Merge pull request #134 from Conor-Mack/feature/menu-refactor

Feature/menu refactor

packages/materialdesign-components/src/List/List.svelte

@@ -17,31 +17,25 @@
   export let onSelect = selectedItems => {}
 
   export let singleSelection = false
-  export let variant = "two-line"
+  export let variant = "one-line"
   export let inputElement = null
 
   let selectedItemsStore
 
   let role = "listbox"
 
-  function createOrAcceptItemStore() {
-    let store = _bb.getContext("BBMD:list:selectItemStore")
-    if (!!store) {
-      selectedItemsStore = store
-    } else {
-      selectedItemsStore = createItemsStore(() => onSelect($selectedItemsStore))
-      _bb.setContext("BBMD:list:selectItemStore", selectedItemsStore)
-    }
-  }
-
   onMount(() => {
-    createOrAcceptItemStore()
+    let ctx = getContext("BBMD:list:context")
+
+    selectedItemsStore = createItemsStore(() => onSelect($selectedItemsStore))
+    _bb.setContext("BBMD:list:selectItemStore", selectedItemsStore)
 
     _bb.setContext("BBMD:list:props", {
       inputElement,
       variant,
       singleSelection,
     })
+
     if (!!list) {
       if (!inputElement) {
         instance = new MDCList(list)

packages/materialdesign-components/src/List/ListItem.svelte

@@ -7,8 +7,6 @@
 
   const cb = new ClassBuilder("list-item")
 
-  export let onClick = item => {}
-
   let _id
   let listProps = null
 
@@ -24,6 +22,7 @@
   export let trailingIcon = ""
   export let selected = false
   export let disabled = false
+  export let dividerAfter = false
 
   let role = "option"
 
@@ -110,3 +109,6 @@
     </span>
   {/if}
 </li>
+{#if dividerAfter}
+  <li class="mdc-list-divider" role="separator" />
+{/if}

packages/materialdesign-components/src/Menu/Menu.svelte

@@ -2,8 +2,10 @@
   import { List } from "../List"
   import { MDCMenu } from "@material/menu"
   import { onMount, setContext } from "svelte"
-  export let items = []
-  export let singleSelection = true
+  import createItemsStore from "../Common/ItemStore.js"
+
+  export let onSelect = selectedItems => {}
+
   export let width = "400px"
   export let open = true
   export let useFixedPosition = false
@@ -11,10 +13,20 @@
   //{x: number, y: number}
   export let absolutePositionCoords = null
 
+  export let _bb
+
   let menu = null
+  let menuList = null
   let instance = null
+  let selectedItemsStore
 
   onMount(() => {
+    _bb.setContext("BBMD:list:context", "menu")
+    _bb.setContext("BBMD:list:props", { singleSelection: true })
+
+    selectedItemsStore = createItemsStore(() => onSelect($selectedItemsStore))
+    _bb.setContext("BBMD:list:selectItemStore", selectedItemsStore)
+
     if (!!menu) {
       instance = new MDCMenu(menu)
       instance.open = open
@@ -25,8 +37,9 @@
         instance.setAbsolutePosition(x | 0, y | 0)
       }
     }
-    setContext("BBMD:list:context", "menu")
   })
+
+  $: menuList && _bb.attachChildren(menuList)
 </script>
 
 {#if useFixedPosition || useAbsolutePosition}
@@ -34,17 +47,17 @@
     bind:this={menu}
     class="mdc-menu mdc-menu-surface"
     style={`width: ${width}`}>
-    <List {items} {singleSelection} />
+    <ul bind:this={menuList} class="mdc-list" role="menu" />
   </div>
 {:else}
   <div class="mdc-menu-surface--anchor">
-    <!-- Will automatically anchor to slotted element -->
+    <!--TODO: Will automatically anchor to slotted element. Not sure how this would be achieved with Budibase though -->
     <slot />
     <div
       bind:this={menu}
       class="mdc-menu mdc-menu-surface"
       style={`width: ${width}`}>
-      <List {items} {singleSelection} />
+      <ul bind:this={menuList} class="mdc-list" role="menu" />
     </div>
   </div>
 {/if}

packages/materialdesign-components/src/Menu/_styles.scss

@@ -1,2 +1,3 @@
+@import "@material/list/mdc-list.scss";
 @import "@material/menu-surface/mdc-menu-surface.scss";
 @import "@material/menu/mdc-menu.scss";

packages/materialdesign-components/src/Test/TestApp.svelte

@@ -14,8 +14,9 @@
     Radiobuttongroup,
     Datatable,
     CustomersIndexTable,
-    List,
     Icon,
+    Menu,
+    List,
   } = props
 
   let currentComponent
@@ -35,6 +36,7 @@
             Icon,
             Datatable,
             CustomersIndexTable,
+            Menu,
             List,
           ],
         },

packages/materialdesign-components/src/Test/props.js

@@ -119,7 +119,7 @@ export const props = {
     _component: "@budibase/materialdesign-components/List",
     variant: "two-line",
     singleSelection: false,
-    onSelect: selected => console.log(selected),
+    onSelect: selected => console.log("LIST SELECT", selected),
     _children: [
       {
         _component: "@budibase/materialdesign-components/ListItem",
@@ -146,4 +146,28 @@ export const props = {
       },
     ]
   },
+  Menu: {
+    _component: "@budibase/materialdesign-components/Menu",
+    onSelect: items => console.log("MENU SELECT", items),
+    _children: [
+      {
+        _component: "@budibase/materialdesign-components/ListItem",
+        _children: [],
+        text: "Settings",
+        value: 0,
+      },
+      {
+        _component: "@budibase/materialdesign-components/ListItem",
+        _children: [],
+        text: "Account",
+        value: 1,
+      },
+      {
+        _component: "@budibase/materialdesign-components/ListItem",
+        _children: [],
+        text: "Profile",
+        value: 2,
+      },
+    ],
+  },
 }

packages/materialdesign-components/src/index.js

@@ -17,3 +17,4 @@ export {
 export { default as indexDatatable } from "./Templates/indexDatatable"
 export { default as recordForm } from "./Templates/recordForm"
 export { List, ListItem } from "./List"
+export {Menu} from "./Menu"