@instructure/ui-menu 8.13.1-snapshot.2 → 8.13.1-snapshot.27

package/es/MenuContext.js

@@ -22,16 +22,16 @@
  * SOFTWARE.
  */
 import { createContext } from 'react';
+
 /**
 ---
 private: true
 ---
 @module MenuContext
 **/
-
 const MenuContext = /*#__PURE__*/createContext({
-  registerMenuItem: () => {},
-  removeMenuItem: () => {}
+  registerMenuItem: _value => {},
+  removeMenuItem: _value => {}
 });
 export default MenuContext;
 export { MenuContext };

package/lib/Menu/MenuItem/index.js

@@ -46,10 +46,12 @@ var _dec, _dec2, _class, _class2, _temp, _IconCheckSolid, _IconArrowOpenEndSoli;
 parent: Menu
 id: Menu.Item
 ---
+@tsProps
 **/
 let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec2 = (0, _testable.testable)(), _dec(_class = _dec2(_class = (_temp = _class2 = class MenuItem extends _react.Component {
   constructor(props) {
-    super();
+    super(props);
+    this.labelId = void 0;
     this.ref = null;
 
     this.handleRef = el => {
@@ -95,7 +97,8 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
 
         if (enterKey) {
           // handle space key on keyUp for FF
-          (0, _findDOMNode.findDOMNode)(this.ref).click(); // eslint-disable-line react/no-find-dom-node
+          const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+          refNode.click();
         }
       }
     };
@@ -109,7 +112,8 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
         e.stopPropagation();
 
         if (spaceKey) {
-          (0, _findDOMNode.findDOMNode)(this.ref).click(); // eslint-disable-line react/no-find-dom-node
+          const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+          refNode.click();
         }
       }
     };
@@ -124,7 +128,7 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
 
     if (typeof props.selected === 'undefined') {
       this.state = {
-        selected: props.defaultSelected
+        selected: !!props.defaultSelected
       };
     }
 
@@ -136,7 +140,9 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
   }
 
   componentDidMount() {
-    this.props.makeStyles();
+    var _this$props$makeStyle, _this$props2;
+
+    (_this$props$makeStyle = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props2);
     const context = this.context;
 
     if (context && context.registerMenuItem) {
@@ -145,7 +151,9 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
   }
 
   componentDidUpdate() {
-    this.props.makeStyles();
+    var _this$props$makeStyle2, _this$props3;
+
+    (_this$props$makeStyle2 = (_this$props3 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props3);
   }
 
   componentWillUnmount() {
@@ -185,15 +193,16 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
   }
 
   focus() {
-    (0, _findDOMNode.findDOMNode)(this.ref).focus(); // eslint-disable-line react/no-find-dom-node
+    const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+    refNode.focus();
   }
 
   renderContent() {
     var _this$props$styles, _this$props$styles2, _this$props$styles3;
 
-    const _this$props2 = this.props,
-          children = _this$props2.children,
-          type = _this$props2.type;
+    const _this$props4 = this.props,
+          children = _this$props4.children,
+          type = _this$props4.type;
     return (0, _emotion.jsx)("span", null, (type === 'checkbox' || type === 'radio') && (0, _emotion.jsx)("span", {
       css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.icon
     }, this.selected && (_IconCheckSolid || (_IconCheckSolid = (0, _emotion.jsx)(_IconCheckSolid2.IconCheckSolid, null)))), (0, _emotion.jsx)("span", {
@@ -207,17 +216,16 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
   render() {
     var _this$props$styles4;
 
-    const _this$props3 = this.props,
-          disabled = _this$props3.disabled,
-          controls = _this$props3.controls,
-          onKeyDown = _this$props3.onKeyDown,
-          onKeyUp = _this$props3.onKeyUp,
-          type = _this$props3.type,
-          href = _this$props3.href;
+    const _this$props5 = this.props,
+          disabled = _this$props5.disabled,
+          controls = _this$props5.controls,
+          onKeyDown = _this$props5.onKeyDown,
+          onKeyUp = _this$props5.onKeyUp,
+          type = _this$props5.type,
+          href = _this$props5.href;
     const props = (0, _omitProps.omitProps)(this.props, MenuItem.allowedProps);
     const ElementType = this.elementType;
-    return (0, _emotion.jsx)(ElementType // eslint-disable-line jsx-a11y/mouse-events-have-key-events
-    , Object.assign({
+    return (0, _emotion.jsx)(ElementType, Object.assign({
       tabIndex: -1 // note: tabIndex can be overridden by Menu or MenuItemGroup components
 
     }, props, {
@@ -238,8 +246,7 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
 
 }, _class2.displayName = "MenuItem", _class2.componentId = 'Menu.Item', _class2.propTypes = _props.propTypes, _class2.allowedProps = _props.allowedProps, _class2.defaultProps = {
   type: 'button',
-  disabled: false,
-  onSelect: function (e, value, selected, item) {}
+  disabled: false
 }, _class2.contextType = _MenuContext.MenuContext, _temp)) || _class) || _class);
 exports.MenuItem = MenuItem;
 var _default = MenuItem;

package/lib/Menu/MenuItem/props.js

@@ -35,39 +35,16 @@ var _controllable = require("@instructure/ui-prop-types/lib/controllable.js");
  * SOFTWARE.
  */
 const propTypes = {
-  /**
-   * the menu item label
-   */
   children: _propTypes.default.node.isRequired,
-
-  /**
-   * whether to set the menu item state to selected or not on initial render
-   */
   defaultSelected: _propTypes.default.bool,
-
-  /**
-   * whether the menu item is selected or not (must be accompanied by an `onSelect` prop)
-   */
   selected: (0, _controllable.controllable)(_propTypes.default.bool, 'onSelect', 'defaultSelected'),
-
-  /**
-   * when used with the `selected` prop, the component will not control its own state
-   */
   onSelect: _propTypes.default.func,
   onClick: _propTypes.default.func,
   onKeyDown: _propTypes.default.func,
   onKeyUp: _propTypes.default.func,
   onMouseOver: _propTypes.default.func,
-
-  /**
-   * the id of the element that the menu item will act upon
-   */
   controls: _propTypes.default.string,
   disabled: _propTypes.default.bool,
-
-  /**
-   * the element type to render as (will default to `<a>` if href is provided)
-   */
   as: _propTypes.default.elementType,
   // eslint-disable-line react/require-default-props
   type: _propTypes.default.oneOf(['button', 'checkbox', 'radio', 'flyout']),

package/lib/Menu/MenuItemGroup/index.js

@@ -38,10 +38,12 @@ var _dec, _dec2, _class, _class2, _temp;
 parent: Menu
 id: Menu.Group
 ---
+@tsProps
 **/
 let MenuItemGroup = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec2 = (0, _testable.testable)(), _dec(_class = _dec2(_class = (_temp = _class2 = class MenuItemGroup extends _react.Component {
   constructor(props) {
-    super();
+    super(props);
+    this._labelId = void 0;
     this.ref = null;
 
     this.handleRef = el => {
@@ -96,11 +98,15 @@ let MenuItemGroup = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.defa
   }
 
   componentDidMount() {
-    this.props.makeStyles();
+    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() {
-    this.props.makeStyles();
+    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);
   }
 
   selectedFromChildren(props) {
@@ -138,13 +144,13 @@ let MenuItemGroup = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.defa
   }
 
   renderChildren() {
-    const _this$props = this.props,
-          children = _this$props.children,
-          disabled = _this$props.disabled,
-          controls = _this$props.controls,
-          allowMultiple = _this$props.allowMultiple,
-          isTabbable = _this$props.isTabbable,
-          onMouseOver = _this$props.onMouseOver;
+    const _this$props3 = this.props,
+          disabled = _this$props3.disabled,
+          controls = _this$props3.controls,
+          allowMultiple = _this$props3.allowMultiple,
+          isTabbable = _this$props3.isTabbable,
+          onMouseOver = _this$props3.onMouseOver;
+    const children = this.props.children;
     let index = -1;
     return _react.Children.map(children, child => {
       if ((0, _matchComponentTypes.matchComponentTypes)(child, [_MenuItem.MenuItem])) {
@@ -192,9 +198,7 @@ let MenuItemGroup = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.defa
   children: null,
   isTabbable: false,
   allowMultiple: false,
-  defaultSelected: [],
-  itemRef: function (item) {},
-  onSelect: function (e, value, selected, item) {}
+  defaultSelected: []
 }, _temp)) || _class) || _class);
 exports.MenuItemGroup = MenuItemGroup;
 var _default = MenuItemGroup;

package/lib/Menu/MenuItemGroup/props.js

@@ -43,45 +43,16 @@ var _MenuItemSeparator = require("../MenuItemSeparator");
 const propTypes = {
   label: _propTypes.default.node.isRequired,
   allowMultiple: _propTypes.default.bool,
-
-  /**
-   * children of type `Menu.Item`, `Menu.Separator`
-   */
   children: _Children.Children.oneOf([_MenuItem.MenuItem, _MenuItemSeparator.MenuItemSeparator]),
-
-  /**
-   * an array of the values (or indices by default) for the selected items
-   */
   selected: (0, _controllable.controllable)(_propTypes.default.array, 'onSelect', 'defaultSelected'),
-
-  /**
-   * an array of the values (or indices by default) for the selected items on initial render
-   */
   defaultSelected: _propTypes.default.array,
-
-  /**
-   * call this function when a menu item is selected
-   */
   onSelect: _propTypes.default.func,
   onMouseOver: _propTypes.default.func,
-  onKeyDown: _propTypes.default.func,
-
-  /**
-   * the id of the element that the menu items will act upon
-   */
   controls: _propTypes.default.string,
-
-  /**
-   * returns a reference to the `MenuItem`
-   */
   itemRef: _propTypes.default.func,
   disabled: _propTypes.default.bool,
-
-  /**
-   * should the group appear in the tab order (the first item will have a tabIndex of 0)
-   */
   isTabbable: _propTypes.default.bool
 };
 exports.propTypes = propTypes;
-const allowedProps = ['label', 'allowMultiple', 'children', 'selected', 'defaultSelected', 'onSelect', 'onMouseOver', 'onKeyDown', 'controls', 'itemRef', 'disabled', 'isTabbable'];
+const allowedProps = ['label', 'allowMultiple', 'children', 'selected', 'defaultSelected', 'onSelect', 'onMouseOver', 'controls', 'itemRef', 'disabled', 'isTabbable'];
 exports.allowedProps = allowedProps;

package/lib/Menu/MenuItemSeparator/index.js

@@ -41,11 +41,15 @@ let MenuItemSeparator = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.
   }
 
   componentDidMount() {
-    this.props.makeStyles();
+    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() {
-    this.props.makeStyles();
+    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);
   }
 
   render() {

package/lib/Menu/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
@@ -26,7 +28,7 @@ Object.defineProperty(exports, "MenuItemSeparator", {
 });
 exports.default = void 0;
 
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 
 var _keycode = _interopRequireDefault(require("keycode"));
 
@@ -66,6 +68,7 @@ var _dec, _dec2, _class, _class2, _temp;
 ---
 category: components
 ---
+@tsProps
 **/
 let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec2 = (0, _testable.testable)(), _dec(_class = _dec2(_class = (_temp = _class2 = class Menu extends _react.Component {
   constructor(props) {
@@ -79,7 +82,8 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
     this._trigger = null;
     this._menu = null;
     this._labelId = (0, _uid.uid)('Menu__label');
-    this._activeSubMenu = null;
+    this._activeSubMenu = void 0;
+    this._id = void 0;
     this.ref = null;
 
     this.handleRef = el => {
@@ -132,10 +136,10 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
       const _keycode$codes = _keycode.default.codes,
             down = _keycode$codes.down,
             up = _keycode$codes.up,
-            pgup = _keycode$codes.pgup,
-            pgdn = _keycode$codes.pgdn,
             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();
@@ -213,6 +217,7 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
 
     this.show = event => {
       if (this._popover) {
+        //TODO make events consistents
         this._popover.show(event);
       }
     };
@@ -221,11 +226,15 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
   }
 
   componentDidMount() {
-    this.props.makeStyles();
+    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(prevProps) {
-    this.props.makeStyles();
+  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() {
@@ -234,11 +243,15 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
 
   focus() {
     if (this.shown) {
-      (0, _console.logError)(this._menu && this._menu.focus, '[Menu] Could not focus the menu.');
+      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 {
-      (0, _console.logError)(this._trigger && this._trigger.focus, '[Menu] Could not focus the trigger.');
+      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();
     }
@@ -267,7 +280,7 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
 
     const current = this.focusedIndex < 0 && step < 0 ? 0 : this.focusedIndex;
     const nextItem = this.menuItems[(current + count + step) % count];
-    (0, _console.logError)(nextItem && nextItem.focus, '[Menu] Could not focus next menu item.');
+    (0, _console.logError)(typeof nextItem !== 'undefined' && typeof nextItem.focus !== 'undefined', '[Menu] Could not focus next menu item.');
     nextItem.focus();
   }
 
@@ -276,9 +289,9 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
   }
 
   renderChildren() {
-    const _this$props = this.props,
-          children = _this$props.children,
-          disabled = _this$props.disabled;
+    const _this$props3 = this.props,
+          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'])) {
@@ -294,8 +307,8 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
         }, child);
       }
 
-      const controls = child.props['aria-controls'] || child.props.controls || this.props['aria-controls'] || // eslint-disable-line react/prop-types
-      this.props.controls; // eslint-disable-line react/prop-types
+      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", {
@@ -350,21 +363,21 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
           }, child.props.title || child.props.label)
         }));
       }
+
+      return;
     });
   }
 
   renderMenu() {
     var _this$props$styles;
 
-    const _this$props2 = this.props,
-          disabled = _this$props2.disabled,
-          label = _this$props2.label,
-          trigger = _this$props2.trigger,
-          onKeyUp = _this$props2.onKeyUp;
-    const labelledBy = this.props['aria-labelledby']; // eslint-disable-line react/prop-types
-
-    const controls = this.props['aria-controls']; // eslint-disable-line react/prop-types
-
+    const _this$props4 = this.props,
+          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, {
       value: {
         removeMenuItem: this.removeMenuItem,
@@ -375,7 +388,7 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
       "aria-label": label,
       tabIndex: 0,
       css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.menu,
-      "aria-labelledby": labelledBy || trigger && this._labelId,
+      "aria-labelledby": labelledBy || (trigger ? this._labelId : void 0),
       "aria-controls": controls,
       "aria-disabled": disabled ? 'true' : void 0,
       onKeyDown: this.handleMenuKeyDown,
@@ -385,26 +398,30 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
   }
 
   render() {
-    const _this$props3 = this.props,
-          show = _this$props3.show,
-          defaultShow = _this$props3.defaultShow,
-          placement = _this$props3.placement,
-          withArrow = _this$props3.withArrow,
-          trigger = _this$props3.trigger,
-          mountNode = _this$props3.mountNode,
-          popoverRef = _this$props3.popoverRef,
-          disabled = _this$props3.disabled,
-          onDismiss = _this$props3.onDismiss,
-          onFocus = _this$props3.onFocus,
-          onMouseOver = _this$props3.onMouseOver,
-          offsetX = _this$props3.offsetX,
-          offsetY = _this$props3.offsetY;
+    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,
+          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;
-        onDismiss(event, documentClick);
+
+        if (typeof onDismiss === 'function') {
+          onDismiss(event, documentClick);
+        }
+
         this.handleToggle(false);
       },
       onShowContent: () => this.handleToggle(true),
@@ -428,6 +445,7 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
       },
       renderTrigger: (0, _safeCloneElement.safeCloneElement)(trigger, {
         ref: el => {
+          this._trigger = el;
           this.ref = el;
         },
         'aria-haspopup': true,
@@ -440,25 +458,13 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
   }
 
 }, _class2.displayName = "Menu", _class2.componentId = 'Menu', _class2.propTypes = _props.propTypes, _class2.allowedProps = _props.allowedProps, _class2.defaultProps = {
-  children: null,
   label: null,
   disabled: false,
   trigger: null,
   placement: 'bottom center',
   defaultShow: false,
-  onToggle: (shown, menu) => {},
-  onSelect: (event, value, selected, item) => {},
-  onDismiss: (event, documentClick) => {},
-  onBlur: event => {},
-  onFocus: event => {},
-  onMouseOver: event => {},
-  onKeyDown: event => {},
-  onKeyUp: event => {},
-  menuRef: el => {},
-  popoverRef: el => {},
   mountNode: null,
   constrain: 'window',
-  liveRegion: null,
   shouldHideOnSelect: true,
   shouldFocusTriggerOnClose: true,
   withArrow: true,