make transition as flat data instead of object

draftbit · Dec 3, 2024 · ab5955b · ab5955b
1 parent 337c00b
commit ab5955b
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/packages/core/src/components/ExpoImage.tsx b/packages/core/src/components/ExpoImage.tsx
@@ -16,20 +16,16 @@ type ImageStyleProp = {
 };
 
 interface ExtendedImageProps extends ExpoImageProps {
-  transition?:
-    | number
-    | {
-        duration?: number;
-        effect?:
-          | "cross-dissolve"
-          | "flip-from-top"
-          | "flip-from-right"
-          | "flip-from-bottom"
-          | "flip-from-left"
-          | "curl-up"
-          | "curl-down";
-        timing?: "ease-in-out" | "ease-in" | "ease-out" | "linear";
-      };
+  transitionDuration?: number;
+  transitionEffect?:
+    | "cross-dissolve"
+    | "flip-from-top"
+    | "flip-from-right"
+    | "flip-from-bottom"
+    | "flip-from-left"
+    | "curl-up"
+    | "curl-down";
+  transitionTiming?: "ease-in-out" | "ease-in" | "ease-out" | "linear";
   contentFit?: "cover" | "contain" | "fill" | "none" | "scale-down";
   contentPosition?: ImageContentPosition;
   cachePolicy?: "none" | "disk" | "memory" | "memory-disk";
@@ -90,7 +86,9 @@ const ExpoImage: React.FC<ExtendedImageProps> = ({
   source,
   resizeMode = "cover",
   style,
-  transition = 300,
+  transitionDuration = 300,
+  transitionEffect = "cross-dissolve",
+  transitionTiming = "ease-in-out",
   contentFit = "cover",
   contentPosition = "center",
   cachePolicy = "memory-disk",
@@ -113,6 +111,12 @@ const ExpoImage: React.FC<ExtendedImageProps> = ({
     ? resizeModeToContentFit(resizeMode)
     : contentFit;
 
+  const transition = {
+    duration: transitionDuration,
+    effect: transitionEffect,
+    timing: transitionTiming,
+  };
+
   if (aspectRatio) {
     return (
       <AspectRatio style={[style, { width, height, aspectRatio }]}>