Fixed Mac CTRL vs. CMD button issue

README.md

@@ -28,7 +28,7 @@ To convert files you have the following options:
 
 # Key features
 - The plugin aims to integrate Excalidraw seemlessly into Obsidian including Command Palette actions, File Explorer features, Option Menu commands, and the Ribbon Button.
-- CTRL+Click on the ribbon button, or in the file explorer to create / open drawings in a new pane.
+- CTRL/CMD+Click on the ribbon button, or in the file explorer to create / open drawings in a new pane.
 - Settings will allow you to customzie Excalidraw to your needs:
   - Default folder for new drawings and define custom filename pattern for new drawings.
   - Template for new drawings. The template will restore stroke properties. This means you can set up defaults in your template for stroke color, stroke width, opacity, font family, font size, fill style, stroke style, etc. This also applies to ExcalidrawAutomate.
@@ -46,11 +46,11 @@ To convert files you have the following options:
     - `![[myfile#section]]` also works, this will transclude the section
     - you can also specify word wrapping for transcluded text by adding the max character count in curly brackets right after the transclusion e.g. `![[myfile#^blockref]]{40}` will wrap text at 40 characters.
   - For convenience you can also use the command palette to insert links into drawings
-  - CTRL/META + hover to bring up the Obsidian quick preview for the link. (On Mac it is CTRL+CMD+hover).
-  - CTRL/META + CLICK a text element to open it as a link.
-  - CTRL/META + ALT + CLICK to create the file (if it does not yet exist) and open it
-  - CTRL/META + SHIFT + CLICK to open the file in a new pane
-  - CTRL/META + ALT + SHIFT + CLICK to create the file (if it does not yet exist) and open it in a new pane
+  - CTRL/CMD + hover to bring up the Obsidian quick preview for the link. (On Mac it is CTRL+CMD+hover).
+  - CTRL/CMD + CLICK a text element to open it as a link.
+  - CTRL/CMD + ALT + CLICK to create the file (if it does not yet exist) and open it
+  - CTRL/CMD + SHIFT + CLICK to open the file in a new pane
+  - CTRL/CMD + ALT + SHIFT + CLICK to create the file (if it does not yet exist) and open it in a new pane
 - Using the block reference you can also reference & transclude text that appears on drawings, in other documents
 - Insert LaTex symbols and simple formulas using the Command Palette action "Insert LaTeX-symbol". Some symbols may not display properly using the "Hand-drawn" font. If that is the case try using the "Normal" or "Code" fonts.
 - Since 1.2.0 Drawing files are stored in Markdown files

package.json

@@ -11,7 +11,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@zsviczian/excalidraw": "0.10.0-obsidian-2",
+    "@zsviczian/excalidraw": "0.10.0-obsidian-3",
     "monkey-around": "^2.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

src/ExcalidrawView.ts

@@ -559,7 +559,7 @@ export default class ExcalidrawView extends TextFileView {
           .setIcon(PNG_ICON_NAME)
           .onClick( async (ev)=> {
             if(!this.getScene || !this.file) return;
-            if(ev.ctrlKey || ev.metaKey) {
+            if(ev.ctrlKey||ev.metaKey) { 
               const exportSettings: ExportSettings = {
                 withBackground: this.plugin.settings.exportWithBackground, 
                 withTheme: this.plugin.settings.exportWithTheme
@@ -584,7 +584,7 @@ export default class ExcalidrawView extends TextFileView {
           .setIcon(SVG_ICON_NAME)
           .onClick(async (ev)=> {
             if(!this.getScene || !this.file) return;
-            if(ev.ctrlKey || ev.metaKey) {
+            if(ev.ctrlKey||ev.metaKey) {
               const exportSettings: ExportSettings = {
                 withBackground: this.plugin.settings.exportWithBackground, 
                 withTheme: this.plugin.settings.exportWithTheme
@@ -900,13 +900,13 @@ export default class ExcalidrawView extends TextFileView {
       const handleLinkClick = () => {
         selectedTextElement = getTextElementAtPointer(currentPosition);
         if(selectedTextElement && selectedTextElement.id) {
-          const event = new MouseEvent("click", {ctrlKey: true, shiftKey: this.shiftKeyDown, altKey:this.altKeyDown});
+          const event = new MouseEvent("click", {ctrlKey:true, metaKey:true, shiftKey:this.shiftKeyDown, altKey:this.altKeyDown});
           this.handleLinkClick(this,event);
           selectedTextElement = null;
         }      
         selectedImageElement = getImageElementAtPointer(currentPosition);
         if(selectedImageElement && selectedImageElement.id) {
-          const event = new MouseEvent("click", {ctrlKey: true, shiftKey: this.shiftKeyDown, altKey:this.altKeyDown});
+          const event = new MouseEvent("click", {ctrlKey:true, metaKey:true, shiftKey:this.shiftKeyDown, altKey:this.altKeyDown});
           this.handleLinkClick(this,event);
           selectedImageElement = null;
         }    
@@ -929,11 +929,11 @@ export default class ExcalidrawView extends TextFileView {
               this.zoomToFit();
             }
 
-            this.ctrlKeyDown  = e.ctrlKey || e.metaKey;
+            this.ctrlKeyDown  = e.ctrlKey||e.metaKey; 
             this.shiftKeyDown = e.shiftKey;
             this.altKeyDown   = e.altKey;
            
-            if(e.ctrlKey && !e.shiftKey && !e.altKey) { // && !e.metaKey) {
+            if((e.ctrlKey||e.metaKey) && !e.shiftKey && !e.altKey) { 
               const selectedElement = getTextElementAtPointer(currentPosition);
               if(!selectedElement) return;
 
@@ -972,12 +972,11 @@ export default class ExcalidrawView extends TextFileView {
             }
           },
           onKeyUp: (e:any) => {
-            this.ctrlKeyDown  = e.ctrlKey || e.metaKey;
+            this.ctrlKeyDown  = e.ctrlKey||e.metaKey;
             this.shiftKeyDown = e.shiftKey;
             this.altKeyDown   = e.altKey;
           },
           onClick: (e:MouseEvent):any => {
-            //@ts-ignore
             if(!(e.ctrlKey||e.metaKey)) return;
             if(!(this.plugin.settings.allowCtrlClick)) return;
             if(!(this.getSelectedTextElement().id || this.getSelectedImageElement().id)) return;
@@ -1020,7 +1019,7 @@ export default class ExcalidrawView extends TextFileView {
             currentPosition = p.pointer;
             if(hoverPreviewTarget && (Math.abs(hoverPoint.x-p.pointer.x)>50 || Math.abs(hoverPoint.y-p.pointer.y)>50)) clearHoverPreview();
             if(!viewModeEnabled) return;
-
+            
             const buttonDown = !blockOnMouseButtonDown && p.button === "down";
             if(buttonDown) {
               blockOnMouseButtonDown = true;
@@ -1110,7 +1109,7 @@ export default class ExcalidrawView extends TextFileView {
             switch(draggable?.type) {
               case "file":
                 if (!onDropHook("file",[draggable.file],null)) {
-                  if((event.ctrlKey || event.metaKey) 
+                  if((event.ctrlKey||event.metaKey) 
                      && (IMAGE_TYPES.contains(draggable.file.extension) 
                         || this.plugin.isExcalidrawFile(draggable.file))) {
                     const f = draggable.file;

src/OneOffs.ts

@@ -1,4 +1,4 @@
-import { App, Modal, TFile } from "obsidian";
+import { App, Modal, Notice, TFile } from "obsidian";
 import { getJSON } from "./ExcalidrawData";
 import ExcalidrawPlugin from "./main";
 
@@ -93,8 +93,8 @@ class MigrationPrompt extends Modal {
 
   createForm(): void {
     const div = this.contentEl.createDiv();
-    div.addClass("excalidraw-prompt-div");
-    div.style.maxWidth = "600px";
+//    div.addClass("excalidraw-prompt-div");
+//    div.style.maxWidth = "600px";
     div.createEl('p',{text:  "This version comes with tons of new features and possibilities. Please read the description in Community Plugins to find out more."});
     div.createEl('p',{text: ""} , (el) => {
       el.innerHTML = "Drawings you've created with version 1.1.x need to be converted to take advantage of the new features. You can also continue to use them in compatibility mode. "+
@@ -147,7 +147,7 @@ class ImageElementNotice extends Modal {
   createForm(): void {
     const div = this.contentEl.createDiv();
     //div.addClass("excalidraw-prompt-div");
-    div.style.maxWidth = "600px";
+    //div.style.maxWidth = "600px";
 
     div.createEl('p',{text: ""},(el) => {
       el.innerHTML = "Welcome to Obsidian-Excalidraw 1.4! I've added Image Elements. " 

src/lang/locale/en.ts

@@ -28,13 +28,13 @@ export default {
   
   //ExcalidrawView.ts
   OPEN_AS_MD: "Open as Markdown",
-  SAVE_AS_PNG: "Save as PNG into Vault (CTRL/META+CLICK to export)",
-  SAVE_AS_SVG: "Save as SVG into Vault (CTRL/META+CLICK to export)",
+  SAVE_AS_PNG: "Save as PNG into Vault (CTRL/CMD+CLICK to export)",
+  SAVE_AS_SVG: "Save as SVG into Vault (CTRL/CMD+CLICK to export)",
   OPEN_LINK: "Open selected text as link\n(SHIFT+CLICK to open in a new pane)",
   EXPORT_EXCALIDRAW: "Export to an .Excalidraw file",
   LINK_BUTTON_CLICK_NO_TEXT: 'Select a an ImageElement, or select a TextElement that contains an internal or external link.\n'+
                              'SHIFT CLICK this button to open the link in a new pane.\n'+
-                             'CTRL/META CLICK the Image or TextElement on the canvas has the same effect!',
+                             'CTRL/CMD CLICK the Image or TextElement on the canvas has the same effect!',
   TEXT_ELEMENT_EMPTY: "No ImageElement is selected or TextElement is empty, or [[valid-link|alias]] or [alias](valid-link) is not found",
   FILENAME_INVALID_CHARS: 'File name cannot contain any of the following characters: * " \\  < > : | ?',
   FILE_DOES_NOT_EXIST: "File does not exist. Hold down ALT (or ALT+SHIFT) and CLICK link button to create a new file.",
@@ -82,14 +82,14 @@ export default {
   ZOOM_TO_FIT_MAX_LEVEL_NAME: "Zoom to fit max ZOOM level",
   ZOOM_TO_FIT_MAX_LEVEL_DESC: "Set the maximum level to which zoom to fit will enlarge the drawing. Minimum is 0.5 (50%) and maximum is 10 (1000%).",
   LINKS_HEAD: "Links and transclusion",
-  LINKS_DESC: "CTRL/META + CLICK on Text Elements to open them as links. " + 
+  LINKS_DESC: "CTRL/CMD + CLICK on Text Elements to open them as links. " + 
               "If the selected text has more than one [[valid Obsidian links]], only the first will be opened. " + 
               "If the text starts as a valid web link (i.e. https:// or http://), then " +
               "the plugin will open it in a browser. " +
               "When Obsidian files change, the matching [[link]] in your drawings will also change. " +
               "If you don't want text accidentally changing in your drawings use [[links|with aliases]].",
   ADJACENT_PANE_NAME: "Open in adjacent pane",
-  ADJACENT_PANE_DESC: "When CTRL+SHIFT clicking a link in Excalidraw by default the plugin will open the link in a new pane. " + 
+  ADJACENT_PANE_DESC: "When CTRL/CMD+SHIFT clicking a link in Excalidraw by default the plugin will open the link in a new pane. " + 
                       "Turning this setting on, Excalidraw will first look for an existing adjacent pane, and try to open the link there. " + 
                       "Excalidraw will first look too the right, then to the left, then down, then up. If no pane is found, Excalidraw will open " +
                       "a new pane.",
@@ -105,7 +105,7 @@ export default {
   URL_PREFIX_DESC:"In PREVIEW mode, if the Text Element contains a URL link, precede the text with these characters. " +
                   "You can override this setting for a specific drawing by adding \'" + FRONTMATTER_KEY_CUSTOM_URL_PREFIX + 
                   ': "🌐 "\' to the file\'s frontmatter.',
-  LINK_CTRL_CLICK_NAME: "CTRL + CLICK on text to open them as links",
+  LINK_CTRL_CLICK_NAME: "CTRL/CMD + CLICK on text to open them as links",
   LINK_CTRL_CLICK_DESC: "You can turn this feature off if it interferes with default Excalidraw features you want to use. If " +
                         "this is turned off, only the link button in the title bar of the drawing pane will open links.",
   TRANSCLUSION_WRAP_NAME: "Overflow wrap behavior of transcluded text",

src/lang/locale/zh-cn.ts

@@ -29,13 +29,13 @@ export default {
   
   //ExcalidrawView.ts
   OPEN_AS_MD: "打开为 Markdown 文件",
-  SAVE_AS_PNG: "保存成 PNG 文件到库里（CTRL/META 加左键点击来指定导出位置）",
-  SAVE_AS_SVG: "保存成 SVG 文件到库里（CTRL/META 加左键点击来指定导出位置）",
+  SAVE_AS_PNG: "保存成 PNG 文件到库里（CTRL/CMD 加左键点击来指定导出位置）",
+  SAVE_AS_SVG: "保存成 SVG 文件到库里（CTRL/CMD 加左键点击来指定导出位置）",
   OPEN_LINK: "以链接的方式打开文本 \n（按住 SHIFT 来在新面板中打开）",
   EXPORT_EXCALIDRAW: "导出为 .Excalidraw 文件",
   LINK_BUTTON_CLICK_NO_TEXT: '选择带有外部链接或内部链接的文本。\n'+
                              'SHIFT 加左键点击按钮来在新面板中打开链接。\n'+
-                             'CTRL/META 加左键在画布中点击文本元素也可以打开对应的链接。',
+                             'CTRL/CMD 加左键在画布中点击文本元素也可以打开对应的链接。',
   TEXT_ELEMENT_EMPTY: "文本元素没有链接任何东西.",
   FILENAME_INVALID_CHARS: '文件名不能包含以下符号： * " \\  < > : | ?',
   FILE_DOES_NOT_EXIST: "文件不存在。按住 ALT（或者 ALT + SHIFT）加左键点击来创建新文件。",
@@ -71,7 +71,7 @@ export default {
   FILENAME_DATE_NAME: "文件名日期",
   FILENAME_DATE_DESC: "文件名的第二部分",
   LINKS_HEAD: "链接",
-  LINKS_DESC: "CTRL/META 加左键点击文本元素来打开链接。" + 
+  LINKS_DESC: "CTRL/CMD 加左键点击文本元素来打开链接。" + 
               "如果选中的文本指向多个双链，只会打开其中第一个。" + 
               "如果选中的文本为超链接 (i.e. https:// or http://)，然后" +
               "插件会在浏览器中打开超链接。" +
@@ -85,7 +85,7 @@ export default {
   LINK_PREFIX_DESC:"在预览（锁定）模式，如果文本元素包含链接，在文本之前加上这些字符。" +
                    "你可以在文件的 Frontmatter 中加入 \'" + FRONTMATTER_KEY_CUSTOM_PREFIX + 
                    ': "👉 "\' 单独更改',
-  LINK_CTRL_CLICK_NAME: "CTRL 加左键点击文本来打开链接",
+  LINK_CTRL_CLICK_NAME: "CTRL/CMD 加左键点击文本来打开链接",
   LINK_CTRL_CLICK_DESC: "如果此功能干扰了您要使用的 Excalidraw 功能，您可以将其关闭。 如果" +
                         "关闭此选项，则只有绘图标题栏中的链接按钮可以让你打开链接。",
   EMBED_HEAD: "嵌入 & 导出",

src/main.ts

@@ -106,14 +106,16 @@ export default class ExcalidrawPlugin extends Plugin {
     this.experimentalFileTypeDisplayToggle(this.settings.experimentalFileType);
     this.registerCommands();
     this.registerEventListeners();
-    
+        
     //inspiration taken from kanban: 
     //https://github.com/mgmeyers/obsidian-kanban/blob/44118e25661bff9ebfe54f71ae33805dc88ffa53/src/main.ts#L267
     this.registerMonkeyPatches();
 
-    const electron:string = process.versions.electron;
-    if(electron.startsWith("8.")) {
-      new Notice(`You are running an older version of the electron Browser (${electron}). If Excalidraw does not start up, please reinstall Obsidian with the latest installer and try again.`,10000);
+    if(!this.app.isMobile) {
+      const electron:string = process?.versions?.electron;
+      if(electron && electron?.startsWith("8.")) {
+        new Notice(`You are running an older version of the electron Browser (${electron}). If Excalidraw does not start up, please reinstall Obsidian with the latest installer and try again.`,10000);
+      }
     }
 
     const patches = new OneOffs(this);