@dtducas/wh-forge-viewer 3.0.0-beta.6 → 3.0.0-beta.7

package/dist/index.esm.js

@@ -70646,6 +70646,7 @@ var SvgToPdfConverter = /*#__PURE__*/function () {
   }, {
     key: "drawEllipse",
     value: function drawEllipse(element, pdfPage, options, transform) {
+      var _options$pageRotation;
       var cx = parseFloat(element.getAttribute('cx') || '0');
       var cy = parseFloat(element.getAttribute('cy') || '0');
       var rx = parseFloat(element.getAttribute('rx') || '0');
@@ -70657,16 +70658,24 @@ var SvgToPdfConverter = /*#__PURE__*/function () {
         _this$transformPoint34 = _slicedToArray(_this$transformPoint33, 2),
         pdfCx = _this$transformPoint34[0],
         pdfCy = _this$transformPoint34[1];
-      // Scale radii (apply SVG transform scale if present)
-      var svgScaleX = transform ? transform.scaleX : 1;
-      var svgScaleY = transform ? transform.scaleY : 1;
+      // Scale radii (apply SVG transform scale if present). Use the *displayed*
+      // page dims (swapped for 90/270) so radii are not stretched on rotated pages,
+      // and swap rx/ry under a quarter rotation since the axes swap in user space.
+      var svgScaleX = Math.abs(transform ? transform.scaleX : 1);
+      var svgScaleY = Math.abs(transform ? transform.scaleY : 1);
       var mbE = options.modelBounds;
       var mapWE = mbE ? mbE.maxX - mbE.minX : options.svgViewBox.width;
       var mapHE = mbE ? mbE.maxY - mbE.minY : options.svgViewBox.height;
-      var scaleX = options.pageWidth / mapWE;
-      var scaleY = options.pageHeight / mapHE;
-      var pdfRx = rx * svgScaleX * scaleX;
-      var pdfRy = ry * svgScaleY * scaleY;
+      var rotE = (((_options$pageRotation = options.pageRotation) !== null && _options$pageRotation !== void 0 ? _options$pageRotation : 0) % 360 + 360) % 360;
+      var quarterE = rotE === 90 || rotE === 270;
+      var dispWE = quarterE ? options.pageHeight : options.pageWidth;
+      var dispHE = quarterE ? options.pageWidth : options.pageHeight;
+      var scaleX = dispWE / mapWE;
+      var scaleY = dispHE / mapHE;
+      var rdx = rx * svgScaleX * scaleX;
+      var rdy = ry * svgScaleY * scaleY;
+      var pdfRx = quarterE ? rdy : rdx;
+      var pdfRy = quarterE ? rdx : rdy;
       // Draw fill
       if (style.fillColor && style.fillOpacity > 0) {
         pdfPage.drawEllipse({
@@ -70698,6 +70707,7 @@ var SvgToPdfConverter = /*#__PURE__*/function () {
   }, {
     key: "drawCircle",
     value: function drawCircle(element, pdfPage, options, transform) {
+      var _options$pageRotation2;
       var cx = parseFloat(element.getAttribute('cx') || '0');
       var cy = parseFloat(element.getAttribute('cy') || '0');
       var r = parseFloat(element.getAttribute('r') || '0');
@@ -70708,12 +70718,18 @@ var SvgToPdfConverter = /*#__PURE__*/function () {
         _this$transformPoint36 = _slicedToArray(_this$transformPoint35, 2),
         pdfCx = _this$transformPoint36[0],
         pdfCy = _this$transformPoint36[1];
-      // Scale radius (apply SVG transform scale if present)
-      var svgScale = transform ? Math.min(transform.scaleX, transform.scaleY) : 1;
+      // Scale radius (apply SVG transform scale if present). Use displayed page
+      // dims (swapped for 90/270) and absolute scale (the SVG Y-flip makes scaleY
+      // negative, which must not flip the radius sign).
+      var svgScale = transform ? Math.min(Math.abs(transform.scaleX), Math.abs(transform.scaleY)) : 1;
       var mbC = options.modelBounds;
       var mapWC = mbC ? mbC.maxX - mbC.minX : options.svgViewBox.width;
       var mapHC = mbC ? mbC.maxY - mbC.minY : options.svgViewBox.height;
-      var scale = svgScale * Math.min(options.pageWidth / mapWC, options.pageHeight / mapHC);
+      var rotC = (((_options$pageRotation2 = options.pageRotation) !== null && _options$pageRotation2 !== void 0 ? _options$pageRotation2 : 0) % 360 + 360) % 360;
+      var quarterC = rotC === 90 || rotC === 270;
+      var dispWC = quarterC ? options.pageHeight : options.pageWidth;
+      var dispHC = quarterC ? options.pageWidth : options.pageHeight;
+      var scale = svgScale * Math.min(dispWC / mapWC, dispHC / mapHC);
       var pdfR = r * scale;
       // Draw fill
       if (style.fillColor && style.fillOpacity > 0) {
@@ -71544,6 +71560,7 @@ var SvgToPdfConverter = /*#__PURE__*/function () {
   }, {
     key: "transformPoint",
     value: function transformPoint(x, y, options, svgTransform) {
+      var _options$pageRotation3;
       // Apply SVG transform (translate, rotate, scale) first
       var svgX = x;
       var svgY = y;
@@ -71573,12 +71590,44 @@ var SvgToPdfConverter = /*#__PURE__*/function () {
       var mapY = mb ? mb.minY : options.svgViewBox.y;
       var mapW = mb ? mb.maxX - mb.minX : options.svgViewBox.width;
       var mapH = mb ? mb.maxY - mb.minY : options.svgViewBox.height;
-      var scaleX = options.pageWidth / mapW;
-      var scaleY = options.pageHeight / mapH;
-      var pdfX = (svgX - mapX) * scaleX;
+      // Raw (unrotated) mediabox dims — pdf-lib draws into this space.
+      var rawW = options.pageWidth;
+      var rawH = options.pageHeight;
+      var rot = (((_options$pageRotation3 = options.pageRotation) !== null && _options$pageRotation3 !== void 0 ? _options$pageRotation3 : 0) % 360 + 360) % 360;
+      var quarter = rot === 90 || rot === 270;
+      // Displayed page dims = the orientation the markup was authored in. For a
+      // 90/270 rotation the visible page is the mediabox with width/height swapped,
+      // so we must scale into the swapped dims (otherwise X/Y scale differ → stretch).
+      var dispW = quarter ? rawH : rawW;
+      var dispH = quarter ? rawW : rawH;
+      var scaleX = dispW / mapW;
+      var scaleY = dispH / mapH;
+      // Displayed-space coords (origin bottom-left of the *visible* page, Y-up).
+      var dx = (svgX - mapX) * scaleX;
       // When SVG has CSS scale(1,-1), coordinates are already Y-up (like PDF)
       // so we map directly. Otherwise flip Y (SVG Y-down → PDF Y-up).
-      var pdfY = this.isYFlipped ? (svgY - mapY) * scaleY : options.pageHeight - (svgY - mapY) * scaleY;
+      var dy = this.isYFlipped ? (svgY - mapY) * scaleY : dispH - (svgY - mapY) * scaleY;
+      // Map displayed coords → unrotated mediabox space by inverting the page
+      // /Rotate, so markup lines up with the rotated page content.
+      var pdfX;
+      var pdfY;
+      switch (rot) {
+        case 90:
+          pdfX = rawW - dy;
+          pdfY = dx;
+          break;
+        case 180:
+          pdfX = rawW - dx;
+          pdfY = rawH - dy;
+          break;
+        case 270:
+          pdfX = dy;
+          pdfY = rawH - dx;
+          break;
+        default:
+          pdfX = dx;
+          pdfY = dy;
+      }
       return [pdfX, pdfY];
     }
     /**
@@ -72104,7 +72153,8 @@ var MarkupExportService = /*#__PURE__*/function () {
                 pageWidth: width,
                 pageHeight: height,
                 svgViewBox: svgViewBox,
-                modelBounds: modelBounds
+                modelBounds: modelBounds,
+                pageRotation: page.getRotation().angle
               }; // Draw markup on page
               _context.n = 8;
               return this.converter.drawSvgOnPdfPage(svgString, page, converterOptions);
@@ -93863,9 +93913,9 @@ var CanvasExportService = /*#__PURE__*/function () {
           scene,
           _msg,
           _error,
-          svgString,
           sceneBounds,
           svgViewBox,
+          svgString,
           modelBounds,
           pb,
           avgStrokePt,
@@ -93985,7 +94035,14 @@ var CanvasExportService = /*#__PURE__*/function () {
               _error.code = 'MISSING_PAGE_BOUNDS';
               throw _error;
             case 13:
-              svgString = SceneToSvg.convert(scene);
+              sceneBounds = SceneToSvg.computeBounds(scene); // SVG viewBox: use full page bounds if available, else shape bounding box.
+              // The viewBox must cover all shapes so nothing is clipped.
+              svgViewBox = (_ref = (_scene$pageBounds = scene.pageBounds) !== null && _scene$pageBounds !== void 0 ? _scene$pageBounds : scene.viewportBounds) !== null && _ref !== void 0 ? _ref : sceneBounds; // Build the SVG with the SAME viewBox used for PDF coordinate mapping below.
+              // SceneToSvg derives its viewBox attribute AND the Y-flip (translate/scale(1,-1))
+              // from this rect; if it defaulted to viewportBounds while the converter maps via
+              // modelBounds (=pageBounds), the flip origin and the mapping disagree → markup is
+              // mispositioned. Passing svgViewBox keeps both consistent.
+              svgString = SceneToSvg.convert(scene, svgViewBox);
               if (svgString) {
                 _context2.n = 14;
                 break;
@@ -93993,9 +94050,7 @@ var CanvasExportService = /*#__PURE__*/function () {
               console.debug("[CanvasExportService] page ".concat(pageIndex, ": SceneToSvg returned empty"));
               return _context2.a(3, 15);
             case 14:
-              sceneBounds = SceneToSvg.computeBounds(scene); // SVG viewBox: use full page bounds if available, else shape bounding box.
-              // The viewBox must cover all shapes so nothing is clipped.
-              svgViewBox = (_ref = (_scene$pageBounds = scene.pageBounds) !== null && _scene$pageBounds !== void 0 ? _scene$pageBounds : scene.viewportBounds) !== null && _ref !== void 0 ? _ref : sceneBounds; // modelBounds: the full page extent in world coordinates.
+              // modelBounds: the full page extent in world coordinates.
               // CRITICAL: must be the full PDF page, not just the shape bounding box.
               // Using the shape bounding box stretches markup to fill the page (wrong scale/position).
               // pageBounds is captured from viewer.model.getBoundingBox() at save time.