Skip to content
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

feat(chip): enhance component's interactivity states #11538

Merged
merged 5 commits into from
Feb 15, 2025
Merged

feat(chip): enhance component's interactivity states #11538

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5887bc6
feat(chip): enhance component's interactivity states
aPreciado88 Feb 12, 2025
92ee5bc
Merge branch 'dev' of github.com:Esri/calcite-design-system into aPre…
aPreciado88 Feb 13, 2025
4508fec
feat(chip): add interactivity stories
aPreciado88 Feb 14, 2025
0f44d64
feat(chip): remove _TestOnly from screenshot test
aPreciado88 Feb 14, 2025
a9cf93e
feat(chip): remove snapshot test inline styles
aPreciado88 Feb 14, 2025
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
76 changes: 76 additions & 0 deletions packages/calcite-components/src/components/chip-group/chip-group.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,79 @@ export const darkThemeRTL_TestOnly = (): string => html`
`;

darkThemeRTL_TestOnly.parameters = { themes: modesDarkDefault };

export const interactivityStates = (): string => html`
<div style="width:500px; max-width:100%; background-color:white; padding:100px">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might not be the case, but let’s remove any non-essential inline styles for the test to keep it as focused and simple as possible.

<h2>appearance="solid" & kind="neutral"</h2>
<calcite-chip-group selection-mode="single">
<calcite-chip appearance="solid" kind="neutral" value="forest">Forest</calcite-chip>
<calcite-chip appearance="solid" kind="neutral" value="tundra">Tundra</calcite-chip>
<calcite-chip appearance="solid" kind="neutral" value="shore">Seashore</calcite-chip>
<calcite-chip appearance="solid" kind="neutral" value="estuary">Estuary</calcite-chip>
</calcite-chip-group>

<h2>appearance="solid" & kind="inverse"</h2>
<calcite-chip-group selection-mode="single">
<calcite-chip appearance="solid" kind="inverse" value="forest">Forest</calcite-chip>
<calcite-chip appearance="solid" kind="inverse" value="tundra">Tundra</calcite-chip>
<calcite-chip appearance="solid" kind="inverse" value="shore">Seashore</calcite-chip>
<calcite-chip appearance="solid" kind="inverse" value="estuary">Estuary</calcite-chip>
</calcite-chip-group>

<h2>appearance="solid" & kind="brand"</h2>
<calcite-chip-group selection-mode="single">
<calcite-chip appearance="solid" kind="brand" value="forest">Forest</calcite-chip>
<calcite-chip appearance="solid" kind="brand" value="tundra">Tundra</calcite-chip>
<calcite-chip appearance="solid" kind="brand" value="shore">Seashore</calcite-chip>
<calcite-chip appearance="solid" kind="brand" value="estuary">Estuary</calcite-chip>
</calcite-chip-group>

<h2>appearance="outline-fill" & kind="neutral"</h2>
<calcite-chip-group selection-mode="single">
<calcite-chip appearance="outline-fill" kind="neutral" value="forest">Forest</calcite-chip>
<calcite-chip appearance="outline-fill" kind="neutral" value="tundra">Tundra</calcite-chip>
<calcite-chip appearance="outline-fill" kind="neutral" value="shore">Seashore</calcite-chip>
<calcite-chip appearance="outline-fill" kind="neutral" value="estuary">Estuary</calcite-chip>
</calcite-chip-group>

<h2>appearance="outline-fill" & kind="inverse"</h2>
<calcite-chip-group selection-mode="single">
<calcite-chip appearance="outline-fill" kind="inverse" value="forest">Forest</calcite-chip>
<calcite-chip appearance="outline-fill" kind="inverse" value="tundra">Tundra</calcite-chip>
<calcite-chip appearance="outline-fill" kind="inverse" value="shore">Seashore</calcite-chip>
<calcite-chip appearance="outline-fill" kind="inverse" value="estuary">Estuary</calcite-chip>
</calcite-chip-group>

<h2>appearance="outline-fill" & kind="brand"</h2>
<calcite-chip-group selection-mode="single">
<calcite-chip appearance="outline-fill" kind="brand" value="forest">Forest</calcite-chip>
<calcite-chip appearance="outline-fill" kind="brand" value="tundra">Tundra</calcite-chip>
<calcite-chip appearance="outline-fill" kind="brand" value="shore">Seashore</calcite-chip>
<calcite-chip appearance="outline-fill" kind="brand" value="estuary">Estuary</calcite-chip>
</calcite-chip-group>

<h2>appearance="outline" & kind="neutral"</h2>
<calcite-chip-group selection-mode="single">
<calcite-chip appearance="outline" kind="neutral" value="forest">Forest</calcite-chip>
<calcite-chip appearance="outline" kind="neutral" value="tundra">Tundra</calcite-chip>
<calcite-chip appearance="outline" kind="neutral" value="shore">Seashore</calcite-chip>
<calcite-chip appearance="outline" kind="neutral" value="estuary">Estuary</calcite-chip>
</calcite-chip-group>

<h2>appearance="outline" & kind="inverse"</h2>
<calcite-chip-group selection-mode="single">
<calcite-chip appearance="outline" kind="inverse" value="forest">Forest</calcite-chip>
<calcite-chip appearance="outline" kind="inverse" value="tundra">Tundra</calcite-chip>
<calcite-chip appearance="outline" kind="inverse" value="shore">Seashore</calcite-chip>
<calcite-chip appearance="outline" kind="inverse" value="estuary">Estuary</calcite-chip>
</calcite-chip-group>

<h2>appearance="outline" & kind="brand"</h2>
<calcite-chip-group selection-mode="single">
<calcite-chip appearance="outline" kind="brand" value="forest">Forest</calcite-chip>
<calcite-chip appearance="outline" kind="brand" value="tundra">Tundra</calcite-chip>
<calcite-chip appearance="outline" kind="brand" value="shore">Seashore</calcite-chip>
<calcite-chip appearance="outline" kind="brand" value="estuary">Estuary</calcite-chip>
</calcite-chip-group>
</div>
`;
89 changes: 89 additions & 0 deletions packages/calcite-components/src/components/chip/chip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,95 @@
opacity: 1;
}

:host([appearance="solid"]) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would internal CSS props help simplify this?

.container {
  &.selectable {
    &:active {
      background-color: var(--calcite-internal-chip-selectable-active-background-color);
      border-color: var(--calcite-internal-chip-selectable-active-border-color);
    }
    &:hover {
      background-color: var(--calcite-internal-chip-selectable-hover-background-color);
      border-color: var(--calcite-internal-chip-selectable-hover-border-color);
    }
}

:host([appearance="solid"]) {
  &:host([kind="neutral"]) {
    // using illustrative names
    --calcite-internal-chip-selectable-active-background-color: var(--calcite-color-a);
    --calcite-internal-chip-selectable-active-border-color: transparent;
    --calcite-internal-chip-selectable-hover-background-color: var(--calcite-color-c);
    --calcite-internal-chip-selectable-hover-border-color: transparent;    
  }
}

// ...

This can be done in a follow-up if feasible.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can take a look at this and create a follow-up issue if it's feasible.

&:host([kind="neutral"]) .container {
&.selectable {
&:hover {
background-color: var(--calcite-color-foreground-3);
}
&:active {
background-color: var(--calcite-color-border-3);
}
}
}

&:host([kind="inverse"]) .container {
&.selectable {
&:hover {
background-color: var(--calcite-color-inverse-hover);
}
&:active {
background-color: var(--calcite-color-inverse-press);
}
}
}

&:host([kind="brand"]) .container {
&.selectable {
&:hover {
background-color: var(--calcite-color-brand-hover);
}
&:active {
background-color: var(--calcite-color-brand-press);
}
}
}
}

:host([appearance="outline-fill"]) {
&:host([kind="neutral"]) .container {
&.selectable {
&:hover {
background-color: var(--calcite-color-foreground-2);
border-color: var(--calcite-color-border-input);
}
&:active {
background-color: var(--calcite-color-foreground-3);
border-color: var(--calcite-color-text-3);
}
}
}

&:host([kind="inverse"]) .container,
&:host([kind="brand"]) .container {
&.selectable {
&:hover {
background-color: var(--calcite-color-foreground-2);
}
&:active {
background-color: var(--calcite-color-foreground-3);
}
}
}
}

:host([appearance="outline"]) {
&:host([kind="neutral"]) .container {
&.selectable {
&:hover {
background-color: var(--calcite-color-transparent-hover);
border-color: var(--calcite-color-border-input);
}
&:active {
background-color: var(--calcite-color-transparent-press);
border-color: var(--calcite-color-text-3);
}
}
}

&:host([kind="inverse"]) .container,
&:host([kind="brand"]) .container {
&.selectable {
&:hover {
background-color: var(--calcite-color-transparent-hover);
}
&:active {
background-color: var(--calcite-color-transparent-press);
}
}
}
}

:host([scale="s"]) {
.container {
--calcite-internal-chip-block-size: var(--calcite-size-sm, 1.5rem) /* 24px */;
Expand Down