@crystaldesign/planner-2d-core 26.12.0-beta.9 → 26.13.0-beta.1

package/build/cjs/index.js

@@ -2340,8 +2340,10 @@ function fixViewBox(state, minBorderX, minBorderY) {
   var oltExtentY = state.startHeightOlt + state.heightOlt;
   var olfExtentX = state.startWidthOlf + state.widthOlf;
   var olfExtentY = state.startHeightOlf + state.heightOlf;
-  var maxWidth = olfExtentX > oltExtentX ? olfExtentX : oltExtentX;
-  var maxHeight = olfExtentY > oltExtentY ? olfExtentY : oltExtentY;
+  // a kept axis ends where its drawn canvas ends, seen from the minBorder origin - the OLT extent would add the OLT's
+  // start offset again behind the drawing, and a rect OLT records none at all
+  var maxWidth = state.keptRootWidth !== undefined ? state.keptRootWidth - minBorderX : olfExtentX > oltExtentX ? olfExtentX : oltExtentX;
+  var maxHeight = state.keptRootHeight !== undefined ? state.keptRootHeight - minBorderY : olfExtentY > oltExtentY ? olfExtentY : oltExtentY;
   root.setAttribute('height', String(round2(maxHeight)));
   root.setAttribute('width', String(round2(maxWidth)));
   var borderX = round2(minBorderX);
@@ -2358,8 +2360,8 @@ function fixViewBox(state, minBorderX, minBorderY) {
     var pieces = ((_root$getAttribute3 = root.getAttribute('viewBox')) !== null && _root$getAttribute3 !== void 0 ? _root$getAttribute3 : '').split(' ');
     // Legacy quirk: without stretch areas on an axis the old viewBox extent is kept (pure scaling display).
     viewBox = "".concat(Number.parseFloat(pieces[0]) + borderX, " ").concat(Number.parseFloat(pieces[1]) + borderY);
-    viewBox += ' ' + (state.sah.length > 0 ? String(round2(maxWidth)) : pieces[2]);
-    viewBox += ' ' + (state.sav.length > 0 ? String(round2(maxHeight)) : pieces[3]);
+    viewBox += ' ' + (state.sah.length > 0 || state.keptRootWidth !== undefined ? String(round2(maxWidth)) : pieces[2]);
+    viewBox += ' ' + (state.sav.length > 0 || state.keptRootHeight !== undefined ? String(round2(maxHeight)) : pieces[3]);
   }
   root.setAttribute('x', String(borderX));
   root.setAttribute('y', String(borderY));
@@ -2394,7 +2396,22 @@ function stretchArticleSvg(svg, targetWidthCm, targetDepthCm) {
   if (state.targetHeightOlt === 0) state.targetHeightOlt = parseFloat((_root$getAttribute4 = root.getAttribute('height')) !== null && _root$getAttribute4 !== void 0 ? _root$getAttribute4 : '');
   ensureTeDisplayNone(xmlDocument);
   prepareStretchGeometry(state);
-  if (targetWidthCm === origWidthCm && targetDepthCm === origDepthCm) {
+  // a kept axis targets its measured OLT, so resizeOutline leaves it alone; a global scale gets factor 1 instead of NaN
+  if (options.keepWidth) {
+    var _root$getAttribute5;
+    state.targetWidthOlt = state.widthOlt;
+    state.globalScaleFactorWidth = 1;
+    state.keptRootWidth = parseFloat((_root$getAttribute5 = root.getAttribute('width')) !== null && _root$getAttribute5 !== void 0 ? _root$getAttribute5 : '');
+  }
+  if (options.keepDepth) {
+    var _root$getAttribute6;
+    state.targetHeightOlt = state.heightOlt;
+    state.globalScaleFactorHeight = 1;
+    state.keptRootHeight = parseFloat((_root$getAttribute6 = root.getAttribute('height')) !== null && _root$getAttribute6 !== void 0 ? _root$getAttribute6 : '');
+  }
+
+  // the early exit keeps the canvas origin, which only matches a caller that measured no minBorder
+  if (!options.keepWidth && !options.keepDepth && targetWidthCm === origWidthCm && targetDepthCm === origDepthCm) {
     return {
       svg: serializeXml(xmlDocument),
       sizes: currentSizes(state),

package/build/esm/index.js

@@ -2327,8 +2327,10 @@ function fixViewBox(state, minBorderX, minBorderY) {
   var oltExtentY = state.startHeightOlt + state.heightOlt;
   var olfExtentX = state.startWidthOlf + state.widthOlf;
   var olfExtentY = state.startHeightOlf + state.heightOlf;
-  var maxWidth = olfExtentX > oltExtentX ? olfExtentX : oltExtentX;
-  var maxHeight = olfExtentY > oltExtentY ? olfExtentY : oltExtentY;
+  // a kept axis ends where its drawn canvas ends, seen from the minBorder origin - the OLT extent would add the OLT's
+  // start offset again behind the drawing, and a rect OLT records none at all
+  var maxWidth = state.keptRootWidth !== undefined ? state.keptRootWidth - minBorderX : olfExtentX > oltExtentX ? olfExtentX : oltExtentX;
+  var maxHeight = state.keptRootHeight !== undefined ? state.keptRootHeight - minBorderY : olfExtentY > oltExtentY ? olfExtentY : oltExtentY;
   root.setAttribute('height', String(round2(maxHeight)));
   root.setAttribute('width', String(round2(maxWidth)));
   var borderX = round2(minBorderX);
@@ -2345,8 +2347,8 @@ function fixViewBox(state, minBorderX, minBorderY) {
     var pieces = ((_root$getAttribute3 = root.getAttribute('viewBox')) !== null && _root$getAttribute3 !== void 0 ? _root$getAttribute3 : '').split(' ');
     // Legacy quirk: without stretch areas on an axis the old viewBox extent is kept (pure scaling display).
     viewBox = "".concat(Number.parseFloat(pieces[0]) + borderX, " ").concat(Number.parseFloat(pieces[1]) + borderY);
-    viewBox += ' ' + (state.sah.length > 0 ? String(round2(maxWidth)) : pieces[2]);
-    viewBox += ' ' + (state.sav.length > 0 ? String(round2(maxHeight)) : pieces[3]);
+    viewBox += ' ' + (state.sah.length > 0 || state.keptRootWidth !== undefined ? String(round2(maxWidth)) : pieces[2]);
+    viewBox += ' ' + (state.sav.length > 0 || state.keptRootHeight !== undefined ? String(round2(maxHeight)) : pieces[3]);
   }
   root.setAttribute('x', String(borderX));
   root.setAttribute('y', String(borderY));
@@ -2381,7 +2383,22 @@ function stretchArticleSvg(svg, targetWidthCm, targetDepthCm) {
   if (state.targetHeightOlt === 0) state.targetHeightOlt = parseFloat((_root$getAttribute4 = root.getAttribute('height')) !== null && _root$getAttribute4 !== void 0 ? _root$getAttribute4 : '');
   ensureTeDisplayNone(xmlDocument);
   prepareStretchGeometry(state);
-  if (targetWidthCm === origWidthCm && targetDepthCm === origDepthCm) {
+  // a kept axis targets its measured OLT, so resizeOutline leaves it alone; a global scale gets factor 1 instead of NaN
+  if (options.keepWidth) {
+    var _root$getAttribute5;
+    state.targetWidthOlt = state.widthOlt;
+    state.globalScaleFactorWidth = 1;
+    state.keptRootWidth = parseFloat((_root$getAttribute5 = root.getAttribute('width')) !== null && _root$getAttribute5 !== void 0 ? _root$getAttribute5 : '');
+  }
+  if (options.keepDepth) {
+    var _root$getAttribute6;
+    state.targetHeightOlt = state.heightOlt;
+    state.globalScaleFactorHeight = 1;
+    state.keptRootHeight = parseFloat((_root$getAttribute6 = root.getAttribute('height')) !== null && _root$getAttribute6 !== void 0 ? _root$getAttribute6 : '');
+  }
+
+  // the early exit keeps the canvas origin, which only matches a caller that measured no minBorder
+  if (!options.keepWidth && !options.keepDepth && targetWidthCm === origWidthCm && targetDepthCm === origDepthCm) {
     return {
       svg: serializeXml(xmlDocument),
       sizes: currentSizes(state),

package/build/types/planner-2d-core/src/stretch/stretchArticleSvg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stretchArticleSvg.d.ts","sourceRoot":"","sources":["../../../../../src/stretch/stretchArticleSvg.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGxD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,aAAa,CA+BxI"}
+{"version":3,"file":"stretchArticleSvg.d.ts","sourceRoot":"","sources":["../../../../../src/stretch/stretchArticleSvg.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGxD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,aAAa,CA2CxI"}

package/build/types/planner-2d-core/src/stretch/types.d.ts

@@ -6,6 +6,13 @@ export interface StretchOptions {
     minBorderX?: number;
     /** Minimum y coordinate of the article geometry, used to correct the output viewBox. Default 0. */
     minBorderY?: number;
+    /**
+     * Keep the width as drawn: the OLT keeps its measured width whatever the target says, also when scaling
+     * globally. With a kept axis the viewBox is always moved by the minBorder, as for any stretched svg.
+     */
+    keepWidth?: boolean;
+    /** Keep the depth as drawn, see keepWidth. */
+    keepDepth?: boolean;
 }
 /** Final outline sizes in SVG user units; an axis that was not stretched keeps its original size. */
 export interface StretchSizes {
@@ -48,6 +55,9 @@ export interface StretchState {
     ratioSav: number[];
     globalScaleFactorWidth: number;
     globalScaleFactorHeight: number;
+    /** Root size of an axis kept as drawn (StretchOptions.keepWidth/keepDepth); the viewBox fix writes it back unchanged. */
+    keptRootWidth?: number;
+    keptRootHeight?: number;
     warnings: string[];
     warned: Set<string>;
 }

package/build/types/planner-2d-core/src/stretch/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/stretch/types.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,MAAM,WAAW,cAAc;IAC7B,4FAA4F;IAC5F,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mGAAmG;IACnG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mGAAmG;IACnG,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qGAAqG;AACrG,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,iHAAiH;AACjH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,MAAM,WAAW,GAAG,GAAG,GAAG,GAAG,CAAC;AAEpC,2DAA2D;AAC3D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,yCAAyC;IACzC,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,OAAO,EAAE,CAAC;IACf,GAAG,EAAE,OAAO,EAAE,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACrB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/stretch/types.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,MAAM,WAAW,cAAc;IAC7B,4FAA4F;IAC5F,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mGAAmG;IACnG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mGAAmG;IACnG,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,qGAAqG;AACrG,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,iHAAiH;AACjH,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,MAAM,WAAW,GAAG,GAAG,GAAG,GAAG,CAAC;AAEpC,2DAA2D;AAC3D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,yCAAyC;IACzC,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,OAAO,EAAE,CAAC;IACf,GAAG,EAAE,OAAO,EAAE,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAChC,yHAAyH;IACzH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACrB"}

package/build/types/planner-2d-core/src/stretch/viewBoxFix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"viewBoxFix.d.ts","sourceRoot":"","sources":["../../../../../src/stretch/viewBoxFix.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAiC5F"}
+{"version":3,"file":"viewBoxFix.d.ts","sourceRoot":"","sources":["../../../../../src/stretch/viewBoxFix.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAmC5F"}

package/build/types/planner-2d-core/src/tests/stretchKeepAxis.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=stretchKeepAxis.test.d.ts.map

package/build/types/planner-2d-core/src/tests/stretchKeepAxis.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stretchKeepAxis.test.d.ts","sourceRoot":"","sources":["../../../../../src/tests/stretchKeepAxis.test.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/planner-2d-core",
-  "version": "26.12.0-beta.9",
+  "version": "26.13.0-beta.1",
   "description": "Browser-free 2D planner core: article SVG parsing, docking logic, dock transform math and collision geometry.",
   "dependencies": {
     "w3c-xmlserializer": "5.0.0"
@@ -20,5 +20,5 @@
   "types": "./build/types/planner-2d-core/src/index.d.ts",
   "module": "build/esm/index.js",
   "main": "build/cjs/index.js",
-  "gitHead": "62f51ceee2ea71c54b990c666eb7ae864f13d374"
+  "gitHead": "b38715cf22885313d39435130631ab8993ac8dc5"
 }