fix: canvas controller

dineug · Jan 19, 2024 · 7f0487d · 7f0487d
1 parent be215f0
commit 7f0487d
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 44 deletions.
diff --git a/packages/erd-editor-vscode/src/editor.ts b/packages/erd-editor-vscode/src/editor.ts
@@ -20,6 +20,11 @@ export abstract class Editor {
   ) {}
 
   get readonly() {
+    // TODO: scheme
+    // scheme: untitled, file, git, conflictResolution
+    // const editable = vscode.workspace.fs.isWritableFileSystem(
+    //   this.document.uri.scheme
+    // );
     return (
       this.document.uri.scheme === 'git' ||
       this.document.uri.scheme === 'conflictResolution'

diff --git a/packages/erd-editor-vscode/src/erd-editor-provider.ts b/packages/erd-editor-vscode/src/erd-editor-provider.ts
@@ -89,7 +89,7 @@ export class ErdEditorProvider
 
     const editor = this.createEditor(
       document,
-      webviewPanel.webview,
+      webview,
       this.context,
       this.docToTupleMap
     );

diff --git a/packages/erd-editor/src/components/erd/canvas/Canvas.styles.ts b/packages/erd-editor/src/components/erd/canvas/Canvas.styles.ts
@@ -7,3 +7,7 @@ export const root = css`
   left: 0;
   will-change: transform;
 `;
+
+export const controller = css`
+  will-change: transform;
+`;
diff --git a/packages/erd-editor/src/components/erd/canvas/Canvas.ts b/packages/erd-editor/src/components/erd/canvas/Canvas.ts
@@ -42,8 +42,7 @@ const Canvas: FC<CanvasProps> = (props, ctx) => {
 
     return html`
       <div
-        class=${styles.root}
-        ${ref(props.canvas)}
+        class=${styles.controller}
         style=${{
           width: `${width}px`,
           height: `${height}px`,
@@ -53,34 +52,45 @@ const Canvas: FC<CanvasProps> = (props, ctx) => {
           'pointer-events': props.grabMove ? 'none' : 'auto',
         }}
       >
-        ${cache(
-          isHighLevelTable(zoomLevel)
-            ? html`${repeat(
-                tables,
-                table => table.id,
-                table => html`<${HighLevelTable} table=${table} />`
-              )}`
-            : html`${repeat(
-                tables,
-                table => table.id,
-                table => html`<${Table} table=${table} />`
-              )}`
-        )}
-        ${repeat(
-          memos,
-          memo => memo.id,
-          memo => html`<${Memo} memo=${memo} />`
-        )}
-        ${bHas(show, Show.relationship) ? html`<${CanvasSvg} />` : null}
-        ${drawRelationship?.start
-          ? html`
-              <${DrawRelationship}
-                root=${props.root}
-                draw=${drawRelationship}
-              />
-            `
-          : null}
-        <${SharedMouseTracker} />
+        <div
+          class=${styles.root}
+          ${ref(props.canvas)}
+          style=${{
+            width: `${width}px`,
+            height: `${height}px`,
+            'min-width': `${width}px`,
+            'min-height': `${height}px`,
+          }}
+        >
+          ${cache(
+            isHighLevelTable(zoomLevel)
+              ? html`${repeat(
+                  tables,
+                  table => table.id,
+                  table => html`<${HighLevelTable} table=${table} />`
+                )}`
+              : html`${repeat(
+                  tables,
+                  table => table.id,
+                  table => html`<${Table} table=${table} />`
+                )}`
+          )}
+          ${repeat(
+            memos,
+            memo => memo.id,
+            memo => html`<${Memo} memo=${memo} />`
+          )}
+          ${bHas(show, Show.relationship) ? html`<${CanvasSvg} />` : null}
+          ${drawRelationship?.start
+            ? html`
+                <${DrawRelationship}
+                  root=${props.root}
+                  draw=${drawRelationship}
+                />
+              `
+            : null}
+          <${SharedMouseTracker} />
+        </div>
       </div>
     `;
   };

diff --git a/packages/erd-editor/src/components/erd/erd-context-menu/menus/exportMenus.ts b/packages/erd-editor/src/components/erd/erd-context-menu/menus/exportMenus.ts
@@ -1,8 +1,6 @@
 import { toJson } from '@dineug/erd-editor-schema';
-import { nextTick } from '@dineug/r-html';
 
 import { AppContext } from '@/components/appContext';
-import { scrollToAction } from '@/engine/modules/settings/atom.actions';
 import {
   exportJSON,
   exportPNG,
@@ -26,8 +24,8 @@ export function createExportMenus(
       },
       name: 'json',
       onClick: () => {
-        exportJSON(toJson(store.state), databaseName);
         onClose();
+        exportJSON(toJson(store.state), databaseName);
       },
     },
     {
@@ -37,8 +35,8 @@ export function createExportMenus(
       },
       name: 'Schema SQL',
       onClick: () => {
-        exportSchemaSQL(createSchemaSQL(store.state), databaseName);
         onClose();
+        exportSchemaSQL(createSchemaSQL(store.state), databaseName);
       },
     },
     {
@@ -49,15 +47,7 @@ export function createExportMenus(
       name: 'png',
       onClick: () => {
         onClose();
-        store.dispatchSync(
-          scrollToAction({
-            scrollTop: 0,
-            scrollLeft: 0,
-          })
-        );
-        nextTick(() => {
-          exportPNG(root, databaseName);
-        });
+        exportPNG(root, databaseName);
       },
     },
   ];