@things-factory/figure-ui 10.1.206 → 10.1.207

package/dist-client/modeller/editor.js

@@ -4,10 +4,9 @@ import { LitElement, html, nothing } from 'lit';
 import { i18next } from '@operato/i18n';
 import '@operato/layout';
 import { 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 { figurePartFaceOf, PART_LIMIT, parseFigureRecipe, resolveFigureRecipe, figurePartCountOf, figurePartIdFor, figureRecipeIdFor, figureSizeEditOf, figureSizeEditorOf, figureSectionMeasuresOf, figurePlaneAlignChanges, figureRowOf, figureFaceOverhangOf, figureRoomOnlyInputsOf, figureRoomRefitOf } from '@hatiolab/figure-model';
+import { figurePartFaceOf, PART_LIMIT, parseFigureRecipe, resolveFigureRecipe, figurePartCountOf, figurePartIdFor, figureRecipeIdFor, figureSizeEditOf, figureSizeEditorOf, figureSectionMeasuresOf, figurePlaneAlignChanges, figureRowOf, figureFaceOverhangOf } from '@hatiolab/figure-model';
 import './figure-recipe-catalog.js';
 import { captureFigureThumbnail } from './thumbnail.js';
 import { drawableFigureParts } from './renderer.js';
@@ -48,11 +47,10 @@ const NO_MARKS = [];
 import { apexOver, drawnOf } from './section-drawing.js';
 import { END_FACE } from './section-controls.js';
 import { nudgeOf, placementOf } from './stage-model.js';
-import { occupancyFromParts, roomRefitRowsOf } from './occupancy.js';
 import { gateFindingStyles, renderGateFinding } from './gate-findings.js';
-import { editRefusalOf, inDeclaredRoom, partNameRefusalOf, sizeRangeFitsOf, partRefusalOf, placedRefusalOf, recipeRefusalOf, removalNoticeOf } from './refusals.js';
+import { editRefusalOf, partNameRefusalOf, sizeRangeFitsOf, partRefusalOf, placedRefusalOf, recipeRefusalOf, removalNoticeOf } from './refusals.js';
 import { HelpToggles } from './help.js';
-import { endPlaceKeyOf, fieldWordsOf, followOf, sizeFollowersOf, measureNow, partSummaryOf, instanceRangeOf, instanceSizeToDeclare, proportionToFollow, rangeWith, turnsAboutAJoint, valueNow } from './links.js';
+import { endPlaceKeyOf, followOf, sizeFollowersOf, measureNow, partSummaryOf, instanceRangeOf, instanceSizeToDeclare, proportionToFollow, rangeWith, turnsAboutAJoint, valueNow } from './links.js';
 import { jointFanOf } from './joint-fan.js';
 import { derivedOf } from './revision.js';
 import { jointDragOf } from './joint-drag.js';
@@ -508,9 +506,9 @@ let FigureEditor = class FigureEditor extends LitElement {
     movePart(id, to) {
         this.run(() => this.session.edit({ kind: 'move-part', target: id, to }));
     }
-    removePart(id, refitRoom = false) {
+    removePart(id) {
         try {
-            const view = this.session.edit({ kind: 'remove-part', target: id, ...(refitRoom ? { refitRoom: true } : {}) });
+            const view = this.session.edit({ kind: 'remove-part', target: id });
             this.error = '';
             /* What else the removal let go of, named (chief architect, 2026-09-27); undo brings it back. */
             this.notice = removalNoticeOf(view.removal, (key, params) => i18next.t(key, params)) ?? '';
@@ -519,19 +517,8 @@ let FigureEditor = class FigureEditor extends LitElement {
             this.changed();
         }
         catch (error) {
-            if (this.refusals.askClipLoss(error, () => this.removePart(id, refitRoom)))
+            if (this.refusals.askClipLoss(error, () => this.removePart(id)))
                 return;
-            /*
-              A part in the declared space goes, and the space is fitted to the parts left, in the same click: every space
-              this product declares is fitted to the parts (「부품에 맞추기」, the AI's fit-room -- no padding), so fitting it
-              again keeps what it says, and there is nothing to ask (user, 2026-09-27: 「이 확인이 꼭 필요한가 ?」).
-            */
-            if (!refitRoom && inDeclaredRoom(error)) {
-                this.removePart(id, true);
-                if (!this.error)
-                    this.notice = [this.notice, i18next.t('figure.text.removal-space-refitted')].filter(Boolean).join(' ');
-                return;
-            }
             this.error = partRefusalOf(error, id, (key, params) => i18next.t(key, params)) ?? this.said(error);
         }
     }
@@ -989,7 +976,6 @@ let FigureEditor = class FigureEditor extends LitElement {
         this.holdAction(null);
         this.notice = '';
         const hadSize = this.hasSize();
-        const hadSpace = !!this.shown()?.asset.occupancy;
         try {
             this.session.command(action);
             this.error = '';
@@ -997,9 +983,7 @@ let FigureEditor = class FigureEditor extends LitElement {
             /* What the command did besides what was asked, in one line: the figure's size declared to follow (ADR ruling Q1). */
             if (action.kind === 'follow-size' && !hadSize) {
                 const size = this.designValues();
-                /* The same step may have fitted the space the figure takes to its parts (figure-model, ruling 2026-10-16 Q1 A): one line says both. */
-                const spaceToo = !hadSpace && !!this.shown()?.asset.occupancy;
-                this.notice = i18next.t(spaceToo ? 'figure.text.size-and-space-declared-to-follow' : 'figure.text.size-declared-to-follow', {
+                this.notice = i18next.t('figure.text.size-declared-to-follow', {
                     x: Math.round(size['size.x'] ?? 0).toLocaleString(),
                     y: Math.round(size['size.y'] ?? 0).toLocaleString(),
                     z: Math.round(size['size.z'] ?? 0).toLocaleString()
@@ -1440,18 +1424,13 @@ let FigureEditor = class FigureEditor extends LitElement {
             return i18next.t('figure.text.release-state-released', { version: String(version) });
         return version > 0 ? i18next.t('figure.text.release-state-draft-over', { version: String(version) }) : i18next.t('figure.text.release-state-draft-new');
     }
-    /** The findings that block release, under the bar beside 「발행」, each with the way out the verdict tab offers for it. */
-    renderReleaseBlockers(blockers, asset, unavailable) {
+    /** The findings that block release, under the bar beside 「발행」. */
+    renderReleaseBlockers(blockers, asset) {
         const parts = (asset?.appearance ?? []).map(look => look.target);
-        const way = (code) => (code === 'occupancy-undeclared' || code === 'part-outside-occupancy') && asset && parts.length
-            ? html `<button act ?disabled=${unavailable} @click=${() => this.linkCommand(occupancyFromParts(asset))}>
-            <md-icon>fit_screen</md-icon>${i18next.t('figure.button.fit-base-to-parts')}
-          </button>`
-            : nothing;
         return html `<div release-blockers role="dialog" aria-label=${i18next.t('figure.text.must-fix-to-release')} @keydown=${(e) => e.key === 'Escape' && (this.blockersOpen = false)}>
       <ul gate>
         <li head>${i18next.t('figure.text.must-fix-to-release')}</li>
-        ${blockers.map(finding => renderGateFinding(finding, true, way(finding.code), parts))}
+        ${blockers.map(finding => renderGateFinding(finding, true, nothing, parts))}
       </ul>
     </div>`;
     }
@@ -1786,20 +1765,9 @@ let FigureEditor = class FigureEditor extends LitElement {
         /* A repeat's own row values (its pitch) have their own section, not the shape's. */
         const own = design.filter(i => this.selected && i.id.startsWith(this.selected + '.') && !i.id.startsWith(this.selected + '.repeat.'));
         const common = design.filter(i => !view.geometry.some(g => i.id.startsWith(ownerOf(g.id) + '.')));
-        /*
-          A part's field only the declared room still reads -- its old height position once the floor holds it -- moves
-          nothing; it is shown apart as what it is, not as a position (ADR-0097, designer 2026-09-27).
-        */
         const shown = this.shown();
         const asset = shown?.asset;
-        let roomOnly = [];
-        try {
-            roomOnly = this.selected && asset ? figureRoomOnlyInputsOf(asset, this.selected) : [];
-        }
-        catch {
-            roomOnly = [];
-        }
-        const partFields = own.filter(i => !roomOnly.includes(i.id));
+        const partFields = own;
         /* The numbers a rule gives the axes that have no field of their own -- shown read-only, never as a blank. */
         let held;
         try {
@@ -1817,7 +1785,6 @@ let FigureEditor = class FigureEditor extends LitElement {
         catch {
             held = undefined;
         }
-        const roomFields = own.filter(i => roomOnly.includes(i.id));
         /*
           Only what is under way is said. Saved or not is the save button's: filled and pressable when there is something
           to save, dimmed when not -- the saved and unsaved words beside it said the same thing again in the primary
@@ -1868,7 +1835,7 @@ let FigureEditor = class FigureEditor extends LitElement {
         </button>
         <button slot="commit" save ?disabled=${unavailable || (!view.dirty && !!view.id)} @click=${this.save}><md-icon>save</md-icon>${i18next.t('figure.button.save')}</button>
       </ox-canvas-bar>
-      ${this.blockersOpen && blockers.length ? this.renderReleaseBlockers(blockers, asset, unavailable) : nothing}
+      ${this.blockersOpen && blockers.length ? this.renderReleaseBlockers(blockers, asset) : nothing}
       ${this.catalogOpen
             ? html `<figure-recipe-catalog
             .templates=${this.templates}
@@ -1976,7 +1943,6 @@ let FigureEditor = class FigureEditor extends LitElement {
                     ${this.renderRepeatNote(view.geometry)}
                   </section>
                   ${this.renderPartGroups(shown, view.geometry, partFields, unavailable, held)}
-                  ${roomFields.length ? this.renderRoomOnly(roomFields, unavailable) : nothing}
                   <figure-material-panel
                     .body=${{ ...part, id: this.selected }}
                     .palette=${view.palette ?? {}}
@@ -2118,58 +2084,6 @@ let FigureEditor = class FigureEditor extends LitElement {
             return html `<p hint held-axes>${i18next.t('figure.text.held-by-fastening')}</p>`;
         return html `<p hint held-axes>${i18next.t('figure.text.held-worked-out', { group: held.map(g => i18next.t('figure.label.group-' + g.name)).join(' · ') })}</p>`;
     }
-    /**
-     * A part's fields only the declared room still reads (ADR-0097, designer 2026-09-27): shown as what they are and not
-     * typed into -- they move nothing. Declaring the room again is offered; nothing is deleted or widened on the way.
-     */
-    renderRoomOnly(fields, unavailable) {
-        return html `<section room-only>
-      <h3>${i18next.t('figure.label.room-only-inputs')}</h3>
-      <p hint>${i18next.t('figure.text.room-only-inputs')}</p>
-      <div form>
-        ${fields.map(f => html `<span>${fieldWordsOf(f.id, key => i18next.t(key))} (${f.unit})</span><input aria-label=${f.id} type="number" .value=${String(f.value)} disabled />`)}
-      </div>
-      <button act room-refit ?disabled=${unavailable} @click=${() => this.askRoomRefit()}><md-icon>fit_screen</md-icon>${i18next.t('figure.button.room-refit')}</button>
-    </section>`;
-    }
-    /** The room as declared and as proposed, and what lies outside each as measured, before the author confirms. */
-    async askRoomRefit() {
-        let refit;
-        try {
-            refit = figureRoomRefitOf(this.shown().asset);
-        }
-        catch (error) {
-            this.error = this.said(error);
-            return;
-        }
-        if (!refit)
-            return;
-        const rows = roomRefitRowsOf(refit);
-        const outside = (list) => list.length
-            ? list.map(o => i18next.t('figure.text.room-part-outside', { part: partLabelOf(o.part), axis: o.axis.toUpperCase(), mm: String(o.mm) })).join(' · ')
-            : i18next.t('figure.text.room-nothing-outside');
-        const agreed = await OxPrompt.open({
-            type: 'question',
-            title: i18next.t('figure.label.room-refit'),
-            template: html `<table room-refit>
-          <tr><th></th><th>${i18next.t('figure.label.room-declared')}</th><th>${i18next.t('figure.label.room-proposed')}</th></tr>
-          ${rows.map(r => html `<tr>
-              <td>${i18next.t(`figure.label.room-at-${r.at}`)} ${r.axis.toUpperCase()}</td>
-              <td>${r.declared}</td>
-              <td>${r.same ? i18next.t('figure.text.room-same') : r.proposed}</td>
-            </tr>`)}
-        </table>
-        <p>${i18next.t('figure.label.room-declared')}: ${outside(refit.outside.declared)}</p>
-        <p>${i18next.t('figure.label.room-proposed')}: ${outside(refit.outside.proposed)}</p>
-        ${refit.drops.length
-                ? html `<p>${i18next.t('figure.text.room-drops', { fields: [...new Set(refit.drops.map(id => `${partLabelOf(id.split('.')[0])} ${fieldWordsOf(id, key => i18next.t(key))}`))].join(' · ') })}</p>`
-                : nothing}`,
-            confirmButton: { text: i18next.t('figure.button.room-refit-confirm') },
-            cancelButton: { text: i18next.t('figure.button.keep-editing') }
-        });
-        if (agreed)
-            this.linkCommand(refit.step);
-    }
     renderSingle(name, field, unavailable) {
         const words = name.split('.').map(part => i18next.t('figure.label.field-' + part, { defaultValue: part }));
         return html `<span ?scrub=${!unavailable} @pointerdown=${(e) => this.scrub(field, e, unavailable)}>${words.join(' · ')} (${field.unit})</span