@instructure/ui-menu 8.33.1 → 8.33.2

package/lib/Menu/index.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -27,43 +25,24 @@ Object.defineProperty(exports, "MenuItemSeparator", {
   }
 });
 exports.default = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _keycode = _interopRequireDefault(require("keycode"));
-
 var _Popover = require("@instructure/ui-popover/lib/Popover");
-
 var _safeCloneElement = require("@instructure/ui-react-utils/lib/safeCloneElement.js");
-
 var _matchComponentTypes = require("@instructure/ui-react-utils/lib/matchComponentTypes.js");
-
 var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
-
 var _console = require("@instructure/console");
-
 var _containsActiveElement = require("@instructure/ui-dom-utils/lib/containsActiveElement.js");
-
 var _testable = require("@instructure/ui-testable/lib/testable.js");
-
 var _MenuContext = require("../MenuContext");
-
 var _MenuItem = require("./MenuItem");
-
 var _MenuItemGroup = require("./MenuItemGroup");
-
 var _MenuItemSeparator = require("./MenuItemSeparator");
-
 var _emotion = require("@instructure/emotion");
-
 var _styles = _interopRequireDefault(require("./styles"));
-
 var _theme = _interopRequireDefault(require("./theme"));
-
 var _props = require("./props");
-
 var _dec, _dec2, _dec3, _class, _class2;
-
 /**
 ---
 category: components
@@ -85,67 +64,55 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
     this._activeSubMenu = void 0;
     this._id = void 0;
     this.ref = null;
-
     this.handleRef = el => {
       const menuRef = this.props.menuRef;
       this._menu = el;
-
       if (typeof menuRef === 'function') {
         menuRef(el);
-      } // If there is no trigger `<ul>` is the ref, otherwise the trigger
-
-
+      }
+      // If there is no trigger `<ul>` is the ref, otherwise the trigger
       if (!this.props.trigger) {
         this.ref = el;
       }
     };
-
     this.registerMenuItem = item => {
       this._menuItems.push(item);
     };
-
     this.removeMenuItem = item => {
       const index = this.getMenuItemIndex(item);
       (0, _console.logError)(index >= 0, '[Menu] Could not find registered menu item.');
-
       if (index >= 0) {
         this._menuItems.splice(index, 1);
       }
     };
-
     this.getMenuItemIndex = item => {
       return this._menuItems.findIndex(i => i === item);
     };
-
     this.handleTriggerKeyDown = event => {
       if (this.props.type === 'flyout' && event.keyCode === _keycode.default.codes.right) {
         event.persist();
         this.show(event);
       }
     };
-
     this.handleTriggerMouseOver = event => {
       if (this.props.type === 'flyout') {
         this.show(event);
       }
     };
-
     this.handleToggle = shown => {
       if (typeof this.props.onToggle === 'function') {
         this.props.onToggle(shown, this);
       }
     };
-
     this.handleMenuKeyDown = event => {
       const key = event && event.keyCode;
       const _keycode$codes = _keycode.default.codes,
-            down = _keycode$codes.down,
-            up = _keycode$codes.up,
-            tab = _keycode$codes.tab,
-            left = _keycode$codes.left;
+        down = _keycode$codes.down,
+        up = _keycode$codes.up,
+        tab = _keycode$codes.tab,
+        left = _keycode$codes.left;
       const pgdn = _keycode.default.codes['page down'];
       const pgup = _keycode.default.codes['page up'];
-
       if (key === down || key === pgdn) {
         event.preventDefault();
         event.stopPropagation();
@@ -160,107 +127,83 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
         event.persist();
         this.hide(event);
       }
-
       if (typeof this.props.onKeyDown === 'function') {
         this.props.onKeyDown(event);
       }
     };
-
     this.handleMenuItemSelect = (event, value, selected, item) => {
       if (this.props.shouldHideOnSelect) {
         this.hide(event);
       }
-
       if (typeof this.props.onSelect === 'function') {
         this.props.onSelect(event, value, selected, item);
       }
     };
-
     this.handleMenuItemFocus = () => {
       this.setState({
         hasFocus: true
       });
     };
-
     this.handleMenuItemBlur = () => {
       this.setState({
         hasFocus: this.focusedIndex >= 0
       });
     };
-
     this.handleMenuItemMouseOver = (event, menuItem) => {
       if (this._activeSubMenu && menuItem !== this._activeSubMenu._trigger) {
         this.hideActiveSubMenu(event);
       }
     };
-
     this.hideActiveSubMenu = event => {
       if (this._activeSubMenu) {
         this._activeSubMenu.hide(event);
-
         this._activeSubMenu = null;
       }
     };
-
     this.handleSubMenuToggle = (shown, subMenu) => {
       if (shown) {
         this._activeSubMenu = subMenu;
       }
     };
-
     this.handleSubMenuDismiss = (event, documentClick) => {
       if (event && event.keyCode === _keycode.default.codes.tab || documentClick) {
         this.hide(event);
       }
     };
-
     this.hide = event => {
       if (this._popover) {
         this._popover.hide(event);
       }
     };
-
     this.show = event => {
       if (this._popover) {
         this._popover.show(event);
       }
     };
-
     this._id = this.props.id || props.deterministicId();
   }
-
   componentDidMount() {
     var _this$props$makeStyle, _this$props;
-
     (_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props);
   }
-
   componentDidUpdate() {
     var _this$props$makeStyle2, _this$props2;
-
     (_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2);
   }
-
   get menuItems() {
     return this._menuItems;
   }
-
   focus() {
     if (this.shown) {
       var _this$_menu;
-
       (0, _console.logError)(!!((_this$_menu = this._menu) !== null && _this$_menu !== void 0 && _this$_menu.focus), '[Menu] Could not focus the menu.');
-
       this._menu.focus();
     } else {
       var _this$_trigger;
-
       (0, _console.logError)(!!((_this$_trigger = this._trigger) !== null && _this$_trigger !== void 0 && _this$_trigger.focus), '[Menu] Could not focus the trigger.');
-
       this._trigger.focus();
     }
   }
-
   focused() {
     if (this.shown) {
       return (0, _containsActiveElement.containsActiveElement)(this._menu) || this.state.hasFocus;
@@ -268,52 +211,42 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
       return (0, _containsActiveElement.containsActiveElement)(this._trigger);
     }
   }
-
   get focusedIndex() {
     return this.menuItems.findIndex(item => {
       return item && item.focused === true;
     });
   }
-
   moveFocus(step) {
     const count = this.menuItems ? this.menuItems.length : 0;
-
     if (count <= 0) {
       return;
     }
-
     const current = this.focusedIndex < 0 && step < 0 ? 0 : this.focusedIndex;
     const nextItem = this.menuItems[(current + count + step) % count];
     (0, _console.logError)(typeof nextItem !== 'undefined' && typeof nextItem.focus !== 'undefined', '[Menu] Could not focus next menu item.');
     nextItem.focus();
   }
-
   get shown() {
     return this._popover ? this._popover.shown : true;
   }
-
   renderChildren() {
     const _this$props3 = this.props,
-          children = _this$props3.children,
-          disabled = _this$props3.disabled;
+      children = _this$props3.children,
+      disabled = _this$props3.disabled;
     let count = 0;
     return _react.Children.map(children, child => {
       if (!(0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItemSeparator', 'MenuItem', 'MenuItemGroup', 'Menu'])) {
         return;
       }
-
       count += 1;
       const isTabbable = !this.state.hasFocus && count === 1;
-
       if ((0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItemSeparator'])) {
         return (0, _emotion.jsx)("li", {
           role: "none"
         }, child);
       }
-
       const menuItemChild = child;
       const controls = menuItemChild.props['aria-controls'] || menuItemChild.props.controls || this.props['aria-controls'] || this.props.controls;
-
       if ((0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItem'])) {
         return (0, _emotion.jsx)("li", {
           role: "none"
@@ -328,7 +261,6 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
           tabIndex: isTabbable ? 0 : -1
         }));
       }
-
       if ((0, _matchComponentTypes.matchComponentTypes)(child, ['MenuItemGroup'])) {
         return (0, _emotion.jsx)("li", {
           role: "none"
@@ -343,7 +275,6 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
           isTabbable
         }));
       }
-
       if ((0, _matchComponentTypes.matchComponentTypes)(child, ['Menu'])) {
         const submenuDisabled = disabled || child.props.disabled;
         return (0, _emotion.jsx)("li", {
@@ -369,19 +300,16 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
           }, child.props.title || child.props.label)
         }));
       }
-
       return;
     });
   }
-
   renderMenu() {
     var _this$props$styles;
-
     const _this$props4 = this.props,
-          disabled = _this$props4.disabled,
-          label = _this$props4.label,
-          trigger = _this$props4.trigger,
-          onKeyUp = _this$props4.onKeyUp;
+      disabled = _this$props4.disabled,
+      label = _this$props4.label,
+      trigger = _this$props4.trigger,
+      onKeyUp = _this$props4.onKeyUp;
     const labelledBy = this.props['aria-labelledby'];
     const controls = this.props['aria-controls'];
     return (0, _emotion.jsx)(_MenuContext.MenuContext.Provider, {
@@ -402,33 +330,30 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
       ref: this.handleRef
     }, this.renderChildren()));
   }
-
   render() {
     const _this$props5 = this.props,
-          show = _this$props5.show,
-          defaultShow = _this$props5.defaultShow,
-          placement = _this$props5.placement,
-          withArrow = _this$props5.withArrow,
-          trigger = _this$props5.trigger,
-          mountNode = _this$props5.mountNode,
-          popoverRef = _this$props5.popoverRef,
-          disabled = _this$props5.disabled,
-          onDismiss = _this$props5.onDismiss,
-          onFocus = _this$props5.onFocus,
-          onMouseOver = _this$props5.onMouseOver,
-          positionContainerDisplay = _this$props5.positionContainerDisplay,
-          offsetX = _this$props5.offsetX,
-          offsetY = _this$props5.offsetY;
+      show = _this$props5.show,
+      defaultShow = _this$props5.defaultShow,
+      placement = _this$props5.placement,
+      withArrow = _this$props5.withArrow,
+      trigger = _this$props5.trigger,
+      mountNode = _this$props5.mountNode,
+      popoverRef = _this$props5.popoverRef,
+      disabled = _this$props5.disabled,
+      onDismiss = _this$props5.onDismiss,
+      onFocus = _this$props5.onFocus,
+      onMouseOver = _this$props5.onMouseOver,
+      positionContainerDisplay = _this$props5.positionContainerDisplay,
+      offsetX = _this$props5.offsetX,
+      offsetY = _this$props5.offsetY;
     return trigger ? (0, _emotion.jsx)(_Popover.Popover, {
       isShowingContent: show,
       defaultIsShowingContent: defaultShow,
       onHideContent: (event, _ref) => {
         let documentClick = _ref.documentClick;
-
         if (typeof onDismiss === 'function') {
           onDismiss(event, documentClick);
         }
-
         this.handleToggle(false);
       },
       onShowContent: () => this.handleToggle(true),
@@ -449,7 +374,6 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
       },
       ref: el => {
         this._popover = el;
-
         if (typeof popoverRef === 'function') {
           popoverRef(el);
         }
@@ -466,7 +390,6 @@ let Menu = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0,
       })
     }, this.renderMenu()) : this.renderMenu();
   }
-
 }, _class2.displayName = "Menu", _class2.componentId = 'Menu', _class2.propTypes = _props.propTypes, _class2.allowedProps = _props.allowedProps, _class2.defaultProps = {
   label: null,
   disabled: false,

package/lib/Menu/locator.js

@@ -22,9 +22,7 @@ Object.defineProperty(exports, "MenuLocator", {
   }
 });
 exports.default = void 0;
-
 var _MenuLocator = require("./MenuLocator");
-
 /*
  * The MIT License (MIT)
  *

package/lib/Menu/props.js

@@ -1,20 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.propTypes = exports.allowedProps = void 0;
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _PositionPropTypes = require("@instructure/ui-position/lib/PositionPropTypes.js");
-
 var _controllable = require("@instructure/ui-prop-types/lib/controllable.js");
-
 var _Children = require("@instructure/ui-prop-types/lib/Children.js");
-
 /*
  * The MIT License (MIT)
  *
@@ -38,6 +32,7 @@ var _Children = require("@instructure/ui-prop-types/lib/Children.js");
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 const propTypes = {
   children: _Children.Children.oneOf(['MenuItem', 'MenuItemGroup', 'MenuItemSeparator', 'Menu']),
   label: _propTypes.default.string,

package/lib/Menu/styles.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 /*
  * The MIT License (MIT)
  *
@@ -74,6 +73,5 @@ const generateStyle = componentTheme => {
     }
   };
 };
-
 var _default = generateStyle;
 exports.default = _default;

package/lib/Menu/theme.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 /*
  * The MIT License (MIT)
  *
@@ -36,8 +35,8 @@ exports.default = void 0;
  */
 const generateComponentTheme = theme => {
   const colors = theme.colors,
-        breakpoints = theme.breakpoints,
-        borders = theme.borders;
+    breakpoints = theme.breakpoints,
+    borders = theme.borders;
   const componentVariables = {
     minWidth: breakpoints === null || breakpoints === void 0 ? void 0 : breakpoints.xxSmall,
     maxWidth: breakpoints === null || breakpoints === void 0 ? void 0 : breakpoints.xSmall,
@@ -47,9 +46,9 @@ const generateComponentTheme = theme => {
     focusBorderColor: colors === null || colors === void 0 ? void 0 : colors.borderBrand,
     focusBorderRadius: borders === null || borders === void 0 ? void 0 : borders.radiusMedium
   };
-  return { ...componentVariables
+  return {
+    ...componentVariables
   };
 };
-
 var _default = generateComponentTheme;
 exports.default = _default;

package/lib/MenuContext.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.MenuContext = void 0;
-
 var _react = require("react");
-
 /*
  * The MIT License (MIT)
  *

package/lib/index.js

@@ -27,5 +27,4 @@ Object.defineProperty(exports, "MenuItemSeparator", {
     return _Menu.MenuItemSeparator;
   }
 });
-
 var _Menu = require("./Menu");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-menu",
-  "version": "8.33.1",
+  "version": "8.33.2",
   "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.33.1",
-    "@instructure/ui-color-utils": "8.33.1",
-    "@instructure/ui-test-locator": "8.33.1",
-    "@instructure/ui-test-queries": "8.33.1",
-    "@instructure/ui-test-utils": "8.33.1",
-    "@instructure/ui-themes": "8.33.1"
+    "@instructure/ui-babel-preset": "8.33.2",
+    "@instructure/ui-color-utils": "8.33.2",
+    "@instructure/ui-test-locator": "8.33.2",
+    "@instructure/ui-test-queries": "8.33.2",
+    "@instructure/ui-test-utils": "8.33.2",
+    "@instructure/ui-themes": "8.33.2"
   },
   "dependencies": {
     "@babel/runtime": "^7.13.10",
-    "@instructure/console": "8.33.1",
-    "@instructure/emotion": "8.33.1",
-    "@instructure/shared-types": "8.33.1",
-    "@instructure/ui-a11y-utils": "8.33.1",
-    "@instructure/ui-dom-utils": "8.33.1",
-    "@instructure/ui-icons": "8.33.1",
-    "@instructure/ui-popover": "8.33.1",
-    "@instructure/ui-position": "8.33.1",
-    "@instructure/ui-prop-types": "8.33.1",
-    "@instructure/ui-react-utils": "8.33.1",
-    "@instructure/ui-testable": "8.33.1",
-    "@instructure/ui-utils": "8.33.1",
+    "@instructure/console": "8.33.2",
+    "@instructure/emotion": "8.33.2",
+    "@instructure/shared-types": "8.33.2",
+    "@instructure/ui-a11y-utils": "8.33.2",
+    "@instructure/ui-dom-utils": "8.33.2",
+    "@instructure/ui-icons": "8.33.2",
+    "@instructure/ui-popover": "8.33.2",
+    "@instructure/ui-position": "8.33.2",
+    "@instructure/ui-prop-types": "8.33.2",
+    "@instructure/ui-react-utils": "8.33.2",
+    "@instructure/ui-testable": "8.33.2",
+    "@instructure/ui-utils": "8.33.2",
     "keycode": "^2",
     "prop-types": "^15"
   },