Merge pull request #124 from openspacelabs/elliott/animate-move-stati…

…c-pin-to Skip re-renders by checking numbers
openspacelabs · Dec 27, 2024 · af7ce8a · af7ce8a
2 parents 6962122 + 14605fb
commit af7ce8a
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 7 deletions.
diff --git a/lib/commonjs/ReactNativeZoomableView.js b/lib/commonjs/ReactNativeZoomableView.js
diff --git a/lib/commonjs/ReactNativeZoomableView.js.map b/lib/commonjs/ReactNativeZoomableView.js.map
diff --git a/lib/module/ReactNativeZoomableView.js b/lib/module/ReactNativeZoomableView.js
diff --git a/lib/module/ReactNativeZoomableView.js.map b/lib/module/ReactNativeZoomableView.js.map
diff --git a/src/ReactNativeZoomableView.tsx b/src/ReactNativeZoomableView.tsx
@@ -401,6 +401,18 @@ class ReactNativeZoomableView extends Component<
             // to avoid messing up calculations, especially ones that are done right after
             // the component transitions from hidden to visible.
             if (!x && !y && !width && !height) return;
+
+            // If these values are all the same, don't re-set them in state
+            // this way we don't re-render
+            if (
+              this.state.originalWidth === width &&
+              this.state.originalHeight === height &&
+              this.state.originalPageX === x &&
+              this.state.originalPageY === y
+            ) {
+              return;
+            }
+
             this.setState({
               originalWidth: width,
               originalHeight: height,
@@ -1198,7 +1210,10 @@ class ReactNativeZoomableView extends Component<
         style={styles.container}
         {...this.gestureHandlers.panHandlers}
         ref={this.zoomSubjectWrapperRef}
-        onLayout={this.grabZoomSubjectOriginalMeasurements}
+        onLayout={(event) => {
+          this.props.onLayout?.(event);
+          this.grabZoomSubjectOriginalMeasurements();
+        }}
       >
         <Animated.View
           style={[