Menu Component Improvements

addon/components/menu.hbs

@@ -1,42 +1,34 @@
-<div
-  id={{this.guid}}
-  ...attributes
-  {{on 'pointerdown' this.onPointerDown}}
-  {{click-outside this.close event='mouseup'}}
->
-  {{yield
-    (hash
+{{yield
+  (hash
+    isOpen=this.isOpen
+    Button=(component
+      'menu/button'
+      buttonGuid=this.buttonGuid
+      itemsGuid=this.itemsGuid
       isOpen=this.isOpen
-      Button=(component
-        'menu/button'
-        guid=this.buttonGuid
-        menuGuid=this.guid
-        itemsGuid=this.itemsGuid
-        isOpen=this.isOpen
-        onClick=this.toggle
-        openMenu=this.open
-        closeMenu=this.close
-        goToFirstItem=this.goToFirstItem
-        goToLastItem=this.goToLastItem
-        goToNextItem=this.goToNextItem
-        goToPreviousItem=this.goToPreviousItem
-      )
-      Items=(component
-        'menu/items'
-        guid=this.itemsGuid
-        buttonGuid=this.buttonGuid
-        isOpen=this.isOpen
-        closeMenu=this.close
-        activeItem=this.activeItem
-        registerItem=this.registerItem
-        unregisterItem=this.unregisterItem
-        goToFirstItem=this.goToFirstItem
-        goToLastItem=this.goToLastItem
-        goToNextItem=this.goToNextItem
-        goToPreviousItem=this.goToPreviousItem
-        goToItem=this.goToItem
-        search=(perform this.searchTask)
-      )
+      openMenu=this.open
+      closeMenu=this.close
+      toggleMenu=this.toggle
+      goToFirstItem=this.goToFirstItem
+      goToLastItem=this.goToLastItem
+      goToNextItem=this.goToNextItem
+      goToPreviousItem=this.goToPreviousItem
     )
-  }}
-</div>
+    Items=(component
+      'menu/items'
+      buttonGuid=this.buttonGuid
+      itemsGuid=this.itemsGuid
+      isOpen=this.isOpen
+      closeMenu=this.close
+      activeItem=this.activeItem
+      registerItem=this.registerItem
+      unregisterItem=this.unregisterItem
+      goToFirstItem=this.goToFirstItem
+      goToLastItem=this.goToLastItem
+      goToNextItem=this.goToNextItem
+      goToPreviousItem=this.goToPreviousItem
+      goToItem=this.goToItem
+      search=(perform this.searchTask)
+    )
+  )
+}}

addon/components/menu.js

@@ -3,7 +3,6 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { restartableTask, timeout } from 'ember-concurrency';
 import { guidFor } from '@ember/object/internals';
-import { next } from '@ember/runloop';
 
 export default class Menu extends Component {
   guid = `${guidFor(this)}-tailwindui-menu`;
@@ -32,12 +31,7 @@ export default class Menu extends Component {
 
   @action
   close() {
-    if (this.isOpen) {
-      this.isOpen = false;
-      next(() => {
-        this.buttonElement && this.buttonElement.focus();
-      });
-    }
+    this.isOpen = false;
   }
 
   @action
@@ -124,16 +118,6 @@ export default class Menu extends Component {
     this.items = items;
   }
 
-  @action
-  onPointerDown(event) {
-    if (event.defaultPrevented) return;
-    if (!this.isOpen) return;
-
-    next(() => {
-      this.buttonElement.focus();
-    });
-  }
-
   _setActiveItem(item) {
     if (item) {
       this.activeItem = item;

addon/components/menu/button.hbs

@@ -3,9 +3,9 @@
   aria-haspopup={{true}}
   aria-controls={{@itemsGuid}}
   aria-expanded={{@isOpen}}
-  id='{{@menuGuid}}-button'
+  id={{@buttonGuid}}
   ...attributes
-  {{on 'click' @onClick}}
+  {{on 'click' @toggleMenu}}
   {{on 'keydown' this.onKeydown}}
 >
   {{yield}}

addon/components/menu/items.hbs

@@ -1,12 +1,21 @@
 {{#if @isOpen}}
   <div
-    id={{@guid}}
+    id={{@itemsGuid}}
     aria-labelledby={{@buttonGuid}}
     aria-activedescendant={{@activeItem.element.id}}
     tabindex='-1'
     role='menu'
     ...attributes
     {{on 'keydown' this.onKeydown}}
+    {{focus-trap
+      focusTrapOptions=(hash
+        allowOutsideClick=this.allowClickOutsideFocusTrap
+        clickOutsideDeactivates=this.clickOutsideFocusTrapDeactivates
+        fallbackFocus=this.menuItemsElement
+        initialFocus=this.menuItemsElement
+        onDeactivate=@closeMenu
+      )
+    }}
   >
     {{yield
       (hash

addon/components/menu/items.js

@@ -2,6 +2,10 @@ import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
 export default class Items extends Component {
+  get menuItemsElement() {
+    return document.getElementById(this.args.itemsGuid);
+  }
+
   @action
   onKeydown(event) {
     switch (event.key) {
@@ -22,4 +26,21 @@ export default class Items extends Component {
         }
     }
   }
+
+  clickInsideMenuTrigger(event) {
+    const buttonElement = document.getElementById(this.args.buttonGuid);
+
+    // The `buttonElement` could not exist if the element has been removed from the DOM
+    return buttonElement ? buttonElement.contains(event.target) : false;
+  }
+
+  @action
+  allowClickOutsideFocusTrap(event) {
+    return this.clickInsideMenuTrigger(event);
+  }
+
+  @action
+  clickOutsideFocusTrapDeactivates(event) {
+    return !this.clickInsideMenuTrigger(event);
+  }
 }

jsconfig.json

@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true
+  }
+}