@instructure/ui-menu 8.11.2-snapshot.15 → 8.11.2-snapshot.23

package/es/Menu/MenuItem/index.js

@@ -49,11 +49,9 @@ let MenuItem = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 =
   constructor(props) {
     super();
     this.ref = null;
-    this._node = null;
 
     this.handleRef = el => {
       this.ref = el;
-      this._node = el;
     };
 
     this.handleClick = e => {
@@ -95,7 +93,7 @@ let MenuItem = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 =
 
         if (enterKey) {
           // handle space key on keyUp for FF
-          findDOMNode(this._node).click(); // eslint-disable-line react/no-find-dom-node
+          findDOMNode(this.ref).click(); // eslint-disable-line react/no-find-dom-node
         }
       }
     };
@@ -109,7 +107,7 @@ let MenuItem = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 =
         e.stopPropagation();
 
         if (spaceKey) {
-          findDOMNode(this._node).click(); // eslint-disable-line react/no-find-dom-node
+          findDOMNode(this.ref).click(); // eslint-disable-line react/no-find-dom-node
         }
       }
     };
@@ -131,6 +129,10 @@ let MenuItem = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 =
     this.labelId = uid('MenuItem__label');
   }
 
+  get _node() {
+    return this.ref;
+  }
+
   componentDidMount() {
     this.props.makeStyles();
     const context = this.context;
@@ -177,11 +179,11 @@ let MenuItem = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 =
   }
 
   get focused() {
-    return isActiveElement(this._node);
+    return isActiveElement(this.ref);
   }
 
   focus() {
-    findDOMNode(this._node).focus(); // eslint-disable-line react/no-find-dom-node
+    findDOMNode(this.ref).focus(); // eslint-disable-line react/no-find-dom-node
   }
 
   renderContent() {

package/es/Menu/index.js

@@ -409,7 +409,6 @@ let Menu = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 = tes
       },
       renderTrigger: safeCloneElement(trigger, {
         ref: el => {
-          this._trigger = el;
           this.ref = el;
         },
         'aria-haspopup': true,

package/lib/Menu/MenuItem/index.js

@@ -51,11 +51,9 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
   constructor(props) {
     super();
     this.ref = null;
-    this._node = null;
 
     this.handleRef = el => {
       this.ref = el;
-      this._node = el;
     };
 
     this.handleClick = e => {
@@ -97,7 +95,7 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
 
         if (enterKey) {
           // handle space key on keyUp for FF
-          (0, _findDOMNode.findDOMNode)(this._node).click(); // eslint-disable-line react/no-find-dom-node
+          (0, _findDOMNode.findDOMNode)(this.ref).click(); // eslint-disable-line react/no-find-dom-node
         }
       }
     };
@@ -111,7 +109,7 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
         e.stopPropagation();
 
         if (spaceKey) {
-          (0, _findDOMNode.findDOMNode)(this._node).click(); // eslint-disable-line react/no-find-dom-node
+          (0, _findDOMNode.findDOMNode)(this.ref).click(); // eslint-disable-line react/no-find-dom-node
         }
       }
     };
@@ -133,6 +131,10 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
     this.labelId = (0, _uid.uid)('MenuItem__label');
   }
 
+  get _node() {
+    return this.ref;
+  }
+
   componentDidMount() {
     this.props.makeStyles();
     const context = this.context;
@@ -179,11 +181,11 @@ let MenuItem = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default),
   }
 
   get focused() {
-    return (0, _isActiveElement.isActiveElement)(this._node);
+    return (0, _isActiveElement.isActiveElement)(this.ref);
   }
 
   focus() {
-    (0, _findDOMNode.findDOMNode)(this._node).focus(); // eslint-disable-line react/no-find-dom-node
+    (0, _findDOMNode.findDOMNode)(this.ref).focus(); // eslint-disable-line react/no-find-dom-node
   }
 
   renderContent() {

package/lib/Menu/index.js

@@ -428,7 +428,6 @@ 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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-menu",
-  "version": "8.11.2-snapshot.15+4f855a7cf",
+  "version": "8.11.2-snapshot.23+0d8081052",
   "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.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-color-utils": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-test-locator": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-test-queries": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-test-utils": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-themes": "8.11.2-snapshot.15+4f855a7cf"
+    "@instructure/ui-babel-preset": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-color-utils": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-test-locator": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-test-queries": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-test-utils": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-themes": "8.11.2-snapshot.23+0d8081052"
   },
   "dependencies": {
     "@babel/runtime": "^7.13.10",
-    "@instructure/console": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/emotion": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/shared-types": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-a11y-utils": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-dom-utils": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-icons": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-popover": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-position": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-prop-types": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-react-utils": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-testable": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/ui-utils": "8.11.2-snapshot.15+4f855a7cf",
-    "@instructure/uid": "8.11.2-snapshot.15+4f855a7cf",
+    "@instructure/console": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/emotion": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/shared-types": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-a11y-utils": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-dom-utils": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-icons": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-popover": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-position": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-prop-types": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-react-utils": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-testable": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/ui-utils": "8.11.2-snapshot.23+0d8081052",
+    "@instructure/uid": "8.11.2-snapshot.23+0d8081052",
     "keycode": "^2",
     "prop-types": "^15"
   },
@@ -56,5 +56,5 @@
     "access": "public"
   },
   "sideEffects": false,
-  "gitHead": "4f855a7cfb0f347bca6a71b18be9504447ba768f"
+  "gitHead": "0d8081052d9986085a7d0c62ee9ac41a1dcf8608"
 }

package/src/Menu/MenuItem/index.tsx

@@ -78,12 +78,16 @@ class MenuItem extends Component<MenuItemProps> {
     this.labelId = uid('MenuItem__label')
   }
 
-  ref: Element | null = null
-  _node: Element | null = null
+  get _node() {
+    console.warn(
+      '_node property is deprecated and will be removed in v9, please use ref instead'
+    )
 
+    return this.ref
+  }
+  ref: Element | null = null
   handleRef = (el: Element | null) => {
     this.ref = el
-    this._node = el
   }
 
   componentDidMount() {
@@ -144,8 +148,8 @@ class MenuItem extends Component<MenuItemProps> {
 
       if (enterKey) {
         // handle space key on keyUp for FF
-        // @ts-expect-error ts-migrate(2339) FIXME: Property '_node' does not exist on type 'MenuItem'... Remove this comment to see the full error message
-        findDOMNode(this._node).click() // eslint-disable-line react/no-find-dom-node
+        // @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
       }
     }
   }
@@ -160,8 +164,8 @@ class MenuItem extends Component<MenuItemProps> {
       e.stopPropagation()
 
       if (spaceKey) {
-        // @ts-expect-error ts-migrate(2339) FIXME: Property '_node' does not exist on type 'MenuItem'... Remove this comment to see the full error message
-        findDOMNode(this._node).click() // eslint-disable-line react/no-find-dom-node
+        // @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
       }
     }
   }
@@ -200,12 +204,12 @@ class MenuItem extends Component<MenuItemProps> {
   }
 
   get focused() {
-    return isActiveElement(this._node)
+    return isActiveElement(this.ref)
   }
 
   focus() {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_node' does not exist on type 'MenuItem'... Remove this comment to see the full error message
-    findDOMNode(this._node).focus() // eslint-disable-line react/no-find-dom-node
+    // @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
   }
 
   renderContent() {

package/src/Menu/index.tsx

@@ -525,7 +525,6 @@ class Menu extends Component<MenuProps> {
         renderTrigger={safeCloneElement(trigger as ReactElement, {
           // @ts-expect-error ts-migrate(7006) FIXME: Parameter 'el' implicitly has an 'any' type.
           ref: (el) => {
-            this._trigger = el
             this.ref = el
           },
           'aria-haspopup': true,

package/types/Menu/MenuItem/index.d.ts

@@ -52,8 +52,8 @@ declare class MenuItem extends Component<MenuItemProps> {
         removeMenuItem: () => void;
     }>;
     constructor(props: any);
+    get _node(): Element | null;
     ref: Element | null;
-    _node: Element | null;
     handleRef: (el: Element | null) => void;
     componentDidMount(): void;
     componentDidUpdate(): void;

package/types/Menu/MenuItem/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Menu/MenuItem/index.tsx"],"names":[],"mappings":"AAuBA,eAAe;AACf,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AASjC,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAQrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE5C;;;;;GAKG;AACH,cAEM,QAAS,SAAQ,SAAS,CAAC,aAAa,CAAC;IAC7C,MAAM,CAAC,QAAQ,CAAC,WAAW,eAAc;IAEzC,MAAM,CAAC,SAAS;;;;;;;;;;;;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;SAAe;IAClC,MAAM,CAAC,YAAY;;;;MAKT;IAEV,MAAM,CAAC,WAAW;;;OAAc;gBAGpB,KAAK,KAAA;IAcjB,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAC1B,KAAK,EAAE,OAAO,GAAG,IAAI,CAAO;IAE5B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAG9B;IAED,iBAAiB;IAUjB,kBAAkB;IAKlB,oBAAoB;IASpB,WAAW,mBAqBV;IAGD,aAAa,mBAcZ;IAGD,WAAW,mBAaV;IAGD,eAAe,uBAMd;IAED,IAAI,WAAW,wEAEd;IAED,IAAI,IAAI,iEAWP;IAED,IAAI,QAAQ,QAKX;IAED,IAAI,OAAO,YAEV;IAED,KAAK;IAKL,aAAa;IAuBb,MAAM;CAmCP;AAED,eAAe,QAAQ,CAAA;AACvB,OAAO,EAAE,QAAQ,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Menu/MenuItem/index.tsx"],"names":[],"mappings":"AAuBA,eAAe;AACf,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AASjC,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAQrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE5C;;;;;GAKG;AACH,cAEM,QAAS,SAAQ,SAAS,CAAC,aAAa,CAAC;IAC7C,MAAM,CAAC,QAAQ,CAAC,WAAW,eAAc;IAEzC,MAAM,CAAC,SAAS;;;;;;;;;;;;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;SAAe;IAClC,MAAM,CAAC,YAAY;;;;MAKT;IAEV,MAAM,CAAC,WAAW;;;OAAc;gBAGpB,KAAK,KAAA;IAcjB,IAAI,KAAK,mBAMR;IACD,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAC1B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAE9B;IAED,iBAAiB;IAUjB,kBAAkB;IAKlB,oBAAoB;IASpB,WAAW,mBAqBV;IAGD,aAAa,mBAcZ;IAGD,WAAW,mBAaV;IAGD,eAAe,uBAMd;IAED,IAAI,WAAW,wEAEd;IAED,IAAI,IAAI,iEAWP;IAED,IAAI,QAAQ,QAKX;IAED,IAAI,OAAO,YAEV;IAED,KAAK;IAKL,aAAa;IAuBb,MAAM;CAmCP;AAED,eAAe,QAAQ,CAAA;AACvB,OAAO,EAAE,QAAQ,EAAE,CAAA"}

package/types/Menu/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Menu/index.tsx"],"names":[],"mappings":"AAuBA,eAAe;AACf,OAAO,EAAY,SAAS,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAczD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAMrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC;;;;GAIG;AACH,cAEM,IAAK,SAAQ,SAAS,CAAC,SAAS,CAAC;IACrC,MAAM,CAAC,QAAQ,CAAC,WAAW,UAAS;IAEpC,MAAM,CAAC,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAAe;IAClC,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;MAmClB;IAED,MAAM,CAAC,IAAI,kBAAW;IACtB,MAAM,CAAC,KAAK,uBAAgB;IAC5B,MAAM,CAAC,SAAS,2BAAoB;IAEpC,KAAK;;MAAsB;IAC3B,SAAS,OAAO;IAChB,UAAU,UAAK;IACf,QAAQ,OAAO;IACf,QAAQ,OAAO;IACf,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAO;IACrC,QAAQ,SAAqB;IAC7B,cAAc,OAAO;IAErB,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAAO;IAEnC,SAAS,OAAQ,gBAAgB,GAAG,IAAI,UAMvC;gBAGW,KAAK,KAAA;IAMjB,iBAAiB;IAMjB,kBAAkB,CAAC,SAAS,KAAA;IAK5B,MAAM,CAAC,WAAW;;;OAAc;IAGhC,gBAAgB,sBAGf;IAGD,cAAc,sBAMb;IAED,IAAI,SAAS,YAEZ;IAGD,gBAAgB,wBAEf;IAGD,oBAAoB,uBAMnB;IAED,sBAAsB,aAKrB;IAGD,YAAY,uBAIX;IAGD,iBAAiB,uBAuBhB;IAGD,oBAAoB,6DAQnB;IAED,mBAAmB,aAElB;IAED,kBAAkB,aAEjB;IAGD,uBAAuB,sCAKtB;IAGD,iBAAiB,uBAMhB;IAGD,mBAAmB,qCAIlB;IAGD,oBAAoB,2CAInB;IAGD,IAAI,uBAKH;IAGD,IAAI,uBAKH;IAED,KAAK;IAiBL,OAAO;IAQP,IAAI,YAAY,WAKf;IAGD,SAAS,CAAC,IAAI,KAAA;IAkBd,IAAI,KAAK,QAGR;IAED,cAAc;IA2Gd,UAAU;IAmCV,MAAM;CAkEP;AAED,eAAe,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Menu/index.tsx"],"names":[],"mappings":"AAuBA,eAAe;AACf,OAAO,EAAY,SAAS,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAczD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAMrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExC;;;;GAIG;AACH,cAEM,IAAK,SAAQ,SAAS,CAAC,SAAS,CAAC;IACrC,MAAM,CAAC,QAAQ,CAAC,WAAW,UAAS;IAEpC,MAAM,CAAC,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAY;IAC5B,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAAe;IAClC,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;MAmClB;IAED,MAAM,CAAC,IAAI,kBAAW;IACtB,MAAM,CAAC,KAAK,uBAAgB;IAC5B,MAAM,CAAC,SAAS,2BAAoB;IAEpC,KAAK;;MAAsB;IAC3B,SAAS,OAAO;IAChB,UAAU,UAAK;IACf,QAAQ,OAAO;IACf,QAAQ,OAAO;IACf,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAO;IACrC,QAAQ,SAAqB;IAC7B,cAAc,OAAO;IAErB,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAAO;IAEnC,SAAS,OAAQ,gBAAgB,GAAG,IAAI,UAMvC;gBAGW,KAAK,KAAA;IAMjB,iBAAiB;IAMjB,kBAAkB,CAAC,SAAS,KAAA;IAK5B,MAAM,CAAC,WAAW;;;OAAc;IAGhC,gBAAgB,sBAGf;IAGD,cAAc,sBAMb;IAED,IAAI,SAAS,YAEZ;IAGD,gBAAgB,wBAEf;IAGD,oBAAoB,uBAMnB;IAED,sBAAsB,aAKrB;IAGD,YAAY,uBAIX;IAGD,iBAAiB,uBAuBhB;IAGD,oBAAoB,6DAQnB;IAED,mBAAmB,aAElB;IAED,kBAAkB,aAEjB;IAGD,uBAAuB,sCAKtB;IAGD,iBAAiB,uBAMhB;IAGD,mBAAmB,qCAIlB;IAGD,oBAAoB,2CAInB;IAGD,IAAI,uBAKH;IAGD,IAAI,uBAKH;IAED,KAAK;IAiBL,OAAO;IAQP,IAAI,YAAY,WAKf;IAGD,SAAS,CAAC,IAAI,KAAA;IAkBd,IAAI,KAAK,QAGR;IAED,cAAc;IA2Gd,UAAU;IAmCV,MAAM;CAiEP;AAED,eAAe,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAA"}