@things-factory/figure-ui 10.1.150 → 10.1.152

package/client/modeller/editor.ts

@@ -6,7 +6,7 @@ import { notify, openPopup } from '@operato/layout'
 import { OxPrompt } from '@operato/popup'
 import { customElement, property, state } from 'lit/decorators.js'
 import { live } from 'lit/directives/live.js'
-import { PART_LIMIT, parseFigureRecipe, resolveFigureRecipe, figurePartCountOf, figureRecipeIdFor, figureSizeEditChanges, figureScaleAnchorOf, figureSectionMeasuresOf, figurePlaneAlignChanges, type FigurePlaneContact, type FigureClipLoss, figurePartFaceOf, type FigureFaceArea, figureRowOf, type FigureRowReading, figureFaceOverhangOf, type FigureFaceOverhang, figureRoomOnlyInputsOf, figureRoomRefitOf } from '@hatiolab/figure-model'
+import { PART_LIMIT, parseFigureRecipe, resolveFigureRecipe, figurePartCountOf, figurePartIdFor, figureRecipeIdFor, figureSizeEditChanges, figureScaleAnchorOf, figureSectionMeasuresOf, figurePlaneAlignChanges, type FigurePlaneContact, type FigureClipLoss, figurePartFaceOf, type FigureFaceArea, figureRowOf, type FigureRowReading, figureFaceOverhangOf, type FigureFaceOverhang, figureRoomOnlyInputsOf, figureRoomRefitOf } from '@hatiolab/figure-model'
 import type { RecipeTemplate } from './recipes.js'
 import './figure-recipe-catalog.js'
 import type { FigureAsset, FigureAuthoringAction, FigureEvaluatedShape, FigureInputChange, FigurePartEdit, FigurePrimitiveCreation, FigureProposalStep, FigureRecipe, FigureRecipeValue, FigurePlacement, FigureFaceMappingNeed, FigureFaceRemap } from '@hatiolab/figure-model'
@@ -35,7 +35,7 @@ import { ScrollbarStyles } from '@operato/styles'
 import { alignChanges, canMirror, mirrorChanges, type AlignTool } from './align.js'
 import type { FigurePaletteKind, FigurePartRow } from './figure-parts.js'
 import { paletteRecipe } from './palette.js'
-import { meshChoicesOf, meshPartIdOf, meshPartOf } from './mesh-import.js'
+import { meshChoicesOf, meshPartOf } from './mesh-import.js'
 import './figure-mesh-choice.js'
 import { uploadFigureMesh } from '../graphql/index.js'
 import { slotMarksOf } from './slot-layout-host.js'
@@ -803,10 +803,8 @@ export class FigureEditor extends LitElement {
   private add(kind: FigurePaletteKind) {
     if (!this.session) return
     this.run(() => {
-      const ids = new Set(this.session!.read().geometry.map(g => g.id))
-      let n = 1
-      while (ids.has(`${kind}-${n}`)) n++
-      const part = paletteRecipe(kind, `${kind}-${n}`)
+      /* The id is figure-model's to choose: what is in use is its rule, not a list the screen keeps. */
+      const part = paletteRecipe(kind, figurePartIdFor(this.session!.revisionNow()!.asset, kind))
       this.session!.add(part)
       this.selected = part.id
     })
@@ -838,8 +836,7 @@ export class FigureEditor extends LitElement {
     if (!choice) return
     const node = upload.summary.nodes.find(n => n.index === (choice as { node?: number }).node)
     this.run(() => {
-      const taken = new Set(this.session!.read().geometry.map(g => g.id))
-      const id = meshPartIdOf(node?.name ?? file.name.replace(/\.glb$/i, ''), taken)
+      const id = figurePartIdFor(this.session!.revisionNow()!.asset, node?.name ?? file.name.replace(/\.glb$/i, ''))
       this.session!.add(meshPartOf(upload, choice as { node?: number }, id))
       this.selected = id
     })
@@ -850,9 +847,8 @@ export class FigureEditor extends LitElement {
    */
   private duplicatePart(id: string) {
     this.run(() => {
-      const before = new Set(this.session!.read().geometry.map(g => g.id))
-      this.session!.edit({ kind: 'duplicate-part', target: id })
-      this.selected = this.session!.read().geometry.find(g => !before.has(g.id))?.id ?? id
+      /* The copy is the part the edit made, as figure-model named it. */
+      this.selected = this.session!.edit({ kind: 'duplicate-part', target: id }).made?.[0] ?? id
     })
   }
   private movePart(id: string, to: number) {
@@ -1032,9 +1028,7 @@ export class FigureEditor extends LitElement {
   private mirror(axis: 'x' | 'z') {
     this.run(() => {
       const id = this.selected
-      const before = new Set(this.session!.read().geometry.map(g => g.id))
-      this.session!.edit({ kind: 'duplicate-part', target: id })
-      const copy = this.session!.read().geometry.find(g => !before.has(g.id))?.id
+      const copy = this.session!.edit({ kind: 'duplicate-part', target: id }).made?.[0]
       if (!copy) return
       this.session!.apply(mirrorChanges(this.shown()!, id, copy, axis))
       this.selected = copy
@@ -1657,8 +1651,14 @@ export class FigureEditor extends LitElement {
       return
     }
     const view = this.session.read()
-    const same = this.preview && this.preview.key === JSON.stringify(candidate) && this.preview.context === view.context && this.preview.part === this.selected && 'revision' in this.preview && this.preview.revision === view.revision
+    const key = JSON.stringify(candidate)
+    const same = this.preview && this.preview.key === key && this.preview.context === view.context && this.preview.part === this.selected && 'revision' in this.preview && this.preview.revision === view.revision
     if (same) return
+    /*
+      What another command would do is not said of this one while this one is worked out: a row's pitch refused stayed
+      on screen for the count chosen after it (:3300, 2026-10-11).
+    */
+    if (this.preview && this.preview.key !== key) this.preview = undefined
     this.previewTimer = setTimeout(() => this.computePreview(candidate), PREVIEW_SETTLE_MS)
   }
   private computePreview(candidate: { action: FigureAuthoringAction; face?: { part: string; face: string } }) {

package/client/modeller/fasten-geometry.ts

@@ -125,6 +125,38 @@ export function alignmentAt(d: number, face: number | undefined, part: number, e
   return { how: 'mm', mm: Math.round(d) }
 }
 
+/**
+ * The alignment that brings the footprint inside the face, for 정렬·간격 고치기: on each axis it comes past an edge, the
+ * least move -- to that edge from inside (`min` / `max`, or that distance where edges are not offered) -- or the centre
+ * when the part is wider than the face and cannot be inside. `inside` when nothing of it is past an edge: what is out
+ * is something fastened on it. `unmeasured` when the face has no size to measure against.
+ */
+export function insideAlignmentOf(
+  view: FaceView | undefined,
+  align: Partial<Record<Axis, Alignment>>,
+  alignMm: Partial<Record<Axis, number>>
+): { align: Partial<Record<Axis, Alignment>>; alignMm: Partial<Record<Axis, number>>; moved: Axis[] } | { cannot: 'inside' | 'unmeasured' } {
+  if (!view || view.axes.some(a => view.face[a] === undefined)) return { cannot: 'unmeasured' }
+  const next = { align: { ...align }, alignMm: { ...alignMm }, moved: [] as Axis[] }
+  for (const a of view.axes) {
+    const face = view.face[a]!,
+      part = view.part[a]
+    const at = offsetOf(align[a], alignMm[a], face, part)
+    const low = -face / 2 - (at - part / 2) > 0.5,
+      high = at + part / 2 - face / 2 > 0.5
+    if (!low && !high) continue
+    next.moved.push(a)
+    if (part > face) {
+      next.align[a] = 'centre'
+      continue
+    }
+    const edge = ((low ? -1 : 1) * (face - part)) / 2
+    if (view.edges[a]) next.align[a] = low ? 'min' : 'max'
+    else ((next.align[a] = 'mm'), (next.alignMm[a] = Math.round(edge)))
+  }
+  return next.moved.length ? next : { cannot: 'inside' }
+}
+
 /** How far the footprint comes past the face's edges, per side, and whether it touches the face at all. */
 export function overhangOf(view: FaceView, at: Record<Axis, number>): { touching: boolean; sides: Array<{ axis: Axis; side: 'low' | 'high'; mm: number }> } {
   const sides: Array<{ axis: Axis; side: 'low' | 'high'; mm: number }> = []

package/client/modeller/figure-links.ts

@@ -6,7 +6,7 @@ import './figure-slot-layout-panel.js'
 import { customElement, property, state } from 'lit/decorators.js'
 
 import { i18next, localize } from '@operato/i18n'
-import { FIGURE_FACES } from '@hatiolab/figure-model'
+import { FIGURE_FACES, figureFaceOverhangOf } from '@hatiolab/figure-model'
 import type { FigureAsset, FigureAuthoringAction, FigureDimensionSource, FigureFace } from '@hatiolab/figure-model'
 
 import {
@@ -56,7 +56,7 @@ import {
 import { SidePanelStyles } from './side-panel-styles.js'
 import './figure-fasten-drawing.js'
 import type { FastenChange } from './figure-fasten-drawing.js'
-import { faceViewOf, modeOf, myFaceFor, turnsInPlace, type FastenMode } from './fasten-geometry.js'
+import { faceViewOf, insideAlignmentOf, modeOf, myFaceFor, turnsInPlace, type FaceView, type FastenMode } from './fasten-geometry.js'
 import type { FigureRevision } from './revision.js'
 import { HelpToggles } from './help.js'
 import { jointAxisWord } from './joint-axis.js'
@@ -186,6 +186,8 @@ export class FigureLinks extends localize(i18next)(LitElement) {
   /** The fastening section, marked for a moment when "open attachment settings" brings it into view. */
   @state() private spotlit = false
   @state() private fasten = freshFasten()
+  /** Why 정렬·간격 고치기 moved nothing, said under it; empty once it moved the part or the part changed. */
+  @state() private fixNote = ''
   @state() private motion: MotionForm = freshMotion()
   @state() private place = freshPlace()
   /** How places are made here: one at a time, or by the figure's rule. Unset: by the rule when the figure has one. */
@@ -201,7 +203,9 @@ export class FigureLinks extends localize(i18next)(LitElement) {
   /* The part the forms were loaded for. A panel made with a part already chosen loaded nothing, and said "editing the
      fastening it has" over an empty target (2026-09-27, :3391, the doors). */
   private loadedFor?: string
-  willUpdate(_changed: Map<string, unknown>) {
+  willUpdate(changed: Map<string, unknown>) {
+    /* What 고치기 said is about the figure as it was: another step or another part, and it no longer holds. */
+    if (changed.has('asset') || changed.has('partId')) this.fixNote = ''
     if (this.asset && this.partId && this.partId !== this.loadedFor) {
       this.loadedFor = this.partId
       /* A part's own fastening is not another part's choices: the form opens on it (walk 1, 2026-09-26). */
@@ -430,16 +434,27 @@ export class FigureLinks extends localize(i18next)(LitElement) {
    * holding places instead).
    */
   /** The face the part sits on, in view with the focus on it: where the place across the face is dragged or keyed. */
-  private async showWhere() {
-    this.working = 'fasten'
-    await this.updateComplete
-    /* The drawing draws itself after this panel does: its "where" is there only once it has. */
-    const drawing = this.renderRoot.querySelector<HTMLElement & { updateComplete?: Promise<unknown> }>('figure-fasten-drawing')
-    await drawing?.updateComplete
-    const where = drawing?.shadowRoot?.querySelector<HTMLElement>('div[where]')
-    if (!where) return
-    where.scrollIntoView({ block: 'nearest', behavior: 'smooth' })
-    where.focus({ preventScroll: true })
+  /**
+   * 정렬·간격 고치기: the part moved inside the face it is fastened on, as one step -- the least move on each side it is
+   * out, or centred when it is wider than the face. When nothing of it can be moved, why is said under the button, not
+   * nothing at all (:3300, 2026-10-11: the button only scrolled to the drawing, which was already in view).
+   */
+  private async fixAlignment(view: FaceView | undefined, target: string) {
+    /* Whether it is out is the kernel's measure (a round face is not measured there); the drawing's sizes say how far to move. */
+    const own = this.revision ? figureFaceOverhangOf(this.revision.asset, this.partId, this.revision.inputs) : undefined
+    const fixed =
+      own?.state === 'unknown'
+        ? ({ cannot: 'unmeasured' } as const)
+        : own?.state === 'out' || own?.state === 'possible'
+          ? insideAlignmentOf(view, this.fasten.align, this.fasten.alignMm)
+          : ({ cannot: 'inside' } as const)
+    if ('cannot' in fixed) {
+      this.fixNote = i18next.t(`figure.text.fix-alignment-${fixed.cannot}`, { part: this.partId, on: target })
+      return
+    }
+    this.fixNote = ''
+    this.fasten = { ...this.fasten, align: fixed.align, alignMm: fixed.alignMm }
+    await this.onFastenRelease(true)
   }
 
   /** The fastening form, open on this part and in view: for "fasten it first" from elsewhere. */
@@ -600,7 +615,10 @@ export class FigureLinks extends localize(i18next)(LitElement) {
         ? html`<div overhang role="status">
             ${this.overhangWords.map(line => html`<p>${line}</p>`)}
             ${current
-              ? html`<button act @click=${() => this.showWhere()}><md-icon>tune</md-icon>${i18next.t('figure.button.fix-alignment')}</button>`
+              ? html`<button act fix-alignment ?disabled=${this.locked} @click=${() => this.fixAlignment(view, held ? f.target : '')}>
+                    <md-icon>tune</md-icon>${i18next.t('figure.button.fix-alignment')}
+                  </button>
+                  ${this.fixNote ? html`<p hint fix-note>${this.fixNote}</p>` : nothing}`
               : nothing}
           </div>`
         : nothing}

package/client/modeller/mesh-import.ts

@@ -38,16 +38,6 @@ export function meshChoicesOf(upload: MeshUpload): Array<{ node?: number; name:
   ]
 }
 
-/** A part id from a node's name: letter-led, letters, digits, `_` and `-`; another number when it is taken. */
-export function meshPartIdOf(name: string, taken: ReadonlySet<string>): string {
-  const cleaned = name.replace(/[^a-zA-Z0-9_-]+/g, '-').replace(/^[^a-zA-Z]+/, '').replace(/-+$/, '')
-  const base = cleaned || 'mesh'
-  if (!taken.has(base)) return base
-  let n = 2
-  while (taken.has(`${base}-${n}`)) n++
-  return `${base}-${n}`
-}
-
 /**
  * The part: its bounds and counts as the server read them, its size the reach along its longest axis (so it is 1:1),
  * and -- for a node -- standing where the node stood in the file, so a crane taken apart node by node stands as it did.

package/client/modeller/refusals.ts

@@ -101,6 +101,9 @@ export function placedRefusalOf(error: unknown, part: string, say: Say): string
 
 /** A part name refused: not a name, already used, or another part is named under the part. The rule is the kernel's. */
 export function partNameRefusalOf(error: unknown, say: Say): string | null {
+  /* A new part named as one already is: the same sentence as a part renamed so. */
+  const takenId = detailsOf(error, 'part-id-taken')
+  if (takenId) return say('figure.text.part-name-taken', { name: takenId.part })
   if (codeOf(error) !== 'PART_ID') return null
   const invalid = detailsOf(error, 'name-invalid')
   if (invalid) return say('figure.text.part-name-invalid', { name: invalid.name })
@@ -236,7 +239,8 @@ export function inputRangeRefusalOf(error: unknown, say: Say): string | null {
 
 /**
  * A row past its limits: a pitch so fine it would hold more copies than a row takes, a row that would expand to more
- * bodies than a figure draws, or a number of copies outside what a row may have.
+ * bodies than a figure draws, a number of copies outside what a row may have or more than its length holds apart, a
+ * row inside a row along the same axis, or a part whose face something holds made into a row.
  */
 export function rowLimitRefusalOf(error: unknown, say: Say): string | null {
   const copies = detailsOf(error, 'copies-over-limit')
@@ -245,9 +249,18 @@ export function rowLimitRefusalOf(error: unknown, say: Say): string | null {
   if (bodies) return say('figure.text.row-geometry-over-limit', { count: bodies.count.toLocaleString(), limit: bodies.limit.toLocaleString() })
   const count = detailsOf(error, 'row-copies-out-of-range')
   if (count) return say('figure.text.row-copies-out-of-range', { count: count.count.toLocaleString(), min: String(count.min), max: String(count.max) })
+  const fit = detailsOf(error, 'row-does-not-fit')
+  if (fit) return say('figure.text.row-does-not-fit', { count: fit.count.toLocaleString(), length: mmOf(fit.length), extent: mmOf(fit.extent) })
+  const axis = detailsOf(error, 'row-same-axis')
+  if (axis) return say('figure.text.row-same-axis', { part: axis.part, outer: axis.outer, axis: axis.axis.toUpperCase() })
+  const held = detailsOf(error, 'surface-on-row')
+  if (held) return say(`figure.text.row-face-held-${heldByOf(held.at)}`, { part: held.part })
   return null
 }
 
+/* What holds a face, from the contract path the kernel names it by: the slot layout, a place, the footprint. */
+const heldByOf = (at: string) => (at.startsWith('slotLayout') ? 'slot-layout' : at.startsWith('bindings') ? 'place' : at.startsWith('occupancy') ? 'footprint' : 'other')
+
 /** A row's pitch under which the figure, at the length it is authored, would hold more copies than a row takes. */
 export function repeatPitchRefusalOf(error: unknown, say: Say): string | null {
   if (codeOf(error) !== 'INPUT_RANGE') return null

package/dist-client/modeller/editor.js

@@ -7,7 +7,7 @@ import { notify, openPopup } from '@operato/layout';
 import { OxPrompt } from '@operato/popup';
 import { customElement, property, state } from 'lit/decorators.js';
 import { live } from 'lit/directives/live.js';
-import { PART_LIMIT, parseFigureRecipe, resolveFigureRecipe, figurePartCountOf, figureRecipeIdFor, figureSizeEditChanges, figureScaleAnchorOf, figureSectionMeasuresOf, figurePlaneAlignChanges, figurePartFaceOf, figureRowOf, figureFaceOverhangOf, figureRoomOnlyInputsOf, figureRoomRefitOf } from '@hatiolab/figure-model';
+import { PART_LIMIT, parseFigureRecipe, resolveFigureRecipe, figurePartCountOf, figurePartIdFor, figureRecipeIdFor, figureSizeEditChanges, figureScaleAnchorOf, figureSectionMeasuresOf, figurePlaneAlignChanges, figurePartFaceOf, figureRowOf, figureFaceOverhangOf, figureRoomOnlyInputsOf, figureRoomRefitOf } from '@hatiolab/figure-model';
 import './figure-recipe-catalog.js';
 import { captureFigureThumbnail } from './thumbnail.js';
 import { drawableFigureParts } from './renderer.js';
@@ -32,7 +32,7 @@ import { SidePanelStyles } from './side-panel-styles.js';
 import { ScrollbarStyles } from '@operato/styles';
 import { alignChanges, canMirror, mirrorChanges } from './align.js';
 import { paletteRecipe } from './palette.js';
-import { meshChoicesOf, meshPartIdOf, meshPartOf } from './mesh-import.js';
+import { meshChoicesOf, meshPartOf } from './mesh-import.js';
 import './figure-mesh-choice.js';
 import { uploadFigureMesh } from '../graphql/index.js';
 import { slotMarksOf } from './slot-layout-host.js';
@@ -794,11 +794,8 @@ let FigureEditor = class FigureEditor extends LitElement {
         if (!this.session)
             return;
         this.run(() => {
-            const ids = new Set(this.session.read().geometry.map(g => g.id));
-            let n = 1;
-            while (ids.has(`${kind}-${n}`))
-                n++;
-            const part = paletteRecipe(kind, `${kind}-${n}`);
+            /* The id is figure-model's to choose: what is in use is its rule, not a list the screen keeps. */
+            const part = paletteRecipe(kind, figurePartIdFor(this.session.revisionNow().asset, kind));
             this.session.add(part);
             this.selected = part.id;
         });
@@ -832,8 +829,7 @@ let FigureEditor = class FigureEditor extends LitElement {
             return;
         const node = upload.summary.nodes.find(n => n.index === choice.node);
         this.run(() => {
-            const taken = new Set(this.session.read().geometry.map(g => g.id));
-            const id = meshPartIdOf(node?.name ?? file.name.replace(/\.glb$/i, ''), taken);
+            const id = figurePartIdFor(this.session.revisionNow().asset, node?.name ?? file.name.replace(/\.glb$/i, ''));
             this.session.add(meshPartOf(upload, choice, id));
             this.selected = id;
         });
@@ -844,9 +840,8 @@ let FigureEditor = class FigureEditor extends LitElement {
      */
     duplicatePart(id) {
         this.run(() => {
-            const before = new Set(this.session.read().geometry.map(g => g.id));
-            this.session.edit({ kind: 'duplicate-part', target: id });
-            this.selected = this.session.read().geometry.find(g => !before.has(g.id))?.id ?? id;
+            /* The copy is the part the edit made, as figure-model named it. */
+            this.selected = this.session.edit({ kind: 'duplicate-part', target: id }).made?.[0] ?? id;
         });
     }
     movePart(id, to) {
@@ -1045,9 +1040,7 @@ let FigureEditor = class FigureEditor extends LitElement {
     mirror(axis) {
         this.run(() => {
             const id = this.selected;
-            const before = new Set(this.session.read().geometry.map(g => g.id));
-            this.session.edit({ kind: 'duplicate-part', target: id });
-            const copy = this.session.read().geometry.find(g => !before.has(g.id))?.id;
+            const copy = this.session.edit({ kind: 'duplicate-part', target: id }).made?.[0];
             if (!copy)
                 return;
             this.session.apply(mirrorChanges(this.shown(), id, copy, axis));
@@ -1671,9 +1664,16 @@ let FigureEditor = class FigureEditor extends LitElement {
             return;
         }
         const view = this.session.read();
-        const same = this.preview && this.preview.key === JSON.stringify(candidate) && this.preview.context === view.context && this.preview.part === this.selected && 'revision' in this.preview && this.preview.revision === view.revision;
+        const key = JSON.stringify(candidate);
+        const same = this.preview && this.preview.key === key && this.preview.context === view.context && this.preview.part === this.selected && 'revision' in this.preview && this.preview.revision === view.revision;
         if (same)
             return;
+        /*
+          What another command would do is not said of this one while this one is worked out: a row's pitch refused stayed
+          on screen for the count chosen after it (:3300, 2026-10-11).
+        */
+        if (this.preview && this.preview.key !== key)
+            this.preview = undefined;
         this.previewTimer = setTimeout(() => this.computePreview(candidate), PREVIEW_SETTLE_MS);
     }
     computePreview(candidate) {