@instructure/ui-link 8.11.2-snapshot.7 → 8.11.2-snapshot.70

package/es/Link/index.js

@@ -51,7 +51,6 @@ let Link = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 = tes
     this.state = {
       hasFocus: false
     };
-    this._link = null;
     this.ref = null;
 
     this.makeStyleProps = () => {
@@ -62,9 +61,7 @@ let Link = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 = tes
     };
 
     this.handleElementRef = el => {
-      const elementRef = this.props.elementRef; // TODO: deprecate _link? ref should be enough
-
-      this._link = el;
+      const elementRef = this.props.elementRef;
       this.ref = el;
 
       if (typeof elementRef === 'function') {
@@ -105,6 +102,10 @@ let Link = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 = tes
     };
   }
 
+  get _link() {
+    return this.ref;
+  }
+
   componentDidMount() {
     this.props.makeStyles(this.makeStyleProps());
   }
@@ -151,11 +152,11 @@ let Link = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 = tes
   }
 
   get focused() {
-    return isActiveElement(this._link);
+    return isActiveElement(this.ref);
   }
 
   get focusable() {
-    return findFocusable(this._link);
+    return findFocusable(this.ref);
   }
 
   get hasVisibleChildren() {
@@ -163,7 +164,7 @@ let Link = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2 = tes
   }
 
   focus() {
-    this._link && this._link.focus();
+    this.ref && this.ref.focus();
   }
 
   renderIcon() {

package/es/package.json

@@ -0,0 +1 @@
+{"type":"module"}

package/lib/Link/index.js

@@ -58,7 +58,6 @@ let Link = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
     this.state = {
       hasFocus: false
     };
-    this._link = null;
     this.ref = null;
 
     this.makeStyleProps = () => {
@@ -69,9 +68,7 @@ let Link = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
     };
 
     this.handleElementRef = el => {
-      const elementRef = this.props.elementRef; // TODO: deprecate _link? ref should be enough
-
-      this._link = el;
+      const elementRef = this.props.elementRef;
       this.ref = el;
 
       if (typeof elementRef === 'function') {
@@ -112,6 +109,10 @@ let Link = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
     };
   }
 
+  get _link() {
+    return this.ref;
+  }
+
   componentDidMount() {
     this.props.makeStyles(this.makeStyleProps());
   }
@@ -160,11 +161,11 @@ let Link = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
   }
 
   get focused() {
-    return (0, _isActiveElement.isActiveElement)(this._link);
+    return (0, _isActiveElement.isActiveElement)(this.ref);
   }
 
   get focusable() {
-    return (0, _findFocusable.findFocusable)(this._link);
+    return (0, _findFocusable.findFocusable)(this.ref);
   }
 
   get hasVisibleChildren() {
@@ -172,7 +173,7 @@ let Link = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _de
   }
 
   focus() {
-    this._link && this._link.focus();
+    this.ref && this.ref.focus();
   }
 
   renderIcon() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-link",
-  "version": "8.11.2-snapshot.7+2681e145a",
+  "version": "8.11.2-snapshot.70+9653a896e",
   "description": "A component for creating links",
   "author": "Instructure, Inc. Engineering and Product Design",
   "type": "commonjs",
@@ -25,25 +25,25 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.13.10",
-    "@instructure/console": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/emotion": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/shared-types": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-a11y-utils": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-color-utils": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-dom-utils": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-icons": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-prop-types": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-react-utils": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-testable": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-view": "8.11.2-snapshot.7+2681e145a",
+    "@instructure/console": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/emotion": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/shared-types": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-a11y-utils": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-color-utils": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-dom-utils": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-icons": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-prop-types": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-react-utils": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-testable": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-view": "8.11.2-snapshot.70+9653a896e",
     "prop-types": "^15"
   },
   "devDependencies": {
-    "@instructure/ui-babel-preset": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-test-locator": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-test-queries": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-test-utils": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-themes": "8.11.2-snapshot.7+2681e145a"
+    "@instructure/ui-babel-preset": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-test-locator": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-test-queries": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-test-utils": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-themes": "8.11.2-snapshot.70+9653a896e"
   },
   "peerDependencies": {
     "react": ">=16.8 <=17"
@@ -52,5 +52,5 @@
     "access": "public"
   },
   "sideEffects": false,
-  "gitHead": "2681e145ad469e1396536d3e9eed75a19995eb8a"
+  "gitHead": "9653a896e80ba4d73335225e80807746a232d96d"
 }

package/src/Link/index.tsx

@@ -67,8 +67,14 @@ class Link extends Component<LinkProps> {
 
   state = { hasFocus: false }
 
-  _link: Element | null = null
-  ref: Element | null = null
+  get _link() {
+    console.warn(
+      '_link property is deprecated and will be removed in v9, please use ref instead'
+    )
+
+    return this.ref
+  }
+  ref: HTMLElement | null = null
 
   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
@@ -92,8 +98,6 @@ class Link extends Component<LinkProps> {
   handleElementRef = (el) => {
     const { elementRef } = this.props
 
-    // TODO: deprecate _link? ref should be enough
-    this._link = el
     this.ref = el
 
     if (typeof elementRef === 'function') {
@@ -171,11 +175,11 @@ class Link extends Component<LinkProps> {
   }
 
   get focused() {
-    return isActiveElement(this._link)
+    return isActiveElement(this.ref)
   }
 
   get focusable() {
-    return findFocusable(this._link)
+    return findFocusable(this.ref)
   }
 
   get hasVisibleChildren() {
@@ -183,8 +187,7 @@ class Link extends Component<LinkProps> {
   }
 
   focus() {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_link' does not exist on type 'Link'.
-    this._link && this._link.focus()
+    this.ref && this.ref.focus()
   }
 
   renderIcon() {
@@ -212,7 +215,6 @@ class Link extends Component<LinkProps> {
       isWithinText,
       ...props
     } = this.props
-
     const { interaction } = this
 
     const isDisabled = interaction === 'disabled'

package/types/Link/index.d.ts

@@ -50,8 +50,8 @@ declare class Link extends Component<LinkProps> {
     state: {
         hasFocus: boolean;
     };
-    _link: Element | null;
-    ref: Element | null;
+    get _link(): HTMLElement | null;
+    ref: HTMLElement | null;
     componentDidMount(): void;
     componentDidUpdate(prevProps: any, prevState: any, snapshot: any): void;
     makeStyleProps: () => LinkStyleProps;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Link/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAexC,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAKrD,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAExD;;;;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;;;;;MAMT;IAEV,KAAK;;MAAsB;IAE3B,KAAK,EAAE,OAAO,GAAG,IAAI,CAAO;IAC5B,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,iBAAiB;IAMjB,kBAAkB,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,QAAQ,KAAA;IAKjD,cAAc,QAAO,cAAc,CAKlC;IAGD,gBAAgB,oBAUf;IAGD,WAAW,uBAUV;IAGD,WAAW,uBAKV;IAGD,UAAU,uBAKT;IAED,IAAI,oBAAoB,YAgBvB;IAED,IAAI,OAAO,+DAYV;IAED,IAAI,WAAW,0DAEd;IAED,IAAI,OAAO,wEAEV;IAED,IAAI,OAAO,YAEV;IAED,IAAI,SAAS,cAEZ;IAED,IAAI,kBAAkB,YAErB;IAED,KAAK;IAKL,UAAU;IAaV,MAAM;CA+CP;AAED,eAAe,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Link/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAexC,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAKrD,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAExD;;;;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;;;;;MAMT;IAEV,KAAK;;MAAsB;IAE3B,IAAI,KAAK,uBAMR;IACD,GAAG,EAAE,WAAW,GAAG,IAAI,CAAO;IAE9B,iBAAiB;IAMjB,kBAAkB,CAAC,SAAS,KAAA,EAAE,SAAS,KAAA,EAAE,QAAQ,KAAA;IAKjD,cAAc,QAAO,cAAc,CAKlC;IAGD,gBAAgB,oBAQf;IAGD,WAAW,uBAUV;IAGD,WAAW,uBAKV;IAGD,UAAU,uBAKT;IAED,IAAI,oBAAoB,YAgBvB;IAED,IAAI,OAAO,+DAYV;IAED,IAAI,WAAW,0DAEd;IAED,IAAI,OAAO,wEAEV;IAED,IAAI,OAAO,YAEV;IAED,IAAI,SAAS,cAEZ;IAED,IAAI,kBAAkB,YAErB;IAED,KAAK;IAIL,UAAU;IAaV,MAAM;CA8CP;AAED,eAAe,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,CAAA"}