labellife-design-tool 2.2.4 → 2.2.5

package/dist/esm/index.js

@@ -1959,11 +1959,11 @@ var Store = types.model('Store', {
     _toCanvas: function _toCanvas() {
       var _arguments = arguments;
       return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-        var _ref4, _ref4$pixelRatio, pixelRatio, pageId, stage, page, layer, prevX, prevY, prevScaleX, prevScaleY, canvas;
+        var _ref4, _ref4$pixelRatio, pixelRatio, pageId, _ref4$mimeType, mimeType, stage, page, layer, prevX, prevY, prevScaleX, prevScaleY, displayOnlyNodes, rawCanvas, finalCanvas, ctx;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              _ref4 = _arguments.length > 0 && _arguments[0] !== undefined ? _arguments[0] : {}, _ref4$pixelRatio = _ref4.pixelRatio, pixelRatio = _ref4$pixelRatio === void 0 ? 1 : _ref4$pixelRatio, _ref4.ignoreBackground, pageId = _ref4.pageId, _ref4.mimeType, _ref4.includeBleed, _ref4._skipTimeout, _ref4.quickMode;
+              _ref4 = _arguments.length > 0 && _arguments[0] !== undefined ? _arguments[0] : {}, _ref4$pixelRatio = _ref4.pixelRatio, pixelRatio = _ref4$pixelRatio === void 0 ? 1 : _ref4$pixelRatio, _ref4.ignoreBackground, pageId = _ref4.pageId, _ref4$mimeType = _ref4.mimeType, mimeType = _ref4$mimeType === void 0 ? 'image/png' : _ref4$mimeType, _ref4.includeBleed, _ref4._skipTimeout, _ref4.quickMode;
               stage = self._stageRef;
               if (stage) {
                 _context.n = 1;
@@ -1998,20 +1998,47 @@ var Store = types.model('Store', {
               layer.y(0);
               layer.scaleX(1);
               layer.scaleY(1);
+
+              // Hide display-only nodes (shadow, checkerboard, overlay) — not wanted in export
+              displayOnlyNodes = layer.find('.display-only');
+              displayOnlyNodes.forEach(function (n) {
+                return n.hide();
+              });
               layer.draw();
-              canvas = layer.toCanvas({
+              rawCanvas = layer.toCanvas({
                 pixelRatio: pixelRatio,
                 x: 0,
                 y: 0,
                 width: self.width,
                 height: self.height
-              }); // Restore
+              }); // Restore display-only nodes
+              displayOnlyNodes.forEach(function (n) {
+                return n.show();
+              });
+
+              // Restore layer transform
               layer.x(prevX);
               layer.y(prevY);
               layer.scaleX(prevScaleX);
               layer.scaleY(prevScaleY);
               layer.draw();
-              return _context.a(2, canvas);
+
+              // For JPEG, composite onto a white canvas to eliminate any remaining transparency
+              // (avoids black areas and reduces file size vs checkerboard patterns)
+              if (!(mimeType === 'image/jpeg')) {
+                _context.n = 4;
+                break;
+              }
+              finalCanvas = document.createElement('canvas');
+              finalCanvas.width = rawCanvas.width;
+              finalCanvas.height = rawCanvas.height;
+              ctx = finalCanvas.getContext('2d');
+              ctx.fillStyle = '#ffffff';
+              ctx.fillRect(0, 0, finalCanvas.width, finalCanvas.height);
+              ctx.drawImage(rawCanvas, 0, 0);
+              return _context.a(2, finalCanvas);
+            case 4:
+              return _context.a(2, rawCanvas);
           }
         }, _callee);
       }))();
@@ -2042,7 +2069,7 @@ var Store = types.model('Store', {
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
-              _ref6 = _arguments3.length > 0 && _arguments3[0] !== undefined ? _arguments3[0] : {}, _ref6$mimeType = _ref6.mimeType, mimeType = _ref6$mimeType === void 0 ? 'image/png' : _ref6$mimeType, _ref6$quality = _ref6.quality, quality = _ref6$quality === void 0 ? 1 : _ref6$quality, rest = _objectWithoutProperties(_ref6, _excluded2$1);
+              _ref6 = _arguments3.length > 0 && _arguments3[0] !== undefined ? _arguments3[0] : {}, _ref6$mimeType = _ref6.mimeType, mimeType = _ref6$mimeType === void 0 ? 'image/png' : _ref6$mimeType, _ref6$quality = _ref6.quality, quality = _ref6$quality === void 0 ? 0.92 : _ref6$quality, rest = _objectWithoutProperties(_ref6, _excluded2$1);
               _context3.n = 1;
               return self._toCanvas(_objectSpread2({
                 mimeType: mimeType
@@ -10879,7 +10906,7 @@ var CheckerboardBackground = function CheckerboardBackground(_ref) {
     height: h,
     fill: "#ffffff",
     listening: false,
-    name: "page-background"
+    name: "display-only"
   });
   return /*#__PURE__*/jsx(Rect, {
     x: 0,
@@ -10889,7 +10916,7 @@ var CheckerboardBackground = function CheckerboardBackground(_ref) {
     fillPatternImage: imgRef.current,
     fillPatternRepeat: "repeat",
     listening: false,
-    name: "page-background"
+    name: "display-only"
   });
 };
 var ImageBackground = function ImageBackground(_ref2) {
@@ -10973,9 +11000,19 @@ var PageBackground = observer(function (_ref3) {
     });
   }
   if (bg === 'transparent') {
-    return /*#__PURE__*/jsx(CheckerboardBackground, {
-      w: w,
-      h: h
+    return /*#__PURE__*/jsxs(Fragment, {
+      children: [/*#__PURE__*/jsx(Rect, {
+        x: 0,
+        y: 0,
+        width: w,
+        height: h,
+        fill: "#ffffff",
+        listening: false,
+        name: "page-background"
+      }), /*#__PURE__*/jsx(CheckerboardBackground, {
+        w: w,
+        h: h
+      })]
     });
   }
 
@@ -11072,7 +11109,8 @@ var PageOverlayFrame = observer(function (_ref4) {
       ctx.fillStrokeShape(shape);
     },
     fill: "rgba(240,240,240,0.5)",
-    listening: false
+    listening: false,
+    name: "display-only"
   });
 });
 var ALL_ANCHORS = ['top-left', 'top-center', 'top-right', 'middle-left', 'middle-right', 'bottom-left', 'bottom-center', 'bottom-right'];
@@ -11407,7 +11445,8 @@ var Workspace = observer(function (_ref6) {
           height: store.height,
           fill: "rgba(0,0,0,0.1)",
           cornerRadius: 0,
-          listening: false
+          listening: false,
+          name: "display-only"
         }), /*#__PURE__*/jsx(PageBackground, {
           store: store
         }), page && page.children.map(function (element) {