fix: shortcut for tab

Author: YuxinZhaozyx

README.md

@@ -81,6 +81,8 @@ The label of a draw.io image block can be configured in the plugin settings.
 
 ## Changelog
 
++ v0.5.5
+    + Fix: shortcut for Tab
 + v0.5.4
     + Feature: fullscreen support for shortcut in Tab
 + v0.5.3

README_zh_CN.md

@@ -70,6 +70,8 @@
 
 ## 更新日志
 
++ v0.5.5
+    + 修复缺陷：快捷键
 + v0.5.4
     + 新增功能：Tab支持快捷键全屏
 + v0.5.3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "siyuan-embed-drawio",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "type": "module",
   "description": "This is a plugin for siyuan",
   "author": "",

plugin.json

@@ -2,7 +2,7 @@
   "name": "siyuan-embed-drawio",
   "author": "Yuxin Zhao",
   "url": "https://github.com/YuxinZhaozyx/siyuan-embed-drawio",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "minAppVersion": "3.0.0",
   "disabledInPublish": true,
   "backends": [

src/index.scss

@@ -52,7 +52,7 @@
     }
 }
 
-html[data-theme-mode="dark"] img[data-src^="assets/drawio-"] {
+html[data-theme-mode="dark"] img[src^="assets/drawio-"] {
     filter: invert(0.8) brightness(1.2);
 }
 

src/index.ts

@@ -7,12 +7,14 @@ import {
   getAllEditor,
   openTab,
   getAllModels,
+  Custom,
 } from "siyuan";
 import "@/index.scss";
 import PluginInfoString from '@/../plugin.json';
 import {
   getImageSizeFromBase64,
   locatePNGtEXt,
+  insertPNGpHYs,
   replaceSubArray,
   arrayToBase64,
   base64ToArray,
@@ -22,6 +24,7 @@ import {
   dataURLToBlob,
   HTMLToElement,
 } from "./utils";
+import { matchHotKey } from "./utils/hotkey";
 import defaultImageContent from "@/default.json";
 
 let PluginInfo = {
@@ -444,11 +447,52 @@ export default class DrawioPlugin extends Plugin {
     })
   }
 
+  private getActiveCustomTab(type: string): Custom {
+    const allCustoms = getAllModels().custom;
+    const activeTabElement = document.querySelector(".layout__wnd--active .item--focus");
+    if (activeTabElement) {
+      const tabId = activeTabElement.getAttribute("data-id");
+      for (const custom of allCustoms as any[]) {
+        if (custom.type == this.name + type && custom.tab.headElement?.getAttribute('data-id') == tabId) {
+          return custom;
+        };
+      }
+    }
+    return null;
+  }
+
+  private tabHotKeyEventHandler = (event: KeyboardEvent, custom?: Custom) => {
+    // 自定义处理方式的快捷键
+    const isFullscreenHotKey = matchHotKey(window.siyuan.config.keymap.editor.general.fullscreen.custom, event);
+    const isCloseTabHotKey = matchHotKey(window.siyuan.config.keymap.general.closeTab.custom, event);
+    if (isFullscreenHotKey || isCloseTabHotKey) {
+      if (!custom) custom = this.getActiveCustomTab(this.EDIT_TAB_TYPE);
+      if (custom) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        if (isFullscreenHotKey) {
+          if (document.fullscreenElement) {
+            document.exitFullscreen();
+          } else {
+            custom.element.requestFullscreen();
+          }
+        }
+        if (isCloseTabHotKey) {
+          custom.tab.close();
+        }
+      }
+    }
+  };
+
   private globalKeyDownHandler = (event: KeyboardEvent) => {
     // 如果是在代码编辑器里使用快捷键，则阻止冒泡 https://github.com/YuxinZhaozyx/siyuan-embed-tikz/issues/1
     if (document.activeElement.closest(".b3-dialog--open .drawio-edit-dialog")) {
       event.stopPropagation();
     }
+
+    // 快捷键
+    this.tabHotKeyEventHandler(event);
   };
 
   public setupEditTab() {
@@ -486,6 +530,7 @@ export default class DrawioPlugin extends Plugin {
           postMessage({
             action: 'export',
             format: `xml${imageInfo.format}`,
+            // scale: 1,
           });
         }
 
@@ -544,17 +589,8 @@ export default class DrawioPlugin extends Plugin {
           }
         };
 
-        const switchFullscreen = () => {
-          if (document.fullscreenElement) {
-            document.exitFullscreen();
-          } else {
-            this.element.requestFullscreen();
-          }
-        }
         const keydownEventHandleer = (event: KeyboardEvent) => {
-          if (event.key.toLowerCase() === 'y' && (event.altKey || event.metaKey)) {
-            switchFullscreen();
-          }
+          that.tabHotKeyEventHandler(event, this);
         };
 
         window.addEventListener("message", messageEventHandler);
@@ -842,6 +878,13 @@ export default class DrawioPlugin extends Plugin {
       base64String = unicodeToBase64(svgContent);
       imageDataURL = `data:image/svg+xml;base64,${base64String}`;
     }
+    // 设置PNG DPI
+    // if (imageDataURL.startsWith('data:image/png')) {
+    //   let binaryArray = base64ToArray(imageDataURL.split(',').pop());
+    //   binaryArray = insertPNGpHYs(binaryArray, 96 * 2);
+    //   const base64String = arrayToBase64(binaryArray);
+    //   imageDataURL = `data:image/png;base64,${base64String}`;
+    // }
     // 当图像为空时，使用默认的占位图
     const imageSize = getImageSizeFromBase64(imageDataURL);
     if (imageSize && imageSize.width <= 1 && imageSize.height <= 1) {

src/types/index.d.ts

@@ -128,6 +128,7 @@ interface Window {
         mode: number;
       };
       lang: string;
+      keymap: any;
     }
   };
   _sy_plugin_sample: {