Support ignore reduce motion for bottom sheet - 50 (#980)

* support ignore reduce motion for bottom sheet * support ignore reduce motion for bottom sheet
draftbit · Dec 27, 2024 · 84a3fe9 · 84a3fe9
1 parent 45674ff
commit 84a3fe9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -44,7 +44,7 @@
     "@draftbit/react-theme-provider": "^2.1.1",
     "@draftbit/theme": "50.7.0",
     "@expo/vector-icons": "^14.0.0",
-    "@gorhom/bottom-sheet": "5.0.0-alpha.7",
+    "@gorhom/bottom-sheet": "5.0.6",
     "@lottiefiles/react-lottie-player": "3.5.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",

diff --git a/packages/core/src/components/BottomSheet/BottomSheet.tsx b/packages/core/src/components/BottomSheet/BottomSheet.tsx
@@ -12,6 +12,7 @@ import BottomSheetComponent, {
 } from "@gorhom/bottom-sheet";
 import { useTheme } from "@draftbit/theme";
 import { extractPercentNumber, useDeepCompareMemo } from "../../utilities";
+import { ReduceMotion } from "react-native-reanimated";
 
 type SnapPosition = "top" | "middle" | "bottom";
 
@@ -38,6 +39,7 @@ export interface BottomSheetProps extends ScrollViewProps {
   enableDynamicSizing?: boolean;
   onSettle?: (index: number) => void;
   style?: StyleProp<ViewStyle>;
+  ignoreReduceMotion?: boolean;
 }
 
 // Clarification:
@@ -61,6 +63,7 @@ const BottomSheet = React.forwardRef<BottomSheetComponent, BottomSheetProps>(
       onSettle,
       style,
       children,
+      ignoreReduceMotion = true,
       ...rest
     },
     ref
@@ -119,6 +122,9 @@ const BottomSheet = React.forwardRef<BottomSheetComponent, BottomSheetProps>(
             ? onSettle?.(mappedSnapPoints.length - index)
             : onSettle?.(mappedSnapPoints.length - index - 1)
         }
+        overrideReduceMotion={
+          ignoreReduceMotion ? ReduceMotion.Never : ReduceMotion.System
+        }
       >
         <BottomSheetScrollView
           contentContainerStyle={[styles.contentContainerStyle, style]}

diff --git a/yarn.lock b/yarn.lock
@@ -1915,10 +1915,10 @@
     fast-deep-equal "^3.1.3"
     supercluster "^7.1.3"
 
-"@gorhom/[email protected].0-alpha.7":
-  version "5.0.0-alpha.7"
-  resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-5.0.0-alpha.7.tgz#bf4e89e3f1a7e43e23d30823b60ff36c155babe5"
-  integrity sha512-3Gr97lenMOjhUeExzvo+6zimcxWt5o4dQMWZ+E7b71Huqg9in+v+CrVPHAiR7sjpzjdBXwDhKkxLAH3lFRq2+A==
+"@gorhom/[email protected].6":
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-5.0.6.tgz#f20736502399c7bcf8c73ea09e6b571dc07fe0eb"
+  integrity sha512-SI/AhPvgRfnCWN6/+wbE6TXwRE4X8F2fLyE4L/0bRwgE34Zenq585qLT139uEcfCIyovC2swC3ICqQpkmWEcFA==
   dependencies:
     "@gorhom/portal" "1.0.14"
     invariant "^2.2.4"