refactor: update appearance subscription (#2586)

callstack · Oct 25, 2021 · 58851e3 · 58851e3
1 parent 91e669c
commit 58851e3
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/core/Provider.tsx b/src/core/Provider.tsx
@@ -60,10 +60,20 @@ const Provider = ({ ...props }: Props) => {
   }, [props.theme]);
 
   React.useEffect(() => {
-    if (!props.theme) Appearance?.addChangeListener(handleAppearanceChange);
+    let appearanceSubscription: NativeEventSubscription | undefined;
+    if (!props.theme) {
+      appearanceSubscription = Appearance?.addChangeListener(
+        handleAppearanceChange
+      ) as NativeEventSubscription | undefined;
+    }
     return () => {
-      if (!props.theme)
-        Appearance?.removeChangeListener(handleAppearanceChange);
+      if (!props.theme) {
+        if (appearanceSubscription) {
+          appearanceSubscription.remove();
+        } else {
+          Appearance?.removeChangeListener(handleAppearanceChange);
+        }
+      }
     };
   }, [props.theme]);