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(checkbox): add component tokens #10221

Merged
merged 9 commits into from
Sep 13, 2024
4 changes: 0 additions & 4 deletions packages/calcite-components/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7852,9 +7852,7 @@ declare global {
new (): HTMLCalciteTileSelectGroupElement;
};
interface HTMLCalciteTimePickerElementEventMap {
"calciteInternalTimePickerBlur": void;
"calciteInternalTimePickerChange": string;
"calciteInternalTimePickerFocus": void;
}
interface HTMLCalciteTimePickerElement extends Components.CalciteTimePicker, HTMLStencilElement {
addEventListener<K extends keyof HTMLCalciteTimePickerElementEventMap>(type: K, listener: (this: HTMLCalciteTimePickerElement, ev: CalciteTimePickerCustomEvent<HTMLCalciteTimePickerElementEventMap[K]>) => any, options?: boolean | AddEventListenerOptions): void;
Expand Down Expand Up @@ -13817,9 +13815,7 @@ declare namespace LocalJSX {
* Specifies the Unicode numeral system used by the component for localization.
*/
"numberingSystem"?: NumberingSystem;
"onCalciteInternalTimePickerBlur"?: (event: CalciteTimePickerCustomEvent<void>) => void;
"onCalciteInternalTimePickerChange"?: (event: CalciteTimePickerCustomEvent<string>) => void;
"onCalciteInternalTimePickerFocus"?: (event: CalciteTimePickerCustomEvent<void>) => void;
/**
* Specifies the size of the component.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ import {
HYDRATED_ATTR,
labelable,
hidden,
themed,
} from "../../tests/commonTests";
import { html } from "../../../support/formatting";
import { Scale } from "../interfaces";
import { Direction } from "../../utils/dom";
import { CSS } from "./resources";

describe("calcite-checkbox", () => {
describe("honors hidden attribute", () => {
Expand Down Expand Up @@ -219,4 +221,23 @@ describe("calcite-checkbox", () => {
});
});
});

describe("theme", () => {
themed(html` <calcite-checkbox name="s-unchecked" scale="s"></calcite-checkbox> `, {
"--calcite-checkbox-size": [
{
shadowSelector: `.${CSS.check}`,
targetProp: "inlineSize",
},
{
shadowSelector: `.${CSS.check}`,
targetProp: "blockSize",
},
],
"--calcite-checkbox-icon-color": {
shadowSelector: `.${CSS.check}`,
targetProp: "color",
},
});
});
});
33 changes: 21 additions & 12 deletions packages/calcite-components/src/components/checkbox/checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,31 @@
* These properties can be overridden using the component's tag as selector.
*
* @prop --calcite-checkbox-size: Specifies the component's height and width.
* @prop --calcite-checkbox-border-color: Specifies the component's color.
* @prop --calcite-checkbox-border-color-hover: Specifies the component's color when hovered.
* @prop --calcite-checkbox-icon-color: Specifies the component's font color.
*/

:host([scale="s"]) {
--calcite-checkbox-size: theme("spacing.3");
.check-svg,
.toggle {
inline-size: var(--calcite-checkbox-size, theme("spacing.3"));
block-size: var(--calcite-checkbox-size, theme("spacing.3"));
}
}
:host([scale="m"]) {
--calcite-checkbox-size: theme("fontSize.n1");
.check-svg,
.toggle {
inline-size: var(--calcite-checkbox-size, theme("fontSize.n1"));
block-size: var(--calcite-checkbox-size, theme("fontSize.n1"));
}
}
:host([scale="l"]) {
--calcite-checkbox-size: theme("spacing.4");
.check-svg,
.toggle {
inline-size: var(--calcite-checkbox-size, theme("spacing.4"));
block-size: var(--calcite-checkbox-size, theme("spacing.4"));
}
}

:host {
Expand All @@ -23,12 +38,6 @@
select-none;
-webkit-tap-highlight-color: transparent;

.check-svg,
.toggle {
inline-size: var(--calcite-checkbox-size);
block-size: var(--calcite-checkbox-size);
}

.check-svg {
@apply bg-foreground-1
pointer-events-none
Expand All @@ -39,8 +48,8 @@
stroke-current
stroke-1
transition-default;
box-shadow: inset 0 0 0 1px var(--calcite-color-border-input);
color: theme("backgroundColor.background");
box-shadow: inset 0 0 0 1px var(--calcite-checkbox-border-color, var(--calcite-color-border-input));
color: var(--calcite-checkbox-icon-color, theme("backgroundColor.background"));
}
}

Expand All @@ -63,7 +72,7 @@
:host([hovered]) .toggle,
:host .toggle:hover {
.check-svg {
box-shadow: inset 0 0 0 2px var(--calcite-color-brand);
box-shadow: inset 0 0 0 2px var(--calcite-checkbox-border-color-hover, var(--calcite-color-brand));
alisonailea marked this conversation as resolved.
Show resolved Hide resolved
}
}

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 @@ -14,7 +14,7 @@ import { accordionItemTokens } from "./custom-theme/accordion-item";
import { accordion, accordionTokens } from "./custom-theme/accordion";
import { buttons } from "./custom-theme/button";
import { card, cardThumbnail, cardTokens } from "./custom-theme/card";
import { checkbox } from "./custom-theme/checkbox";
import { checkbox, checkboxTokens } from "./custom-theme/checkbox";
import { chips } from "./custom-theme/chips";
import { datePicker } from "./custom-theme/date-picker";
import { dropdown } from "./custom-theme/dropdown";
Expand Down Expand Up @@ -128,6 +128,7 @@ export default {
...actionPadTokens,
...actionGroupTokens,
...cardTokens,
...checkboxTokens,
...handleTokens,
...progressTokens,
...inputTokens,
Expand All @@ -149,6 +150,7 @@ export const theming_TestOnly = (): string => {
...actionPadTokens,
...actionGroupTokens,
...cardTokens,
...checkboxTokens,
...handleTokens,
...progressTokens,
...inputTokens,
Expand Down
6 changes: 6 additions & 0 deletions packages/calcite-components/src/custom-theme/checkbox.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import { html } from "../../support/formatting";

export const checkboxTokens = {
calciteCheckboxSize: "",
calciteCheckboxColor: "",
Copy link
Contributor

Choose a reason for hiding this comment

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

add calciteCheckboxBorderColor

calciteCheckboxBorderColor: "",
};

export const checkbox = html`<label>
<calcite-checkbox indeterminate></calcite-checkbox>
Initially indeterminate and unchecked
Expand Down
Loading