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

package/es/Pages/Page/index.js

@@ -44,12 +44,14 @@ class Page extends Component {
     this.ref = null;
 
     this.handleRef = el => {
-      this._content = el; // TODO remove and keep 'ref' in v9
-
       this.ref = el;
     };
   }
 
+  get _content() {
+    return this.ref;
+  }
+
   get defaultFocusElement() {
     let defaultFocusElement = this.props.defaultFocusElement;
 
@@ -62,7 +64,7 @@ class Page extends Component {
     }
 
     if (!defaultFocusElement) {
-      const tabbable = findTabbable(this._content);
+      const tabbable = findTabbable(this.ref);
       defaultFocusElement = tabbable && tabbable[0];
     }
 

package/es/Pages/index.js

@@ -47,14 +47,16 @@ category: components
 **/
 
 let Pages = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_class = (_temp = _class2 = class Pages extends Component {
+  get _contentElement() {
+    return this.ref;
+  }
+
   constructor(props) {
     super(props);
     this._timeouts = [];
     this.ref = null;
 
     this.handleRef = el => {
-      this._contentElement = el; // TODO remove with v9 and keep ref
-
       this.ref = el;
     };
 
@@ -96,7 +98,7 @@ let Pages = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_clas
   }
 
   get focused() {
-    return containsActiveElement(this._contentElement);
+    return containsActiveElement(this.ref);
   }
 
   focus() {
@@ -107,7 +109,7 @@ let Pages = (_dec = withStyle(generateStyle, generateComponentTheme), _dec(_clas
         activePage.focus();
       } else {
         // Use first tabbable as last ditch effort
-        const tabbable = findTabbable(this._contentElement);
+        const tabbable = findTabbable(this.ref);
         const element = tabbable && tabbable[0];
         element && element.focus();
       }

package/es/package.json

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

package/lib/Pages/Page/index.js

@@ -41,12 +41,14 @@ class Page extends _react.Component {
     this.ref = null;
 
     this.handleRef = el => {
-      this._content = el; // TODO remove and keep 'ref' in v9
-
       this.ref = el;
     };
   }
 
+  get _content() {
+    return this.ref;
+  }
+
   get defaultFocusElement() {
     let defaultFocusElement = this.props.defaultFocusElement;
 
@@ -59,7 +61,7 @@ class Page extends _react.Component {
     }
 
     if (!defaultFocusElement) {
-      const tabbable = (0, _findTabbable.findTabbable)(this._content);
+      const tabbable = (0, _findTabbable.findTabbable)(this.ref);
       defaultFocusElement = tabbable && tabbable[0];
     }
 

package/lib/Pages/index.js

@@ -53,14 +53,16 @@ category: components
 
 exports.PagesContext = PagesContext;
 let Pages = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = (_temp = _class2 = class Pages extends _react.Component {
+  get _contentElement() {
+    return this.ref;
+  }
+
   constructor(props) {
     super(props);
     this._timeouts = [];
     this.ref = null;
 
     this.handleRef = el => {
-      this._contentElement = el; // TODO remove with v9 and keep ref
-
       this.ref = el;
     };
 
@@ -102,7 +104,7 @@ let Pages = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
   }
 
   get focused() {
-    return (0, _containsActiveElement.containsActiveElement)(this._contentElement);
+    return (0, _containsActiveElement.containsActiveElement)(this.ref);
   }
 
   focus() {
@@ -113,7 +115,7 @@ let Pages = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _d
         activePage.focus();
       } else {
         // Use first tabbable as last ditch effort
-        const tabbable = (0, _findTabbable.findTabbable)(this._contentElement);
+        const tabbable = (0, _findTabbable.findTabbable)(this.ref);
         const element = tabbable && tabbable[0];
         element && element.focus();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-pages",
-  "version": "8.11.2-snapshot.7+2681e145a",
+  "version": "8.11.2-snapshot.70+9653a896e",
   "description": "A UI component library made by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
   "type": "commonjs",
@@ -24,23 +24,23 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@instructure/ui-babel-preset": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-color-utils": "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-color-utils": "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"
   },
   "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-dom-utils": "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-utils": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/ui-view": "8.11.2-snapshot.7+2681e145a",
-    "@instructure/uid": "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-dom-utils": "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-utils": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/ui-view": "8.11.2-snapshot.70+9653a896e",
+    "@instructure/uid": "8.11.2-snapshot.70+9653a896e",
     "prop-types": "^15"
   },
   "peerDependencies": {
@@ -50,5 +50,5 @@
     "access": "public"
   },
   "sideEffects": false,
-  "gitHead": "2681e145ad469e1396536d3e9eed75a19995eb8a"
+  "gitHead": "9653a896e80ba4d73335225e80807746a232d96d"
 }

package/src/Pages/Page/index.tsx

@@ -56,12 +56,15 @@ class Page extends Component<PagesPageProps> {
     navigateToPreviousPage: PropTypes.func
   }
 
+  get _content() {
+    console.warn('_content deprecated, please use ref instead')
+
+    return this.ref
+  }
+
   ref: Element | null = null
 
   handleRef = (el: Element | null) => {
-    // @ts-expect-error ts-migrate(2551) FIXME: Property '_content' does not exist on type 'Page'.... Remove this comment to see the full error message
-    this._content = el // TODO remove and keep 'ref' in v9
-
     this.ref = el
   }
 
@@ -77,8 +80,7 @@ class Page extends Component<PagesPageProps> {
     }
 
     if (!defaultFocusElement) {
-      // @ts-expect-error ts-migrate(2551) FIXME:
-      const tabbable = findTabbable(this._content)
+      const tabbable = findTabbable(this.ref)
       // @ts-expect-error ts-migrate(2554) FIXME:
       defaultFocusElement = tabbable && tabbable[0]
     }

package/src/Pages/index.tsx

@@ -66,12 +66,16 @@ class Pages extends Component<PagesProps> {
   static Page = Page
 
   _timeouts = []
+  get _contentElement() {
+    console.warn(
+      '_contentElement property is deprecated and will be removed in v9, please use ref instead'
+    )
+
+    return this.ref
+  }
   ref: Element | null = null
 
   handleRef = (el: Element | null) => {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_contentElement' does not exist on type ... Remove this comment to see the full error message
-    this._contentElement = el // TODO remove with v9 and keep ref
-
     this.ref = el
   }
 
@@ -133,8 +137,7 @@ class Pages extends Component<PagesProps> {
   }
 
   get focused() {
-    // @ts-expect-error ts-migrate(2339) FIXME: Property '_contentElement' does not exist on type ... Remove this comment to see the full error message
-    return containsActiveElement(this._contentElement)
+    return containsActiveElement(this.ref)
   }
 
   focus() {
@@ -149,8 +152,7 @@ class Pages extends Component<PagesProps> {
           activePage.focus()
         } else {
           // Use first tabbable as last ditch effort
-          // @ts-expect-error ts-migrate(2339) FIXME:
-          const tabbable = findTabbable(this._contentElement)
+          const tabbable = findTabbable(this.ref)
           const element = tabbable && tabbable[0]
 
           // @ts-expect-error ts-migrate(2554) FIXME:

package/types/Pages/Page/index.d.ts

@@ -31,6 +31,7 @@ declare class Page extends Component<PagesPageProps> {
         history: PropTypes.Requireable<any[]>;
         navigateToPreviousPage: PropTypes.Requireable<(...args: any[]) => any>;
     };
+    get _content(): Element | null;
     ref: Element | null;
     handleRef: (el: Element | null) => void;
     get defaultFocusElement(): React.ReactElement<any, string | React.JSXElementConstructor<any>> | ((...args: any[]) => any) | undefined;

package/types/Pages/Page/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Pages/Page/index.tsx"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACxC,OAAO,SAAS,MAAM,YAAY,CAAA;AAMlC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAG7C;;;;;GAKG;AACH,cAAM,IAAK,SAAQ,SAAS,CAAC,cAAc,CAAC;IAC1C,MAAM,CAAC,QAAQ,CAAC,WAAW,gBAAe;IAE1C,MAAM,CAAC,YAAY;;;;;SAAe;IAClC,MAAM,CAAC,SAAS;;;;;OAAY;IAE5B,MAAM,CAAC,YAAY;;;;;MAKlB;IAED,MAAM,CAAC,YAAY;;;MAGlB;IAED,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAK9B;IAED,IAAI,mBAAmB,+GAyBtB;IAED,IAAI,SAAS,wBAKZ;IAED,KAAK;IAOL,MAAM;CAoBP;AAED,eAAe,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Pages/Page/index.tsx"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACxC,OAAO,SAAS,MAAM,YAAY,CAAA;AAMlC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAG7C;;;;;GAKG;AACH,cAAM,IAAK,SAAQ,SAAS,CAAC,cAAc,CAAC;IAC1C,MAAM,CAAC,QAAQ,CAAC,WAAW,gBAAe;IAE1C,MAAM,CAAC,YAAY;;;;;SAAe;IAClC,MAAM,CAAC,SAAS;;;;;OAAY;IAE5B,MAAM,CAAC,YAAY;;;;;MAKlB;IAED,MAAM,CAAC,YAAY;;;MAGlB;IAED,IAAI,QAAQ,mBAIX;IAED,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAE9B;IAED,IAAI,mBAAmB,+GAwBtB;IAED,IAAI,SAAS,wBAKZ;IAED,KAAK;IAOL,MAAM;CAoBP;AAED,eAAe,IAAI,CAAA;AACnB,OAAO,EAAE,IAAI,EAAE,CAAA"}

package/types/Pages/index.d.ts

@@ -36,6 +36,7 @@ declare class Pages extends Component<PagesProps> {
     };
     static Page: typeof Page;
     _timeouts: never[];
+    get _contentElement(): Element | null;
     ref: Element | null;
     handleRef: (el: Element | null) => void;
     constructor(props: any);

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Pages/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,KAAK,EAAE,EAAE,SAAS,EAA+B,MAAM,OAAO,CAAA;AAQrE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAGzC,eAAO,MAAM,YAAY;;;EAGvB,CAAA;AAEF;;;;GAIG;AACH,cACM,KAAM,SAAQ,SAAS,CAAC,UAAU,CAAC;IACvC,MAAM,CAAC,QAAQ,CAAC,WAAW,WAAU;IAErC,MAAM,CAAC,YAAY;;;;;;SAAe;IAClC,MAAM,CAAC,SAAS;;;;;;OAAY;IAE5B,MAAM,CAAC,YAAY;;;;;MAKlB;IAED,MAAM,CAAC,IAAI,cAAO;IAElB,SAAS,UAAK;IACd,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAK9B;gBAGW,KAAK,KAAA;IAcjB,iBAAiB;IAIjB,qBAAqB,aAOpB;IAGD,yBAAyB,CAAC,SAAS,KAAA,EAAE,WAAW,KAAA;IAchD,kBAAkB;IAUlB,oBAAoB;IAIpB,IAAI,OAAO,YAGV;IAED,KAAK;IAuBL,IAAI,UAAU,8EAkBb;IAED,MAAM;CAyBP;AAED,eAAe,KAAK,CAAA;AACpB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Pages/index.tsx"],"names":[],"mappings":"AAwBA,eAAe;AACf,OAAO,KAAK,EAAE,EAAE,SAAS,EAA+B,MAAM,OAAO,CAAA;AAQrE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAE7B,OAAO,EAAa,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAGzC,eAAO,MAAM,YAAY;;;EAGvB,CAAA;AAEF;;;;GAIG;AACH,cACM,KAAM,SAAQ,SAAS,CAAC,UAAU,CAAC;IACvC,MAAM,CAAC,QAAQ,CAAC,WAAW,WAAU;IAErC,MAAM,CAAC,YAAY;;;;;;SAAe;IAClC,MAAM,CAAC,SAAS;;;;;;OAAY;IAE5B,MAAM,CAAC,YAAY;;;;;MAKlB;IAED,MAAM,CAAC,IAAI,cAAO;IAElB,SAAS,UAAK;IACd,IAAI,eAAe,mBAMlB;IACD,GAAG,EAAE,OAAO,GAAG,IAAI,CAAO;IAE1B,SAAS,OAAQ,OAAO,GAAG,IAAI,UAE9B;gBAGW,KAAK,KAAA;IAcjB,iBAAiB;IAIjB,qBAAqB,aAOpB;IAGD,yBAAyB,CAAC,SAAS,KAAA,EAAE,WAAW,KAAA;IAchD,kBAAkB;IAUlB,oBAAoB;IAIpB,IAAI,OAAO,YAEV;IAED,KAAK;IAsBL,IAAI,UAAU,8EAkBb;IAED,MAAM;CAyBP;AAED,eAAe,KAAK,CAAA;AACpB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA"}