@yorab/react-paint 0.4.2 → 0.6.1

package/dist/styles.css

@@ -31,7 +31,7 @@
   min-width: 0;
 }
 
-.s1unz6yq{position:absolute;display:inline-block;outline:none;left:0px;top:0px;-webkit-transform-origin:left top;-ms-transform-origin:left top;transform-origin:left top;box-sizing:border-box;-webkit-transform:var(--s1unz6yq-0);-ms-transform:var(--s1unz6yq-0);transform:var(--s1unz6yq-0);color:var(--s1unz6yq-1);padding:var(--s1unz6yq-2);font-size:var(--s1unz6yq-3);line-height:var(--s1unz6yq-3);font-family:var(--s1unz6yq-5);}
+.s1unz6yq{position:absolute;display:inline-block;outline:none;left:0px;top:0px;-webkit-transform-origin:left top;-ms-transform-origin:left top;transform-origin:left top;box-sizing:border-box;-webkit-transform:var(--s1unz6yq-0);-ms-transform:var(--s1unz6yq-0);transform:var(--s1unz6yq-0);color:var(--s1unz6yq-1);padding:var(--s1unz6yq-2);font-size:var(--s1unz6yq-3);line-height:var(--s1unz6yq-3);font-family:var(--s1unz6yq-5);opacity:var(--s1unz6yq-6);}.s1unz6yq[data-fontbold='true']{font-weight:bold;}.s1unz6yq[data-fontitalic='true']{font-style:italic;}
 .s9czb9p{-webkit-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}
 .s1538eht{position:relative;background-color:var(--canvas-bg);background-repeat:repeat;background-size:16px;overflow:hidden;display:grid;}.s1538eht[data-grid='true']{background-image:url("data:image/svg+xml,%3Csvg%20id%3D%22svg%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20width%3D%22400%22%20height%3D%22400%22%20viewBox%3D%220%2C%200%2C%20400%2C400%22%3E%3Cg%20id%3D%22svgg%22%3E%3Cpath%20id%3D%22path0%22%20d%3D%22M204.800%2094.600%20C%20204.800%20188.933%2C204.802%20189.200%2C205.600%20189.200%20C%20206.248%20189.200%2C206.400%20189.467%2C206.400%20190.600%20C%20206.400%20191.733%2C206.552%20192.000%2C207.200%20192.000%20C%20207.733%20192.000%2C208.000%20192.267%2C208.000%20192.800%20C%20208.000%20193.244%2C208.267%20193.600%2C208.600%20193.600%20C%20208.933%20193.600%2C209.200%20193.956%2C209.200%20194.400%20C%20209.200%20195.067%2C209.467%20195.200%2C210.800%20195.200%20C%20212.133%20195.200%2C212.400%20195.333%2C212.400%20196.000%20C%20212.400%20196.798%2C212.667%20196.800%2C306.200%20196.800%20L%20400.000%20196.800%20400.000%2098.400%20L%20400.000%200.000%20302.400%200.000%20L%20204.800%200.000%20204.800%2094.600%20M0.000%20302.400%20L%200.000%20400.000%2098.400%20400.000%20L%20196.800%20400.000%20196.800%20306.200%20C%20196.800%20212.667%2C196.798%20212.400%2C196.000%20212.400%20C%20195.333%20212.400%2C195.200%20212.133%2C195.200%20210.800%20C%20195.200%20209.467%2C195.067%20209.200%2C194.400%20209.200%20C%20193.956%20209.200%2C193.600%20208.933%2C193.600%20208.600%20C%20193.600%20208.267%2C193.244%20208.000%2C192.800%20208.000%20C%20192.267%20208.000%2C192.000%20207.733%2C192.000%20207.200%20C%20192.000%20206.552%2C191.733%20206.400%2C190.600%20206.400%20C%20189.467%20206.400%2C189.200%20206.248%2C189.200%20205.600%20C%20189.200%20204.802%2C188.933%20204.800%2C94.600%20204.800%20L%200.000%20204.800%200.000%20302.400%20%22%20stroke%3D%22none%22%20fill%3D%22%23fcfcfc%22%20fill-rule%3D%22evenodd%22%3E%3C%2Fpath%3E%3Cpath%20id%3D%22path1%22%20d%3D%22M0.000%20100.000%20L%200.000%20200.000%2096.800%20200.000%20C%20193.333%20200.000%2C193.600%20199.998%2C193.600%20199.200%20C%20193.600%20198.533%2C193.867%20198.400%2C195.200%20198.400%20C%20196.533%20198.400%2C196.800%20198.267%2C196.800%20197.600%20C%20196.800%20197.067%2C197.067%20196.800%2C197.600%20196.800%20C%20198.267%20196.800%2C198.400%20196.533%2C198.400%20195.200%20C%20198.400%20193.867%2C198.533%20193.600%2C199.200%20193.600%20C%20199.998%20193.600%2C200.000%20193.333%2C200.000%2096.800%20L%20200.000%200.000%20100.000%200.000%20L%200.000%200.000%200.000%20100.000%20M208.000%20202.400%20C%20208.000%20203.067%2C207.733%20203.200%2C206.400%20203.200%20C%20205.067%20203.200%2C204.800%20203.333%2C204.800%20204.000%20C%20204.800%20204.533%2C204.533%20204.800%2C204.000%20204.800%20C%20203.333%20204.800%2C203.200%20205.067%2C203.200%20206.400%20C%20203.200%20207.733%2C203.067%20208.000%2C202.400%20208.000%20C%20201.602%20208.000%2C201.600%20208.267%2C201.600%20304.000%20L%20201.600%20400.000%20300.800%20400.000%20L%20400.000%20400.000%20400.000%20300.800%20L%20400.000%20201.600%20304.000%20201.600%20C%20208.267%20201.600%2C208.000%20201.602%2C208.000%20202.400%20%22%20stroke%3D%22none%22%20fill%3D%22%23e4e4e4%22%20fill-rule%3D%22evenodd%22%3E%3C%2Fpath%3E%3Cpath%20id%3D%22path2%22%20d%3D%22%22%20stroke%3D%22none%22%20fill%3D%22%23f4100f0%22%20fill-rule%3D%22evenodd%22%3E%3C%2Fpath%3E%3Cpath%20id%3D%22path3%22%20d%3D%22%22%20stroke%3D%22none%22%20fill%3D%22%23f4100f0%22%20fill-rule%3D%22evenodd%22%3E%3C%2Fpath%3E%3Cpath%20id%3D%22path4%22%20d%3D%22%22%20stroke%3D%22none%22%20fill%3D%22%23f4100f0%22%20fill-rule%3D%22evenodd%22%3E%3C%2Fpath%3E%3C%2Fg%3E%3C%2Fsvg%3E");}.s1538eht[data-grow='true']{width:100%;height:100%;}
 .s101qxdc{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;max-width:100%;touch-action:none;display:block;grid-area:1 / 1;}.s101qxdc[data-grow='true']{width:100%;}
@@ -43,14 +43,15 @@
 .s1xzg253{position:absolute;z-index:3;background:var(--toolbar-bg);bottom:100%;box-shadow:0 3px 8px rgb(0 0 0 / 24%);padding:8px;border-radius:8px;white-space:nowrap;}.s1xzg253[data-alignment='left']{left:0;margin:4px;}.s1xzg253[data-alignment='center']{left:50%;-webkit-transform:translate3d(-50%,0px,0px);-ms-transform:translate3d(-50%,0px,0px);transform:translate3d(-50%,0px,0px);margin:4px 0px;}.s1xzg253[data-alignment='right']{right:0;margin:4px;}
 .s17qj3jh{margin-bottom:8px;margin-top:4px;font-size:18px;}
 .su3a8bs{display:inline-block;background:var(--toolbar-bg);box-sizing:border-box;overflow-y:auto;min-width:200px;}
-.szboplp{border:3px solid transparent;padding:4px 0px;position:relative;background:var(--toolbar-bg);box-sizing:border-box;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;}.szboplp[data-is-over='1']{border:3px dotted var(--font-hover-bg);}.szboplp[data-is-dragging='1']{opacity:0.4;}.szboplp[data-selected='1']{color:var(--font-selected-color);background:var(--font-selected-bg);}.szboplp[data-selected='0'][data-disabled='0']{background:var(--font-bg);color:var(--font-color);}.szboplp[data-selected='0'][data-disabled='0']:hover{color:var(--font-hover-color);background:var(--font-hover-bg);}.szboplp[data-disabled='1']{cursor:default;color:var(--font-disabled-color);background:var(--font-disabled-bg);}.szboplp[data-disabled='0']{cursor:move;}.szboplp > span{height:20px;}.szboplp > span > svg{fill:#8a8a8a;width:20px;height:20px;padding:0 16px;}
-.sff5xt[data-visible='false']{opacity:0.2;}
-.sj3bift[data-locked='false']{opacity:0.2;}
-.s10ip0a4[data-grid='false'] svg{opacity:0.2;}
-.s1j9uq9o{-webkit-flex:1;-ms-flex:1;flex:1;}
-.s156ddbb{bottom:0;left:unset;top:unset;max-height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}
-.s11gt4hl{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;}
-.s13cxqhq{opacity:0.6;text-align:center;padding:12px 0px;}
+.szboplp{margin:2px 0;}.szboplp:not(:hover){opacity:0.2;}
+.sff5xt{border:3px solid transparent;padding:4px 0px;position:relative;background:var(--toolbar-bg);box-sizing:border-box;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;}.sff5xt[data-is-over='1']{border:3px dotted var(--font-hover-bg);}.sff5xt[data-is-dragging='1']{opacity:0.4;}.sff5xt[data-selected='1']{color:var(--font-selected-color);background:var(--font-selected-bg);}.sff5xt[data-selected='1'] .szboplp{color:white;}.sff5xt[data-selected='0'][data-disabled='0']{background:var(--font-bg);color:var(--font-color);}.sff5xt[data-selected='0'][data-disabled='0']:hover{color:var(--font-hover-color);background:var(--font-hover-bg);}.sff5xt[data-disabled='1']{cursor:default;color:var(--font-disabled-color);background:var(--font-disabled-bg);}.sff5xt[data-disabled='0']{cursor:move;}.sff5xt > span{height:20px;line-height:1;color:#8a8a8a;}.sff5xt > span > svg{fill:#8a8a8a;width:20px;height:20px;padding:0 4px;-webkit-transform:scale(0.75);-ms-transform:scale(0.75);transform:scale(0.75);}
+.sj3bift{margin:2px 0;}.sj3bift[data-visible='false']{opacity:0.2;}
+.s10ip0a4{margin:2px 0;}.s10ip0a4[data-locked='false']{opacity:0.2;}
+.s1j9uq9o[data-grid='false'] svg{opacity:0.2;}
+.s156ddbb{-webkit-flex:1;-ms-flex:1;flex:1;}
+.s11gt4hl{bottom:0;left:unset;top:unset;max-height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}
+.s13cxqhq{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;overflow-y:auto;}
+.s1idv8qv{opacity:0.6;text-align:center;padding:12px 0px;}
 .s1bvz4xj{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;bottom:unset;top:100%;}.s1bvz4xj[data-vertical='1']{-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}
 .siejlch{position:relative;display:inline-block;}
 .s1uphjfh{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;bottom:unset;top:100%;}.s1uphjfh[data-vertical='1']{-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}
@@ -68,7 +69,6 @@
 .s9mugpt{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}
 .s1ktxhkr{padding:16px;}
 .smpmxx5{font-family:var(--smpmxx5-0);}
-
 .s1qssg4n{display:inline-block;width:6px;height:2px;background:transparent;vertical-align:middle;}
 .se26iq6{display:inline-block;}.se26iq6[data-type='0'] .s1qssg4n{background:currentColor;}.se26iq6[data-type='1']{position:relative;left:3px;}.se26iq6[data-type='1'] .s1qssg4n:nth-child(3n-1){background:currentColor;width:12px;}.se26iq6[data-type='1'] .s1qssg4n:nth-child(n+11){display:none;}.se26iq6[data-type='2'] .s1qssg4n:nth-child(2n+1){background:currentColor;}
 .s1xxj4yl{position:absolute;left:0;top:50%;-webkit-transform:translate3d(-25%,-50%,0px);-ms-transform:translate3d(-25%,-50%,0px);transform:translate3d(-25%,-50%,0px);display:inline-block;width:0;height:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:15px solid currentColor;}

package/dist/types/Shapes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ToolEnum = exports.ShapeEnum = void 0;
+exports.ShapeEnum = void 0;
 var ShapeEnum;
 exports.ShapeEnum = ShapeEnum;
 
@@ -18,18 +18,4 @@ exports.ShapeEnum = ShapeEnum;
   ShapeEnum["ellipse"] = "ellipse";
   ShapeEnum["picture"] = "picture";
   ShapeEnum["text"] = "text";
-})(ShapeEnum || (exports.ShapeEnum = ShapeEnum = {}));
-
-var ToolEnum;
-exports.ToolEnum = ToolEnum;
-
-(function (ToolEnum) {
-  ToolEnum["selection"] = "selection";
-  ToolEnum["undo"] = "undo";
-  ToolEnum["redo"] = "redo";
-  ToolEnum["clear"] = "clear";
-  ToolEnum["export"] = "export";
-  ToolEnum["loadFile"] = "loadfile";
-  ToolEnum["saveFile"] = "savefile";
-  ToolEnum["move"] = "move";
-})(ToolEnum || (exports.ToolEnum = ToolEnum = {}));
+})(ShapeEnum || (exports.ShapeEnum = ShapeEnum = {}));

package/dist/types/tools.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ActionsEnum = void 0;
+// default
+var ActionsEnum;
+exports.ActionsEnum = ActionsEnum;
+
+(function (ActionsEnum) {
+  ActionsEnum["selection"] = "selection";
+  ActionsEnum["undo"] = "undo";
+  ActionsEnum["redo"] = "redo";
+  ActionsEnum["clear"] = "clear";
+  ActionsEnum["export"] = "export";
+  ActionsEnum["loadFile"] = "loadfile";
+  ActionsEnum["saveFile"] = "savefile";
+  ActionsEnum["move"] = "move";
+  ActionsEnum["uploadPicture"] = "uploadpicture";
+  ActionsEnum["addUrlPicture"] = "addurlpicture";
+})(ActionsEnum || (exports.ActionsEnum = ActionsEnum = {}));

package/dist/utils/data.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.roundValues = exports.createShape = exports.createPicture = exports.copyShape = exports.cleanShapesBeforeExport = exports.addDefaultAndTempShapeProps = void 0;
+exports.roundValues = exports.createShape = exports.createPicture = exports.copyShape = exports.cleanShapesBeforeExport = exports.buildDataToExport = exports.addDefaultAndTempShapeProps = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -19,6 +19,8 @@ var _Shapes = require("../types/Shapes");
 
 var _file = require("./file");
 
+var _tools = require("../constants/tools");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -34,13 +36,14 @@ var createPicture = function createPicture(fileOrUrl, maxPictureWidth, maxPictur
           height = _fitContentInsideCont2[1];
 
       var pictureShape = {
+        toolId: _tools.DEFAULT_SHAPE_PICTURE.id,
         type: _Shapes.ShapeEnum.picture,
         id: _fp["default"].uniqueId("".concat(_Shapes.ShapeEnum.picture, "_")),
         x: (maxPictureWidth - width) / 2,
         y: (maxPictureHeight - height) / 2,
         width: width,
         height: height,
-        src: img.src,
+        src: fileOrUrl instanceof File ? img.src : fileOrUrl,
         img: img,
         translation: [0, 0],
         rotation: 0
@@ -48,10 +51,18 @@ var createPicture = function createPicture(fileOrUrl, maxPictureWidth, maxPictur
       resolve(pictureShape);
     };
 
+    img.onerror = function () {
+      reject(new Error('Some images could not be loaded'));
+    };
+
     if (fileOrUrl instanceof File) {
       img.src = URL.createObjectURL(fileOrUrl);
     } else {
-      img.src = fileOrUrl;
+      (0, _file.fetchAndStringify)(fileOrUrl).then(function (picData) {
+        img.src = picData;
+      })["catch"](function () {
+        img.src = ''; // to trigger onerror
+      });
     }
 
     img.onerror = function () {
@@ -66,74 +77,112 @@ var createPicture = function createPicture(fileOrUrl, maxPictureWidth, maxPictur
 
 exports.createPicture = createPicture;
 
-var createShape = function createShape(ctx, shape, cursorPosition, defaultConf) {
-  var _defaultConf$style$po, _defaultConf$style, _defaultConf$style$po2, _defaultConf$style2, _defaultConf$style3;
+var createShape = function createShape(ctx, shape, cursorPosition) {
+  var _shape$settings$fontB, _shape$settings, _shape$settings$fontI, _shape$settings2;
 
-  switch (shape) {
+  switch (shape.type) {
     case _Shapes.ShapeEnum.brush:
+      shape.settings;
       return {
+        toolId: shape.id,
         type: _Shapes.ShapeEnum.brush,
-        id: _fp["default"].uniqueId("".concat(shape, "_")),
+        id: _fp["default"].uniqueId("".concat(shape.type, "_")),
         points: [[cursorPosition]],
         translation: [0, 0],
         rotation: 0,
-        style: defaultConf.style
+        style: {
+          globalAlpha: shape.settings.opacity["default"],
+          strokeColor: shape.settings.strokeColor["default"],
+          lineWidth: shape.settings.lineWidth["default"],
+          lineDash: shape.settings.lineDash["default"]
+        }
       };
 
     case _Shapes.ShapeEnum.line:
       return {
+        toolId: shape.id,
         type: _Shapes.ShapeEnum.line,
-        id: _fp["default"].uniqueId("".concat(shape, "_")),
+        id: _fp["default"].uniqueId("".concat(shape.type, "_")),
         points: [cursorPosition, cursorPosition],
         translation: [0, 0],
         rotation: 0,
-        style: defaultConf.style
+        style: {
+          globalAlpha: shape.settings.opacity["default"],
+          strokeColor: shape.settings.strokeColor["default"],
+          lineWidth: shape.settings.lineWidth["default"],
+          lineDash: shape.settings.lineDash["default"],
+          lineArrow: shape.settings.lineArrow["default"]
+        }
       };
 
     case _Shapes.ShapeEnum.polygon:
       return {
+        toolId: shape.id,
         type: _Shapes.ShapeEnum.polygon,
-        id: _fp["default"].uniqueId("".concat(shape, "_")),
+        id: _fp["default"].uniqueId("".concat(shape.type, "_")),
         points: _fp["default"].flow(_fp["default"].range(0), _fp["default"].map(function () {
           return cursorPosition;
-        }))((_defaultConf$style$po = (_defaultConf$style = defaultConf.style) === null || _defaultConf$style === void 0 ? void 0 : _defaultConf$style.pointsCount) !== null && _defaultConf$style$po !== void 0 ? _defaultConf$style$po : 3),
+        }))(shape.settings.pointsCount["default"]),
         translation: [0, 0],
         rotation: 0,
-        style: defaultConf.style
+        style: {
+          globalAlpha: shape.settings.opacity["default"],
+          fillColor: shape.settings.fillColor["default"],
+          strokeColor: shape.settings.strokeColor["default"],
+          lineWidth: shape.settings.lineWidth["default"],
+          lineDash: shape.settings.lineDash["default"],
+          pointsCount: shape.settings.pointsCount["default"]
+        }
       };
 
     case _Shapes.ShapeEnum.curve:
       return {
+        toolId: shape.id,
         type: _Shapes.ShapeEnum.curve,
-        id: _fp["default"].uniqueId("".concat(shape, "_")),
+        id: _fp["default"].uniqueId("".concat(shape.type, "_")),
         points: _fp["default"].flow(_fp["default"].range(0), _fp["default"].map(function () {
           return cursorPosition;
-        }))((_defaultConf$style$po2 = (_defaultConf$style2 = defaultConf.style) === null || _defaultConf$style2 === void 0 ? void 0 : _defaultConf$style2.pointsCount) !== null && _defaultConf$style$po2 !== void 0 ? _defaultConf$style$po2 : 3),
+        }))(shape.settings.pointsCount["default"]),
         translation: [0, 0],
         rotation: 0,
-        style: defaultConf.style
+        style: {
+          globalAlpha: shape.settings.opacity["default"],
+          fillColor: shape.settings.fillColor["default"],
+          strokeColor: shape.settings.strokeColor["default"],
+          lineWidth: shape.settings.lineWidth["default"],
+          lineDash: shape.settings.lineDash["default"],
+          pointsCount: shape.settings.pointsCount["default"]
+        }
       };
 
     case _Shapes.ShapeEnum.rect:
     case _Shapes.ShapeEnum.square:
       return {
-        type: shape,
-        id: _fp["default"].uniqueId("".concat(shape, "_")),
+        toolId: shape.id,
+        type: shape.type,
+        id: _fp["default"].uniqueId("".concat(shape.type, "_")),
         x: cursorPosition[0],
         y: cursorPosition[1],
         width: 1,
         height: 1,
         translation: [0, 0],
         rotation: 0,
-        style: defaultConf.style
+        style: {
+          globalAlpha: shape.settings.opacity["default"],
+          fillColor: shape.settings.fillColor["default"],
+          strokeColor: shape.settings.strokeColor["default"],
+          lineWidth: shape.settings.lineWidth["default"],
+          lineDash: shape.settings.lineDash["default"]
+        }
       };
 
     case _Shapes.ShapeEnum.text:
-      var defaultValue = [];
-      var fontSize = (0, _transform.calculateTextFontSize)(ctx, defaultValue, 50, (_defaultConf$style3 = defaultConf.style) === null || _defaultConf$style3 === void 0 ? void 0 : _defaultConf$style3.fontFamily);
+      var defaultValue = ['Texte'];
+      var fontSize = (0, _transform.calculateTextFontSize)(ctx, defaultValue, 50, (_shape$settings$fontB = (_shape$settings = shape.settings) === null || _shape$settings === void 0 ? void 0 : _shape$settings.fontBold["default"]) !== null && _shape$settings$fontB !== void 0 ? _shape$settings$fontB : false, (_shape$settings$fontI = (_shape$settings2 = shape.settings) === null || _shape$settings2 === void 0 ? void 0 : _shape$settings2.fontItalic["default"]) !== null && _shape$settings$fontI !== void 0 ? _shape$settings$fontI : false, shape.settings.fontFamily["default"]);
       return {
+        toolId: shape.id,
         type: _Shapes.ShapeEnum.text,
-        id: _fp["default"].uniqueId("".concat(shape, "_")),
+        id: _fp["default"].uniqueId("".concat(shape.type, "_")),
         x: cursorPosition[0],
         y: cursorPosition[1],
         value: defaultValue,
@@ -142,33 +191,50 @@ var createShape = function createShape(ctx, shape, cursorPosition, defaultConf)
         height: fontSize * (defaultValue.length || 1),
         translation: [0, 0],
         rotation: 0,
-        style: defaultConf.style
+        style: {
+          globalAlpha: shape.settings.opacity["default"],
+          strokeColor: shape.settings.strokeColor["default"],
+          fontFamily: shape.settings.fontFamily["default"]
+        }
       };
 
     case _Shapes.ShapeEnum.ellipse:
       return {
+        toolId: shape.id,
         type: _Shapes.ShapeEnum.ellipse,
-        id: _fp["default"].uniqueId("".concat(shape, "_")),
+        id: _fp["default"].uniqueId("".concat(shape.type, "_")),
         x: cursorPosition[0],
         y: cursorPosition[1],
         radiusX: 0,
         radiusY: 0,
         translation: [0, 0],
         rotation: 0,
-        style: defaultConf.style
+        style: {
+          globalAlpha: shape.settings.opacity["default"],
+          fillColor: shape.settings.fillColor["default"],
+          strokeColor: shape.settings.strokeColor["default"],
+          lineWidth: shape.settings.lineWidth["default"],
+          lineDash: shape.settings.lineDash["default"]
+        }
       };
 
     case _Shapes.ShapeEnum.circle:
-    default:
       return {
+        toolId: shape.id,
         type: _Shapes.ShapeEnum.circle,
-        id: _fp["default"].uniqueId("".concat(shape, "_")),
+        id: _fp["default"].uniqueId("".concat(shape.type, "_")),
         x: cursorPosition[0],
         y: cursorPosition[1],
         radius: 0,
         translation: [0, 0],
         rotation: 0,
-        style: defaultConf.style
+        style: {
+          globalAlpha: shape.settings.opacity["default"],
+          fillColor: shape.settings.fillColor["default"],
+          strokeColor: shape.settings.strokeColor["default"],
+          lineWidth: shape.settings.lineWidth["default"],
+          lineDash: shape.settings.lineDash["default"]
+        }
       };
   }
 };
@@ -221,6 +287,18 @@ var cleanShapesBeforeExport = function cleanShapesBeforeExport(shapes) {
 
 exports.cleanShapesBeforeExport = cleanShapesBeforeExport;
 
+var buildDataToExport = function buildDataToExport(shapes, width, height) {
+  return {
+    shapes: cleanShapesBeforeExport(shapes),
+    config: {
+      width: width,
+      height: height
+    }
+  };
+};
+
+exports.buildDataToExport = buildDataToExport;
+
 var addDefaultAndTempShapeProps = function addDefaultAndTempShapeProps(shape) {
   return _objectSpread(_objectSpread({}, shape), {}, {
     id: _fp["default"].uniqueId("".concat(shape.type, "_"))

package/dist/utils/draw.js

@@ -225,12 +225,12 @@ var drawRect = function drawRect(ctx, rect) {
 exports.drawRect = drawRect;
 
 var drawText = function drawText(ctx, text) {
-  var _text$style, _text$style$fontFamil, _text$style2;
+  var _text$style, _text$style2, _text$style3, _text$style$fontFamil, _text$style4;
 
   updateDrawStyle(ctx, text.style);
   if (ctx.globalAlpha === 0 || !((_text$style = text.style) !== null && _text$style !== void 0 && _text$style.strokeColor) || text.style.strokeColor === 'transparent') return;
-  ctx.font = "".concat(text.fontSize, "px ").concat((_text$style$fontFamil = (_text$style2 = text.style) === null || _text$style2 === void 0 ? void 0 : _text$style2.fontFamily) !== null && _text$style$fontFamil !== void 0 ? _text$style$fontFamil : _style.STYLE_FONT_DEFAULT);
-  ctx.textBaseline = 'hanging';
+  ctx.font = "".concat((_text$style2 = text.style) !== null && _text$style2 !== void 0 && _text$style2.fontItalic ? 'italic' : '', " ").concat((_text$style3 = text.style) !== null && _text$style3 !== void 0 && _text$style3.fontBold ? 'bold' : '', " ").concat(text.fontSize, "px ").concat((_text$style$fontFamil = (_text$style4 = text.style) === null || _text$style4 === void 0 ? void 0 : _text$style4.fontFamily) !== null && _text$style$fontFamil !== void 0 ? _text$style$fontFamil : _style.STYLE_FONT_DEFAULT);
+  ctx.textBaseline = 'top';
   ctx.fillStyle = text.style.strokeColor;
 
   for (var i = 0; i < text.value.length; i++) {

package/dist/utils/file.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCanvasImage = exports.getBase64Image = exports.fetchAndStringify = exports.encodeShapesInString = exports.downloadFile = exports.decodePicturesInShapes = exports.decodeJson = void 0;
+exports.getCanvasImage = exports.getBase64Image = exports.fetchAndStringify = exports.encodeShapesInString = exports.downloadFile = exports.decodeJson = exports.decodeImportedData = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -80,9 +80,9 @@ var getCanvasImage = function getCanvasImage(shapes, canvasOffset, width, height
 
 exports.getCanvasImage = getCanvasImage;
 
-var encodeShapesInString = function encodeShapesInString(shapes) {
-  var cleanShapes = (0, _data.cleanShapesBeforeExport)(shapes);
-  return encodeObjectToString(cleanShapes);
+var encodeShapesInString = function encodeShapesInString(shapes, width, height) {
+  var dataToExport = (0, _data.buildDataToExport)(shapes, width, height);
+  return encodeObjectToString(dataToExport);
 };
 
 exports.encodeShapesInString = encodeShapesInString;
@@ -123,14 +123,15 @@ var decodeJson = /*#__PURE__*/function () {
 
 exports.decodeJson = decodeJson;
 
-var decodePicturesInShapes = /*#__PURE__*/function () {
+var decodeImportedData = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(shapesForJson) {
-    var promisesArray, shapes;
+    var promisesArray, jsonShapes, shapes;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             promisesArray = [];
+            jsonShapes = shapesForJson.shapes;
             shapes = _fp["default"].flow(_fp["default"].map(function (shape) {
               if (!_fp["default"].includes(shape.type, _Shapes.ShapeEnum)) return null;
 
@@ -157,20 +158,20 @@ var decodePicturesInShapes = /*#__PURE__*/function () {
                   img.src = shape.src;
                 }
 
-                return _objectSpread(_objectSpread({}, shape), {}, {
+                return (0, _data.addDefaultAndTempShapeProps)(_objectSpread(_objectSpread({}, shape), {}, {
                   img: img
-                });
+                }));
               }
 
               return (0, _data.addDefaultAndTempShapeProps)(shape);
-            }), _fp["default"].compact)(shapesForJson);
-            _context2.next = 4;
+            }), _fp["default"].compact)(jsonShapes);
+            _context2.next = 5;
             return Promise.all(promisesArray);
 
-          case 4:
+          case 5:
             return _context2.abrupt("return", shapes);
 
-          case 5:
+          case 6:
           case "end":
             return _context2.stop();
         }
@@ -178,9 +179,9 @@ var decodePicturesInShapes = /*#__PURE__*/function () {
     }, _callee2);
   }));
 
-  return function decodePicturesInShapes(_x2) {
+  return function decodeImportedData(_x2) {
     return _ref2.apply(this, arguments);
   };
 }();
 
-exports.decodePicturesInShapes = decodePicturesInShapes;
+exports.decodeImportedData = decodeImportedData;

package/dist/utils/selection.js

@@ -54,7 +54,7 @@ var selectShape = function selectShape(shapes, cursorPosition, currentScale, can
     };
     var newSelectionMode = getNewSelectionData(positionIntersection, selectedShape, cursorPosition, selectionPadding);
 
-    if (newSelectionMode) {
+    if ((newSelectionMode === null || newSelectionMode === void 0 ? void 0 : newSelectionMode.mode) === _Mode.SelectionModeLib.resize || (newSelectionMode === null || newSelectionMode === void 0 ? void 0 : newSelectionMode.mode) === _Mode.SelectionModeLib.rotate) {
       return {
         shape: selectedShape,
         mode: newSelectionMode

package/dist/utils/style.js

@@ -24,7 +24,8 @@ var getShapePicture = function getShapePicture(shape) {
       return _icons.curveIcon;
 
     case _Shapes.ShapeEnum.rect:
-      return _icons.recIcon;
+      return _icons.squareIcon;
+    // temporary
 
     case _Shapes.ShapeEnum.square:
       return _icons.squareIcon;
@@ -33,7 +34,8 @@ var getShapePicture = function getShapePicture(shape) {
       return _icons.circleIcon;
 
     case _Shapes.ShapeEnum.ellipse:
-      return _icons.ellipseIcon;
+      return _icons.circleIcon;
+    // temporary
 
     case _Shapes.ShapeEnum.text:
       return _icons.textIcon;

package/dist/utils/toolbar.js

@@ -5,33 +5,88 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCurrentStructure = void 0;
+exports.sanitizeTools = exports.getCurrentStructure = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _Shapes = require("../types/Shapes");
+
 var _fp = _interopRequireDefault(require("lodash/fp"));
 
+var _tools = require("../constants/tools");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var getCurrentStructure = function getCurrentStructure(availableTools, defaultStructure) {
-  return _fp["default"].flow(_fp["default"].map(function (group) {
+  return _fp["default"].flow(_fp["default"].flatMap(function (group) {
     if (!_fp["default"].isObject(group)) {
-      if (_fp["default"].includes(group, availableTools)) {
-        return group;
-      }
-
-      return null;
+      return _fp["default"].filter({
+        type: group
+      }, availableTools);
     }
 
-    var tools = _fp["default"].intersection(availableTools, group.tools);
+    var toolsType = _fp["default"].filter(function (tool) {
+      return _fp["default"].includes(tool.type, group.toolsType);
+    }, availableTools);
 
-    if (!tools) return null;
+    if (!toolsType) return null;
     return _objectSpread(_objectSpread({}, group), {}, {
-      tools: tools
+      toolsType: toolsType
     });
   }), _fp["default"].compact)(defaultStructure);
 };
 
-exports.getCurrentStructure = getCurrentStructure;
+exports.getCurrentStructure = getCurrentStructure;
+
+var sanitizeTools = function sanitizeTools(tools) {
+  var withPicture = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+  var customizer = function customizer(objValue, srcValue) {
+    if (_fp["default"].isArray(objValue)) {
+      return srcValue;
+    }
+  };
+
+  return _fp["default"].flow(_fp["default"].map(function (tool) {
+    if (!_fp["default"].isObject(tool)) return null;
+
+    switch (_fp["default"].get('type', tool)) {
+      case _Shapes.ShapeEnum.brush:
+        return _fp["default"].mergeWith(customizer, _tools.DEFAULT_SHAPE_BRUSH, tool);
+
+      case _Shapes.ShapeEnum.circle:
+        return _fp["default"].mergeWith(customizer, _tools.DEFAULT_SHAPE_CIRCLE, tool);
+
+      case _Shapes.ShapeEnum.curve:
+        return _fp["default"].mergeWith(customizer, _tools.DEFAULT_SHAPE_CURVE, tool);
+
+      case _Shapes.ShapeEnum.ellipse:
+        return _fp["default"].mergeWith(customizer, _tools.DEFAULT_SHAPE_ELLIPSE, tool);
+
+      case _Shapes.ShapeEnum.line:
+        return _fp["default"].mergeWith(customizer, _tools.DEFAULT_SHAPE_LINE, tool);
+
+      case _Shapes.ShapeEnum.polygon:
+        return _fp["default"].mergeWith(customizer, _tools.DEFAULT_SHAPE_POLYGON, tool);
+
+      case _Shapes.ShapeEnum.rect:
+        return _fp["default"].mergeWith(customizer, _tools.DEFAULT_SHAPE_RECT, tool);
+
+      case _Shapes.ShapeEnum.square:
+        return _fp["default"].mergeWith(customizer, _tools.DEFAULT_SHAPE_SQUARE, tool);
+
+      case _Shapes.ShapeEnum.text:
+        return _fp["default"].mergeWith(customizer, _tools.DEFAULT_SHAPE_TEXT, tool);
+    }
+
+    return null;
+  }), function (tools) {
+    return withPicture ? [].concat((0, _toConsumableArray2["default"])(tools), [_tools.DEFAULT_SHAPE_PICTURE]) : tools;
+  }, _fp["default"].compact)(tools);
+};
+
+exports.sanitizeTools = sanitizeTools;