@instructure/ui-menu 8.22.1-snapshot.4 → 8.23.0

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [8.23.0](https://github.com/instructure/instructure-ui/compare/v8.22.0...v8.23.0) (2022-04-07)
+
+**Note:** Version bump only for package @instructure/ui-menu
+
 # [8.22.0](https://github.com/instructure/instructure-ui/compare/v8.21.0...v8.22.0) (2022-03-31)
 
 **Note:** Version bump only for package @instructure/ui-menu

package/es/Menu/index.js

@@ -69,6 +69,11 @@ let Menu = (_dec = withDeterministicId(), _dec2 = withStyle(generateStyle, gener
 
       if (typeof menuRef === 'function') {
         menuRef(el);
+      } // If there is no trigger `<ul>` is the ref, otherwise the trigger
+
+
+      if (!this.props.trigger) {
+        this.ref = el;
       }
     };
 
@@ -414,6 +419,9 @@ let Menu = (_dec = withDeterministicId(), _dec2 = withStyle(generateStyle, gener
       onMouseOver: onMouseOver,
       offsetX: offsetX,
       offsetY: offsetY,
+      elementRef: element => {
+        this.ref = element;
+      },
       ref: el => {
         this._popover = el;
 
@@ -424,7 +432,6 @@ let Menu = (_dec = withDeterministicId(), _dec2 = withStyle(generateStyle, gener
       renderTrigger: safeCloneElement(trigger, {
         ref: el => {
           this._trigger = el;
-          this.ref = (el === null || el === void 0 ? void 0 : el.ref) || el;
         },
         'aria-haspopup': true,
         id: this._labelId,

package/lib/Menu/index.js

@@ -92,6 +92,11 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
 
       if (typeof menuRef === 'function') {
         menuRef(el);
+      } // If there is no trigger `<ul>` is the ref, otherwise the trigger
+
+
+      if (!this.props.trigger) {
+        this.ref = el;
       }
     };
 
@@ -437,6 +442,9 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
       onMouseOver: onMouseOver,
       offsetX: offsetX,
       offsetY: offsetY,
+      elementRef: element => {
+        this.ref = element;
+      },
       ref: el => {
         this._popover = el;
 
@@ -447,7 +455,6 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
       renderTrigger: (0, _safeCloneElement.safeCloneElement)(trigger, {
         ref: el => {
           this._trigger = el;
-          this.ref = (el === null || el === void 0 ? void 0 : el.ref) || el;
         },
         'aria-haspopup': true,
         id: this._labelId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-menu",
-  "version": "8.22.1-snapshot.4+5809c01bc",
+  "version": "8.23.0",
   "description": "A dropdown menu component",
   "author": "Instructure, Inc. Engineering and Product Design",
   "module": "./es/index.js",
@@ -23,27 +23,27 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@instructure/ui-babel-preset": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-color-utils": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-test-locator": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-test-queries": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-test-utils": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-themes": "8.22.1-snapshot.4+5809c01bc"
+    "@instructure/ui-babel-preset": "8.23.0",
+    "@instructure/ui-color-utils": "8.23.0",
+    "@instructure/ui-test-locator": "8.23.0",
+    "@instructure/ui-test-queries": "8.23.0",
+    "@instructure/ui-test-utils": "8.23.0",
+    "@instructure/ui-themes": "8.23.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.13.10",
-    "@instructure/console": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/emotion": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/shared-types": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-a11y-utils": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-dom-utils": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-icons": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-popover": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-position": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-prop-types": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-react-utils": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-testable": "8.22.1-snapshot.4+5809c01bc",
-    "@instructure/ui-utils": "8.22.1-snapshot.4+5809c01bc",
+    "@instructure/console": "8.23.0",
+    "@instructure/emotion": "8.23.0",
+    "@instructure/shared-types": "8.23.0",
+    "@instructure/ui-a11y-utils": "8.23.0",
+    "@instructure/ui-dom-utils": "8.23.0",
+    "@instructure/ui-icons": "8.23.0",
+    "@instructure/ui-popover": "8.23.0",
+    "@instructure/ui-position": "8.23.0",
+    "@instructure/ui-prop-types": "8.23.0",
+    "@instructure/ui-react-utils": "8.23.0",
+    "@instructure/ui-testable": "8.23.0",
+    "@instructure/ui-utils": "8.23.0",
     "keycode": "^2",
     "prop-types": "^15"
   },
@@ -53,6 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "sideEffects": false,
-  "gitHead": "5809c01bc3fc6e7b468d18d44c22f364304561ed"
+  "sideEffects": false
 }

package/src/Menu/index.tsx

@@ -110,6 +110,10 @@ class Menu extends Component<MenuProps> {
     if (typeof menuRef === 'function') {
       menuRef(el)
     }
+    // If there is no trigger `<ul>` is the ref, otherwise the trigger
+    if (!this.props.trigger) {
+      this.ref = el
+    }
   }
 
   constructor(props: MenuProps) {
@@ -487,6 +491,9 @@ class Menu extends Component<MenuProps> {
         onMouseOver={onMouseOver}
         offsetX={offsetX}
         offsetY={offsetY}
+        elementRef={(element) => {
+          this.ref = element
+        }}
         ref={(el) => {
           this._popover = el
           if (typeof popoverRef === 'function') {
@@ -496,7 +503,6 @@ class Menu extends Component<MenuProps> {
         renderTrigger={safeCloneElement(trigger as ReactElement, {
           ref: (el: (React.ReactInstance & { ref?: Element }) | null) => {
             this._trigger = el
-            this.ref = el?.ref || (el as Element)
           },
           'aria-haspopup': true,
           id: this._labelId,

package/src/Menu/props.ts

@@ -55,7 +55,8 @@ type MenuOwnProps = {
    */
   children?: React.ReactNode // TODO: oneOf(['MenuItem', 'MenuItemGroup', 'MenuItemSeparator', 'Menu'])
   /**
-   * Description of the `<Menu />`
+   * Description of the `<Menu />`. The component uses it to add its value to
+   * the `aria-label` attribute.
    */
   label?: string
   /**