@spectrum-web-components/menu 0.14.2-slim.2 → 0.14.4

package/custom-elements.json

@@ -77,37 +77,6 @@
             }
           ],
           "members": [
-            {
-              "kind": "field",
-              "name": "closeSelfAsSubmenu",
-              "type": {
-                "text": "(leave?: boolean) => void"
-              },
-              "privacy": "public"
-            },
-            {
-              "kind": "method",
-              "name": "setCloseSelfAsSubmenu",
-              "privacy": "public",
-              "return": {
-                "type": {
-                  "text": "void"
-                }
-              },
-              "parameters": [
-                {
-                  "name": "cb",
-                  "type": {
-                    "text": "(leave?: boolean) => void"
-                  }
-                }
-              ]
-            },
-            {
-              "kind": "field",
-              "name": "_closeSelfAsSubmenu",
-              "default": "noop"
-            },
             {
               "kind": "field",
               "name": "isSubmenu",
@@ -117,46 +86,6 @@
               "privacy": "public",
               "default": "false"
             },
-            {
-              "kind": "field",
-              "name": "closeOpenSubmenu",
-              "type": {
-                "text": "(leave?: boolean) => void"
-              },
-              "privacy": "public"
-            },
-            {
-              "kind": "method",
-              "name": "setCloseOpenSubmenu",
-              "privacy": "public",
-              "return": {
-                "type": {
-                  "text": "void"
-                }
-              },
-              "parameters": [
-                {
-                  "name": "cb",
-                  "type": {
-                    "text": "(leave?: boolean) => void"
-                  }
-                }
-              ]
-            },
-            {
-              "kind": "field",
-              "name": "_closeOpenSubmenu",
-              "default": "noop"
-            },
-            {
-              "kind": "field",
-              "name": "hasOpenSubmenu",
-              "type": {
-                "text": "boolean"
-              },
-              "privacy": "public",
-              "default": "false"
-            },
             {
               "kind": "field",
               "name": "label",
@@ -400,24 +329,6 @@
                 }
               ]
             },
-            {
-              "kind": "method",
-              "name": "submenuWillCloseOn",
-              "privacy": "public",
-              "return": {
-                "type": {
-                  "text": "void"
-                }
-              },
-              "parameters": [
-                {
-                  "name": "menuItem",
-                  "type": {
-                    "text": "MenuItem"
-                  }
-                }
-              ]
-            },
             {
               "kind": "method",
               "name": "onClick",
@@ -699,6 +610,12 @@
                 "text": "Event"
               },
               "description": "Announces that the `value` of the element has changed"
+            },
+            {
+              "name": "close",
+              "type": {
+                "text": "Event"
+              }
             }
           ],
           "attributes": [
@@ -858,49 +775,6 @@
                 }
               }
             },
-            {
-              "kind": "field",
-              "name": "closeSelfAsSubmenu",
-              "type": {
-                "text": "(leave?: boolean) => void"
-              },
-              "privacy": "public",
-              "inheritedFrom": {
-                "name": "Menu",
-                "module": "src/Menu.ts"
-              }
-            },
-            {
-              "kind": "method",
-              "name": "setCloseSelfAsSubmenu",
-              "privacy": "public",
-              "return": {
-                "type": {
-                  "text": "void"
-                }
-              },
-              "parameters": [
-                {
-                  "name": "cb",
-                  "type": {
-                    "text": "(leave?: boolean) => void"
-                  }
-                }
-              ],
-              "inheritedFrom": {
-                "name": "Menu",
-                "module": "src/Menu.ts"
-              }
-            },
-            {
-              "kind": "field",
-              "name": "_closeSelfAsSubmenu",
-              "default": "noop",
-              "inheritedFrom": {
-                "name": "Menu",
-                "module": "src/Menu.ts"
-              }
-            },
             {
               "kind": "field",
               "name": "isSubmenu",
@@ -914,62 +788,6 @@
                 "module": "src/Menu.ts"
               }
             },
-            {
-              "kind": "field",
-              "name": "closeOpenSubmenu",
-              "type": {
-                "text": "(leave?: boolean) => void"
-              },
-              "privacy": "public",
-              "inheritedFrom": {
-                "name": "Menu",
-                "module": "src/Menu.ts"
-              }
-            },
-            {
-              "kind": "method",
-              "name": "setCloseOpenSubmenu",
-              "privacy": "public",
-              "return": {
-                "type": {
-                  "text": "void"
-                }
-              },
-              "parameters": [
-                {
-                  "name": "cb",
-                  "type": {
-                    "text": "(leave?: boolean) => void"
-                  }
-                }
-              ],
-              "inheritedFrom": {
-                "name": "Menu",
-                "module": "src/Menu.ts"
-              }
-            },
-            {
-              "kind": "field",
-              "name": "_closeOpenSubmenu",
-              "default": "noop",
-              "inheritedFrom": {
-                "name": "Menu",
-                "module": "src/Menu.ts"
-              }
-            },
-            {
-              "kind": "field",
-              "name": "hasOpenSubmenu",
-              "type": {
-                "text": "boolean"
-              },
-              "privacy": "public",
-              "default": "false",
-              "inheritedFrom": {
-                "name": "Menu",
-                "module": "src/Menu.ts"
-              }
-            },
             {
               "kind": "field",
               "name": "label",
@@ -1293,28 +1111,6 @@
                 "module": "src/Menu.ts"
               }
             },
-            {
-              "kind": "method",
-              "name": "submenuWillCloseOn",
-              "privacy": "public",
-              "return": {
-                "type": {
-                  "text": "void"
-                }
-              },
-              "parameters": [
-                {
-                  "name": "menuItem",
-                  "type": {
-                    "text": "MenuItem"
-                  }
-                }
-              ],
-              "inheritedFrom": {
-                "name": "Menu",
-                "module": "src/Menu.ts"
-              }
-            },
             {
               "kind": "method",
               "name": "onClick",
@@ -1740,6 +1536,16 @@
                 "name": "Menu",
                 "module": "src/Menu.ts"
               }
+            },
+            {
+              "name": "close",
+              "type": {
+                "text": "Event"
+              },
+              "inheritedFrom": {
+                "name": "Menu",
+                "module": "src/Menu.ts"
+              }
             }
           ]
         }
@@ -2136,11 +1942,21 @@
                 }
               }
             },
+            {
+              "kind": "method",
+              "name": "closeOverlaysForRoot",
+              "privacy": "protected",
+              "return": {
+                "type": {
+                  "text": "void"
+                }
+              }
+            },
             {
               "kind": "field",
               "name": "closeOverlay",
               "type": {
-                "text": "(leave?: boolean) => Promise<void> | undefined"
+                "text": "() => Promise<void> | undefined"
               },
               "privacy": "public"
             },
@@ -2201,16 +2017,7 @@
                 "type": {
                   "text": "Promise<void>"
                 }
-              },
-              "parameters": [
-                {
-                  "name": "{\n        immediate,\n    }",
-                  "default": "{}",
-                  "type": {
-                    "text": "{ immediate?: boolean }"
-                  }
-                }
-              ]
+              }
             },
             {
               "kind": "method",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@spectrum-web-components/menu",
-    "version": "0.14.2-slim.2+c71efb901",
+    "version": "0.14.4",
     "publishConfig": {
         "access": "public"
     },
@@ -50,22 +50,23 @@
         "lit-html"
     ],
     "dependencies": {
-        "@spectrum-web-components/action-button": "^0.8.5",
-        "@spectrum-web-components/base": "^0.5.6",
-        "@spectrum-web-components/divider": "^0.4.8",
-        "@spectrum-web-components/icon": "^0.11.8",
-        "@spectrum-web-components/icons-ui": "^0.8.8",
-        "@spectrum-web-components/overlay": "^0.16.3-slim.2+c71efb901",
-        "@spectrum-web-components/shared": "^0.14.1",
+        "@lit-labs/observers": "^1.0.1",
+        "@spectrum-web-components/action-button": "^0.9.0",
+        "@spectrum-web-components/base": "^0.5.8",
+        "@spectrum-web-components/divider": "^0.4.11",
+        "@spectrum-web-components/icon": "^0.11.11",
+        "@spectrum-web-components/icons-ui": "^0.8.11",
+        "@spectrum-web-components/overlay": "^0.16.5",
+        "@spectrum-web-components/shared": "^0.14.4",
         "tslib": "^2.0.0"
     },
     "devDependencies": {
-        "@spectrum-css/menu": "^4.0.2"
+        "@spectrum-css/menu": "^4.0.4"
     },
     "types": "./src/index.d.ts",
     "customElements": "custom-elements.json",
     "sideEffects": [
         "./sp-*.js"
     ],
-    "gitHead": "c71efb901d48037f76afdd4a1cd23f0ab07223b1"
+    "gitHead": "3be62133721efba844cd7032566a2c49ed6d9875"
 }

package/src/Menu.d.ts

@@ -22,14 +22,7 @@ export interface MenuChildItem {
  */
 export declare class Menu extends SpectrumElement {
     static get styles(): CSSResultArray;
-    get closeSelfAsSubmenu(): (leave?: boolean) => void;
-    setCloseSelfAsSubmenu(cb: (leave?: boolean) => void): void;
-    _closeSelfAsSubmenu: () => void;
     isSubmenu: boolean;
-    get closeOpenSubmenu(): (leave?: boolean) => void;
-    setCloseOpenSubmenu(cb: (leave?: boolean) => void): void;
-    _closeOpenSubmenu: () => void;
-    hasOpenSubmenu: boolean;
     label: string;
     selects: undefined | 'inherit' | 'single' | 'multiple';
     value: string;
@@ -75,7 +68,6 @@ export declare class Menu extends SpectrumElement {
     private removeChildItem;
     constructor();
     focus({ preventScroll }?: FocusOptions): void;
-    submenuWillCloseOn(menuItem: MenuItem): void;
     private onClick;
     handleFocusin(event: FocusEvent): void;
     startListeningToKeyboard(): void;

package/src/Menu.js

@@ -17,10 +17,6 @@ import menuStyles from './menu.css.js';
 function elementIsOrContains(el, isOrContains) {
     return !!isOrContains && (el === isOrContains || el.contains(isOrContains));
 }
-/* c8 ignore next 3 */
-const noop = () => {
-    return;
-};
 /**
  * Spectrum Menu Component
  * @element sp-menu
@@ -37,10 +33,7 @@ const noop = () => {
 export class Menu extends SpectrumElement {
     constructor() {
         super();
-        this._closeSelfAsSubmenu = noop;
         this.isSubmenu = false;
-        this._closeOpenSubmenu = noop;
-        this.hasOpenSubmenu = false;
         this.label = '';
         this.value = '';
         // For the multiple select case, we'll join the value strings together
@@ -68,32 +61,6 @@ export class Menu extends SpectrumElement {
     static get styles() {
         return [menuStyles];
     }
-    get closeSelfAsSubmenu() {
-        this.isSubmenu = false;
-        return this._closeSelfAsSubmenu;
-    }
-    setCloseSelfAsSubmenu(cb) {
-        if (cb === this._closeSelfAsSubmenu) {
-            this.isSubmenu = false;
-            this._closeSelfAsSubmenu = noop;
-            return;
-        }
-        this.isSubmenu = true;
-        this._closeSelfAsSubmenu = cb;
-    }
-    get closeOpenSubmenu() {
-        this.hasOpenSubmenu = false;
-        return this._closeOpenSubmenu;
-    }
-    setCloseOpenSubmenu(cb) {
-        if (cb === this._closeOpenSubmenu) {
-            this.hasOpenSubmenu = false;
-            this._closeOpenSubmenu = noop;
-            return;
-        }
-        this.hasOpenSubmenu = true;
-        this._closeOpenSubmenu = cb;
-    }
     get childItems() {
         if (!this.cachedChildItems) {
             this.cachedChildItems = this.updateCachedMenuItems();
@@ -219,10 +186,6 @@ export class Menu extends SpectrumElement {
             selectedItem.scrollIntoView({ block: 'nearest' });
         }
     }
-    submenuWillCloseOn(menuItem) {
-        this.focusedItemIndex = this.childItems.indexOf(menuItem);
-        this.focusInItemIndex = this.focusedItemIndex;
-    }
     onClick(event) {
         if (event.defaultPrevented) {
             return;
@@ -244,12 +207,6 @@ export class Menu extends SpectrumElement {
             if (target.hasSubmenu || target.open) {
                 return;
             }
-            if (this.hasOpenSubmenu) {
-                this.closeOpenSubmenu();
-            }
-            if (this.isSubmenu) {
-                this.closeSelfAsSubmenu();
-            }
             this.selectOrToggleItem(target);
         }
         else {
@@ -390,11 +347,11 @@ export class Menu extends SpectrumElement {
                 // Remove focus while opening overlay from keyboard or the visible focus
                 // will slip back to the first item in the menu.
                 this.blur();
-                lastFocusedItem.openOverlay({ immediate: true });
+                lastFocusedItem.openOverlay();
             }
         }
-        else if (this.isSubmenu && shouldCloseSelfAsSubmenu) {
-            this.closeSelfAsSubmenu(true);
+        else if (shouldCloseSelfAsSubmenu && this.isSubmenu) {
+            this.dispatchEvent(new Event('close', { bubbles: true }));
         }
     }
     handleKeydown(event) {
@@ -410,7 +367,7 @@ export class Menu extends SpectrumElement {
                 // Remove focus while opening overlay from keyboard or the visible focus
                 // will slip back to the first item in the menu.
                 this.blur();
-                lastFocusedItem.openOverlay({ immediate: true });
+                lastFocusedItem.openOverlay();
                 return;
             }
         }