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
5 changes: 5 additions & 0 deletions .changeset/bright-rings-read.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@lynx-js/react": patch
---

Fix crash caused by not removing event listeners during destroy.
45 changes: 45 additions & 0 deletions packages/react/runtime/__test__/lifecycle/destroy.test.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { render } from 'preact';
import { beforeAll, describe, expect, test, vi } from 'vitest';

describe('Destroy', () => {
const addEventListener = vi.fn();
const removeEventListener = vi.fn();

beforeAll(() => {
lynx.getCoreContext = vi.fn(() => {
return {
addEventListener,
removeEventListener,
};
});
});

test('should remove event listener when throw in cleanup', async function() {
vi.resetModules();
await import('../../src/lynx');

expect(addEventListener).toHaveBeenCalled();
expect(removeEventListener).toHaveBeenCalledTimes(0);

const { useEffect } = await import('../../src/index');
const { __root } = await import('../../src/root');

const callback = vi.fn().mockImplementation(() => {
throw '???';
});

function Comp() {
useEffect(() => callback, []);
return null;
}

render(<Comp />, __root);
await Promise.resolve().then(() => {});

expect(() => lynxCoreInject.tt.callDestroyLifetimeFun()).toThrow('???');

await Promise.resolve().then(() => {});
expect(callback).toHaveBeenCalledTimes(1);
expect(removeEventListener).toHaveBeenCalledTimes(addEventListener.mock.calls.length);
});
});
2 changes: 2 additions & 0 deletions packages/react/runtime/__test__/utils/runtimeProxy.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ describe('runtimeProxy', () => {
globalEnvManager.switchToBackground();
lynx.getCoreContext().dispatchEvent({ type: 'event1', data: 'test' });
expect(event).toBeCalledWith({ type: 'event1', data: 'test' });
lynx.getJSContext().removeEventListener('event1', event);
});

it('should not trigger event when context mismatch', () => {
const event = vi.fn();
lynx.getJSContext().addEventListener('event1', event);
lynx.getJSContext().dispatchEvent({ type: 'event1', data: 'test' });
expect(event).not.toBeCalled();
lynx.getJSContext().removeEventListener('event1', event);
});

it('should throw when dispatch event to the same context', () => {
Expand Down
6 changes: 5 additions & 1 deletion packages/react/runtime/__test__/utils/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@ function inject() {
inject();

afterEach((context) => {
if (context.task.name.includes('preact/debug')) {
const skippedTasks = [
// Skip preact/debug tests since it would throw errors and abort the rendering process
'preact/debug',
'should remove event listener when throw in cleanup',
];
if (skippedTasks.some(task => context.task.name.includes(task))) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/react/runtime/src/lynx/tt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ function injectTt(): void {
tt.publishEvent = delayedPublishEvent;
tt.publicComponentEvent = delayedPublicComponentEvent;
tt.callDestroyLifetimeFun = () => {
removeCtxNotFoundEventListener();
destroyWorklet();
destroyBackground();
removeCtxNotFoundEventListener();
};
tt.updateGlobalProps = updateGlobalProps;
tt.updateCardData = updateCardData;
Expand Down
Loading