integration of circuit-sketcher-core 1.2.0 with new features and some bug fixes

integration of circuit-sketcher-core 1.2.0 with new features and some bug fixes

Author: code-forge-temple

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "circuit-sketcher",
     "name": "Circuit Sketcher",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "minAppVersion": "0.15.0",
     "description": "A plugin for drawing circuits on a canvas, based on circuit-sketcher-core.",
     "author": "Code Forge Temple",

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "circuit-sketcher-obsidian-plugin",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "main": "main.js",
     "author": "Code Forge Temple",
     "license": "GPL",
@@ -13,7 +13,7 @@
     },
     "keywords": [],
     "dependencies": {
-        "circuit-sketcher-core": "git+https://github.com/code-forge-temple/circuit-sketcher-core.git",
+        "circuit-sketcher-core": "github:code-forge-temple/circuit-sketcher-core",
         "obsidian": "^1.7.2",
         "react": "^19.0.0",
         "react-dom": "^19.0.0"
@@ -41,6 +41,7 @@
         "typescript-eslint": "^8.18.0",
         "url-loader": "^4.1.1",
         "webpack": "^5.97.1",
-        "webpack-cli": "^5.1.4"
+        "webpack-cli": "^5.1.4",
+        "webpack-preprocessor-loader": "^1.3.0"
     }
-}
+}

package.json

@@ -21,6 +21,9 @@ export class CircuitSketcherView extends TextFileView {
     private root: Root | null = null;
 
     constructor (leaf: WorkspaceLeaf, plugin: CircuitSketcherPlugin) {
+        // #!dev
+        console.log("CircuitSketcherView.constructor()");
+
         super(leaf);
 
         this.plugin = plugin;
@@ -39,13 +42,16 @@ export class CircuitSketcherView extends TextFileView {
     // Set the data to the editor. This is used to load the file contents.
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     setViewData = async (fileContents: string, clear: boolean) => {
+        // #!dev
+        console.log("CircuitSketcherView.setViewData() - NEW FILE");
+
         LocalStorageManager.setLibrary(await this.plugin.getLibraryFile());
 
         const viewDomContent = this.containerEl.children[1];
 
-        if (!this.root) {
-            this.root = createRoot(viewDomContent);
-        }
+        this.clear();
+
+        this.root = createRoot(viewDomContent);
 
         this.root.render(
             <StrictMode>
@@ -56,16 +62,27 @@ export class CircuitSketcherView extends TextFileView {
 
     // Gets the data from the editor. This will be called to save the editor contents to the file.
     getViewData = (): string => {
+        // #!dev
+        console.log("CircuitSketcherView.getViewData() - OLD FILE");
+
         const fileContents = CanvasManager.getInstance().stringify(true);
 
         this.plugin.setLibraryFile(LocalStorageManager.getLibrary(true));
 
         return fileContents;
     }
 
-    clear (): void {}
+    // Clear the editor. This is usually called when we're about to open a completely different file, so it's best to clear any editor states like undo-redo history, and any caches/indexes associated with the previous file contents.
+    clear (): void {
+        // #!dev
+        console.log("CircuitSketcherView.clear()");
 
-    async onClose () {
+        CanvasManager.destroy();
+
+        this.clearHtml();
+    }
+
+    clearHtml (): void {
         if (this.root) {
             this.root.unmount();
             this.root = null;
@@ -76,7 +93,12 @@ export class CircuitSketcherView extends TextFileView {
         while (viewDomContent.firstChild) {
             viewDomContent.removeChild(viewDomContent.firstChild);
         }
+    }
 
-        CanvasManager.destroy();
+    async onClose () {
+        // #!dev
+        console.log("CircuitSketcherView.onClose()");
+
+        this.clear();
     }
 }

src/CircuitSketcherView.tsx

@@ -15,13 +15,30 @@ const postcssLoader = {
   },
 };
 
+const ENVIRONMENT = "production";
+
 module.exports = {
   entry: "./src/main.ts",
   module: {
     rules: [
       {
         test: /\.tsx?$/,
-        use: "ts-loader",
+        use: [
+          {
+            loader: "ts-loader",
+          },
+          {
+            loader: "webpack-preprocessor-loader",
+            options: {
+              params: {
+                dev: ENVIRONMENT === "development", // for preprocessor commands defined with `#!if dev` and `#!endif`
+              },
+              directives: {
+                dev: ENVIRONMENT === "development", // for preprocessor command `#!dev`
+              },
+            },
+          },
+        ],
         exclude: /node_modules/,
       },
       {
@@ -58,7 +75,7 @@ module.exports = {
   externals: {
     obsidian: "commonjs obsidian",
   },
-  mode: "production",
+  mode: ENVIRONMENT,
   plugins: [
     new webpack.BannerPlugin({
       banner: `/*! Also see LICENSE file in the root of the project. */`,