@teachinglab/omd 0.7.11 → 0.7.13

package/canvas/tools/SelectTool.js

@@ -95,6 +95,12 @@ export class SelectTool extends Tool {
                 this.dragStartPoint = { x: event.x, y: event.y };
                 this.potentialDeselect = segmentSelection;
                 
+                // Also enable OMD dragging if we have selected OMD elements
+                if (this.selectedOMDElements.size > 0) {
+                    this.isDraggingOMD = true;
+                    this.startPoint = { x: event.x, y: event.y };
+                }
+                
                 // Set isDrawing so we get pointermove events
                 if (this.canvas.eventManager) {
                     this.canvas.eventManager.isDrawing = true;
@@ -127,6 +133,13 @@ export class SelectTool extends Tool {
                 this.draggedOMDElement = omdElement; // Primary drag target
                 this.startPoint = { x: event.x, y: event.y };
                 
+                // Also enable stroke dragging if we have selected strokes
+                if (this.selectedSegments.size > 0) {
+                    this.isDraggingStrokes = true;
+                    this.dragStartPoint = { x: event.x, y: event.y };
+                    this.hasSeparatedForDrag = false;
+                }
+                
                 // Show resize handles if this is the only selected element
                 if (this.selectedOMDElements.size === 1) {
                     this.resizeHandleManager.selectElement(omdElement);

package/omd/nodes/omdEquationNode.js

@@ -1121,14 +1121,26 @@ _propagateBackgroundStyle(style, visited = new Set()) {
      * @private
      */
     _renderToTable(options) {
+        // Helper to format expression - if it already has "y =" or starts with variable, use as-is, else prepend "y ="
+        const formatEquation = (expr) => {
+            const normalized = this._normalizeExpressionString(expr);
+            // Check if expression already has "y =" or other variable assignment
+            if (/^[a-zA-Z]\s*=/.test(normalized)) {
+                return normalized;
+            }
+            // Otherwise prepend "y ="
+            return `y = ${normalized}`;
+        };
+
         // Single side: let omdTable generate rows from equation
         if (options.side === 'left') {
             const expr = this._normalizeExpressionString(this.getLeft().toString());
+            const equation = formatEquation(expr);
             return {
                 omdType: "table",
-                title: `Function Table: y = ${expr}`,
+                title: `Function Table: ${equation}`,
                 headers: ["x", "y"],
-                equation: `y = ${expr}`,
+                equation: equation,
                 xMin: options.xMin,
                 xMax: options.xMax,
                 stepSize: options.stepSize,
@@ -1145,11 +1157,65 @@ _propagateBackgroundStyle(style, visited = new Set()) {
             };
         } else if (options.side === 'right') {
             const expr = this._normalizeExpressionString(this.getRight().toString());
+            const equation = formatEquation(expr);
+            return {
+                omdType: "table",
+                title: `Function Table: ${equation}`,
+                headers: ["x", "y"],
+                equation: equation,
+                xMin: options.xMin,
+                xMax: options.xMax,
+                stepSize: options.stepSize,
+                // Background customization options
+                backgroundColor: (options.backgroundColor !== undefined) ? options.backgroundColor : undefined,
+                backgroundCornerRadius: (options.backgroundCornerRadius !== undefined) ? options.backgroundCornerRadius : undefined,
+                backgroundOpacity: (options.backgroundOpacity !== undefined) ? options.backgroundOpacity : undefined,
+                showBackground: (options.showBackground !== undefined) ? options.showBackground : undefined,
+                // Alternating row color options
+                alternatingRowColors: (options.alternatingRowColors !== undefined) ? options.alternatingRowColors : undefined,
+                evenRowColor: (options.evenRowColor !== undefined) ? options.evenRowColor : undefined,
+                oddRowColor: (options.oddRowColor !== undefined) ? options.oddRowColor : undefined,
+                alternatingRowOpacity: (options.alternatingRowOpacity !== undefined) ? options.alternatingRowOpacity : undefined
+            };
+        }
+
+        // Both sides: use equation format for proper table generation
+        // The omdTable class can handle this better than manually computing data
+        const leftExpr = this._normalizeExpressionString(this.getLeft().toString());
+        const rightExpr = this._normalizeExpressionString(this.getRight().toString());
+        
+        // If left side is just "y", use right side as the equation
+        if (leftExpr.toLowerCase().trim() === 'y') {
+            const equation = formatEquation(rightExpr);
+            return {
+                omdType: "table",
+                title: `Function Table: ${equation}`,
+                headers: ["x", "y"],
+                equation: equation,
+                xMin: options.xMin,
+                xMax: options.xMax,
+                stepSize: options.stepSize,
+                // Background customization options
+                backgroundColor: (options.backgroundColor !== undefined) ? options.backgroundColor : undefined,
+                backgroundCornerRadius: (options.backgroundCornerRadius !== undefined) ? options.backgroundCornerRadius : undefined,
+                backgroundOpacity: (options.backgroundOpacity !== undefined) ? options.backgroundOpacity : undefined,
+                showBackground: (options.showBackground !== undefined) ? options.showBackground : undefined,
+                // Alternating row color options
+                alternatingRowColors: (options.alternatingRowColors !== undefined) ? options.alternatingRowColors : undefined,
+                evenRowColor: (options.evenRowColor !== undefined) ? options.evenRowColor : undefined,
+                oddRowColor: (options.oddRowColor !== undefined) ? options.oddRowColor : undefined,
+                alternatingRowOpacity: (options.alternatingRowOpacity !== undefined) ? options.alternatingRowOpacity : undefined
+            };
+        }
+        
+        // If right side is just "y", use left side as the equation
+        if (rightExpr.toLowerCase().trim() === 'y') {
+            const equation = formatEquation(leftExpr);
             return {
                 omdType: "table",
-                title: `Function Table: y = ${expr}`,
+                title: `Function Table: ${equation}`,
                 headers: ["x", "y"],
-                equation: `y = ${expr}`,
+                equation: equation,
                 xMin: options.xMin,
                 xMax: options.xMax,
                 stepSize: options.stepSize,
@@ -1166,7 +1232,7 @@ _propagateBackgroundStyle(style, visited = new Set()) {
             };
         }
 
-        // Both sides: compute data for x, left(x), right(x)
+        // Both sides have expressions: compute data for x, left(x), right(x)
         const leftSide = this.getLeft();
         const rightSide = this.getRight();
         const leftLabel = leftSide.toString();

package/package.json

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