@svgedit/svgcanvas 7.4.1 → 7.4.2

package/core/undo.js

@@ -6,6 +6,7 @@
  */
 import * as draw from './draw.js'
 import * as hstry from './history.js'
+import { BBOX_AFFECTING_ATTRS } from './history.js'
 import {
   getRotationAngle, getBBox as utilsGetBBox, setHref, getStrokedBBoxDefaultVisible
 } from './utilities.js'
@@ -204,7 +205,10 @@ export const changeSelectedAttributeNoUndoMethod = (attr, newValue, elems) => {
       } else if (attr === '#href') {
         setHref(elem, newValue)
       } else if (newValue) {
-        elem.setAttribute(attr, isNaN(parseFloat(newValue)) ? newValue : parseFloat(newValue))
+        // Number(), unlike parseFloat(), rejects a value with a trailing unit suffix
+        // (e.g. "10pt", "2px") instead of silently truncating it to a bare number.
+        const asNumber = Number(newValue)
+        elem.setAttribute(attr, Number.isNaN(asNumber) ? newValue : asNumber)
       } else if (typeof newValue === 'number') {
         elem.setAttribute(attr, newValue)
       } else {
@@ -239,26 +243,39 @@ export const changeSelectedAttributeNoUndoMethod = (attr, newValue, elems) => {
           svgCanvas.selectorManager.requestSelector(elem).resize()
         }, 0)
       }
-      // if this element was rotated, and we changed the position of this element
-      // we need to update the rotational transform attribute
+      // Only recalculate rotation center for attributes that change element geometry.
+      // Non-geometric attributes (stroke-width, fill, opacity, etc.) don't affect
+      // the bbox center, so the rotation is already correct and must not be touched.
+      // BBOX_AFFECTING_ATTRS is imported from history.js to keep the list in one place.
       const angle = getRotationAngle(elem)
-      if (angle !== 0 && attr !== 'transform') {
+      if (angle !== 0 && attr !== 'transform' && BBOX_AFFECTING_ATTRS.has(attr)) {
         const tlist = getTransformList(elem)
         let n = tlist.numberOfItems
         while (n--) {
           const xform = tlist.getItem(n)
           if (xform.type === 4) {
-            // remove old rotate
+            // Compute bbox BEFORE removing the rotation so we can bail out
+            // safely if getBBox returns nothing (avoids losing the rotation).
+            const box = utilsGetBBox(elem)
+            if (!box) break
+
             tlist.removeItem(n)
 
-            const box = utilsGetBBox(elem)
+            // Transform bbox center through only the transforms that come
+            // AFTER the rotation in the list (not the pre-rotation transforms).
+            // After removeItem(n), what was at n+1 is now at n.
+            let centerMatrix
+            if (n < tlist.numberOfItems) {
+              centerMatrix = transformListToTransform(tlist, n, tlist.numberOfItems - 1).matrix
+            } else {
+              centerMatrix = svgCanvas.getSvgRoot().createSVGMatrix() // identity
+            }
             const center = transformPoint(
-              box.x + box.width / 2, box.y + box.height / 2, transformListToTransform(tlist).matrix
+              box.x + box.width / 2, box.y + box.height / 2, centerMatrix
             )
-            const cx = center.x
-            const cy = center.y
+
             const newrot = svgCanvas.getSvgRoot().createSVGTransform()
-            newrot.setRotate(angle, cx, cy)
+            newrot.setRotate(angle, center.x, center.y)
             tlist.insertItemBefore(newrot, n)
             break
           }