Merge branch 'features/ui' into button

src/ui/__tests__/utils.test.ts

@@ -0,0 +1,56 @@
+import { cls } from "../utils";
+
+/**
+ * Provides assertions for the {@link cls} utility function.
+ */
+describe("cls", () => {
+	test.each([
+		{
+			name: "empty is undefined",
+			values: [],
+			expected: "",
+		},
+		{
+			name: "single string",
+			values: ["test"],
+			expected: "test",
+		},
+		{
+			name: "multiple strings",
+			values: ["foo", "bar"],
+			expected: "foo bar",
+		},
+		{
+			name: "truthy",
+			// eslint-disable-next-line no-constant-binary-expression
+			values: [1 && "yes"],
+			expected: "yes",
+		},
+		{
+			name: "falsy undefined",
+			// eslint-disable-next-line no-constant-binary-expression
+			values: [undefined && "no", "yes"],
+			expected: "yes",
+		},
+		{
+			name: "falsy null",
+			// eslint-disable-next-line no-constant-binary-expression
+			values: [null && "no", "yes"],
+			expected: "yes",
+		},
+		{
+			name: "falsy 0",
+			// eslint-disable-next-line no-constant-binary-expression
+			values: [0 && "no", "yes"],
+			expected: "yes",
+		},
+		{
+			name: "hyphens",
+			// eslint-disable-next-line no-constant-binary-expression
+			values: [true && "container--disabled"],
+			expected: "container--disabled",
+		},
+	])("$name", ({ values, expected }) => {
+		expect(cls(...values)).toBe(expected);
+	});
+});

src/ui/components/index.ts

@@ -1,7 +1,9 @@
-import "./button";
-import "./field";
-import "./label";
-import "./option";
-import "./radio-group";
-import "./switch";
-import "./text-field";
+export * from "./button";
+export * from "./field";
+export * from "./label";
+export * from "./option";
+export * from "./radio";
+export * from "./radio-group";
+export * from "./switch";
+export * from "./text-area";
+export * from "./text-field";

src/ui/components/option.ts

@@ -11,21 +11,22 @@ export class SDOptionElement extends LitElement {
 	/**
 	 * Private backing field for {@link SDOptionElement.value}.
 	 */
-	#value: boolean | number | string | undefined;
+	#value: boolean | number | string | null | undefined = null;
 
 	/**
 	 * Determines whether the option is disabled; default `false`.
 	 */
-	@property({ type: Boolean })
+	@property({
+		reflect: true,
+		type: Boolean,
+	})
 	public accessor disabled: boolean = false;
 
 	/**
-	 * Label that represents the option; read from the `innerText` of the element.
-	 * @returns The label.
+	 * Label that represents the option.
 	 */
-	public get label(): string {
-		return this.innerText;
-	}
+	@property()
+	public accessor label: string | undefined;
 
 	/**
 	 * Type of the value; allows for the value to be converted to a boolean or number.
@@ -44,23 +45,44 @@ export class SDOptionElement extends LitElement {
 	 * @returns The value.
 	 */
 	public get value(): boolean | number | string | undefined {
+		if (this.#value === null) {
+			if (this.type === "boolean") {
+				this.#value = parseBoolean(this.htmlValue);
+			} else if (this.type === "number") {
+				this.#value = parseNumber(this.htmlValue);
+			} else {
+				this.#value = this.htmlValue;
+			}
+		}
+
 		return this.#value;
 	}
 
+	/**
+	 * Sets the value of the option, and associated type.
+	 * @param value New value.
+	 */
+	public set value(value: boolean | number | string | undefined) {
+		this.type = typeof value === "number" ? "number" : typeof value === "boolean" ? "boolean" : "string";
+		this.htmlValue = value?.toString();
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	protected override update(changedProperties: Map<PropertyKey, unknown>): void {
+		super.update(changedProperties);
+		this.dispatchEvent(new Event("update"));
+	}
+
 	/**
 	 * @inheritdoc
 	 */
 	protected override willUpdate(_changedProperties: Map<PropertyKey, unknown>): void {
 		super.willUpdate(_changedProperties);
 
 		if (_changedProperties.has("type") || _changedProperties.has("value")) {
-			if (this.type === "boolean") {
-				this.#value = parseBoolean(this.htmlValue);
-			} else if (this.type === "number") {
-				this.#value = parseNumber(this.htmlValue);
-			} else {
-				this.#value = this.htmlValue;
-			}
+			this.#value = null;
 		}
 	}
 }

src/ui/components/radio-group.ts

@@ -1,11 +1,10 @@
 import { css, html, LitElement, type TemplateResult } from "lit";
 import { customElement } from "lit/decorators.js";
-import { ifDefined } from "lit/directives/if-defined.js";
 import { repeat } from "lit/directives/repeat.js";
 
 import { Input } from "../mixins/input";
 import { List } from "../mixins/list";
-import { preventDoubleClickSelection } from "../utils";
+import { SDRadioElement } from "./radio";
 
 /**
  * Element that offers persisting a value via a list of radio options.
@@ -17,92 +16,10 @@ export class SDRadioGroupElement extends List(Input<boolean | number | string>(L
 	 */
 	public static styles = [
 		super.styles ?? [],
+		...SDRadioElement.styles,
 		css`
-			label {
+			sd-radio {
 				display: flex;
-				align-items: center;
-			}
-
-			input {
-				/* Hide the input, whilst still allowing focus */
-				height: 0;
-				opacity: 0;
-				position: absolute;
-				width: 0;
-			}
-
-			/**
-			 * Radio button replacement.
-			 */
-
-			.indicator {
-				--size: calc(var(--size-m) - calc(var(--border-width-thin) * 2));
-				align-items: center;
-				border: var(--border-width-thin) solid var(--color-content-disabled);
-				border-radius: var(--rounding-full);
-				display: inline-flex;
-				height: var(--size);
-				justify-content: center;
-				margin: var(--space-xs) var(--space-xs) var(--space-xs) 0;
-				user-select: none;
-				width: var(--size);
-			}
-
-			/**
-			 * Checked.
-			 */
-
-			input:checked {
-				& + .indicator {
-					background: var(--color-surface-accent);
-					border-color: var(--color-content-disabled);
-					border-radius: var(--rounding-full);
-				}
-
-				& + .indicator::before {
-					content: "";
-					background: var(--color-surface-ondark);
-					border-radius: var(--rounding-full);
-					display: block;
-					height: var(--size-xs);
-					width: var(--size-xs);
-				}
-			}
-
-			/**
-			 * Disabled.
-			 */
-
-			label:has(input:disabled) {
-				color: var(--color-content-disabled);
-			}
-
-			input:disabled + .indicator {
-				border-color: var(--color-border-subtle-disabled);
-			}
-
-			/**
-			 * Checked + disabled.
-			 */
-
-			input:checked:disabled {
-				& + .indicator {
-					background-color: var(--color-surface-disabled);
-				}
-
-				& + .indicator::before {
-					background-color: var(--color-content-disabled);
-				}
-			}
-
-			/**
-			 * Focus
-			 */
-
-			input:focus-visible + .indicator {
-				box-shadow: var(--highlight-box-shadow);
-				outline: var(--highlight-outline--focus);
-				outline-offset: var(--highlight-outline-offset);
 			}
 		`,
 	];
@@ -114,25 +31,19 @@ export class SDRadioGroupElement extends List(Input<boolean | number | string>(L
 		return html`
 			${repeat(
 				this.items,
-				({ key }) => key,
-				({ disabled, label, value }) => {
-					return html`
-						<label role="radio" @mousedown=${preventDoubleClickSelection}>
-							<input
-								name="radio"
-								type="radio"
-								value=${ifDefined(value)}
-								tabindex=${ifDefined(disabled ? undefined : 0)}
-								.checked=${this.value === value}
-								.disabled=${disabled}
-								@change=${(): void => {
-									this.value = value;
-								}}
-							/>
-							<span class="indicator"></span>
-							${label}
-						</label>
-					`;
+				(opt) => opt,
+				(opt) => {
+					return html`<sd-radio
+						name="__radio"
+						.checked=${this.value === opt.value}
+						.disabled=${opt.disabled}
+						.label=${opt.label}
+						.value=${opt.value}
+						@change=${(): void => {
+							this.value = opt.value;
+						}}
+						>${opt.innerText}</sd-radio
+					>`;
 				},
 			)}
 		`;