Merge pull request #2083 from dmscode/master

Update zh-cn.ts to 8f14f97

manifest-beta.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-excalidraw-plugin",
 	"name": "Excalidraw",
-	"version": "2.6.0-beta-3",
+	"version": "2.6.2",
 	"minAppVersion": "1.1.6",
 	"description": "An Obsidian plugin to edit and view Excalidraw drawings",
 	"author": "Zsolt Viczian",

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "obsidian-excalidraw-plugin",
   "name": "Excalidraw",
-  "version": "2.5.2",
+  "version": "2.6.2",
   "minAppVersion": "1.1.6",
   "description": "An Obsidian plugin to edit and view Excalidraw drawings",
   "author": "Zsolt Viczian",

package.json

@@ -19,7 +19,7 @@
   "license": "MIT",
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "@zsviczian/excalidraw": "0.17.6-6",
+    "@zsviczian/excalidraw": "0.17.6-8",
     "chroma-js": "^2.4.2",
     "clsx": "^2.0.0",
     "@zsviczian/colormaster": "^1.2.2",

src/EmbeddedFileLoader.ts

@@ -1106,8 +1106,48 @@ export class EmbeddedFilesLoader {
 }
 
 const getSVGData = async (app: App, file: TFile, colorMap: ColorMap | null): Promise<DataURL> => {
-  const svg = replaceSVGColors(await app.vault.read(file), colorMap) as string;
-  return svgToBase64(svg) as DataURL;
+  const svgString = replaceSVGColors(await app.vault.read(file), colorMap) as string;
+
+  try {
+    const container = document.createElement('div');
+    container.innerHTML = svgString;
+    
+    const svgElement = container.querySelector('svg');
+    
+    if (!svgElement) {
+      throw new Error('Invalid SVG content'); // Ensure there's an SVG element
+    }
+
+    // Check for width and height attributes
+    const hasWidth = svgElement.hasAttribute('width');
+    const hasHeight = svgElement.hasAttribute('height');
+
+    // If width or height is missing, calculate based on viewBox
+    if (!hasWidth || !hasHeight) {
+      const viewBox = svgElement.getAttribute('viewBox');
+      
+      if (viewBox) {
+        const [ , , viewBoxWidth, viewBoxHeight] = viewBox.split(/\s+/).map(Number);
+
+        // Set width and height based on viewBox if they are missing
+        if (!hasWidth) {
+          svgElement.setAttribute('width', `${viewBoxWidth}px`);
+        }
+        if (!hasHeight) {
+          svgElement.setAttribute('height', `${viewBoxHeight}px`);
+        }
+      }
+    }
+
+    // Get the updated SVG string from outerHTML
+    const updatedSVGString = svgElement.outerHTML;
+
+    // Convert the updated SVG string to a base64 Data URL
+    return svgToBase64(updatedSVGString) as DataURL;
+  } catch (error) {
+    errorlog({ where: "EmbeddedFileLoader.getSVGData", error });
+    return svgToBase64(svgString) as DataURL;
+  }
 };
 
 /*export const generateIdFromFile = async (file: ArrayBuffer): Promise<FileId> => {

src/ExcalidrawData.ts

@@ -754,7 +754,7 @@ export class ExcalidrawData {
       notice.noticeEl.oncontextmenu = () => {
         displayFontMessage(this.app);
       }
-    },2000);
+    },5000);
     await loadSceneFonts(this.scene.elements);
     clearTimeout(timer);
 

src/ExcalidrawView.ts

@@ -5878,6 +5878,7 @@ export default class ExcalidrawView extends TextFileView implements HoverParent{
     }
   ) {
     (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.instantiateExcalidraw, "ExcalidrawView.instantiateExcalidraw", initdata);
+    await this.plugin.awaitInit();
     while(!this.semaphores.scriptsReady) {
       await sleep(50);
     }

src/dialogs/ExcalidrawLoading.ts

@@ -0,0 +1,44 @@
+import { FileView, TextFileView, View, WorkspaceLeaf } from "obsidian";
+import ExcalidrawPlugin from "src/main";
+import { setExcalidrawView } from "src/utils/ObsidianUtils";
+
+export default class ExcalidrawLoading extends FileView {
+  constructor(leaf: WorkspaceLeaf, private plugin: ExcalidrawPlugin) {
+    super(leaf);
+    this.switchToeExcalidraw();
+    this.displayLoadingText();
+  }
+
+  public onload() {
+    super.onload();
+    this.displayLoadingText();
+  }
+
+  private async switchToeExcalidraw() {
+    await this.plugin.awaitInit();
+    setExcalidrawView(this.leaf);
+  }
+  
+  getViewType(): string {
+    return "excalidra-loading";
+  }
+
+  getDisplayText() {
+    return "Loading Excalidraw... " + (this.file?.basename ?? "");
+  }
+
+  private displayLoadingText() {
+    // Create a div element for displaying the text
+    const loadingTextEl = this.contentEl.createEl("div", {
+      text: this.getDisplayText()
+    });
+    
+    // Apply styling to center the text
+    loadingTextEl.style.display = "flex";
+    loadingTextEl.style.alignItems = "center";
+    loadingTextEl.style.justifyContent = "center";
+    loadingTextEl.style.height = "100%";
+    loadingTextEl.style.fontSize = "1.5em"; // Adjust size as needed
+  }
+  
+}

src/dialogs/Messages.ts

@@ -15,7 +15,37 @@ export const RELEASE_NOTES: { [k: string]: string } = {
 
 I develop this plugin as a hobby, spending my free time doing this. If you find it valuable, then please say THANK YOU or...
 
-<div class="ex-coffee-div"><a href="https://ko-fi.com/zsolt"><img src="https://cdn.ko-fi.com/cdn/kofi3.png?v=3" height=45></a></div>
+<div class="ex-coffee-div"><a href="https://ko-fi.com/zsolt"><img src="https://storage.ko-fi.com/cdn/kofi6.png?v=6" border="0" alt="Buy Me a Coffee at ko-fi.com"  height=45></a></div>
+`,
+"2.6.2":`
+## Fixed
+- Image scaling issue with SVGs that miss the width and height property. [#8729](https://github.com/excalidraw/excalidraw/issues/8729)
+`,
+"2.6.1":`
+## New
+- Pen-mode single-finger panning enabled also for the "Selection" tool.
+- You can disable pen-mode single-finger panning in Plugin Settings under Excalidraw Appearance and Behavior [#2080](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2080)
+
+## Fixed
+- Text tool did not work in pen-mode using finger [#2080](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2080)
+- Pasting images to Excalidraw from the web resulted in filenames of "image_1.png", "image_2.png" instead of "Pasted Image TIMESTAMP" [#2081](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2081)
+`,
+"2.6.0":`
+## Performance
+- Much faster plugin initialization. Down from 1000-3000ms to 100-300ms. According to my testing speed varies on a wide spectrum depending on device, size of Vault and other plugins being loaded. I measured values ranging from 84ms up to 782ms [#2068](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2068)
+- Faster loading of scenes with many embedded illustrations or PDF pages.
+- SVG export results in even smaller files by further optimizing which characters are included in the embedded fonts. [#8641](https://github.com/excalidraw/excalidraw/pull/8641)
+
+## New
+- Image cropping tool. Double click the image to crop it. [#8613](https://github.com/excalidraw/excalidraw/pull/8613)
+- Single finger panning in pen mode.
+- Native handwritten CJK Font support [8530](https://github.com/excalidraw/excalidraw/pull/8530) 
+  - Created a new **Fonts** section in settings. This includes configuration of the "Local Font" and downloading of the CJK fonts in case you need them offline.
+- Option under **Appearance and Behavior / Link Click** to disable double-click link navigation in view mode. [#2075](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2075)
+- New RU translation 🙏[@tovBender](https://github.com/tovBender)
+
+## Updated
+- CN translation 🙏[@dmscode](https://github.com/dmscode)
 `,
 "2.5.2": `
 ## Fixed

src/lang/locale/en.ts

@@ -355,6 +355,7 @@ FILENAME_HEAD: "Filename",
   DEFAULT_PEN_MODE_DESC:
     "Should pen mode be automatically enabled when opening Excalidraw?",
   DISABLE_DOUBLE_TAP_ERASER_NAME: "Enable double-tap eraser in pen mode",
+  DISABLE_SINGLE_FINGER_PANNING_NAME: "Enable single-finger panning in pen mode",
   SHOW_PEN_MODE_FREEDRAW_CROSSHAIR_NAME: "Show (+) crosshair in pen mode",
   SHOW_PEN_MODE_FREEDRAW_CROSSHAIR_DESC:
     "Show crosshair in pen mode when using the freedraw tool. <b><u>Toggle ON:</u></b> SHOW <b><u>Toggle OFF:</u></b> HIDE<br>"+

src/lang/locale/zh-cn.ts

@@ -98,6 +98,8 @@ export default {
   RESET_IMG_ASPECT_RATIO: "重置所选图像元素的纵横比",
   TEMPORARY_DISABLE_AUTOSAVE: "临时禁用自动保存功能，直到本次 Obsidian 退出（小白慎用！）",
   TEMPORARY_ENABLE_AUTOSAVE: "启用自动保存功能",
+  FONTS_LOADED : "Excalidraw: CJK 字体已加载" ,
+  FONTS_LOAD_ERROR : "Excalidraw: 在资源文件夹下找不到 CJK 字体\n" ,
 
   //ExcalidrawView.ts
   NO_SEARCH_RESULT: "在绘图中未找到匹配的元素",
@@ -353,6 +355,7 @@ FILENAME_HEAD: "文件名",
   DEFAULT_PEN_MODE_DESC:
     "打开绘图时，是否自动开启触控笔模式？",
   DISABLE_DOUBLE_TAP_ERASER_NAME: "启用手写模式下的双击橡皮擦功能",
+  DISABLE_SINGLE_FINGER_PANNING_NAME: "启用手写模式下的单指平移功能",
   SHOW_PEN_MODE_FREEDRAW_CROSSHAIR_NAME: "在触控笔模式下显示十字准星（+）",
   SHOW_PEN_MODE_FREEDRAW_CROSSHAIR_DESC:
     "在触控笔模式下使用涂鸦功能会显示十字准星 <b><u>打开:</u></b> 显示 <b><u>关闭:</u></b> 隐藏<br>"+
@@ -432,6 +435,7 @@ FILENAME_HEAD: "文件名",
   LONG_PRESS_DESKTOP_DESC: "长按(以毫秒为单位)打开在 Markdown 文件中嵌入的 Excalidraw 绘图。",
   LONG_PRESS_MOBILE_NAME: "长按打开（移动端）",
   LONG_PRESS_MOBILE_DESC: "长按(以毫秒为单位)打开在 Markdown 文件中嵌入的 Excalidraw 绘图。",
+  DOUBLE_CLICK_LINK_OPEN_VIEW_MODE: "在查看模式下允许双击打开链接",
 
   FOCUS_ON_EXISTING_TAB_NAME: "聚焦于当前标签页",
   FOCUS_ON_EXISTING_TAB_DESC: "当打开一个链接时，如果该文件已经打开，Excalidraw 将会聚焦到现有的标签页上 " +

src/main.ts

@@ -143,6 +143,7 @@ import { RankMessage } from "./dialogs/RankMessage";
 import { initCompressionWorker, terminateCompressionWorker } from "./workers/compression-worker";
 import { WeakArray } from "./utils/WeakArray";
 import { getCJKDataURLs } from "./utils/CJKLoader";
+import ExcalidrawLoading from "./dialogs/ExcalidrawLoading";
 
 declare let EXCALIDRAW_PACKAGE:string;
 declare let REACT_PACKAGES:string;
@@ -351,8 +352,17 @@ export default class ExcalidrawPlugin extends Plugin {
   async onload() {
     this.registerView(
       VIEW_TYPE_EXCALIDRAW,
-      (leaf: WorkspaceLeaf) => new ExcalidrawView(leaf, this),
+      (leaf: WorkspaceLeaf) => {
+        if(this.isReady) {
+          return new ExcalidrawView(leaf, this);
+        } else {
+          return new ExcalidrawLoading(leaf, this);
+        }
+      },
     );
+    //Compatibility mode with .excalidraw files
+    this.registerExtensions(["excalidraw"], VIEW_TYPE_EXCALIDRAW);
+
     await this.loadSettings({reEnableAutosave:true});
     const updateSettings = !this.settings.onceOffCompressFlagReset || !this.settings.onceOffGPTVersionReset;
     if(!this.settings.onceOffCompressFlagReset) {
@@ -370,8 +380,6 @@ export default class ExcalidrawPlugin extends Plugin {
     this.addSettingTab(new ExcalidrawSettingTab(this.app, this));
     this.ea = await initExcalidrawAutomate(this);
 
-    //Compatibility mode with .excalidraw files
-    this.registerExtensions(["excalidraw"], VIEW_TYPE_EXCALIDRAW);
     this.addMarkdownPostProcessor();
     
     this.app.workspace.onLayoutReady(async () => {

src/settings.ts

@@ -85,6 +85,7 @@ export interface ExcalidrawSettings {
   defaultMode: string;
   defaultPenMode: "never" | "mobile" | "always";
   penModeDoubleTapEraser: boolean;
+  penModeSingleFingerPanning: boolean;
   penModeCrosshairVisible: boolean;
   renderImageInMarkdownReadingMode: boolean,
   renderImageInHoverPreviewForMDNotes: boolean,
@@ -261,6 +262,7 @@ export const DEFAULT_SETTINGS: ExcalidrawSettings = {
   defaultMode: "normal",
   defaultPenMode: "never",
   penModeDoubleTapEraser: true,
+  penModeSingleFingerPanning: true,
   penModeCrosshairVisible: true,
   renderImageInMarkdownReadingMode: false,
   renderImageInHoverPreviewForMDNotes: false,
@@ -1066,6 +1068,17 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
             this.applySettingsUpdate();
           }),
       );
+    
+    new Setting(detailsEl)
+      .setName(t("DISABLE_SINGLE_FINGER_PANNING_NAME"))
+      .addToggle((toggle) =>
+        toggle
+          .setValue(this.plugin.settings.penModeSingleFingerPanning)
+          .onChange(async (value) => {
+            this.plugin.settings.penModeSingleFingerPanning = value;
+            this.applySettingsUpdate();
+          }),
+      );
 
     new Setting(detailsEl)
       .setName(t("SHOW_PEN_MODE_FREEDRAW_CROSSHAIR_NAME"))

src/utils/PDFUtils.ts

@@ -0,0 +1,27 @@
+//for future use, not used currently
+
+import { ImageCrop } from "@zsviczian/excalidraw/types/excalidraw/element/types";
+import { LinkParts } from "./Utils";
+
+export function getPDFCropRect (props: {
+  scale: number,
+  linkParts: LinkParts, 
+  naturalHeight: number, 
+  naturalWidth: number,
+}) : ImageCrop | null {
+  const cropRect = props.linkParts.ref.split("rect=")[1]?.split(",").map(x=>parseInt(x));
+  const validRect = cropRect && cropRect.length === 4 && cropRect.every(x=>!isNaN(x));
+
+  if(!validRect) {
+    return null;
+  }
+
+  return {
+    x: cropRect[0] * props.scale,
+    y: (props.naturalHeight/props.scale - cropRect[3]) * props.scale,
+    width: (cropRect[2] - cropRect[0]) * props.scale,
+    height: (cropRect[3] - cropRect[1]) * props.scale,
+    naturalWidth: props.naturalWidth,
+    naturalHeight: props.naturalHeight,
+  }
+}