Merge pull request #1412 from andrew-bierman/fix/fab

fix fab closing on native
andrew-bierman · Jan 9, 2025 · 8f1a712 · 8f1a712
2 parents b072498 + 5c27c5f
commit 8f1a712
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/packages/app/components/Fab/FabNative.tsx b/packages/app/components/Fab/FabNative.tsx
@@ -21,7 +21,14 @@ const FABNative: React.FC<FABProps> = ({
   const { currentTheme } = useTheme();
 
   return (
-    <Popover>
+    <Popover
+      open={showQuickActions}
+      onOpenChange={(open) => {
+        if (!open) {
+          closeQuickActions();
+        }
+      }}
+    >
       <Popover.Trigger asChild>
         <RButton
           style={{
@@ -37,6 +44,7 @@ const FABNative: React.FC<FABProps> = ({
             bottom: 20,
             alignSelf: 'center',
           }}
+          onPress={toggleQuickActions}
         >
           <MaterialIcons
             name="add"
@@ -63,7 +71,10 @@ const FABNative: React.FC<FABProps> = ({
           {quickActionData.map((action) => (
             <QuickActionButton
               key={action.action}
-              onPress={() => handleActionSelect(action.action)}
+              onPress={() => {
+                handleActionSelect(action.action);
+                closeQuickActions();
+              }}
               iconName={action.iconName}
               text={action.text}
             />