Merge pull request #1492 from gluestack/fix/actionsheet-dragindicatot

Fix/actionsheet drag indicator
gluestack · Dec 13, 2023 · ceb0c02 · ceb0c02
2 parents bc9ee40 + 2f04f5b
commit ceb0c02
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/unstyled/actionsheet/src/ActionsheetDragIndicator.tsx b/packages/unstyled/actionsheet/src/ActionsheetDragIndicator.tsx
@@ -6,7 +6,11 @@ function ActionsheetDragIndicator<T>(
   return forwardRef(
     ({ children, ...props }: T & { children?: any }, ref?: any) => {
       return (
-        <StyledActionsheetDragIndicator ref={ref} {...(props as T)}>
+        <StyledActionsheetDragIndicator
+          ref={ref}
+          {...(props as T)}
+          focusable={false}
+        >
           {children}
         </StyledActionsheetDragIndicator>
       );

diff --git a/packages/unstyled/actionsheet/src/index.tsx b/packages/unstyled/actionsheet/src/index.tsx
@@ -4,8 +4,8 @@ import { ActionsheetItem } from './ActionsheetItem';
 import ActionsheetBackdrop from './ActionsheetBackdrop';
 import { ActionsheetDragIndicatorWrapper } from './ActionsheetDragIndicatorWrapper';
 import type { IActionsheetComponentType } from './types';
+import ActionsheetDragIndicator from './ActionsheetDragIndicator';
 // import { ActionsheetItemText } from './ActionsheetItemText';
-// import ActionsheetDragIndicator from './ActionsheetDragIndicator';
 // import { ActionsheetScrollView } from './ActionsheetScrollView';
 // import { ActionsheetVirtualizedList } from './ActionsheetVirtualizedList';
 
@@ -63,7 +63,7 @@ export function createActionsheet<
   const Actionsheet = ActionsheetMain(Root) as any;
   Actionsheet.Backdrop = ActionsheetBackdrop(Backdrop, AnimatePresence);
   Actionsheet.Content = ActionsheetContent(Content, AnimatePresence);
-  Actionsheet.DragIndicator = DragIndicator;
+  Actionsheet.DragIndicator = ActionsheetDragIndicator(DragIndicator);
   Actionsheet.DragIndicatorWrapper =
     ActionsheetDragIndicatorWrapper(IndicatorWrapper);
   Actionsheet.Item = ActionsheetItem(Item);