[chore] Refactor event handler disposer

Author: IjzerenHein

src/SharedElementRendererData.ts

@@ -263,7 +263,7 @@ export default class SharedElementRendererData
     if (this.scenes.length > 10) {
       const { subscription } = this.scenes[0];
       this.scenes.splice(0, 1);
-      if (subscription) subscription.remove();
+      subscription?.();
     }
     this.updateSceneListeners();
   }
@@ -281,7 +281,7 @@ export default class SharedElementRendererData
         });
       } else if (!isActive && subscription) {
         sceneRoute.subscription = null;
-        subscription.remove();
+        subscription();
       }
     });
   }
@@ -350,9 +350,7 @@ export default class SharedElementRendererData
     handler: SharedElementRendererUpdateHandler
   ): SharedElementEventSubscription {
     this.updateSubscribers.add(handler);
-    return {
-      remove: () => this.updateSubscribers.delete(handler)
-    };
+    return () => this.updateSubscribers.delete(handler);
   }
 
   private emitUpdateEvent(): void {

src/SharedElementRendererView.tsx

@@ -22,7 +22,7 @@ export default class SharedElementRendererView extends React.PureComponent<
 
   componentWillUnmount() {
     if (this.subscription) {
-      this.subscription.remove();
+      this.subscription();
       this.subscription = undefined;
     }
   }

src/SharedElementSceneData.ts

@@ -103,9 +103,7 @@ export default class SharedElementSceneData {
     handler: SharedElementSceneUpdateHandler
   ): SharedElementEventSubscription {
     this.updateSubscribers.add(handler);
-    return {
-      remove: () => this.updateSubscribers.delete(handler)
-    };
+    return () => this.updateSubscribers.delete(handler);
   }
 
   private emitUpdateEvent(

src/createSharedElementScene.tsx

@@ -32,7 +32,9 @@ function createSharedElementScene(
 ): React.ComponentType<any> {
   class SharedElementSceneView extends React.PureComponent<PropsType> {
     private subscriptions: {
-      [key: string]: SharedElementEventSubscription;
+      [key: string]: {
+        remove(): void;
+      };
     } = {};
     private sceneData: SharedElementSceneData = new SharedElementSceneData(
       Component,

src/types.ts

@@ -52,9 +52,7 @@ export type NavigationProp<RouteName = string, Params = object> = {
   dangerouslyGetParent(): NavigationProp | undefined;
 };
 
-export type SharedElementEventSubscription = {
-  remove(): void;
-};
+export type SharedElementEventSubscription = () => void;
 
 export type SharedElementStrictConfig = {
   readonly id: string;