@teachinglab/omd 0.7.1 → 0.7.3

package/canvas/ui/toolbar.js

@@ -41,6 +41,11 @@ export class Toolbar {
         // Create a jsvgGroup for the toolbar
         this.toolbarGroup = new jsvgGroup();
         
+        // Stop pointer events from bubbling to canvas to prevent drawing while interacting with toolbar
+        const stopPropagation = (e) => e.stopPropagation();
+        this.toolbarGroup.svgObject.addEventListener('pointerdown', stopPropagation);
+        this.toolbarGroup.svgObject.addEventListener('pointermove', stopPropagation);
+        this.toolbarGroup.svgObject.addEventListener('pointerup', stopPropagation);
         
         // Create background rectangle
         this.background = new jsvgRect();
@@ -135,7 +140,7 @@ export class Toolbar {
         const button = new jsvgButton();
         button.setWidthAndHeight(size, size);
         button.setCornerRadius(size / 2); // Make it circular
-        button.setFillColor('white');
+        button.setFillColor(this.omdColor.lightGray);
         
         // Remove any default text from the button group (if present)
         // jsvgButton may add a <text> element by default; remove it
@@ -193,13 +198,13 @@ export class Toolbar {
     _updateActiveButton(toolName) {
         // Reset all buttons
         this.buttons.forEach(button => {
-            button.setFillColor('white');
+            button.setFillColor(this.omdColor.lightGray);
         });
         
         // Highlight active button
         const activeButton = this.buttons.get(toolName);
         if (activeButton) {
-            activeButton.setFillColor(this.omdColor.lightGray);
+            activeButton.setFillColor('white');
             this.activeButton = activeButton;
         } else {
             this.activeButton = null;

package/package.json

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

package/src/omdExpression.js

@@ -35,6 +35,14 @@ export class omdExpression extends omdMetaExpression
             const parsed = parseExpressionString(data);
             if ( parsed ) data = parsed;
         }
+        // Handle object with 'expression' string property
+        else if ( typeof data === 'object' && data.expression && typeof data.expression === 'string' ) {
+             const parsed = parseExpressionString(data.expression);
+             if ( parsed ) {
+                 // Merge parsed data into data object
+                 data = { ...data, ...parsed };
+             }
+        }
 
         if ( typeof data.termsAndOpers != "undefined" )
         {
@@ -73,6 +81,14 @@ export class omdExpression extends omdMetaExpression
                     this.operatorSet.push( P );
                     this.expressionStack.addChild( P );
                 }
+                else if ( elem.omdType == "string" )
+                {
+                    // Fallback for string tokens - treat as term with variable name
+                    var T = new omdTerm(1, elem.name, 1);
+                    T.hideBackgroundByDefault();
+                    this.termSet.push( T );
+                    this.expressionStack.addChild( T );
+                }
             }
         }
 
@@ -108,9 +124,10 @@ export class omdExpression extends omdMetaExpression
 
         this.setWidthAndHeight( this.backRect.width, this.backRect.height );
 
-        // Set individual width/height properties and viewBox for API compatibility
+        // Set individual width/height properties
         this.width = this.backRect.width;
         this.height = this.backRect.height;
-        this.svgObject.setAttribute('viewBox', `0 0 ${this.width} ${this.height}`);
+        // Removed viewBox setting as it is not valid for 'g' elements and can cause rendering issues
+        // this.svgObject.setAttribute('viewBox', `0 0 ${this.width} ${this.height}`);
     }
 }