Excalidraw Image Element Demo

api documentation updated
1.3.16
2025-08-06 05:46:28 +00:00 · 2021-10-02 17:34:13 +02:00 · 2021-10-01 21:01:11 +02:00 · 2021-10-01 20:59:02 +02:00 · 2021-09-29 06:50:51 +02:00 · 2021-09-28 22:58:02 +02:00
23 changed files with 2290 additions and 804 deletions
--- a/README.md
+++ b/README.md
@@ -41,8 +41,12 @@ To convert files you have the following options:
 - Supports hyperlinks e.g. `https://zsolt.blog`, `[Obsidian](https://obsidian.md)`, and internal links e.g. `[[My file in vault|Alias]]` in drawing text. 
  - Links will update when files are moved or renamed, if you have the Obsidian setting Files & Links/Automatically Update Internal Links enalbled.
  - Links in drawings will show up in backlinks of documents
-  - Transclusions are supported i.e. `![[myfile#^blockref]]` will convert in the drawing into the transcluded text
+  - Transclusions are supported 
+    - `![[myfile#^blockref]]` will convert in the drawing into the transcluded text of the block
+    - `![[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
@@ -54,6 +58,10 @@ To convert files you have the following options:
  - You can add metadata to the YAML front matter of drawings
  - Anything you add between the frontmatter and the `# Text Elements` heading will be ignored by Excalidraw, i.e. you can add whatever you like here, it will be preserved as part of the document.
  - Excalidraw documents now show in graph view.
+  - The following front matter keys will customize how the drawing is displayed - overriding general settings:
+    - `excalidraw-link-prefix: "📍"` preview prefix for internal links
+    - `excalidraw-url-prefix: "🌐"` preview prefix for external links
+    - `excalidraw-link-brackets: true|false` whether or not to display brackets around links in preview
 - Includes full [Templater](https://silentvoid13.github.io/Templater/) and [Dataview](https://blacksmithgu.github.io/obsidian-dataview/docs/api/intro/) support through ExcalidrawAutomate. Check out the [detailed help + examples](https://zsviczian.github.io/obsidian-excalidraw-plugin/)
 - REQUIRES AN OBSIDIAN SYNC SUBSCRIPTION: Full drawing file history and synchronization between devices
 - Multilanguage support: if you'd like to help out by translating the plugin, please get in contact with me.
--- a/docs/API/attributes_functions_overview.md
+++ b/docs/API/attributes_functions_overview.md
@@ -2,44 +2,137 @@
 ## Attributes and functions overview
 Here's the interface implemented by ExcalidrawAutomate:

-```javascript
-ExcalidrawAutomate: {
-  style: {
-    strokeColor: string;
-    backgroundColor: string;
-    angle: number;
-    fillStyle: FillStyle;
-    strokeWidth: number;
-    storkeStyle: StrokeStyle;
-    roughness: number;
-    opacity: number;
-    strokeSharpness: StrokeSharpness;
-    fontFamily: FontFamily;
-    fontSize: number;
-    textAlign: string;
-    verticalAlign: string;
-    startArrowHead: string;
-    endArrowHead: string;
-  }
-  canvas: {theme: string, viewBackgroundColor: string};
-  setFillStyle: Function;
-  setStrokeStyle: Function;
-  setStrokeSharpness: Function;
-  setFontFamily: Function;
-  setTheme: Function;
-  addRect: Function;
-  addDiamond: Function;
-  addEllipse: Function;
-  addText: Function;
-  addLine: Function;
-  addArrow: Function;
-  connectObjects: Function;
-  addToGroup: Function;
-  toClipboard: Function;
-  create: Function;
-  createPNG: Function;
-  createSVG: Function;
-  clear: Function;
-  reset: Function;
-};
-```
+```typescript
+export interface ExcalidrawAutomate extends Window {
+  ExcalidrawAutomate: {
+    plugin: ExcalidrawPlugin;
+    elementsDict: {};
+    style: {
+      strokeColor: string;
+      backgroundColor: string;
+      angle: number;
+      fillStyle: FillStyle;
+      strokeWidth: number;
+      storkeStyle: StrokeStyle;
+      roughness: number;
+      opacity: number;
+      strokeSharpness: StrokeSharpness;
+      fontFamily: number;
+      fontSize: number;
+      textAlign: string;
+      verticalAlign: string;
+      startArrowHead: string;
+      endArrowHead: string;
+    }
+    canvas: {
+      theme: string, 
+      viewBackgroundColor: string, 
+      gridSize: number
+    };
+    setFillStyle (val:number): void;
+    setStrokeStyle (val:number): void;
+    setStrokeSharpness (val:number): void;
+    setFontFamily (val:number): void;
+    setTheme (val:number): void;
+    addToGroup (objectIds:[]):string;
+    toClipboard (templatePath?:string): void;
+    getElements ():ExcalidrawElement[];
+    getElement (id:string):ExcalidrawElement;
+    create (
+      params?: {
+        filename?: string, 
+        foldername?:string, 
+        templatePath?:string, 
+        onNewPane?: boolean,
+        frontmatterKeys?:{
+          "excalidraw-plugin"?: "raw"|"parsed",
+          "excalidraw-link-prefix"?: string,
+          "excalidraw-link-brackets"?: boolean,
+          "excalidraw-url-prefix"?: string
+        }
+      }
+    ):Promise<string>;
+    createSVG (templatePath?:string):Promise<SVGSVGElement>;
+    createPNG (templatePath?:string):Promise<any>;
+    wrapText (text:string, lineLen:number):string;
+    addRect (topX:number, topY:number, width:number, height:number):string;
+    addDiamond (topX:number, topY:number, width:number, height:number):string;
+    addEllipse (topX:number, topY:number, width:number, height:number):string;
+    addBlob (topX:number, topY:number, width:number, height:number):string;
+    addText (
+      topX:number, 
+      topY:number, 
+      text:string, 
+      formatting?: {
+        wrapAt?:number, 
+        width?:number, 
+        height?:number,
+        textAlign?: string, 
+        box?: "box"|"blob"|"ellipse"|"diamond", 
+        boxPadding?: number
+      },
+      id?:string
+    ):string;
+    addLine(points: [[x:number,y:number]]):string;
+    addArrow (
+      points: [[x:number,y:number]],
+      formatting?: {
+        startArrowHead?:string,
+        endArrowHead?:string,
+        startObjectId?:string,
+        endObjectId?:string
+      }
+    ):string ;
+    connectObjects (
+      objectA: string, 
+      connectionA: ConnectionPoint, 
+      objectB: string, 
+      connectionB: ConnectionPoint, 
+      formatting?: {
+        numberOfPoints?: number,
+        startArrowHead?:string,
+        endArrowHead?:string, 
+        padding?: number
+      }
+    ):void;
+    clear (): void;
+    reset (): void;
+    isExcalidrawFile (f:TFile): boolean;  
+    //view manipulation
+    targetView: ExcalidrawView;
+    setView (view:ExcalidrawView|"first"|"active"):ExcalidrawView;
+    getExcalidrawAPI ():any;
+    getViewElements ():ExcalidrawElement[];
+    deleteViewElements (el: ExcalidrawElement[]):boolean;
+    getViewSelectedElement( ):ExcalidrawElement;
+    getViewSelectedElements ():ExcalidrawElement[];
+    viewToggleFullScreen (forceViewMode?:boolean):void;
+    connectObjectWithViewSelectedElement (
+      objectA:string,
+      connectionA: ConnectionPoint, 
+      connectionB: ConnectionPoint, 
+      formatting?: {
+        numberOfPoints?: number,
+        startArrowHead?:string,
+        endArrowHead?:string, 
+        padding?: number
+      }
+    ):boolean;
+    addElementsToView (repositionToCursor:boolean, save:boolean):Promise<boolean>;
+    onDropHook (data: {
+      ea: ExcalidrawAutomate, 
+      event: React.DragEvent<HTMLDivElement>,
+      draggable: any, //Obsidian draggable object
+      type: "file"|"text"|"unknown",
+      payload: {
+        files: TFile[], //TFile[] array of dropped files
+        text: string, //string 
+      },
+      excalidrawFile: TFile, //the file receiving the drop event
+      view: ExcalidrawView, //the excalidraw view receiving the drop
+      pointerPosition: {x:number, y:number} //the pointer position on canvas at the time of drop
+    }):boolean;
+  };
+}
+```
+
--- a/docs/API/canvas_style.md
+++ b/docs/API/canvas_style.md
@@ -12,4 +12,7 @@ String. Valid values are "light" and "dark".
 ### viewBackgroundColor
 String. This is the fill color of an object. [CSS Legal Color Values](https://www.w3schools.com/cssref/css_colors_legal.asp)

-Allowed values are [HTML color names](https://www.w3schools.com/colors/colors_names.asp), hexadecimal RGB strings e.g. `#FF0000` for red, or `transparent`.
+Allowed values are [HTML color names](https://www.w3schools.com/colors/colors_names.asp), hexadecimal RGB strings e.g. `#FF0000` for red, or `transparent`.
+
+### gridSize
+Number. The size of the grid. If set to zero, no grid is displayed.
--- a/docs/API/introduction.md
+++ b/docs/API/introduction.md
@@ -1,6 +1,6 @@
 # [◀ Excalidraw Automate How To](../readme.md)
 ## Introduction to the API
-You can access Excalidraw Automate via the ExcalidrawAutomate object. I recommend starting your Automate scripts with the following code.
+You can access Excalidraw Automate via the ExcalidrawAutomate object. I recommend starting your Automate scripts with the following code:

 *Use CTRL+Shift+V to paste code into Obsidian!*
 ```javascript
@@ -15,11 +15,11 @@ The second line resets ExcalidrawAutomate to defaults. This is important as you
 ### Basic logic of using Excalidraw Automate
 1. Set the styling of the elements you want to draw
 2. Add elements. As you add elements, each new element is added one layer above the previous, thus in case of overlapping objects the later one will be on the top of the prior one.
-3. Call `await ea.create();` to instantiate the drawing
+3. Call `await ea.create();` to instantiate the drawing, or use `ea.setView();` followed by `ea.addElementsToView();` to add your elements to an existing view, or create a PNG or SVG image out of your elements using `await ea.createSVG();` or `await ea.createPNG();`;

-You can change styling between adding different elements. My logic for separating element styling and creation is based on the assumption that you will probably set a stroke color, stroke style, stroke roughness, etc. and draw most of your elements using this. There would be no point in setting all these parameters each time you add an element.
+You can change the styling between adding different elements. My logic for separating element styling and creation is based on the assumption that you will probably set a stroke color, stroke style, stroke roughness, etc. and draw most of your elements using that. There would be no point in setting all these parameters each time you add an element.

-### Before we dive deeper, here are two a simple example scripts
+### Before we dive deeper, here are three a simple example Templater scripts
 #### Create a new drawing with custom name, in a custom folder, using a template
 This simple script gives you significant additional flexibility over Excalidraw Plugin settings to name your drawings, place them into folders, and to apply templates.

@@ -55,4 +55,46 @@ This simple script gives you significant additional flexibility over Excalidraw
 ```
 The script will generate the following drawing:

-![FristDemo](https://user-images.githubusercontent.com/14358394/116825643-6e5a8b00-ab90-11eb-9e3a-37c524620d0d.png)
+![FristDemo](https://user-images.githubusercontent.com/14358394/116825643-6e5a8b00-ab90-11eb-9e3a-37c524620d0d.png)
+
+#### Add a TextElement in a box to an open Excalidraw View. 
+Position the new element under the currently selected element, with an arrow from the selected element to the added text.
+
+*Use CTRL+Shift+V to paste code into Obsidian!*
+```javascript
+<%*
+  const ea = ExcalidrawAutomate;
+  ea.reset();
+  ea.setView("first"); 
+  selectedElement = ea.getViewSelectedElement();
+  ea.setStrokeSharpness(0);
+  const boxPadding = 5;
+  id = ea.addText(
+    selectedElement.x + boxPadding,
+    selectedElement.y+selectedElement.height+100,
+    "[[Next process step]]",
+    {
+      textAlign:"center",
+      box:true,
+      boxPadding:boxPadding,
+      width:selectedElement.width-boxPadding*2,
+    }
+  );
+  ea.setStrokeSharpness(1);
+  ea.style.roughness= 0;
+  ea.connectObjectWithViewSelectedElement(
+    id,
+    "top",
+    "bottom",
+    {
+      numberOfPoints:2,
+      startArrowHead:"arrow",
+      endArrowHead:"dot", 
+      padding:5
+  });
+  ea.addElementsToView();
+%>
+```
+[Click here to view animation](https://user-images.githubusercontent.com/14358394/131967188-2a488e38-f742-49d9-ae98-33238a8d4712.mp4)
+
+
--- a/docs/API/objects.md
+++ b/docs/API/objects.md
@@ -14,7 +14,20 @@ Returns the `id` of the object. The `id` is required when connecting objects wit

 ### addText()
 ```typescript
-addText(topX:number, topY:number, text:string, formatting?:{width?:number, height?:number,textAlign?: string, verticalAlign?:string, box?: boolean, boxPadding?: number},id?:string):string;
+addText( 
+  topX:number, 
+  topY:number, 
+  text:string, 
+  formatting?:{
+    wrapAt?:number, 
+    width?:number, 
+    height?:number,
+    textAlign?:string, 
+    box?: "box"|"blob"|"ellipse"|"diamond", 
+    boxPadding?:number
+  },
+  id?:string
+):string
 ```

 Adds text to the drawing. 
@@ -22,19 +35,21 @@ Adds text to the drawing.
 Formatting parameters are optional:
 - If `width` and `height` are not specified, the function will calculate the width and height based on the fontFamily, the fontSize and the text provided.
 - In case you want to position a text in the center compared to other elements on the drawing, you can provide a fixed height and width, and you can also specify `textAlign` and `verticalAlign` as described above. e.g.: `{width:500, textAlign:"center"}`
- If you want to add a box around the text, set `{box:true}`
+- If you want to add a box around the text, set `{box:"box"|"blob"|"ellipse"|"diamond"}`

-Returns the `id` of the object. The `id` is required when connecting objects with lines. See later. If `{box:true}` then returns the id of the enclosing box.
+Returns the `id` of the object. The `id` is required when connecting objects with lines. See later. If `{box:}` then returns the id of the enclosing box object.

 ### addLine()
 ```typescript
-addLine(points: [[x:number,y:number]]):void
+addLine(points: [[x:number,y:number]]):string
 ```
 Adds a line following the points provided. Must include at least two points `points.length >= 2`. If more than 2 points are provided the interim points will be added as breakpoints. The line will break with angles if `strokeSharpness` is set to "sharp" and will be curvey if it is set to "round".

+Returns the `id` of the object.
+
 ### addArrow()
 ```typescript
-addArrow(points: [[x:number,y:number]],formatting?:{startArrowHead:string,endArrowHead:string,startObjectId:string,endObjectId:string}):void
+addArrow(points: [[x:number,y:number]],formatting?:{startArrowHead?:string,endArrowHead?:string,startObjectId?:string,endObjectId?:string}):string ;
 ```

 Adds an arrow following the points provided. Must include at least two points `points.length >= 2`. If more than 2 points are provided the interim points will be added as breakpoints. The line will break with angles if element `style.strokeSharpness` is set to "sharp" and will be curvey if it is set to "round".
@@ -43,12 +58,14 @@ Adds an arrow following the points provided. Must include at least two points `p

 `startObjectId` and `endObjectId` are the object id's of connected objects. I recommend using `connectObjects` instead calling addArrow() for the purpose of connecting objects.

+Returns the `id` of the object.
+
 ### connectObjects()
 ```typescript
 declare type ConnectionPoint = "top"|"bottom"|"left"|"right";
 connectObjects(objectA: string, connectionA: ConnectionPoint, objectB: string, connectionB: ConnectionPoint, formatting?:{numberOfPoints: number,startArrowHead:string,endArrowHead:string, padding: number}):void
 ```
-Connects two objects with an arrow.
+Connects two objects with an arrow. Will do nothing if either of the two elements is of type `line`, `arrow`, or `freedraw`.

 `objectA` and `objectB` are strings. These are the ids of the objects to connect. These IDs are returned by addRect(), addDiamond(), addEllipse() and addText() when creating those objects.

@@ -60,6 +77,6 @@ Connects two objects with an arrow.

 ### addToGroup()
 ```typescript
-addToGroup(objectIds:[]):void
+addToGroup(objectIds:[]):string
 ```
-Groups objects listed in `objectIds`.
+Groups objects listed in `objectIds`. Returns the `id` of the group.
--- a/docs/API/utility.md
+++ b/docs/API/utility.md
@@ -18,11 +18,24 @@ async toClipboard(templatePath?:string)
 ```
 Places the generated drawing to the clipboard. Useful when you don't want to create a new drawing, but want to paste additional items onto an existing drawing.

+### getElements()
+```typescript
+getElements():ExcalidrawElement[];
+```
+Returns the elements in ExcalidrawAutomate as an array of ExcalidrawElements. This format is usefull when working with ExcalidrawRef.
+
+### getElement()
+```typescript
+getElement(id:string):ExcalidrawElement;
+```
+
+Returns the element object matching the id. If the element does not exist, returns null.
+
 ### create()
 ```typescript
 async create(params?:{filename: string, foldername:string, templatePath:string, onNewPane: boolean})
 ```
-Creates the drawing and opens it.
+Creates the drawing and opens it. Returns the full filepath of the created file.

 `filename` is the filename without extension of the drawing to be created. If `null`, then Excalidraw will generate a filename.

@@ -32,9 +45,30 @@ Creates the drawing and opens it.

 `onNewPane` defines where the new drawing should be created. `false` will open the drawing on the current active leaf. `true` will open the drawing by vertically splitting the current leaf.

+`frontmatterKeys` are the set of frontmatter keys to apply to the document
+  {
+    excalidraw-plugin?: "raw"|"parsed",
+    excalidraw-link-prefix?: string,
+    excalidraw-link-brackets?: boolean,
+    excalidraw-url-prefix?: string
+  }
+
 Example:
 ```javascript
-create({filename:"my drawing", foldername:"myfolder/subfolder/", templatePath: "Excalidraw/template.excalidraw", onNewPane: true});
+create (
+  {
+    filename:"my drawing", 
+    foldername:"myfolder/subfolder/", 
+    templatePath: "Excalidraw/template.excalidraw", 
+    onNewPane: true, 
+    frontmatterKeys: {
+      "excalidraw-plugin": "parsed",
+      "excalidraw-link-prefix": "",
+      "excalidraw-link-brackets": true,
+      "excalidraw-url-prefix": "🌐",
+    }
+  }
+);
 ```
 ### createSVG()
 ```typescript
@@ -46,4 +80,142 @@ Returns an HTML SVGSVGElement containing the generated drawing.
 ```typescript
 async createPNG(templatePath?:string, scale:number=1)
 ```
-Returns a blob containing a PNG image of the generated drawing.
+Returns a blob containing a PNG image of the generated drawing.
+
+### wrapText()
+```typescript
+wrapText(text:string, lineLen:number):string
+```
+Returns a string wrapped to the provided max lineLen.
+
+
+### Accessing the open Excalidraw view
+You first need to initialize targetView, before using any of the view manipulation functions.
+
+#### targetView
+```typescript
+targetView: ExcalidrawView
+```
+The open Excalidraw View configured as the target of the view operations. User `setView` to initialize.
+
+#### setView()
+```typescript
+setView(view:ExcalidrawView|"first"|"active"):ExcalidrawView
+```
+Setting the ExcalidrawView that will be the target of the View operations. Valid `view` input values are:
+- an object instance of ExcalidrawView
+- "first": meaning if there are multiple Excalidraw Views open, pick the first that is returned by `app.workspace.getLeavesOfType("Excalidraw")`
+- "active": meaning the currently active view
+
+#### getExcalidrawAPI()
+```typescript
+getExcalidrawAPI():any
+```
+Returns the native Excalidraw API (ref.current) for the active drawing specified in `targetView`.
+See Excalidraw documentation here: https://www.npmjs.com/package/@excalidraw/excalidraw#ref
+
+#### getViewElements()
+```typescript
+getViewElements():ExcalidrawElement[] 
+```
+
+Returns all the elements from the view.
+
+#### deleteViewElements()
+```typescript
+deleteViewElements(elToDelete: ExcalidrawElement[]):boolean 
+```
+
+Deletes those elements from the view that match the elements provided as the input parameter.
+
+Example to delete the selected elements from the view:
+```typescript
+ea = ExcalidrawAutomate;
+ea.setView("active");
+el = ea.getViewSelectedElements();
+ea.deleteViewElements();
+```
+
+#### getViewSelectedElement()
+```typescript
+getViewSelectedElement():ExcalidrawElement
+```
+
+You first need to set the view calling `setView()`.
+
+If an element is selected in the targetView the function returns the selected element. If multiple elements are selected, either by SHIFT+Clicking to select multiple elements, or by selecting a group, the first of the elements will be selected. If you want to specify which element to select from a group, double click the desired element in the group.
+
+This function is helpful if you want to add a new element in relation to an existing element in your drawing.
+
+#### getViewSelectedElements()
+```typescript
+getViewSelectedElements():ExcalidrawElement[]
+```
+
+You first need to set the view calling `setView()`.
+
+Gets the array of selected elements in the scene. Returns [] if no elements are selected.
+
+Note: you can call `getExcalidrawAPI().getSceneElements()` to retreive all the elements in the scene.
+
+#### viewToggleFullScreen()
+```typescript
+viewToggleFullScreen(forceViewMode?:boolean):void;
+```
+
+Toggles targetView between fullscreen mode and normal mode. By setting forceViewMode to `true` will change Excalidraw mode to View mode. Default is `false`.
+
+The function will do nothing on Obsidian Mobile.
+
+#### connectObjectWithViewSelectedElement()
+```typescript 
+connectObjectWithViewSelectedElement(objectA:string,connectionA: ConnectionPoint, connectionB: ConnectionPoint, formatting?:{numberOfPoints?: number,startArrowHead?:string,endArrowHead?:string, padding?: number}):boolean
+```
+Same as `connectObjects()`, but ObjectB is the currently selected element in the target ExcalidrawView. The function helps with placing an arrow between a newly created object and the selected element in the target ExcalidrawView.
+
+#### addElementsToView()
+```typescript
+async addElementsToView(repositionToCursor:boolean=false, save:boolean=false):Promise<boolean>
+```
+Adds elements created with ExcalidrawAutomate to the target ExcalidrawView.
+`repositionToCursor` dafault is false
+- true: the elements will be moved such that the center point of the elements will be aligned with the current position of the pointer on ExcalidrawView. You can point and place elements to a desired location in your drawing using this switch.
+- false: elements will be positioned as defined by the x&y coordinates of each element.
+
+`save` default is false
+- true: the drawing will be saved after the elements were added.
+- false: the drawing will be saved at the next autosave cycle. Use false when adding multiple elements one after the other. Else, best to use true, to minimize risk of data loss.
+
+### onDropHook
+```typescript
+onDropHook (data: {
+  ea: ExcalidrawAutomate, 
+  event: React.DragEvent<HTMLDivElement>,
+  draggable: any, //Obsidian draggable object
+  type: "file"|"text"|"unknown",
+  payload: {
+    files: TFile[], //TFile[] array of dropped files
+    text: string, //string 
+  },
+  excalidrawFile: TFile, //the file receiving the drop event
+  view: ExcalidrawView, //the excalidraw view receiving the drop
+  pointerPosition: {x:number, y:number} //the pointer position on canvas at the time of drop
+}):boolean;
+```
+
+Callback function triggered when an draggable item is dropped on Excalidraw.
+The function should return a boolean value. True if the drop was handled by the hook and futher native processing should be stopped, and false if Excalidraw should continue with the processing of the drop.
+type of drop can be one of:
+- "file" if a file from Obsidian file explorer is dropped onto Excalidraw. In this case payload.files will contain the list of files dropped.
+- "text" if a link (e.g. url, or wiki link) or other text is dropped. In this case payload.text will contain the received string
+- "unknown" if Excalidraw plugin does not recognize the type of dropped object. In this case you can use React.DragEvent to analysed the dropped object.
+
+Use Templater startup templates or similar to set the Hook function. 
+
+```typescript
+ea = ExcalidrawAutomate;
+ea.onDropHook = (data) => {
+  console.log(data); 
+  return false;
+}
+```
--- a/docs/Examples/dataviewjs_familytree.md
+++ b/docs/Examples/dataviewjs_familytree.md
@@ -59,9 +59,5 @@ function buildMindmap(subtasks, depth, offset, parentObjectID) {
 tasks["objectID"] = ea.addText(width*1.5,width,tasks.text,{box:true, textAlign:"center"});    
 buildMindmap(tasks.subtasks, 2, 0, tasks.objectID);

-(async ()=> {
-  const svg = await ea.createSVG(); 
-  const el=document.querySelector("div.block-language-dataviewjs"); 
-  el.appendChild(svg); 
-})();
+ea.createSVG().then((svg)=>dv.span(svg.outerHTML));
 ```
--- a/docs/Examples/dataviewjs_mindmap.md
+++ b/docs/Examples/dataviewjs_mindmap.md
@@ -52,9 +52,5 @@ function buildMindmap(subtasks, depth, offset, parentObjectID) {
 tasks["objectID"] = ea.addText(0,(tasks.size/2)*height,tasks.text,{box:true});    
 buildMindmap(tasks.subtasks, 1, 0, tasks.objectID);

-(async ()=> {
-  const svg = await ea.createSVG(); 
-  const el=document.querySelector("div.block-language-dataviewjs"); 
-  el.appendChild(svg); 
-})();
+ea.createSVG().then((svg)=>dv.span(svg.outerHTML));
 ```
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-excalidraw-plugin",
 	"name": "Excalidraw",
-	"version": "1.2.12",
+	"version": "1.3.16",
 	"minAppVersion": "0.12.0",
 	"description": "An Obsidian plugin to edit and view Excalidraw drawings",
 	"author": "Zsolt Viczian",
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
  "author": "",
  "license": "MIT",
  "dependencies": {
-    "@zsviczian/excalidraw": "^0.9.0-onTextEditEvents-4",
+    "@zsviczian/excalidraw": "0.9.0-obsidian-image-support-3",
    "monkey-around": "^2.2.0",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
@@ -31,7 +31,7 @@
    "@types/react-dom": "^17.0.8",
    "cross-env": "^7.0.3",
    "nanoid": "^3.1.23",
-    "obsidian": "^0.12.11",
+    "obsidian": "^0.12.16",
    "rollup": "^2.52.3",
    "rollup-plugin-visualizer": "^5.5.0",
    "tslib": "^2.3.0",
--- a/src/ExcalidrawAutomate.ts
+++ b/src/ExcalidrawAutomate.ts
@@ -3,10 +3,10 @@ import {
  FillStyle,
  StrokeStyle,
  StrokeSharpness,
+  ExcalidrawElement,
 } from "@zsviczian/excalidraw/types/element/types";
 import {
  normalizePath,
-  Notice,
  TFile
 } from "obsidian"
 import ExcalidrawView from "./ExcalidrawView";
@@ -14,16 +14,20 @@ import { getJSON } from "./ExcalidrawData";
 import { 
  FRONTMATTER, 
  nanoid, 
-  JSON_parse 
+  JSON_parse, 
+  VIEW_TYPE_EXCALIDRAW,
+  MAX_IMAGE_SIZE
 } from "./constants";
+import { getObsidianImage, wrapText } from "./Utils";
+import { AppState } from "@zsviczian/excalidraw/types/types";

 declare type ConnectionPoint = "top"|"bottom"|"left"|"right";

 export interface ExcalidrawAutomate extends Window {
  ExcalidrawAutomate: {
    plugin: ExcalidrawPlugin;
-    elementIds: [];
-    elementsDict: {},
+    elementsDict: {};
+    imagesDict: {};
    style: {
      strokeColor: string;
      backgroundColor: string;
@@ -41,27 +45,115 @@ export interface ExcalidrawAutomate extends Window {
      startArrowHead: string;
      endArrowHead: string;
    }
-    canvas: {theme: string, viewBackgroundColor: string};
-    setFillStyle(val:number): void;
-    setStrokeStyle(val:number): void;
-    setStrokeSharpness(val:number): void;
-    setFontFamily(val:number): void;
-    setTheme(val:number): void;
-    addToGroup(objectIds:[]):void;
-    toClipboard(templatePath?:string): void;
-    create(params?:{filename: string, foldername:string, templatePath:string, onNewPane: boolean}):Promise<void>;
-    createSVG(templatePath?:string):Promise<SVGSVGElement>;
-    createPNG(templatePath?:string):Promise<any>;
-    addRect(topX:number, topY:number, width:number, height:number):string;
-    addDiamond(topX:number, topY:number, width:number, height:number):string;
-    addEllipse(topX:number, topY:number, width:number, height:number):string;
-    addText(topX:number, topY:number, text:string, formatting?:{width?:number, height?:number,textAlign?: string, verticalAlign?:string, box?: boolean, boxPadding?: number},id?:string):string;
-    addLine(points: [[x:number,y:number]]):void;
-    addArrow(points: [[x:number,y:number]],formatting?:{startArrowHead:string,endArrowHead:string,startObjectId:string,endObjectId:string}):void ;
-    connectObjects(objectA: string, connectionA: ConnectionPoint, objectB: string, connectionB: ConnectionPoint, formatting?:{numberOfPoints: number,startArrowHead:string,endArrowHead:string, padding: number}):void;
-    clear(): void;
-    reset(): void;
-    isExcalidrawFile(f:TFile): boolean;  
+    canvas: {
+      theme: string, 
+      viewBackgroundColor: string, 
+      gridSize: number
+    };
+    setFillStyle (val:number): void;
+    setStrokeStyle (val:number): void;
+    setStrokeSharpness (val:number): void;
+    setFontFamily (val:number): void;
+    setTheme (val:number): void;
+    addToGroup (objectIds:[]):string;
+    toClipboard (templatePath?:string): void;
+    getElements ():ExcalidrawElement[];
+    getElement (id:string):ExcalidrawElement;
+    create (
+      params?: {
+        filename?: string, 
+        foldername?:string, 
+        templatePath?:string, 
+        onNewPane?: boolean,
+        frontmatterKeys?:{
+          "excalidraw-plugin"?: "raw"|"parsed",
+          "excalidraw-link-prefix"?: string,
+          "excalidraw-link-brackets"?: boolean,
+          "excalidraw-url-prefix"?: string
+        }
+      }
+    ):Promise<string>;
+    createSVG (templatePath?:string):Promise<SVGSVGElement>;
+    createPNG (templatePath?:string):Promise<any>;
+    wrapText (text:string, lineLen:number):string;
+    addRect (topX:number, topY:number, width:number, height:number):string;
+    addDiamond (topX:number, topY:number, width:number, height:number):string;
+    addEllipse (topX:number, topY:number, width:number, height:number):string;
+    addBlob (topX:number, topY:number, width:number, height:number):string;
+    addText (
+      topX:number, 
+      topY:number, 
+      text:string, 
+      formatting?: {
+        wrapAt?:number, 
+        width?:number, 
+        height?:number,
+        textAlign?: string, 
+        box?: boolean|"box"|"blob"|"ellipse"|"diamond", 
+        boxPadding?: number
+      },
+      id?:string
+    ):string;
+    addLine(points: [[x:number,y:number]]):string;
+    addArrow (
+      points: [[x:number,y:number]],
+      formatting?: {
+        startArrowHead?:string,
+        endArrowHead?:string,
+        startObjectId?:string,
+        endObjectId?:string
+      }
+    ):string ;
+    addImage(topX:number, topY:number, imageFile: TFile):Promise<string>;
+    connectObjects (
+      objectA: string, 
+      connectionA: ConnectionPoint, 
+      objectB: string, 
+      connectionB: ConnectionPoint, 
+      formatting?: {
+        numberOfPoints?: number,
+        startArrowHead?:string,
+        endArrowHead?:string, 
+        padding?: number
+      }
+    ):void;
+    clear (): void;
+    reset (): void;
+    isExcalidrawFile (f:TFile): boolean;  
+    //view manipulation
+    targetView: ExcalidrawView;
+    setView (view:ExcalidrawView|"first"|"active"):ExcalidrawView;
+    getExcalidrawAPI ():any;
+    getViewElements ():ExcalidrawElement[];
+    deleteViewElements (el: ExcalidrawElement[]):boolean;
+    getViewSelectedElement ():ExcalidrawElement;
+    getViewSelectedElements ():ExcalidrawElement[];
+    viewToggleFullScreen (forceViewMode?:boolean):void;
+    connectObjectWithViewSelectedElement (
+      objectA:string,
+      connectionA: ConnectionPoint, 
+      connectionB: ConnectionPoint, 
+      formatting?: {
+        numberOfPoints?: number,
+        startArrowHead?:string,
+        endArrowHead?:string, 
+        padding?: number
+      }
+    ):boolean;
+    addElementsToView (repositionToCursor:boolean, save:boolean):Promise<boolean>;
+    onDropHook (data: {
+      ea: ExcalidrawAutomate, 
+      event: React.DragEvent<HTMLDivElement>,
+      draggable: any, //Obsidian draggable object
+      type: "file"|"text"|"unknown",
+      payload: {
+        files: TFile[], //TFile[] array of dropped files
+        text: string, //string 
+      },
+      excalidrawFile: TFile, //the file receiving the drop event
+      view: ExcalidrawView, //the excalidraw view receiving the drop
+      pointerPosition: {x:number, y:number} //the pointer position on canvas at the time of drop
+    }):boolean;
  };
 }

@@ -70,8 +162,8 @@ declare let window: ExcalidrawAutomate;
 export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
  window.ExcalidrawAutomate = {
    plugin: plugin,
-    elementIds: [],
    elementsDict: {},
+    imagesDict: {},
    style: {
      strokeColor: "#000000",
      backgroundColor: "transparent",
@@ -87,9 +179,9 @@ export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
      textAlign: "left",
      verticalAlign: "top",
      startArrowHead: null,
-      endArrowHead: "arrow"
+      endArrowHead: "arrow",
    },
-    canvas: {theme: "light", viewBackgroundColor: "#FFFFFF"},
+    canvas: {theme: "light", viewBackgroundColor: "#FFFFFF", gridSize: 0},
    setFillStyle (val:number) {
      switch(val) {
        case 0: 
@@ -149,35 +241,71 @@ export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
          return "dark";
      }      
    },
-    addToGroup(objectIds:[]):void {
+    addToGroup(objectIds:[]):string {
      const id = nanoid();
      objectIds.forEach((objectId)=>{
        this.elementsDict[objectId]?.groupIds?.push(id);
      });
+      return id;
    },
    async toClipboard(templatePath?:string) {
      const template = templatePath ? (await getTemplate(templatePath)) : null;
      let elements = template ? template.elements : [];
-      for (let i=0;i<this.elementIds.length;i++) {
-        elements.push(this.elementsDict[this.elementIds[i]]);
-      }
+      elements = elements.concat(this.getElements());
      navigator.clipboard.writeText(
        JSON.stringify({
          "type":"excalidraw/clipboard",
          "elements": elements,
      }));
    },
-    async create(params?:{filename: string, foldername:string, templatePath:string, onNewPane: boolean}) {
+    getElements():ExcalidrawElement[] {
+      let elements=[];
+      const elementIds = Object.keys(this.elementsDict);
+      for (let i=0;i<elementIds.length;i++) {
+        elements.push(this.elementsDict[elementIds[i]]);
+      }
+      return elements;
+    },
+    getElement(id:string):ExcalidrawElement {
+      return this.elementsDict[id];
+    },
+    async create (
+      params?:{
+        filename?: string, 
+        foldername?:string, 
+        templatePath?:string, 
+        onNewPane?: boolean, 
+        frontmatterKeys?:{
+          "excalidraw-plugin"?: "raw"|"parsed",
+          "excalidraw-link-prefix"?: string,
+          "excalidraw-link-brackets"?: boolean,
+          "excalidraw-url-prefix"?: string
+        }
+      }
+    ):Promise<string> {
      const template = params?.templatePath ? (await getTemplate(params.templatePath)) : null;
      let elements = template ? template.elements : [];
-      for (let i=0;i<this.elementIds.length;i++) {
-        elements.push(this.elementsDict[this.elementIds[i]]);
+      elements = elements.concat(this.getElements());
+      let frontmatter:string;
+      if(params?.frontmatterKeys) {
+        const keys = Object.keys(params.frontmatterKeys);
+        if(!keys.includes("excalidraw-plugin")) {
+          params.frontmatterKeys["excalidraw-plugin"] = "parsed";
+        }
+        frontmatter = "---\n\n";
+        for(const key of Object.keys(params.frontmatterKeys)) {
+          //@ts-ignore
+          frontmatter += key + ": " + (params.frontmatterKeys[key]==="" ? '""' : params.frontmatterKeys[key]) +"\n";  
+        }
+        frontmatter += "\n---\n";        
+      } else {
+        frontmatter = template?.frontmatter ? template.frontmatter : FRONTMATTER;
      }
-      plugin.createDrawing(
+      return plugin.createDrawing(
        params?.filename ? params.filename + '.excalidraw.md' : this.plugin.getNextDefaultFilename(),
        params?.onNewPane ? params.onNewPane : false,
        params?.foldername ? params.foldername : this.plugin.settings.folder,
-        FRONTMATTER + exportSceneToMD(
+        frontmatter + plugin.exportSceneToMD(
        JSON.stringify({
          type: "excalidraw",
          version: 2,
@@ -200,6 +328,7 @@ export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
            currentItemStartArrowhead: template? template.appState.currentItemStartArrowhead: this.style.startArrowHead,
            currentItemEndArrowhead: template? template.appState.currentItemEndArrowhead : this.style.endArrowHead,
            currentItemLinearStrokeSharpness: template? template.appState.currentItemLinearStrokeSharpness : this.style.strokeSharpness,
+            gridSize: template ? template.appState.gridSize : this.canvas.gridSize
          }
        }))
      );  
@@ -207,9 +336,7 @@ export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
    async createSVG(templatePath?:string):Promise<SVGSVGElement> {
      const template = templatePath ? (await getTemplate(templatePath)) : null;
      let elements = template ? template.elements : [];
-      for (let i=0;i<this.elementIds.length;i++) {
-        elements.push(this.elementsDict[this.elementIds[i]]);
-      }
+      elements = elements.concat(this.getElements());
      return await ExcalidrawView.getSVG(
        {//createDrawing
          "type": "excalidraw",
@@ -230,9 +357,7 @@ export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
    async createPNG(templatePath?:string, scale:number=1) {
      const template = templatePath ? (await getTemplate(templatePath)) : null;
      let elements = template ? template.elements : [];
-      for (let i=0;i<this.elementIds.length;i++) {
-        elements.push(this.elementsDict[this.elementIds[i]]);
-      }
+      elements = elements.concat(this.getElements());
      return ExcalidrawView.getPNG(
        { 
          "type": "excalidraw",
@@ -251,53 +376,115 @@ export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
        scale
      )  
    },
+    wrapText(text:string, lineLen:number):string {
+      return wrapText(text,lineLen,this.plugin.settings.forceWrap);
+    },
    addRect(topX:number, topY:number, width:number, height:number):string {
      const id = nanoid();
-      this.elementIds.push(id);
      this.elementsDict[id] = boxedElement(id,"rectangle",topX,topY,width,height);
      return id;
    },
    addDiamond(topX:number, topY:number, width:number, height:number):string {
      const id = nanoid();
-      this.elementIds.push(id);
      this.elementsDict[id] = boxedElement(id,"diamond",topX,topY,width,height);
      return id;
    },
    addEllipse(topX:number, topY:number, width:number, height:number):string {
      const id = nanoid();
-      this.elementIds.push(id);
      this.elementsDict[id] = boxedElement(id,"ellipse",topX,topY,width,height);
      return id;
-    },
-    addText(topX:number, topY:number, text:string, formatting?:{width?:number, height?:number,textAlign?: string, verticalAlign?:string, box?: boolean, boxPadding?: number},id?:string):string {
-      if(!id) id = nanoid();    
+    }, 
+    addBlob(topX:number, topY:number, width:number, height:number):string {
+      const b = height*0.5; //minor axis of the ellipsis
+      const a = width*0.5; //major axis of the ellipsis
+      const sx = a/9; 
+      const sy = b*0.8;
+      const step = 6;
+      let p:any = [];
+      const pushPoint = (i:number,dir:number) => {
+          const x = i + Math.random()*sx-sx/2;
+          p.push([x+Math.random()*sx-sx/2+(i%2)*sx/6+topX,dir*Math.sqrt(b*b*(1-(x*x)/(a*a)))+Math.random()*sy-sy/2+(i%2)*sy/6+topY]);
+      }
+      let i:number;
+      for (i=-a+sx/2;i<=a-sx/2;i+=a/step) {
+        pushPoint(i,1);
+      }
+      for(i=a-sx/2;i>=-a+sx/2;i-=a/step) {
+        pushPoint(i,-1);
+      }
+      p.push(p[0]);
+      const scale = (p:[[x:number,y:number]]):[[x:number,y:number]] => {
+        const box = getLineBox(p);
+        const scaleX = width/box.w;
+        const scaleY = height/box.h;
+        let i;
+        for(i=0;i<p.length;i++) {
+          let [x,y] = p[i];
+          x = (x-box.x)*scaleX+box.x;
+          y = (y-box.y)*scaleY+box.y;
+          p[i]=[x,y]
+        }
+        return p;
+      }
+      const id=this.addLine(scale(p));
+      this.elementsDict[id]=repositionElementsToCursor([this.getElement(id)],{x:topX,y:topY},false)[0];
+      return id;
+    }, 
+    addText( 
+      topX:number, 
+      topY:number, 
+      text:string, 
+      formatting?:{
+        wrapAt?:number, 
+        width?:number, 
+        height?:number,
+        textAlign?:string, 
+        box?: boolean|"box"|"blob"|"ellipse"|"diamond", 
+        boxPadding?:number
+      },
+      id?:string
+    ):string {
+      id = id ?? nanoid();
+      text = (formatting?.wrapAt) ? this.wrapText(text,formatting.wrapAt):text;
      const {w, h, baseline} = measureText(text, this.style.fontSize,this.style.fontFamily);
      const width = formatting?.width ? formatting.width : w;
      const height = formatting?.height ? formatting.height : h;
-      this.elementIds.push(id);
+      
+      let boxId:string = null;
+      const boxPadding = formatting?.boxPadding ?? 10;
+      if(formatting?.box) {
+        switch(formatting?.box) {
+          case "ellipse":
+            boxId = this.addEllipse(topX-boxPadding,topY-boxPadding,width+2*boxPadding,height+2*boxPadding);
+            break;
+          case "diamond":
+            boxId = this.addDiamond(topX-boxPadding,topY-boxPadding,width+2*boxPadding,height+2*boxPadding);
+            break;
+          case "blob":
+            boxId = this.addBlob(topX-boxPadding,topY-boxPadding,width+2*boxPadding,height+2*boxPadding);
+            break;
+          default: 
+            boxId = this.addRect(topX-boxPadding,topY-boxPadding,width+2*boxPadding,height+2*boxPadding);
+        }       
+      }
      this.elementsDict[id] = {
        text: text,
        fontSize: window.ExcalidrawAutomate.style.fontSize,
        fontFamily: window.ExcalidrawAutomate.style.fontFamily,
        textAlign: formatting?.textAlign ? formatting.textAlign : window.ExcalidrawAutomate.style.textAlign,
-        verticalAlign: formatting?.verticalAlign ? formatting.verticalAlign : window.ExcalidrawAutomate.style.verticalAlign,
+        verticalAlign: window.ExcalidrawAutomate.style.verticalAlign,
        baseline: baseline,
        ... boxedElement(id,"text",topX,topY,width,height)
      };
-      if(formatting?.box) {
-        const boxPadding = formatting?.boxPadding ? formatting.boxPadding : 10;
-        const boxId = this.addRect(topX-boxPadding,topY-boxPadding,width+2*boxPadding,height+2*boxPadding);
-        this.addToGroup([id,boxId])
-        return boxId; 
-      }
-      return id;
+      if (boxId) this.addToGroup([id,boxId])
+      return boxId ?? id;
    },
-    addLine(points: [[x:number,y:number]]):void {
+    addLine(points: [[x:number,y:number]]):string {
      const box = getLineBox(points);
      const id = nanoid();
-      this.elementIds.push(id);
+      //this.elementIds.push(id);
      this.elementsDict[id] = {
-        points: normalizeLinePoints(points),
+        points: normalizeLinePoints(points,box),
        lastCommittedPoint: null,
        startBinding: null,
        endBinding: null,
@@ -305,13 +492,14 @@ export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
        endArrowhead: null,
        ... boxedElement(id,"line",box.x,box.y,box.w,box.h)
      };
+      return id;
    },
-    addArrow(points: [[x:number,y:number]],formatting?:{startArrowHead:string,endArrowHead:string,startObjectId:string,endObjectId:string}):void {
+    addArrow(points: [[x:number,y:number]],formatting?:{startArrowHead?:string,endArrowHead?:string,startObjectId?:string,endObjectId?:string}):string {
      const box = getLineBox(points);
      const id = nanoid();
-      this.elementIds.push(id);
+      //this.elementIds.push(id);
      this.elementsDict[id] = {
-        points: normalizeLinePoints(points),
+        points: normalizeLinePoints(points,box),
        lastCommittedPoint: null,
        startBinding: {elementId:formatting?.startObjectId,focus:0.1,gap:4},
        endBinding: {elementId:formatting?.endObjectId,focus:0.1,gap:4},
@@ -319,13 +507,45 @@ export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
        endArrowhead: formatting?.endArrowHead ? formatting.endArrowHead : this.style.endArrowHead,
        ... boxedElement(id,"arrow",box.x,box.y,box.w,box.h)
      };
-      if(formatting?.startObjectId) this.elementsDict[formatting.startObjectId].boundElementIds.push(id);
-      if(formatting?.endObjectId) this.elementsDict[formatting.endObjectId].boundElementIds.push(id);
+      if(formatting?.startObjectId) {
+        if(!this.elementsDict[formatting.startObjectId].boundElementIds) this.elementsDict[formatting.startObjectId].boundElementIds = [];
+        this.elementsDict[formatting.startObjectId].boundElementIds.push(id);
+      }
+      if(formatting?.endObjectId) {
+        if(!this.elementsDict[formatting.endObjectId].boundElementIds) this.elementsDict[formatting.endObjectId].boundElementIds = [];
+        this.elementsDict[formatting.endObjectId].boundElementIds.push(id);
+      }
+      return id;
    },
-    connectObjects(objectA: string, connectionA: ConnectionPoint, objectB: string, connectionB: ConnectionPoint, formatting?:{numberOfPoints: number,startArrowHead:string,endArrowHead:string, padding: number}):void {
+    async addImage(topX:number, topY:number, imageFile: TFile):Promise<string> {
+      const id = nanoid();
+      const image = await getObsidianImage(this.plugin.app,imageFile);
+      if(!image) return null;
+      this.imagesDict[image.imageId] = {
+        type:"image",
+        id: image.imageId,
+        dataURL: image.dataURL
+      }
+      if (Math.max(image.size.width,image.size.height) > MAX_IMAGE_SIZE) {
+        const scale = MAX_IMAGE_SIZE/Math.max(image.size.width,image.size.height);
+        image.size.width = scale*image.size.width;
+        image.size.height = scale*image.size.height;
+      }
+      this.elementsDict[id] = boxedElement(id,"image",topX,topY,image.size.width,image.size.height);
+      this.elementsDict[id].imageId = image.imageId;
+      this.elementsDict[id].scale = [1,1];
+      return id;
+    },
+    connectObjects(objectA: string, connectionA: ConnectionPoint, objectB: string, connectionB: ConnectionPoint, formatting?:{numberOfPoints?: number,startArrowHead?:string,endArrowHead?:string, padding?: number}):void {
      if(!(this.elementsDict[objectA] && this.elementsDict[objectB])) {
        return;
      }
+
+      if(["line","arrow","freedraw"].includes(this.elementsDict[objectA].type) ||
+         ["line","arrow","freedraw"].includes(this.elementsDict[objectB].type)) {
+        return;
+      }
+
      const padding = formatting?.padding ? formatting.padding : 10;
      const numberOfPoints = formatting?.numberOfPoints ? formatting.numberOfPoints : 0;
      const getSidePoints = (side:string, el:any) => {
@@ -354,8 +574,8 @@ export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
      });
    },
    clear() {
-      this.elementIds = [];
      this.elementsDict = {};
+      this.imagesDict = {};
    },
    reset() {
      this.clear();
@@ -376,11 +596,119 @@ export async function initExcalidrawAutomate(plugin: ExcalidrawPlugin) {
      this.style.endArrowHead= "arrow";
      this.canvas.theme = "light";
      this.canvas.viewBackgroundColor="#FFFFFF";
+      this.canvas.gridSize = 0;
    },
    isExcalidrawFile(f:TFile):boolean {
      return this.plugin.isExcalidrawFile(f);
-    }
-  
+    },
+    targetView: null,
+    setView(view:ExcalidrawView|"first"|"active"):ExcalidrawView {
+      if(view == "active") {
+        const v = this.plugin.app.workspace.activeLeaf.view;
+        if(!(v instanceof ExcalidrawView)) return;
+        this.targetView = v;
+      }
+      if(view == "first") {
+        const leaves = this.plugin.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
+        if(!leaves || leaves.length == 0) return;
+        this.targetView = (leaves[0].view as ExcalidrawView);
+      }
+      if(view instanceof ExcalidrawView) this.targetView = view;
+      return this.targetView;
+    },
+    getExcalidrawAPI():any {
+      if (!this.targetView || !this.targetView?._loaded) {
+        errorMessage("targetView not set", "getExcalidrawAPI()");
+        return null;
+      }
+      return (this.targetView as ExcalidrawView).excalidrawRef.current;
+    },
+    getViewElements ():ExcalidrawElement[] { 
+      if (!this.targetView || !this.targetView?._loaded) {
+        errorMessage("targetView not set", "getViewSelectedElements()");
+        return [];
+      }
+      const current = this.targetView?.excalidrawRef?.current;
+      if(!current) return [];
+      return current?.getSceneElements();
+    },
+    deleteViewElements (elToDelete: ExcalidrawElement[]):boolean {
+      if (!this.targetView || !this.targetView?._loaded) {
+        errorMessage("targetView not set", "getViewSelectedElements()");
+        return false;
+      }
+      const current = this.targetView?.excalidrawRef?.current;
+      if(!current) return false;
+      const el: ExcalidrawElement[] = current.getSceneElements();
+      const st: AppState = current.getAppState();
+      current.updateScene({
+        elements: el.filter((e:ExcalidrawElement)=>!elToDelete.includes(e)),
+        appState: st,
+        commitToHistory: true,
+      });
+      this.targetView.save(); 
+      return true;
+    },
+    getViewSelectedElement():any {      
+      const elements = this.getViewSelectedElements();
+      return elements ? elements[0] : null;
+    },
+    getViewSelectedElements():any[] {
+      if (!this.targetView || !this.targetView?._loaded) {
+        errorMessage("targetView not set", "getViewSelectedElements()");
+        return [];
+      }
+      const current = this.targetView?.excalidrawRef?.current;
+      const selectedElements = current?.getAppState()?.selectedElementIds;
+      if(!selectedElements) return [];
+      const selectedElementsKeys = Object.keys(selectedElements);
+      if(!selectedElementsKeys) return [];     
+      return current.getSceneElements().filter((e:any)=>selectedElementsKeys.includes(e.id));
+    },
+    viewToggleFullScreen(forceViewMode:boolean = false):void {
+      if (this.plugin.app.isMobile) {
+        errorMessage("mobile not supported", "viewToggleFullScreen()");
+        return;
+      }
+      if (!this.targetView || !this.targetView?._loaded) {
+        errorMessage("targetView not set", "viewToggleFullScreen()");
+        return;
+      }
+      if(forceViewMode){
+        const ref = this.getExcalidrawAPI();
+        ref.updateScene({
+          elements: ref.getSceneElements(),
+          appState: { 
+            viewModeEnabled: true,
+            ...  ref.appState, 
+          },
+          commitToHistory: false,
+        });
+      } 
+      if(document.fullscreenElement === (this.targetView as ExcalidrawView).contentEl) {
+        document.exitFullscreen();
+      } else {
+        (this.targetView as ExcalidrawView).contentEl.requestFullscreen();
+      }
+    },
+    connectObjectWithViewSelectedElement(objectA:string,connectionA: ConnectionPoint, connectionB: ConnectionPoint, formatting?:{numberOfPoints?: number,startArrowHead?:string,endArrowHead?:string, padding?: number}):boolean {
+      const el = this.getViewSelectedElement();
+      if(!el) return false;
+      const id = el.id;
+      this.elementsDict[id] = el;
+      this.connectObjects(objectA,connectionA,id,connectionB,formatting);
+      delete this.elementsDict[id];
+      return true;
+    },
+    async addElementsToView(repositionToCursor:boolean = false, save:boolean=false):Promise<boolean> {
+      if (!this.targetView || !this.targetView?._loaded) {
+        errorMessage("targetView not set", "addElementsToView()");
+        return false;
+      }
+      const elements = this.getElements();
+      return await this.targetView.addElements(elements,repositionToCursor,save,this.imagesDict);
+    },
+    onDropHook:null,
  };
  await initFonts();
 }
@@ -389,10 +717,10 @@ export function destroyExcalidrawAutomate() {
  delete window.ExcalidrawAutomate;
 }

-function normalizeLinePoints(points:[[x:number,y:number]]) {
+function normalizeLinePoints(points:[[x:number,y:number]],box:{x:number,y:number,w:number,h:number}) {
  let p = [];
  for(let i=0;i<points.length;i++) {
-    p.push([points[i][0]-points[0][0], points[i][1]-points[0][1]]);
+    p.push([points[i][0]-box.x, points[i][1]-box.y]);
  }
  return p;
 }
@@ -424,11 +752,12 @@ function boxedElement(id:string,eltype:any,x:number,y:number,w:number,h:number)
 }

 function getLineBox(points: [[x:number,y:number]]) {
+  const [x1,y1,x2,y2] = estimateLineBound(points);
  return {
-    x: points[0][0],
-    y: points[0][1],
-    w: Math.abs(points[points.length-1][0]-points[0][0]),
-    h: Math.abs(points[points.length-1][1]-points[0][1])
+    x: x1,
+    y: y1,
+    w: x2-x1, //Math.abs(points[points.length-1][0]-points[0][0]),
+    h: y2-y1  //Math.abs(points[points.length-1][1]-points[0][1])
  }
 }

@@ -475,47 +804,95 @@ export function measureText (newText:string, fontSize:number, fontFamily:number)
  return {w: width, h: height, baseline: baseline };
 };

-async function getTemplate(fileWithPath: string):Promise<{elements: any,appState: any}> {
-  const vault = window.ExcalidrawAutomate.plugin.app.vault;
-  const file = vault.getAbstractFileByPath(normalizePath(fileWithPath));
+async function getTemplate(fileWithPath: string):Promise<{elements: any,appState: any, frontmatter: string}> {
+  const app = window.ExcalidrawAutomate.plugin.app;
+  const vault = app.vault;
+  const file = app.metadataCache.getFirstLinkpathDest(normalizePath(fileWithPath),'');
  if(file && file instanceof TFile) {
    const data = await vault.read(file);
-    const excalidrawData = JSON_parse(getJSON(data));
+
+    let trimLocation = data.search("# Text Elements\n");
+    if(trimLocation == -1) trimLocation = data.search("# Drawing\n");
+
+    const excalidrawData = JSON_parse(getJSON(data)[0]);
    return {
      elements: excalidrawData.elements,
      appState: excalidrawData.appState,  
+      frontmatter: data.substring(0,trimLocation)
    };
  };
  return {
    elements: [],
    appState: {},
+    frontmatter: null
  }
 }

-/**
- * Extracts the text elements from an Excalidraw scene into a string of ids as headers followed by the text contents
- * @param {string} data - Excalidraw scene JSON string
- * @returns {string} - Text starting with the "# Text Elements" header and followed by each "## id-value" and text
- */
- export function exportSceneToMD(data:string): string {
-  if(!data) return "";
-  const excalidrawData = JSON_parse(data);
-  const textElements = excalidrawData.elements?.filter((el:any)=> el.type=="text")
-  let outString = '# Text Elements\n';
-  let id:string;
-  for (const te of textElements) {
-    id = te.id;
-    //replacing Excalidraw text IDs with my own, because default IDs may contain 
-    //characters not recognized by Obsidian block references
-    //also Excalidraw IDs are inconveniently long
-    if(te.id.length>8) {  
-      id=nanoid();
-      data = data.replaceAll(te.id,id); //brute force approach to replace all occurances.
-    }
-    outString += te.text+' ^'+id+'\n\n';
+function estimateLineBound(points:any):[number,number,number,number] {
+  let minX = Infinity;
+  let maxX = -Infinity;
+  let minY = Infinity;
+  let maxY = -Infinity;
+  points.forEach((p:any) => {
+    const [x,y] = p;
+    minX = Math.min(minX, x);
+    minY = Math.min(minY, y);
+    maxX = Math.max(maxX, x);
+    maxY = Math.max(maxY, y);
+  });
+  return[minX,minY,maxX,maxY];
+}
+
+export function estimateElementBounds (element:ExcalidrawElement):[number,number,number,number] {
+  if(element.type=="line" || element.type=="arrow") {
+    const [minX,minY,maxX,maxY] = estimateLineBound(element.points);
+    return [minX+element.x,minY+element.y,maxX+element.x,maxY+element.y];
  }
-  return outString + '# Drawing\n'
-         + String.fromCharCode(96)+String.fromCharCode(96)+String.fromCharCode(96)+'json\n' 
-         + data + '\n'
-         + String.fromCharCode(96)+String.fromCharCode(96)+String.fromCharCode(96);
-}
+  return[element.x,element.y,element.x+element.width,element.y+element.height];
+} 
+
+export function estimateBounds (elements:ExcalidrawElement[]):[number,number,number,number] {
+  if(!elements.length) return [0,0,0,0];
+  let minX = Infinity;
+  let maxX = -Infinity;
+  let minY = Infinity;
+  let maxY = -Infinity;
+
+  elements.forEach((element)=>{
+    const [x1,y1,x2,y2] = estimateElementBounds(element);
+    minX = Math.min(minX, x1);
+    minY = Math.min(minY, y1);
+    maxX = Math.max(maxX, x2);
+    maxY = Math.max(maxY, y2);
+  });
+  return [minX,minY,maxX,maxY];
+}
+
+export function repositionElementsToCursor (elements:ExcalidrawElement[],newPosition:{x:number, y:number},center:boolean=false):ExcalidrawElement[] {
+  const [x1,y1,x2,y2] = estimateBounds(elements);
+  let [offsetX,offsetY] = [0,0];
+  if (center) {
+    [offsetX,offsetY] = [newPosition.x-(x1+x2)/2,newPosition.y-(y1+y2)/2];
+  } else {
+    [offsetX,offsetY] = [newPosition.x-x1,newPosition.y-y1];
+  }
+
+  elements.forEach((element:any)=>{ //using any so I can write read-only propery x & y
+    element.x=element.x+offsetX;
+    element.y=element.y+offsetY;
+  });
+  return elements;
+}
+
+function errorMessage(message: string, source: string) {
+  switch(message) {
+    case "targetView not set": 
+      console.log(source, "ExcalidrawAutomate: targetView not set, or no longer active. Use setView before calling this function");
+      break;
+    case "mobile not supported":
+      console.log(source, "ExcalidrawAutomate: this function is not avalable on Obsidian Mobile");
+      break;
+    default:
+      console.log(source, "ExcalidrawAutomate: unknown error");
+  }
+}
--- a/src/ExcalidrawData.ts
+++ b/src/ExcalidrawData.ts
@@ -3,45 +3,84 @@ import {
  nanoid,
  FRONTMATTER_KEY_CUSTOM_PREFIX,
  FRONTMATTER_KEY_CUSTOM_LINK_BRACKETS,
+  FRONTMATTER_KEY_CUSTOM_URL_PREFIX,
 } from "./constants";
 import { measureText } from "./ExcalidrawAutomate";
 import ExcalidrawPlugin from "./main";
-import { ExcalidrawSettings } from "./settings";
 import {  
  JSON_parse
 } from "./constants";
-import { ExcalidrawTextElement } from "@zsviczian/excalidraw/types/element/types";
-import { rawListeners } from "process";
 import { TextMode } from "./ExcalidrawView";
-import { link } from "fs";
+import { wrapText } from "./Utils";

-const DRAWING_REG = /\n# Drawing\n(```json\n)?(.*)(```)?/gm;

-//![[link|alias]]![alias](link)
-//1  2    3      4 5      6
-export const REG_LINK_BACKETS = /(!)?\[\[([^|\]]+)\|?(.+)?]]|(!)?\[(.*)\]\((.*)\)/g;
+declare module "obsidian" {
+  interface MetadataCache {
+    blockCache: {
+      getForFile(x:any,f:TAbstractFile):any;
+    }
+  }
+}

-export function getJSON(data:string):string {
-  const res = data.matchAll(DRAWING_REG);
-  const parts = res.next();
+export const REGEX_LINK = {
+  //![[link|alias]] [alias](link){num}
+  //      1  2     3           4        5      6  7     8  9
+  EXPR: /(!)?(\[\[([^|\]]+)\|?(.+)?]]|\[(.*)\]\((.*)\))(\{(\d+)\})?/g,
+  isTransclusion: (parts: IteratorResult<RegExpMatchArray, any>):boolean => {
+    return parts.value[1] ? true:false;
+  },
+  getLink: (parts: IteratorResult<RegExpMatchArray, any>):string => {
+    return parts.value[3] ? parts.value[3] : parts.value[6];
+  },
+  isWikiLink: (parts: IteratorResult<RegExpMatchArray, any>):boolean => {
+    return parts.value[3] ? true:false;
+  },
+  getAliasOrLink: (parts: IteratorResult<RegExpMatchArray, any>):string => {
+    return REGEX_LINK.isWikiLink(parts)
+           ? (parts.value[4] ? parts.value[4] : parts.value[3]) 
+           : (parts.value[5] ? parts.value[5] : parts.value[6]);
+  },
+  getWrapLength: (parts: IteratorResult<RegExpMatchArray, any>):number => {
+    return parts.value[8];
+  }
+}
+
+
+export const REG_LINKINDEX_HYPERLINK = /^\w+:\/\//;
+
+const DRAWING_REG = /\n%%\n# Drawing\n(```json\n)(.*)\n```%%/gm;
+const DRAWING_REG_FALLBACK = /\n# Drawing\n(```json\n)?(.*)(```)?(%%)?/gm;
+export function getJSON(data:string):[string,number] {
+  let res = data.matchAll(DRAWING_REG);
+
+  //In case the user adds a text element with the contents "# Drawing\n"
+  let parts;
+  parts = res.next();
+  if(parts.done) { //did not find a match
+    res = data.matchAll(DRAWING_REG_FALLBACK);
+    parts = res.next();
+  }
  if(parts.value && parts.value.length>1) {
    const result = parts.value[2];
-    return result.substr(0,result.lastIndexOf("}")+1); //this is a workaround in case sync merges two files together and one version is still an old version without the ```codeblock
+    return [result.substr(0,result.lastIndexOf("}")+1),parts.value.index]; //this is a workaround in case sync merges two files together and one version is still an old version without the ```codeblock
  }
-  return data;
+  return [data,parts.value.index];
 }

 export class ExcalidrawData {
  private textElements:Map<string,{raw:string, parsed:string}> = null; 
  public scene:any = null;
  private file:TFile = null;
-  private settings:ExcalidrawSettings;
  private app:App;
  private showLinkBrackets: boolean;
  private linkPrefix: string;
+  private urlPrefix: string;
  private textMode: TextMode = TextMode.raw;
+  private plugin: ExcalidrawPlugin;
+  public loaded: boolean = false;
+
  constructor(plugin: ExcalidrawPlugin) {
-    this.settings = plugin.settings;
+    this.plugin = plugin;
    this.app = plugin.app;
  }  

@@ -51,7 +90,7 @@ export class ExcalidrawData {
   * @returns {boolean} - true if file was loaded, false if there was an error
   */
  public async loadData(data: string,file: TFile, textMode:TextMode):Promise<boolean> {
-
+    this.loaded = false;
    this.file = file;
    this.textElements = new Map<string,{raw:string, parsed:string}>();

@@ -59,9 +98,15 @@ export class ExcalidrawData {
    //The drawing will use these values until next drawing is loaded or this drawing is re-loaded
    this.setShowLinkBrackets();
    this.setLinkPrefix();  
+    this.setUrlPrefix();
    
    this.scene = null;
-    if (this.settings.syncExcalidraw) {
+
+    //In compatibility mode if the .excalidraw file was more recently updated than the .md file, then the .excalidraw file
+    //should be loaded as the scene.
+    //This feature is mostly likely only relevant to people who use Obsidian and Logseq on the same vault and edit .excalidraw
+    //drawings in Logseq.
+    if (this.plugin.settings.syncExcalidraw) {
      const excalfile = file.path.substring(0,file.path.lastIndexOf('.md')) + '.excalidraw';
      const f = this.app.vault.getAbstractFileByPath(excalfile);
      if(f && f instanceof TFile && f.stat.mtime>file.stat.mtime) { //the .excalidraw file is newer then the .md file
@@ -71,27 +116,39 @@ export class ExcalidrawData {
    }

    //Load scene: Read the JSON string after "# Drawing" 
-    let parts = data.matchAll(DRAWING_REG).next();
-    if(!(parts.value && parts.value.length>1)) return false; //JSON not found or invalid
-    if(!this.scene) { //scene was not loaded from .excalidraw
-      const scene = parts.value[2];
-      this.scene = JSON_parse(scene.substr(0,scene.lastIndexOf("}")+1)); //this is a workaround to address when files are mereged by sync and one version is still an old markdown without the codeblock ```
+    const [scene,pos] = getJSON(data);
+    if (pos === -1) {
+      return false; //JSON not found
    }
-    //Trim data to remove the JSON string
-    data = data.substring(0,parts.value.index);
+    if (!this.scene) {
+      this.scene = JSON_parse(scene); //this is a workaround to address when files are mereged by sync and one version is still an old markdown without the codeblock ```
+    }
+    data = data.substring(0,pos);

-    //The Markdown # Text Elements take priority over the JSON text elements. 
-    //i.e. if the JSON is modified to reflect the MD in case of difference
+    //The Markdown # Text Elements take priority over the JSON text elements. Assuming the scenario in which the link was updated due to filename changes
+    //The .excalidraw JSON is modified to reflect the MD in case of difference
    //Read the text elements into the textElements Map
-    let position = data.search("# Text Elements");
-    if(position==-1) return true; //Text Elements header does not exist
-    position += "# Text Elements\n".length;
+    let position = data.search(/(^%%\n)?# Text Elements\n/m);
+    if(position==-1) {
+      await this.setTextMode(textMode,false);  
+      this.loaded = true;
+      return true; //Text Elements header does not exist
+    }
+    position += data.match(/((^%%\n)?# Text Elements\n)/m)[0].length
    
+    //iterating through all the text elements in .md
+    //Text elements always contain the raw value
    const BLOCKREF_LEN:number = " ^12345678\n\n".length;
-    const res = data.matchAll(/\s\^(.{8})\n/g);
+    const res = data.matchAll(/\s\^(.{8})[\n]+/g);
+    let parts;
    while(!(parts = res.next()).done) {
      const text = data.substring(position,parts.value.index);
-      this.textElements.set(parts.value[1],{raw: text, parsed: await this.parse(text)});
+      const id:string = parts.value[1];
+      this.textElements.set(id,{raw: text, parsed: await this.parse(text)});
+      //this will set the rawText field of text elements imported from files before 1.3.14, and from other instances of Excalidraw
+      const textEl = this.scene.elements.filter((el:any)=>el.id===id)[0];
+      if(textEl && (!textEl.rawText || textEl.rawText === "")) textEl.rawText = text; 
+
      position = parts.value.index + BLOCKREF_LEN;  
    }

@@ -99,6 +156,7 @@ export class ExcalidrawData {
    //e.g. if the entire text elements section was deleted.
    this.findNewTextElementsInScene();
    await this.setTextMode(textMode,true);
+    this.loaded = true;
    return true;
  }

@@ -107,9 +165,10 @@ export class ExcalidrawData {
    this.textElements = new Map<string,{raw:string, parsed:string}>();
    this.setShowLinkBrackets();
    this.setLinkPrefix(); 
+    this.setUrlPrefix();
    this.scene = JSON.parse(data);
    this.findNewTextElementsInScene();
-    await this.setTextMode(TextMode.raw,true);
+    await this.setTextMode(TextMode.raw,true); //legacy files are always displayed in raw mode.
    return true;
  }

@@ -118,6 +177,17 @@ export class ExcalidrawData {
    await this.updateSceneTextElements(forceupdate);
  }

+  //update a single text element in the scene if the newText is different
+  public updateTextElement(sceneTextElement:any, newText:string, forceUpdate:boolean = false) {
+    if(forceUpdate || newText!=sceneTextElement.text) {
+      const measure = measureText(newText,sceneTextElement.fontSize,sceneTextElement.fontFamily);
+      sceneTextElement.text = newText;
+      sceneTextElement.width = measure.w;
+      sceneTextElement.height = measure.h;
+      sceneTextElement.baseline = measure.baseline;
+    }
+  }
+
  /**
   * Updates the TextElements in the Excalidraw scene based on textElements MAP in ExcalidrawData
   * Depending on textMode, TextElements will receive their raw or parsed values
@@ -125,23 +195,11 @@ export class ExcalidrawData {
   * correct sizing issues
   */
  private async updateSceneTextElements(forceupdate:boolean=false) {
-
-    //update a single text element in the scene if the newText is different
-    const update = (sceneTextElement:any, newText:string) => {
-      if(forceupdate || newText!=sceneTextElement.text) {
-        const measure = measureText(newText,sceneTextElement.fontSize,sceneTextElement.fontFamily);
-        sceneTextElement.text = newText;
-        sceneTextElement.width = measure.w;
-        sceneTextElement.height = measure.h;
-        sceneTextElement.baseline = measure.baseline;
-      }
-    }
-
    //update text in scene based on textElements Map
    //first get scene text elements
    const texts = this.scene.elements?.filter((el:any)=> el.type=="text")
    for (const te of texts) {
-      update(te,await this.getText(te.id)); 
+      this.updateTextElement(te,await this.getText(te.id),forceupdate); 
    }
  }

@@ -184,16 +242,17 @@ export class ExcalidrawData {
      if(te.id.length > 8 && this.textElements.has(te.id)) { //element was created with onBeforeTextSubmit
        const element = this.textElements.get(te.id);
        this.textElements.set(id,{raw: element.raw, parsed: element.parsed})
-        this.textElements.delete(te.id);
+        this.textElements.delete(te.id); //delete the old ID from the Map
        dirty = true;
      } else if(!this.textElements.has(id)) {
        dirty = true;
-        this.textElements.set(id,{raw: te.text, parsed: null});
-        this.parseasync(id,te.text);
+        const raw = (te.rawText && te.rawText!==""?te.rawText:te.text); //this is for compatibility with drawings created before the rawText change on ExcalidrawTextElement
+        this.textElements.set(id,{raw: raw, parsed: null});
+        this.parseasync(id,raw);
      }
    }
    if(dirty) { //reload scene json in case it has changed
-      this.scene = JSON_parse(jsonString);
+      this.scene = JSON.parse(jsonString);
    }

    return dirty;
@@ -204,46 +263,15 @@ export class ExcalidrawData {
   * and updating the textElement map based on the text updated in the scene
   */
  private async updateTextElementsFromScene() {
-    //console.log("Excalidraw.Data.updateTextElementesFromScene()");
    for(const key of this.textElements.keys()){
      //find text element in the scene
      const el = this.scene.elements?.filter((el:any)=> el.type=="text" && el.id==key);
      if(el.length==0) {
        this.textElements.delete(key); //if no longer in the scene, delete the text element
      } else {
-        if(!this.textElements.has(key)) {
+        const text = await this.getText(key); 
+        if(text != el[0].text) {
          this.textElements.set(key,{raw: el[0].text,parsed: await this.parse(el[0].text)});
-        } else {
-          const text = await this.getText(key); 
-          if(text != el[0].text) {
-            this.textElements.set(key,{raw: el[0].text,parsed: await this.parse(el[0].text)});
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * update text element map by deleting entries that are no long in the scene
-   * and updating the textElement map based on the text updated in the scene
-   */
-   private updateTextElementsFromSceneRawOnly() {
-    //console.log("Excalidraw.Data.updateTextElementsFromSceneRawOnly()");
-    for(const key of this.textElements.keys()){
-      //find text element in the scene
-      const el = this.scene.elements?.filter((el:any)=> el.type=="text" && el.id==key);
-      if(el.length==0) {
-        this.textElements.delete(key); //if no longer in the scene, delete the text element
-      } else {
-        if(!this.textElements.has(key)) {
-          this.textElements.set(key,{raw: el[0].text,parsed: null});
-          this.parseasync(key,el[0].text);
-        } else {
-          const text = (this.textMode == TextMode.parsed) ? this.textElements.get(key).parsed : this.textElements.get(key).raw;
-          if(text != el[0].text) {
-            this.textElements.set(key,{raw: el[0].text,parsed: null});
-            this.parseasync(key,el[0].text);
-          }
        }
      }
    }
@@ -254,19 +282,61 @@ export class ExcalidrawData {
  }

  private parseLinks(text:string, position:number, parts:any):string {
-    let outString = null;
-    if (parts.value[2]) {
-      outString = text.substring(position,parts.value.index) + 
-                   (this.showLinkBrackets ? "[[" : "") +
-                   (parts.value[3] ? parts.value[3]:parts.value[2]) + //insert alias or link text
-                   (this.showLinkBrackets ? "]]" : "");
-    } else {
-      outString = text.substring(position,parts.value.index) + 
-                   (this.showLinkBrackets ? "[[" : "") +
-                   (parts.value[5] ? parts.value[5]:parts.value[6]) + //insert alias or link text
-                   (this.showLinkBrackets ? "]]" : "");
+    return text.substring(position,parts.value.index) + 
+           (this.showLinkBrackets ? "[[" : "") +
+           REGEX_LINK.getAliasOrLink(parts) +
+           (this.showLinkBrackets ? "]]" : "");
+  }
+
+  /**
+   * 
+   * @param text 
+   * @returns [string,number] - the transcluded text, and the line number for the location of the text
+   */
+  public async getTransclusion (text:string):Promise<[string,number]> {
+    //file-name#^blockref
+    //1         2 3
+    const REG_FILE_BLOCKREF = /(.*)#(\^)?(.*)/g;
+    const parts=text.matchAll(REG_FILE_BLOCKREF).next();
+    if(!parts.done && !parts.value[1]) return [text,0]; //filename not found
+    const filename = parts.done ? text : parts.value[1];
+    const file = this.app.metadataCache.getFirstLinkpathDest(filename,this.file.path);
+    if(!file || !(file instanceof TFile)) return [text,0];
+    const contents = await this.app.vault.cachedRead(file);
+    if(parts.done) { //no blockreference
+      return([contents.substr(0,this.plugin.settings.pageTransclusionCharLimit),0]);
+    }
+    const isParagraphRef = parts.value[2] ? true : false; //does the reference contain a ^ character?
+    const id = parts.value[3]; //the block ID or heading text
+    const blocks = (await this.app.metadataCache.blockCache.getForFile({isCancelled: ()=>false},file)).blocks.filter((block:any)=>block.node.type!="comment");
+    if(!blocks) return [text,0];
+    if(isParagraphRef) {
+      let para = blocks.filter((block:any)=>block.node.id == id)[0]?.node;
+      if(!para) return [text,0];
+      if(["blockquote","listItem"].includes(para.type)) para = para.children[0]; //blockquotes are special, they have one child, which has the paragraph
+      const startPos = para.position.start.offset;
+      const lineNum = para.position.start.line;
+      const endPos = para.children[para.children.length-1]?.position.start.offset-1; //alternative: filter((c:any)=>c.type=="blockid")[0]
+      return [contents.substr(startPos,endPos-startPos),lineNum]
+    
+    } else {
+      const headings = blocks.filter((block:any)=>block.display.startsWith("#"));
+      let startPos:number = null; 
+      let lineNum:number = 0;
+      let endPos:number = null;
+      for(let i=0;i<headings.length;i++) {
+        if(startPos && !endPos) {
+          endPos = headings[i].node.position.start.offset-1;
+          return [contents.substr(startPos,endPos-startPos),lineNum];
+        }
+        if(!startPos && headings[i].node.children[0]?.value == id) {
+          startPos = headings[i].node.children[0]?.position.start.offset; //
+          lineNum = headings[i].node.children[0]?.position.start.line; //
+        }
+      }
+      if(startPos) return [contents.substr(startPos),lineNum];
+      return [text,0];
    }
-    return outString;
  }

  /**
@@ -275,35 +345,24 @@ export class ExcalidrawData {
   * @returns 
   */
  private async parse(text:string):Promise<string>{
-    const getTransclusion = async (text:string) => {
-      //file-name#^blockref
-      //1          2
-      const REG_FILE_BLOCKREF = /(.*)#\^(.*)/g;
-      const parts=text.matchAll(REG_FILE_BLOCKREF).next();
-      if(parts.done || !parts.value[1] || !parts.value[2]) return text; //filename and/or blockref not found
-      const file = this.app.metadataCache.getFirstLinkpathDest(parts.value[1],this.file.path);
-      const contents = await this.app.vault.cachedRead(file);
-      //get transcluded line and take the part before ^blockref
-      const REG_TRANSCLUDE = new RegExp("(.*)\\s\\^" + parts.value[2]);
-      const res = contents.match(REG_TRANSCLUDE);
-      if(res) return res[1];
-      return text;//if blockref not found in file, return the input string
-    }
-
    let outString = "";
    let position = 0;
-    const res = text.matchAll(REG_LINK_BACKETS);
+    const res = text.matchAll(REGEX_LINK.EXPR);
    let linkIcon = false;
+    let urlIcon = false;
    let parts;
    while(!(parts=res.next()).done) {
-      if (parts.value[1] || parts.value[4]) { //transclusion
+      if (REGEX_LINK.isTransclusion(parts)) { //transclusion //parts.value[1] || parts.value[4]
+        const [contents,lineNum] = await this.getTransclusion(REGEX_LINK.getLink(parts));
        outString += text.substring(position,parts.value.index) + 
-                     await getTransclusion(parts.value[1] ? parts.value[2] : parts.value[6]);
+                     wrapText(contents,REGEX_LINK.getWrapLength(parts),this.plugin.settings.forceWrap);
      } else {
        const parsedLink = this.parseLinks(text,position,parts);
        if(parsedLink) {
-          linkIcon = true;
          outString += parsedLink;
+          if(!(urlIcon || linkIcon))
+            if(REGEX_LINK.getLink(parts).match(REG_LINKINDEX_HYPERLINK)) urlIcon = true;  
+            else linkIcon = true;
        }
      } 
      position = parts.value.index + parts.value[0].length;
@@ -312,6 +371,9 @@ export class ExcalidrawData {
    if (linkIcon) {
      outString = this.linkPrefix + outString;
    }
+    if (urlIcon) {
+      outString = this.urlPrefix + outString;
+    }

    return outString;
  }
@@ -325,10 +387,10 @@ export class ExcalidrawData {
   */
  private quickParse(text:string):string {
    const hasTransclusion = (text:string):boolean => {
-      const res = text.matchAll(REG_LINK_BACKETS);
+      const res = text.matchAll(REGEX_LINK.EXPR);
      let parts;
      while(!(parts=res.next()).done) {
-        if (parts.value[1] || parts.value[4]) return true;
+        if (REGEX_LINK.isTransclusion(parts)) return true; 
      }
      return false;
    }
@@ -336,14 +398,17 @@ export class ExcalidrawData {

    let outString = "";
    let position = 0;
-    const res = text.matchAll(REG_LINK_BACKETS);
+    const res = text.matchAll(REGEX_LINK.EXPR);
    let linkIcon = false;
+    let urlIcon = false;
    let parts;
    while(!(parts=res.next()).done) {
      const parsedLink = this.parseLinks(text,position,parts);
      if(parsedLink) {
-        linkIcon = true;
        outString += parsedLink;
+        if(!(urlIcon || linkIcon))
+          if(REGEX_LINK.getLink(parts).match(REG_LINKINDEX_HYPERLINK)) urlIcon = true;  
+          else linkIcon = true;
      }
      position = parts.value.index + parts.value[0].length;
    }
@@ -351,6 +416,9 @@ export class ExcalidrawData {
    if (linkIcon) {
      outString = this.linkPrefix + outString;
    }
+    if (urlIcon) {
+      outString = this.urlPrefix + outString;
+    }
    return outString;
  }

@@ -360,31 +428,27 @@ export class ExcalidrawData {
   * @returns markdown string
   */
  generateMD():string {
-    //console.log("Excalidraw.Data.generateMD()");
    let outString = '# Text Elements\n';
    for(const key of this.textElements.keys()){
      outString += this.textElements.get(key).raw+' ^'+key+'\n\n';
    }
-    return outString + '# Drawing\n' 
-           + String.fromCharCode(96)+String.fromCharCode(96)+String.fromCharCode(96)+'json\n' 
-           + JSON.stringify(this.scene) + '\n'
-           + String.fromCharCode(96)+String.fromCharCode(96)+String.fromCharCode(96);
+    return outString + this.plugin.getMarkdownDrawingSection(JSON.stringify(this.scene));
  }

-  public syncElements(newScene:any):boolean {
+  public async syncElements(newScene:any):Promise<boolean> {
    //console.log("Excalidraw.Data.syncElements()");
    this.scene = newScene;//JSON_parse(newScene);
-    const result = this.setLinkPrefix() || this.setShowLinkBrackets() || this.findNewTextElementsInScene();
-    this.updateTextElementsFromSceneRawOnly();
-    return result;
+    const result = this.setLinkPrefix() || this.setUrlPrefix() || this.setShowLinkBrackets();
+    await this.updateTextElementsFromScene();
+    return result || this.findNewTextElementsInScene();
  }

  public async updateScene(newScene:any){
    //console.log("Excalidraw.Data.updateScene()");
    this.scene = JSON_parse(newScene);
-    const result = this.setLinkPrefix() || this.setShowLinkBrackets() || this.findNewTextElementsInScene();
+    const result = this.setLinkPrefix() || this.setUrlPrefix() || this.setShowLinkBrackets();
    await this.updateTextElementsFromScene();
-    if(result) {
+    if(result || this.findNewTextElementsInScene()) {
      await this.updateSceneTextElements();
      return true;
    };
@@ -413,6 +477,12 @@ export class ExcalidrawData {
    return null;
  }

+  public async addTextElement(elementID:string, rawText:string):Promise<string> {
+    const parseResult = await this.parse(rawText);
+    this.textElements.set(elementID,{raw: rawText,parsed: parseResult});
+    return parseResult;
+  }
+
  public deleteTextElement(id:string) {
    this.textElements.delete(id);
  }
@@ -423,20 +493,33 @@ export class ExcalidrawData {
    if (fileCache?.frontmatter && fileCache.frontmatter[FRONTMATTER_KEY_CUSTOM_PREFIX]!=null) {
      this.linkPrefix=fileCache.frontmatter[FRONTMATTER_KEY_CUSTOM_PREFIX];
    } else {
-      this.linkPrefix = this.settings.linkPrefix;
+      this.linkPrefix = this.plugin.settings.linkPrefix;
    }
    return linkPrefix != this.linkPrefix;
  }

+  private setUrlPrefix():boolean {
+    const urlPrefix = this.urlPrefix;
+    const fileCache = this.app.metadataCache.getFileCache(this.file);
+    if (fileCache?.frontmatter && fileCache.frontmatter[FRONTMATTER_KEY_CUSTOM_URL_PREFIX]!=null) {
+      this.urlPrefix=fileCache.frontmatter[FRONTMATTER_KEY_CUSTOM_URL_PREFIX];
+    } else {
+      this.urlPrefix = this.plugin.settings.urlPrefix;
+    }
+    return urlPrefix != this.urlPrefix;
+  }
+
  private setShowLinkBrackets():boolean {
    const showLinkBrackets = this.showLinkBrackets;
    const fileCache = this.app.metadataCache.getFileCache(this.file);
    if (fileCache?.frontmatter && fileCache.frontmatter[FRONTMATTER_KEY_CUSTOM_LINK_BRACKETS]!=null) {
      this.showLinkBrackets=fileCache.frontmatter[FRONTMATTER_KEY_CUSTOM_LINK_BRACKETS]!=false;
    } else {
-      this.showLinkBrackets = this.settings.showLinkBrackets;
+      this.showLinkBrackets = this.plugin.settings.showLinkBrackets;
    }
    return showLinkBrackets != this.showLinkBrackets;
  }

 }
+
+
--- a/src/ExcalidrawView.ts
+++ b/src/ExcalidrawView.ts
--- a/src/InsertLinkDialog.ts
+++ b/src/InsertLinkDialog.ts
@@ -0,0 +1,43 @@
+import { 
+  App, 
+  FuzzySuggestModal, 
+  TFile 
+} from "obsidian";
+import {t} from './lang/helpers'
+
+export class InsertLinkDialog extends FuzzySuggestModal<TFile> {
+  public app: App;
+  private addText: Function;
+  private drawingPath: string;
+
+  constructor(app: App) {
+    super(app);
+    this.app = app;
+    this.limit = 20;
+    this.setInstructions([{
+      command: t("SELECT_FILE"),
+      purpose: "",
+    }]);    
+    this.setPlaceholder(t("SELECT_FILE_TO_LINK"));
+    this.emptyStateText = t("NO_MATCH");
+  }
+
+  getItems(): TFile[] {
+    return this.app.vault.getFiles();
+  }
+
+  getItemText(item: TFile): string {
+    return item.path; 
+  }
+
+  onChooseItem(item: TFile, _evt: MouseEvent | KeyboardEvent): void {
+    const filepath = this.app.metadataCache.fileToLinktext(item,this.drawingPath,true);
+    this.addText("[["+filepath+"]]"); 
+  }
+
+  public start(drawingPath:string, addText: Function) {
+    this.addText = addText;
+    this.drawingPath = drawingPath;
+    this.open();
+  }
+}
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -1,5 +1,9 @@
-import { Modal, normalizePath, TAbstractFile, TFolder, Vault } from "obsidian";
+import {  App, normalizePath, TAbstractFile, TFile, TFolder, Vault } from "obsidian";
 import { Random } from "roughjs/bin/math";
+import { Zoom } from "@zsviczian/excalidraw/types/types";
+import { nanoid } from "nanoid";
+import { IMAGE_TYPES } from "./constants";
+

 /**
 * Splits a full path including a folderpath and a filename into separate folderpath and filename components
@@ -60,15 +64,127 @@ export function getIMGPathFromExcalidrawFile (excalidrawPath:string,newExtension
  return fname;
 }

-  /**
-  * Open or create a folderpath if it does not exist
-  * @param folderpath 
-  */
-  export async function checkAndCreateFolder(vault:Vault,folderpath:string) {
-    let folder = vault.getAbstractFileByPath(folderpath);
-    if(folder && folder instanceof TFolder) return;
-    await vault.createFolder(folderpath);
-  }
+/**
+* Open or create a folderpath if it does not exist
+* @param folderpath 
+*/
+export async function checkAndCreateFolder(vault:Vault,folderpath:string) {
+  folderpath = normalizePath(folderpath);
+  let folder = vault.getAbstractFileByPath(folderpath);
+  if(folder && folder instanceof TFolder) return;
+  await vault.createFolder(folderpath);
+}

 let random = new Random(Date.now());
-export const randomInteger = () => Math.floor(random.next() * 2 ** 31);
+export const randomInteger = () => Math.floor(random.next() * 2 ** 31);
+
+//https://macromates.com/blog/2006/wrapping-text-with-regular-expressions/
+export function wrapText(text:string, lineLen:number, forceWrap:boolean=false):string {
+  if(!lineLen) return text;
+  let outstring = "";
+  if(forceWrap) {
+    for(const t of text.split("\n")) {
+      const v = t.match(new RegExp('(.){1,'+lineLen+'}','g'));
+      outstring += v ? v.join("\n")+"\n" : "\n";
+    }
+    return outstring.replace(/\n$/, '');
+  }
+
+  //                       1                2            3        4
+  const reg = new RegExp(`(.{1,${lineLen}})(\\s+|$\\n?)|([^\\s]+)(\\s+|$\\n?)`,'gm');
+  const res = text.matchAll(reg);
+  let parts;
+  while(!(parts = res.next()).done) {
+    outstring += parts.value[1] ? parts.value[1].trimEnd() : parts.value[3].trimEnd();
+    const newLine1 = parts.value[2]?.includes("\n");
+    const newLine2 = parts.value[4]?.includes("\n");
+    if(newLine1) outstring += parts.value[2];
+    if(newLine2) outstring += parts.value[4];
+    if(!(newLine1 || newLine2)) outstring += "\n";
+  }
+  return outstring.replace(/\n$/, '');
+}
+
+export const viewportCoordsToSceneCoords = (
+  { clientX, clientY }: { clientX: number; clientY: number },
+  {
+    zoom,
+    offsetLeft,
+    offsetTop,
+    scrollX,
+    scrollY,
+  }: {
+    zoom: Zoom;
+    offsetLeft: number;
+    offsetTop: number;
+    scrollX: number;
+    scrollY: number;
+  },
+) => {
+  const invScale = 1 / zoom.value;
+  const x = (clientX - zoom.translation.x - offsetLeft) * invScale - scrollX;
+  const y = (clientY - zoom.translation.y - offsetTop) * invScale - scrollY;
+  return { x, y };
+};
+
+export const getObsidianImage = async (app: App, file: TFile)
+  :Promise<{
+    imageId: string, 
+    dataURL: string,
+    size: {height: number, width: number},
+  }> => {
+  if(!app || !file) return null;
+  if (!IMAGE_TYPES.contains(file.extension)) return null;
+  const ab = await app.vault.readBinary(file);
+  return {
+    imageId: await generateIdFromFile(ab),
+    dataURL: file.extension==="svg" ? await getSVGData(app,file) : await getDataURL(ab),
+    size: await getImageSize(app,file)
+  }
+}
+
+const getSVGData = async (app: App, file: TFile): Promise<string> => {
+  const svg = await app.vault.read(file);
+  return "data:image/svg+xml;base64,"+btoa(unescape(encodeURIComponent(svg.replaceAll("&nbsp;"," "))))
+}
+
+const getDataURL = async (file: ArrayBuffer): Promise<string> => {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = () => {
+      const dataURL = reader.result as string;
+      resolve(dataURL);
+    };
+    reader.onerror = (error) => reject(error);
+    reader.readAsDataURL(new Blob([new Uint8Array(file)]));
+  });
+};
+
+const generateIdFromFile = async (file: ArrayBuffer):Promise<string> => {
+  let id: string;
+  try {
+    const hashBuffer = await window.crypto.subtle.digest(
+      "SHA-1",
+      file,
+    );
+    id =
+      // convert buffer to byte array
+      Array.from(new Uint8Array(hashBuffer))
+        // convert to hex string
+        .map((byte) => byte.toString(16).padStart(2, "0"))
+        .join("");
+  } catch (error) {
+    console.error(error);
+    id = nanoid(40);
+  }
+  return id;
+};
+
+const getImageSize = async (app: App, file:TFile):Promise<{height:number, width:number}> => {
+  return new Promise((resolve, reject) => {
+    let img = new Image()
+    img.onload = () => resolve({height: img.height, width:img.width});
+    img.onerror = reject;
+    img.src = app.vault.getResourcePath(file);
+    })
+}
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -3,8 +3,11 @@ export function JSON_parse(x:string):any {return JSON.parse(x.replaceAll("&#91;"

 import {customAlphabet} from "nanoid";
 export const nanoid = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',8);
+export const IMAGE_TYPES = ['jpeg', 'jpg', 'png', 'gif', 'svg', 'bmp'];
+export const MAX_IMAGE_SIZE = 600;
 export const FRONTMATTER_KEY = "excalidraw-plugin";
 export const FRONTMATTER_KEY_CUSTOM_PREFIX = "excalidraw-link-prefix";
+export const FRONTMATTER_KEY_CUSTOM_URL_PREFIX = "excalidraw-url-prefix";
 export const FRONTMATTER_KEY_CUSTOM_LINK_BRACKETS = "excalidraw-link-brackets";
 export const VIEW_TYPE_EXCALIDRAW = "excalidraw";
 export const ICON_NAME = "excalidraw-icon";
@@ -12,10 +15,10 @@ export const MAX_COLORS = 5;
 export const COLOR_FREQ = 6;
 export const RERENDER_EVENT = "excalidraw-embed-rerender";
 export const BLANK_DRAWING = '{"type":"excalidraw","version":2,"source":"https://excalidraw.com","elements":[],"appState":{"gridSize":null,"viewBackgroundColor":"#ffffff"}}';
-export const FRONTMATTER = ["---","",`${FRONTMATTER_KEY}: unlocked`,"","---", "==⚠  Switch to EXCALIDRAW VIEW in the MORE OPTIONS menu of this document. ⚠==", "",""].join("\n");
+export const FRONTMATTER = ["---","",`${FRONTMATTER_KEY}: parsed`,"","---", "==⚠  Switch to EXCALIDRAW VIEW in the MORE OPTIONS menu of this document. ⚠==", "",""].join("\n");
 export const EMPTY_MESSAGE = "Hit enter to create a new drawing";
-export const TEXT_DISPLAY_PARSED_ICON_NAME = "presentation";
-export const TEXT_DISPLAY_RAW_ICON_NAME = "quote-glyph";
+export const TEXT_DISPLAY_PARSED_ICON_NAME = "quote-glyph";
+export const TEXT_DISPLAY_RAW_ICON_NAME = "presentation";
 export const FULLSCREEN_ICON_NAME="fullscreen";
 export const EXIT_FULLSCREEN_ICON_NAME = "exit-fullscreen";
 export const DISK_ICON_NAME = "disk";
--- a/src/lang/locale/en.ts
+++ b/src/lang/locale/en.ts
@@ -1,4 +1,4 @@
-import { FRONTMATTER_KEY_CUSTOM_LINK_BRACKETS, FRONTMATTER_KEY_CUSTOM_PREFIX } from "src/constants";
+import { FRONTMATTER_KEY_CUSTOM_LINK_BRACKETS, FRONTMATTER_KEY_CUSTOM_PREFIX, FRONTMATTER_KEY_CUSTOM_URL_PREFIX } from "src/constants";

 // English
 export default {
@@ -21,7 +21,7 @@ export default {
  NEW_IN_ACTIVE_PANE_EMBED: "Create a new drawing - IN THE CURRENT ACTIVE PANE - and embed into active document",
  EXPORT_SVG: "Save as SVG next to the current file",
  EXPORT_PNG: "Save as PNG next to the current file",
-  TOGGLE_LOCK: "Toggle Text Element edit LOCK/UNLOCK",
+  TOGGLE_LOCK: "Toggle Text Element edit RAW/PREVIEW",
  INSERT_LINK: "Insert link to file",
  INSERT_LATEX: "Insert LaTeX-symbol (e.g. $\\theta$)",
  ENTER_LATEX: "Enter a valid LaTeX expression",
@@ -39,11 +39,13 @@ export default {
  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.",
  FORCE_SAVE: "Force-save to update transclusions in adjacent panes.\n(Please note, that autosave is always on)",
-  RAW: "Text-elements are displayed in RAW mode. Click button to change to PREVIEW mode.",
-  PARSED: "Text-elements are displayed in PREVIEW mode. Click button to change to RAW mode.",
+  RAW: "Change to PREVIEW mode (only effects text-elements with links or transclusions)",
+  PARSED: "Change to RAW mode (only effects text-elements with links or transclusions)",
  NOFILE: "Excalidraw (no file)",
  COMPATIBILITY_MODE: "*.excalidraw file opened in compatibility mode. Convert to new format for full plugin functionality.",
  CONVERT_FILE: "Convert to new format",
+  DRAWING_CONTAINS_IMAGE: "Warning! The drawing contains image elements. Depending on the number and size of the images, " +
+                          "loading Markdown View may take a while. Please be patient. ",

  //settings.ts
  FOLDER_NAME: "Excalidraw folder",
@@ -51,7 +53,7 @@ export default {
  TEMPLATE_NAME: "Excalidraw template file",
  TEMPLATE_DESC: "Full filepath to the Excalidraw template. " +
                 "E.g.: If your template is in the default Excalidraw folder and it's name is " +
-                 "Template.md, the setting would be: Excalidraw/Template.md " + 
+                 "Template.md, the setting would be: Excalidraw/Template.md (or just Excalidraw/Template - you may ommit the .md file extension" + 
                 "If you are using Excalidraw in compatibility mode, then your template must be a legacy excalidraw file as well " + 
                 "such as Excalidraw/Template.excalidraw.",
  AUTOSAVE_NAME: "Autosave",
@@ -69,7 +71,10 @@ export default {
  FILENAME_PREFIX_DESC: "The first part of the filename",
  FILENAME_DATE_NAME: "Filename date",
  FILENAME_DATE_DESC: "The second part of the filename",
-  LINKS_HEAD: "Links",
+  DISPLAY_HEAD: "Display",
+  ZOOM_TO_FIT_NAME: "Zoom to fit on view resize",
+  ZOOM_TO_FIT_DESC: "Zoom to fit drawing when the pane is resized",
+  LINKS_HEAD: "Links and transclusion",
  LINKS_DESC: "CTRL/META + 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 " +
@@ -77,21 +82,39 @@ export default {
              "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]].",
  LINK_BRACKETS_NAME: "Show [[brackets]] around links",
-  LINK_BRACKETS_DESC: "In preview (locked) mode, when parsing Text Elements, place brackets around links. " +
+  LINK_BRACKETS_DESC: "In PREVIEW mode, when parsing Text Elements, place brackets around links. " +
                      "You can override this setting for a specific drawing by adding '" + FRONTMATTER_KEY_CUSTOM_LINK_BRACKETS + 
                      ": true/false' to the file\'s frontmatter.",
  LINK_PREFIX_NAME:"Link prefix",
-  LINK_PREFIX_DESC:"In preview (locked) mode, if the Text Element contains a link, precede the text with these characters. " +
+  LINK_PREFIX_DESC:"In PREVIEW mode, if the Text Element contains a link, precede the text with these characters. " +
                   "You can override this setting for a specific drawing by adding \'" + FRONTMATTER_KEY_CUSTOM_PREFIX + 
-                   ': "👉 "\' to the file\'s frontmatter.',
+                   ': "📍 "\' to the file\'s frontmatter.',
+  URL_PREFIX_NAME:"URL prefix",
+  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_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",
+  TRANSCLUSION_WRAP_DESC: "Number specifies the character count where the text should be wrapped. " + 
+                          "Set the text wrapping behavior of transcluded text. Turn this ON to force-wrap " + 
+                          "text (i.e. no overflow), or OFF to soft-warp text (at the nearest whitespace).",
+  PAGE_TRANSCLUSION_CHARCOUNT_NAME: "Page transclusion max char count",
+  PAGE_TRANSCLUSION_CHARCOUNT_DESC: "The maximum number of characters to display from the page when transcluding an entire page with the "+
+                                    "![[markdown page]] format.",
  EMBED_HEAD: "Embed & Export",
+  EMBED_PREVIEW_SVG_NAME: "Display SVG in markdown preview",
+  EMBED_PREVIEW_SVG_DESC: "The default is to display drawings as SVG images in the markdown preview. Turning this feature off, the markdown preview will display the drawing as an embedded PNG image.",
  EMBED_WIDTH_NAME: "Default width of embedded (transcluded) image",
-  EMBED_WIDTH_DESC: "The default width of an embedded drawing. You can specify a custom " +
+  EMBED_WIDTH_DESC: "Only relevant if embed type is excalidraw. Has no effect on PNG and SVG embeds. The default width of an embedded drawing. You can specify a custom " +
                    "width when embedding an image using the ![[drawing.excalidraw|100]] or " +
                    "[[drawing.excalidraw|100x100]] format.",
+  EMBED_TYPE_NAME: "Type of file to insert into the document",                    
+  EMBED_TYPE_DESC: "When you embed an image into a document using the command palette this setting will specify if Excalidraw should embed the original excalidraw file "+
+                   "or a PNG or an SVG copy. You need to enable auto-export PNG / SVG (see below under Export Settings) for those image types to be available in the dropdown. For drawings that do not have a " +
+                   "a correspondign PNG or SVG readily available the command palette action will insert a broken link. You need to open the original drawing and initiate export manually. " +
+                   "This option will not autogenerate PNG/SVG files, but will simply reference the already existing files.",
  EXPORT_PNG_SCALE_NAME: "PNG export image scale",
  EXPORT_PNG_SCALE_DESC: "The size-scale of the exported PNG image",
  EXPORT_BACKGROUND_NAME: "Export image with background",
@@ -126,7 +149,7 @@ export default {
  FILETYPE_DESC: "Excalidraw files will receive an indicator using the emojii or text defined in the next setting.",                           
  FILETAG_NAME: "Set the type indicator for excalidraw.md files",
  FILETAG_DESC: "The text or emojii to display as type indicator.",                           
-
+  INSERT_EMOJI: "Insert an emoji",


  //openDrawings.ts
--- a/src/main.ts
+++ b/src/main.ts
@@ -15,10 +15,7 @@ import {
  MarkdownRenderer,
  ViewState,
  Notice,
-  TFolder,
-  Modal,
 } from "obsidian";
-
 import { 
  BLANK_DRAWING,
  VIEW_TYPE_EXCALIDRAW, 
@@ -33,11 +30,8 @@ import {
  RERENDER_EVENT,
  FRONTMATTER_KEY,
  FRONTMATTER,
-  //LOCK_ICON,
-  TEXT_DISPLAY_PARSED_ICON_NAME,
-  TEXT_DISPLAY_RAW_ICON_NAME,
-  //UNLOCK_ICON,
-  JSON_parse
+  JSON_parse,
+  nanoid
 } from "./constants";
 import ExcalidrawView, {ExportSettings, TextMode} from "./ExcalidrawView";
 import {getJSON} from "./ExcalidrawData";
@@ -50,26 +44,40 @@ import {
  openDialogAction, 
  OpenFileDialog
 } from "./openDrawing";
+import {
+  InsertLinkDialog
+} from "./InsertLinkDialog";
 import {
  initExcalidrawAutomate,
-  destroyExcalidrawAutomate,
-  exportSceneToMD,
+  destroyExcalidrawAutomate
 } from "./ExcalidrawAutomate";
 import { Prompt } from "./Prompt";
 import { around } from "monkey-around";
 import { t } from "./lang/helpers";
 import { MigrationPrompt } from "./MigrationPrompt";
-import { checkAndCreateFolder, download, getIMGPathFromExcalidrawFile, getNewUniqueFilepath } from "./Utils";
+import { checkAndCreateFolder, download, getIMGPathFromExcalidrawFile, getNewUniqueFilepath, splitFolderAndFilename } from "./Utils";
+
+declare module "obsidian" {
+  interface App {
+    isMobile():boolean;
+  }
+  interface Vault {
+      getConfig(option:"attachmentFolderPath"): string;
+  }
+  interface Workspace {
+    on(name: 'hover-link', callback: (e:MouseEvent) => any, ctx?: any): EventRef;
+  }
+}

 export default class ExcalidrawPlugin extends Plugin {
  public excalidrawFileModes: { [file: string]: string } = {};
  private _loaded: boolean = false;
  public settings: ExcalidrawSettings;
-  //public stencilLibrary: any = null;
  private openDialog: OpenFileDialog;
+  private insertLinkDialog: InsertLinkDialog;
  private activeExcalidrawView: ExcalidrawView = null;
  public lastActiveExcalidrawFilePath: string = null;
-  private hover: {linkText: string, sourcePath: string} = {linkText: null, sourcePath: null};
+  public hover: {linkText: string, sourcePath: string} = {linkText: null, sourcePath: null};
  private observer: MutationObserver;
  private fileExplorerObserver: MutationObserver;
  public opencount:number = 0;
@@ -83,8 +91,6 @@ export default class ExcalidrawPlugin extends Plugin {
    addIcon(DISK_ICON_NAME,DISK_ICON);
    addIcon(PNG_ICON_NAME,PNG_ICON);
    addIcon(SVG_ICON_NAME,SVG_ICON);
-    //addIcon(TEXT_DISPLAY_PARSED_ICON_NAME,LOCK_ICON);
-    //addIcon(TEXT_DISPLAY_RAW_ICON_NAME,UNLOCK_ICON);
    
    await this.loadSettings();
    this.addSettingTab(new ExcalidrawSettingTab(this.app, this));
@@ -107,7 +113,62 @@ export default class ExcalidrawPlugin extends Plugin {
    //https://github.com/mgmeyers/obsidian-kanban/blob/44118e25661bff9ebfe54f71ae33805dc88ffa53/src/main.ts#L267
    this.registerMonkeyPatches();
    if(this.settings.loadCount<1) this.migrationNotice();
-    
+    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);
+    }
+    this.switchToExcalidarwAfterLoad()
+
+    //This is a once off cleanup process to remediate incorrectly placed comment %% before # Text Elements
+    if(this.settings.patchCommentBlock) {
+      const self = this;
+      console.log(window.moment().format("HH:mm:ss") + ": Excalidraw will patch drawings in 5 minutes");
+      setTimeout(async ()=>{
+        await self.loadSettings();
+        if (!self.settings.patchCommentBlock) {
+          console.log(window.moment().format("HH:mm:ss") + ": Excalidraw patching aborted because synched data.json is already patched");
+          return;
+        }
+        console.log(window.moment().format("HH:mm:ss") + ": Excalidraw is starting the patching process");
+        let i = 0;
+        const excalidrawFiles = this.app.vault.getFiles();
+        for (const f of (excalidrawFiles || []).filter((f:TFile) => self.isExcalidrawFile(f))) {
+          if (   (f.extension !== "excalidraw")  //legacy files do not need to be touched
+              && (self.app.workspace.getActiveFile() !== f)) {  //file is currently being edited
+            let drawing = await self.app.vault.read(f);
+            const orig_drawing = drawing;
+            drawing = drawing.replaceAll("\r\n","\n").replaceAll("\r","\n"); //Win, Mac, Linux compatibility
+            drawing = drawing.replace("\n%%\n# Text Elements\n","\n# Text Elements\n");
+            if (drawing.search("\n%%\n# Drawing\n") === -1) {
+              const [json,pos] = getJSON(drawing);
+              drawing = drawing.substr(0,pos)+"\n%%\n# Drawing\n```json\n"+json+"\n```%%";
+            };
+            if (drawing !== orig_drawing) {
+              i++;
+              console.log("Excalidraw patched: " + f.path);
+              await self.app.vault.modify(f,drawing);   
+            }
+          }
+        }
+        self.settings.patchCommentBlock = false;
+        self.saveSettings();
+        console.log(window.moment().format("HH:mm:ss") + ": Excalidraw patched in total " + i + " files");
+      },300000) //5 minutes
+    }
+  }
+
+  private switchToExcalidarwAfterLoad() {
+    const self = this;
+    this.app.workspace.onLayoutReady(() => {
+      let leaf: WorkspaceLeaf;
+      for (leaf of self.app.workspace.getLeavesOfType("markdown")) {
+        if ((leaf.view instanceof MarkdownView) && self.isExcalidrawFile(leaf.view.file)) {
+          self.excalidrawFileModes[(leaf as any).id || leaf.view.file.path] =
+                    VIEW_TYPE_EXCALIDRAW;
+                    self.setExcalidrawView(leaf);
+        }
+      }
+    });
  }

  private migrationNotice(){
@@ -122,12 +183,14 @@ export default class ExcalidrawPlugin extends Plugin {
      }
    });
  }
+
  /**
   * Displays a transcluded .excalidraw image in markdown preview mode
   */
  private addMarkdownPostProcessor() {
    
    interface imgElementAttributes {
+      file?:   TFile,
      fname:   string, //Excalidraw filename
      fwidth:  string, //Display width of image
      fheight: string, //Display height of image
@@ -135,14 +198,18 @@ export default class ExcalidrawPlugin extends Plugin {
    }

    /**
-     * Generates an img element with the .excalidraw drawing encoded as a base64 svg
+     * Generates an img element with the drawing encoded as a base64 SVG or a PNG (depending on settings)
     * @param parts {imgElementAttributes} - display properties of the image
-     * @returns {Promise<HTMLElement>} - the IMG HTML element containing the encoded SVG image
+     * @returns {Promise<HTMLElement>} - the IMG HTML element containing the image
     */
-    const getIMG = async (parts:imgElementAttributes):Promise<HTMLElement> => {
-      const file = this.app.vault.getAbstractFileByPath(parts.fname);
-      if(!(file && file instanceof TFile)) {
-        return null;
+    const getIMG = async (imgAttributes:imgElementAttributes):Promise<HTMLElement> => {
+      let file = imgAttributes.file;
+      if(!imgAttributes.file) {
+        const f = this.app.vault.getAbstractFileByPath(imgAttributes.fname);
+        if(!(f && f instanceof TFile)) {
+          return null;
+        }
+        file = f;
      }
    
      const content = await this.app.vault.read(file);
@@ -150,16 +217,28 @@ export default class ExcalidrawPlugin extends Plugin {
        withBackground: this.settings.exportWithBackground, 
        withTheme: this.settings.exportWithTheme
      }
-      let svg = await ExcalidrawView.getSVG(JSON_parse(getJSON(content)),exportSettings);
+      const img = createEl("img");
+      img.setAttribute("width",imgAttributes.fwidth);        
+      if(imgAttributes.fheight) img.setAttribute("height",imgAttributes.fheight);
+      img.addClass(imgAttributes.style);
+
+      
+      if(!this.settings.displaySVGInPreview) {
+        const width = parseInt(imgAttributes.fwidth);
+        let scale = 1;
+        if(width>=800) scale = 2;
+        if(width>=1600) scale = 3;
+        if(width>=2400) scale = 4;
+        const png = await ExcalidrawView.getPNG(JSON_parse(getJSON(content)[0]),exportSettings, scale);
+        if(!png) return null;
+        img.src = URL.createObjectURL(png);
+        return img;
+      }
+      let svg = await ExcalidrawView.getSVG(JSON_parse(getJSON(content)[0]),exportSettings);
      if(!svg) return null;
      svg = ExcalidrawView.embedFontsInSVG(svg);
-      const img = createEl("img");
      svg.removeAttribute('width');
      svg.removeAttribute('height');
-      img.setAttribute("width",parts.fwidth);
-      
-      if(parts.fheight) img.setAttribute("height",parts.fheight);
-      img.addClass(parts.style);
      img.setAttribute("src","data:image/svg+xml;base64,"+btoa(unescape(encodeURIComponent(svg.outerHTML.replaceAll("&nbsp;"," ")))));
      return img;
    }
@@ -170,12 +249,12 @@ export default class ExcalidrawPlugin extends Plugin {
     * @param ctx 
     */
    const markdownPostProcessor = async (el:HTMLElement,ctx:MarkdownPostProcessorContext) => {
-      const drawings = el.querySelectorAll('.internal-embed');
-      if(drawings.length==0) return;
+      const embeddedItems = el.querySelectorAll('.internal-embed');
+      if(embeddedItems.length==0) return;

      let attr:imgElementAttributes={fname:"",fheight:"",fwidth:"",style:""};
-      let alt:string, img:any, parts, div, file:TFile;
-      for (const drawing of drawings) {
+      let alt:string, parts, div, file:TFile;
+      for (const drawing of embeddedItems) {
        attr.fname = drawing.getAttribute("src");
        file = this.app.metadataCache.getFirstLinkpathDest(attr.fname, ctx.sourcePath); 
        if(file && file instanceof TFile && this.isExcalidrawFile(file)) {  
@@ -185,18 +264,19 @@ export default class ExcalidrawPlugin extends Plugin {
          if(alt == attr.fname) alt = ""; //when the filename starts with numbers followed by a space Obsidian recognizes the filename as alt-text
          attr.style = "excalidraw-svg";
          if(alt) {
-            //for some reason ![]() is rendered in a DIV and ![[]] in a span by Obsidian
-            //also the alt text of the DIV does not include the altext of the image
-            //thus need to add an additional "|" character when its a span
+            //for some reason Obsidian renders ![]() in a DIV and ![[]] in a SPAN
+            //also the alt-text of the DIV does not include the alt-text of the image
+            //thus need to add an additional "|" character when its a SPAN
            if(drawing.tagName.toLowerCase()=="span") alt = "|"+alt;
-            parts = alt.match(/[^\|]*\|?(\d*)x?(\d*)\|?(.*)/);
+            //1:width, 2:height, 3:style  1      2      3
+            parts = alt.match(/[^\|]*\|?(\d*%?)x?(\d*%?)\|?(.*)/);
            attr.fwidth = parts[1]? parts[1] : this.settings.width;
            attr.fheight = parts[2];
            if(parts[3]!=attr.fname) attr.style = "excalidraw-svg" + (parts[3] ? "-" + parts[3] : "");
          }
-        
+          
          attr.fname = file?.path;
-          img = await getIMG(attr);
+          const img = await getIMG(attr);
          div = createDiv(attr.style, (el)=>{
            el.append(img);
            el.setAttribute("src",file.path);
@@ -240,18 +320,17 @@ export default class ExcalidrawPlugin extends Plugin {
      this.hover.sourcePath = e.sourcePath;      
    };   
    this.registerEvent(
-      //@ts-ignore
      this.app.workspace.on('hover-link',hoverEvent)
    );
      
    //monitoring for div.popover.hover-popover.file-embed.is-loaded to be added to the DOM tree
-    this.observer = new MutationObserver((m)=>{
+    this.observer = new MutationObserver(async (m)=>{
      if(m.length == 0) return;
      if(!this.hover.linkText) return;
      const file = this.app.metadataCache.getFirstLinkpathDest(this.hover.linkText, this.hover.sourcePath?this.hover.sourcePath:""); 
      if(!file || !(file instanceof TFile) || !this.isExcalidrawFile(file)) return
   
-      if((file as TFile).extension == "excalidraw") {
+      if(file.extension == "excalidraw") {
        observerForLegacyFileFormat(m,file);
        return;
      }
@@ -269,12 +348,14 @@ export default class ExcalidrawPlugin extends Plugin {
      if(m[i].addedNodes[0].firstElementChild?.firstElementChild?.className=="excalidraw-svg") return;
      
      //@ts-ignore
-      if(!m[i].addedNodes[0].matchParent(".hover-popover")) return;
+      const hoverPopover = m[i].addedNodes[0].matchParent(".hover-popover");
+      if(!hoverPopover) return;
+      const node = m[i].addedNodes[0];

      //this div will be on top of original DIV. By stopping the propagation of the click
      //I prevent the default Obsidian feature of openning the link in the native app
-      const div = createDiv("",async (el)=>{
-        const img = await getIMG({fname:file.path,fwidth:"300",fheight:null,style:"excalidraw-svg"});
+      const div = createDiv("", async (el)=>{
+        const img = await getIMG({file:file,fname:file.path,fwidth:"300",fheight:null,style:"excalidraw-svg"});
        el.appendChild(img);
        el.setAttribute("src",file.path);
        el.onClickEvent((ev)=>{
@@ -283,12 +364,11 @@ export default class ExcalidrawPlugin extends Plugin {
          if(src) this.openDrawing(this.app.vault.getAbstractFileByPath(src) as TFile,ev.ctrlKey||ev.metaKey);
        });
      });
-      m[i].addedNodes[0].insertBefore(div,m[i].addedNodes[0].firstChild)
-      
+      node.insertBefore(div,node.firstChild)
    });

    //compatibility: .excalidraw file observer
-    let observerForLegacyFileFormat = (m:MutationRecord[], file:TFile) => {
+    let observerForLegacyFileFormat = async (m:MutationRecord[], file:TFile) => {
      if(!this.hover.linkText) return;
      if(m.length!=1) return;
      if(m[0].addedNodes.length != 1) return;
@@ -299,8 +379,8 @@ export default class ExcalidrawPlugin extends Plugin {
      
      //this div will be on top of original DIV. By stopping the propagation of the click
      //I prevent the default Obsidian feature of openning the link in the native app
+      const img = await getIMG({file:file,fname:file.path,fwidth:"300",fheight:null,style:"excalidraw-svg"});
      const div = createDiv("",async (el)=>{
-        const img = await getIMG({fname:file.path,fwidth:"300",fheight:null,style:"excalidraw-svg"});
        el.appendChild(img);
        el.setAttribute("src",file.path);
        el.onClickEvent((ev)=>{
@@ -326,35 +406,32 @@ export default class ExcalidrawPlugin extends Plugin {
    this.fileExplorerObserver = null;
  }

+  /**
+   * Display characters configured in settings, in front of the filename, if the markdown file is an excalidraw drawing
+   */
  private experimentalFileTypeDisplay() {
+    const insertFiletype = (el: HTMLElement) => {
+      if(el.childElementCount != 1) return;
+      //@ts-ignore
+      if(this.isExcalidrawFile(this.app.vault.getAbstractFileByPath(el.attributes["data-path"].value))) {
+        el.insertBefore(createDiv({cls:"nav-file-tag",text:this.settings.experimentalFileTag}),el.firstChild);
+      }
+    };   
+
    this.fileExplorerObserver = new MutationObserver((m)=>{

      const mutationsWithNodes = m.filter((v)=>v.addedNodes.length > 0);
      mutationsWithNodes.forEach((mu)=>{
        mu.addedNodes.forEach((n)=>{
          if(!(n instanceof Element)) return;
-          n.querySelectorAll(".nav-file-title").forEach((el)=>{
-            if(el.childElementCount == 1) {
-              //@ts-ignore
-              if(this.isExcalidrawFile(this.app.vault.getAbstractFileByPath(el.attributes["data-path"].value))) {
-                el.insertBefore(createDiv({cls:"nav-file-tag",text:this.settings.experimentalFileTag}),el.firstChild);
-              }
-            }
-          });
+          n.querySelectorAll(".nav-file-title").forEach(insertFiletype);
        });
      });
    });

    const self = this;
    this.app.workspace.onLayoutReady(()=>{
-      document.querySelectorAll(".nav-file-title").forEach((el)=>{
-        if(el.childElementCount == 1) {
-          //@ts-ignore
-          if(this.isExcalidrawFile(this.app.vault.getAbstractFileByPath(el.attributes["data-path"].value))) {
-            el.insertBefore(createDiv({cls:"nav-file-tag",text:this.settings.experimentalFileTag}),el.firstChild);
-          }
-        }
-      });
+      document.querySelectorAll(".nav-file-title").forEach(insertFiletype); //apply filetype to files already displayed
      this.fileExplorerObserver.observe(document.querySelector(".workspace"), {childList: true, subtree: true});
    });
    
@@ -362,6 +439,7 @@ export default class ExcalidrawPlugin extends Plugin {

  private registerCommands() {
    this.openDialog = new OpenFileDialog(this.app, this);
+    this.insertLinkDialog = new InsertLinkDialog(this.app);

    this.addRibbonIcon(ICON_NAME, t("CREATE_NEW"), async (e) => {
      this.createDrawing(this.getNextDefaultFilename(), e.ctrlKey||e.metaKey);
@@ -419,7 +497,6 @@ export default class ExcalidrawPlugin extends Plugin {
      id: "excalidraw-download-lib",
      name: t("DOWNLOAD_LIBRARY"),
      callback: async () => {
-        //@ts-ignore
        if(this.app.isMobile) {
          const prompt = new Prompt(this.app, "Please provide a filename",'my-library','filename, leave blank to cancel action');
          prompt.openAndGetValue( async (filename:string)=> {
@@ -495,6 +572,26 @@ export default class ExcalidrawPlugin extends Plugin {
      },
    });

+    const insertDrawingToDoc = async (inNewPane:boolean) => {
+      const activeView = this.app.workspace.getActiveViewOfType(MarkdownView);
+      if(!activeView) return;
+      let folder = this.app.vault.getConfig("attachmentFolderPath");
+      // folder == null: save to vault root
+      // folder == "./" save to same folder as current file
+      // folder == "folder" save to specific folder in vault
+      // folder == "./folder" save to specific subfolder of current active folder
+      if(folder && folder.startsWith("./")) { // folder relative to current file
+          const activeFileFolder = splitFolderAndFilename(activeView.file.path).folderpath + "/";
+          folder = normalizePath(activeFileFolder + folder.substring(2));
+      }
+      if(!folder) folder = "";
+      await checkAndCreateFolder(this.app.vault,folder);
+      const filename = activeView.file.basename + "_" + window.moment().format(this.settings.drawingFilenameDateTime)
+           + (this.settings.compatibilityMode ? '.excalidraw' : '.excalidraw.md');
+      this.embedDrawing(normalizePath(folder + "/" + filename));
+      this.createDrawing(filename, inNewPane,folder==""?null:folder);
+    }
+
    this.addCommand({
      id: "excalidraw-autocreate-and-embed",
      name: t("NEW_IN_NEW_PANE_EMBED"),
@@ -502,9 +599,7 @@ export default class ExcalidrawPlugin extends Plugin {
        if (checking) {
          return (this.app.workspace.activeLeaf.view.getViewType() == "markdown");
        } else {
-          const filename = this.getNextDefaultFilename();
-          this.embedDrawing(filename);
-          this.createDrawing(filename, true);
+          insertDrawingToDoc(true);
          return true;
        }
      },
@@ -517,9 +612,7 @@ export default class ExcalidrawPlugin extends Plugin {
        if (checking) {
          return (this.app.workspace.activeLeaf.view.getViewType() == "markdown");
        } else {
-          const filename = this.getNextDefaultFilename();
-          this.embedDrawing(filename);
-          this.createDrawing(filename, false);
+          insertDrawingToDoc(false);
          return true;
        }
      },
@@ -591,7 +684,7 @@ export default class ExcalidrawPlugin extends Plugin {
        } else {
          const view = this.app.workspace.activeLeaf.view;
          if (view instanceof ExcalidrawView) {
-            this.openDialog.insertLink(view.file.path,view.addText);
+            this.insertLinkDialog.start(view.file.path,view.addText);
            return true;
          }
          else return false;
@@ -692,7 +785,7 @@ export default class ExcalidrawPlugin extends Plugin {
    const filename = file.name.substr(0,file.name.lastIndexOf(".excalidraw")) + (replaceExtension ? ".md" : ".excalidraw.md");
    const fname = getNewUniqueFilepath(this.app.vault,filename,normalizePath(file.path.substr(0,file.path.lastIndexOf(file.name))));
    console.log(fname);
-    const result = await this.app.vault.create(fname,FRONTMATTER + exportSceneToMD(data));
+    const result = await this.app.vault.create(fname,FRONTMATTER + this.exportSceneToMD(data));
    if (this.settings.keepInSync) {
      ['.svg','.png'].forEach( (ext:string)=>{
        const oldIMGpath = file.path.substring(0,file.path.lastIndexOf(".excalidraw")) + ext;   
@@ -850,7 +943,7 @@ export default class ExcalidrawPlugin extends Plugin {
      const deleteEventHandler = async (file:TFile) => {
        if (!(file instanceof TFile)) return;     
        //@ts-ignore
-        const isExcalidarwFile = (file.unsafeCachedData && file.unsafeCachedData.search(/---\n[\s\S]*excalidraw-plugin:\s*(locked|unlocked)\n[\s\S]*---/gm)>-1) 
+        const isExcalidarwFile = (file.unsafeCachedData && file.unsafeCachedData.search(/---[\r\n]+[\s\S]*excalidraw-plugin:\s*\w+[\r\n]+[\s\S]*---/gm)>-1) 
                                 || (file.extension=="excalidraw");
        if(!isExcalidarwFile) return;

@@ -878,14 +971,11 @@ export default class ExcalidrawPlugin extends Plugin {
      );

      //save open drawings when user quits the application
-      const quitEventHandler = (tasks: Tasks) => {
+      const quitEventHandler = async (tasks: Tasks) => {
        const leaves = self.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);      
        for (let i=0;i<leaves.length;i++) {
-          (leaves[i].view as ExcalidrawView).save(); 
+          await (leaves[i].view as ExcalidrawView).save(true); 
        }
-        this.settings.drawingOpenCount += this.opencount;
-        this.settings.loadCount++;
-        //this.saveSettings();
      }
      self.registerEvent(
        self.app.workspace.on("quit",quitEventHandler)
@@ -929,7 +1019,18 @@ export default class ExcalidrawPlugin extends Plugin {
    const activeView = this.app.workspace.getActiveViewOfType(MarkdownView);
    if(activeView) {
      const editor = activeView.editor;
-      editor.replaceSelection("![["+data+"]]");
+      switch (this.settings.embedType) {
+        case "excalidraw":
+          editor.replaceSelection("![["+data+"]]");
+          break;
+        case "PNG":
+          editor.replaceSelection("![["+data.substr(0,data.lastIndexOf("."))+".png]] ([["+data+"|*]])");
+          break;
+        case "SVG": 
+          editor.replaceSelection("![["+data.substr(0,data.lastIndexOf("."))+".svg]] ([["+data+"|*]])");
+          break;
+      }
+      
      editor.focus();
    }
  
@@ -948,7 +1049,7 @@ export default class ExcalidrawPlugin extends Plugin {
  }

  public setStencilLibrary(library:string) {
-      this.settings.library = library;
+    this.settings.library = library;
  }

  public triggerEmbedUpdates(filepath?:string){
@@ -1002,13 +1103,42 @@ export default class ExcalidrawPlugin extends Plugin {
    if (this.settings.compatibilityMode) {
      return BLANK_DRAWING;
    }
-    return FRONTMATTER + '\n# Drawing\n'
-           + String.fromCharCode(96)+String.fromCharCode(96)+String.fromCharCode(96)+'json\n' 
-           + BLANK_DRAWING + '\n'
-           + String.fromCharCode(96)+String.fromCharCode(96)+String.fromCharCode(96);
+    return FRONTMATTER + '\n' + this.getMarkdownDrawingSection(BLANK_DRAWING);
  }

-  public async createDrawing(filename: string, onNewPane: boolean, foldername?: string, initData?:string) {
+  public getMarkdownDrawingSection(jsonString: string) {
+    return '%%\n# Drawing\n'
+    + String.fromCharCode(96)+String.fromCharCode(96)+String.fromCharCode(96)+'json\n' 
+    + jsonString + '\n'
+    + String.fromCharCode(96)+String.fromCharCode(96)+String.fromCharCode(96) + '%%';
+  }
+
+  /**
+  * Extracts the text elements from an Excalidraw scene into a string of ids as headers followed by the text contents
+  * @param {string} data - Excalidraw scene JSON string
+  * @returns {string} - Text starting with the "# Text Elements" header and followed by each "## id-value" and text
+  */
+  public exportSceneToMD(data:string): string {
+    if(!data) return "";
+    const excalidrawData = JSON_parse(data);
+    const textElements = excalidrawData.elements?.filter((el:any)=> el.type=="text")
+    let outString = '# Text Elements\n';
+    let id:string;
+    for (const te of textElements) {
+      id = te.id;
+      //replacing Excalidraw text IDs with my own, because default IDs may contain 
+      //characters not recognized by Obsidian block references
+      //also Excalidraw IDs are inconveniently long
+      if(te.id.length>8) {  
+        id=nanoid();
+        data = data.replaceAll(te.id,id); //brute force approach to replace all occurances.
+      }
+      outString += te.text+' ^'+id+'\n\n';
+    }
+    return outString + this.getMarkdownDrawingSection(JSON.stringify(JSON_parse(data)));
+  }
+
+  public async createDrawing(filename: string, onNewPane: boolean, foldername?: string, initData?:string):Promise<string> {
    const folderpath = normalizePath(foldername ? foldername: this.settings.folder);
    await checkAndCreateFolder(this.app.vault,folderpath); //create folder if it does not exist

@@ -1016,10 +1146,11 @@ export default class ExcalidrawPlugin extends Plugin {

    if(initData) {
      this.openDrawing(await this.app.vault.create(fname,initData),onNewPane);
-      return;
+      return fname;
    }

    this.openDrawing(await this.app.vault.create(fname,await this.getBlankDrawing()), onNewPane);
+    return fname;
  }

  public async setMarkdownView(leaf: WorkspaceLeaf) {
@@ -1041,7 +1172,7 @@ export default class ExcalidrawPlugin extends Plugin {
    } as ViewState);
  }

-  isExcalidrawFile(f:TFile) {
+  public isExcalidrawFile(f:TFile) {
    if(f.extension=="excalidraw") return true;
    const fileCache = this.app.metadataCache.getFileCache(f);
    return !!fileCache?.frontmatter && !!fileCache.frontmatter[FRONTMATTER_KEY];
--- a/src/openDrawing.ts
+++ b/src/openDrawing.ts
@@ -12,7 +12,6 @@ import {t} from './lang/helpers'
 export enum openDialogAction {
  openFile,
  insertLinkToDrawing,
-  insertLink
 }

 export class OpenFileDialog extends FuzzySuggestModal<TFile> {
@@ -20,8 +19,6 @@ export class OpenFileDialog extends FuzzySuggestModal<TFile> {
  private plugin: ExcalidrawPlugin;
  private action: openDialogAction;
  private onNewPane: boolean;
-  private addText: Function;
-  private drawingPath: string;

  constructor(app: App, plugin: ExcalidrawPlugin) {
    super(app);
@@ -29,6 +26,11 @@ export class OpenFileDialog extends FuzzySuggestModal<TFile> {
    this.action = openDialogAction.openFile;
    this.plugin = plugin;
    this.onNewPane = false;
+    this.limit = 20;
+    this.setInstructions([{
+      command: t("TYPE_FILENAME"),
+      purpose: "",
+    }]);
    
    this.inputEl.onkeyup = (e) => {
      if(e.key=="Enter" && this.action == openDialogAction.openFile) {
@@ -42,10 +44,7 @@ export class OpenFileDialog extends FuzzySuggestModal<TFile> {

  getItems(): TFile[] {
    const excalidrawFiles = this.app.vault.getFiles();
-    return (excalidrawFiles || []).filter((f:TFile) => {
-      if (this.action == openDialogAction.insertLink) return true;
-      return this.plugin.isExcalidrawFile(f);
-    });
+    return (excalidrawFiles || []).filter((f:TFile) => this.plugin.isExcalidrawFile(f));
  }

  getItemText(item: TFile): string {
@@ -60,32 +59,10 @@ export class OpenFileDialog extends FuzzySuggestModal<TFile> {
      case(openDialogAction.insertLinkToDrawing):
        this.plugin.embedDrawing(item.path);
        break;
-      case(openDialogAction.insertLink):
-        //TO-DO
-        const filepath = this.app.metadataCache.fileToLinktext(item,this.drawingPath,true);
-        this.addText("[["+filepath+"]]"); 
-        break;
    }
  }

-  public insertLink(drawingPath:string, addText: Function) {
-    this.action = openDialogAction.insertLink;
-    this.addText = addText;
-    this.drawingPath = drawingPath;
-    this.setInstructions([{
-      command: t("SELECT_FILE"),
-      purpose: "",
-    }]);
-    this.emptyStateText = t("NO_MATCH");
-    this.setPlaceholder(t("SELECT_FILE_TO_LINK"));
-    this.open();
-  }
-
  public start(action:openDialogAction, onNewPane: boolean): void {
-    this.setInstructions([{
-      command: t("TYPE_FILENAME"),
-      purpose: "",
-    }]);
    this.action = action;
    this.onNewPane = onNewPane;
    switch(action) {
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -1,5 +1,6 @@
 import {
  App, 
+  DropdownComponent, 
  PluginSettingTab, 
  Setting,
  TFile
@@ -14,11 +15,15 @@ export interface ExcalidrawSettings {
  templateFilePath: string,
  drawingFilenamePrefix: string,
  drawingFilenameDateTime: string,
+  displaySVGInPreview: boolean,
  width: string,
+  zoomToFitOnResize: boolean,
  showLinkBrackets: boolean,
  linkPrefix: string,
-  //autosave: boolean;
+  urlPrefix: string,
  allowCtrlClick: boolean, //if disabled only the link button in the view header will open links 
+  forceWrap: boolean,
+  pageTransclusionCharLimit: number,
  pngExportScale: number,
  exportWithTheme: boolean,
  exportWithBackground: boolean,
@@ -26,6 +31,7 @@ export interface ExcalidrawSettings {
  autoexportSVG: boolean,
  autoexportPNG: boolean,
  autoexportExcalidraw: boolean,
+  embedType: "excalidraw"|"PNG"|"SVG",
  syncExcalidraw: boolean,
  compatibilityMode: boolean,
  experimentalFileType: boolean,
@@ -33,6 +39,7 @@ export interface ExcalidrawSettings {
  loadCount: number, //version 1.2 migration counter
  drawingOpenCount: number,
  library: string,
+  patchCommentBlock: boolean, //1.3.12 
 }

 export const DEFAULT_SETTINGS: ExcalidrawSettings = {
@@ -40,11 +47,15 @@ export const DEFAULT_SETTINGS: ExcalidrawSettings = {
  templateFilePath: 'Excalidraw/Template.excalidraw',
  drawingFilenamePrefix: 'Drawing ',
  drawingFilenameDateTime: 'YYYY-MM-DD HH.mm.ss',
+  displaySVGInPreview: true,
  width: '400',
+  zoomToFitOnResize: true,
  linkPrefix: "📍",
+  urlPrefix: "🌐",
  showLinkBrackets: true,
-  //autosave: false,
  allowCtrlClick: true,
+  forceWrap: false,
+  pageTransclusionCharLimit: 200,
  pngExportScale: 1,
  exportWithTheme: true,
  exportWithBackground: true,
@@ -52,6 +63,7 @@ export const DEFAULT_SETTINGS: ExcalidrawSettings = {
  autoexportSVG: false,
  autoexportPNG: false,
  autoexportExcalidraw: false,
+  embedType: "excalidraw",
  syncExcalidraw: false,
  experimentalFileType: false,
  experimentalFileTag: "✏️",
@@ -59,20 +71,60 @@ export const DEFAULT_SETTINGS: ExcalidrawSettings = {
  loadCount: 0,
  drawingOpenCount: 0,
  library: `{"type":"excalidrawlib","version":1,"library":[]}`,
+  patchCommentBlock: true,
 }

 export class ExcalidrawSettingTab extends PluginSettingTab {
  plugin: ExcalidrawPlugin;
+  private requestEmbedUpdate:boolean = false;
+  private requestReloadDrawings:boolean = false;
+  private applyDebounceTimer: number = 0;

  constructor(app: App, plugin: ExcalidrawPlugin) {
    super(app, plugin);
    this.plugin = plugin;
  }

+  applySettingsUpdate(requestReloadDrawings:boolean = false) {
+    clearTimeout(this.applyDebounceTimer);
+    const plugin = this.plugin;
+    this.applyDebounceTimer = window.setTimeout(() => {
+      plugin.saveSettings();
+    }, 200);
+    if(requestReloadDrawings) this.requestReloadDrawings = true;
+  }
+
+  async hide() {
+    if(this.requestReloadDrawings) {
+      const exs = this.plugin.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
+      for(const v of exs) {
+        if(v.view instanceof ExcalidrawView) {
+          await v.view.save(false);
+          await v.view.reload(true);
+        }
+      }
+      this.requestEmbedUpdate = true;
+    }
+    if(this.requestEmbedUpdate) this.plugin.triggerEmbedUpdates();
+  }
+
  display(): void {
+    this.requestEmbedUpdate = false;
+    this.requestReloadDrawings = false;
    let {containerEl} = this;
    this.containerEl.empty();

+    const coffeeDiv = containerEl.createDiv('coffee');
+		coffeeDiv.addClass('ex-coffee-div');
+		const coffeeLink = coffeeDiv.createEl('a', { href: 'https://ko-fi.com/zsolt' });
+		const coffeeImg = coffeeLink.createEl('img', {
+			attr: {
+				src: 'https://cdn.ko-fi.com/cdn/kofi3.png?v=3',
+			},
+		});
+		coffeeImg.height = 45;
+
+
    new Setting(containerEl)
    .setName(t("FOLDER_NAME")) 
    .setDesc(t("FOLDER_DESC"))
@@ -81,7 +133,7 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
      .setValue(this.plugin.settings.folder)
      .onChange(async (value) => {
        this.plugin.settings.folder = value;
-        await this.plugin.saveSettings();
+        this.applySettingsUpdate();
      }));

    new Setting(containerEl)
@@ -92,31 +144,9 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .setValue(this.plugin.settings.templateFilePath)
        .onChange(async (value) => {
          this.plugin.settings.templateFilePath = value;
-          await this.plugin.saveSettings();
+          this.applySettingsUpdate();
        }));

-/*    new Setting(containerEl)
-      .setName(t("AUTOSAVE_NAME")) 
-      .setDesc(t("AUTOSAVE_DESC"))
-      .addToggle(toggle => toggle
-        .setValue(this.plugin.settings.autosave)
-        .onChange(async (value) => {
-          this.plugin.settings.autosave = value;
-          await this.plugin.saveSettings();
-          const exs = this.plugin.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
-          for(const v of exs) {
-            if(v.view instanceof ExcalidrawView) {
-              if(v.view.autosaveTimer) {
-                clearInterval(v.view.autosaveTimer)
-                v.view.autosaveTimer = null;
-              }
-              if(value) { 
-                v.view.setupAutosaveTimer();
-              }
-            }
-          }          
-        }));*/
-
    this.containerEl.createEl('h1', {text: t("FILENAME_HEAD")});
    containerEl.createDiv('',(el) => {
      el.innerHTML = t("FILENAME_DESC");
@@ -142,7 +172,7 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
          this.plugin.settings.drawingFilenamePrefix = value.replaceAll(/[<>:"/\\|?*]/g,'_');
          text.setValue(this.plugin.settings.drawingFilenamePrefix);
          filenameEl.innerHTML = getFilenameSample();
-          await this.plugin.saveSettings();
+          this.applySettingsUpdate();
        }));

    new Setting(containerEl)
@@ -155,23 +185,23 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
          this.plugin.settings.drawingFilenameDateTime = value.replaceAll(/[<>:"/\\|?*]/g,'_');
          text.setValue(this.plugin.settings.drawingFilenameDateTime);
          filenameEl.innerHTML = getFilenameSample();
-          await this.plugin.saveSettings();
+          this.applySettingsUpdate();
+        }));
+
+    this.containerEl.createEl('h1', {text: t("DISPLAY_HEAD")});
+    new Setting(containerEl)
+      .setName(t("ZOOM_TO_FIT_NAME")) 
+      .setDesc(t("ZOOM_TO_FIT_DESC"))
+      .addToggle(toggle => toggle
+        .setValue(this.plugin.settings.zoomToFitOnResize)
+        .onChange(async (value) => {
+          this.plugin.settings.zoomToFitOnResize = value;
+          this.applySettingsUpdate();
        }));

    this.containerEl.createEl('h1', {text: t("LINKS_HEAD")});
    this.containerEl.createEl('p',{
      text: t("LINKS_DESC")});
-    
-    const reloadDrawings = async () => {
-      const exs = this.plugin.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
-      for(const v of exs) {
-        if(v.view instanceof ExcalidrawView) {
-          await v.view.save(false);
-          v.view.reload(true);
-        }
-      }
-      this.plugin.triggerEmbedUpdates();
-    }

    new Setting(containerEl)
      .setName(t("LINK_BRACKETS_NAME")) 
@@ -180,20 +210,30 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .setValue(this.plugin.settings.showLinkBrackets)
        .onChange(async (value) => {
          this.plugin.settings.showLinkBrackets = value;
-          await this.plugin.saveSettings();
-          reloadDrawings();
+          this.applySettingsUpdate(true);
        }));
    
    new Setting(containerEl)
      .setName(t("LINK_PREFIX_NAME"))
      .setDesc(t("LINK_PREFIX_DESC"))
      .addText(text => text
-        .setPlaceholder('📍')
+        .setPlaceholder(t("INSERT_EMOJI"))
        .setValue(this.plugin.settings.linkPrefix)
-        .onChange(async (value) => {
+        .onChange((value) => {
+          console.log(value);
          this.plugin.settings.linkPrefix = value;
-          await this.plugin.saveSettings();
-          reloadDrawings();
+          this.applySettingsUpdate(true);
+        }));
+  
+    new Setting(containerEl)
+      .setName(t("URL_PREFIX_NAME"))
+      .setDesc(t("URL_PREFIX_DESC"))
+      .addText(text => text
+        .setPlaceholder(t("INSERT_EMOJI"))
+        .setValue(this.plugin.settings.urlPrefix)
+        .onChange(async (value) => {
+          this.plugin.settings.urlPrefix = value;
+          this.applySettingsUpdate(true);
        }));

    new Setting(containerEl)
@@ -203,11 +243,57 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .setValue(this.plugin.settings.allowCtrlClick)
        .onChange(async (value) => {
          this.plugin.settings.allowCtrlClick = value;
-          await this.plugin.saveSettings();
+          this.applySettingsUpdate();
        }));

+    const s = new Setting(containerEl)
+      .setName(t("TRANSCLUSION_WRAP_NAME")) 
+      .setDesc(t("TRANSCLUSION_WRAP_DESC"))
+      .addToggle(toggle => toggle
+        .setValue(this.plugin.settings.forceWrap)
+        .onChange(async (value) => {
+          this.plugin.settings.forceWrap = value;
+          this.applySettingsUpdate(true);
+        }));
+    s.descEl.innerHTML="<code>![[doc#^ref]]{number}</code> "+t("TRANSCLUSION_WRAP_DESC");
+
+    new Setting(containerEl)
+      .setName(t("PAGE_TRANSCLUSION_CHARCOUNT_NAME")) 
+      .setDesc(t("PAGE_TRANSCLUSION_CHARCOUNT_DESC"))
+      .addText(text => text
+        .setPlaceholder('Enter a number')
+        .setValue(this.plugin.settings.pageTransclusionCharLimit.toString())
+        .onChange(async (value) => {
+          const intVal = parseInt(value);
+          if(isNaN(intVal) && value!=="") {
+            text.setValue(this.plugin.settings.pageTransclusionCharLimit.toString());
+            return;
+          } 
+          this.requestEmbedUpdate = true;
+          if(value === "") {
+            this.plugin.settings.pageTransclusionCharLimit = 10;
+            this.applySettingsUpdate(true);
+            return;
+          }
+          this.plugin.settings.pageTransclusionCharLimit = intVal;
+          text.setValue(this.plugin.settings.pageTransclusionCharLimit.toString());
+          this.applySettingsUpdate(true);
+        }));  
+
    this.containerEl.createEl('h1', {text: t("EMBED_HEAD")});

+
+    new Setting(containerEl)
+    .setName(t("EMBED_PREVIEW_SVG_NAME")) 
+    .setDesc(t("EMBED_PREVIEW_SVG_DESC"))
+    .addToggle(toggle => toggle
+      .setValue(this.plugin.settings.displaySVGInPreview)
+      .onChange(async (value) => {
+        this.plugin.settings.displaySVGInPreview = value;
+        this.applySettingsUpdate();
+      }));
+
+
    new Setting(containerEl)
      .setName(t("EMBED_WIDTH_NAME")) 
      .setDesc(t("EMBED_WIDTH_DESC"))
@@ -216,9 +302,42 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .setValue(this.plugin.settings.width)
        .onChange(async (value) => {
          this.plugin.settings.width = value;
-          await this.plugin.saveSettings();
-          this.plugin.triggerEmbedUpdates();
-        }));
+          this.applySettingsUpdate();
+          this.requestEmbedUpdate = true;
+        }));  
+
+    let dropdown: DropdownComponent;
+
+    new Setting(containerEl)
+      .setName(t("EMBED_TYPE_NAME"))
+      .setDesc(t("EMBED_TYPE_DESC"))
+      .addDropdown(async (d:DropdownComponent) => {
+        dropdown = d;
+        dropdown.addOption("excalidraw","excalidraw")
+        if(this.plugin.settings.autoexportPNG) {
+          dropdown.addOption("PNG","PNG");
+        } else {
+          if(this.plugin.settings.embedType === "PNG") {
+            this.plugin.settings.embedType = "excalidraw";
+            this.applySettingsUpdate();
+          }
+        }
+        if(this.plugin.settings.autoexportSVG) {
+          dropdown.addOption("SVG","SVG");
+        } else {
+          if(this.plugin.settings.embedType === "SVG") {
+            this.plugin.settings.embedType = "excalidraw";
+            this.applySettingsUpdate();
+          }
+        }
+        dropdown
+          .setValue(this.plugin.settings.embedType)
+          .onChange(async (value)=>{
+            //@ts-ignore
+            this.plugin.settings.embedType = value;        
+            this.applySettingsUpdate();
+          });
+      });

    let scaleText:HTMLDivElement;

@@ -231,7 +350,7 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .onChange(async (value)=> {
          scaleText.innerText = " " + value.toString();
          this.plugin.settings.pngExportScale = value;
-          this.plugin.saveSettings();
+          this.applySettingsUpdate();
        }))
        .settingEl.createDiv('',(el)=>{
          scaleText = el;
@@ -247,8 +366,8 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .setValue(this.plugin.settings.exportWithBackground)
        .onChange(async (value) => {
          this.plugin.settings.exportWithBackground = value;
-          await this.plugin.saveSettings();
-          this.plugin.triggerEmbedUpdates();
+          this.applySettingsUpdate();
+          this.requestEmbedUpdate = true;
        }));
    
    new Setting(containerEl)
@@ -258,8 +377,8 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .setValue(this.plugin.settings.exportWithTheme)
        .onChange(async (value) => {
          this.plugin.settings.exportWithTheme = value;
-          await this.plugin.saveSettings();
-          this.plugin.triggerEmbedUpdates();
+          this.applySettingsUpdate();
+          this.requestEmbedUpdate = true;
        }));
    
    this.containerEl.createEl('h1', {text: t("EXPORT_HEAD")});
@@ -271,17 +390,35 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .setValue(this.plugin.settings.keepInSync)
        .onChange(async (value) => {
          this.plugin.settings.keepInSync = value;
-          await this.plugin.saveSettings();
+          this.applySettingsUpdate();
        }));
        
+    const removeDropdownOption = (opt: string) => {
+      let i=0;
+      for(i=0;i<dropdown.selectEl.options.length;i++) {
+        if((dropdown.selectEl.item(i) as HTMLOptionElement).label===opt) {
+          dropdown.selectEl.item(i).remove();
+        }
+      }
+    }
+
    new Setting(containerEl)
      .setName(t("EXPORT_SVG_NAME")) 
      .setDesc(t("EXPORT_SVG_DESC"))
      .addToggle(toggle => toggle
        .setValue(this.plugin.settings.autoexportSVG)
        .onChange(async (value) => {
+          if(value) {
+            dropdown.addOption("SVG","SVG");
+          } else {
+            if (this.plugin.settings.embedType === "SVG") {
+              dropdown.setValue("excalidraw");
+              this.plugin.settings.embedType = "excalidraw";
+            }
+            removeDropdownOption("SVG");
+          }
          this.plugin.settings.autoexportSVG = value;
-          await this.plugin.saveSettings();
+          this.applySettingsUpdate();
        }));

        
@@ -291,8 +428,17 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
    .addToggle(toggle => toggle
      .setValue(this.plugin.settings.autoexportPNG)
      .onChange(async (value) => {
+        if(value) {
+          dropdown.addOption("PNG","PNG");
+        } else {
+          if (this.plugin.settings.embedType === "PNG") {
+            dropdown.setValue("excalidraw");
+            this.plugin.settings.embedType = "excalidraw";
+          }
+          removeDropdownOption("PNG");
+        }
        this.plugin.settings.autoexportPNG = value;
-        await this.plugin.saveSettings();
+        this.applySettingsUpdate();
      }));
         
    this.containerEl.createEl('h1', {text: t("COMPATIBILITY_HEAD")});
@@ -304,7 +450,7 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .setValue(this.plugin.settings.compatibilityMode)
        .onChange(async (value) => {
          this.plugin.settings.compatibilityMode = value;
-          await this.plugin.saveSettings();
+          this.applySettingsUpdate();
        }));

    new Setting(containerEl)
@@ -314,7 +460,7 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .setValue(this.plugin.settings.autoexportExcalidraw)
        .onChange(async (value) => {
          this.plugin.settings.autoexportExcalidraw = value;
-          await this.plugin.saveSettings();
+          this.applySettingsUpdate();
        }));

    new Setting(containerEl)
@@ -324,7 +470,7 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
          .setValue(this.plugin.settings.syncExcalidraw)
          .onChange(async (value) => {
            this.plugin.settings.syncExcalidraw = value;
-            await this.plugin.saveSettings();
+            this.applySettingsUpdate();
          }));

    this.containerEl.createEl('h1', {text: t("EXPERIMENTAL_HEAD")});
@@ -338,18 +484,18 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
        .onChange(async (value) => {
          this.plugin.settings.experimentalFileType = value;
          this.plugin.experimentalFileTypeDisplayToggle(value);
-          await this.plugin.saveSettings();
+          this.applySettingsUpdate();
        }));

    new Setting(containerEl)
    .setName(t("FILETAG_NAME")) 
    .setDesc(t("FILETAG_DESC"))
    .addText(text => text
-      .setPlaceholder('✏️')
+      .setPlaceholder(t("INSERT_EMOJI"))
      .setValue(this.plugin.settings.experimentalFileTag)
      .onChange(async (value) => {
        this.plugin.settings.experimentalFileTag = value;
-        await this.plugin.saveSettings();
+        this.applySettingsUpdate();
      }));    
  }
 }
--- a/styles.css
+++ b/styles.css
@@ -81,12 +81,17 @@ li[data-testid] {
  box-shadow: 0 !important;
  background-color: transparent !important;
 }
-/*
-@font-face {
-  font-family: "Virgil";
-  src: url("https://excalidraw.com/Virgil.woff2");
+
+.disable-zen-mode--visible {
+  color: var(--text-primary-color);
+}
+
+.disable-zen-mode {
+  width: 9em !important;
+}
+
+.ex-coffee-div {
+	text-align: center;
+	margin-bottom: 20px;
+  
 }
-@font-face {
-  font-family: "Cascadia";
-  src: url("https://excalidraw.com/Cascadia.woff2");
-}*/
--- a/versions.json
+++ b/versions.json
@@ -1,3 +1,3 @@
 {
-  "1.2.12": "0.11.13"
+  "1.3.16": "0.11.13"
 }
--- a/yarn.lock
+++ b/yarn.lock
@@ -1024,10 +1024,10 @@
  dependencies:
    "@types/estree" "*"

-"@zsviczian/excalidraw@^0.9.0-onTextEditEvents-4":
-  "integrity" "sha512-4W/s1gbsOCpSerqgog6Nu38doy6n1h+aEy5q7DS/nodJVca5bc6wj+OcUJJeajw7NabkKofOI2RYOVw3oMgJcw=="
-  "resolved" "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.9.0-onTextEditEvents-4.tgz"
-  "version" "0.9.0-onTextEditEvents-4"
+"@zsviczian/excalidraw@0.9.0-obsidian-image-support-3":
+  "integrity" "sha512-Y+hIhIxoNsoyYS2AmhE9I8G0M6Q6KaQ3LxSn8p3JZbUGFqoAmDg+26fGHXhMsboaVXhKqonkw5UN1UlZYL5k1A=="
+  "resolved" "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.9.0-obsidian-image-support-3.tgz"
+  "version" "0.9.0-obsidian-image-support-3"

 "abab@^1.0.3":
  "integrity" "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4="
@@ -2788,12 +2788,6 @@
  optionalDependencies:
    "fsevents" "~2.3.2"

-"chokidar2@file:./chokidar2":
-  "resolved" "file:node_modules/watchpack/chokidar2"
-  "version" "2.0.0"
-  dependencies:
-    "chokidar" "^2.1.8"
-
 "ci-info@^1.5.0":
  "integrity" "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="
  "resolved" "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz"
@@ -6897,10 +6891,10 @@
  dependencies:
    "isobject" "^3.0.1"

-"obsidian@^0.12.11":
-  "integrity" "sha512-Kv4m1n4nfd17FzpqHZfqFS2YZAyY+cxAUM7/5jqh1bmbPlmKoNd1XJZC7o9KvkXfTCxALiXfGRdrjHB+GUFAEA=="
-  "resolved" "https://registry.npmjs.org/obsidian/-/obsidian-0.12.11.tgz"
-  "version" "0.12.11"
+"obsidian@^0.12.16":
+  "integrity" "sha512-YwwhYrmlv71A/ntTiGOyGaqr9ONhKPE1OKN1tcHovLJC0N/BRZ7XlGpzaN1T3BnAE5H8DmYLsAI3h67u6eJPGQ=="
+  "resolved" "https://registry.npmjs.org/obsidian/-/obsidian-0.12.16.tgz"
+  "version" "0.12.16"
  dependencies:
    "@types/codemirror" "0.0.108"
    "moment" "2.29.1"
Author	SHA1	Message	Date
Zsolt Viczian	78fb37b173	Excalidraw Image Element Demo	2021-10-02 17:34:13 +02:00
Zsolt Viczian	a17638717f	api documentation updated	2021-10-01 21:01:11 +02:00
Zsolt Viczian	70de8ba2f8	1.3.16	2021-10-01 20:59:02 +02:00
Zsolt Viczian	e8a29a2715	1.3.15	2021-09-29 06:50:51 +02:00
Zsolt Viczian	7b1f13391c	1.3.14 rawText copy/paste	2021-09-28 22:58:02 +02:00
Zsolt Viczian	33081b1a84	1.3.13	2021-09-27 19:45:05 +02:00
Zsolt Viczian	aafd9f17f8	1.3.12	2021-09-25 19:56:46 +02:00
zsviczian	a27da5f5f5	Update README.md	2021-09-23 12:36:06 +02:00
Zsolt Viczian	472b58a417	1.3.11	2021-09-21 19:12:55 +02:00
zsviczian	1bba254eaf	Update README.md	2021-09-19 15:55:31 +02:00
Zsolt Viczian	a0e47c390c	1.3.10 Deployed improved Excalidraw freehand	2021-09-19 08:18:24 +02:00
Zsolt Viczian	caa1281d23	1.3.9	2021-09-17 21:54:01 +02:00
Zsolt Viczian	3fb2cbba14	1.3.8	2021-09-16 20:39:04 +02:00
Zsolt Viczian	8f1ec2acbc	addBlob scale fixed	2021-09-14 22:52:08 +02:00
Zsolt Viczian	3e2d85dd09	ExcalidrawAutomate blob,line,scale	2021-09-14 22:38:03 +02:00
Zsolt Viczian	ec3e9fd5b7	1.3.7 kanban support, onDrop fix	2021-09-12 17:16:50 +02:00
Zsolt Viczian	784a7cb6bf	1.3.6 accept text drop, improved addElement	2021-09-11 12:07:30 +02:00
Zsolt Viczian	e8666797d7	1.3.5	2021-09-10 16:16:13 +02:00
zsviczian	5c2c1ebf5e	added error messages	2021-09-09 10:46:14 +02:00
Zsolt Viczian	ecd19dd072	1.3.4 ea.viewToggleFullScreen()	2021-09-09 06:31:36 +02:00
Zsolt Viczian	377927c891	1.3.3 force-overflow text wrapping	2021-09-05 22:01:22 +02:00
Zsolt Viczian	9f28c974f7	1.3.2 - fixed EA.create()	2021-09-05 08:02:46 +02:00
Zsolt Viczian	1b9fa6a790	1.3.1 Drag&Drop + zoomToFit + no chunking	2021-09-04 23:37:43 +02:00
Zsolt Viczian	4dd8271223	zoomToFit change	2021-09-04 17:46:06 +02:00
Zsolt Viczian	3e62cd33a2	documentation improved	2021-09-03 19:58:51 +02:00
Zsolt Viczian	c670ecb09c	1.3.0	2021-09-03 18:47:25 +02:00
zsviczian	f5307db33e	Update introduction.md	2021-09-03 09:30:36 +02:00
zsviczian	7e216306c0	Update introduction.md	2021-09-03 09:30:05 +02:00
zsviczian	e3daf5d22e	Update introduction.md	2021-09-03 09:29:37 +02:00
zsviczian	a85a46cbae	Update introduction.md	2021-09-03 09:27:52 +02:00
Zsolt Viczian	ac16f5427b	Excalidraw Automate enhancements	2021-09-03 09:26:24 +02:00
Zsolt Viczian	edc92472df	addElementsToView()	2021-09-01 22:20:07 +02:00
Zsolt Viczian	e66b7aef7f	1.2.24 gridSize	2021-08-31 20:40:25 +02:00
Zsolt Viczian	7e9d5e8867	1.2.23	2021-08-29 18:58:56 +02:00
Zsolt Viczian	167918f718	published wrapText to Excalidraw Automate	2021-08-29 11:25:02 +02:00
Zsolt Viczian	65af29c2ef	Merge branch 'master' of https://github.com/zsviczian/obsidian-excalidraw-plugin	2021-08-29 10:31:59 +02:00
Zsolt Viczian	b19e1b6dcb	1.2.22	2021-08-29 10:31:35 +02:00
zsviczian	f7263543fa	Update README.md	2021-08-28 16:31:41 +02:00
Zsolt Viczian	c6339b28ac	1.2.21 - blockquote transclusion fixed	2021-08-28 16:20:43 +02:00
Zsolt Viczian	f24e4fce9c	1.2.20 wrapText()	2021-08-28 15:56:45 +02:00
Zsolt Viczian	5eff9b2e54	1.2.19	2021-08-28 11:57:09 +02:00
Zsolt Viczian	d89c019612	1.2.18	2021-08-27 19:12:29 +02:00
Zsolt Viczian	01d3c13cce	1.2.17	2021-08-25 20:48:36 +02:00
Zsolt Viczian	de68ebbe7d	1.2.16	2021-08-22 13:05:47 +02:00
Zsolt Viczian	caee4f7500	1.2.16	2021-08-22 12:38:09 +02:00
Zsolt Viczian	6d28546677	1.2.15 - link preview inside Excalidraw	2021-08-21 23:01:12 +02:00
Zsolt Viczian	ec5a13f9e4	1.2.14	2021-08-10 20:57:12 +02:00
Zsolt Viczian	b788118880	1.2.13	2021-08-05 21:47:44 +02:00