@things-factory/figure-ui 10.1.221 → 10.1.223

package/client/modeller/editor.ts

@@ -1969,6 +1969,7 @@ export class FigureEditor extends LitElement {
               ?locked=${unavailable}
               @select-part=${(e: CustomEvent) => this.choose(e.detail.id)}
               @part-edit=${(e: CustomEvent) => this.run(() => this.session!.edit(e.detail.edit))}
+              @command=${(e: CustomEvent) => this.linkCommand(e.detail.action)}
             ></figure-capability-panel>
           </div>
           <div panel ?off=${tab !== 'data'}>

package/client/modeller/figure-capability-panel.ts

@@ -12,7 +12,9 @@ import { placeTerms } from '@things-factory/figure-viewer/dist-client/detail-fac
 /**
  * 자리·능력 — what the figure does on a board: the ladder from drawing only, to
  * holding things, to passing them on, and every place things are held, whatever part it is on. A place is not drawn,
- * so the list is the only way to find one; choosing a row selects its part, where the place is edited.
+ * so the list is the only way to find one; choosing a row selects its part, where the place is edited. Whether the
+ * figure is the look of an item a holder carries is said here too (ADR-0155 amendment 2): a tag, apart from the ladder,
+ * since an item may hold things as well.
  */
 @customElement('figure-capability-panel')
 export class FigureCapabilityPanel extends localize(i18next)(LitElement) {
@@ -20,7 +22,8 @@ export class FigureCapabilityPanel extends localize(i18next)(LitElement) {
     :host {
       display: block;
     }
-    label[rung] {
+    label[rung],
+    label[item] {
       display: flex;
       gap: 8px;
       align-items: flex-start;
@@ -29,16 +32,19 @@ export class FigureCapabilityPanel extends localize(i18next)(LitElement) {
       border-radius: 8px;
       cursor: pointer;
     }
-    label[rung][on] {
+    label[rung][on],
+    label[item][on] {
       border-color: var(--md-sys-color-primary);
       background: var(--md-sys-color-secondary-container);
       color: var(--md-sys-color-on-secondary-container);
     }
-    label[rung] span {
+    label[rung] span,
+    label[item] span {
       display: grid;
       gap: 2px;
     }
     label[rung] em,
+    label[item] em,
     p[hint],
     small {
       font-style: normal;
@@ -106,6 +112,16 @@ export class FigureCapabilityPanel extends localize(i18next)(LitElement) {
         : html`<p hint>${i18next.t('figure.text.no-places')}</p>`}
       ${places.length && rung === 'none' ? html`<p hint>${i18next.t('figure.text.place-needs-holding')}</p>` : nothing}
       </section>
+      <section>
+      <h3>${i18next.t('figure.label.item')}</h3>
+      <label item ?on=${!!asset.item}>
+        <input type="checkbox" .checked=${live(!!asset.item)} ?disabled=${this.locked} @change=${(e: Event) => this.setItem((e.target as HTMLInputElement).checked)} />
+        <span>
+          <strong>${i18next.t('figure.label.is-item')}</strong>
+          <em>${i18next.t('figure.text.is-item-note')}</em>
+        </span>
+      </label>
+      </section>
     `
   }
 
@@ -113,6 +129,10 @@ export class FigureCapabilityPanel extends localize(i18next)(LitElement) {
     this.dispatchEvent(new CustomEvent('part-edit', { detail: { edit: { kind: 'set-capabilities', names: [...RUNGS[which]] } }, bubbles: true, composed: true }))
   }
 
+  private setItem(item: boolean) {
+    this.dispatchEvent(new CustomEvent('command', { detail: { action: { kind: 'set-item', item } }, bubbles: true, composed: true }))
+  }
+
   private pick(part: string) {
     this.dispatchEvent(new CustomEvent('select-part', { detail: { id: part }, bubbles: true, composed: true }))
   }

package/client/modeller/slot-layout-host.ts

@@ -9,7 +9,6 @@
  * Kept free of Lit, i18n and the editor's element so node tests read it directly.
  */
 import {
-  figureShapeBoundsOf,
   figureSlotLayoutOf,
   figureSlotLayoutIssues,
   slotLayoutPreset,
@@ -40,8 +39,6 @@ export interface SlotEditorIssue {
   params?: Record<string, string | number>
 }
 
-type Body = { id: string; shape?: Parameters<typeof figureShapeBoundsOf>[0] }
-
 /** The figure's layout as the form and the layout, or a form to start one from on the selected part's top. */
 export function slotLayoutFormOf(asset: FigureAsset, part: string): { form: SlotLayoutForm; layout?: SlotLayout } {
   const had = figureSlotLayoutOf(asset as never)
@@ -49,17 +46,8 @@ export function slotLayoutFormOf(asset: FigureAsset, part: string): { form: Slot
   return { form: { label: '', role: 'seat', anchors: part ? [{ id: part, part, face: 'top' }] : [] } }
 }
 
-/** How big each anchor's face is, along the part's own X (width) and Z (depth): what the editor checks slots against. */
-export function anchorFacesOf(anchors: readonly SlotAnchor[], geometry: readonly Body[]): Record<string, { width: number; depth: number }> {
-  const out: Record<string, { width: number; depth: number }> = {}
-  for (const a of anchors) {
-    const body = geometry.find(g => g.id === a.part)
-    if (!body?.shape) continue
-    const b = figureShapeBoundsOf(body.shape)
-    out[a.id] = { width: b.x.max - b.x.min, depth: b.z.max - b.z.min }
-  }
-  return out
-}
+/** How big each anchor's face is: things-scene's, the one a board's placed figure is measured with too. */
+export { figureAnchorFacesOf as anchorFacesOf } from '@hatiolab/things-scene'
 
 /**
  * Where an author starts: the equipment presets (figure-model, ADR-0118 decision 8), laid out on this figure's anchors --

package/dist-client/modeller/editor.js

@@ -1996,6 +1996,7 @@ let FigureEditor = class FigureEditor extends LitElement {
               ?locked=${unavailable}
               @select-part=${(e) => this.choose(e.detail.id)}
               @part-edit=${(e) => this.run(() => this.session.edit(e.detail.edit))}
+              @command=${(e) => this.linkCommand(e.detail.action)}
             ></figure-capability-panel>
           </div>
           <div panel ?off=${tab !== 'data'}>