@gjermundgaraba-designs/pixel-paper 0.22.1 → 0.23.0

package/dist/src/textareaField/textareaField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textareaField.d.ts","sourceRoot":"","sources":["../../../src/textareaField/textareaField.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAMzF,gEAAgE;AAChE,MAAM,MAAM,UAAU,CAAC,OAAO,IAAI,QAAQ,CAAC;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IACpC,yCAAyC;IACzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;uCAEmC;IACnC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,yFAAyF;IACzF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kDAAkD;IAClD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gEAAgE;IAChE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;uDACmD;IACnD,kBAAkB,CAAC,EAAE,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC;CACjF,CAAC,CAAC;AAEH;;;2EAG2E;AAC3E,eAAO,MAAM,IAAI,GAAI,OAAO,UAAU,UAAU,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,OAAO,CAAC,KAAG,IA2CpF,CAAC"}
+{"version":3,"file":"textareaField.d.ts","sourceRoot":"","sources":["../../../src/textareaField/textareaField.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAMzF,gEAAgE;AAChE,MAAM,MAAM,UAAU,CAAC,OAAO,IAAI,QAAQ,CAAC;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IACpC,yCAAyC;IACzC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;uCAEmC;IACnC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,yFAAyF;IACzF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kDAAkD;IAClD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gEAAgE;IAChE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;uDACmD;IACnD,kBAAkB,CAAC,EAAE,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC;CACjF,CAAC,CAAC;AAEH;;;2EAG2E;AAC3E,eAAO,MAAM,IAAI,GAAI,OAAO,UAAU,UAAU,CAAC,OAAO,CAAC,KAAK,WAAW,CAAC,OAAO,CAAC,KAAG,IAuCpF,CAAC"}

package/dist/src/textareaField/textareaField.js

@@ -1,6 +1,6 @@
 import { brandViewResult as __foldkitBrandViewResult } from 'foldkit/brand'
 import { Textarea as UiTextarea } from "@foldkit/ui";
-import { describedByError, errorView } from "../field/field.js";
+import { controlAttributes, errorView, helpView } from "../field/field.js";
 /** A labelled textarea with its help line, built on `@foldkit/ui`'s `Textarea`: the label
  *  names the textarea, the help line describes it (`aria-describedby`), an `error` sets
  *  `aria-invalid` and describes it before the help, and `isRequired` sets `aria-required`.
@@ -16,17 +16,13 @@ export const view = (config, h) => {
         ...(rows !== undefined && { rows }),
         toView: (groups) => __foldkitBrandViewResult((h.div([h.Class(`field${isMono ? " mono" : ""}`)], [
             h.label(groups.label, [label]),
-            // NOTE: @foldkit/ui gap: Textarea has no required option, so the wrapper says it.
             h.textarea([
                 ...textareaAttributes,
                 ...groups.textarea,
-                ...describedByError(id, error, help !== undefined, h),
-                ...(isRequired ? [h.AriaRequired(true)] : []),
+                ...controlAttributes(id, error, help, isRequired, h),
             ]),
             ...errorView(id, error, h),
-            ...(help === undefined
-                ? []
-                : [h.p([...groups.description, h.Class("field-help")], [help])]),
+            ...helpView(help, groups.description, h),
         ])), "@gjermundgaraba-designs/pixel-paper/src/textareaField/textareaField.js#toView"),
     }, h)), "@gjermundgaraba-designs/pixel-paper/src/textareaField/textareaField.js#view");
 };

package/dist/src/time/time.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["../../../src/time/time.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,QAAQ,EAAiB,MAAM,EAAY,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC1F,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAMlE;;YAEY;AACZ,eAAO,MAAM,UAAU,uEAA+D,CAAC;AACvF,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC;AAUhD,wDAAwD;AACxD,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC;IAChC,yCAAyC;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB;;2CAEuC;IACvC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,mEAAmE;IACnE,UAAU,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC;CAChC,CAAC,CAAC;AAqDH;oFACoF;AACpF,eAAO,MAAM,IAAI,GAAI,OAAO,UAAU,UAAU,KAAK,WAAW,CAAC,OAAO,CAAC,KAAG,IAc3E,CAAC;AAMF,8DAA8D;AAC9D,MAAM,MAAM,WAAW,CAAC,KAAK,EAAE,OAAO,IAAI,QAAQ,CAAC;IACjD,kFAAkF;IAClF,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC;IACpC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACrC,CAAC,CAAC;AAEH;;;sBAGsB;AACtB,eAAO,MAAM,UAAU,GAAI,KAAK,EAAE,OAAO,UAC/B,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,KAClC,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC;IAAE,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,KAAK,CAU7E,CAAC"}
+{"version":3,"file":"time.d.ts","sourceRoot":"","sources":["../../../src/time/time.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,QAAQ,EAAS,MAAM,EAAY,MAAM,EAAU,MAAM,QAAQ,CAAC;AAClF,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAMlE;;YAEY;AACZ,eAAO,MAAM,UAAU,uEAA+D,CAAC;AACvF,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC;AAUhD,wDAAwD;AACxD,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC;IAChC,yCAAyC;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB;;2CAEuC;IACvC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,8EAA8E;IAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,mEAAmE;IACnE,UAAU,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC;CAChC,CAAC,CAAC;AAqDH;oFACoF;AACpF,eAAO,MAAM,IAAI,GAAI,OAAO,UAAU,UAAU,KAAK,WAAW,CAAC,OAAO,CAAC,KAAG,IAc3E,CAAC;AAMF,8DAA8D;AAC9D,MAAM,MAAM,WAAW,CAAC,KAAK,EAAE,OAAO,IAAI,QAAQ,CAAC;IACjD,kFAAkF;IAClF,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC;IACpC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACrC,CAAC,CAAC;AAEH;;;sBAGsB;AACtB,eAAO,MAAM,UAAU,GAAI,KAAK,EAAE,OAAO,UAC/B,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,KAClC,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC;IAAE,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,KAAK,CAS7E,CAAC"}

package/dist/src/time/time.js

@@ -1,5 +1,5 @@
 import { brandViewResult as __foldkitBrandViewResult } from 'foldkit/brand'
-import { Clock, Duration, Effect, Match, Option, Schedule, Schema, Stream } from "effect";
+import { Clock, Duration, Match, Option, Schedule, Schema, Stream } from "effect";
 import { formatDate, formatDateTime, formatRemaining, formatSpan } from "../format/format.js";
 // FORMAT
 /** How a moment is said. `Age`: `"19d"`, the age register. `Ago`: `"4m ago"`. `Until`:
@@ -57,5 +57,7 @@ const TICK = Duration.seconds(1);
 export const clockEntry = (config) => (__foldkitBrandViewResult(({
     dependenciesSchema: Schema.Struct({ isActive: Schema.Boolean }),
     modelToDependencies: (model) => (__foldkitBrandViewResult(({ isActive: config.isActive(model) }), "@gjermundgaraba-designs/pixel-paper/src/time/time.js#modelToDependencies")),
-    dependenciesToStream: ({ isActive }) => __foldkitBrandViewResult((Stream.when(Stream.fromEffectSchedule(Clock.currentTimeMillis, Schedule.spaced(TICK)).pipe(Stream.map(config.toMessage)), Effect.sync(() => __foldkitBrandViewResult((isActive), "@gjermundgaraba-designs/pixel-paper/src/time/time.js#anonymous~7")))), "@gjermundgaraba-designs/pixel-paper/src/time/time.js#dependenciesToStream"),
+    dependenciesToStream: ({ isActive }) => __foldkitBrandViewResult((isActive
+        ? Stream.fromEffectSchedule(Clock.currentTimeMillis, Schedule.spaced(TICK)).pipe(Stream.map(config.toMessage))
+        : Stream.empty), "@gjermundgaraba-designs/pixel-paper/src/time/time.js#dependenciesToStream"),
 }), "@gjermundgaraba-designs/pixel-paper/src/time/time.js#clockEntry"));

package/dist/src/tips/index.d.ts

@@ -1,3 +1,3 @@
 export { HideTip, Message, Model, ShowTip, WaitBeforeCooling, WaitBeforeHiding, WaitBeforeShowing, id, init, subscriptions, update, view, } from "./tips.ts";
-export type { InitConfig, Trigger } from "./tips.ts";
+export type { InitConfig } from "./tips.ts";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/tips/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tips/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,OAAO,EACP,KAAK,EACL,OAAO,EACP,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,EAAE,EACF,IAAI,EACJ,aAAa,EACb,MAAM,EACN,IAAI,GACL,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tips/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,OAAO,EACP,KAAK,EACL,OAAO,EACP,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,EAAE,EACF,IAAI,EACJ,aAAa,EACb,MAAM,EACN,IAAI,GACL,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC"}

package/dist/src/toast/index.d.ts

@@ -1,5 +1,5 @@
 export { AnnounceSlip, BindStack, FocusSlip, Message, Model, OutMessage, dismiss, id, init, sceneMounts, show, update, view, } from "./toast.ts";
-export type { InitConfig, ShowConfig, ShowReturn } from "./toast.ts";
+export type { InitConfig, ShowConfig } from "./toast.ts";
 export type { Action, Tone } from "./stack.ts";
 export { Focus } from "../focus/focus.ts";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/toast/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/toast/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,SAAS,EACT,OAAO,EACP,KAAK,EACL,UAAU,EACV,OAAO,EACP,EAAE,EACF,IAAI,EACJ,WAAW,EACX,IAAI,EACJ,MAAM,EACN,IAAI,GACL,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACrE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/toast/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,SAAS,EACT,OAAO,EACP,KAAK,EACL,UAAU,EACV,OAAO,EACP,EAAE,EACF,IAAI,EACJ,WAAW,EACX,IAAI,EACJ,MAAM,EACN,IAAI,GACL,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACzD,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/src/toast/toast.d.ts

@@ -326,8 +326,6 @@ export declare const update: (model: Model, message: Message) => Readonly<{
                 readonly pendingDismissVersion: number;
                 readonly isHovered: boolean;
                 readonly swipeState: {
-                    readonly _tag: "Idle";
-                } | {
                     readonly _tag: "Dismissing";
                     readonly offsetX: number;
                     readonly direction: "Left" | "Right";
@@ -336,6 +334,8 @@ export declare const update: (model: Model, message: Message) => Readonly<{
                     readonly pointerId: number;
                     readonly startX: number;
                     readonly currentX: number;
+                } | {
+                    readonly _tag: "Idle";
                 } | {
                     readonly _tag: "Settling";
                     readonly offsetX: number;
@@ -421,7 +421,7 @@ export type ShowConfig = Readonly<{
 }>;
 /** What `show` returns: the next Model and Commands, and the new slip's id, to take it back
  *  with `dismiss`. */
-export type ShowReturn = Update.Return<Model, Message> & Readonly<{
+type ShowReturn = Update.Return<Model, Message> & Readonly<{
     entryId: string;
 }>;
 /**
@@ -557,8 +557,6 @@ export declare const view: import("foldkit/submodel").View<{
             readonly pendingDismissVersion: number;
             readonly isHovered: boolean;
             readonly swipeState: {
-                readonly _tag: "Idle";
-            } | {
                 readonly _tag: "Dismissing";
                 readonly offsetX: number;
                 readonly direction: "Left" | "Right";
@@ -567,6 +565,8 @@ export declare const view: import("foldkit/submodel").View<{
                 readonly pointerId: number;
                 readonly startX: number;
                 readonly currentX: number;
+            } | {
+                readonly _tag: "Idle";
             } | {
                 readonly _tag: "Settling";
                 readonly offsetX: number;

package/dist/src/toast/toast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toast.d.ts","sourceRoot":"","sources":["../../../src/toast/toast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,QAAQ,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM,EAAgB,MAAM,QAAQ,CAAC;AACtF,OAAO,KAAK,OAAO,MAAM,iBAAiB,CAAC;AAI3C,OAAO,KAAK,KAAK,MAAM,eAAe,CAAC;AAIvC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AASzC,OAAO,EAAE,MAAM,EAAgB,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAI7D;;wDAEwD;AACxD,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKhB,CAAC;AACH,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAC;AAItC,yDAAyD;AACzD,eAAO,MAAM,OAAO;;QACC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QACV,WAAW;;;;;;QAIV,OAAO;QAAiB,MAAM;;;;;;QAC7B,OAAO;;;;;EAIzB,CAAC;AACH,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAC;AAI1C;yDACyD;AACzD,eAAO,MAAM,UAAU;;QACH,EAAE;QAAiB,OAAO;;EAC5C,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC;AAWhD;gBACgB;AAChB,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAElD,oCAAoC;AACpC,eAAO,MAAM,IAAI,WAAY,UAAU,KAAG,KAKxC,CAAC;AAIH,8CAA8C;AAC9C,eAAO,MAAM,EAAE,UAAW,KAAK,KAAG,MAAwB,CAAC;AAU3D,KAAK,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AA2EhD;uCACuC;AACvC,eAAO,MAAM,SAAS;;;;iBAQpB,CAAC;AASH;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY;;;;;iBAiBvB,CAAC;AAgCH,2FAA2F;AAC3F,eAAO,MAAM,MAAM,UAAW,KAAK,WAAW,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiCjD,CAAC;AAEL,0BAA0B;AAC1B,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC;IAChC,IAAI,EAAE,IAAI,CAAC;IACX,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAC;IACd,qEAAqE;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC,CAAC;AAOH;sBACsB;AACtB,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAKvF;;;;;;GAMG;AACH,eAAO,MAAM,IAAI,UAAW,KAAK,UAAU,UAAU,KAAG,UAmCvD,CAAC;AAEF,mEAAmE;AACnE,eAAO,MAAM,OAAO,UAAW,KAAK,WAAW,MAAM,KAAG,UACnB,CAAC;AAwDtC,2FAA2F;AAC3F,eAAO,MAAM,YAAY,UAChB,OAAO,SACP,UAAU,KAChB,MAAM,CAAC,MAAM,CAAC,OAAO,OAAO,CAAC,YAAY,CAAC,IAAI,CAG9C,CAAC;AAEJ,wDAAwD;AACxD,eAAO,MAAM,aAAa,UACjB,OAAO,SACP,UAAU,KAChB,MAAM,CAAC,MAAM,CAAC,OAAO,OAAO,CAAC,YAAY,CAAC,IAAI,CAC0C,CAAC;AAE5F,uEAAuE;AACvE,eAAO,MAAM,QAAQ,UAAW,aAAa,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,OAAO,CAAC,aAAa,CAAC,IAAI,CACzB,CAAC;AAEvE;;6DAE6D;AAC7D,eAAO,MAAM,SAAS;;;;;;;EAuBpB,CAAC;AAEH;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAkBhB,CAAC;AAEF;+DAC+D;AAC/D,eAAO,MAAM,WAAW;;;;;;;;;GAAiD,CAAC"}
+{"version":3,"file":"toast.d.ts","sourceRoot":"","sources":["../../../src/toast/toast.ts"],"names":[],"mappings":"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"}

package/dist/src/toast/toast.js

@@ -215,14 +215,9 @@ export const show = (model, config) => {
 /** Takes a slip back by its id: what it reported has recovered. */
 export const dismiss = (model, entryId) => __foldkitBrandViewResult((dismissKeepingFocus(model, entryId)), "@gjermundgaraba-designs/pixel-paper/src/toast/toast.js#dismiss");
 // VIEW
-const TONE_CLASS = {
-    Ok: "notice toast ok",
-    Error: "notice toast error",
-    Quiet: "notice toast quiet",
-};
 const slipView = (entry, h) => {
     const { tone, title, maybeBody, maybeAction } = entry.payload;
-    return __foldkitBrandViewResult((h.div([h.Class(TONE_CLASS[tone])], [
+    return __foldkitBrandViewResult((h.div([h.Class(`notice toast${Notice.TONE_CLASS[tone]}`)], [
         Notice.toneGlyphView({ tone }, h),
         h.div([], [h.strong([], [title]), ...Option.toArray(maybeBody)]),
         ...Array.fromOption(Option.map(maybeAction, (action) => __foldkitBrandViewResult((Button.view({

package/dist/src/toolbar/toolbar.d.ts

@@ -1,7 +1,6 @@
 import { Schema } from "effect";
 import type { Html, HtmlBuilder } from "foldkit/html";
 import * as Mount from "foldkit/mount";
-import type { Attributes } from "../attributes/attributes.ts";
 /** Which way the strip lies. A `Vertical` strip stands on end: a canvas's tools down its left
  *  edge. The arrows of both axes move in either. */
 export declare const Orientation: Schema.Literals<readonly ["Horizontal", "Vertical"]>;
@@ -38,8 +37,6 @@ export type ViewConfig<ParentMessage> = Readonly<{
      *  Scene, resolve the Mount by name with the lifted Message:
      *  `Scene.Mount.resolve({ name: Toolbar.BindToolKeys.name }, toParentMessage(Toolbar.Message.MovedToolFocus({ move })))`. */
     toParentMessage: (message: Message) => ParentMessage;
-    /** Further attributes for the toolbar, never a class. */
-    attributes?: Attributes<ParentMessage>;
 }>;
 /** A strip of tools that is one stop for Tab (`role="toolbar"`, named by its label, with its
  *  `aria-orientation`): the arrows move between the tools and stop at the ends, Home and End

package/dist/src/toolbar/toolbar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolbar.d.ts","sourceRoot":"","sources":["../../../src/toolbar/toolbar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,MAAM,EAAgB,MAAM,QAAQ,CAAC;AAEpF,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,KAAK,KAAK,MAAM,eAAe,CAAC;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAK9D;oDACoD;AACpD,eAAO,MAAM,WAAW,sDAA8C,CAAC;AACvE,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC,IAAI,CAAC;AAQlD,6FAA6F;AAC7F,eAAO,MAAM,OAAO;;QAA0C,IAAI;;EAAe,CAAC;AAClF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAC;AAsG1C;;;;;;yDAMyD;AACzD,eAAO,MAAM,YAAY;;;EAuBvB,CAAC;AAIH,yDAAyD;AACzD,MAAM,MAAM,UAAU,CAAC,aAAa,IAAI,QAAQ,CAAC;IAC/C,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iEAAiE;IACjE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;iIAG6H;IAC7H,eAAe,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,aAAa,CAAC;IACrD,yDAAyD;IACzD,UAAU,CAAC,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;CACxC,CAAC,CAAC;AAEH;;gEAEgE;AAChE,eAAO,MAAM,IAAI,GAAI,aAAa,UACxB,UAAU,CAAC,aAAa,CAAC,KAC9B,WAAW,CAAC,aAAa,CAAC,KAC5B,IAqBF,CAAC"}
+{"version":3,"file":"toolbar.d.ts","sourceRoot":"","sources":["../../../src/toolbar/toolbar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,MAAM,EAAgB,MAAM,QAAQ,CAAC;AAEpF,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,KAAK,KAAK,MAAM,eAAe,CAAC;AAMvC;oDACoD;AACpD,eAAO,MAAM,WAAW,sDAA8C,CAAC;AACvE,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC,IAAI,CAAC;AAQlD,6FAA6F;AAC7F,eAAO,MAAM,OAAO;;QAA0C,IAAI;;EAAe,CAAC;AAClF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAC;AAsG1C;;;;;;yDAMyD;AACzD,eAAO,MAAM,YAAY;;;EAuBvB,CAAC;AAIH,yDAAyD;AACzD,MAAM,MAAM,UAAU,CAAC,aAAa,IAAI,QAAQ,CAAC;IAC/C,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iEAAiE;IACjE,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;iIAG6H;IAC7H,eAAe,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,aAAa,CAAC;CACtD,CAAC,CAAC;AAEH;;gEAEgE;AAChE,eAAO,MAAM,IAAI,GAAI,aAAa,UACxB,UAAU,CAAC,aAAa,CAAC,KAC9B,WAAW,CAAC,aAAa,CAAC,KAC5B,IAmBF,CAAC"}

package/dist/src/toolbar/toolbar.js

@@ -90,9 +90,8 @@ export const BindToolKeys = Mount.defineStream("BindToolKeys", {
  *  `aria-orientation`): the arrows move between the tools and stop at the ends, Home and End
  *  go to the ends, and Tab comes back to the tool used last. */
 export const view = (config, h) => {
-    const { label, tools: toolViews, orientation = "Horizontal", isFloating = false, toParentMessage, attributes = [], } = config;
+    const { label, tools: toolViews, orientation = "Horizontal", isFloating = false, toParentMessage, } = config;
     return __foldkitBrandViewResult((h.div([
-        ...attributes,
         h.Role("toolbar"),
         h.AriaLabel(label),
         h.AriaOrientation(orientation === "Vertical" ? "vertical" : "horizontal"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjermundgaraba-designs/pixel-paper",
-  "version": "0.22.1",
+  "version": "0.23.0",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/adapters/mermaid.ts

@@ -2,30 +2,6 @@
 // faces, in the page's palette. An optional entry point ("./adapters/mermaid"):
 // mermaid is the adopter's own dependency, loaded here only when a diagram is drawn.
 //
-// `view` renders the diagram's box and draws into it from a Mount (`DrawDiagram`), so it
-// needs the DOM only once the box is on the page, never while rendering on the server. The
-// box is keyed by the palette the page prints in, from the application's SchemeSwitch
-// (`Scheme.SchemeSwitch.palette`, which under "System" follows the reader's system as it
-// changes), so a new palette mounts a new box and draws the diagram again; a new source does
-// the same. The box reports `SucceededDrawDiagram`, `FailedLoadMermaid` or `FailedDrawDiagram`
-// through the caller's `toParentMessage`, and the caller keeps what it shows meanwhile (a
-// Loading line, an error Notice) in its own Model:
-//
-//   Mermaid.view(
-//     {
-//       source,
-//       palette: Scheme.SchemeSwitch.palette(model.schemeSwitch),
-//       toParentMessage: (message) => GotDiagramMessage({ message }),
-//     },
-//     h,
-//   );
-//
-// `renderDiagram` waits for the faces, so words are measured in them and not a fallback;
-// renders in the box (it must be on the page), so labels are measured where they will print;
-// and returns the SVG. Mermaid's settings are global, so draws run one at a time. It fails with
-// `MermaidMissing` when mermaid itself does not load, and with `DiagramError` when mermaid
-// loads but the diagram is not drawn.
-//
 // Two layers. themeCSS repaints with var(…), so the parts it names (nodes, edges, labels,
 // clusters, actors, messages, notes) follow a palette switch in place. themeVariables must be
 // colours, not var() strings (mermaid mixes its own shades from them), so they are read from

package/src/announcer/announcer.ts

@@ -35,7 +35,7 @@ export const view = <Message>(h: HtmlBuilder<Message>): Html =>
     h.Class("sr-only"),
     h.Role("status"),
     h.AriaLive("polite"),
-    h.DataAttribute("pixel-paper-announcer", ""),
+    h.Attribute(ANNOUNCER_ATTRIBUTE, ""),
   ]);
 
 // ANNOUNCE
@@ -97,28 +97,21 @@ export const announce = (text: string): Effect.Effect<void> =>
 // FLASH
 
 const FLASH_ID = "pixel-paper-flash";
-const DEFAULT_BEAT = Duration.millis(700);
 
-const toMillis = (time: string): Option.Option<number> =>
-  pipe(
+/** The beat in milliseconds, from the stylesheet's `--motion-flash`: none on a page that has
+ *  not loaded the stylesheet, which has nothing to flash with. */
+const beatOf = (element: Element): Option.Option<number> => {
+  const time = getComputedStyle(element).getPropertyValue("--motion-flash").trim();
+  return pipe(
     Option.liftPredicate(Number.parseFloat(time), Number.isFinite),
     Option.map((value) => (time.endsWith("ms") ? value : value * 1000)),
   );
-
-const beatOf = (element: Element): number =>
-  Option.getOrElse(
-    toMillis(getComputedStyle(element).getPropertyValue("--motion-flash").trim()),
-    () => Duration.toMillis(DEFAULT_BEAT),
-  );
+};
 
 const prefersReducedMotion = (): boolean =>
   window.matchMedia("(prefers-reduced-motion: reduce)").matches;
 
-const runFlash = (element: Element): void => {
-  if (!("animate" in element)) {
-    return;
-  }
-  const beat = beatOf(element);
+const runFlash = (element: Element, beat: number): void => {
   Array.forEach(
     Array.filter(element.getAnimations(), (animation) => animation.id === FLASH_ID),
     (animation) => animation.cancel(),
@@ -141,8 +134,11 @@ const runFlash = (element: Element): void => {
 export const flash = (selector: string): Effect.Effect<void> =>
   Effect.sync(() => {
     const maybeElement = Option.fromNullishOr(document.querySelector(selector));
-    if (Option.isSome(maybeElement)) {
-      runFlash(maybeElement.value);
+    const maybeFlash = Option.flatMap(maybeElement, (element) =>
+      Option.map(beatOf(element), (beat) => ({ element, beat })),
+    );
+    if (Option.isSome(maybeFlash)) {
+      runFlash(maybeFlash.value.element, maybeFlash.value.beat);
     }
   });
 

package/src/board/board.ts

@@ -1,5 +1,5 @@
 import { Button as UiButton, DragAndDrop as UiDragAndDrop } from "@foldkit/ui";
-import { Array, Effect, Equal, Match, Option, Schema, Stream, pipe } from "effect";
+import { Array, Effect, Equal, Match, Option, Schema, pipe } from "effect";
 import * as Command from "foldkit/command";
 import {
   type Attribute,
@@ -26,13 +26,15 @@ import { prefixKeys } from "../subscription/prefixKeys.ts";
 import {
   LEFT_BUTTON,
   activatedKeyboardDrag,
+  canLift,
   cancelledDrag,
-  escapeKeys,
+  escapeSubscriptions,
   innerControls,
   isCarrying,
   measureLift,
   phaseOf,
   pressedDraggable,
+  settle as settleDrag,
 } from "../drag/drag.ts";
 
 // MODEL
@@ -50,19 +52,20 @@ export const Column = Schema.Struct({
 });
 export type Column = typeof Column.Type;
 
+/** How the keyboard carries what it holds: said on the grip and once it is picked up. */
+const KEYBOARD_MOVES = "Arrow keys move it to another column, space drops it, escape cancels.";
+
 /** The words a board says. `{card}` stands for the card's label and `{column}` for a
  *  column's title. */
 const COPY = {
   /** The grip's name. */
   gripLabel: "Move {card}",
   /** What the grip describes: how to move a card from the keyboard. */
-  gripHelp:
-    "Press space to pick the card up. Arrow keys move it to another column, space drops it, escape cancels.",
+  gripHelp: `Press space to pick the card up. ${KEYBOARD_MOVES}`,
   /** A pointer has lifted the card. */
   pickedUp: "Picked up {card}.",
   /** The keyboard has lifted the card: say how to go on. */
-  pickedUpByKeyboard:
-    "Picked up {card}. Arrow keys move it to another column, space drops it, escape cancels.",
+  pickedUpByKeyboard: `Picked up {card}. ${KEYBOARD_MOVES}`,
   /** The held card is over another column. */
   over: "{card} is over {column}.",
   /** The card was dropped in a column. */
@@ -177,12 +180,6 @@ export const id = (model: Model): string => model.dragAndDrop.id;
 /** Whether a card is held by a pointer or the keyboard. */
 export const isDragging = (model: Model): boolean => UiDragAndDrop.isDragging(model.dragAndDrop);
 
-/** Whether a card is pressed or held. While it is, the arrow keys, Space and Escape belong to
- *  the board: pause the page's own bindings for them. The board takes Escape before anything
- *  else sees it. */
-export const isHolding = (model: Model): boolean =>
-  Option.isSome(UiDragAndDrop.maybeDraggedItemId(model.dragAndDrop));
-
 // DOM HOOKS
 
 const hookId = (boardId: string, localId: string): string => `${boardId}/${localId}`;
@@ -234,9 +231,6 @@ const overColumn = (model: Model): Option.Option<Column> =>
     ),
   );
 
-const announceMove = (maybeText: Option.Option<string>): ReadonlyArray<Command.Command<Message>> =>
-  Array.fromOption(Option.map(maybeText, (text) => AnnounceMove({ text })));
-
 const placementOf = (
   model: Model,
   held: Held,
@@ -263,10 +257,7 @@ const placementOf = (
       fromIndex: from.index,
       toColumnId: to.id,
       toIndex,
-      maybeAfterCardId: Option.map(
-        toIndex > 0 ? Array.get(others, toIndex - 1) : Option.none(),
-        (card) => card.id,
-      ),
+      maybeAfterCardId: Option.map(Array.get(others, toIndex - 1), (card) => card.id),
       maybeBeforeCardId: Option.map(Array.get(others, toIndex), (card) => card.id),
     });
   });
@@ -349,35 +340,26 @@ const moveText = (
  *  A card set down without a move says `putBack`. */
 const settle =
   (previous: Model, putBack = COPY.putBack) =>
-  (dragAndDropUpdate: UpdateReturn): UpdateReturn => {
-    const nextModel =
-      phaseOf(dragAndDropUpdate.model.dragAndDrop) === "Idle"
-        ? modifyFields(dragAndDropUpdate.model, { maybeHeld: () => Option.none() })
-        : dragAndDropUpdate.model;
-    const maybeText = Option.flatMap(previous.maybeHeld, (held) =>
-      moveText(
-        held,
-        previous,
-        dragAndDropUpdate.model,
-        Option.fromNullishOr(dragAndDropUpdate.outMessage),
-        putBack,
+  (dragAndDropUpdate: UpdateReturn): UpdateReturn =>
+    settleDrag(
+      dragAndDropUpdate,
+      Option.map(
+        Option.flatMap(previous.maybeHeld, (held) =>
+          moveText(
+            held,
+            previous,
+            dragAndDropUpdate.model,
+            Option.fromNullishOr(dragAndDropUpdate.outMessage),
+            putBack,
+          ),
+        ),
+        (text) => AnnounceMove({ text }),
       ),
     );
 
-    return Update.withOutMessage(
-      {
-        model: nextModel,
-        commands: [...(dragAndDropUpdate.commands ?? []), ...announceMove(maybeText)],
-      },
-      dragAndDropUpdate.outMessage,
-    );
-  };
-
 const holding = (model: Model, held: Held): Model =>
   modifyFields(model, { maybeHeld: () => Option.some(held) });
 
-const canLift = (model: Model): boolean => model.isMovable && phaseOf(model.dragAndDrop) === "Idle";
-
 const liftByKeyboard = (model: Model, place: Place, columns: ReadonlyArray<Column>) => {
   const pressed = holding(model, { card: place.card, columns, maybePressPoint: Option.none() });
   return settle(pressed)(
@@ -545,17 +527,6 @@ export const setMovable = (model: Model, isMovable: boolean): UpdateReturn => {
 
 // SUBSCRIPTION
 
-const holdingSubscriptions = Subscription.make<Model, Message>()((entry) => ({
-  escape: entry(
-    { isHolding: Schema.Boolean },
-    {
-      modelToDependencies: (model) => ({ isHolding: isHolding(model) }),
-      dependenciesToStream: ({ isHolding: isHoldingNow }) =>
-        isHoldingNow ? escapeKeys(Message.PressedEscape()) : Stream.empty,
-    },
-  ),
-}));
-
 // NOTE: @foldkit/ui gap: DragAndDrop's Subscription keys are fixed, so two of its users on a
 // page would share them. The board lifts them under its own names, behind the parent's prefix.
 const dragSubscriptions = Subscription.lift({
@@ -567,7 +538,10 @@ const dragSubscriptions = Subscription.lift({
   toParentMessage: toDragAndDropMessage,
 });
 
-const boardSubscriptions = Subscription.aggregate(holdingSubscriptions, dragSubscriptions);
+const boardSubscriptions = Subscription.aggregate(
+  escapeSubscriptions<Model, Message>(Message.PressedEscape()),
+  dragSubscriptions,
+);
 
 /** A held card follows the pointer, the arrows and Space move and drop it, Escape puts it
  *  back and the page scrolls near its edges, all from listeners that run only while a card is
@@ -581,9 +555,6 @@ export const subscriptions = <Prefix extends string>(keyPrefix: Prefix) =>
 
 // LIFTED CARD
 
-const pressPointOf = (model: Model): Option.Option<typeof PressPoint.Type> =>
-  Option.flatMap(model.maybeHeld, (held) => held.maybePressPoint);
-
 /** Sizes the copy that follows the pointer to the card it lifts, and keeps the pointer where
  *  it pressed the card. Measures the card once, when the copy appears. */
 export const SizeLiftedCard = Mount.define("SizeLiftedCard", {
@@ -627,9 +598,6 @@ export type ViewInputs = Readonly<{
   toEmptyView?: (column: Column) => ReadonlyArray<Html>;
   /** Controls at the right of a column's head, after its count ("capture here"). */
   toColumnActions?: (column: Column) => ReadonlyArray<Html>;
-  /** Further attributes for a column's `div.board-col` (`data-status`), never a class. Wrap
-   *  them with `childAttributes` so their handlers dispatch the parent's Messages. */
-  toColumnAttributes?: (column: Column) => ReadonlyArray<ChildAttribute>;
 }>;
 
 const INNER_CONTROL = innerControls(`[data-${TITLE_ATTRIBUTE}], [data-${GRIP_ATTRIBUTE}]`);
@@ -664,7 +632,6 @@ type PlaceInfo = Readonly<{
   toCardView: (card: Card, render: CardRender) => Html;
   toEmptyView: (column: Column) => ReadonlyArray<Html>;
   toColumnActions: (column: Column) => ReadonlyArray<Html>;
-  toColumnAttributes: (column: Column) => ReadonlyArray<ChildAttribute>;
 }>;
 
 const gripHelpId = (model: Model): string => `${id(model)}-grip-help`;
@@ -872,7 +839,6 @@ const columnView = (info: PlaceInfo, column: Column, h: HtmlBuilder<Message>): H
   return h.keyed("div")(
     column.id,
     [
-      ...info.toColumnAttributes(column),
       h.DataAttribute("droppable-id", columnHook(model, column.id)),
       h.Class(isTarget ? "board-col drop-target" : "board-col"),
     ],
@@ -905,12 +871,11 @@ const liftedCopyView = (info: PlaceInfo, h: HtmlBuilder<Message>): ReadonlyArray
   const maybeLifted = Option.all({
     style: UiDragAndDrop.ghostStyle(model.dragAndDrop),
     held: model.maybeHeld,
+    pressPoint: Option.flatMap(model.maybeHeld, (held) => held.maybePressPoint),
   });
 
-  const pressPoint = Option.getOrElse(pressPointOf(model), () => ({ clientX: 0, clientY: 0 }));
-
   return Array.fromOption(
-    Option.map(maybeLifted, ({ style, held }) =>
+    Option.map(maybeLifted, ({ style, held, pressPoint }) =>
       h.div(
         [
           h.Class("board-lift"),
@@ -946,21 +911,8 @@ const liftedCopyView = (info: PlaceInfo, h: HtmlBuilder<Message>): ReadonlyArray
  * follows the pointer or the keys.
  */
 export const view = defineView<Model, Message, ViewInputs>((model, viewInputs, h): Html => {
-  const {
-    columns,
-    toCardView,
-    toEmptyView = () => [],
-    toColumnActions = () => [],
-    toColumnAttributes = () => [],
-  } = viewInputs;
-  const info: PlaceInfo = {
-    model,
-    columns,
-    toCardView,
-    toEmptyView,
-    toColumnActions,
-    toColumnAttributes,
-  };
+  const { columns, toCardView, toEmptyView = () => [], toColumnActions = () => [] } = viewInputs;
+  const info: PlaceInfo = { model, columns, toCardView, toEmptyView, toColumnActions };
 
   return h.div(
     [h.Class("board"), h.Style({ "--cols": `${columns.length}` })],

package/src/board/index.ts

@@ -10,10 +10,10 @@ export {
   cardView,
   id,
   init,
-  isHolding,
   setMovable,
   subscriptions,
   update,
   view,
 } from "./board.ts";
+export { isHolding } from "../drag/drag.ts";
 export type { CardRender, CardViewConfig, InitConfig, ViewInputs } from "./board.ts";

package/src/button/button.ts

@@ -76,7 +76,7 @@ export type ViewConfig<Message> = Look &
     isDisabled?: boolean;
     keyHint?: KeyHintConfig;
     /** `submit` makes it its form's submit button while it is not held. */
-    type?: "button" | "submit" | "reset";
+    type?: "button" | "submit";
     /** Further attributes for the `<button>`, such as an id or a Submodel's attribute group. */
     attributes?: Attributes<Message>;
   }> &

package/src/chip/chip.ts

@@ -47,14 +47,6 @@ export type DotConfig = Readonly<{
   tone?: Tone;
 }>;
 
-const DOT_CLASS: Readonly<Record<Tone, string>> = {
-  Plain: "chip-dot",
-  Go: "chip-dot go",
-  Warn: "chip-dot warn",
-  Blocked: "chip-dot blocked",
-  Done: "chip-dot done",
-};
-
 /** A chip as a 10px cell in its tone, where a word would take the room a title needs (a task
  *  row's status, before its title). It is an image (`role="img"`) named by the word, which its
  *  tip shows, so the state never rests on its colour. */
@@ -65,6 +57,6 @@ export const dotView = <Message>(config: DotConfig, h: HtmlBuilder<Message>): Ht
     h.Role("img"),
     h.AriaLabel(label),
     h.DataAttribute("tip", label),
-    h.Class(DOT_CLASS[tone]),
+    h.Class(`chip-dot${TONE_CLASS[tone]}`),
   ]);
 };