@things-factory/figure-ui 10.1.113 → 10.1.115

package/dist-client/modeller/editor.d.ts

@@ -47,6 +47,7 @@ export declare class FigureEditor extends LitElement {
     firstSave?: (name: string) => Promise<FirstSave | undefined>;
     private selected;
     private error;
+    private faceMapping?;
     /** The same link offered again with the size range narrowed, after a link the declared range could not hold. */
     private retry?;
     private tab;
@@ -210,6 +211,9 @@ export declare class FigureEditor extends LitElement {
     /** The figure's controls: try a value, name it, set its range and travel time, keep the pose. */
     private renderControls;
     /** One command, one step of the history. A refusal a person can meet here is said in their words. */
+    /** Where a held edit goes once the author has chosen where what stands on its lost faces goes. */
+    private mapFaces;
+    /** Runs a command; true when it was taken. */
     private linkCommand;
     private changeField;
     /** Typing or a held spinner: each number on the way is drawn; the field's change records it. */

package/dist-client/modeller/editor.js

@@ -1194,7 +1194,17 @@ let FigureEditor = class FigureEditor extends LitElement {
     ></figure-clips>`;
     }
     /** One command, one step of the history. A refusal a person can meet here is said in their words. */
-    linkCommand(action) {
+    /** Where a held edit goes once the author has chosen where what stands on its lost faces goes. */
+    mapFaces(remap) {
+        const held = this.faceMapping;
+        if (!held)
+            return;
+        const done = this.linkCommand({ ...held.action, remap }, held.from);
+        if (done && held.from === 'section-editor')
+            this.closeSectionEditor();
+    }
+    /** Runs a command; true when it was taken. */
+    linkCommand(action, from = 'panel') {
         /* Committed or refused, a command in hand is let go of: the figure as it stands is drawn again. */
         this.holdAction(null);
         this.retry = undefined;
@@ -1203,6 +1213,7 @@ let FigureEditor = class FigureEditor extends LitElement {
         try {
             this.session.command(action);
             this.error = '';
+            this.faceMapping = undefined;
             /* 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();
@@ -1213,16 +1224,24 @@ let FigureEditor = class FigureEditor extends LitElement {
                 });
             }
             this.changed();
+            return true;
         }
         catch (error) {
-            if (this.askClipLoss(error, () => this.linkCommand(action)))
-                return;
+            if (this.askClipLoss(error, () => this.linkCommand(action, from)))
+                return false;
             const code = error?.code;
+            /* Something stands on a face this takes away: ask where it goes, there, rather than only saying no. */
+            const need = error.details;
+            if (code === 'FEATURE_MAPPING_REQUIRED' && need?.lost?.length) {
+                this.faceMapping = { action, need, from };
+                this.error = '';
+                return false;
+            }
             const narrowing = narrowingRetryOf(action, error, (key, params) => i18next.t(key, params));
             if (narrowing) {
                 this.error = narrowing.message;
                 this.retry = { label: narrowing.label, action: narrowing.retry };
-                return;
+                return false;
             }
             this.error =
                 code === 'DIMENSION_CYCLE'
@@ -1232,6 +1251,7 @@ let FigureEditor = class FigureEditor extends LitElement {
                         : sizeRangeRefusalOf(error, (key, params) => i18next.t(key, params)) ??
                             placementRefusalOf(error, (key, params) => i18next.t(key, params)) ??
                             this.said(error);
+            return false;
         }
     }
     changeField(field, event) {
@@ -1779,6 +1799,7 @@ let FigureEditor = class FigureEditor extends LitElement {
     choose(id) {
         /* A copy on the canvas selects its repeat: the part the author made. */
         this.selected = id ? ownerOf(id) : id;
+        this.faceMapping = undefined;
         if (id && (this.tab === 'verdict' || this.tab === 'view' || this.tab === 'history'))
             this.tab = 'properties';
     }
@@ -1842,8 +1863,15 @@ let FigureEditor = class FigureEditor extends LitElement {
       .kept=${kept}
       .pointBlocked=${this.pointBlockedOf(drawn)}
       .revision=${this.session?.read().revision ?? 0}
-      @command=${(e) => this.linkCommand(e.detail.action)}
+      .faceMapping=${this.faceMapping?.from === 'section-editor' ? this.faceMapping.need : undefined}
+      @command=${(e) => {
+            /* Held for a choice of where things go: the editor stays open, the choice shown in it. */
+            if (!this.linkCommand(e.detail.action, 'section-editor'))
+                e.detail.held = true;
+        }}
       @command-live=${(e) => this.holdAction(e.detail.action)}
+      @face-mapped=${(e) => this.mapFaces(e.detail.remap)}
+      @face-mapping-cancel=${() => (this.faceMapping = undefined)}
       @section-editor-close=${() => this.closeSectionEditor()}
     ></figure-section-editor>`;
     }
@@ -2052,6 +2080,7 @@ let FigureEditor = class FigureEditor extends LitElement {
               .asset=${asset}
               .context=${view.context ?? ''}
               .view=${this.view}
+              .selected=${this.selected}
               @configure-size=${async (e) => {
                 this.middle = 'edit';
                 this.selected = e.detail.part;
@@ -2115,6 +2144,9 @@ let FigureEditor = class FigureEditor extends LitElement {
                   <figure-section-panel
                     .body=${{ ...part, id: this.selected }}
                     ?locked=${unavailable}
+                    .faceMapping=${this.faceMapping?.from === 'panel' ? this.faceMapping.need : undefined}
+                    @face-mapped=${(e) => this.mapFaces(e.detail.remap)}
+                    @face-mapping-cancel=${() => (this.faceMapping = undefined)}
                     @command=${(e) => this.linkCommand(e.detail.action)}
                     @command-live=${(e) => this.holdAction(e.detail.action)}
                     @section-editor-open=${() => (this.sectionEditing = this.selected)}
@@ -2363,6 +2395,10 @@ __decorate([
     state(),
     __metadata("design:type", Object)
 ], FigureEditor.prototype, "error", void 0);
+__decorate([
+    state(),
+    __metadata("design:type", Object)
+], FigureEditor.prototype, "faceMapping", void 0);
 __decorate([
     state(),
     __metadata("design:type", Object)