@things-factory/figure-ui 10.1.210 → 10.1.211

package/dist-client/modeller/editor.js

@@ -55,7 +55,7 @@ import { canFollow, followableAxes, endPlaceKeyOf, followOf, sizeFollowersOf, me
 import { jointFanOf } from './joint-fan.js';
 import { derivedOf } from './revision.js';
 import { jointDragOf } from './joint-drag.js';
-import { liveOverSession, NOTHING_LIVE, scrubbed, scrubStep } from './live.js';
+import { liveOverSession, NOTHING_LIVE, scrubLabel } from './live.js';
 import { startingShapeKindOfBody } from './starting-shape.js';
 import { GroupMenuStyles } from './group-menu.js';
 /** The person's own fold of the properties' 「더 보기」, kept in their browser. */
@@ -832,7 +832,9 @@ let FigureEditor = class FigureEditor extends LitElement {
       ?locked=${unavailable}
       @command=${(e) => this.linkCommand(e.detail.action)}
       @size-recipe=${(e) => this.applySizeSteps(e.detail.steps)}
-      @size-input=${(e) => this.run(() => this.session.apply(figureSizeEditOf(this.shown().asset, e.detail.part, [{ kind: 'set-design', input: e.detail.input, unit: 'mm', value: e.detail.value }], { keep: 'centre' }).changes))}
+      @size-input=${(e) => this.writeField({ id: e.detail.input, unit: 'mm' }, e.detail.value)}
+      @size-typing=${(e) => this.hold(this.heldOf({ id: e.detail.input, unit: 'mm' }, e.detail.value))}
+      @size-let-go=${() => (this.live = NOTHING_LIVE)}
       @fasten-open=${() => this.openFastening()}
       .previewWords=${this.commandPreview.words()}
       .detachWords=${this.commandPreview.detachWords(shown)}
@@ -1034,8 +1036,15 @@ let FigureEditor = class FigureEditor extends LitElement {
         }
     }
     changeField(field, event) {
-        const input = event.target, value = input.valueAsNumber;
-        /* A number typed keeps the part's middle, or its fastening -- figure-model's one size function (ADR-0140 4.1). */
+        const input = event.target;
+        // Rejected edits must also restore the displayed numeric value.
+        input.value = String(this.writeField(field, input.valueAsNumber));
+    }
+    /**
+     * A number written to an input, from a field, a scrub or the size editor's rows: a size keeps the part's middle, or its
+     * fastening -- figure-model's one size function (ADR-0140 4.1). Gives the value the input holds after, refused or not.
+     */
+    writeField(field, value) {
         const part = this.selected;
         const change = { kind: field.role === 'state' ? 'set-state' : 'set-design', input: field.id, unit: field.unit, value };
         const asset = this.shown()?.asset;
@@ -1045,8 +1054,7 @@ let FigureEditor = class FigureEditor extends LitElement {
         const after = asset && part && field.role !== 'state' ? throughPlaneOf(this.shown().asset, drawableFigureParts(this.session.read().geometry ?? []), part) : 0;
         if (after > before + 0.5)
             this.tellThroughPlane(part, after);
-        // Rejected edits must also restore the displayed numeric value.
-        input.value = String(this.session.read().fields.find(i => i.id === field.id).value);
+        return this.session.read().fields.find(i => i.id === field.id).value;
     }
     /** Typing or a held spinner: each number on the way is drawn; the field's change records it. */
     typing(field, event) {
@@ -1077,16 +1085,12 @@ let FigureEditor = class FigureEditor extends LitElement {
      * pointer, and the release records one step. The field's number follows too, so the value in hand is always read.
      */
     scrub(field, down, unavailable) {
-        if (unavailable || down.button !== 0)
+        if (unavailable)
             return;
         const label = down.currentTarget;
         const input = (label.closest('div[cell]')?.querySelector('input') ?? label.nextElementSibling);
         if (!input)
             return;
-        down.preventDefault();
-        label.setPointerCapture(down.pointerId);
-        const start = field.value;
-        let value = start;
         /* Prepared once for the scrub: each move is a size through the same function its release writes with. */
         const asset = this.shown()?.asset;
         const sized = asset && this.selected && field.role !== 'state' ? (() => { try {
@@ -1095,29 +1099,17 @@ let FigureEditor = class FigureEditor extends LitElement {
         catch {
             return undefined;
         } })() : undefined;
-        const move = (e) => {
-            value = scrubbed(start, e.clientX - down.clientX, scrubStep(field.unit, start, e.shiftKey));
-            input.value = String(value);
-            this.hold(this.heldOf(field, value, sized));
-        };
-        const up = (e) => {
-            label.removeEventListener('pointermove', move);
-            label.removeEventListener('pointerup', up);
-            label.removeEventListener('pointercancel', up);
-            /* A drag the system took away is not the author's value: the field goes back to where it was. */
-            if (e.type === 'pointercancel')
-                value = start;
-            if (value === start) {
-                input.value = String(start);
+        scrubLabel(down, field, {
+            move: value => {
+                input.value = String(value);
+                this.hold(this.heldOf(field, value, sized));
+            },
+            release: value => (input.value = String(this.writeField(field, value))),
+            cancel: () => {
+                input.value = String(field.value);
                 this.live = NOTHING_LIVE;
-                return;
             }
-            input.value = String(value);
-            this.changeField(field, { target: input });
-        };
-        label.addEventListener('pointermove', move);
-        label.addEventListener('pointerup', up);
-        label.addEventListener('pointercancel', up);
+        });
     }
     /** The sizes a board may give the figure: the ends the author typed, and the rest as far as its parts allow. */
     renderInstanceRange(shown, unavailable) {