2.5.0-rc-1

manifest-beta.json

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

package.json

@@ -19,7 +19,7 @@
   "license": "MIT",
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "@zsviczian/excalidraw": "0.17.1-obsidian-52",
+    "@zsviczian/excalidraw": "0.17.1-obsidian-53",
     "chroma-js": "^2.4.2",
     "clsx": "^2.0.0",
     "@zsviczian/colormaster": "^1.2.2",

src/ExcalidrawAutomate.ts

@@ -281,8 +281,17 @@ export class ExcalidrawAutomate {
     return LZString.compressToBase64(str);
   }
 
-  public decompressFromBase64(str:string): string {
-    return LZString.decompressFromBase64(str);
+  public decompressFromBase64(data:string): string {
+    if (!data) throw new Error("No input string provided for decompression.");
+    let cleanedData = '';
+    const length = data.length;
+    for (let i = 0; i < length; i++) {
+      const char = data[i];
+      if (char !== '\\n' && char !== '\\r') {
+        cleanedData += char;
+      }
+    }
+    return LZString.decompressFromBase64(cleanedData);
   }
 
   /**

src/ExcalidrawView.ts

@@ -2337,8 +2337,8 @@ export default class ExcalidrawView extends TextFileView {
 
     if (this.plugin.settings.gridSettings.DYNAMIC_COLOR) {
       // Dynamic color: concatenate opacity to the HEX string  
-      Regular = (isDark ? cm.lighterBy(7) : cm.darkerBy(7)).alphaTo(opacity).stringRGB({ alpha: true });
-      Bold = (isDark ? cm.lighterBy(14) : cm.darkerBy(14)).alphaTo(opacity).stringRGB({ alpha: true });
+      Regular = (isDark ? cm.lighterBy(10) : cm.darkerBy(10)).alphaTo(opacity).stringRGB({ alpha: true });
+      Bold = (isDark ? cm.lighterBy(5) : cm.darkerBy(5)).alphaTo(opacity).stringRGB({ alpha: true });
     } else {
       // Custom color handling
       const customCM = this.plugin.ea.getCM(this.plugin.settings.gridSettings.COLOR);
@@ -3362,6 +3362,13 @@ export default class ExcalidrawView extends TextFileView {
       toDelete.forEach((k) => delete files[k]);
     }
 
+    const activeTool = st.activeTool;
+    if(activeTool.type!=="freedraw") {
+      activeTool.type = "selection";
+    }
+    activeTool.customType = null;
+    activeTool.lastActiveTool = null;
+
     return {
       type: "excalidraw",
       version: 2,
@@ -3396,7 +3403,7 @@ export default class ExcalidrawView extends TextFileView {
         currentStrokeOptions: st.currentStrokeOptions,
         frameRendering: st.frameRendering,
         objectsSnapModeEnabled: st.objectsSnapModeEnabled,
-        activeTool: st.activeTool,
+        activeTool,
       },
       prevTextMode: this.prevTextMode,
       files,

src/lang/locale/en.ts

@@ -402,7 +402,7 @@ FILENAME_HEAD: "Filename",
   GRID_COLOR_NAME: "Grid color",
   GRID_OPACITY_NAME: "Grid opacity",
   GRID_OPACITY_DESC: "Grid opacity will also control the opacity of the binding box when binding an arrow to an element.<br>" +
-    "Set the opacity of the grid. 0 is transparent, 1 is opaque.",
+    "Set the opacity of the grid. 0 is transparent, 100 is opaque.",
   LASER_HEAD: "Laser pointer",
   LASER_COLOR: "Laser pointer color",
   LASER_DECAY_TIME_NAME: "Laser pointer decay time",

src/utils/DynamicStyling.ts

@@ -83,8 +83,9 @@ export const setDynamicStyle = (
     [`--color-on-primary-container`]: str(!isDark?accent().darkerBy(15):accent().lighterBy(15)),
     [`--color-surface-primary-container`]: str(isDark?accent().darkerBy(step):accent().lighterBy(step)),
     [`--bold-color`]: str(!isDark?accent().darkerBy(15):accent().lighterBy(15)),
-    //[`--color-primary-darker`]: str(accent().darkerBy(step)),
-    //[`--color-primary-darkest`]: str(accent().darkerBy(step)),
+    [`--color-primary-darker`]: str(accent().darkerBy(step)),
+    [`--color-primary-darkest`]: str(accent().darkerBy(2*step)),
+    ['--button-bg-color']: str(gray1()),
     [`--button-gray-1`]: str(gray1()),
     [`--button-gray-2`]: str(gray2()),
     [`--input-border-color`]: str(gray1()),
@@ -97,12 +98,11 @@ export const setDynamicStyle = (
     [`--overlay-bg-color`]: gray2().alphaTo(0.6).stringHEX(),
     [`--popup-bg-color`]: str(gray1()),
     [`--color-on-surface`]: str(text),
-    [`--default-border-color`]: str(text),
+    [`--default-border-color`]: str(gray1()),
     //[`--color-gray-100`]: str(text),
     [`--color-gray-40`]: str(text), //frame
-    [`--color-gray-50`]: str(text), //frame
     [`--color-surface-highlight`]: str(gray1()),
-    //[`--color-gray-30`]: str(gray1),
+    [`--color-gray-20`]: str(gray1()),
     [`--sidebar-border-color`]: str(gray1()),
     [`--color-primary-light`]: str(accent().lighterBy(step)),
     [`--button-hover-bg`]: str(gray1()),
@@ -118,9 +118,11 @@ export const setDynamicStyle = (
     [`color`]: str(text),
     ['--excalidraw-caret-color']: str(isLightTheme ? text : cmBG()),
     [`--select-highlight-color`]: str(gray1()),
-    [`--color-gray-80`]: str(isDark?text.darkerBy(40):text.lighterBy(40)), //frame
     [`--color-gray-90`]: str(isDark?text.darkerBy(5):text.lighterBy(5)), //search background
-    [`--default-bg-color`]: str(text), //search background,
+    [`--color-gray-80`]: str(isDark?text.darkerBy(10):text.lighterBy(10)), //frame
+    [`--color-gray-70`]: str(isDark?text.darkerBy(10):text.lighterBy(10)), //frame
+    [`--default-bg-color`]: str(isDark?text.darkerBy(20):text.lighterBy(20)), //search background,
+    [`--color-gray-50`]: str(text), //frame
   };
   
     const styleString = Object.keys(styleObject)

styles.css

@@ -638,4 +638,12 @@ textarea.excalidraw-wysiwyg, .excalidraw input {
 
 .ExcTextField__input input::placeholder {
   color: var(--select-highlight-color);
+}
+
+.excalidraw textarea::placeholder {
+  color: var(--color-gray-50);
+}
+
+.excalidraw textarea.ttd-dialog-input {
+  caret-color: var(--excalidraw-caret-color);
 }