@pingux/astro 2.36.0-alpha.3 → 2.36.0

package/lib/cjs/components/DataTable/DataTable.js

@@ -88,7 +88,7 @@ var DataTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   // entering resizing/exiting resizing doesn't trigger a render
   // with table layout, so we need to track it here
   var state = (0, _table2.useTableState)(_objectSpread({}, props));
-  var domRef = (0, _react.useRef)(ref);
+  var domRef = (0, _hooks.useLocalOrForwardRef)(ref);
   var headerRef = (0, _react.useRef)();
   var bodyRef = (0, _react.useRef)();
   var density = props.density || 'regular';

package/lib/cjs/components/DataTable/DataTable.test.js

@@ -33,6 +33,7 @@ var _i18n = require("@react-aria/i18n");
 var _react2 = require("@testing-library/react");
 var _reactHooks = require("@testing-library/react-hooks");
 var _index = require("../../index");
+var _universalComponentTest = require("../../utils/testUtils/universalComponentTest");
 var _DataTable = _interopRequireDefault(require("./DataTable"));
 var _react3 = require("@emotion/react");
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = _Object$defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof _Symbol ? _Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return _Object$defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = _Object$create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = _Object$getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = _Object$create(IteratorPrototype); function defineIteratorMethods(prototype) { var _context38; _forEachInstanceProperty(_context38 = ["next", "throw", "return"]).call(_context38, function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], _forEachInstanceProperty(tryLocsList).call(tryLocsList, pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return _Object$setPrototypeOf ? _Object$setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = _Object$create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = _Promise2); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return _reverseInstanceProperty(keys).call(keys), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { var _context39; if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, _forEachInstanceProperty(_context39 = this.tryEntries).call(_context39, resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+_sliceInstanceProperty(name).call(name, 1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
@@ -1141,4 +1142,23 @@ describe('Empty DataTable', function () {
     expect(staticTable).toBeVisible();
     expect(tRows).toBeInTheDocument();
   });
+});
+
+// Needs to be added to each components test file
+(0, _universalComponentTest.universalComponentTests)({
+  renderComponent: function renderComponent(props) {
+    return (0, _react3.jsx)(_DataTable["default"], (0, _extends2["default"])({}, props, {
+      "aria-label": "label"
+    }), (0, _react3.jsx)(_index.DataTableHeader, {
+      columns: [columns[0]]
+    }, (0, _react3.jsx)(_index.DataTableColumn, {
+      align: "center"
+    }, columns[0].name)), (0, _react3.jsx)(_index.DataTableBody, {
+      items: rows
+    }, function (item) {
+      return (0, _react3.jsx)(_index.DataTableRow, null, function (columnKey) {
+        return (0, _react3.jsx)(_index.DataTableCell, null, item[columnKey]);
+      });
+    }));
+  }
 });

package/lib/cjs/components/DataTable/DataTableVirtualizer.js

@@ -115,7 +115,6 @@ var DataTableVirtualizer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, r
     },
     ref: headerRef
   }, state.visibleViews[0]), (0, _react2.jsx)(_virtualizer.ScrollView, {
-    role: "presentation",
     variant: "dataTable.tableBody",
     style: {
       flex: 1

package/lib/cjs/utils/testUtils/universalComponentTest.js

@@ -49,33 +49,35 @@ var universalComponentTests = /*#__PURE__*/function () {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           renderComponent = _ref2.renderComponent, _ref2$rules = _ref2.rules, rules = _ref2$rules === void 0 ? {} : _ref2$rules;
-          test('should have no accessibility violations', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-            var _render, container, results;
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  jest.useRealTimers();
-                  _render = (0, _react2.render)(renderComponent()), container = _render.container;
-                  _context.next = 4;
-                  return (0, _jestAxe.axe)(container, {
-                    rules: rules
-                  });
-                case 4:
-                  results = _context.sent;
-                  expect(results).toHaveNoViolations();
-                case 6:
-                case "end":
-                  return _context.stop();
-              }
-            }, _callee);
-          })));
-          test('should forward refs properly', function () {
-            (0, _react2.render)((0, _react3.jsx)(ComponentWithRef, {
-              renderComponent: renderComponent
-            }));
-            _react2.screen.getByText(HAS_REF);
+          describe('Universal Component Tests', function () {
+            test('should have no accessibility violations', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+              var _render, container, results;
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    jest.useRealTimers();
+                    _render = (0, _react2.render)(renderComponent()), container = _render.container;
+                    _context.next = 4;
+                    return (0, _jestAxe.axe)(container, {
+                      rules: rules
+                    });
+                  case 4:
+                    results = _context.sent;
+                    expect(results).toHaveNoViolations();
+                  case 6:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            })));
+            test('should forward refs properly', function () {
+              (0, _react2.render)((0, _react3.jsx)(ComponentWithRef, {
+                renderComponent: renderComponent
+              }));
+              _react2.screen.getByText(HAS_REF);
+            });
           });
-        case 3:
+        case 2:
         case "end":
           return _context2.stop();
       }

package/lib/components/DataTable/DataTable.js

@@ -26,7 +26,7 @@ import { TableLayout } from '@react-stately/layout';
 import { TableColumnLayout, useTableState } from '@react-stately/table';
 import PropTypes from 'prop-types';
 import { DataTableContext, useDataTableContext } from '../../context/DataTableContext';
-import { useStatusClasses } from '../../hooks';
+import { useLocalOrForwardRef, useStatusClasses } from '../../hooks';
 import { Box, Icon, Loader } from '../../index';
 import DataTableVirtualizer from './DataTableVirtualizer';
 import { jsx as ___EmotionJSX } from "@emotion/react";
@@ -77,7 +77,7 @@ var DataTable = /*#__PURE__*/forwardRef(function (props, ref) {
   // entering resizing/exiting resizing doesn't trigger a render
   // with table layout, so we need to track it here
   var state = useTableState(_objectSpread({}, props));
-  var domRef = useRef(ref);
+  var domRef = useLocalOrForwardRef(ref);
   var headerRef = useRef();
   var bodyRef = useRef();
   var density = props.density || 'regular';

package/lib/components/DataTable/DataTable.test.js

@@ -36,6 +36,7 @@ import { useCollator } from '@react-aria/i18n';
 import { act, fireEvent, render, screen, within } from '@testing-library/react';
 import { act as actHooks, renderHook } from '@testing-library/react-hooks';
 import { DataTableBody, DataTableCell, DataTableColumn, DataTableHeader, DataTableRow } from '../../index';
+import { universalComponentTests } from '../../utils/testUtils/universalComponentTest';
 import DataTable from './DataTable';
 import { jsx as ___EmotionJSX } from "@emotion/react";
 var offsetWidth;
@@ -1138,4 +1139,23 @@ describe('Empty DataTable', function () {
     expect(staticTable).toBeVisible();
     expect(tRows).toBeInTheDocument();
   });
+});
+
+// Needs to be added to each components test file
+universalComponentTests({
+  renderComponent: function renderComponent(props) {
+    return ___EmotionJSX(DataTable, _extends({}, props, {
+      "aria-label": "label"
+    }), ___EmotionJSX(DataTableHeader, {
+      columns: [columns[0]]
+    }, ___EmotionJSX(DataTableColumn, {
+      align: "center"
+    }, columns[0].name)), ___EmotionJSX(DataTableBody, {
+      items: rows
+    }, function (item) {
+      return ___EmotionJSX(DataTableRow, null, function (columnKey) {
+        return ___EmotionJSX(DataTableCell, null, item[columnKey]);
+      });
+    }));
+  }
 });

package/lib/components/DataTable/DataTableVirtualizer.js

@@ -103,7 +103,6 @@ var DataTableVirtualizer = /*#__PURE__*/forwardRef(function (_ref, ref) {
     },
     ref: headerRef
   }, state.visibleViews[0]), ___EmotionJSX(ScrollView, {
-    role: "presentation",
     variant: "dataTable.tableBody",
     style: {
       flex: 1

package/lib/utils/testUtils/universalComponentTest.js

@@ -38,33 +38,35 @@ export var universalComponentTests = /*#__PURE__*/function () {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           renderComponent = _ref2.renderComponent, _ref2$rules = _ref2.rules, rules = _ref2$rules === void 0 ? {} : _ref2$rules;
-          test('should have no accessibility violations', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-            var _render, container, results;
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
-                case 0:
-                  jest.useRealTimers();
-                  _render = render(renderComponent()), container = _render.container;
-                  _context.next = 4;
-                  return axe(container, {
-                    rules: rules
-                  });
-                case 4:
-                  results = _context.sent;
-                  expect(results).toHaveNoViolations();
-                case 6:
-                case "end":
-                  return _context.stop();
-              }
-            }, _callee);
-          })));
-          test('should forward refs properly', function () {
-            render(___EmotionJSX(ComponentWithRef, {
-              renderComponent: renderComponent
-            }));
-            screen.getByText(HAS_REF);
+          describe('Universal Component Tests', function () {
+            test('should have no accessibility violations', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+              var _render, container, results;
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    jest.useRealTimers();
+                    _render = render(renderComponent()), container = _render.container;
+                    _context.next = 4;
+                    return axe(container, {
+                      rules: rules
+                    });
+                  case 4:
+                    results = _context.sent;
+                    expect(results).toHaveNoViolations();
+                  case 6:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            })));
+            test('should forward refs properly', function () {
+              render(___EmotionJSX(ComponentWithRef, {
+                renderComponent: renderComponent
+              }));
+              screen.getByText(HAS_REF);
+            });
           });
-        case 3:
+        case 2:
         case "end":
           return _context2.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pingux/astro",
-  "version": "2.36.0-alpha.3",
+  "version": "2.36.0",
   "description": "React component library for Ping Identity's design system",
   "repository": {
     "type": "git",