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/khaki-beans-enter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@lynx-js/testing-environment": patch
---

Fix `GlobalEventEmitter` type definition, the `emit(eventName: string, data: unknown)` function should recevie an array typed `data` and pass as param list of listeners.
17 changes: 15 additions & 2 deletions packages/react/runtime/__test__/utils/jsModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,28 @@ class GlobalEventEmitter {
}
this.listeners[eventName] = this.listeners[eventName].filter((l) => l !== listener);
}
emit(eventName: string, ...args: any[]): void {
emit(eventName: string, args: any[]): void {
if (!this.listeners[eventName]) {
return;
}
this.listeners[eventName].forEach((listener) => listener(...args));
this.listeners[eventName].forEach((listener) => args ? listener(...args) : listener());
}
clear(): void {
this.listeners = {};
}
removeAllListeners(eventName?: string): void {
if (eventName) {
delete this.listeners[eventName];
} else {
this.clear();
}
}
trigger(eventName: string, params: string | Record<any, any>): void {
this.emit(eventName, [params]);
}
toggle(eventName: string, ...data: unknown[]): void {
this.emit(eventName, data);
}
}

const jsModules: {
Expand Down
4 changes: 2 additions & 2 deletions packages/react/testing-library/src/__tests__/lynx.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ describe('lynx global API', () => {
lynx.getJSModule('GlobalEventEmitter')
.addListener('onDataChanged', cb);

lynx.getJSModule('GlobalEventEmitter').emit('onDataChanged', {
lynx.getJSModule('GlobalEventEmitter').emit('onDataChanged', [{
data: {
foo: 'bar',
},
});
}]);
expect(cb).toBeCalledTimes(1);
expect(cb.mock.calls).toMatchInlineSnapshot(`
[
Expand Down
7 changes: 2 additions & 5 deletions packages/testing-library/testing-environment/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { JSDOM } from 'jsdom';
import { createGlobalThis, LynxGlobalThis } from './lynx/GlobalThis.js';
import { initElementTree } from './lynx/ElementPAPI.js';
import { Console } from 'console';
import { GlobalEventEmitter } from './lynx/GlobalEventEmitter.js';
export { initElementTree } from './lynx/ElementPAPI.js';
export type { LynxElement } from './lynx/ElementPAPI.js';
export type { LynxGlobalThis } from './lynx/GlobalThis.js';
Expand Down Expand Up @@ -335,11 +336,7 @@ function injectBackgroundThreadGlobals(target?: any, polyfills?: any) {
UNIQUE_ID, // element_id
}

const globalEventEmitter = new EventEmitter();
// @ts-ignore
globalEventEmitter.trigger = globalEventEmitter.emit;
// @ts-ignore
globalEventEmitter.toggle = globalEventEmitter.emit;
const globalEventEmitter = new GlobalEventEmitter();
target.lynx = {
getNativeApp: () => app,
performance,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
export class GlobalEventEmitter {
listeners: Record<string, Function[]> = {};
addListener(eventName: string, listener: Function): void {
this.listeners[eventName] ??= [];
this.listeners[eventName].push(listener);
}
removeListener(eventName: string, listener: Function): void {
if (!this.listeners[eventName]) {
return;
}
this.listeners[eventName] = this.listeners[eventName].filter((l) =>
l !== listener
);
}
emit(eventName: string, args: any[]): void {
if (!this.listeners[eventName]) {
return;
}
this.listeners[eventName].forEach((listener) =>
args ? listener(...args) : listener()
);
}
clear(): void {
this.listeners = {};
}
removeAllListeners(eventName?: string): void {
if (eventName) {
delete this.listeners[eventName];
} else {
this.clear();
}
}
trigger(eventName: string, params: string | Record<any, any>): void {
this.emit(eventName, [params]);
}
toggle(eventName: string, ...data: unknown[]): void {
this.emit(eventName, data);
}
}
Loading