Fix dismiss actions

Author: markusjwetzel

src/components/collapse/useCollapse.js

@@ -21,20 +21,28 @@ export default function useCollapse(
       identifier,
       visible,
       setVisible,
-      trigger: ({ dismiss }) => ({
-        props: {
-          onPress: () => {
-            if (dismiss) {
-              setVisible(false);
-            } else {
+      trigger: ({ dismiss }) => {
+        if (dismiss) {
+          return {
+            props: {
+              onPress: () => {
+                setVisible(false);
+              },
+            },
+          };
+        }
+
+        return {
+          props: {
+            onPress: () => {
               setVisible((value) => !value);
-            }
+            },
+            'aria-expanded': visible,
+            'aria-controls': identifier,
           },
-          'aria-expanded': visible,
-          'aria-controls': identifier,
-        },
-        classes: cx(!visible && 'collapsed'),
-      }),
+          classes: cx(!visible && 'collapsed'),
+        };
+      },
     }),
     [visible],
   );

src/components/dropdowns/useDropdown.js

@@ -33,23 +33,31 @@ export default function useDropdown(
       identifier,
       visible,
       setVisible,
-      trigger: ({ dismiss }) => ({
-        props: {
-          nativeID: identifier,
-          ref: (element) => {
-            controlRef.current = findNodeHandle(element);
-          },
-          onPress: () => {
-            if (dismiss) {
-              setVisible(false);
-            } else {
+      trigger: ({ dismiss }) => {
+        if (dismiss) {
+          return {
+            props: {
+              onPress: () => {
+                setVisible(false);
+              },
+            },
+          };
+        }
+
+        return {
+          props: {
+            nativeID: identifier,
+            ref: (element) => {
+              controlRef.current = findNodeHandle(element);
+            },
+            onPress: () => {
               setVisible((value) => !value);
-            }
+            },
+            'aria-haspopup': true,
+            'aria-expanded': visible,
           },
-          'aria-haspopup': true,
-          'aria-expanded': visible,
-        },
-      }),
+        };
+      },
       menuRef: (element) => {
         menuRef.current = findNodeHandle(element);
       },

src/components/navbar/useNavbar.js

@@ -22,21 +22,29 @@ export default function useNavbar(
       expanded,
       setExpanded,
       expand,
-      trigger: ({ dismiss }) => ({
-        props: {
-          nativeID: identifier,
-          onPress: () => {
-            if (dismiss) {
-              setExpanded(false);
-            } else {
+      trigger: ({ dismiss }) => {
+        if (dismiss) {
+          return {
+            props: {
+              onPress: () => {
+                setExpanded(false);
+              },
+            },
+          };
+        }
+
+        return {
+          props: {
+            nativeID: identifier,
+            onPress: () => {
               setExpanded((value) => !value);
-            }
+            },
+            'aria-controls': identifier,
+            'aria-expanded': expanded,
+            'aria-label': 'Toggle navigation',
           },
-          'aria-controls': identifier,
-          'aria-expanded': expanded,
-          'aria-label': 'Toggle navigation',
-        },
-      }),
+        };
+      },
     }),
     [expanded],
   );