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.

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(color-picker): add component tokens #11622

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
// @ts-strict-ignore
import { E2EElement, E2EPage, EventSpy, newE2EPage } from "@arcgis/lumina-compiler/puppeteerTesting";
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, MockInstance, vi } from "vitest";
import { accessible, defaults, disabled, focusable, hidden, reflects, renders, t9n } from "../../tests/commonTests";
import {
accessible,
defaults,
disabled,
focusable,
hidden,
reflects,
renders,
t9n,
themed,
} from "../../tests/commonTests";
import {
findAll,
getElementRect,
Expand Down Expand Up @@ -2506,4 +2516,13 @@ describe("calcite-color-picker", () => {

await expect(doTest()).resolves.toBeUndefined();
});

describe.skip("theme", () => {
themed(html`<calcite-color-picker></calcite-color-picker>`, {
"--calcite-color-picker-size": {
selector: `calcite-color-picker`,
targetProp: "inlineSize",
},
});
});
});
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
/**
* CSS Custom Properties
*
* These properties can be overridden using the component's tag as selector.
*
* @prop --calcite-color-picker-size: Specifies the component's width.
*/

:host {
@apply text-n2h inline-block font-normal;

inline-size: var(--calcite-internal-color-picker-min-width);
min-inline-size: var(--calcite-internal-color-picker-min-width);
inline-size: var(--calcite-color-picker-size, var(--calcite-internal-color-picker-min-size));
min-inline-size: var(--calcite-color-picker-size, var(--calcite-internal-color-picker-min-size));
}

@include disabled();

:host([scale="s"]) {
--calcite-internal-color-picker-min-width: 200px;
--calcite-color-picker-spacing: 8px;
--calcite-internal-color-picker-min-size: 200px;
--calcite-internal-color-picker-space: 8px;

.saved-colors {
@apply gap-1;
Expand All @@ -18,19 +26,19 @@
}

:host([scale="m"]) {
--calcite-internal-color-picker-min-width: 240px;
--calcite-color-picker-spacing: 12px;
--calcite-internal-color-picker-min-size: 240px;
--calcite-internal-color-picker-space: 12px;
}

:host([scale="l"]) {
--calcite-internal-color-picker-min-width: 304px;
--calcite-color-picker-spacing: 16px;
--calcite-internal-color-picker-min-size: 304px;
--calcite-internal-color-picker-space: 16px;

@apply text-n1h;

.section {
&:first-of-type {
padding-block-start: var(--calcite-color-picker-spacing);
padding-block-start: var(--calcite-internal-color-picker-space);
}
}

Expand Down Expand Up @@ -94,23 +102,23 @@
}

.section {
padding-block: 0 var(--calcite-color-picker-spacing);
padding-inline: var(--calcite-color-picker-spacing);
padding-block: 0 var(--calcite-internal-color-picker-space);
padding-inline: var(--calcite-internal-color-picker-space);

&:first-of-type {
padding-block-start: var(--calcite-color-picker-spacing);
padding-block-start: var(--calcite-internal-color-picker-space);
}
}

.sliders {
@apply flex flex-col justify-between;
margin-inline-start: var(--calcite-color-picker-spacing);
margin-inline-start: var(--calcite-internal-color-picker-space);
gap: var(--calcite-spacing-xxs);
}

.preview-and-sliders {
@apply flex items-center;
padding: var(--calcite-color-picker-spacing);
padding: var(--calcite-internal-color-picker-space);
}

.color-hex-options,
Expand All @@ -126,7 +134,7 @@
}

.color-mode-container {
padding-block-start: var(--calcite-color-picker-spacing);
padding-block-start: var(--calcite-internal-color-picker-space);
}

.channels {
Expand Down Expand Up @@ -159,7 +167,7 @@

.saved-colors {
@apply grid gap-2;
padding-block-start: var(--calcite-color-picker-spacing);
padding-block-start: var(--calcite-internal-color-picker-space);
grid-template-columns: repeat(auto-fill, 24px);
}

Expand Down
4 changes: 3 additions & 1 deletion packages/calcite-components/src/custom-theme.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import { navigationUserTokens, navigationUsers } from "./custom-theme/navigation
import { tileTokens, tile } from "./custom-theme/tile";
import { navigationTokens, navigation } from "./custom-theme/navigation";
import { menuItem, menuItemTokens } from "./custom-theme/menu-item";
import { colorPicker, colorPickerTokens } from "./custom-theme/color-picker";

const globalTokens = {
calciteColorBrand: "#007ac2",
Expand Down Expand Up @@ -146,7 +147,7 @@ const kitchenSink = (args: Record<string, string>, useTestValues = false) =>
${avatarThumbnail} ${progress} ${handle} ${graph} ${textArea} ${popover} ${tile} ${tooltip} ${comboboxItem}
</div>
<div class="demo-column">
${navigation} ${navigationLogos} ${navigationUsers} ${blockSection} ${block} ${rating}
${navigation} ${navigationLogos} ${navigationUsers} ${blockSection} ${block} ${rating} ${colorPicker}
</div>
<div class="demo-column"><div class="demo-column">${alert}</div></div>
<div class="demo-column">${menuItem}</div>
Expand Down Expand Up @@ -204,6 +205,7 @@ const componentTokens = {
...tileTokens,
...tooltipTokens,
...menuItemTokens,
...colorPickerTokens,
};

export default {
Expand Down
7 changes: 7 additions & 0 deletions packages/calcite-components/src/custom-theme/color-picker.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { html } from "../../support/formatting";

export const colorPickerTokens = {
calciteColorPickerSize: "",
};

export const colorPicker = html`<calcite-color-picker></calcite-color-picker>`;