diff --git a/components/image-carousel.tsx b/components/image-carousel.tsx index f0fee0d3..7c573290 100644 --- a/components/image-carousel.tsx +++ b/components/image-carousel.tsx @@ -71,7 +71,7 @@ const ImageCarousel = ({ } {uuids !== undefined && uuids.length >= 2 && - + {!isMobile() && = 1 && onChangeEmbiggened(uuids[activeIndex])} + onPress={() => onChangeEmbiggened(uuids[activeIndex])} style={styles.middleButton} /> } {uuids !== undefined && uuids.length >= 2 && - + {!isMobile() && { const panResponder = useRef( PanResponder.create({ - onStartShouldSetPanResponder: () => true, - onMoveShouldSetPanResponder: () => true, + onStartShouldSetPanResponderCapture: (e) => (e.preventDefault(), true), onPanResponderGrant: handleSingleTap, onPanResponderMove: onPinchMove, onPanResponderRelease: onPinchEnd, @@ -253,7 +252,7 @@ const Pinchy = ({uuid}: {uuid: string}) => { }, [viewportWidth, viewportHeight]); return ( - + { const styles = StyleSheet.create({ container: { ...StyleSheet.absoluteFillObject, + touchAction: 'none', flex: 1, justifyContent: 'center', alignItems: 'center', diff --git a/package-lock.json b/package-lock.json index 3cc4e4cc..30ec3c73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "expo-clipboard": "~4.3.1", "expo-image-picker": "^14.3.2", "expo-linear-gradient": "^12.3.0", - "expo-screen-orientation": "^6.0.5", + "expo-screen-orientation": "~6.0.6", "expo-secure-store": "^12.3.1", "expo-splash-screen": "^0.20.5", "expo-status-bar": "^1.6.0", @@ -40,7 +40,7 @@ "patch-package": "^6.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-native": "0.72.5", + "react-native": "0.72.6", "react-native-dropdown-picker": "^5.4.4", "react-native-feather": "^1.1.2", "react-native-svg": "^13.9.0", @@ -10365,9 +10365,9 @@ } }, "node_modules/expo-screen-orientation": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/expo-screen-orientation/-/expo-screen-orientation-6.0.5.tgz", - "integrity": "sha512-aOOuuQkxNHNxSzfEO037jnD0zYiwBVTvuXeFy/0KntFmuqWmZGaFmFks1uTA2+0wKlbA049kVjkBnA1peybmHQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/expo-screen-orientation/-/expo-screen-orientation-6.0.6.tgz", + "integrity": "sha512-qiTGX1udJi6hj+8JUP9C27+TJDU7+42HcYcgmGd5hi/iXvIK1YwuCkXFdny+BkiapFb5jQnJCBZfdhMk1fjh+Q==", "peerDependencies": { "expo": "*" } @@ -16318,9 +16318,9 @@ "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, "node_modules/react-native": { - "version": "0.72.5", - "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.72.5.tgz", - "integrity": "sha512-oIewslu5DBwOmo7x5rdzZlZXCqDIna0R4dUwVpfmVteORYLr4yaZo5wQnMeR+H7x54GaMhmgeqp0ZpULtulJFg==", + "version": "0.72.6", + "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.72.6.tgz", + "integrity": "sha512-RafPY2gM7mcrFySS8TL8x+TIO3q7oAlHpzEmC7Im6pmXni6n1AuufGaVh0Narbr1daxstw7yW7T9BKW5dpVc2A==", "dependencies": { "@jest/create-cache-key-function": "^29.2.1", "@react-native-community/cli": "11.3.7", @@ -27080,9 +27080,9 @@ } }, "expo-screen-orientation": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/expo-screen-orientation/-/expo-screen-orientation-6.0.5.tgz", - "integrity": "sha512-aOOuuQkxNHNxSzfEO037jnD0zYiwBVTvuXeFy/0KntFmuqWmZGaFmFks1uTA2+0wKlbA049kVjkBnA1peybmHQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/expo-screen-orientation/-/expo-screen-orientation-6.0.6.tgz", + "integrity": "sha512-qiTGX1udJi6hj+8JUP9C27+TJDU7+42HcYcgmGd5hi/iXvIK1YwuCkXFdny+BkiapFb5jQnJCBZfdhMk1fjh+Q==", "requires": {} }, "expo-secure-store": { @@ -31340,9 +31340,9 @@ "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, "react-native": { - "version": "0.72.5", - "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.72.5.tgz", - "integrity": "sha512-oIewslu5DBwOmo7x5rdzZlZXCqDIna0R4dUwVpfmVteORYLr4yaZo5wQnMeR+H7x54GaMhmgeqp0ZpULtulJFg==", + "version": "0.72.6", + "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.72.6.tgz", + "integrity": "sha512-RafPY2gM7mcrFySS8TL8x+TIO3q7oAlHpzEmC7Im6pmXni6n1AuufGaVh0Narbr1daxstw7yW7T9BKW5dpVc2A==", "requires": { "@jest/create-cache-key-function": "^29.2.1", "@react-native-community/cli": "11.3.7", diff --git a/package.json b/package.json index 26b6af78..86d739dc 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "expo-clipboard": "~4.3.1", "expo-image-picker": "^14.3.2", "expo-linear-gradient": "^12.3.0", - "expo-screen-orientation": "^6.0.5", + "expo-screen-orientation": "~6.0.6", "expo-secure-store": "^12.3.1", "expo-splash-screen": "^0.20.5", "expo-status-bar": "^1.6.0", @@ -41,7 +41,7 @@ "patch-package": "^6.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-native": "0.72.5", + "react-native": "0.72.6", "react-native-dropdown-picker": "^5.4.4", "react-native-feather": "^1.1.2", "react-native-svg": "^13.9.0",