fix: QuickSearch outside-click

dineug · Dec 23, 2023 · 43dcd8a · 43dcd8a
1 parent 00727b9
commit 43dcd8a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 3 deletions.
diff --git a/packages/erd-editor-shiki-worker/README.md b/packages/erd-editor-shiki-worker/README.md
@@ -26,4 +26,13 @@ setGetShikiServiceCallback(getShikiService);
 
   setGetShikiServiceCallback(getShikiService);
 </script>
+<!-- or -->
+<script src="https://cdn.jsdelivr.net/npm/@dineug/erd-editor/dist/erd-editor.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@dineug/erd-editor-shiki-worker/dist/erd-editor-shiki-worker.min.js"></script>
+<script>
+  const { setGetShikiServiceCallback } = window['@dineug/erd-editor'];
+  const { getShikiService } = window['@dineug/erd-editor-shiki-worker'];
+
+  setGetShikiServiceCallback(getShikiService);
+</script>
 ```
diff --git a/packages/erd-editor-vscode-bridge/package.json b/packages/erd-editor-vscode-bridge/package.json
@@ -24,6 +24,7 @@
     "build": "vite build"
   },
   "devDependencies": {
+    "@dineug/shared": "workspace:*",
     "@rollup/plugin-typescript": "^11.1.5",
     "rollup-plugin-visualizer": "^5.11.0",
     "ts-patch": "^3.1.1",

diff --git a/packages/erd-editor-vscode-bridge/src/index.ts b/packages/erd-editor-vscode-bridge/src/index.ts
@@ -1,3 +1,5 @@
+import { isObject } from '@dineug/shared';
+
 import {
   AnyAction,
   Callback,
@@ -112,6 +114,7 @@ export class Emitter<M extends BridgeActionMap> {
   }
 
   emit(action: AnyAction) {
+    if (!isObject(action)) return;
     this.#observers.forEach(reducers => {
       const reducer = Reflect.get(reducers, action.type);
       safeCallback(reducer, action);

diff --git a/packages/erd-editor-vscode-webview/vite.config.ts b/packages/erd-editor-vscode-webview/vite.config.ts
@@ -23,6 +23,7 @@ export default defineConfig(({ command, mode }) => {
         formats: ['iife'],
       },
       outDir,
+      emptyOutDir: true,
     },
     plugins: [tsconfigPaths()],
   };

diff --git a/packages/erd-editor/README.md b/packages/erd-editor/README.md
@@ -12,8 +12,6 @@ npm install @dineug/erd-editor
 
 ## Usage
 
-### javascript
-
 ```js
 import '@dineug/erd-editor';
 
@@ -34,6 +32,8 @@ const editor = document.createElement('erd-editor');
 
   const editor = document.createElement('erd-editor');
 </script>
+<!-- or -->
+<script src="https://cdn.jsdelivr.net/npm/@dineug/erd-editor/dist/erd-editor.min.js"></script>
 ```
 
 ## ErdEditorElement

diff --git a/packages/erd-editor/src/components/quick-search/QuickSearch.ts b/packages/erd-editor/src/components/quick-search/QuickSearch.ts
@@ -224,7 +224,10 @@ const QuickSearch: FC<QuickSearchProps> = (props, ctx) => {
               (action, index) => html`
                 <div
                   class=${[styles.action, { selected: index === state.index }]}
-                  @click=${() => handlePerform(index)}
+                  @click=${(event: MouseEvent) => {
+                    event.stopPropagation();
+                    handlePerform(index);
+                  }}
                 >
                   ${action.icon
                     ? html`<div class=${styles.icon}>${action.icon}</div>`

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ export default defineConfig(({ command, mode }) => { @@
             formats: ['iife'],
           },
           outDir,
+          emptyOutDir: true,
         },
         plugins: [tsconfigPaths()],
       };
@@ Expand Down @@