@things-factory/figure-ui 10.1.10 → 10.1.14

package/dist-client/pages/figure-modeller-page.js

@@ -5,6 +5,7 @@ import '../modeller/figure-ask.js';
 import '../modeller/figure-canvas.js';
 import { captureThumbnail } from '../modeller/figure-thumbnail.js';
 import '../modeller/figure-preview.js';
+import { shouldStartNewFigure } from '../modeller/new-figure-entry.js';
 import '../modeller/figure-parts.js';
 import '../modeller/figure-inspector.js';
 import { css, html } from 'lit';
@@ -129,6 +130,46 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
         this.saveFailure = '';
         /** 인라인 요청창과 AI 도크가 함께 쓰는 현재 Figure의 제한된 세션 피드백. */
         this.proposalFeedback = [];
+        this.undoStack = [];
+        this.redoStack = [];
+        this.lastHistoryTime = 0;
+        this.announceAiContext = () => {
+            if (!this.active)
+                return;
+            window.dispatchEvent(new CustomEvent('figure-ai-context', {
+                detail: { figureId: this.figure?.id, source: this.folded }
+            }));
+        };
+        this.acceptDockProposal = (event) => {
+            const detail = event.detail;
+            if (!this.active || (detail?.figureId ?? '') !== (this.figure?.id ?? ''))
+                return;
+            if (detail?.draftType && detail.draftType !== this.folded?.type)
+                return;
+            if (detail?.baseSource && detail.baseSource !== JSON.stringify(this.folded))
+                return;
+            this.receive(detail.proposal);
+            detail.accepted = true;
+        };
+        this.handleKeyDown = (e) => {
+            if (!this.active || this.mode !== 'edit' || this.proposalSession)
+                return;
+            const target = e.composedPath()[0];
+            const tag = target?.tagName?.toLowerCase();
+            if (tag === 'input' || tag === 'textarea' || target?.isContentEditable)
+                return;
+            if ((e.metaKey || e.ctrlKey) && !e.altKey) {
+                if (e.key === 'z' && !e.shiftKey) {
+                    e.preventDefault();
+                    this.undo();
+                }
+                else if ((e.key === 'z' && e.shiftKey) || e.key === 'y') {
+                    e.preventDefault();
+                    this.redo();
+                }
+            }
+        };
+        this.loadGeneration = 0;
     }
     static { this.styles = css `
     :host {
@@ -201,84 +242,9 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
       display: none;
     }
 
-    /*
-      머리줄 — 이름 · 타입 · 미저장 표시 · 말로 시키는 줄 · 저장을 **한 줄에** 담는다.
-
-      이름은 페이지 제목에도 나온다(셸이 context.title 로 그린다). 그래도 여기 입력칸을 두는
-      이유는 **고치는 자리**가 필요해서다 — 제목은 읽는 것이고 이 칸은 바꾸는 것이다. 두 줄로
-      벌리는 대신 한 줄에 모아 캔버스에 높이를 넘긴다.
-    */
-    div[header] {
-      display: flex;
-      align-items: center;
-      gap: var(--spacing-medium, 8px);
-      padding: var(--spacing-medium, 8px) var(--spacing-large, 12px);
-      border-bottom: 1px solid var(--md-sys-color-outline-variant);
-    }
-    div[header] figure-ask {
-      flex: 1;
-      min-width: 0;
-    }
-    input[name] {
-      flex: none;
-      width: 180px;
-      padding: 5px 9px;
-      font: var(--input-field-font, inherit);
-      font-size: 0.82rem;
-      color: var(--md-sys-color-on-surface);
-      background-color: var(--md-sys-color-surface-container-lowest);
-      border: 1px solid var(--md-sys-color-outline-variant);
-      border-radius: 6px;
-    }
-    /* 타입 이름은 만든 뒤 고칠 수 없다 — 그 사실이 화면에서 보여야 한다 */
-    code[type] {
-      padding: 4px 8px;
-      font-family: var(--mono-font, monospace);
-      font-size: 0.76rem;
-      color: var(--md-sys-color-on-surface-variant, var(--md-sys-color-on-surface));
-      background-color: var(--md-sys-color-surface-container);
-      border-radius: 6px;
-    }
-    span[dirty] {
-      font: var(--label-font, inherit);
-      font-size: 0.74rem;
-      color: var(--md-sys-color-tertiary);
-    }
     div[spacer] {
       flex: 1;
     }
-    button[save] {
-      padding: 6px 16px;
-      font: var(--label-font, inherit);
-      font-size: 0.76rem;
-      font-weight: 600;
-      color: var(--md-sys-color-on-primary, #fff);
-      background-color: var(--md-sys-color-primary);
-      border: none;
-      border-radius: 6px;
-      cursor: pointer;
-    }
-    button[save][disabled] {
-      opacity: 0.4;
-      cursor: default;
-    }
-
-    /*
-      저장이 거절된 사유. 단추 **바로 왼쪽**에 둔다 — 누른 자리에서 답을 봐야 한다. 길면 줄이지만
-      전문은 title 로 남긴다(서버 문장이 길 수 있다).
-    */
-    span[save-failed] {
-      max-width: 280px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      padding: 4px 8px;
-      font: var(--label-font, inherit);
-      font-size: 0.72rem;
-      color: var(--md-sys-color-on-error-container, var(--md-sys-color-on-surface));
-      background-color: var(--md-sys-color-error-container);
-      border-radius: 6px;
-    }
 
     /*
       칸을 벡터 저작도구의 관례대로 놓는다 — 왼쪽에 무엇이 있나(레이어), 오른쪽에
@@ -301,16 +267,17 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
     }
 
     /*
-      편집 · 미리보기 전환.
+      편집 · 미리보기 전환 및 조작 띠.
 
       가운데 칸 위에 얇게 둔다. 무엇을 보고 있는지가 늘 보여야 하고, 두 화면이 같은
       자리를 쓰므로 어느 쪽인지 모르면 편집이 안 먹는 것처럼 읽힌다.
     */
     div[modes] {
       display: flex;
+      align-items: center;
       flex: none;
       gap: 2px;
-      padding: 5px var(--spacing-medium, 8px);
+      padding: 4px var(--spacing-medium, 8px);
       border-bottom: 1px solid var(--md-sys-color-outline-variant);
     }
     div[modes] button[mode] {
@@ -331,13 +298,36 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
       color: var(--md-sys-color-on-primary-container);
       background-color: var(--md-sys-color-primary-container);
     }
-
-    /*
-      양쪽 칸을 접는 손잡이. 띠의 양 끝, 접히는 칸 바로 옆이다.
-
-      접었을 때 남는 것이 이것 하나뿐이므로 **접는 자리와 펴는 자리가 같아야 한다.**
-      다른 데 두면 접고 나서 되돌릴 곳을 찾아야 한다.
-    */
+    div[modes] div[separator] {
+      width: 1px;
+      height: 16px;
+      margin: 0 4px;
+      background-color: var(--md-sys-color-outline-variant);
+    }
+    div[modes] button[history] {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 26px;
+      height: 26px;
+      padding: 0;
+      color: var(--md-sys-color-on-surface-variant, var(--md-sys-color-on-surface));
+      background: none;
+      border: none;
+      border-radius: 6px;
+      cursor: pointer;
+    }
+    div[modes] button[history]:hover:not([disabled]) {
+      background-color: var(--md-sys-color-surface-container);
+      color: var(--md-sys-color-on-surface);
+    }
+    div[modes] button[history][disabled] {
+      opacity: 0.3;
+      cursor: default;
+    }
+    div[modes] button[history] md-icon {
+      --md-icon-size: 18px;
+    }
     div[modes] button[collapse] {
       display: flex;
       align-items: center;
@@ -355,6 +345,46 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
     div[modes] button[collapse] md-icon {
       --md-icon-size: 18px;
     }
+    div[modes] span[dirty] {
+      align-self: center;
+      margin-right: 6px;
+      font: var(--label-font, inherit);
+      font-size: 0.72rem;
+      color: var(--md-sys-color-tertiary);
+    }
+    div[modes] span[save-failed] {
+      align-self: center;
+      max-width: 240px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      margin-right: 6px;
+      padding: 3px 7px;
+      font: var(--label-font, inherit);
+      font-size: 0.7rem;
+      color: var(--md-sys-color-on-error-container, var(--md-sys-color-on-surface));
+      background-color: var(--md-sys-color-error-container);
+      border-radius: 4px;
+    }
+    div[modes] button[save] {
+      padding: 4px 14px;
+      margin-right: 4px;
+      font: var(--label-font, inherit);
+      font-size: 0.74rem;
+      font-weight: 600;
+      color: var(--md-sys-color-on-primary, #fff);
+      background-color: var(--md-sys-color-primary);
+      border: none;
+      border-radius: 6px;
+      cursor: pointer;
+    }
+    div[modes] button[save]:hover:not([disabled]) {
+      box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+    }
+    div[modes] button[save][disabled] {
+      opacity: 0.35;
+      cursor: default;
+    }
 
     /*
       후보가 오면 가운데를 둘로 나눈다.
@@ -568,7 +598,16 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
             }));
         }
     }
+    connectedCallback() {
+        super.connectedCallback();
+        window.addEventListener('figure-ai-context-request', this.announceAiContext);
+        window.addEventListener('figure-ai-review', this.acceptDockProposal);
+        window.addEventListener('keydown', this.handleKeyDown);
+    }
     disconnectedCallback() {
+        window.removeEventListener('keydown', this.handleKeyDown);
+        window.removeEventListener('figure-ai-context-request', this.announceAiContext);
+        window.removeEventListener('figure-ai-review', this.acceptDockProposal);
         window.dispatchEvent(new CustomEvent('figure-ai-context', { detail: undefined }));
         super.disconnectedCallback();
     }
@@ -591,29 +630,6 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
     render() {
         const source = this.folded;
         return html `
-      <div header>
-        <!--
-          이름과 타입은 **속성 패널**에 있다(figure-inspector 의 도형 절). 여기 있던 이름 칸은
-          하네스 시절의 자리였다 — 앱에서는 셸이 페이지 제목으로 같은 이름을 그리므로 글자가 두 번
-          나오고, 캔버스가 주인공인 화면에서 그만큼 높이를 잃었다.
-        -->
-        ${this.dirty ? html `<span dirty>${i18next.t('figure.text.unsaved-changes')}</span>` : ''}
-        <!--
-          말로 시키는 줄이 머리줄의 남는 폭을 쓴다. 따로 두면 화면 위가 두 줄이 되고, 그 위 줄은
-          이름을 페이지 제목과 겹쳐 적는다.
-        -->
-        <figure-ask
-          .source=${source}
-          .type=${source?.type ?? ''}
-          .feedback=${this.proposalFeedback}
-          @proposed=${(e) => this.receive(e.detail.proposal)}
-        ></figure-ask>
-        ${this.saveFailure ? html `<span save-failed title=${this.saveFailure}>${this.saveFailure}</span>` : ''}
-        <button save ?disabled=${!this.canSave} @click=${() => this.save()}>
-          ${this.saving ? i18next.t('figure.text.saving-figure') : i18next.t('figure.button.save')}
-        </button>
-      </div>
-
       <div
         edits
         ?collapse-left=${this.collapsed.left}
@@ -654,6 +670,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
                   <div lane>
                     <h4>${i18next.t('figure.label.now')}</h4>
                     <figure-canvas
+                      .figureId=${this.figure?.id || this.figure?.type}
                       .board=${this.board}
                       .parts=${this.parts}
                       .picked=${this.pickedName}
@@ -678,9 +695,11 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
             : this.mode === 'preview'
                 ? html `<figure-preview .source=${source}></figure-preview>`
                 : html `<figure-canvas
+                  .figureId=${this.figure?.id || this.figure?.type}
                   .board=${this.board}
                   .parts=${this.parts}
                   .picked=${this.pickedName}
+                  .view=${this.view}
                 ></figure-canvas>`}
         </div>
 
@@ -732,7 +751,33 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
     `;
         return html `<div modes>
       ${this.renderCollapse('left')}${this.proposalSession ? '' : html `${one('edit')}${one('preview')}`}
+      ${this.mode === 'edit' && !this.proposalSession
+            ? html `
+            <div separator></div>
+            <button
+              history
+              ?disabled=${this.undoStack.length === 0}
+              title="${i18next.t('figure.button.undo')} (Ctrl+Z)"
+              @click=${() => this.undo()}
+            >
+              <md-icon>undo</md-icon>
+            </button>
+            <button
+              history
+              ?disabled=${this.redoStack.length === 0}
+              title="${i18next.t('figure.button.redo')} (Ctrl+Y)"
+              @click=${() => this.redo()}
+            >
+              <md-icon>redo</md-icon>
+            </button>
+          `
+            : ''}
       <div spacer></div>
+      ${this.saveFailure ? html `<span save-failed title=${this.saveFailure}>${this.saveFailure}</span>` : ''}
+      ${this.dirty ? html `<span dirty>${i18next.t('figure.text.unsaved-changes')}</span>` : ''}
+      <button save ?disabled=${!this.canSave} @click=${() => this.save()}>
+        ${this.saving ? i18next.t('figure.text.saving-figure') : i18next.t('figure.button.save')}
+      </button>
       ${this.renderCollapse('right')}
     </div>`;
     }
@@ -791,6 +836,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
     renderDecision() {
         if (!this.proposalSession)
             return '';
+        const stale = this.proposalBaseSource !== undefined && this.proposalBaseSource !== JSON.stringify(this.folded);
         const changes = proposals.diffProposal(this.folded, this.proposalSession.source);
         const picked = proposals.applyProposal(this.folded, this.proposalSession.source, this.proposalSession.picked);
         const { errors, violations } = validate(picked);
@@ -799,7 +845,8 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
         <span>${this.proposalSession.title || i18next.t('figure.text.assistant-proposed-a-figure')}</span>
         <div spacer></div>
         <button drop @click=${() => this.discard()}>${i18next.t('figure.button.discard')}</button>
-        <button take ?disabled=${errors.length > 0 || this.proposalSession.picked.size === 0} @click=${() => this.take()}>
+        ${stale ? html `<span role="alert">원본이 변경되었습니다. 후보를 취소하고 AI 지원에서 다시 요청하세요.</span>` : ''}
+        <button take ?disabled=${stale || errors.length > 0 || this.proposalSession.picked.size === 0} @click=${() => this.take()}>
           ${i18next.t('figure.button.take-n-changes', { n: this.proposalSession.picked.size })}
         </button>
       </div>
@@ -884,6 +931,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
      * 무엇이 자기 것이고 무엇이 기계 것인지 모르게 된다.
      */
     receive(proposal) {
+        this.proposalBaseSource = JSON.stringify(this.folded);
         this.proposalSession = proposalSessions.openAiProposal(this.folded, proposal);
     }
     /**
@@ -894,6 +942,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
     previewSizingFix(fix) {
         if (!this.folded)
             return;
+        this.proposalBaseSource = JSON.stringify(this.folded);
         this.proposalSession = proposalSessions.openSizingFix(this.folded, fix);
     }
     /**
@@ -917,6 +966,9 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
     take() {
         if (!this.proposalSession)
             return;
+        if (this.proposalBaseSource !== undefined && this.proposalBaseSource !== JSON.stringify(this.folded))
+            return;
+        this.recordHistory();
         const taken = proposals.applyProposal(this.folded, this.proposalSession.source, this.proposalSession.picked);
         const { board, parts } = fromFigureSource(taken);
         this.board = board;
@@ -951,6 +1003,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
         if (reportFeedback)
             this.reportProposalFeedback('discarded');
         this.proposalSession = undefined;
+        this.proposalBaseSource = undefined;
     }
     /**
      * 저장할 수 있나.
@@ -975,11 +1028,12 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
     }
     async pageUpdated(changes, lifecycle) {
         if (!this.active) {
+            ++this.loadGeneration;
             return;
         }
         const id = lifecycle?.resourceId;
         if (id) {
-            if (id !== this.figure?.id) {
+            if (changes.active || id !== this.figure?.id) {
                 await this.load(id);
             }
             return;
@@ -1001,19 +1055,21 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
             return;
         }
         if (this.figure.id) {
-            /*
-              고치던 것이 있으면 묻는다. 저작한 것을 말없이 버리지 않는다 — 되돌릴 수 없다.
-              그만두면 보고 있던 도형의 주소로 되돌려 화면과 주소가 어긋나지 않게 한다.
-            */
-            if (this.dirty && !confirm(i18next.t('figure.text.discard-changes-and-start-new'))) {
-                navigate(`figure-modeller/${this.figure.id}`, true);
-                return;
-            }
             this.startNew();
+            return;
+        }
+        if (shouldStartNewFigure(changes, !!this.figure, this.figure?.id)) {
+            this.startNew();
+            return;
         }
     }
     async load(id) {
+        const generation = ++this.loadGeneration;
         const figure = await fetchFigure(id);
+        if (generation !== this.loadGeneration || !this.active)
+            return;
+        this.proposalSession = undefined;
+        this.proposalBaseSource = undefined;
         this.figure = figure;
         /*
           그림이 없으면 이 자리에서 채운다(아래 `fillThumbnail`). 기다리지 않는다 — 화면이 먼저다.
@@ -1044,8 +1100,16 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
         this.selected = -1;
         this.dirty = false;
         this.violations = [];
+        this.undoStack = [];
+        this.redoStack = [];
+        this.lastCoalesceKey = undefined;
     }
     startNew() {
+        ++this.loadGeneration;
+        this.proposalSession = undefined;
+        this.proposalBaseSource = undefined;
+        this.proposalFeedback = [];
+        this.mode = 'edit';
         // 타입 이름을 사람이 정하기 전까지는 임시 이름을 쓴다. 저장할 때 확정한다.
         const draftType = `FIGURE_${Date.now().toString(36).toUpperCase()}`;
         const { board, parts } = startingModel(draftType);
@@ -1056,6 +1120,9 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
         this.selected = -1;
         this.dirty = true;
         this.violations = [];
+        this.undoStack = [];
+        this.redoStack = [];
+        this.lastCoalesceKey = undefined;
     }
     rename(name) {
         if (!this.figure)
@@ -1075,13 +1142,56 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
         this.figure = { ...this.figure, ...patch };
         this.dirty = true;
     }
+    snapshotState() {
+        return {
+            board: this.board ? structuredClone(this.board) : undefined,
+            parts: structuredClone(this.parts),
+            selected: this.selected
+        };
+    }
+    recordHistory(coalesceKey) {
+        const now = Date.now();
+        if (coalesceKey && this.lastCoalesceKey === coalesceKey && now - this.lastHistoryTime < 600) {
+            this.lastHistoryTime = now;
+            return;
+        }
+        this.lastCoalesceKey = coalesceKey;
+        this.lastHistoryTime = now;
+        this.undoStack = [...this.undoStack.slice(-49), this.snapshotState()];
+        this.redoStack = [];
+    }
+    undo() {
+        if (this.undoStack.length === 0)
+            return;
+        const prev = this.undoStack[this.undoStack.length - 1];
+        this.undoStack = this.undoStack.slice(0, -1);
+        this.redoStack = [this.snapshotState(), ...this.redoStack.slice(0, 49)];
+        this.board = prev.board ? structuredClone(prev.board) : undefined;
+        this.parts = structuredClone(prev.parts);
+        this.selected = this.parts.length ? Math.max(-1, Math.min(prev.selected, this.parts.length - 1)) : -1;
+        this.dirty = true;
+        this.lastCoalesceKey = undefined;
+    }
+    redo() {
+        if (this.redoStack.length === 0)
+            return;
+        const next = this.redoStack[0];
+        this.redoStack = this.redoStack.slice(1);
+        this.undoStack = [...this.undoStack.slice(-49), this.snapshotState()];
+        this.board = next.board ? structuredClone(next.board) : undefined;
+        this.parts = structuredClone(next.parts);
+        this.selected = this.parts.length ? Math.max(-1, Math.min(next.selected, this.parts.length - 1)) : -1;
+        this.dirty = true;
+        this.lastCoalesceKey = undefined;
+    }
     /**
      * 부품 목록을 갈아 끼운다.
      *
      * 편집 규칙은 `part-edits` 가 갖는다 — 화면과 테스트가 같은 것을 쓰게 하려고 떼어
      * 놓았다. 여기서는 결과를 담고 선택 인덱스를 정리한다.
      */
-    put(parts, selected = this.selected) {
+    put(parts, selected = this.selected, coalesceKey) {
+        this.recordHistory(coalesceKey);
         this.parts = parts;
         this.selected = Math.min(selected, parts.length - 1);
         this.dirty = true;
@@ -1102,7 +1212,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
         this.put(edits.movePart(this.parts, index, to), to);
     }
     updatePart(index, part) {
-        this.put(edits.updatePart(this.parts, index, part));
+        this.put(edits.updatePart(this.parts, index, part), this.selected, `part:${part.name || index}`);
     }
     /**
      * 판 자체의 값을 갈아 끼운다 — 능력처럼 부품보다 위에 있는 것들.
@@ -1111,6 +1221,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
      * 고칠 때마다 부품 목록이 새 배열이 되고, 그리는 쪽이 전부 다시 그린다.
      */
     updateBoard(board) {
+        this.recordHistory('board');
         this.board = board;
         this.dirty = true;
     }
@@ -1127,6 +1238,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
     changeDetailLevel(level) {
         if (!this.board)
             return;
+        this.recordHistory('detailLevel');
         this.board = { ...this.board, detailLevel: level };
         this.dirty = true;
     }
@@ -1163,7 +1275,7 @@ let FigureModellerPage = class FigureModellerPage extends FigureModellerPageBase
     partChanged(name, part) {
         const at = this.parts.findIndex(item => item.name === name);
         if (at >= 0)
-            this.put(edits.updatePart(this.parts, at, part));
+            this.put(edits.updatePart(this.parts, at, part), this.selected, `drag:${name}`);
     }
     /**
      * 정밀 배치 도구.
@@ -1365,6 +1477,14 @@ __decorate([
     state(),
     __metadata("design:type", Array)
 ], FigureModellerPage.prototype, "proposalFeedback", void 0);
+__decorate([
+    state(),
+    __metadata("design:type", Array)
+], FigureModellerPage.prototype, "undoStack", void 0);
+__decorate([
+    state(),
+    __metadata("design:type", Array)
+], FigureModellerPage.prototype, "redoStack", void 0);
 FigureModellerPage = __decorate([
     customElement('figure-modeller-page')
 ], FigureModellerPage);