feat(#9): update menu (#128)

Realityloop · Nov 9, 2023 · 810b819 · 810b819
1 parent c692a00
commit 810b819
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
@@ -35,7 +35,7 @@ export default {
     },
     type: {
       type: String,
-      default: 'collapsible'
+      default: undefined
     }
   }
 }

diff --git a/src/components/MenuItem.vue b/src/components/MenuItem.vue
@@ -26,23 +26,24 @@
 
     <!-- Children - Collapsible -->
     <div
-      v-if="isCollapsible && hasChildren"
+      v-if="!isFlyout && hasChildren"
       class="ct-menu__sub-menu__wrapper"
       :class="{
         [`ct-menu__sub-menu__wrapper--level-${level + 1}`]: true,
       }"
-      data-collapsible-panel
-      data-collapsible-trigger-no-icon
+      :data-collapsible-panel="isCollapsible"
+      :data-collapsible-trigger-no-icon="isCollapsible"
     >
       <CTMenu
         class="ct-menu__sub-menu"
         :level="level + 1"
         :items="item.children"
+        :theme="theme"
       />
     </div>
 
     <!-- Children - Flyout -->
-    <CTFlyout v-if="isFlyout && hasChildren">
+    <CTFlyout v-else-if="isFlyout && hasChildren">
       <template #open-button>
         <CTButton
           class="ct-mobile-navigation__open-subsection-trigger"
@@ -73,6 +74,7 @@
           :items="item.children"
           :level="level + 1"
           type="flyout"
+          :theme="theme"
         />
       </div>
     </CTFlyout>
@@ -96,7 +98,7 @@ export default {
     },
     type: {
       type: String,
-      default: 'collapsible'
+      default: undefined
     }
   },
 

diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue
@@ -12,6 +12,7 @@
           class="ct-navigation__menu"
           :theme="theme"
           :items="items"
+          :type="type"
         />
       </slot>
     </div>
@@ -40,7 +41,9 @@ export default {
   },
 
   computed: {
-    dropdownClass: ({ dropdown }) => `ct-navigation--${dropdown}`
+    dropdownClass: ({ dropdown }) => `ct-navigation--${dropdown}`,
+
+    type: ({ dropdown }) => dropdown === 'dropdown' ? 'collapsible' : undefined,
   }
 }
 </script>
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ export default { @@
         },
         type: {
           type: String,
-          default: 'collapsible'
+          default: undefined
         }
       }
     }
@@ Expand Down @@