@webority-technologies/mobile 0.0.15 → 0.0.20

package/lib/module/components/ImageGallery/ImageGallery.js

@@ -24,14 +24,15 @@ import { Dimensions, Image, Modal as RNModal, Pressable, StyleSheet, Text, View
 import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import Animated, { runOnJS, useAnimatedStyle, useSharedValue, withSpring, withTiming } from 'react-native-reanimated';
 import { Carousel } from "../Carousel/index.js";
-import { AppIcon } from "../AppIcon/index.js";
-import { SkeletonContent } from "../Skeleton/index.js";
+import { Skeleton } from "../Skeleton/index.js";
 import { useTheme } from "../../theme/index.js";
 import { triggerHaptic } from "../../utils/index.js";
+
+// Local shape mirror — see types.ts ImageGalleryTokens for the canonical definition.
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const MAX_SCALE = 4;
-const MIN_SCALE = 1;
-const DOUBLE_TAP_SCALE = 2;
+const MAX_SCALE_FALLBACK = 4;
+const MIN_SCALE_FALLBACK = 1;
+const DOUBLE_TAP_SCALE_FALLBACK = 2;
 const SPRING_CONFIG = {
   damping: 18,
   stiffness: 220,
@@ -52,6 +53,8 @@ const ImageGallery = ({
 }) => {
   const theme = useTheme();
   const styles = useMemo(() => buildStyles(theme), [theme]);
+  const galleryTokens = theme.components.imageGallery;
+  const pressHaptic = galleryTokens?.pressHaptic ?? false;
   const [currentIndex, setCurrentIndex] = useState(clamp(initialIndex, 0, Math.max(0, images.length - 1)));
   const [lightboxOpen, setLightboxOpen] = useState(false);
   const handleIndexChange = useCallback(idx => {
@@ -60,13 +63,13 @@ const ImageGallery = ({
   }, [onIndexChange]);
   const openLightbox = useCallback(() => {
     if (!enableLightbox) return;
-    triggerHaptic('selection');
+    if (pressHaptic) triggerHaptic('selection');
     setLightboxOpen(true);
-  }, [enableLightbox]);
+  }, [enableLightbox, pressHaptic]);
   const closeLightbox = useCallback(() => {
-    triggerHaptic('selection');
+    if (pressHaptic) triggerHaptic('selection');
     setLightboxOpen(false);
-  }, []);
+  }, [pressHaptic]);
   const renderImage = useCallback((image, idx) => {
     const a11y = image.alt ?? `Image ${idx + 1} of ${images.length}`;
     return /*#__PURE__*/_jsx(Pressable, {
@@ -119,20 +122,86 @@ const ImageGallery = ({
       enablePinchZoom: enablePinchZoom,
       showCounter: showCounter,
       onClose: closeLightbox,
-      onIndexChange: handleIndexChange
+      onIndexChange: handleIndexChange,
+      pressHaptic: pressHaptic
     }) : null]
   });
   if (loading) {
-    return /*#__PURE__*/_jsx(SkeletonContent, {
-      loading: true,
-      mode: "auto",
-      children: rendered
+    return /*#__PURE__*/_jsx(ImageGallerySkeleton, {
+      images: images,
+      showThumbnails: showThumbnails,
+      showCounter: showCounter,
+      containerStyle: containerStyle,
+      testID: testID
     });
   }
   return rendered;
 };
 ImageGallery.displayName = 'ImageGallery';
 
+/**
+ * Placeholder shape for `<ImageGallery>`. Hero image block + optional
+ * counter pill + thumbnail strip. Heights are tuned to match the live
+ * component's defaults so the gallery doesn't reflow when ready.
+ */
+const ImageGallerySkeleton = ({
+  images,
+  showThumbnails = true,
+  showCounter = true,
+  containerStyle,
+  testID
+}) => {
+  const thumbCount = Math.min(images?.length || 4, 6);
+  return /*#__PURE__*/_jsxs(View, {
+    style: [{
+      width: '100%'
+    }, containerStyle],
+    testID: testID,
+    accessibilityRole: "progressbar",
+    accessibilityState: {
+      busy: true
+    },
+    children: [/*#__PURE__*/_jsxs(View, {
+      style: {
+        position: 'relative'
+      },
+      children: [/*#__PURE__*/_jsx(Skeleton, {
+        width: "100%",
+        height: 280,
+        radius: "lg"
+      }), showCounter ? /*#__PURE__*/_jsx(View, {
+        style: {
+          position: 'absolute',
+          top: 12,
+          right: 12
+        },
+        children: /*#__PURE__*/_jsx(Skeleton, {
+          width: 44,
+          height: 22,
+          radius: "full"
+        })
+      }) : null]
+    }), showThumbnails ? /*#__PURE__*/_jsx(View, {
+      style: {
+        flexDirection: 'row',
+        marginTop: 12
+      },
+      children: Array.from({
+        length: thumbCount
+      }).map((_, i) => /*#__PURE__*/_jsx(Skeleton, {
+        width: 64,
+        height: 64,
+        radius: "md",
+        style: {
+          marginRight: 8
+        }
+      }, `sk-thumb-${i}`))
+    }) : null]
+  });
+};
+ImageGallerySkeleton.displayName = 'ImageGallerySkeleton';
+ImageGallery.Skeleton = ImageGallerySkeleton;
+
 // ───────── Lightbox ─────────
 
 const Lightbox = ({
@@ -142,26 +211,35 @@ const Lightbox = ({
   enablePinchZoom,
   showCounter,
   onClose,
-  onIndexChange
+  onIndexChange,
+  pressHaptic
 }) => {
   const theme = useTheme();
   const styles = useMemo(() => buildLightboxStyles(theme), [theme]);
+  const galleryTokens = theme.components.imageGallery;
+  const maxScale = galleryTokens?.maxScale ?? MAX_SCALE_FALLBACK;
+  const minScale = galleryTokens?.minScale ?? MIN_SCALE_FALLBACK;
+  const doubleTapScale = galleryTokens?.doubleTapScale ?? DOUBLE_TAP_SCALE_FALLBACK;
   const carouselRef = useRef(null);
   const [activeIndex, setActiveIndex] = useState(initialIndex);
   const handleSwipe = useCallback(idx => {
     if (idx !== activeIndex) {
-      triggerHaptic('selection');
+      if (pressHaptic) triggerHaptic('selection');
       setActiveIndex(idx);
       onIndexChange(idx);
     }
-  }, [activeIndex, onIndexChange]);
+  }, [activeIndex, onIndexChange, pressHaptic]);
   const renderItem = useCallback((image, idx) => /*#__PURE__*/_jsx(ZoomableImage, {
     image: image,
     index: idx,
     total: images.length,
     active: idx === activeIndex,
-    enabled: enablePinchZoom
-  }), [activeIndex, enablePinchZoom, images.length]);
+    enabled: enablePinchZoom,
+    maxScale: maxScale,
+    minScale: minScale,
+    doubleTapScale: doubleTapScale,
+    pressHaptic: pressHaptic
+  }), [activeIndex, enablePinchZoom, images.length, maxScale, minScale, doubleTapScale, pressHaptic]);
   const caption = images[activeIndex]?.caption;
   return /*#__PURE__*/_jsx(RNModal, {
     visible: visible,
@@ -197,11 +275,15 @@ const Lightbox = ({
         accessibilityLabel: "Close gallery",
         style: styles.closeButton,
         hitSlop: 12,
-        children: /*#__PURE__*/_jsx(AppIcon, {
-          name: "x",
-          family: "feather",
-          size: "lg",
+        children: theme.icons?.close ? theme.icons.close({
+          size: 24,
           color: theme.colors.text.inverse
+        }) : /*#__PURE__*/_jsx(Text, {
+          style: {
+            fontSize: 24,
+            color: theme.colors.text.inverse
+          },
+          children: "\xD7"
         })
       }), caption ? /*#__PURE__*/_jsx(Animated.View, {
         style: styles.captionWrap,
@@ -224,7 +306,11 @@ const ZoomableImage = ({
   index,
   total,
   active,
-  enabled
+  enabled,
+  maxScale,
+  minScale,
+  doubleTapScale,
+  pressHaptic
 }) => {
   const screen = Dimensions.get('window');
   const scale = useSharedValue(1);
@@ -259,7 +345,9 @@ const ZoomableImage = ({
       savedTranslateY.value = 0;
     }
   }, [active, scale, translateX, translateY, savedScale, savedTranslateX, savedTranslateY]);
-  const triggerImpact = useCallback(() => triggerHaptic('impactLight'), []);
+  const triggerImpact = useCallback(() => {
+    if (pressHaptic) triggerHaptic('impactLight');
+  }, [pressHaptic]);
   const pinch = useMemo(() => Gesture.Pinch().enabled(enabled).onStart(() => {
     'worklet';
 
@@ -268,33 +356,33 @@ const ZoomableImage = ({
     'worklet';
 
     const next = savedScale.value * e.scale;
-    // Clamp 1..MAX_SCALE on the UI thread so pinch feels rubbery at limits.
-    if (next < MIN_SCALE) {
-      scale.value = MIN_SCALE + (next - MIN_SCALE) * 0.3;
-    } else if (next > MAX_SCALE) {
-      scale.value = MAX_SCALE + (next - MAX_SCALE) * 0.2;
+    // Clamp minScale..maxScale on the UI thread so pinch feels rubbery at limits.
+    if (next < minScale) {
+      scale.value = minScale + (next - minScale) * 0.3;
+    } else if (next > maxScale) {
+      scale.value = maxScale + (next - maxScale) * 0.2;
     } else {
       scale.value = next;
     }
   }).onEnd(() => {
     'worklet';
 
-    if (scale.value < MIN_SCALE) {
-      scale.value = withSpring(MIN_SCALE, SPRING_CONFIG);
+    if (scale.value < minScale) {
+      scale.value = withSpring(minScale, SPRING_CONFIG);
       translateX.value = withSpring(0, SPRING_CONFIG);
       translateY.value = withSpring(0, SPRING_CONFIG);
-      savedScale.value = MIN_SCALE;
+      savedScale.value = minScale;
       savedTranslateX.value = 0;
       savedTranslateY.value = 0;
       return;
     }
-    if (scale.value > MAX_SCALE) {
-      scale.value = withSpring(MAX_SCALE, SPRING_CONFIG);
-      savedScale.value = MAX_SCALE;
+    if (scale.value > maxScale) {
+      scale.value = withSpring(maxScale, SPRING_CONFIG);
+      savedScale.value = maxScale;
       return;
     }
     savedScale.value = scale.value;
-  }), [enabled, scale, savedScale, translateX, translateY, savedTranslateX, savedTranslateY]);
+  }), [enabled, scale, savedScale, translateX, translateY, savedTranslateX, savedTranslateY, minScale, maxScale]);
 
   // Pan only engages when zoomed in — otherwise the parent Carousel owns horizontal swipe.
   const pan = useMemo(() => Gesture.Pan().minPointers(1).maxPointers(1).onStart(() => {
@@ -326,10 +414,10 @@ const ZoomableImage = ({
       savedTranslateX.value = 0;
       savedTranslateY.value = 0;
     } else {
-      scale.value = withSpring(DOUBLE_TAP_SCALE, SPRING_CONFIG);
-      savedScale.value = DOUBLE_TAP_SCALE;
+      scale.value = withSpring(doubleTapScale, SPRING_CONFIG);
+      savedScale.value = doubleTapScale;
     }
-  }), [scale, savedScale, translateX, translateY, savedTranslateX, savedTranslateY, triggerImpact]);
+  }), [scale, savedScale, translateX, translateY, savedTranslateX, savedTranslateY, triggerImpact, doubleTapScale]);
 
   // Race the gestures so they coordinate cleanly: a tap won't be misread as a tiny pan,
   // and pan won't fire when the user actually starts a pinch.