Page MenuHomePhorge
Files F33311923

D14303.1768813157.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D14303.1768813157.diff
View Options

diff --git a/native/components/full-screen-view-modal.react.js b/native/components/full-screen-view-modal.react.js
--- a/native/components/full-screen-view-modal.react.js
+++ b/native/components/full-screen-view-modal.react.js
@@ -373,15 +373,6 @@
);
const updates = [
- this.pinchUpdate(
- pinchActive,
- pinchScale,
- pinchFocalX,
- pinchFocalY,
- curScale,
- curX,
- curY,
- ),
this.singleTapUpdate(
singleTapState,
singleTapX,
@@ -502,37 +493,6 @@
return max(vertPop, 0);
}
- pinchUpdate(
- // Inputs
- pinchActive: Node,
- pinchScale: Node,
- pinchFocalX: Node,
- pinchFocalY: Node,
- // Outputs
- curScale: Value,
- curX: Value,
- curY: Value,
- ): Node {
- const deltaScale = scaleDelta(pinchScale, pinchActive);
- const deltaPinchX = multiply(
- sub(1, deltaScale),
- sub(pinchFocalX, curX, this.centerX),
- );
- const deltaPinchY = multiply(
- sub(1, deltaScale),
- sub(pinchFocalY, curY, this.centerY),
- );
-
- return cond(
- [deltaScale, pinchActive],
- [
- set(curX, add(curX, deltaPinchX)),
- set(curY, add(curY, deltaPinchY)),
- set(curScale, multiply(curScale, deltaScale)),
- ],
- );
- }
-
singleTapUpdate(
// Inputs
singleTapState: Node,
@@ -1222,6 +1182,35 @@
const curX = useSharedValue(0);
const curY = useSharedValue(0);
+ const curScale = useSharedValue(1);
+
+ const centerX = useSharedValue(dimensions.width / 2);
+ const centerY = useSharedValue(dimensions.safeAreaHeight / 2);
+
+ const lastPinchScale = useSharedValue(1);
+
+ const pinchStart = React.useCallback(() => {
+ 'worklet';
+ lastPinchScale.value = 1;
+ }, [lastPinchScale]);
+
+ const pinchUpdate = React.useCallback(
+ ({ scale, focalX, focalY }: PinchGestureEvent) => {
+ 'worklet';
+ const deltaScale = scale / lastPinchScale.value;
+ const deltaPinchX =
+ (1 - deltaScale) * (focalX - curX.value - centerX.value);
+ const deltaPinchY =
+ (1 - deltaScale) * (focalY - curY.value - centerY.value);
+
+ curX.value += deltaPinchX;
+ curY.value += deltaPinchY;
+ curScale.value *= deltaScale;
+
+ lastPinchScale.value = scale;
+ },
+ [centerX, centerY, curScale, curX, curY, lastPinchScale],
+ );
const panActive = useSharedValue(false);
@@ -1266,7 +1255,9 @@
}, [panActive]);
const gesture = React.useMemo(() => {
- const pinchGesture = Gesture.Pinch();
+ const pinchGesture = Gesture.Pinch()
+ .onStart(pinchStart)
+ .onUpdate(pinchUpdate);
const panGesture = Gesture.Pan()
.averageTouches(true)
.onStart(panStart)
@@ -1280,7 +1271,7 @@
doubleTapGesture,
singleTapGesture,
);
- }, [panEnd, panStart, panUpdate]);
+ }, [panEnd, panStart, panUpdate, pinchStart, pinchUpdate]);
return (
<FullScreenViewModal

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 19, 8:59 AM (21 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5955514
Default Alt Text
D14303.1768813157.diff (3 KB)

Event Timeline