diff --git a/.yarn/cache/@carbon-icons-npm-11.34.1-f7381f5483-b24dc17886.zip b/.yarn/cache/@carbon-icons-npm-11.36.0-98d93c9469-e3880a694a.zip similarity index 83% rename from .yarn/cache/@carbon-icons-npm-11.34.1-f7381f5483-b24dc17886.zip rename to .yarn/cache/@carbon-icons-npm-11.36.0-98d93c9469-e3880a694a.zip index 4418656d90b..dc48df677b9 100644 Binary files a/.yarn/cache/@carbon-icons-npm-11.34.1-f7381f5483-b24dc17886.zip and b/.yarn/cache/@carbon-icons-npm-11.36.0-98d93c9469-e3880a694a.zip differ diff --git a/.yarn/cache/@carbon-pictograms-react-npm-11.56.1-4111610b6d-bdb847921e.zip b/.yarn/cache/@carbon-pictograms-react-npm-11.57.0-097fafcc93-e37a294516.zip similarity index 99% rename from .yarn/cache/@carbon-pictograms-react-npm-11.56.1-4111610b6d-bdb847921e.zip rename to .yarn/cache/@carbon-pictograms-react-npm-11.57.0-097fafcc93-e37a294516.zip index 0c9d1c6f759..a7e16da6142 100644 Binary files a/.yarn/cache/@carbon-pictograms-react-npm-11.56.1-4111610b6d-bdb847921e.zip and b/.yarn/cache/@carbon-pictograms-react-npm-11.57.0-097fafcc93-e37a294516.zip differ diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json index 64247a8022f..c2563df7811 100644 --- a/packages/carbon-web-components/package.json +++ b/packages/carbon-web-components/package.json @@ -90,7 +90,7 @@ "@babel/template": "~7.12.0", "@babel/traverse": "~7.23.7", "@carbon/icon-helpers": "10.46.0", - "@carbon/icons": "11.34.1", + "@carbon/icons": "11.36.0", "@open-wc/semantic-dom-diff": "~0.18.0", "@percy-io/in-percy": "^0.1.11", "@percy/cli": "^1.27.4", diff --git a/packages/carbon-web-components/src/components/data-table/table-header-cell.ts b/packages/carbon-web-components/src/components/data-table/table-header-cell.ts index 119b639fa3d..850213344e5 100644 --- a/packages/carbon-web-components/src/components/data-table/table-header-cell.ts +++ b/packages/carbon-web-components/src/components/data-table/table-header-cell.ts @@ -130,13 +130,13 @@ class CDSTableHeaderCell extends FocusMixin(LitElement) { /** * `true` if the table has expandable rows */ - @property({ type: Boolean, reflect: true, attribute: 'is-sortable' }) + @property({ type: Boolean, reflect: true, attribute: 'expandable' }) isExpandable = false; /** * `true` if this table has selectable rows */ - @property({ type: Boolean, reflect: true, attribute: 'is-sortable' }) + @property({ type: Boolean, reflect: true, attribute: 'is-selectable' }) isSelectable = false; /** * `true` if this table header column should be sortable diff --git a/packages/carbon-web-components/src/components/data-table/table.ts b/packages/carbon-web-components/src/components/data-table/table.ts index 31ce2eb0392..b71627532a3 100644 --- a/packages/carbon-web-components/src/components/data-table/table.ts +++ b/packages/carbon-web-components/src/components/data-table/table.ts @@ -404,9 +404,13 @@ class CDSTable extends HostListenerMixin(LitElement) { const columns = [...this._tableHeaderRow.children]; const columnIndex = columns.indexOf(target); - columns.forEach( - (e) => e !== target && e.setAttribute('sort-direction', 'none') - ); + columns.forEach((e) => { + if (e !== target && this.isSortable) { + e.setAttribute('sort-direction', 'none'); + } else if (e.hasAttribute('is-sortable')) { + e.setAttribute('sort-direction', 'none'); + } + }); this._handleSortAction(columnIndex, sortDirection); @@ -825,10 +829,13 @@ class CDSTable extends HostListenerMixin(LitElement) { } }); - columns.forEach( - (e, index) => - index !== columnIndex && e.setAttribute('sort-direction', 'none') - ); + columns.forEach((e, index) => { + if (index !== columnIndex && this.isSortable) { + e.setAttribute('sort-direction', 'none'); + } else if (e.hasAttribute('is-sortable')) { + e.setAttribute('sort-direction', 'none'); + } + }); this._handleSortAction(columnIndex, sortDirection); } diff --git a/packages/styles/package.json b/packages/styles/package.json index 11a542b4300..95ab3d20359 100644 --- a/packages/styles/package.json +++ b/packages/styles/package.json @@ -29,7 +29,7 @@ "upgrade-carbon": "yarn upgrade-interactive @carbon/layout @carbon/styles @carbon/themes @carbon/icons-react --latest --exact" }, "dependencies": { - "@carbon/icons-react": "11.34.1", + "@carbon/icons-react": "11.36.0", "@carbon/layout": "11.20.1", "@carbon/styles": "1.50.0", "@carbon/telemetry": "0.1.0", diff --git a/packages/web-components/package.json b/packages/web-components/package.json index d611e2f3955..6b822511712 100644 --- a/packages/web-components/package.json +++ b/packages/web-components/package.json @@ -132,9 +132,9 @@ "@babel/traverse": "~7.23.7", "@carbon/ibmdotcom-services-store": "1.53.0", "@carbon/icon-helpers": "10.46.0", - "@carbon/icons": "11.34.1", + "@carbon/icons": "11.36.0", "@carbon/icons-react": "^11.33.0", - "@carbon/pictograms-react": "11.56.1", + "@carbon/pictograms-react": "11.57.0", "@carbon/react": "1.50.0", "@carbon/type": "11.25.1", "@open-wc/semantic-dom-diff": "~0.18.0", diff --git a/yarn.lock b/yarn.lock index d9afe791109..39fb62d2396 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3226,7 +3226,7 @@ __metadata: version: 0.0.0-use.local resolution: "@carbon/ibmdotcom-styles@workspace:packages/styles" dependencies: - "@carbon/icons-react": "npm:11.34.1" + "@carbon/icons-react": "npm:11.36.0" "@carbon/layout": "npm:11.20.1" "@carbon/styles": "npm:1.50.0" "@carbon/telemetry": "npm:0.1.0" @@ -3331,11 +3331,11 @@ __metadata: "@carbon/ibmdotcom-styles": "npm:2.3.0-rc.0" "@carbon/ibmdotcom-utilities": "npm:2.3.0-rc.0" "@carbon/icon-helpers": "npm:10.46.0" - "@carbon/icons": "npm:11.34.1" + "@carbon/icons": "npm:11.36.0" "@carbon/icons-react": "npm:^11.33.0" "@carbon/layout": "npm:11.20.1" "@carbon/motion": "npm:11.16.1" - "@carbon/pictograms-react": "npm:11.56.1" + "@carbon/pictograms-react": "npm:11.57.0" "@carbon/react": "npm:1.50.0" "@carbon/styles": "npm:1.50.0" "@carbon/telemetry": "npm:0.1.0" @@ -3484,36 +3484,36 @@ __metadata: languageName: node linkType: hard -"@carbon/icons-react@npm:11.34.1, @carbon/icons-react@npm:^11.33.0": - version: 11.34.1 - resolution: "@carbon/icons-react@npm:11.34.1" +"@carbon/icons-react@npm:11.36.0, @carbon/icons-react@npm:^11.36.0": + version: 11.36.0 + resolution: "@carbon/icons-react@npm:11.36.0" dependencies: - "@carbon/icon-helpers": "npm:^10.45.0" + "@carbon/icon-helpers": "npm:^10.46.0" "@carbon/telemetry": "npm:0.1.0" prop-types: "npm:^15.7.2" peerDependencies: react: ">=16" - checksum: 10/970581fdaee75b626416a18728c0362cb29a8719288cd2e01203672fa17c64265a67257f3e8b7d7e941c633c1b690db616d31930fbdaff83f00b3284aaa6b93e + checksum: 10/ecb6ec76ce092bbd9f32dc6d1fc68a3e4895ab9ab5f5aaa8ef4dc806479dda33fb6f78798d92d1a66ff3031d446bafe7d5ee99fa325aef782d7de5335bf4ddda languageName: node linkType: hard -"@carbon/icons-react@npm:^11.36.0": - version: 11.36.0 - resolution: "@carbon/icons-react@npm:11.36.0" +"@carbon/icons-react@npm:^11.33.0": + version: 11.34.1 + resolution: "@carbon/icons-react@npm:11.34.1" dependencies: - "@carbon/icon-helpers": "npm:^10.46.0" + "@carbon/icon-helpers": "npm:^10.45.0" "@carbon/telemetry": "npm:0.1.0" prop-types: "npm:^15.7.2" peerDependencies: react: ">=16" - checksum: 10/ecb6ec76ce092bbd9f32dc6d1fc68a3e4895ab9ab5f5aaa8ef4dc806479dda33fb6f78798d92d1a66ff3031d446bafe7d5ee99fa325aef782d7de5335bf4ddda + checksum: 10/970581fdaee75b626416a18728c0362cb29a8719288cd2e01203672fa17c64265a67257f3e8b7d7e941c633c1b690db616d31930fbdaff83f00b3284aaa6b93e languageName: node linkType: hard -"@carbon/icons@npm:11.34.1": - version: 11.34.1 - resolution: "@carbon/icons@npm:11.34.1" - checksum: 10/b24dc17886565c1a7fd98811dce79d3a7e42644ded82bdd277940f4f1111dc9d94658125b7ef386424afe0381c03b0037f1310847770d8c42d53e0b9b12743fc +"@carbon/icons@npm:11.36.0": + version: 11.36.0 + resolution: "@carbon/icons@npm:11.36.0" + checksum: 10/e3880a694a12a03cf3f485e61542bdbe93e1d6dcc2d2ca427322f5aeb0b35a287910d0c66af41ab43a59c12fa329d0ae1cfbd7504a79474a68aa2dab23e7235d languageName: node linkType: hard @@ -3531,16 +3531,16 @@ __metadata: languageName: node linkType: hard -"@carbon/pictograms-react@npm:11.56.1": - version: 11.56.1 - resolution: "@carbon/pictograms-react@npm:11.56.1" +"@carbon/pictograms-react@npm:11.57.0": + version: 11.57.0 + resolution: "@carbon/pictograms-react@npm:11.57.0" dependencies: - "@carbon/icon-helpers": "npm:^10.45.0" + "@carbon/icon-helpers": "npm:^10.46.0" "@carbon/telemetry": "npm:0.1.0" prop-types: "npm:^15.7.2" peerDependencies: react: ">=16" - checksum: 10/bdb847921ec8b85b807169715ae7bf1bbfebb3c84fff8c50024942091f7cf84864c4303bf936994ec50a931abc6bb2a3cb9c2596a467cfe56d6ba7778acbaf1b + checksum: 10/e37a294516c5872fcb50110667853ed31f1bef069746f109cf2dde4906a59c1a5a1c0d36d2492ad7598f75e2ebf4e98fbeed23100bafd19bc74469f086e25035 languageName: node linkType: hard @@ -3664,7 +3664,7 @@ __metadata: "@babel/traverse": "npm:~7.23.7" "@carbon/ibm-products-styles": "npm:2.20.1" "@carbon/icon-helpers": "npm:10.46.0" - "@carbon/icons": "npm:11.34.1" + "@carbon/icons": "npm:11.36.0" "@carbon/styles": "npm:1.50.0" "@open-wc/semantic-dom-diff": "npm:~0.18.0" "@percy-io/in-percy": "npm:^0.1.11"