Skip to content

Allow color gradient in color swatch #1074

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

Open
wants to merge 2 commits into
base: v1/contrib
Choose a base branch
from
Open

Allow color gradient in color swatch #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5085b5c
Allow color gradient in color swatch
bjarnef Apr 19, 2025
855b992
Add story
bjarnef Apr 19, 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
2 changes: 1 addition & 1 deletion packages/uui-color-swatch/lib/uui-color-swatch.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export class UUIColorSwatchElement extends LabelMixin(
<div class="color-swatch color-swatch--transparent-bg">
<div
class="color-swatch__color"
style="background-color: var(--uui-swatch-color, ${this.color ??
style="background: var(--uui-swatch-color, ${this.color ??
this.value})"></div>
<div
class="color-swatch__check"
Expand Down
9 changes: 9 additions & 0 deletions packages/uui-color-swatch/lib/uui-color-swatch.story.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,12 @@ export const Transparent: Story = {
value: 'rgba(209, 2, 26, 0.4)',
},
};

export const Gradient: Story = {
args: {
value: 'sun',
color: 'radial-gradient(orange, red)',
label: 'Sun',
showLabel: true,
},
};
58 changes: 54 additions & 4 deletions packages/uui-color-swatches/lib/uui-color-swatches.story.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,57 @@ import type { Meta, StoryObj } from '@storybook/web-components';
import { spread } from '../../../storyhelpers';
import { repeat } from 'lit/directives/repeat.js';

const swatchesColor = [
const swatches = [
{ label: 'Blood Orange', value: '#d0021b' },
{ label: 'Avocado', value: '#417505' },
{ label: 'Tufts Blue', value: '#4a90e2' },
];

const gradients = [
{
label: 'Vital Ocean',
value: 'ocean',
color:
'linear-gradient(90deg,rgba(2, 0, 36, 1) 0%, rgba(9, 9, 121, 1) 35%, rgba(0, 212, 255, 1) 100%)',
},
{
label: 'Disco Club',
value: 'avocado',
color:
'radial-gradient(circle,rgba(63, 94, 251, 1) 0%, rgba(252, 70, 107, 1) 100%)',
},
{
label: 'Deep Sunset',
value: 'sunset',
color:
'linear-gradient(90deg,rgba(131, 58, 180, 1) 0%, rgba(253, 29, 29, 1) 50%, rgba(252, 176, 69, 1) 100%)',
},
{
label: 'Bubble Gum',
value: 'gum',
color:
'radial-gradient(circle,rgba(238, 174, 202, 1) 0%, rgba(148, 187, 233, 1) 100%)',
},
{
label: 'Blue Lagoon',
value: 'lagoon',
color:
'linear-gradient(90deg,rgba(67, 198, 172, 1) 0%, rgba(25, 22, 84, 1) 100%)',
},
{
label: 'Lemon Twist',
value: 'lemon-twist',
color:
'linear-gradient(90deg,rgba(60, 165, 92, 1) 0%, rgba(181, 172, 73, 1) 100%)',
},
];

const meta: Meta = {
id: 'uui-color-swatches',
component: 'uui-color-swatches',
title: 'Inputs/Color/Color Swatches',
args: {
swatches: swatchesColor,
swatches: swatches,
},
argTypes: {
value: { control: { type: 'color' } },
Expand All @@ -26,14 +65,17 @@ const meta: Meta = {
render: (args: any) => html`
<uui-color-swatches
${spread(args, ['swatches', 'showLabel'])}
label="My color pallette">${repeat(args.swatches, (swatch: any) => {
label="My color palette">${repeat(args.swatches, (swatch: any) => {
const label = typeof swatch === 'string' ? swatch : swatch.label;
const value = typeof swatch === 'string' ? swatch : swatch.value;
const color = typeof swatch === 'string' ? swatch : swatch.color;
Copy link
Preview

Copilot AI Apr 19, 2025

Choose a reason for hiding this comment

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

Consider ensuring that all swatch objects intended to display gradients explicitly include a 'color' property, as using a string fallback may lead to unexpected behavior when gradients are desired.

Copilot is powered by AI, so mistakes are possible. Review output carefully before use.

return html`
<uui-color-swatch
label="${label}"
.showLabel=${args.showLabel}
.value=${value}></uui-color-swatch>`;
.color="${color}"
.value=${value}>
</uui-color-swatch>`;
})}
</uui-color-swatches>
`,
Expand Down Expand Up @@ -72,3 +114,11 @@ export const ShowLabel: Story = {
showLabel: true,
},
};

export const Gradient: Story = {
args: {
swatches: gradients,
showLabel: true,
value: 'lemon-twist',
},
};
Loading