@instructure/ui-menu 11.7.3-snapshot-7 → 11.7.3-snapshot-26

package/lib/Menu/v2/MenuItem/index.js

@@ -20,7 +20,7 @@ var _MenuContext = require("../../../utils/v1/MenuContext");
 var _styles = _interopRequireDefault(require("./styles"));
 var _props = require("./props");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-var _dec, _dec2, _class, _MenuItem;
+var _dec, _dec2, _class;
 /*
  * The MIT License (MIT)
  *
@@ -50,98 +50,17 @@ parent: Menu
 id: Menu.Item
 ---
 **/
-let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default), _dec(_class = _dec2(_class = (_MenuItem = class MenuItem extends _react.Component {
+let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default), _dec(_class = _dec2(_class = class MenuItem extends _react.Component {
+  static displayName = "MenuItem";
+  static componentId = 'Menu.Item';
+  static allowedProps = _props.allowedProps;
+  static defaultProps = {
+    type: 'button',
+    disabled: false
+  };
+  static contextType = _MenuContext.MenuContext;
   constructor(props) {
     super(props);
-    this.labelId = void 0;
-    this.ref = null;
-    this.handleRef = el => {
-      this.ref = el;
-    };
-    this.handleClick = e => {
-      const _this$props = this.props,
-        onSelect = _this$props.onSelect,
-        onClick = _this$props.onClick,
-        disabled = _this$props.disabled,
-        value = _this$props.value;
-      const selected = !this.selected;
-      if (disabled) {
-        e.preventDefault();
-        return;
-      }
-      if (typeof this.props.selected === 'undefined') {
-        this.setState({
-          selected
-        });
-      }
-      if (typeof onSelect === 'function') {
-        e.persist();
-        onSelect(e, value, selected, this);
-      }
-      if (typeof onClick === 'function') {
-        onClick(e);
-      }
-    };
-    this.handleKeyDown = e => {
-      const spaceKey = e.keyCode === _keycode.default.codes.space;
-      const enterKey = e.keyCode === _keycode.default.codes.enter;
-      if (spaceKey || enterKey) {
-        e.preventDefault();
-        e.stopPropagation();
-        if (enterKey) {
-          // handle space key on keyUp for FF
-          const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
-          refNode.click();
-        }
-      }
-    };
-    this.handleKeyUp = e => {
-      const spaceKey = e.keyCode === _keycode.default.codes.space;
-      const enterKey = e.keyCode === _keycode.default.codes.enter;
-      if (spaceKey || enterKey) {
-        e.preventDefault();
-        e.stopPropagation();
-        if (spaceKey) {
-          const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
-          refNode.click();
-        }
-      }
-    };
-    this.handleMouseOver = event => {
-      if (!this.focused) {
-        this.focus();
-      }
-      if (typeof this.props.onMouseOver === 'function') {
-        this.props.onMouseOver(event, this);
-      }
-    };
-    this.handleMouseEnter = () => {
-      this.setState({
-        isHovered: true
-      });
-    };
-    this.handleMouseLeave = () => {
-      this.setState({
-        isHovered: false
-      });
-    };
-    this.handleFocusEvent = () => {
-      this.setState({
-        isFocused: true
-      });
-    };
-    this.handleBlurEvent = () => {
-      this.setState({
-        isFocused: false
-      });
-    };
-    this.getIconColor = () => {
-      const type = this.props.type;
-      if (type === 'flyout') {
-        return 'baseColor';
-      }
-      return this.selected ? 'inverseColor' : 'baseColor';
-    };
     const state = {
       isHovered: false,
       isFocused: false
@@ -155,17 +74,20 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
   get _node() {
     return this.ref;
   }
+  labelId;
+  ref = null;
+  handleRef = el => {
+    this.ref = el;
+  };
   componentDidMount() {
-    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);
+    this.props.makeStyles?.();
     const context = this.context;
     if (context && context.registerMenuItem) {
       context.registerMenuItem(this);
     }
   }
   componentDidUpdate() {
-    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);
+    this.props.makeStyles?.();
   }
   componentWillUnmount() {
     const context = this.context;
@@ -173,6 +95,93 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       context.removeMenuItem(this);
     }
   }
+  handleClick = e => {
+    const {
+      onSelect,
+      onClick,
+      disabled,
+      value
+    } = this.props;
+    const selected = !this.selected;
+    if (disabled) {
+      e.preventDefault();
+      return;
+    }
+    if (typeof this.props.selected === 'undefined') {
+      this.setState({
+        selected
+      });
+    }
+    if (typeof onSelect === 'function') {
+      e.persist();
+      onSelect(e, value, selected, this);
+    }
+    if (typeof onClick === 'function') {
+      onClick(e);
+    }
+  };
+  handleKeyDown = e => {
+    const spaceKey = e.keyCode === _keycode.default.codes.space;
+    const enterKey = e.keyCode === _keycode.default.codes.enter;
+    if (spaceKey || enterKey) {
+      e.preventDefault();
+      e.stopPropagation();
+      if (enterKey) {
+        // handle space key on keyUp for FF
+        const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+        refNode.click();
+      }
+    }
+  };
+  handleKeyUp = e => {
+    const spaceKey = e.keyCode === _keycode.default.codes.space;
+    const enterKey = e.keyCode === _keycode.default.codes.enter;
+    if (spaceKey || enterKey) {
+      e.preventDefault();
+      e.stopPropagation();
+      if (spaceKey) {
+        const refNode = (0, _findDOMNode.findDOMNode)(this.ref);
+        refNode.click();
+      }
+    }
+  };
+  handleMouseOver = event => {
+    if (!this.focused) {
+      this.focus();
+    }
+    if (typeof this.props.onMouseOver === 'function') {
+      this.props.onMouseOver(event, this);
+    }
+  };
+  handleMouseEnter = () => {
+    this.setState({
+      isHovered: true
+    });
+  };
+  handleMouseLeave = () => {
+    this.setState({
+      isHovered: false
+    });
+  };
+  handleFocusEvent = () => {
+    this.setState({
+      isFocused: true
+    });
+  };
+  handleBlurEvent = () => {
+    this.setState({
+      isFocused: false
+    });
+  };
+  getIconColor = () => {
+    const {
+      type
+    } = this.props;
+    if (type === 'flyout') {
+      return 'baseColor';
+    }
+    return this.selected ? 'inverseColor' : 'baseColor';
+  };
   get elementType() {
     return (0, _getElementType.getElementType)(MenuItem, this.props);
   }
@@ -197,46 +206,46 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
     refNode.focus();
   }
   renderContent() {
-    var _this$props$styles, _this$props$styles2, _this$props$styles3, _this$props$styles4;
-    const _this$props4 = this.props,
-      children = _this$props4.children,
-      type = _this$props4.type,
-      renderLabelInfo = _this$props4.renderLabelInfo;
+    const {
+      children,
+      type,
+      renderLabelInfo
+    } = this.props;
     return (0, _jsxRuntime.jsxs)("span", {
       children: [(0, _jsxRuntime.jsx)("span", {
-        css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.label,
+        css: this.props.styles?.label,
         id: this.labelId,
         children: children
       }), (type === 'checkbox' || type === 'radio') && (0, _jsxRuntime.jsx)("span", {
-        css: (_this$props$styles2 = this.props.styles) === null || _this$props$styles2 === void 0 ? void 0 : _this$props$styles2.icon,
+        css: this.props.styles?.icon,
         children: this.selected && (0, _jsxRuntime.jsx)(_uiIcons.CheckInstUIIcon, {
           size: "md",
           color: this.getIconColor()
         })
       }), type === 'flyout' && (0, _jsxRuntime.jsx)("span", {
-        css: (_this$props$styles3 = this.props.styles) === null || _this$props$styles3 === void 0 ? void 0 : _this$props$styles3.icon,
+        css: this.props.styles?.icon,
         children: (0, _jsxRuntime.jsx)(_uiIcons.ChevronRightInstUIIcon, {
           size: "md",
           color: this.getIconColor()
         })
       }), renderLabelInfo && (0, _jsxRuntime.jsx)("span", {
-        css: (_this$props$styles4 = this.props.styles) === null || _this$props$styles4 === void 0 ? void 0 : _this$props$styles4.labelInfo,
+        css: this.props.styles?.labelInfo,
         children: (0, _callRenderProp.callRenderProp)(renderLabelInfo)
       })]
     });
   }
   render() {
-    var _this$props$styles5;
-    const _this$props5 = this.props,
-      disabled = _this$props5.disabled,
-      controls = _this$props5.controls,
-      onKeyDown = _this$props5.onKeyDown,
-      onKeyUp = _this$props5.onKeyUp,
-      onFocus = _this$props5.onFocus,
-      onBlur = _this$props5.onBlur,
-      type = _this$props5.type,
-      href = _this$props5.href,
-      target = _this$props5.target;
+    const {
+      disabled,
+      controls,
+      onKeyDown,
+      onKeyUp,
+      onFocus,
+      onBlur,
+      type,
+      href,
+      target
+    } = this.props;
     const props = (0, _omitProps.omitProps)(this.props, MenuItem.allowedProps);
     const ElementType = this.elementType;
     return (0, _jsxRuntime.jsx)(ElementType, {
@@ -247,14 +256,14 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       target: target,
       role: this.role,
       "aria-labelledby": this.labelId,
-      "aria-disabled": disabled ? 'true' : void 0,
+      "aria-disabled": disabled ? 'true' : undefined,
       "aria-controls": controls,
-      "aria-checked": type === 'checkbox' || type === 'radio' ? this.selected ? 'true' : 'false' : void 0,
+      "aria-checked": type === 'checkbox' || type === 'radio' ? this.selected ? 'true' : 'false' : undefined,
       onClick: this.handleClick,
       onKeyUp: (0, _createChainedFunction.createChainedFunction)(onKeyUp, this.handleKeyUp),
       onKeyDown: (0, _createChainedFunction.createChainedFunction)(onKeyDown, this.handleKeyDown),
       ref: this.handleRef,
-      css: (_this$props$styles5 = this.props.styles) === null || _this$props$styles5 === void 0 ? void 0 : _this$props$styles5.menuItem,
+      css: this.props.styles?.menuItem,
       onMouseOver: this.handleMouseOver,
       onMouseEnter: this.handleMouseEnter,
       onMouseLeave: this.handleMouseLeave,
@@ -264,8 +273,5 @@ let MenuItem = exports.MenuItem = (_dec = (0, _withDeterministicId.withDetermini
       children: this.renderContent()
     });
   }
-}, _MenuItem.displayName = "MenuItem", _MenuItem.componentId = 'Menu.Item', _MenuItem.allowedProps = _props.allowedProps, _MenuItem.defaultProps = {
-  type: 'button',
-  disabled: false
-}, _MenuItem.contextType = _MenuContext.MenuContext, _MenuItem)) || _class) || _class);
+}) || _class) || _class);
 var _default = exports.default = MenuItem;

package/lib/Menu/v2/MenuItem/styles.js

@@ -39,9 +39,11 @@ exports.default = void 0;
  * @return {Object} The final style object, which will be used in the component
  */
 const generateStyle = (componentTheme, props) => {
-  const type = props.type,
-    disabled = props.disabled,
-    selected = props.selected;
+  const {
+    type,
+    disabled,
+    selected
+  } = props;
   const isRadioOrCheckbox = type === 'checkbox' || type === 'radio';
   const flyoutIconStyles = type === 'flyout' ? {
     insetInlineStart: 'auto',

package/lib/Menu/v2/MenuItemGroup/index.js

@@ -16,7 +16,7 @@ var _MenuItem = require("../MenuItem");
 var _styles = _interopRequireDefault(require("./styles"));
 var _props = require("./props");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-var _dec, _dec2, _class, _MenuItemGroup;
+var _dec, _dec2, _class;
 /*
  * The MIT License (MIT)
  *
@@ -46,62 +46,74 @@ parent: Menu
 id: Menu.Group
 ---
 **/
-let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default), _dec(_class = _dec2(_class = (_MenuItemGroup = class MenuItemGroup extends _react.Component {
+let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.withDeterministicId)(), _dec2 = (0, _emotion.withStyle)(_styles.default), _dec(_class = _dec2(_class = class MenuItemGroup extends _react.Component {
+  static displayName = "MenuItemGroup";
+  static componentId = 'Menu.Group';
+  static allowedProps = _props.allowedProps;
+  static defaultProps = {
+    disabled: false,
+    children: null,
+    isTabbable: false,
+    allowMultiple: false,
+    defaultSelected: []
+  };
   constructor(props) {
     super(props);
-    this.ref = null;
-    this.handleRef = el => {
-      this.ref = el;
-    };
-    this.handleSelect = (e, value, selected, item) => {
-      if (this.props.disabled) {
-        e.preventDefault();
-        return;
-      }
-      if (this.props.selected) {
-        this.updateSelected(e, value, this.props.selected, selected, item);
-      } else {
-        this.setState(state => {
-          return {
-            selected: this.updateSelected(e, value, state.selected, selected, item)
-          };
-        });
-      }
-    };
-    this.updateSelected = (e, value, items, selected, item) => {
-      const allowMultiple = this.props.allowMultiple;
-      let updated = allowMultiple ? [...items] : [];
-      const location = updated.indexOf(value);
-      if (selected === true && location < 0) {
-        updated.push(value);
-      } else if (selected === false && location !== -1) {
-        updated.splice(location, 1);
-      } else if (!allowMultiple && updated.length < 1) {
-        // don't allow nothing selected if it's not allowMultiple/checkbox
-        updated = [...items];
-      }
-      if (typeof this.props.onSelect === 'function') {
-        this.props.onSelect(e, updated, selected, item);
-      }
-      return updated;
-    };
     if (typeof props.selected === 'undefined') {
       this.state = {
         selected: this.selectedFromChildren(props) || props.defaultSelected
       };
     }
   }
+  ref = null;
+  handleRef = el => {
+    this.ref = el;
+  };
   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);
+    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);
+    this.props.makeStyles?.();
   }
+  handleSelect = (e, value, selected, item) => {
+    if (this.props.disabled) {
+      e.preventDefault();
+      return;
+    }
+    if (this.props.selected) {
+      this.updateSelected(e, value, this.props.selected, selected, item);
+    } else {
+      this.setState(state => {
+        return {
+          selected: this.updateSelected(e, value, state.selected, selected, item)
+        };
+      });
+    }
+  };
+  updateSelected = (e, value, items, selected, item) => {
+    const {
+      allowMultiple
+    } = this.props;
+    let updated = allowMultiple ? [...items] : [];
+    const location = updated.indexOf(value);
+    if (selected === true && location < 0) {
+      updated.push(value);
+    } else if (selected === false && location !== -1) {
+      updated.splice(location, 1);
+    } else if (!allowMultiple && updated.length < 1) {
+      // don't allow nothing selected if it's not allowMultiple/checkbox
+      updated = [...items];
+    }
+    if (typeof this.props.onSelect === 'function') {
+      this.props.onSelect(e, updated, selected, item);
+    }
+    return updated;
+  };
   selectedFromChildren(props) {
-    const children = props.children,
-      allowMultiple = props.allowMultiple;
+    const {
+      children,
+      allowMultiple
+    } = props;
     const selected = [];
     const items = _react.Children.toArray(children).filter(child => {
       return (0, _matchComponentTypes.matchComponentTypes)(child, [_MenuItem.MenuItem]);
@@ -121,20 +133,22 @@ let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.wit
     }
   }
   renderLabel() {
-    var _this$props$styles;
-    const label = this.props.label;
+    const {
+      label
+    } = this.props;
     return (0, _hasVisibleChildren.hasVisibleChildren)(label) ? (0, _jsxRuntime.jsx)("span", {
-      css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.label,
+      css: this.props.styles?.label,
       children: label
     }) : label;
   }
   renderChildren() {
-    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 {
+      disabled,
+      controls,
+      allowMultiple,
+      isTabbable,
+      onMouseOver
+    } = this.props;
     const children = this.props.children;
     let index = -1;
     return _react.Children.map(children, child => {
@@ -159,25 +173,18 @@ let MenuItemGroup = exports.MenuItemGroup = (_dec = (0, _withDeterministicId.wit
     });
   }
   render() {
-    var _this$props$styles2, _this$props$styles3;
     const props = (0, _omitProps.omitProps)(this.props, MenuItemGroup.allowedProps);
     return (0, _jsxRuntime.jsxs)("span", {
       ...props,
-      css: (_this$props$styles2 = this.props.styles) === null || _this$props$styles2 === void 0 ? void 0 : _this$props$styles2.menuItemGroup,
+      css: this.props.styles?.menuItemGroup,
       ref: this.handleRef,
       "data-cid": "MenuItemGroup",
       children: [this.renderLabel(), (0, _jsxRuntime.jsx)("div", {
-        css: (_this$props$styles3 = this.props.styles) === null || _this$props$styles3 === void 0 ? void 0 : _this$props$styles3.items,
-        "aria-disabled": this.props.disabled ? 'true' : void 0,
+        css: this.props.styles?.items,
+        "aria-disabled": this.props.disabled ? 'true' : undefined,
         children: this.renderChildren()
       })]
     });
   }
-}, _MenuItemGroup.displayName = "MenuItemGroup", _MenuItemGroup.componentId = 'Menu.Group', _MenuItemGroup.allowedProps = _props.allowedProps, _MenuItemGroup.defaultProps = {
-  disabled: false,
-  children: null,
-  isTabbable: false,
-  allowMultiple: false,
-  defaultSelected: []
-}, _MenuItemGroup)) || _class) || _class);
+}) || _class) || _class);
 var _default = exports.default = MenuItemGroup;

package/lib/Menu/v2/MenuItemSeparator/index.js

@@ -11,7 +11,7 @@ var _omitProps = require("@instructure/ui-react-utils/lib/omitProps.js");
 var _styles = _interopRequireDefault(require("./styles"));
 var _props = require("./props");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-var _dec, _class, _MenuItemSeparator;
+var _dec, _class;
 /*
  * The MIT License (MIT)
  *
@@ -42,34 +42,31 @@ id: Menu.Separator
 ---
 @module MenuItemSeparator
 **/
-let MenuItemSeparator = exports.MenuItemSeparator = (_dec = (0, _emotion.withStyle)(_styles.default), _dec(_class = (_MenuItemSeparator = class MenuItemSeparator extends _react.Component {
-  constructor(...args) {
-    super(...args);
-    this.ref = null;
-    this.handleRef = el => {
-      this.ref = el;
-    };
-  }
+let MenuItemSeparator = exports.MenuItemSeparator = (_dec = (0, _emotion.withStyle)(_styles.default), _dec(_class = class MenuItemSeparator extends _react.Component {
+  static displayName = "MenuItemSeparator";
+  static componentId = 'Menu.Separator';
+  static allowedProps = _props.allowedProps;
+  ref = null;
+  handleRef = el => {
+    this.ref = el;
+  };
   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);
+    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);
+    this.props.makeStyles?.();
   }
   render() {
-    var _this$props$styles;
     const props = (0, _omitProps.omitProps)(this.props, MenuItemSeparator.allowedProps);
     // role="separator" would fit better here, but it causes NVDA to stop the
     // MenuItem count after it
     return (0, _jsxRuntime.jsx)("div", {
       ...props,
       role: "presentation",
-      css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.menuItemSeparator,
+      css: this.props.styles?.menuItemSeparator,
       ref: this.handleRef,
       "data-cid": "MenuItemSeparator"
     });
   }
-}, _MenuItemSeparator.displayName = "MenuItemSeparator", _MenuItemSeparator.componentId = 'Menu.Separator', _MenuItemSeparator.allowedProps = _props.allowedProps, _MenuItemSeparator)) || _class);
+}) || _class);
 var _default = exports.default = MenuItemSeparator;