@things-factory/figure-ui 10.1.204 → 10.1.206

package/client/modeller/fasten-form.ts

@@ -1,5 +1,5 @@
-import { FIGURE_FACES, figurePlaneFacingOf } from '@hatiolab/figure-model'
-import type { FigureAuthoringAction, FigureFace } from '@hatiolab/figure-model'
+import { FIGURE_FACES, figureFastenKeptGapOf, figureFastenTargetAt, figurePlaneFacingOf, figureSurfaceKeptPlaceOf } from '@hatiolab/figure-model'
+import type { FigureAuthoringAction, FigureFace, FigureSurfacePlace } from '@hatiolab/figure-model'
 
 import { faceViewOf, type FaceView, type FastenMode, type FastenTarget } from './fasten-geometry.js'
 import type { FastenChange } from './figure-fasten-drawing.js'
@@ -14,10 +14,12 @@ import {
   heldBy,
   mountingPlaneOf,
   placeKeptOf,
+  surfaceOf,
   type Alignment,
   type Axis
 } from './links.js'
 import type { FigureRevision } from './revision.js'
+import { ownerOf } from './fields.js'
 
 /*
  * A fastening as it is chosen, before it is done: to what, which face, how, where across the face. The fastening window
@@ -36,9 +38,17 @@ export interface FastenForm {
   gap: number
   /** The record's gap when it is worked out (a length that follows something): kept until a number is typed. */
   gapKept: unknown
+  /**
+   * Where the gap came from (ADR-0140 stage 4, 「현재 상태로 붙이기」): `kept` -- the distance the part stands at, worked
+   * out again whenever where or how it is fastened changes, so fastening does not move it; `typed` -- the author's
+   * number, left as it is; `pressed` -- 0, the part put where the canvas was pressed.
+   */
+  gapFrom: 'kept' | 'typed' | 'pressed'
   align: Partial<Record<Axis, Alignment>>
   alignMm: Partial<Record<Axis, number>>
   alignInput: Partial<Record<Axis, string>>
+  /** On a point of the target's curved surface instead of a face (ADR-0140 3.9): where, as the record says it. */
+  surface?: FigureSurfacePlace
 }
 
 export const freshFasten = (): FastenForm => ({
@@ -48,6 +58,7 @@ export const freshFasten = (): FastenForm => ({
   facing: 'meet',
   gap: 0,
   gapKept: undefined,
+  gapFrom: 'kept',
   align: {},
   alignMm: {},
   alignInput: {}
@@ -56,7 +67,9 @@ export const freshFasten = (): FastenForm => ({
 /** The part's own fastening as a form, or a fresh one: a window opens on what the part has (walk 1, 2026-09-26). */
 export function fastenFormOf(revision: FigureRevision, part: string): FastenForm {
   const own = fasteningOf(revision, part)
-  return own && !own.atOrigin ? ({ ...freshFasten(), ...own } as FastenForm) : freshFasten()
+  if (!own || own.atOrigin) return freshFasten()
+  /* A gap the record works out is the author's; a number is where the part stands, so aiming again keeps it there. */
+  return { ...freshFasten(), ...own, gapFrom: own.gapKept !== undefined ? 'typed' : 'kept' } as FastenForm
 }
 
 /** What a part may be fastened to: every other part that can be, each said whether it would close a loop. */
@@ -72,15 +85,38 @@ export function fastenTargetsOf(revision: FigureRevision, part: string): Array<{
 }
 
 /**
- * A new aim: the plane, another part, or another face of the same part. Where on the face is filled in as where the
- * part stands now, so fastening it keeps it there (`placeKeptOf`); the author changes it from there.
+ * The point of a target's curved surface on the side the part stands on now (ADR-0140 3.9): the kernel's
+ * (`figureSurfaceKeptPlaceOf`), or, the part standing on its axis, the surface's first point.
+ */
+export function surfaceKeptOf(revision: FigureRevision, part: string, target: string): FigureSurfacePlace | undefined {
+  const surface = surfaceOf(revision.asset, target)
+  if (!surface) return undefined
+  return (
+    figureSurfaceKeptPlaceOf(revision.asset, part, target, { ...revision.inputs }) ??
+    (surface.form === 'around' ? { around: 0, along: 'centre' } : { toward: { x: 0, y: 1, z: 0 } })
+  )
+}
+
+/**
+ * A new aim: the plane, another part, another face of the same part, or a point of its curved surface. Where on the
+ * face -- or the surface -- is filled in as where the part stands now, so fastening it keeps it there (`placeKeptOf`,
+ * `surfaceKeptOf`); the author changes it from there. A part aimed at a sphere, or beside a cylinder's side within its
+ * length, is aimed at the surface: it is fastened as it stands (ADR-0140 3.6).
  */
 export function aimFasten(
   revision: FigureRevision,
   part: string,
   form: FastenForm,
-  to: { plane: true } | { part: string } | { targetFace: FigureFace }
+  to: { plane: true } | { part: string } | { targetFace: FigureFace } | { surface: true }
 ): FastenForm {
+  if ('surface' in to) return { ...form, surface: surfaceKeptOf(revision, part, form.target), align: {}, alignMm: {}, alignInput: {} }
+  if ('part' in to) {
+    /* Beside its curved surface -- a sphere's anywhere, a cylinder's side within its length -- or with no face at all. */
+    const beside = figureSurfaceKeptPlaceOf(revision.asset, part, to.part, { ...revision.inputs })
+    const kept = beside ?? (!facesOf(revision.asset, to.part).length ? surfaceKeptOf(revision, part, to.part) : undefined)
+    if (kept) return { ...form, toPlane: false, target: to.part, surface: kept, align: {}, alignMm: {}, alignInput: {} }
+  }
+  form = { ...form, surface: undefined }
   /* Aimed at the plane, it meets it toward the side the placement uses -- below a ceiling -- until the author says (ADR-0140 3.11). */
   const f: FastenForm =
     'plane' in to
@@ -106,9 +142,11 @@ export function fastenChanged(
   change: FastenChange
 ): FastenForm {
   const f = form
-  if ('targetFace' in change) return aimFasten(revision, part, f, { targetFace: change.targetFace as FigureFace })
-  if ('mode' in change) return { ...f, facing: change.mode }
-  if ('gap' in change) return { ...f, gap: change.gap, gapKept: undefined }
+  if ('targetFace' in change) return keptGapOf(revision, part, aimFasten(revision, part, f, { targetFace: change.targetFace as FigureFace }))
+  if ('onSurface' in change) return keptGapOf(revision, part, aimFasten(revision, part, f, { surface: true }))
+  if ('surface' in change) return keptGapOf(revision, part, { ...f, surface: change.surface })
+  if ('mode' in change) return keptGapOf(revision, part, { ...f, facing: change.mode })
+  if ('gap' in change) return { ...f, gap: change.gap, gapKept: undefined, gapFrom: 'typed' }
   return {
     ...f,
     align: { ...f.align, [change.axis]: change.how },
@@ -116,6 +154,29 @@ export function fastenChanged(
   }
 }
 
+/**
+ * The form with the gap that keeps the part where it stands (ADR-0140 stage 4, user 2026-10-20 「현재 상태로 붙이기」):
+ * figure-model's `figureFastenKeptGapOf` for what it is aimed at and how it meets it. A gap the author typed, or the 0 a
+ * canvas press puts, is left as it is. Nothing aimed at yet, the form is as it was.
+ */
+export function keptGapOf(revision: FigureRevision, part: string, form: FastenForm): FastenForm {
+  if (form.gapFrom !== 'kept') return form
+  const asset = revision.asset
+  const theirFaces = form.target ? facesOf(asset, form.target) : FACES
+  const targetFace = (theirFaces.includes(form.targetFace) ? form.targetFace : theirFaces[0]) as FigureFace
+  const planeWay = figurePlaneFacingOf(asset)
+  const mode: FastenMode = form.toPlane ? (mountingPlaneOf(asset).facings.includes(form.facing) ? form.facing : (planeWay ?? 'meet')) : form.facing
+  const to = form.toPlane
+    ? ('plane' as const)
+    : form.target && form.surface && surfaceOf(asset, form.target)
+      ? { part: form.target, surface: form.surface }
+      : form.target
+        ? { part: form.target, face: targetFace }
+        : undefined
+  if (!to) return form
+  return { ...form, gap: figureFastenKeptGapOf(asset, part, to, mode, { ...revision.inputs }), gapKept: undefined }
+}
+
 /** What a form comes to: the face aimed at, the way, the drawing of the face and the command. */
 export interface FastenPlan {
   /** Nothing is aimed at until a part or the plane is chosen. */
@@ -129,6 +190,8 @@ export interface FastenPlan {
   action?: FigureAuthoringAction
   /** The face the command would meet, lit on the canvas while it is tried. */
   face?: { part: string; face: string }
+  /** On a point of the target's curved surface: which surface, about which axis, and where (ADR-0140 3.9). */
+  surface?: { form: 'around' | 'toward'; axis: Axis; place: FigureSurfacePlace }
 }
 
 export function fastenPlanOf(revision: FigureRevision, part: string, f: FastenForm): FastenPlan {
@@ -143,6 +206,19 @@ export function fastenPlanOf(revision: FigureRevision, part: string, f: FastenFo
   /* The plane takes a part standing on it or hanging below it, a wall only one standing out of it (ADR-0140 3.11). */
   const planeWay = figurePlaneFacingOf(asset)
   const mode: FastenMode = f.toPlane ? (mountingPlaneOf(asset).facings.includes(f.facing) ? f.facing : (planeWay ?? 'meet')) : f.facing
+  const surface = !f.toPlane && f.target && f.surface ? surfaceOf(asset, f.target) : undefined
+  if (surface) {
+    /* On the surface: where is the surface's own words, so no alignment goes with it (ADR-0140 3.9). */
+    const action = {
+      kind: 'attach',
+      part,
+      to: { part: f.target, surface: f.surface },
+      facing: mode,
+      ...fastenGapOf(f),
+      replace: !!heldBy(asset, part)
+    } as FigureAuthoringAction
+    return { theirFaces, targetFace, mode, alignRows: [], action, surface: { ...surface, place: f.surface! } }
+  }
   if (!aim) return { theirFaces, targetFace, mode, alignRows: [] }
   const align = alignOf(asset, aim, f.align, f.alignMm, f.alignInput)
   const view = faceViewOf(revision, part, aim, mode)
@@ -177,17 +253,59 @@ export function fastenSentenceOf(
   planeWord: string,
   say: Say
 ): string {
-  const to = form.toPlane ? planeWord : `${form.target}의 ${say('figure.label.face-' + plan.targetFace)}`
+  const where = plan.surface ? say('figure.label.surface-' + plan.surface.form) : say('figure.label.face-' + plan.targetFace)
+  const to = form.toPlane ? planeWord : `${form.target}의 ${where}`
   return say(`figure.text.fasten-sentence-${plan.mode}`, { to })
 }
 
-/** What the folded details hold that is not their default, said while folded; nothing for the default. */
+/**
+ * What the folded details hold that is not their default, said while folded; nothing for the default. The gap's default
+ * is the one it starts at -- the distance the part stands at, or 0 where the canvas was pressed -- so only a number typed
+ * is said.
+ */
 export function fastenDetailWordsOf(form: FastenForm, say: Say): string[] {
   return [
     ...(form.gapKept !== undefined
       ? [say('figure.text.fasten-summary-gap-worked-out')]
-      : form.gap
+      : form.gapFrom === 'typed' && form.gap
         ? [say('figure.text.fasten-summary-gap', { mm: String(form.gap) })]
         : [])
   ]
 }
+
+/**
+ * A part pressed on the canvas while the window is open (ADR-0140 stage 4): aimed at, on the face or the point pressed,
+ * its middle where it was pressed -- the kernel's reading of the press (`figureFastenTargetAt`), the point and normal brought into that part's own
+ * frame by the pose its body is drawn at (`at.id`, a row's copy too). The part itself, one hanging from it, or one with
+ * nothing to fasten to is not aimed at; a press on a curve there is no fastening to aims at the part alone. Each says
+ * why, by its words' key.
+ */
+/* Put where the canvas was pressed: on the face or the surface there, with no gap (ADR-0140 stage 4). */
+const PRESSED = { gap: 0, gapKept: undefined, gapFrom: 'pressed' as const }
+
+export function aimFastenAt(
+  revision: FigureRevision,
+  part: string,
+  form: FastenForm,
+  at: { id: string; point?: readonly number[]; normal?: readonly number[] }
+): { form?: FastenForm; note?: 'aim-self' | 'aim-cannot' | 'target-would-loop' | 'aim-not-here'; part: string } {
+  const target = ownerOf(at.id)
+  const offered = fastenTargetsOf(revision, part).find(t => t.part === target)
+  if (target === part) return { note: 'aim-self', part: target }
+  if (!offered) return { note: 'aim-cannot', part: target }
+  if (offered.loops) return { note: 'target-would-loop', part: target }
+  const aimed = aimFasten(revision, part, form, { part: target })
+  const pose = (revision.geometry as Array<{ id: string; pose?: { r: number[][]; t: number[] } }>).find(g => g.id === at.id)?.pose
+  if (!pose || !at.point || !at.normal) return { form: aimed, part: target }
+  /* Into the part's own frame: rᵀ (p − t), and the normal by rᵀ. */
+  const own = (v: readonly number[], from: readonly number[] = [0, 0, 0]) => [0, 1, 2].map(c => [0, 1, 2].reduce((sum, i) => sum + pose.r[i]![c]! * (v[i]! - from[i]!), 0))
+  const lands = figureFastenTargetAt(revision.asset, target, own(at.point, pose.t), own(at.normal), { ...revision.inputs })
+  if ('face' in lands) {
+    /* On the face where it was pressed, as a point of a curved surface is: its middle there. */
+    const onFace = aimFasten(revision, part, { ...aimed, surface: undefined }, { targetFace: lands.face as FigureFace })
+    const at = lands.at as Partial<Record<Axis, number>>
+    return { form: { ...onFace, ...PRESSED, align: Object.fromEntries(Object.keys(at).map(a => [a, 'mm'])) as FastenForm['align'], alignMm: { ...at }, alignInput: {} }, part: target }
+  }
+  if ('surface' in lands) return { form: { ...aimed, ...PRESSED, toPlane: false, target, surface: lands.surface, align: {}, alignMm: {}, alignInput: {} }, part: target }
+  return { form: aimed, note: 'aim-not-here', part: target }
+}

package/client/modeller/figure-fasten-dialog.ts

@@ -15,6 +15,8 @@ import type { FastenChange } from './figure-fasten-drawing.js'
 import { turnsInPlace, type FastenMode } from './fasten-geometry.js'
 import {
   aimFasten,
+  aimFastenAt,
+  keptGapOf,
   fastenChanged,
   fastenDetailWordsOf,
   fastenFormOf,
@@ -23,16 +25,17 @@ import {
   fastenTargetsOf,
   type FastenForm
 } from './fasten-form.js'
-import { fieldWordsOf, hasInstanceSize, heldBy, mountingPlaneOf, type Alignment, type Axis } from './links.js'
+import { fieldWordsOf, hasInstanceSize, heldBy, mountingPlaneOf, surfaceOf, type Alignment, type Axis } from './links.js'
 import type { FigureRevision } from './revision.js'
 
 /** The target list's entry for the plane the figure stands by. */
 const PLANE = '__plane'
 
 /**
- * 붙이기 창: what the selected part is fastened to, on which face, how (user 2026-10-17: 「속성에는 심플하고 직관적인
- * 결과 위주로, 편집은 팝업에서 넓은 공간을 써서」). The editor stands it over the side panel with its title and close,
- * where the canvas stays in sight (2026-10-19: the standard popup, always modal, hid the 3D it was choosing for).
+ * 붙이기 창: what the selected part is fastened to, on which face, how -- chosen with room to see it, in the standard
+ * popup the editor opens (`openPopup`: its title, its close, moved by its head; no backdrop, so the canvas can be
+ * pressed while it is open) (user 2026-10-17: 「속성에는 심플하고 직관적인 결과 위주로, 편집은 팝업에서 넓은 공간을
+ * 써서」; 2026-10-18: the standard popup, not a window of its own; put back 2026-10-20).
  *
  * Everything chosen here is tried, not done: the command it comes to is told to the editor as it changes
  * (`preview-command`), and the canvas draws it. 「적용」 sends it once (`fasten-apply`), one step of the history;
@@ -46,11 +49,16 @@ export class FigureFastenDialog extends localize(i18next)(LitElement) {
     SidePanelStyles,
     CommonPopupStyles,
     css`
+      /*
+        The popup holds it at its own height and cuts what is past the screen: the window scrolls itself, within the
+        screen less the popup's head and margins, 취소 · 적용 kept at its foot (below).
+      */
       :host {
         display: grid;
         gap: 16px;
         padding: var(--popup-padding, 16px);
         overflow: auto;
+        max-height: calc(100dvh - 32px - 56px);
       }
       /* The result in one line, at the top: it changes with every choice below it. */
       p[fasten-sentence] {
@@ -104,7 +112,7 @@ export class FigureFastenDialog extends localize(i18next)(LitElement) {
         margin: 0;
         color: var(--md-sys-color-error);
       }
-      /* 취소 · 적용 stay in sight at the window's foot when what is above them is taller than the panel. */
+      /* 취소 · 적용 stay in sight at the window's foot when what is above them is taller than the screen. */
       ox-popup-actions {
         position: sticky;
         bottom: calc(-1 * var(--popup-padding, 16px));
@@ -126,6 +134,8 @@ export class FigureFastenDialog extends localize(i18next)(LitElement) {
   @property() error = ''
 
   @state() private form?: FastenForm
+  /** Why a press on the canvas aimed at nothing, or only at the part (ADR-0140 stage 4); cleared by the next choice. */
+  @state() private aimNote = ''
   /** The command the part's own fastening comes to, as opened: tried unchanged, nothing new is said of it. */
   private opened?: string
   private told = ''
@@ -195,12 +205,17 @@ export class FigureFastenDialog extends localize(i18next)(LitElement) {
         .alignMm=${f.alignMm}
         .gap=${f.gap}
         .partName=${this.partId}
+        .surfaceForm=${f.toPlane || !f.target ? '' : (surfaceOf(asset, f.target)?.form ?? '')}
+        .surface=${plan.surface}
         ?locked=${this.locked}
-        @fasten-change=${(e: CustomEvent<FastenChange>) => (this.form = fastenChanged(revision, this.partId, this.form!, e.detail))}
+        @fasten-change=${(e: CustomEvent<FastenChange>) => {
+          this.aimNote = ''
+          this.form = fastenChanged(revision, this.partId, this.form!, e.detail)
+        }}
       ></figure-fasten-drawing>`
     return html`
       ${
-        plan.aim
+        plan.aim || plan.surface
           ? html`<p fasten-sentence role="status">
               ${fastenSentenceOf(f, plan, planeWord, (key, params) => i18next.t(key, params))}
             </p>`
@@ -211,13 +226,15 @@ export class FigureFastenDialog extends localize(i18next)(LitElement) {
         ${this.renderTargets(revision, f, planeWord)}
       </div>
       ${
-        plan.aim
+        plan.aim || plan.surface
           ? html`<div question="face">
                 <h4>
                   ${
                     /* The face asked is the target's, named: the part meets it by its real shape, by no face of its own. */ f.toPlane
                       ? i18next.t('figure.label.fasten-face-on-plane', { plane: planeWord })
-                      : i18next.t('figure.label.fasten-face-on-part', { part: f.target })
+                      : /* A sphere has no face to choose: where on its surface. */ plan.theirFaces.length
+                        ? i18next.t('figure.label.fasten-face-on-part', { part: f.target })
+                        : i18next.t('figure.label.fasten-face-on-surface', { part: f.target })
                   }
                 </h4>
                 ${drawing('face')}
@@ -244,7 +261,7 @@ export class FigureFastenDialog extends localize(i18next)(LitElement) {
                       step="any"
                       .value=${f.gapKept !== undefined ? '' : String(f.gap)}
                       placeholder=${f.gapKept !== undefined ? i18next.t('figure.label.follows-expression') : ''}
-                      @change=${(e: Event) => this.set({ gap: Number((e.target as HTMLInputElement).value) || 0, gapKept: undefined })}
+                      @change=${(e: Event) => this.set({ gap: Number((e.target as HTMLInputElement).value) || 0, gapKept: undefined, gapFrom: 'typed' })}
                     />
                   </div>
                 </details>
@@ -252,6 +269,7 @@ export class FigureFastenDialog extends localize(i18next)(LitElement) {
               ${/* The one it has, tried unchanged: that it stays where it is goes without saying. */ JSON.stringify(plan.action ?? null) === this.opened ? nothing : this.renderPreviewWords()}`
           : nothing
       }
+      ${this.aimNote ? html`<p hint aim-note role="status">${this.aimNote}</p>` : nothing}
       ${this.error ? html`<p error role="alert">${this.error}</p>` : nothing}
       <ox-popup-actions>
         <md-text-button slot="cancel" cancel @click=${this.cancel}>${i18next.t('figure.button.cancel')}</md-text-button>
@@ -310,9 +328,23 @@ export class FigureFastenDialog extends localize(i18next)(LitElement) {
 
   private aim(part: string) {
     if (this.locked || !this.revision || !this.form) return
+    this.aimNote = ''
     const chosen = this.form.toPlane ? PLANE : this.form.target
     if (part === chosen) return
-    this.form = aimFasten(this.revision, this.partId, this.form, part === PLANE ? { plane: true } : { part })
+    this.form = keptGapOf(this.revision, this.partId, aimFasten(this.revision, this.partId, this.form, part === PLANE ? { plane: true } : { part }))
+  }
+
+  /**
+   * A part pressed on the canvas while the window is open (ADR-0140 stage 4): aimed at, on the face or the point pressed
+   * -- the kernel's reading of the press (`figureFastenTargetAt`), the point and normal brought into that part's own
+   * frame by the pose it is drawn at. The part itself, or one hanging from it, is not aimed at; and a press on a curve
+   * there is no fastening to aims at the part alone. Each is said.
+   */
+  aimAt(at: { id: string; point?: number[]; normal?: number[] }) {
+    if (this.locked || !this.revision || !this.form) return
+    const aimed = aimFastenAt(this.revision, this.partId, this.form, at)
+    this.aimNote = aimed.note ? i18next.t(`figure.text.${aimed.note}`, { part: aimed.part, mine: this.partId }) : ''
+    if (aimed.form) this.form = aimed.form
   }
 
   /** The part under the pointer or the focus in the list, for the canvas to light; the plane lights nothing. */
@@ -410,6 +442,8 @@ export class FigureFastenDialog extends localize(i18next)(LitElement) {
     this.setAttribute('role', 'dialog')
     this.setAttribute('aria-label', i18next.t('figure.label.fastening'))
     this.addEventListener('keydown', this.onKey)
+    /* The popup's fitting width is the overlay's own setting; the window asks it for room for the face and the way side by side. */
+    this.closest<HTMLElement>('ox-floating-overlay')?.style.setProperty('--overlay-center-fit-width', '640px')
   }
 
   private onKey = async (e: KeyboardEvent) => {