@instructure/ui-menu 8.13.1-snapshot.9 → 8.14.0

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 => {
@@ -111,13 +115,13 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
     this.handleTriggerKeyDown = event => {
       if (this.props.type === 'flyout' && event.keyCode === _keycode.default.codes.right) {
         event.persist();
-        this.show();
+        this.show(event);
       }
     };
 
-    this.handleTriggerMouseOver = () => {
+    this.handleTriggerMouseOver = event => {
       if (this.props.type === 'flyout') {
-        this.show();
+        this.show(event);
       }
     };
 
@@ -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();
@@ -221,11 +225,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 +242,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 +279,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 +288,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 +306,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 +362,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 +387,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 +397,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,7 +444,8 @@ let Menu = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
       },
       renderTrigger: (0, _safeCloneElement.safeCloneElement)(trigger, {
         ref: el => {
-          this.ref = el;
+          this._trigger = el;
+          this.ref = (el === null || el === void 0 ? void 0 : el.ref) || el;
         },
         'aria-haspopup': true,
         id: this._labelId,
@@ -440,25 +457,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,

package/lib/Menu/props.js

@@ -39,144 +39,32 @@ var _Children = require("@instructure/ui-prop-types/lib/Children.js");
  * SOFTWARE.
  */
 const propTypes = {
-  /**
-   * Children of type `Menu.Item`, `Menu.Group`, `Menu.Separator`, or `Menu`
-   */
   children: _Children.Children.oneOf(['MenuItem', 'MenuItemGroup', 'MenuItemSeparator', 'Menu']),
-
-  /**
-   * Description of the `<Menu />`
-   */
   label: _propTypes.default.string,
-
-  /**
-   * Is the `<Menu />` disabled
-   */
   disabled: _propTypes.default.bool,
-
-  /**
-   * The trigger element, if the `<Menu />` is to render as a popover
-   */
   trigger: _propTypes.default.node,
-
-  /**
-   * If a trigger is supplied, where should the `<Menu />` be placed (relative to the trigger)
-   */
   placement: _PositionPropTypes.PositionPropTypes.placement,
-
-  /**
-   * Should the `<Menu />` be open for the initial render
-   */
   defaultShow: _propTypes.default.bool,
-
-  /**
-   * Is the `<Menu />` open (should be accompanied by `onToggle`)
-   */
   show: (0, _controllable.controllable)(_propTypes.default.bool, 'onToggle', 'defaultShow'),
-
-  /**
-   * Callback fired when the `<Menu />` is toggled open/closed. When used with `show`,
-   * the component will not control its own state.
-   */
   onToggle: _propTypes.default.func,
-
-  /**
-   * Callback fired when an item within the `<Menu />` is selected
-   */
   onSelect: _propTypes.default.func,
-
-  /**
-   * If a trigger is supplied, callback fired when the `<Menu />` is closed
-   */
   onDismiss: _propTypes.default.func,
-
-  /**
-   * If a trigger is supplied, callback fired when the `<Menu />` trigger is blurred
-   */
-  onBlur: _propTypes.default.func,
-
-  /**
-   * If a trigger is supplied, callback fired when the `<Menu />` trigger is focused
-   */
   onFocus: _propTypes.default.func,
-
-  /**
-   * If a trigger is supplied, callback fired onMouseOver for the `<Menu />` trigger
-   */
   onMouseOver: _propTypes.default.func,
-
-  /**
-   * Callback fired on the onKeyDown of the `<Menu />`
-   */
   onKeyDown: _propTypes.default.func,
-
-  /**
-   * Callback fired on the onKeyUp of the `<Menu />`
-   */
   onKeyUp: _propTypes.default.func,
-
-  /**
-   * A function that returns a reference to the `<Menu />`
-   */
   menuRef: _propTypes.default.func,
-
-  /**
-   * A function that returns a reference to the `<Popover />`
-   */
   popoverRef: _propTypes.default.func,
-
-  /**
-   * If a trigger is supplied, an element or a function returning an element to use as the mount node
-   * for the `<Menu />` (defaults to `document.body`)
-   */
   mountNode: _PositionPropTypes.PositionPropTypes.mountNode,
-
-  /**
-   * The parent in which to constrain the menu.
-   * One of: 'window', 'scroll-parent', 'parent', 'none', an element,
-   * or a function returning an element
-   */
   constrain: _PositionPropTypes.PositionPropTypes.constrain,
-
-  /**
-   * If a trigger is supplied, an element, function returning an element, or array of elements that will not
-   * be hidden from the screen reader when the `<Menu />` is open
-   */
-  liveRegion: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.element), _propTypes.default.element, _propTypes.default.func]),
-
-  /**
-   * If a trigger is supplied, should the `<Menu />` hide when an item is selected
-   */
   shouldHideOnSelect: _propTypes.default.bool,
-
-  /**
-   * If a trigger is supplied, should the `<Menu />` focus the trigger on after closing
-   */
   shouldFocusTriggerOnClose: _propTypes.default.bool,
-
-  /**
-   * The type of `<Menu />`
-   */
   type: _propTypes.default.oneOf(['flyout']),
   id: _propTypes.default.string,
-
-  /**
-   * Whether or not an arrow pointing to the trigger should be rendered
-   */
   withArrow: _propTypes.default.bool,
-
-  /**
-   * The horizontal offset for the positioned content.
-   * Works only if `trigger` is provided.
-   */
   offsetX: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
-
-  /**
-   * The vertical offset for the positioned content.
-   * Works only if `trigger` is provided.
-   */
   offsetY: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number])
 };
 exports.propTypes = propTypes;
-const allowedProps = ['children', 'label', 'disabled', 'trigger', 'placement', 'defaultShow', 'show', 'onToggle', 'onSelect', 'onDismiss', 'onBlur', 'onFocus', 'onMouseOver', 'onKeyDown', 'onKeyUp', 'menuRef', 'popoverRef', 'mountNode', 'constrain', 'liveRegion', 'shouldHideOnSelect', 'shouldFocusTriggerOnClose', 'type', 'id', 'withArrow', 'offsetX', 'offsetY'];
+const allowedProps = ['children', 'label', 'disabled', 'trigger', 'placement', 'defaultShow', 'show', 'onToggle', 'onSelect', 'onDismiss', 'onFocus', 'onMouseOver', 'onKeyDown', 'onKeyUp', 'menuRef', 'popoverRef', 'mountNode', 'constrain', 'shouldHideOnSelect', 'shouldFocusTriggerOnClose', 'type', 'id', 'withArrow', 'offsetX', 'offsetY'];
 exports.allowedProps = allowedProps;

package/lib/MenuContext.js

@@ -38,8 +38,8 @@ private: true
 @module MenuContext
 **/
 const MenuContext = /*#__PURE__*/(0, _react.createContext)({
-  registerMenuItem: () => {},
-  removeMenuItem: () => {}
+  registerMenuItem: _value => {},
+  removeMenuItem: _value => {}
 });
 exports.MenuContext = MenuContext;
 var _default = MenuContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-menu",
-  "version": "8.13.1-snapshot.9+f32ba918e",
+  "version": "8.14.0",
   "description": "A dropdown menu component",
   "author": "Instructure, Inc. Engineering and Product Design",
   "type": "commonjs",
@@ -24,28 +24,28 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@instructure/ui-babel-preset": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-color-utils": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-test-locator": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-test-queries": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-test-utils": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-themes": "8.13.1-snapshot.9+f32ba918e"
+    "@instructure/ui-babel-preset": "8.14.0",
+    "@instructure/ui-color-utils": "8.14.0",
+    "@instructure/ui-test-locator": "8.14.0",
+    "@instructure/ui-test-queries": "8.14.0",
+    "@instructure/ui-test-utils": "8.14.0",
+    "@instructure/ui-themes": "8.14.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.13.10",
-    "@instructure/console": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/emotion": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/shared-types": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-a11y-utils": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-dom-utils": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-icons": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-popover": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-position": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-prop-types": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-react-utils": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-testable": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/ui-utils": "8.13.1-snapshot.9+f32ba918e",
-    "@instructure/uid": "8.13.1-snapshot.9+f32ba918e",
+    "@instructure/console": "8.14.0",
+    "@instructure/emotion": "8.14.0",
+    "@instructure/shared-types": "8.14.0",
+    "@instructure/ui-a11y-utils": "8.14.0",
+    "@instructure/ui-dom-utils": "8.14.0",
+    "@instructure/ui-icons": "8.14.0",
+    "@instructure/ui-popover": "8.14.0",
+    "@instructure/ui-position": "8.14.0",
+    "@instructure/ui-prop-types": "8.14.0",
+    "@instructure/ui-react-utils": "8.14.0",
+    "@instructure/ui-testable": "8.14.0",
+    "@instructure/ui-utils": "8.14.0",
+    "@instructure/uid": "8.14.0",
     "keycode": "^2",
     "prop-types": "^15"
   },
@@ -55,6 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "sideEffects": false,
-  "gitHead": "f32ba918e4d3ce76c6ee95c856584d00a9d80958"
+  "sideEffects": false
 }

package/src/Menu/MenuItem/index.tsx

@@ -39,42 +39,38 @@ import generateStyle from './styles'
 import generateComponentTheme from './theme'
 
 import { propTypes, allowedProps } from './props'
-import type { MenuItemProps } from './props'
+import type { MenuItemProps, MenuItemState } from './props'
 
 /**
 ---
 parent: Menu
 id: Menu.Item
 ---
+@tsProps
 **/
 @withStyle(generateStyle, generateComponentTheme)
 @testable()
-class MenuItem extends Component<MenuItemProps> {
+class MenuItem extends Component<MenuItemProps, MenuItemState> {
   static readonly componentId = 'Menu.Item'
 
   static propTypes = propTypes
   static allowedProps = allowedProps
   static defaultProps = {
     type: 'button',
-    disabled: false,
-    // @ts-expect-error ts-migrate(6133) FIXME: 'e' is declared but its value is never read.
-    onSelect: function (e, value, selected, item) {}
+    disabled: false
   } as const
 
   static contextType = MenuContext
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'props' implicitly has an 'any' type.
-  constructor(props) {
-    // @ts-expect-error ts-migrate(2554) FIXME: Expected 1-2 arguments, but got 0.
-    super()
+  constructor(props: MenuItemProps) {
+    super(props)
 
     if (typeof props.selected === 'undefined') {
       this.state = {
-        selected: props.defaultSelected
+        selected: !!props.defaultSelected
       }
     }
 
-    // @ts-expect-error ts-migrate(2339) FIXME: Property 'labelId' does not exist on type 'MenuIte... Remove this comment to see the full error message
     this.labelId = uid('MenuItem__label')
   }
 
@@ -85,14 +81,16 @@ class MenuItem extends Component<MenuItemProps> {
 
     return this.ref
   }
+
+  labelId: string
   ref: Element | null = null
+
   handleRef = (el: Element | null) => {
     this.ref = el
   }
 
   componentDidMount() {
-    // @ts-expect-error ts-migrate(2722) FIXME: Cannot invoke an object which is possibly 'undefin... Remove this comment to see the full error message
-    this.props.makeStyles()
+    this.props.makeStyles?.()
     const context = this.context
 
     if (context && context.registerMenuItem) {
@@ -101,8 +99,7 @@ class MenuItem extends Component<MenuItemProps> {
   }
 
   componentDidUpdate() {
-    // @ts-expect-error ts-migrate(2722) FIXME: Cannot invoke an object which is possibly 'undefin... Remove this comment to see the full error message
-    this.props.makeStyles()
+    this.props.makeStyles?.()
   }
 
   componentWillUnmount() {
@@ -113,8 +110,7 @@ class MenuItem extends Component<MenuItemProps> {
     }
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'e' implicitly has an 'any' type.
-  handleClick = (e) => {
+  handleClick = (e: React.MouseEvent) => {
     const { onSelect, onClick, disabled, value } = this.props
     const selected = !this.selected
 
@@ -137,8 +133,7 @@ class MenuItem extends Component<MenuItemProps> {
     }
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'e' implicitly has an 'any' type.
-  handleKeyDown = (e) => {
+  handleKeyDown = (e: React.KeyboardEvent) => {
     const spaceKey = e.keyCode === keycode.codes.space
     const enterKey = e.keyCode === keycode.codes.enter
 
@@ -148,14 +143,13 @@ class MenuItem extends Component<MenuItemProps> {
 
       if (enterKey) {
         // handle space key on keyUp for FF
-        // @ts-expect-error ts-migrate(2339) FIXME: Property 'ref' does not exist on type 'MenuItem'... Remove this comment to see the full error message
-        findDOMNode(this.ref).click() // eslint-disable-line react/no-find-dom-node
+        const refNode = findDOMNode(this.ref) as HTMLElement
+        refNode.click()
       }
     }
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'e' implicitly has an 'any' type.
-  handleKeyUp = (e) => {
+  handleKeyUp = (e: React.KeyboardEvent) => {
     const spaceKey = e.keyCode === keycode.codes.space
     const enterKey = e.keyCode === keycode.codes.enter
 
@@ -164,14 +158,13 @@ class MenuItem extends Component<MenuItemProps> {
       e.stopPropagation()
 
       if (spaceKey) {
-        // @ts-expect-error ts-migrate(2339) FIXME: Property 'ref' does not exist on type 'MenuItem'... Remove this comment to see the full error message
-        findDOMNode(this.ref).click() // eslint-disable-line react/no-find-dom-node
+        const refNode = findDOMNode(this.ref) as HTMLElement
+        refNode.click()
       }
     }
   }
 
-  // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'event' implicitly has an 'any' type.
-  handleMouseOver = (event) => {
+  handleMouseOver = (event: React.MouseEvent) => {
     this.focus()
 
     if (typeof this.props.onMouseOver === 'function') {
@@ -198,8 +191,7 @@ class MenuItem extends Component<MenuItemProps> {
 
   get selected() {
     return typeof this.props.selected === 'undefined'
-      ? // @ts-expect-error ts-migrate(2339) FIXME: Property 'selected' does not exist on type 'Readon... Remove this comment to see the full error message
-        this.state.selected
+      ? this.state.selected
       : this.props.selected
   }
 
@@ -208,8 +200,8 @@ class MenuItem extends Component<MenuItemProps> {
   }
 
   focus() {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property 'ref' does not exist on type 'MenuItem'... Remove this comment to see the full error message
-    findDOMNode(this.ref).focus() // eslint-disable-line react/no-find-dom-node
+    const refNode = findDOMNode(this.ref) as HTMLElement
+    refNode.focus()
   }
 
   renderContent() {
@@ -222,7 +214,6 @@ class MenuItem extends Component<MenuItemProps> {
             {this.selected && <IconCheckSolid />}
           </span>
         )}
-        {/* @ts-expect-error ts-migrate(2339) FIXME: Property 'labelId' does not exist on type 'MenuIte... Remove this comment to see the full error message */}
         <span css={this.props.styles?.label} id={this.labelId}>
           {children}
         </span>
@@ -242,13 +233,12 @@ class MenuItem extends Component<MenuItemProps> {
     const ElementType = this.elementType
 
     return (
-      <ElementType // eslint-disable-line jsx-a11y/mouse-events-have-key-events
+      <ElementType
         // @ts-expect-error TODO: `ref` prop causes: "Expression produces a union type that is too complex to represent.ts(2590)"
         tabIndex={-1} // note: tabIndex can be overridden by Menu or MenuItemGroup components
         {...props}
         href={href}
         role={this.role}
-        // @ts-expect-error ts-migrate(2339) FIXME: Property 'labelId' does not exist on type 'MenuIte... Remove this comment to see the full error message
         aria-labelledby={this.labelId}
         aria-disabled={disabled ? 'true' : undefined}
         aria-controls={controls}