Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/__tests__/internal.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ beforeEach(() => {
});

describe("useEventHandlerRegistration", () => {
it("should support a handler wrapped in workletEventHandler", () => {
it("should support the handler shape from Reanimated 3.8 and newer", () => {
const viewTagRef = { current: VIEW };
const workletEventHandler = createWorkletHandler();
const register = renderRegistration(viewTagRef);
Expand All @@ -70,12 +70,14 @@ describe("useEventHandlerRegistration", () => {
);
});

it("should support a direct worklet handler", () => {
it("should support the ref handler shape from Reanimated 3.0 through 3.7", () => {
const viewTagRef = { current: VIEW };
const workletEventHandler = createWorkletHandler();
const register = renderRegistration(viewTagRef);

const cleanup = register(workletEventHandler as unknown as EventHandler);
const cleanup = register({
current: workletEventHandler,
} as unknown as EventHandler);

expect(workletEventHandler.registerForEvents).toHaveBeenCalledWith(
VIEW_TAG,
Expand Down
13 changes: 7 additions & 6 deletions src/internal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ type WorkletHandler = {
unregisterFromEvents: (viewTag: number) => void;
};

type WorkletHandlerOrWorkletHandlerObject =
| WorkletHandler
type WorkletHandlerContainer =
| {
current: WorkletHandler;
}
| {
workletEventHandler: WorkletHandler;
};
Expand All @@ -35,8 +37,7 @@ export function useEventHandlerRegistration(
viewTagRef: React.MutableRefObject<ComponentOrHandle>,
) {
const onRegisterHandler = (handler: EventHandlerProcessed<never, never>) => {
const currentHandler =
handler as unknown as WorkletHandlerOrWorkletHandlerObject;
const currentHandler = handler as unknown as WorkletHandlerContainer;
let registeredViewTag: number | null = null;
const attachWorkletHandlers = () => {
const viewTag = findNodeHandle(viewTagRef.current);
Expand All @@ -51,7 +52,7 @@ export function useEventHandlerRegistration(
if ("workletEventHandler" in currentHandler) {
currentHandler.workletEventHandler.registerForEvents(viewTag);
} else {
currentHandler.registerForEvents(viewTag);
currentHandler.current.registerForEvents(viewTag);
}

registeredViewTag = viewTag;
Expand All @@ -72,7 +73,7 @@ export function useEventHandlerRegistration(
registeredViewTag,
);
} else {
currentHandler.unregisterFromEvents(registeredViewTag);
currentHandler.current.unregisterFromEvents(registeredViewTag);
}
}
};
Expand Down
Loading