Skip to content

Fix component listeners for prototype-named IDs #8349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix component listeners for prototype-named IDs #8349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions src/events/ComponentEventsObserver.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,28 @@ describe('ComponentEventsObserver', () => {
expect(didAppearFn).not.toHaveBeenCalled();
});

it.each(['component.with.dots', 'toString', '__proto__'])(
'removes all listeners for the %s component id',
(componentId) => {
const listener = jest.fn();
const registered = uut.registerComponentListener(
{ componentDidDisappear: listener },
componentId
);

uut.unmounted(componentId);
uut.notifyComponentDidDisappear({
componentId,
componentName: 'doesnt matter',
componentType: 'Component',
});
const callCount = listener.mock.calls.length;
registered.remove();

expect(callCount).toBe(0);
}
);

it(`supports multiple listeners with same componentId`, () => {
const screen1 = render(<SimpleScreen componentId={'myCompId'} />);
const screen2 = render(<SimpleScreen componentId={'myCompId'} />);
Expand Down
9 changes: 5 additions & 4 deletions src/events/ComponentEventsObserver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import type { Component } from 'react';
import isString from 'lodash/isString';
import isNil from 'lodash/isNil';
import uniqueId from 'lodash/uniqueId';
import unset from 'lodash/unset';
import forEach from 'lodash/forEach';
import { EventSubscription } from '../interfaces/EventSubscription';
import { NavigationComponentListener } from '../interfaces/NavigationComponentListener';
Expand All @@ -23,7 +22,9 @@ import { Store } from '../components/Store';
type ReactComponentWithIndexing = NavigationComponentListener & Record<string, any>;

export class ComponentEventsObserver {
private listeners: Record<string, Record<string, ReactComponentWithIndexing>> = {};
private listeners: Record<string, Record<string, ReactComponentWithIndexing>> = Object.create(
null
);
private alreadyRegistered = false;

constructor(
Expand Down Expand Up @@ -92,11 +93,11 @@ export class ComponentEventsObserver {
const key = uniqueId();
this.listeners[componentId][key] = listener;

return { remove: () => unset(this.listeners[componentId], key) };
return { remove: () => delete this.listeners[componentId]?.[key] };
}

public unmounted(componentId: string) {
unset(this.listeners, componentId);
delete this.listeners[componentId];
}

notifyComponentWillAppear(event: ComponentWillAppearEvent) {
Expand Down