From 969d4abe0e2e161d469399c0fcf68d23a7c0b42e Mon Sep 17 00:00:00 2001 From: xmflsct Date: Wed, 14 Sep 2022 21:52:16 +0200 Subject: [PATCH] Move image viewer to a new plugin --- package.json | 1 + src/components/GracefullyImage.tsx | 36 +- .../ImageViewer/@types/extensions.d.ts | 7 - src/screens/ImageViewer/@types/index.ts | 17 - src/screens/ImageViewer/Root.tsx | 132 ------ .../components/ImageItem.android.tsx | 123 ------ .../ImageViewer/components/ImageItem.d.ts | 32 -- .../ImageViewer/components/ImageItem.ios.tsx | 177 -------- .../hooks/useAnimatedComponents.ts | 40 -- .../ImageViewer/hooks/useDoubleTapToZoom.ts | 64 --- .../ImageViewer/hooks/useImageIndexChange.ts | 31 -- .../ImageViewer/hooks/usePanResponder.ts | 406 ------------------ .../ImageViewer/hooks/useRequestClose.ts | 23 - src/screens/ImageViewer/utils.ts | 147 ------- src/screens/ImagesViewer.tsx | 160 +++++-- yarn.lock | 5 + 16 files changed, 128 insertions(+), 1273 deletions(-) delete mode 100644 src/screens/ImageViewer/@types/extensions.d.ts delete mode 100644 src/screens/ImageViewer/@types/index.ts delete mode 100644 src/screens/ImageViewer/Root.tsx delete mode 100644 src/screens/ImageViewer/components/ImageItem.android.tsx delete mode 100644 src/screens/ImageViewer/components/ImageItem.d.ts delete mode 100644 src/screens/ImageViewer/components/ImageItem.ios.tsx delete mode 100644 src/screens/ImageViewer/hooks/useAnimatedComponents.ts delete mode 100644 src/screens/ImageViewer/hooks/useDoubleTapToZoom.ts delete mode 100644 src/screens/ImageViewer/hooks/useImageIndexChange.ts delete mode 100644 src/screens/ImageViewer/hooks/usePanResponder.ts delete mode 100644 src/screens/ImageViewer/hooks/useRequestClose.ts delete mode 100644 src/screens/ImageViewer/utils.ts diff --git a/package.json b/package.json index 7f88d524..4281b154 100644 --- a/package.json +++ b/package.json @@ -86,6 +86,7 @@ "react-native-language-detection": "^0.1.0", "react-native-pager-view": "^5.4.25", "react-native-reanimated": "^2.9.1", + "react-native-reanimated-zoom": "^0.3.0", "react-native-safe-area-context": "^4.3.1", "react-native-screens": "^3.16.0", "react-native-share-menu": "^6.0.0", diff --git a/src/components/GracefullyImage.tsx b/src/components/GracefullyImage.tsx index 01db6c04..5afcbff6 100644 --- a/src/components/GracefullyImage.tsx +++ b/src/components/GracefullyImage.tsx @@ -67,9 +67,7 @@ const GracefullyImage = ({ const onLoad = () => { setImageLoaded(true) if (setImageDimensions && source.uri) { - Image.getSize(source.uri, (width, height) => - setImageDimensions({ width, height }) - ) + Image.getSize(source.uri, (width, height) => setImageDimensions({ width, height })) } } const onError = () => { @@ -81,22 +79,9 @@ const GracefullyImage = ({ const blurhashView = useMemo(() => { if (hidden || !imageLoaded) { if (blurhash) { - return ( - - ) + return } else { - return ( - - ) + return } } else { return null @@ -105,26 +90,17 @@ const GracefullyImage = ({ return (