@yorab/react-paint 0.4.2 → 0.6.1

package/dist/utils/transform.js

@@ -135,7 +135,13 @@ var updatePolygonLinesCount = function updatePolygonLinesCount(shape, newPointsC
   if (currentPointsCount === newPointsCount) return shape;
 
   if (currentPointsCount > newPointsCount) {
-    return _fp["default"].set('points', shape.points.slice(0, newPointsCount), shape);
+    var totalPoints = shape.points.slice(0, newPointsCount);
+    return _objectSpread(_objectSpread({}, shape), {}, {
+      points: totalPoints,
+      style: _objectSpread(_objectSpread({}, shape.style), {}, {
+        pointsCount: totalPoints.length
+      })
+    });
   } else {
     //TODO : better distribution for new points
     var nbPointsToAdd = newPointsCount - currentPointsCount;
@@ -144,7 +150,14 @@ var updatePolygonLinesCount = function updatePolygonLinesCount(shape, newPointsC
       return [shape.points[0][0] + (shape.points[1][0] - shape.points[0][0]) * (index + 1) / (nbPointsToAdd + 1), shape.points[0][1] + (shape.points[1][1] - shape.points[0][1]) * (index + 1) / (nbPointsToAdd + 1)];
     }))(nbPointsToAdd);
 
-    return _fp["default"].set('points', [shape.points[0]].concat((0, _toConsumableArray2["default"])(newPoints), (0, _toConsumableArray2["default"])(shape.points.slice(1, shape.points.length))), shape);
+    var _totalPoints = [shape.points[0]].concat((0, _toConsumableArray2["default"])(newPoints), (0, _toConsumableArray2["default"])(shape.points.slice(1, shape.points.length)));
+
+    return _objectSpread(_objectSpread({}, shape), {}, {
+      points: _totalPoints,
+      style: _objectSpread(_objectSpread({}, shape.style), {}, {
+        pointsCount: _totalPoints.length
+      })
+    });
   }
 };
 
@@ -260,11 +273,11 @@ var resizeRect = function resizeRect(cursorPosition, canvasOffset, originalShape
 exports.resizeRect = resizeRect;
 
 var resizeText = function resizeText(ctx, cursorPosition, canvasOffset, originalShape, selectionMode, selectionPadding) {
-  var _newRect$style;
+  var _newRect$style$fontBo, _newRect$style, _newRect$style$fontIt, _newRect$style2, _newRect$style3;
 
   var newRect = resizeRect(cursorPosition, canvasOffset, originalShape, selectionMode, selectionPadding, true);
   return _objectSpread(_objectSpread({}, newRect), {}, {
-    fontSize: calculateTextFontSize(ctx, newRect.value, newRect.width, (_newRect$style = newRect.style) === null || _newRect$style === void 0 ? void 0 : _newRect$style.fontFamily)
+    fontSize: calculateTextFontSize(ctx, newRect.value, newRect.width, (_newRect$style$fontBo = (_newRect$style = newRect.style) === null || _newRect$style === void 0 ? void 0 : _newRect$style.fontBold) !== null && _newRect$style$fontBo !== void 0 ? _newRect$style$fontBo : false, (_newRect$style$fontIt = (_newRect$style2 = newRect.style) === null || _newRect$style2 === void 0 ? void 0 : _newRect$style2.fontItalic) !== null && _newRect$style$fontIt !== void 0 ? _newRect$style$fontIt : false, (_newRect$style3 = newRect.style) === null || _newRect$style3 === void 0 ? void 0 : _newRect$style3.fontFamily)
   });
 };
 
@@ -332,23 +345,23 @@ var transformShape = function transformShape(ctx, shape, cursorPosition, canvasO
 
 exports.transformShape = transformShape;
 
-var calculateTextFontSize = function calculateTextFontSize(ctx, text, maxWidth) {
+var calculateTextFontSize = function calculateTextFontSize(ctx, text, maxWidth, fontBold, fontItalic) {
   var _$flow;
 
-  var fontFamily = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _style.STYLE_FONT_DEFAULT;
-  ctx.font = "1px ".concat(fontFamily);
+  var fontFamily = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : _style.STYLE_FONT_DEFAULT;
+  ctx.font = "".concat(fontItalic ? 'italic' : '', " ").concat(fontBold ? 'bold' : '', " 1px ").concat(fontFamily);
   return (_$flow = _fp["default"].flow(_fp["default"].map(function (value) {
     return maxWidth / ctx.measureText(value).width;
-  }), _fp["default"].min)(text)) !== null && _$flow !== void 0 ? _$flow : 12;
+  }), _fp["default"].min)(text)) !== null && _$flow !== void 0 ? _$flow : _style.STYLE_FONT_SIZE_DEFAULT;
 };
 
 exports.calculateTextFontSize = calculateTextFontSize;
 
-var calculateTextWidth = function calculateTextWidth(ctx, text, fontSize) {
+var calculateTextWidth = function calculateTextWidth(ctx, text, fontSize, fontBold, fontItalic) {
   var _$flow2;
 
-  var fontFamily = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _style.STYLE_FONT_DEFAULT;
-  ctx.font = "".concat(fontSize, "px ").concat(fontFamily);
+  var fontFamily = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : _style.STYLE_FONT_DEFAULT;
+  ctx.font = "".concat(fontItalic ? 'italic' : '', " ").concat(fontBold ? 'bold' : '', " ").concat(fontSize, "px ").concat(fontFamily);
   return (_$flow2 = _fp["default"].flow(_fp["default"].map(function (value) {
     return ctx.measureText(value).width;
   }), _fp["default"].max)(text)) !== null && _$flow2 !== void 0 ? _$flow2 : 20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yorab/react-paint",
-  "version": "0.4.2",
+  "version": "0.6.1",
   "keywords": [],
   "author": "Yohann Rabatel",
   "license": "MIT",