@teachinglab/omd 0.7.35 → 0.7.37

package/omd/core/omdEquationStack.js

@@ -491,8 +491,7 @@ export class omdEquationStack extends jsvgGroup {
         let eqIndex = -1;
         for (let i = seq.steps.length - 1; i >= 0; i--) {
             const st = seq.steps[i];
-            const name = st?.constructor?.name;
-            if (st instanceof omdEquationNode || name === 'omdEquationNode') { eqIndex = i; break; }
+            if (st instanceof omdEquationNode || st?.type === 'omdEquationNode') { eqIndex = i; break; }
         }
         if (eqIndex === -1) return false;
 
@@ -500,8 +499,7 @@ export class omdEquationStack extends jsvgGroup {
         let startIndex = eqIndex;
         for (let i = eqIndex; i >= 0; i--) {
             const st = seq.steps[i];
-            const name = st?.constructor?.name;
-            if (st instanceof omdOperationDisplayNode || name === 'omdOperationDisplayNode') { startIndex = i; break; }
+            if (st instanceof omdOperationDisplayNode || st?.type === 'omdOperationDisplayNode') { startIndex = i; break; }
         }
         // Remove DOM children and steps from startIndex to end
         for (let i = seq.steps.length - 1; i >= startIndex; i--) {
@@ -546,7 +544,7 @@ export class omdEquationStack extends jsvgGroup {
 
         // Safety: ensure dot/line counts match equations and prune orphan dots
         try {
-            const isEquation = (s) => (s instanceof omdEquationNode) || (s?.constructor?.name === 'omdEquationNode');
+            const isEquation = (s) => (s instanceof omdEquationNode) || (s?.type === 'omdEquationNode');
             const equationsCount = Array.isArray(seq.steps) ? seq.steps.filter(isEquation).length : 0;
 
             // Remove dots whose equationRef is no longer present in steps

package/omd/display/omdDisplay.js

@@ -535,8 +535,9 @@ export class omdDisplay {
             // Detect step visualizer directly on node (getSequence returns underlying sequence only)
             let hasStepVisualizer = false;
             if (this.node) {
-                const ctorName = this.node.constructor?.name;
-                hasStepVisualizer = (ctorName === 'omdStepVisualizer') || this.node.type === 'omdStepVisualizer' || (typeof omdStepVisualizer !== 'undefined' && this.node instanceof omdStepVisualizer);
+                hasStepVisualizer =
+                    this.node.type === 'omdStepVisualizer' ||
+                    (typeof omdStepVisualizer !== 'undefined' && this.node instanceof omdStepVisualizer);
             }
 
             if (hasStepVisualizer) {

package/omd/nodes/omdEquationSequenceNode.js

@@ -997,7 +997,7 @@ export class omdEquationSequenceNode extends omdNode {
             // If visibility is explicitly false, skip
             if (step.visible === false) continue;
             // Prefer equation nodes when present
-            if (step.constructor?.name === 'omdEquationNode') {
+            if (step instanceof omdEquationNode || step.type === 'omdEquationNode') {
                 chosenIndex = i;
                 break;
             }
@@ -1278,4 +1278,4 @@ export class omdEquationSequenceNode extends omdNode {
         this.computeDimensions();
         this.updateLayout();
     }
-}
+}

package/omd/step-visualizer/omdStepVisualizerLayout.js

@@ -388,7 +388,7 @@ export class omdStepVisualizerLayout {
         // Debug all steps and their properties
         
         sv.steps.forEach((step, i) => {
-            if (step && (step instanceof omdEquationNode || step.constructor.name === 'omdEquationNode')) {
+            if (step && (step instanceof omdEquationNode || step.type === 'omdEquationNode')) {
                 
             } else {
                 
@@ -410,7 +410,7 @@ export class omdStepVisualizerLayout {
         // Check for hidden intermediate steps between consecutive visible major steps (stepMark = 0)
         const visibleMajorSteps = [];
         sv.steps.forEach((step, stepIndex) => {
-            if (step && (step instanceof omdEquationNode || step.constructor.name === 'omdEquationNode')) {
+            if (step && (step instanceof omdEquationNode || step.type === 'omdEquationNode')) {
                 if (step.stepMark === 0 && step.visible === true) {
                     visibleMajorSteps.push(stepIndex);
                     
@@ -431,7 +431,7 @@ export class omdStepVisualizerLayout {
             let hiddenIntermediateCount = 0;
             for (let j = previousMajorStepIndex + 1; j < currentMajorStepIndex; j++) {
                 const step = sv.steps[j];
-                if (step && (step instanceof omdEquationNode || step.constructor.name === 'omdEquationNode')) {
+                if (step && (step instanceof omdEquationNode || step.type === 'omdEquationNode')) {
                     if (step.stepMark > 0 && step.visible === false) {
                         hiddenIntermediateCount++;
                         
@@ -498,7 +498,7 @@ export class omdStepVisualizerLayout {
         // Count intermediate steps between these two major steps
         for (let i = fromStepIndex + 1; i < toStepIndex; i++) {
             const step = sv.steps[i];
-            if (step && (step instanceof omdEquationNode || step.constructor.name === 'omdEquationNode')) {
+            if (step && (step instanceof omdEquationNode || step.type === 'omdEquationNode')) {
                 // Count intermediate steps (stepMark > 0) that are currently hidden
                 if (step.stepMark !== undefined && step.stepMark > 0 && step.visible === false) {
                     
@@ -680,7 +680,7 @@ export class omdStepVisualizerLayout {
                 let majorStepAfterIndex = -1;
                 for (let i = lastIntermediateStepIndex + 1; i < sv.steps.length; i++) {
                     const step = sv.steps[i];
-                    if (step && (step instanceof omdEquationNode || step.constructor.name === 'omdEquationNode')) {
+                    if (step && (step instanceof omdEquationNode || step.type === 'omdEquationNode')) {
                         if (step.stepMark === 0 && step.visible === true) {
                             majorStepAfterIndex = i;
                             
@@ -774,7 +774,7 @@ export class omdStepVisualizerLayout {
             // Show all intermediate steps between the previous and current major steps
             for (let i = previousStepIndex + 1; i < majorStepIndex; i++) {
                 const step = sv.steps[i];
-                if (step && (step instanceof omdEquationNode || step.constructor.name === 'omdEquationNode')) {
+                if (step && (step instanceof omdEquationNode || step.type === 'omdEquationNode')) {
                     if (step.stepMark > 0) {
                         
                         this._showStep(step);
@@ -890,4 +890,4 @@ export class omdStepVisualizerLayout {
         
         
     }
-} 
+} 

package/package.json

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

package/src/omdCoordinatePlane.js

@@ -348,11 +348,14 @@ export class omdCoordinatePlane extends jsvgGroup {
     addTickLabel(gridHolder, isXAxis, pos, value) {
         const label = this.createNumericLabel(value);
         if (isXAxis) {
-            const lx = Math.max(10, Math.min(pos - 10, this.width - 30));
+            const labelWidth = label.width || 20;
+            const lx = Math.max(10, Math.min(pos - labelWidth / 2, this.width - labelWidth - 10));
             label.setPosition(lx, this.height - this.paddingBottom + this.tickLabelOffsetPx);
         } else {
-            const lx = Math.max(5, this.paddingLeft - (this.tickLabelOffsetPx + 20));
-            const ly = Math.max(7.5, Math.min(pos - 7.5, this.height - 15));
+            const labelWidth = label.width || 20;
+            const labelHeight = label.height || 15;
+            const lx = Math.max(5, this.paddingLeft - (this.tickLabelOffsetPx + labelWidth));
+            const ly = Math.max(labelHeight / 2, Math.min(pos - labelHeight / 2, this.height - labelHeight));
             label.setPosition(lx, ly);
         }
         gridHolder.addChild(label);
@@ -366,10 +369,17 @@ export class omdCoordinatePlane extends jsvgGroup {
     }
 
     createNumericLabel(text) {
+        const textString = String(text);
+        const fontSize = 9;
+        const horizontalPadding = 6;
+        const verticalPadding = 4;
+        const estimatedCharWidth = fontSize * 0.58;
+        const labelWidth = Math.max(20, Math.ceil(textString.length * estimatedCharWidth) + horizontalPadding * 2);
+        const labelHeight = fontSize + verticalPadding * 2;
         const label = new jsvgTextBox();
-        label.setWidthAndHeight(20, 15);
-        label.setText(String(text));
-        label.setFontSize(9);
+        label.setWidthAndHeight(labelWidth, labelHeight);
+        label.setText(textString);
+        label.setFontSize(fontSize);
         label.setFontColor(this.getAllowedColor("black"));
         label.setAlignment("center");
         label.setVerticalCentering();