@teachinglab/omd 0.3.4 → 0.3.6

package/canvas/core/omdCanvas.js

@@ -7,7 +7,7 @@ import { SelectTool } from '../tools/SelectTool.js';
 import { Cursor } from '../ui/cursor.js';
 import { Toolbar } from '../ui/toolbar.js';
 import { FocusFrameManager } from '../features/focusFrameManager.js';
-
+import {jsvgGroup} from '@teachinglab/jsvg'
 /**
  * Main OMD Canvas class
  * Provides the primary interface for creating and managing a drawing canvas

package/canvas/index.js

@@ -27,7 +27,6 @@ export { mathUtils } from './utils/mathUtils.js';
 
 // Focus frame system
 export { FocusFrameManager } from './features/focusFrameManager.js';
-import { omdCanvas } from './core/omdCanvas.js';
 /**
  * Quick setup function for common use cases
  * @param {HTMLElement|string} container - Container element or selector

package/canvas/ui/toolbar.js

@@ -1,4 +1,6 @@
 import {omdColor} from '../../src/omdColor.js';
+import { jsvgRect, jsvgGroup } from '@teachinglab/jsvg';
+import { jsvgButton } from '@teachinglab/jsvg';
 
 export class Toolbar {
     /**

package/index.js

@@ -13,10 +13,13 @@
 
 // Export everything from the core OMD library (equations, nodes, display, etc.)
 export * from './omd/core/index.js';
-
+export * from './canvas/index.js';
 // Export everything from the visualization components
 export * from './src/index.js';
 
+// Re-export canvas helpers/events so package consumers can import them from the package root
+export { EventManager } from './canvas/events/eventManager.js';
+
 // Export utility components
 export { omdNodeOverlay, omdNodeOverlayPresets } from './omd/utils/omdNodeOverlay.js';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teachinglab/omd",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "omd",
   "main": "./index.js",
   "module": "./index.js",

package/src/omdEquation.js

@@ -42,42 +42,69 @@ export class omdEquation extends omdMetaExpression
 
     loadFromJSON( data )
     {
-        if ( typeof data.leftExpression != "undefined" )
+        // If explicit left/right JSON provided, build them according to their omdType
+        if ( typeof data.leftExpression != "undefined" && data.leftExpression )
         {
-            // console.log("A");
-            // console.log( data.leftExpression );
-            if ( data.leftExpression.omdType == "expression" )
-                this.leftExpression = new omdExpression();
-            if ( data.leftExpression.omdType == "number" )
-                this.leftExpression = new omdNumber();
-            if ( data.leftExpression.omdType == "variable" )
-                this.leftExpression = new omdVariable();
-            if ( data.leftExpression.omdType == "term" )
-                this.leftExpression = new omdTerm();
-            this.leftExpression.loadFromJSON( data.leftExpression  );
-            this.leftHolder.removeAllChildren();
-            this.leftHolder.addChild( this.leftExpression );
+            const left = data.leftExpression;
+            if ( left.omdType == "expression" ) this.leftExpression = new omdExpression();
+            else if ( left.omdType == "number" ) this.leftExpression = new omdNumber();
+            else if ( left.omdType == "variable" ) this.leftExpression = new omdVariable();
+            else if ( left.omdType == "term" ) this.leftExpression = new omdTerm();
+            else if ( left.omdType == "string" || typeof left == 'string' ) this.leftExpression = new omdString( typeof left == 'string' ? left : left.name || '' );
+
+            if (this.leftExpression && typeof this.leftExpression.loadFromJSON === 'function' && left && typeof left === 'object') {
+                this.leftExpression.loadFromJSON( left );
+            }
+
+            if (this.leftExpression) {
+                this.leftHolder.removeAllChildren();
+                this.leftHolder.addChild( this.leftExpression );
+            }
         }
-        if ( typeof data.rightExpression != "undefined" )
+
+        if ( typeof data.rightExpression != "undefined" && data.rightExpression )
         {
-            // console.log("B");
-            // console.log( data.exponentExpression );
-            if ( data.rightExpression.omdType == "expression" )
-                this.rightExpression = new omdExpression();
-            if ( data.rightExpression.omdType == "number" )
-                this.rightExpression = new omdNumber();
-            if ( data.rightExpression.omdType == "variable" )
-                this.rightExpression = new omdVariable();
-            if ( data.rightExpression.omdType == "term" )
-                this.rightExpression = new omdTerm();
-            this.rightExpression.loadFromJSON( data.rightExpression  );
-            this.rightHolder.removeAllChildren();
-            this.rightHolder.addChild( this.rightExpression );
+            const right = data.rightExpression;
+            if ( right.omdType == "expression" ) this.rightExpression = new omdExpression();
+            else if ( right.omdType == "number" ) this.rightExpression = new omdNumber();
+            else if ( right.omdType == "variable" ) this.rightExpression = new omdVariable();
+            else if ( right.omdType == "term" ) this.rightExpression = new omdTerm();
+            else if ( right.omdType == "string" || typeof right == 'string' ) this.rightExpression = new omdString( typeof right == 'string' ? right : right.name || '' );
+
+            if (this.rightExpression && typeof this.rightExpression.loadFromJSON === 'function' && right && typeof right === 'object') {
+                this.rightExpression.loadFromJSON( right );
+            }
+
+            if (this.rightExpression) {
+                this.rightHolder.removeAllChildren();
+                this.rightHolder.addChild( this.rightExpression );
+            }
         }
-        
-        this.equalSign.hideBackgroundByDefault();
-        this.leftExpression.hideBackgroundByDefault();
-        this.rightExpression.hideBackgroundByDefault();
+
+        // If no structured left/right provided but an `equation` string exists, parse it into simple string nodes
+        if ( (!this.leftExpression || !this.rightExpression) && typeof data.equation === 'string' ) {
+            const eq = data.equation || '';
+            const parts = eq.split('=');
+            const leftStr = (parts[0] || '').trim();
+            const rightStr = (parts[1] || '').trim();
+
+            if (!this.leftExpression) this.leftExpression = new omdString(leftStr || '');
+            if (!this.rightExpression) this.rightExpression = new omdString(rightStr || '');
+
+            if (this.leftExpression) {
+                this.leftHolder.removeAllChildren();
+                this.leftHolder.addChild(this.leftExpression);
+            }
+            if (this.rightExpression) {
+                this.rightHolder.removeAllChildren();
+                this.rightHolder.addChild(this.rightExpression);
+            }
+        }
+
+        // Guarded calls to hide backgrounds only when components exist
+        if (this.equalSign && typeof this.equalSign.hideBackgroundByDefault === 'function') this.equalSign.hideBackgroundByDefault();
+        if (this.leftExpression && typeof this.leftExpression.hideBackgroundByDefault === 'function') this.leftExpression.hideBackgroundByDefault();
+        if (this.rightExpression && typeof this.rightExpression.hideBackgroundByDefault === 'function') this.rightExpression.hideBackgroundByDefault();
 
         this.centerEquation = false;
         this.updateLayout();