@atlaskit/dynamic-table 14.15.0 → 14.16.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/dynamic-table
 
+## 14.16.0
+
+### Minor Changes
+
+- [#81825](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/81825) [`6d27545ac997`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6d27545ac997) - Dynamic table now also respects test IDs when passed in at the row level.
+
 ## 14.15.0
 
 ### Minor Changes

package/dist/cjs/components/rankable/body.js

@@ -114,7 +114,7 @@ var RankableBody = exports.RankableBody = /*#__PURE__*/function (_React$Componen
             row: row,
             isRankingDisabled: isRankingDisabled,
             isHighlighted: !!highlightedRowIndex && (typeof highlightedRowIndex === 'number' ? highlightedRowIndex === rowIndex : highlightedRowIndex.indexOf(rowIndex) > -1),
-            testId: "".concat(testId, "--rankable--table--row")
+            testId: testId && "".concat(testId, "--rankable--table--row")
           });
         }), provided.placeholder);
       }));

package/dist/cjs/components/rankable/table-row.js

@@ -20,7 +20,7 @@ var _withDimensions = _interopRequireDefault(require("../../hoc/with-dimensions"
 var _helpers = require("../../internal/helpers");
 var _tableRow = require("../../styled/rankable/table-row");
 var _tableCell = _interopRequireDefault(require("./table-cell"));
-var _excluded = ["cells", "key", "isHighlighted"];
+var _excluded = ["cells", "testId", "key", "isHighlighted"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -61,6 +61,7 @@ var RankableTableRow = exports.RankableTableRow = /*#__PURE__*/function (_React$
         isHighlighted = _this$props.isHighlighted,
         testId = _this$props.testId;
       var cells = row.cells,
+        rowTestId = row.testId,
         key = row.key,
         isRowHighlighted = row.isHighlighted,
         restRowProps = (0, _objectWithoutProperties2.default)(row, _excluded);
@@ -83,7 +84,7 @@ var RankableTableRow = exports.RankableTableRow = /*#__PURE__*/function (_React$
           isHighlighted: isHighlighted || isRowHighlighted,
           isRanking: isRanking,
           isRankingItem: snapshot.isDragging,
-          testId: testId && "".concat(testId, "--rankable--table--body--row")
+          testId: rowTestId || testId && "".concat(testId, "--rankable--table--body--row")
         }), cells.map(function (cell, cellIndex) {
           var headCell = (head || {
             cells: []

package/dist/cjs/components/stateless.js

@@ -35,7 +35,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var packageName = "@atlaskit/dynamic-table";
-var packageVersion = "14.15.0";
+var packageVersion = "14.16.0";
 function toggleSortOrder(currentSortOrder) {
   switch (currentSortOrder) {
     case _constants.DESC:

package/dist/cjs/components/table-row.js

@@ -25,7 +25,7 @@ var Row = function Row(_ref) {
   }, isHighlighted ? {
     'data-ts--dynamic-table--table-row--highlighted': true
   } : null, {
-    testId: testId && "".concat(testId, "--row-").concat(restRowProps.key)
+    testId: row.testId || testId && "".concat(testId, "--row-").concat(restRowProps.key)
   }), cells.map(function (cell, cellIndex) {
     var content = cell.content,
       cellTestId = cell.testId,

package/dist/es2019/components/rankable/body.js

@@ -105,7 +105,7 @@ export class RankableBody extends React.Component {
       row: row,
       isRankingDisabled: isRankingDisabled,
       isHighlighted: !!highlightedRowIndex && (typeof highlightedRowIndex === 'number' ? highlightedRowIndex === rowIndex : highlightedRowIndex.indexOf(rowIndex) > -1),
-      testId: `${testId}--rankable--table--row`
+      testId: testId && `${testId}--rankable--table--row`
     })), provided.placeholder)));
   }
 }

package/dist/es2019/components/rankable/table-row.js

@@ -33,6 +33,7 @@ export class RankableTableRow extends React.Component {
     } = this.props;
     const {
       cells,
+      testId: rowTestId,
       key,
       isHighlighted: isRowHighlighted,
       // TODO: Remove `rest` props and use only what is explicitly in the API.
@@ -60,7 +61,7 @@ export class RankableTableRow extends React.Component {
         isHighlighted: isHighlighted || isRowHighlighted,
         isRanking: isRanking,
         isRankingItem: snapshot.isDragging,
-        testId: testId && `${testId}--rankable--table--body--row`
+        testId: rowTestId || testId && `${testId}--rankable--table--body--row`
       }), cells.map((cell, cellIndex) => {
         const headCell = (head || {
           cells: []

package/dist/es2019/components/stateless.js

@@ -14,7 +14,7 @@ import LoadingContainerAdvanced from './loading-container-advanced';
 import ManagedPagination from './managed-pagination';
 import TableHead from './table-head';
 const packageName = "@atlaskit/dynamic-table";
-const packageVersion = "14.15.0";
+const packageVersion = "14.16.0";
 function toggleSortOrder(currentSortOrder) {
   switch (currentSortOrder) {
     case DESC:

package/dist/es2019/components/table-row.js

@@ -18,7 +18,7 @@ const Row = ({
   }, isHighlighted ? {
     'data-ts--dynamic-table--table-row--highlighted': true
   } : null, {
-    testId: testId && `${testId}--row-${restRowProps.key}`
+    testId: row.testId || testId && `${testId}--row-${restRowProps.key}`
   }), cells.map((cell, cellIndex) => {
     const {
       content,

package/dist/esm/components/rankable/body.js

@@ -109,7 +109,7 @@ export var RankableBody = /*#__PURE__*/function (_React$Component) {
             row: row,
             isRankingDisabled: isRankingDisabled,
             isHighlighted: !!highlightedRowIndex && (typeof highlightedRowIndex === 'number' ? highlightedRowIndex === rowIndex : highlightedRowIndex.indexOf(rowIndex) > -1),
-            testId: "".concat(testId, "--rankable--table--row")
+            testId: testId && "".concat(testId, "--rankable--table--row")
           });
         }), provided.placeholder);
       }));

package/dist/esm/components/rankable/table-row.js

@@ -7,7 +7,7 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["cells", "key", "isHighlighted"];
+var _excluded = ["cells", "testId", "key", "isHighlighted"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -56,6 +56,7 @@ export var RankableTableRow = /*#__PURE__*/function (_React$Component) {
         isHighlighted = _this$props.isHighlighted,
         testId = _this$props.testId;
       var cells = row.cells,
+        rowTestId = row.testId,
         key = row.key,
         isRowHighlighted = row.isHighlighted,
         restRowProps = _objectWithoutProperties(row, _excluded);
@@ -78,7 +79,7 @@ export var RankableTableRow = /*#__PURE__*/function (_React$Component) {
           isHighlighted: isHighlighted || isRowHighlighted,
           isRanking: isRanking,
           isRankingItem: snapshot.isDragging,
-          testId: testId && "".concat(testId, "--rankable--table--body--row")
+          testId: rowTestId || testId && "".concat(testId, "--rankable--table--body--row")
         }), cells.map(function (cell, cellIndex) {
           var headCell = (head || {
             cells: []

package/dist/esm/components/stateless.js

@@ -25,7 +25,7 @@ import LoadingContainerAdvanced from './loading-container-advanced';
 import ManagedPagination from './managed-pagination';
 import TableHead from './table-head';
 var packageName = "@atlaskit/dynamic-table";
-var packageVersion = "14.15.0";
+var packageVersion = "14.16.0";
 function toggleSortOrder(currentSortOrder) {
   switch (currentSortOrder) {
     case DESC:

package/dist/esm/components/table-row.js

@@ -18,7 +18,7 @@ var Row = function Row(_ref) {
   }, isHighlighted ? {
     'data-ts--dynamic-table--table-row--highlighted': true
   } : null, {
-    testId: testId && "".concat(testId, "--row-").concat(restRowProps.key)
+    testId: row.testId || testId && "".concat(testId, "--row-").concat(restRowProps.key)
   }), cells.map(function (cell, cellIndex) {
     var content = cell.content,
       cellTestId = cell.testId,

package/dist/types/components/loading-container-advanced.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { SpinnerSizeType } from '../types';
 export interface LoadingContainerAdvancedProps {
+    children?: React.ReactNode;
     isLoading?: boolean;
     spinnerSize?: SpinnerSizeType;
     contentsOpacity: number | string;

package/dist/types-ts4.5/components/loading-container-advanced.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { SpinnerSizeType } from '../types';
 export interface LoadingContainerAdvancedProps {
+    children?: React.ReactNode;
     isLoading?: boolean;
     spinnerSize?: SpinnerSizeType;
     contentsOpacity: number | string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/dynamic-table",
-  "version": "14.15.0",
+  "version": "14.16.0",
   "description": "A dynamic table displays rows of data with built-in pagination, sorting, and re-ordering functionality.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"