Merge remote-tracking branch 'origin/master' into thomas/fix-pinch-br…

…eaking # Conflicts: # lib/commonjs/ReactNativeZoomableView.js.map # lib/module/ReactNativeZoomableView.js.map
openspacelabs · Oct 30, 2024 · faa8fdc · faa8fdc
2 parents 23ded10 + 115c884
commit faa8fdc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 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
@@ -397,6 +397,10 @@ class ReactNativeZoomableView extends Component<
         // we don't wanna measure when zoomSubjectWrapperRef is not yet available or has been unmounted
         zoomSubjectWrapperRef.current?.measureInWindow(
           (x, y, width, height) => {
+            // When the component is off-screen, these become all 0s, so we don't set them
+            // 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;
             this.setState({
               originalWidth: width,
               originalHeight: height,