fix: removal of non-existing listener should not break updating ref

react-navigation · Oct 20, 2021 · 464d058 · 464d058
1 parent e947943
commit 464d058
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/packages/core/src/__tests__/createNavigationContainerRef.test.tsx b/packages/core/src/__tests__/createNavigationContainerRef.test.tsx
@@ -45,3 +45,11 @@ it('adds the listener even if container is mounted later', () => {
 
   expect(listener).toHaveBeenCalledTimes(1);
 });
+
+it('removal of non-existing listener should not break updating ref', () => {
+  const ref = createNavigationContainerRef<ParamListBase>();
+  ref.removeListener('state', jest.fn());
+  expect(() => {
+    ref.current = createNavigationContainerRef<ParamListBase>();
+  }).not.toThrow();
+});
diff --git a/packages/core/src/createNavigationContainerRef.tsx b/packages/core/src/createNavigationContainerRef.tsx
@@ -33,7 +33,9 @@ export default function createNavigationContainerRef<
     event: string,
     callback: (...args: any[]) => void
   ) => {
-    listeners[event] = listeners[event]?.filter((cb) => cb !== callback);
+    if (listeners[event]) {
+      listeners[event] = listeners[event].filter((cb) => cb !== callback);
+    }
   };
 
   let current: NavigationContainerRef<ParamList> | null = null;