Skip to content

feat(table): Update multiple selection iconography #10125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
macandcheese merged 7 commits into from
Aug 21, 2024
+147 −4
Merged

feat(table): Update multiple selection iconography #10125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a13def
feat(table): Update selection iconography
macandcheese Aug 21, 2024
c0004e1
Merge branch 'dev' into macandcheese/10123-table-update-selection-ico…
macandcheese Aug 21, 2024
954f07f
Clean up
macandcheese Aug 21, 2024
235ba4b
Merge branch 'dev' into macandcheese/10123-table-update-selection-ico…
macandcheese Aug 21, 2024
c952376
Clean up
macandcheese Aug 21, 2024
baadd0f
Merge branch 'dev' into macandcheese/10123-table-update-selection-ico…
macandcheese Aug 21, 2024
cbd2a27
Merge branch 'dev' into macandcheese/10123-table-update-selection-ico…
macandcheese Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/calcite-components/src/components/table-header/resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@ export const CSS = {
lastCell: "last-cell",
staticCell: "static-cell",
};

export const ICONS = {
checked: "check-square-f",
indeterminate: "minus-square-f",
unchecked: "square",
};
14 changes: 10 additions & 4 deletions packages/calcite-components/src/components/table-header/table-header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Alignment, Scale, SelectionMode } from "../interfaces";
import { RowType, TableInteractionMode } from "../table/interfaces";
import { getIconScale } from "../../utils/component";
import { TableHeaderMessages } from "./assets/table-header/t9n";
import { CSS } from "./resources";
import { CSS, ICONS } from "./resources";

@Component({
tag: "calcite-table-header",
Expand Down Expand Up @@ -216,8 +216,14 @@ export class TableHeader implements LocalizedComponent, LoadableComponent, T9nCo
? "row"
: "col";

const allSelected = this.selectedRowCount === this.bodyRowCount;
const selectionIcon = allSelected ? "check-square-f" : "check-square";
const checked = this.selectedRowCount === this.bodyRowCount;
const indeterminate = this.selectedRowCount > 0;
const selectionIcon = checked
? ICONS.checked
: indeterminate
? ICONS.indeterminate
: ICONS.unchecked;

const staticCell = this.interactionMode === "static" && !this.selectionCell;
return (
<Host>
Expand Down Expand Up @@ -249,7 +255,7 @@ export class TableHeader implements LocalizedComponent, LoadableComponent, T9nCo
{this.description && <div class={CSS.description}>{this.description}</div>}
{this.selectionCell && this.selectionMode === "multiple" && (
<calcite-icon
class={{ [CSS.active]: allSelected }}
class={{ [CSS.active]: indeterminate || checked }}
icon={selectionIcon}
scale={getIconScale(this.scale)}
/>
Expand Down
131 changes: 131 additions & 0 deletions packages/calcite-components/src/components/table/table.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,38 @@ export const singleSelection_TestOnly = (): string =>
</calcite-table-row>
</calcite-table>`;

export const singleSelectionSelected_TestOnly = (): string =>
html` <calcite-table selection-mode="single" caption="selection-mode single table">
<calcite-action slot="selection-actions" icon="layer"></calcite-action>
<calcite-action slot="selection-actions" icon="send"></calcite-action>
<calcite-action slot="selection-actions" icon="copy"></calcite-action>
<calcite-action slot="selection-actions" icon="plus"></calcite-action>
<calcite-table-row slot="table-header">
<calcite-table-header heading="Heading"></calcite-table-header>
<calcite-table-header heading="Heading"></calcite-table-header>
<calcite-table-header heading="Heading"></calcite-table-header>
<calcite-table-header heading="Heading"></calcite-table-header>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
</calcite-table>`;

export const selectionModeMultipleAndSelectedOnLoad_TestOnly = (): string =>
html` <calcite-table
page-size="4"
Expand Down Expand Up @@ -836,6 +868,105 @@ export const selectionModeMultipleAndSelectedOnLoad_TestOnly = (): string =>
</calcite-table-row>
</calcite-table>`;

export const selectionModeMultipleAndAllSelectedSinglePageOnLoad_TestOnly = (): string =>
html` <calcite-table selection-mode="multiple" numbered caption="selection-mode multiple with selected at load">
<calcite-action slot="selection-actions" icon="layer"></calcite-action>
<calcite-action slot="selection-actions" icon="send"></calcite-action>
<calcite-action slot="selection-actions" icon="copy"></calcite-action>
<calcite-action slot="selection-actions" icon="plus"></calcite-action>
<calcite-table-row slot="table-header">
<calcite-table-header heading="Heading"></calcite-table-header>
<calcite-table-header heading="Heading"></calcite-table-header>
<calcite-table-header heading="Heading"></calcite-table-header>
<calcite-table-header heading="Heading"></calcite-table-header>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
</calcite-table>`;

export const selectionModeMultipleAndAllSelectedMultiplePagesOnLoad_TestOnly = (): string =>
html` <calcite-table
page-size="4"
selection-mode="multiple"
numbered
caption="selection-mode multiple with selected at load"
>
<calcite-action slot="selection-actions" icon="layer"></calcite-action>
<calcite-action slot="selection-actions" icon="send"></calcite-action>
<calcite-action slot="selection-actions" icon="copy"></calcite-action>
<calcite-action slot="selection-actions" icon="plus"></calcite-action>
<calcite-table-row slot="table-header">
<calcite-table-header heading="Heading"></calcite-table-header>
<calcite-table-header heading="Heading"></calcite-table-header>
<calcite-table-header heading="Heading"></calcite-table-header>
<calcite-table-header heading="Heading"></calcite-table-header>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
<calcite-table-row selected>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
<calcite-table-cell>cell</calcite-table-cell>
</calcite-table-row>
</calcite-table>`;

export const selectionModeMultipleAndSelectedSelectionDisplayNoneOnLoad = (): string =>
html` <calcite-table
page-size="4"
Expand Down