cherry-pick

software-mansion · Jun 19, 2024 · 54495af · 54495af
1 parent 3188d92
commit 54495af
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/app/src/examples/ShareableFreezingExample.tsx b/app/src/examples/ShareableFreezingExample.tsx
@@ -68,6 +68,13 @@ export default function FreezingShareables() {
           onPress={tryModifyConvertedInt32Array}
         />
       </View>
+      <View style={styles.textAndButton}>
+        <Text style={styles.text}>🤫</Text>
+        <Button
+          title="Modify unconfigurable object"
+          onPress={tryModifyUnconfigurableObject}
+        />
+      </View>
     </View>
   );
 }
@@ -92,7 +99,7 @@ function tryModifyConvertedHostObject() {
     return;
   }
   makeShareableCloneRecursive(obj);
-  // @ts-expect-error
+  // @ts-expect-error It's ok
   obj.prop = 2; // shouldn't warn because it's not frozen
 }
 
@@ -107,21 +114,22 @@ function tryModifyConvertedPlainObject() {
 function tryModifyConvertedRegExpLiteral() {
   const obj = /a/;
   makeShareableCloneRecursive(obj);
-  // @ts-expect-error
+  // @ts-expect-error It's ok
   obj.prop = 2; // shouldn't warn because it's not frozen
 }
 
 function tryModifyConvertedRegExpInstance() {
+  // eslint-disable-next-line prefer-regex-literals
   const obj = new RegExp('a');
   makeShareableCloneRecursive(obj);
-  // @ts-expect-error
+  // @ts-expect-error It's ok
   obj.prop = 2; // shouldn't warn because it's not frozen
 }
 
 function tryModifyConvertedArrayBuffer() {
   const obj = new ArrayBuffer(8);
   makeShareableCloneRecursive(obj);
-  // @ts-expect-error
+  // @ts-expect-error It's ok
   obj.prop = 2; // shouldn't warn because it's not frozen
 }
 
@@ -131,6 +139,17 @@ function tryModifyConvertedInt32Array() {
   obj[1] = 2; // shouldn't warn because it's not frozen
 }
 
+function tryModifyUnconfigurableObject() {
+  const obj = {};
+  Object.defineProperty(obj, 'prop', {
+    value: 1,
+    writable: false,
+    enumerable: true,
+    configurable: false,
+  });
+  makeShareableCloneRecursive(obj);
+}
+
 const styles = StyleSheet.create({
   container: {
     flex: 1,

diff --git a/src/reanimated2/shareables.ts b/src/reanimated2/shareables.ts
@@ -318,6 +318,10 @@ function freezeObjectIfDev<T extends object>(value: T) {
     return;
   }
   Object.entries(value).forEach(([key, element]) => {
+    const descriptor = Object.getOwnPropertyDescriptor(value, key)!;
+    if (!descriptor.configurable) {
+      return;
+    }
     Object.defineProperty(value, key, {
       get() {
         return element;