Fix mappers cleanup

wordpress-mobile · Nov 29, 2022 · d7d8569 · d7d8569
1 parent 53a51c6
commit d7d8569
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/reanimated2/ViewDescriptorsSet.ts b/src/reanimated2/ViewDescriptorsSet.ts
@@ -22,7 +22,14 @@ export function makeViewDescriptorsSet(): ViewDescriptorsSet {
     add: (item: Descriptor) => {
       sharableViewDescriptors.modify((descriptors: Descriptor[]) => {
         'worklet';
-        descriptors.push(item);
+        const index = descriptors.findIndex(
+          (descriptor) => descriptor.tag === item.tag
+        );
+        if (index !== -1) {
+          descriptors[index] = item;
+        } else {
+          descriptors.push(item);
+        }
         return descriptors;
       });
     },

diff --git a/src/reanimated2/mappers.ts b/src/reanimated2/mappers.ts
@@ -175,5 +175,5 @@ export function stopMapper(mapperID: number): void {
     'worklet';
     const mapperRegistry = global.__mapperRegistry;
     mapperRegistry?.stop(mapperID);
-  });
+  })();
 }