@threadlabs/looma 0.12.0 → 0.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threadlabs/looma",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "type": "module",
   "description": "Looma components as HTML, Vue, and plain DOM, with design tokens.",
   "license": "MIT",

package/styles/ui-input-group.css

@@ -5,8 +5,13 @@
        focus ring around the input and its affixes together; the input inside drops its own through
        its custom properties, so it is still the one ui-input, with its form behaviour intact. The
        affixes are plain text beside the input, so name the input with a label that says what the
-       whole value is. */
+       whole value is. The action slot takes one button at the end, inside the border, for the one
+       thing the field is for ("Continue" after a site's address), so it reads as the field's action
+       and not the form's. */
     :scope {
+      /* The group's own border and height stand for the input's, so the group is a lone Input's height. */
+      --ui-input-border-width: 0;
+      --ui-input-min-block-size: 0;
       --ui-input-border: transparent;
       --ui-input-border-hover: transparent;
       --ui-input-focus-border: transparent;
@@ -14,6 +19,7 @@
       --ui-input-invalid-focus-shadow: none;
       --ui-input-shadow: none;
       --ui-input-focus-shadow: none;
+      --ui-input-focus-outline: none;
       --ui-input-radius: 0;
       --ui-input-surface: transparent;
 
@@ -23,20 +29,25 @@
       inline-size: 100%;
       min-inline-size: 0;
       min-block-size: var(--ui-control-size-md);
-      border: 1px solid var(--ui-border-strong);
+      /* The frame reads the shared control tokens with a lone Input's fallbacks, so the two match. */
+      border: 1px solid var(--ui-control-border, var(--ui-border-strong));
       border-radius: var(--ui-radius-md);
-      background: var(--ui-surface-elevated);
+      background: var(--ui-control-surface, var(--ui-surface-elevated));
       box-shadow: var(--ui-control-inset);
       overflow: hidden;
+      /* A press anywhere in the frame focuses the input. */
+      cursor: text;
       transition: border-color var(--ui-motion-fast) var(--ui-motion-ease), box-shadow var(--ui-motion-fast) var(--ui-motion-ease);
     }
 
-    :scope:hover:not(:focus-within) {
-      border-color: var(--ui-text-secondary);
+    :scope:hover:not(:has(input:focus, input:disabled)) {
+      border-color: var(--ui-control-border-hover, var(--ui-text-secondary));
     }
 
-    :scope:focus-within {
-      border-color: var(--ui-accent-solid);
+    /* The ring shows when the field's input would show its own: when it is focus-visible, which a
+       text input is for a pointer as well as a keyboard. A focused action button draws its own. */
+    :scope:has(.field input:focus-visible) {
+      border-color: var(--ui-control-focus, var(--ui-accent-solid));
       box-shadow:
         var(--ui-control-inset),
         var(--ui-control-focus-halo-shadow);
@@ -46,9 +57,25 @@
       border-color: var(--ui-danger-solid);
     }
 
-    :scope[data-ui-input-group-state~="disabled"] {
-      background: var(--ui-surface-muted);
+    :scope:has(input:is([aria-invalid="true"], :is(:user-invalid, [data-user-invalid])):focus-visible) {
+      box-shadow:
+        var(--ui-control-inset),
+        0 0 0 3px color-mix(in srgb, var(--ui-danger-solid) 22%, transparent);
+    }
+
+    /* Forced colors drop box shadows, so the focus ring becomes an outline. */
+    @media (forced-colors: active) {
+      :scope:has(input:focus-visible) {
+        outline: 2px solid Highlight;
+        outline-offset: 1px;
+      }
+    }
+
+    :scope[data-ui-input-group-state~="disabled"],
+    :scope:has(input:disabled) {
+      background: var(--ui-control-surface-disabled, var(--ui-surface-muted));
       box-shadow: none;
+      cursor: not-allowed;
     }
 
     .field {
@@ -68,7 +95,17 @@
       white-space: nowrap;
     }
 
-    .affix:empty {
+    /* Centred rather than padded above and below: the group is exactly a lone Input's height, so a
+       small button sits inside it with the difference split evenly, and the field keeps its height. */
+    .action {
+      display: flex;
+      flex: none;
+      align-items: center;
+      padding-inline: var(--ui-space-1);
+    }
+
+    .affix:empty,
+    .action:empty {
       display: none;
     }
 
@@ -83,7 +120,19 @@
        focus ring around the input and its affixes together; the input inside drops its own through
        its custom properties, so it is still the one ui-input, with its form behaviour intact. The
        affixes are plain text beside the input, so name the input with a label that says what the
-       whole value is. */
+       whole value is. The action slot takes one button at the end, inside the border, for the one
+       thing the field is for ("Continue" after a site's address), so it reads as the field's action
+       and not the form's. */
+
+    /* The ring shows when the field's input would show its own: when it is focus-visible, which a
+       text input is for a pointer as well as a keyboard. A focused action button draws its own. */
+
+    /* Forced colors drop box shadows, so the focus ring becomes an outline. */
+    @media (forced-colors: active) {
+    }
+
+    /* Centred rather than padded above and below: the group is exactly a lone Input's height, so a
+       small button sits inside it with the difference split evenly, and the field keeps its height. */
 
     /* A component that sets its display still honours the hidden attribute on its root. */
 }

package/styles/ui-input.css

@@ -5,11 +5,11 @@
       display: inline-block;
       inline-size: 100%;
       min-inline-size: 0;
-      min-block-size: var(--ui-control-size-md);
+      min-block-size: var(--ui-input-min-block-size, var(--ui-control-size-md));
       margin: 0;
       padding: var(--ui-space-2) var(--ui-space-3);
       appearance: none;
-      border: 1px solid var(--ui-input-border, var(--ui-control-border, var(--ui-border-strong)));
+      border: var(--ui-input-border-width, 1px) solid var(--ui-input-border, var(--ui-control-border, var(--ui-border-strong)));
       border-radius: var(--ui-input-radius, var(--ui-radius-md));
       background: var(--ui-input-surface, var(--ui-control-surface, var(--ui-surface-elevated)));
       color: var(--ui-text-primary);
@@ -64,6 +64,14 @@
       cursor: not-allowed;
     }
 
+    /* Forced colors drop box shadows, so the focus ring becomes an outline. */
+    @media (forced-colors: active) {
+      :scope:focus-visible {
+        outline: var(--ui-input-focus-outline, 2px solid Highlight);
+        outline-offset: 1px;
+      }
+    }
+
     /* No text-box-trim here: trimming a native input's line box below its line height lets the text
      * scroll vertically inside the field. Native inputs already center their single line. */
 
@@ -77,6 +85,10 @@
 
     /* The app's invalid flag, or the browser's own verdict once the user has left an invalid field. */
 
+    /* Forced colors drop box shadows, so the focus ring becomes an outline. */
+    @media (forced-colors: active) {
+    }
+
     /* No text-box-trim here: trimming a native input's line box below its line height lets the text
      * scroll vertically inside the field. Native inputs already center their single line. */
 

package/vanilla/UiInputGroup.js

@@ -1,11 +1,13 @@
 // Generated by HTML Next 1.0.0-alpha.5 for Vanilla DOM. Do not edit.
-import { manageGeneratedProps } from "@nextwebwg/html-next/generated-runtime";
+import { manageComponentLifecycle } from "@nextwebwg/html-next/runtime";
+import * as controller from "../components/ui-input-group/ui-input-group.js";
 import "../styles/ui-input-group.css";
 
+const definition = {...{"contract":{"tag":"ui-input-group","props":{"disabled":{"type":"boolean","required":false,"target":{"attribute":"disabled"},"default":false}}},"template":{"kind":"element","name":"div","attributes":[],"children":[{"kind":"element","name":"span","attributes":[{"kind":"literal","name":"class","value":"affix"}],"children":[{"kind":"slot","fallback":[],"name":"prefix"}]},{"kind":"element","name":"span","attributes":[{"kind":"literal","name":"class","value":"field"}],"children":[{"kind":"slot"}]},{"kind":"element","name":"span","attributes":[{"kind":"literal","name":"class","value":"affix"}],"children":[{"kind":"slot","fallback":[],"name":"suffix"}]},{"kind":"element","name":"span","attributes":[{"kind":"literal","name":"class","value":"action"}],"children":[{"kind":"slot","fallback":[],"name":"action"}]}]},"declarations":[],"root":{"kind":"native","element":"div","choices":["div"]}},source:{file:import.meta.url},css:""};
+
 export function createUiInputGroup(options = {}) {
   const { attributes = {}, children = [], slots = {}, as, ...componentProps } = options;
   const projected = [];
-  const prop0 = componentProps["disabled"] === undefined ? false : componentProps["disabled"];
   const element = document.createElement("div");
   for (const [name, value] of Object.entries(attributes)) {
     if (value === null || value === undefined || value === false) continue;
@@ -45,9 +47,20 @@ export function createUiInputGroup(options = {}) {
   } else {
   }
   element.append(element2);
-  manageGeneratedProps(element, [
-    { name: "disabled", attribute: "data-disabled", value: componentProps["disabled"], default: false, type: "boolean", required: false },
-  ]);
+  const element3 = document.createElement("span");
+  element3.setAttribute("class", "action");
+  if (slots["action"] ?? [].length > 0) {
+    for (const child of slots["action"] ?? []) {
+      const node = typeof child === "string" ? document.createTextNode(child) : child;
+      projected.push([node, "action"]);
+      element3.append(node);
+    }
+  } else {
+  }
+  element.append(element3);
+  manageComponentLifecycle(element, definition, { props: componentProps, projected,
+    controller,
+  });
   return element;
 }
 

package/vue/UiInput.vue

@@ -60,11 +60,12 @@ useComponentHost(controllerModule.default, {
   display: inline-block;
   inline-size: 100%;
   min-inline-size: 0;
-  min-block-size: var(--ui-control-size-md);
+  min-block-size: var(--ui-input-min-block-size, var(--ui-control-size-md));
   margin: 0;
   padding: var(--ui-space-2) var(--ui-space-3);
   appearance: none;
-  border: 1px solid var(--ui-input-border, var(--ui-control-border, var(--ui-border-strong)));
+  border: var(--ui-input-border-width, 1px) solid
+    var(--ui-input-border, var(--ui-control-border, var(--ui-border-strong)));
   border-radius: var(--ui-input-radius, var(--ui-radius-md));
   background: var(--ui-input-surface, var(--ui-control-surface, var(--ui-surface-elevated)));
   color: var(--ui-text-primary);
@@ -126,6 +127,14 @@ useComponentHost(controllerModule.default, {
   cursor: not-allowed;
 }
 
+/* Forced colors drop box shadows, so the focus ring becomes an outline. */
+@media (forced-colors: active) {
+  [data-component~="ui-input"]:focus-visible {
+    outline: var(--ui-input-focus-outline, 2px solid Highlight);
+    outline-offset: 1px;
+  }
+}
+
 /* No text-box-trim here: trimming a native input's line box below its line height lets the text
  * scroll vertically inside the field. Native inputs already center their single line. */
 

package/vue/UiInputGroup.d.ts

@@ -1,13 +1,15 @@
 type __VLS_Props = {
     disabled?: boolean;
 };
-declare var __VLS_1: {}, __VLS_3: {}, __VLS_5: {};
+declare var __VLS_1: {}, __VLS_3: {}, __VLS_5: {}, __VLS_7: {};
 type __VLS_Slots = {} & {
     prefix?: (props: typeof __VLS_1) => any;
 } & {
     default?: (props: typeof __VLS_3) => any;
 } & {
     suffix?: (props: typeof __VLS_5) => any;
+} & {
+    action?: (props: typeof __VLS_7) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
     disabled: boolean;

package/vue/UiInputGroup.vue

@@ -1,6 +1,8 @@
 <!-- Generated by HTML Next 1.0.0-alpha.5 for Vue 3.5. Do not edit. -->
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
+import * as controllerModule from '../components/ui-input-group/ui-input-group.js'
+import { createDispatch, useComponentHost } from './host'
 
 defineOptions({ inheritAttrs: false })
 
@@ -13,12 +15,22 @@ const props = withDefaults(
   },
 )
 
+const root = ref<HTMLElement | null>(null)
+
 /** The values the styles' :host-state() rules test. */
 const hostState = computed(() =>
   [
     props.disabled && 'disabled',
   ].filter(Boolean).join(' ')
 )
+
+const dispatch = createDispatch(root)
+
+useComponentHost(controllerModule.default, {
+  root,
+  dispatch,
+  props,
+})
 </script>
 
 <template>
@@ -26,10 +38,12 @@ const hostState = computed(() =>
     data-component="ui-input-group"
     v-bind="$attrs"
     :data-ui-input-group-state="hostState || undefined"
+    ref="root"
   >
     <span class="affix"><slot name="prefix" /></span>
     <span class="field"><slot /></span>
     <span class="affix"><slot name="suffix" /></span>
+    <span class="action"><slot name="action" /></span>
   </div>
 </template>
 
@@ -39,8 +53,13 @@ const hostState = computed(() =>
        focus ring around the input and its affixes together; the input inside drops its own through
        its custom properties, so it is still the one ui-input, with its form behaviour intact. The
        affixes are plain text beside the input, so name the input with a label that says what the
-       whole value is. */
+       whole value is. The action slot takes one button at the end, inside the border, for the one
+       thing the field is for ("Continue" after a site's address), so it reads as the field's action
+       and not the form's. */
 [data-component~="ui-input-group"] {
+  /* The group's own border and height stand for the input's, so the group is a lone Input's height. */
+  --ui-input-border-width: 0;
+  --ui-input-min-block-size: 0;
   --ui-input-border: transparent;
   --ui-input-border-hover: transparent;
   --ui-input-focus-border: transparent;
@@ -48,6 +67,7 @@ const hostState = computed(() =>
   --ui-input-invalid-focus-shadow: none;
   --ui-input-shadow: none;
   --ui-input-focus-shadow: none;
+  --ui-input-focus-outline: none;
   --ui-input-radius: 0;
   --ui-input-surface: transparent;
 
@@ -57,22 +77,27 @@ const hostState = computed(() =>
   inline-size: 100%;
   min-inline-size: 0;
   min-block-size: var(--ui-control-size-md);
-  border: 1px solid var(--ui-border-strong);
+  /* The frame reads the shared control tokens with a lone Input's fallbacks, so the two match. */
+  border: 1px solid var(--ui-control-border, var(--ui-border-strong));
   border-radius: var(--ui-radius-md);
-  background: var(--ui-surface-elevated);
+  background: var(--ui-control-surface, var(--ui-surface-elevated));
   box-shadow: var(--ui-control-inset);
   overflow: hidden;
+  /* A press anywhere in the frame focuses the input. */
+  cursor: text;
   transition:
     border-color var(--ui-motion-fast) var(--ui-motion-ease),
     box-shadow var(--ui-motion-fast) var(--ui-motion-ease);
 }
 
-[data-component~="ui-input-group"]:hover:not(:focus-within) {
-  border-color: var(--ui-text-secondary);
+[data-component~="ui-input-group"]:hover:not(:has(input:focus, input:disabled)) {
+  border-color: var(--ui-control-border-hover, var(--ui-text-secondary));
 }
 
-[data-component~="ui-input-group"]:focus-within {
-  border-color: var(--ui-accent-solid);
+/* The ring shows when the field's input would show its own: when it is focus-visible, which a
+   text input is for a pointer as well as a keyboard. A focused action button draws its own. */
+[data-component~="ui-input-group"]:has(.field input:focus-visible) {
+  border-color: var(--ui-control-focus, var(--ui-accent-solid));
   box-shadow:
     var(--ui-control-inset),
     var(--ui-control-focus-halo-shadow);
@@ -82,9 +107,25 @@ const hostState = computed(() =>
   border-color: var(--ui-danger-solid);
 }
 
-[data-component~="ui-input-group"][data-ui-input-group-state~="disabled"] {
-  background: var(--ui-surface-muted);
+[data-component~="ui-input-group"]:has(input:is([aria-invalid="true"], :is(:user-invalid, [data-user-invalid])):focus-visible) {
+  box-shadow:
+    var(--ui-control-inset),
+    0 0 0 3px color-mix(in srgb, var(--ui-danger-solid) 22%, transparent);
+}
+
+/* Forced colors drop box shadows, so the focus ring becomes an outline. */
+@media (forced-colors: active) {
+  [data-component~="ui-input-group"]:has(input:focus-visible) {
+    outline: 2px solid Highlight;
+    outline-offset: 1px;
+  }
+}
+
+[data-component~="ui-input-group"][data-ui-input-group-state~="disabled"],
+[data-component~="ui-input-group"]:has(input:disabled) {
+  background: var(--ui-control-surface-disabled, var(--ui-surface-muted));
   box-shadow: none;
+  cursor: not-allowed;
 }
 
 .field {
@@ -104,7 +145,17 @@ const hostState = computed(() =>
   white-space: nowrap;
 }
 
-.affix:empty {
+/* Centred rather than padded above and below: the group is exactly a lone Input's height, so a
+   small button sits inside it with the difference split evenly, and the field keeps its height. */
+.action {
+  display: flex;
+  flex: none;
+  align-items: center;
+  padding-inline: var(--ui-space-1);
+}
+
+.affix:empty,
+.action:empty {
   display: none;
 }
 

package/vue/chunks/UiInput.js

@@ -61,6 +61,6 @@ var UiInput_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PURE
 			}), null, 16, _hoisted_1)), [[vModelDynamic, model.value]]);
 		};
 	}
-}), [["__scopeId", "data-v-c19f8322"]]);
+}), [["__scopeId", "data-v-e7c851a2"]]);
 //#endregion
 export { UiInput_default as t };

package/vue/chunks/UiInputGroup.js

@@ -1,10 +1,13 @@
 import { t as _plugin_vue_export_helper_default } from "./_plugin-vue_export-helper.js";
-import { computed, createElementBlock, createElementVNode, defineComponent, mergeProps, openBlock, renderSlot } from "vue";
+import { n as useComponentHost, t as createDispatch } from "./host.js";
+import { computed, createElementBlock, createElementVNode, defineComponent, mergeProps, openBlock, ref, renderSlot } from "vue";
+import * as controllerModule from "@threadlabs/looma/components/ui-input-group/ui-input-group.js";
 //#region .build/vue/UiInputGroup.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = ["data-ui-input-group-state"];
 var _hoisted_2 = { class: "affix" };
 var _hoisted_3 = { class: "field" };
 var _hoisted_4 = { class: "affix" };
+var _hoisted_5 = { class: "action" };
 //#endregion
 //#region .build/vue/UiInputGroup.vue
 var UiInputGroup_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PURE__ */ defineComponent({
@@ -16,16 +19,28 @@ var UiInputGroup_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @_
 	} },
 	setup(__props) {
 		const props = __props;
+		const root = ref(null);
 		/** The values the styles' :host-state() rules test. */
 		const hostState = computed(() => [props.disabled && "disabled"].filter(Boolean).join(" "));
+		const dispatch = createDispatch(root);
+		useComponentHost(controllerModule.default, {
+			root,
+			dispatch,
+			props
+		});
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", mergeProps({ "data-component": "ui-input-group" }, _ctx.$attrs, { "data-ui-input-group-state": hostState.value || void 0 }), [
+			return openBlock(), createElementBlock("div", mergeProps({ "data-component": "ui-input-group" }, _ctx.$attrs, {
+				"data-ui-input-group-state": hostState.value || void 0,
+				ref_key: "root",
+				ref: root
+			}), [
 				createElementVNode("span", _hoisted_2, [renderSlot(_ctx.$slots, "prefix", {}, void 0, true)]),
 				createElementVNode("span", _hoisted_3, [renderSlot(_ctx.$slots, "default", {}, void 0, true)]),
-				createElementVNode("span", _hoisted_4, [renderSlot(_ctx.$slots, "suffix", {}, void 0, true)])
+				createElementVNode("span", _hoisted_4, [renderSlot(_ctx.$slots, "suffix", {}, void 0, true)]),
+				createElementVNode("span", _hoisted_5, [renderSlot(_ctx.$slots, "action", {}, void 0, true)])
 			], 16, _hoisted_1);
 		};
 	}
-}), [["__scopeId", "data-v-42ff173c"]]);
+}), [["__scopeId", "data-v-027c11f5"]]);
 //#endregion
 export { UiInputGroup_default as t };