@ukic/canary-web-components 2.0.0-canary.36 → 2.0.0-canary.38

package/dist/collection/components/ic-data-table/ic-data-table.js

@@ -368,7 +368,7 @@ export class DataTable {
                 }
             });
         };
-        this.createColumnHeaders = () => (this.columns || []).map(({ cellAlignment, colspan, icon, key, title, columnWidth }, index) => (h("th", { scope: "col", class: {
+        this.createColumnHeaders = () => (this.columns || []).map(({ cellAlignment, colspan, icon, key, title, columnWidth, excludeColumnFromSort, }, index) => (h("th", { scope: "col", class: {
                 ["column-header"]: true,
                 [`table-density-${this.density}`]: this.notDefaultDensity(),
                 ["updating-state-headers"]: this.updating && !this.loading,
@@ -383,7 +383,7 @@ export class DataTable {
             } }, title))) : (h("ic-typography", { variant: "body", class: {
                 ["column-header-text"]: true,
                 [`text-${this.density}`]: this.notDefaultDensity(),
-            } }, title)), this.sortable && (h("ic-button", { variant: "icon", id: `sort-button-${key}`, "aria-label": this.getSortButtonLabel(key),
+            } }, title)), this.sortable && !excludeColumnFromSort && (h("ic-button", { variant: "icon", id: `sort-button-${key}`, "aria-label": this.getSortButtonLabel(key),
             // eslint-disable-next-line react/jsx-no-bind
             onClick: () => this.sortRows(key), innerHTML: this.SORT_ICONS[this.sortedColumn === key
                 ? this.sortedColumnOrder
@@ -407,6 +407,7 @@ export class DataTable {
             const data = this.showPagination
                 ? this.data.slice(this.fromRow, this.toRow)
                 : this.data.slice();
+            const paginationOffset = this.showPagination ? this.fromRow : 0;
             /**
              * Ensures that createCells has a value in data to map over to actually render the slot.
              * Removes the need for the user to add it multiple times.
@@ -415,7 +416,10 @@ export class DataTable {
              */
             const organisedData = data.map((row, rowIndex) => {
                 const slottedColumns = this.columns
-                    .map(({ key }, index) => isSlotUsed(this.el, `${key}-${rowIndex}`) && { key, index })
+                    .map(({ key }, index) => isSlotUsed(this.el, `${key}-${rowIndex + paginationOffset}`) && {
+                    key,
+                    index,
+                })
                     .filter((col) => !!col &&
                     // skip the column if its already in the row
                     !Object.prototype.hasOwnProperty.call(row, col.key));
@@ -434,7 +438,7 @@ export class DataTable {
                         ["table-row"]: true,
                         ["table-row-selected"]: this.highlightSelectedRow && this.selectedRow === row,
                     }
-                }, this.createCells(row, index)));
+                }, this.createCells(row, index + paginationOffset)));
             });
         };
         this.getObjectValue = (cell, key) => Object.values(cell)[Object.keys(cell).indexOf(key)];
@@ -1218,7 +1222,7 @@ export class DataTable {
         tooltipEl.prepend(typographyEl);
     }
     render() {
-        var _a;
+        var _a, _b;
         const { caption, createColumnHeaders, createUpdatingIndicator, data, hideColumnHeaders, loading, loadingOptions, paginationBarOptions, scrollable, scrollOffset, showPagination, sortable, sortedColumn, sortedColumnOrder, stickyColumnHeaders, updateScrollOffset, updating, } = this;
         return (h(Host, { style: Object.assign({}, this.setTableDimensions()) }, h("div", { class: "table-container" }, isSlotUsed(this.el, "title-bar") && h("slot", { name: "title-bar" }), h("div", { class: {
                 ["table-row-container"]: true,
@@ -1231,7 +1235,7 @@ export class DataTable {
             } }, h("tr", null, createColumnHeaders()))), updating &&
             !loading &&
             (hideColumnHeaders ? (h("thead", null, createUpdatingIndicator())) : (createUpdatingIndicator())), this.renderTableBody(data, loading, loadingOptions.overlay)), this.renderEmptyState(data, loading, loadingOptions.overlay)), h("div", { "aria-live": "assertive", class: "sr-only" }, this.renderAriaLiveLoading()), this.renderLoadingIndicator(loading, loadingOptions), (showPagination || isSlotUsed(this.el, "pagination-bar")) && (h("div", { class: "pagination-container" }, isSlotUsed(this.el, "pagination-bar") ? (h("slot", { name: "pagination-bar" })) : (h("ic-pagination-bar", { alignment: paginationBarOptions.alignment, appearance: paginationBarOptions.appearance, hideAllFromItemsPerPage: paginationBarOptions.hideAllFromItemsPerPage, hideRangeLabel: paginationBarOptions.hideRangeLabel, itemLabel: paginationBarOptions.itemLabel, itemsPerPageOptions: paginationBarOptions.itemsPerPageOptions, pageLabel: paginationBarOptions.pageLabel, rangeLabelType: paginationBarOptions.rangeLabelType, selectedItemsPerPage: paginationBarOptions.selectedItemsPerPage, setToFirstPageOnPaginationChange: paginationBarOptions.setToFirstPageOnPaginationChange, showGoToPageControl: paginationBarOptions.showGoToPageControl, showItemsPerPageControl: paginationBarOptions.showItemsPerPageControl, totalItems: (_a = data === null || data === void 0 ? void 0 : data.length) !== null && _a !== void 0 ? _a : 0, type: paginationBarOptions.type })))), sortable && (h("div", { class: "screen-reader-sort-text", "aria-live": "polite" }, sortedColumnOrder !== "unsorted" && sortedColumn
-            ? `${sortedColumn} sorted ${sortedColumnOrder}`
+            ? `${((_b = this.columns.find((col) => col.key === sortedColumn)) === null || _b === void 0 ? void 0 : _b.title) || sortedColumn} sorted ${sortedColumnOrder}`
             : "table unsorted")))));
     }
     static get is() { return "ic-data-table"; }