@things-factory/figure-ui 10.1.272 → 10.1.273

package/client/modeller/data-interface.ts

@@ -94,13 +94,14 @@ import { methodOf, type DataMethod } from '@things-factory/figure-viewer/dist-cl
 export { methodOf, type DataMethod }
 
 /**
- * The methods a field allows (ADR-0166 2): a number as it is, scaled or by a range table; a text or true/false by a code
- * table, or as it is where a behavior takes it so; a list as it is (its items). A new field is made by a table.
+ * The methods a field allows (ADR-0166 2, amendment 1): a number as it is, scaled, by a code table (status codes sent as
+ * numbers, 4002) or by a range table; a text or true/false by a code table, or as it is where a behavior takes it so; a
+ * list as it is (its items). A new field is made by a table.
  */
 export function methodsOf(node: FigureDataNode | null, choices: BehaviorChoice[]): DataMethod[] {
   if (!node) return ['code', 'ranges']
   const fitting = choices.some(c => fitsField(node, c))
-  if (node.kind === 'number') return [...(fitting ? (['value', 'scale'] as const) : []), 'ranges']
+  if (node.kind === 'number') return [...(fitting ? (['value', 'scale'] as const) : []), 'code', 'ranges']
   if (node.kind === 'text' || node.kind === 'boolean') return [...(fitting ? (['value'] as const) : []), 'code']
   return fitting ? ['value'] : []
 }
@@ -170,6 +171,12 @@ export function bindingDraftOf(asset: FigureAsset, accessor: string, node: Figur
 /* ---------------------------------------------------------------- tables (ADR-0166 3) */
 
 /** The first code a new code table names, and the next ones: `CODE`, `CODE2`, … */
+/** A new code for a number field's code table: one past the largest taken, or 0 (ADR-0166 amendment 1). */
+export function freeNumberCodeOf(taken: string[]): string {
+  const numbers = taken.map(Number).filter(n => Number.isInteger(n) && n >= 0)
+  return String(numbers.length ? Math.max(...numbers) + 1 : 0)
+}
+
 export function freeCodeOf(taken: string[]): string {
   if (!taken.includes('CODE')) return 'CODE'
   let n = 2
@@ -186,28 +193,26 @@ export const legendRoleOf = (id: string): string =>
 
 /**
  * A first table on a field (ADR-0166 10): a row per value of a closed field, an open field's rows typed later, one
- * interval over the whole of a number. A new field is made by the table (P2): a code table's a text whose values are the
- * table's keys, starting with one code; a range table's a number. Returns the binding and, for a new field, the schema
- * with it.
+ * interval over the whole of a number. The field is one the schema has: the data tab adds a binding in the field's row.
  */
 export function tableDraftOf(
   asset: FigureAsset,
-  field: { path: string; node: FigureDataNode } | { name: string },
+  field: { path: string; node: FigureDataNode },
   method: 'code' | 'ranges',
   targets: FigureDataTargets
-): { binding: FigureDataTableBinding; schema?: FigureDataField[] } {
+): { binding: FigureDataTableBinding } {
   const taken = (asset.dataInterface?.bindings ?? []).map(b => b.id)
-  const made = 'name' in field
-  const name = made ? field.name : (field.path.replace(/\[\]/g, '').split('.').pop() ?? field.path)
+  const name = field.path.replace(/\[\]/g, '').split('.').pop() ?? field.path
   const id = freeIdOf(taken, name.toLowerCase())
-  const node: FigureDataNode = made ? (method === 'code' ? { kind: 'text', values: ['CODE'] } : { kind: 'number' }) : field.node
-  const accessor = made ? field.name : accessorOfRow(field.path)
+  const node = field.node
+  const accessor = accessorOfRow(field.path)
   const table: Record<string, FigureDataTableEntry> =
-    method === 'code' ? Object.fromEntries(domainOf(node).map(v => [String(v), {}])) : { [`${node.kind === 'number' ? (node.min ?? '') : ''}~`]: {} }
-  const binding: FigureDataTableBinding = { id, accessor, rule: 'table', lookup: method, targets: tidyTargets(targets), table }
-  if (!made) return { binding }
-  const schema = [...(asset.dataInterface?.schema ?? []), { name: field.name, ...node } as FigureDataField]
-  return { binding, schema }
+    method === 'code'
+      ? node.kind === 'number'
+        ? { [freeNumberCodeOf([])]: {} }
+        : Object.fromEntries(domainOf(node).map(v => [String(v), {}]))
+      : { [`${node.kind === 'number' ? (node.min ?? '') : ''}~`]: {} }
+  return { binding: { id, accessor, rule: 'table', lookup: method, targets: tidyTargets(targets), table } }
 }
 
 /** Targets with empty lists left out, as the kernel keeps them. */
@@ -217,8 +222,9 @@ const tidyTargets = (t: FigureDataTargets): FigureDataTargets => ({
   ...(t.group ? { group: t.group } : {})
 })
 
-/** A look with only the columns its targets take: a target taken away takes its columns with it. */
+/** A look with only the columns its targets take: a target taken away takes its columns with it. A look that keeps stays so. */
 function lookFor(look: FigureDataTableEntry, t: FigureDataTargets): FigureDataTableEntry {
+  if (look.keep) return { keep: true }
   const out: FigureDataTableEntry = {}
   if (t.parts?.length) {
     if (look.color !== undefined) out.color = look.color
@@ -245,6 +251,12 @@ export function tableWithTargets(b: FigureDataTableBinding, targets: FigureDataT
 /** The table with one look set: the whole look given, a column left out cleared. */
 export const tableWithLook = (b: FigureDataTableBinding, key: string, look: FigureDataTableEntry): FigureDataTableBinding => ({ ...b, table: { ...b.table, [key]: lookFor(look, b.targets) } })
 
+/**
+ * The table whose other values keep what it last showed, or go to the default look (an empty one): the 「그대로 둠」 of
+ * the 「그 밖의 값」 row (ADR-0166 amendment 1).
+ */
+export const tableWithKeep = (b: FigureDataTableBinding, keep: boolean): FigureDataTableBinding => ({ ...b, table: { ...b.table, default: keep ? { keep: true } : {} } })
+
 /** The table's rows renamed, added or taken away, in order; `default` kept last. */
 export function tableWithKeys(b: FigureDataTableBinding, rows: Array<[string, FigureDataTableEntry]>): FigureDataTableBinding {
   const d = b.table.default

package/client/modeller/editor-styles.ts

@@ -411,14 +411,25 @@ export const EditorStyles = css`
     z-index: 2;
     display: grid;
     gap: 4px;
-    padding: 10px 12px;
-    background: var(--md-sys-color-surface-container-lowest);
-    border-bottom: 1px solid var(--md-sys-color-outline-variant);
+    padding: 6px 12px;
+    /* Solid where a theme gives no colour: a sticky line with none let the rows scrolled under it show through. */
+    background: var(--md-sys-color-surface-container-lowest, #fff);
+    border-bottom: 1px solid var(--md-sys-color-outline-variant, rgba(0, 0, 0, 0.12));
   }
-  /* The panel's three sizes (side-panel-styles): the part's kind at the title's, its two lines at the hint's. */
+  /*
+    The part's name and its kind on one line: two lines on every tab, over a name field saying it again on the
+    properties tab, took the panel's top (user 2026-11-12).
+  */
   div[subject-summary] {
-    display: grid;
-    gap: 2px;
+    display: flex;
+    align-items: baseline;
+    gap: 6px;
+    min-width: 0;
+  }
+  div[subject-summary] > * {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
   div[subject-summary] b {
     font-size: var(--ui-t-body, 13px);

package/client/modeller/editor.ts

@@ -2215,6 +2215,8 @@ export class FigureEditor extends LitElement {
               .asset=${asset}
               .selected=${this.selected}
               ?locked=${unavailable}
+              ?previewing=${this.middle === 'preview'}
+              @show-preview=${() => (this.middle = 'preview')}
               @data-sample=${(e: CustomEvent) => (this.dataSample = e.detail.data)}
               @legend-sample=${(e: CustomEvent) => (this.legendSample = e.detail.legends)}
               @part-edit=${(e: CustomEvent) => this.run(() => this.session!.edit(e.detail.edit))}

package/client/modeller/fasten-form.ts

@@ -51,6 +51,11 @@ export interface FastenForm {
   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
+  /**
+   * Opened on the part's own fastening: aimed again, it goes there with that fastening's gap and place across the face
+   * (tutorial 2026-11-12). 「현재 상태로 붙이기」 -- where it stands kept -- is a loose part's.
+   */
+  fastened?: boolean
 }
 
 export const freshFasten = (): FastenForm => ({
@@ -73,8 +78,12 @@ export function fastenFormOf(revision: FigureRevision, part: string): FastenForm
     /* A part still where it was added was put nowhere by the author: fastened, it goes on the face, no gap to keep. */
     return addedUnplaced(revision, part) ? { ...freshFasten(), gapFrom: 'pressed' } : 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
+  /*
+    Its fastening is the author's, gap and place: aimed at another face or part through 「바꾸기」 it goes there with them
+    (tutorial 2026-11-12: a pillar copied from the front one and turned to the body's back face stayed in front, its gap
+    worked out as the whole body's depth).
+  */
+  return { ...freshFasten(), ...own, gapFrom: 'typed', fastened: true } as FastenForm
 }
 
 /** A part fastened to nothing that still stands where the palette put it: the author has put it nowhere to keep. */
@@ -195,6 +204,7 @@ export function aimFasten(
    * arm aimed at the body's side stood off the face, out of reach of the drawing).
    */
   const centred = { align: {}, alignMm: {}, alignInput: {} }
+  if (f.fastened) return f
   return { ...f, ...(aim && !addedUnplaced(revision, part) ? placeKeptOf(revision, part, aim) : centred) }
 }
 

package/client/modeller/fasten-geometry.ts

@@ -188,8 +188,10 @@ export function fastenLabelsOf(
 /**
  * How much of an axis the face drawing shows, mm: room around the face for the part to go past its edges by about half
  * itself, and for a part bigger than the face lined up with one of its edges (a mast flush with a low body's bottom) to
- * show whole; a plane with no size, three parts wide.
+ * show whole; a plane with no size, three parts wide. A part standing `at` mm off the centre is reached too, its far
+ * edge inside (roll cradle tutorial 2026-11-12: a box left far up had its size label cut off the drawing).
  */
-export function drawingSpanOf(face: number | undefined, part: number): number {
-  return face !== undefined ? Math.max(face + part, 2 * part - face) : part * 3
+export function drawingSpanOf(face: number | undefined, part: number, at = 0): number {
+  const room = face !== undefined ? Math.max(face + part, 2 * part - face) : part * 3
+  return Math.max(room, 2 * Math.abs(at) + part)
 }