redhotmagma-graphics-editor 1.45.0 → 1.46.0

package/CanvasAdapters/PaperJs/Canvas.js

@@ -56,6 +56,9 @@ var Canvas = exports.Canvas = /*#__PURE__*/function (_AbstractCanvas) {
       args[_key] = arguments[_key];
     }
     _this = _super.call.apply(_super, [this].concat(args));
+    _defineProperty(_assertThisInitialized(_this), "Image", Canvas.Image);
+    _defineProperty(_assertThisInitialized(_this), "Text", Canvas.Text);
+    _defineProperty(_assertThisInitialized(_this), "Group", Canvas.Group);
     _defineProperty(_assertThisInitialized(_this), "_project", void 0);
     _defineProperty(_assertThisInitialized(_this), "_view", void 0);
     // prevents dragging out the object (by default lets dragging only up to the 2/3 of the object width)
@@ -527,7 +530,7 @@ var Canvas = exports.Canvas = /*#__PURE__*/function (_AbstractCanvas) {
   }, {
     key: "addText",
     value: function addText(options) {
-      var text = new _Text.Text(options);
+      var text = new this.Text(options);
       this.add(text);
       return text;
     }
@@ -540,7 +543,7 @@ var Canvas = exports.Canvas = /*#__PURE__*/function (_AbstractCanvas) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               src = options.src;
-              image = new _Image.Image(options);
+              image = new this.Image(options);
               if (!src) {
                 _context6.next = 5;
                 break;
@@ -571,7 +574,7 @@ var Canvas = exports.Canvas = /*#__PURE__*/function (_AbstractCanvas) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               src = options.src;
-              group = new _Group.Group(options);
+              group = new this.Group(options);
               if (!src) {
                 _context7.next = 5;
                 break;
@@ -702,4 +705,7 @@ var Canvas = exports.Canvas = /*#__PURE__*/function (_AbstractCanvas) {
     }()
   }]);
   return Canvas;
-}(_Canvas.AbstractCanvas);
+}(_Canvas.AbstractCanvas);
+_defineProperty(Canvas, "Image", _Image.Image);
+_defineProperty(Canvas, "Text", _Text.Text);
+_defineProperty(Canvas, "Group", _Group.Group);

package/CanvasAdapters/PaperJs/CanvasRepository.js

@@ -3,8 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createCanvasRepository = void 0;
+exports.createCanvasRepository = exports.AdapterClasses = void 0;
 var _Canvas = require("./Canvas");
+var AdapterClasses = exports.AdapterClasses = {
+  Canvas: _Canvas.Canvas
+};
 var createCanvasRepository = exports.createCanvasRepository = function createCanvasRepository() {
   var repositoryMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Map();
   var activeCanvas;
@@ -14,7 +17,7 @@ var createCanvasRepository = exports.createCanvasRepository = function createCan
     var _options$updateCanvas = options.updateCanvas,
       updateCanvas = _options$updateCanvas === void 0 ? false : _options$updateCanvas;
     if (!repositoryMap.has(key) || updateCanvas) {
-      var _canvas = new _Canvas.Canvas();
+      var _canvas = new AdapterClasses.Canvas();
       _canvas.init(); // create canvas element
       if (canvasSize) {
         _canvas.setSize(canvasSize);

package/CanvasAdapters/PaperJs/Utils/TextToSVGRepository.js

@@ -30,7 +30,8 @@ function getFontsFromSvg(node, fontToFileMap) {
   if (node.nodeName === 'text') {
     var fontFamily = (0, _String.trimQuotes)((0, _DOM.getClosestAttribute)(node, 'font-family'));
     var fontWeight = (0, _DOM.getClosestAttribute)(node, 'font-weight');
-    var type = (0, _TextToSVGUtils.convertFontWeightToType)(fontWeight);
+    var fontStyle = (0, _DOM.getClosestAttribute)(node, 'font-style');
+    var type = (0, _TextToSVGUtils.convertFontWeightToType)(fontWeight, fontStyle);
     if (fontFamily) {
       var url = fontToFileMap[fontFamily] && fontToFileMap[fontFamily][type];
       if (url) {
@@ -50,8 +51,9 @@ function replaceTextNodesWithPaths(node, textToSVGInstances) {
   if (node.nodeName === 'text') {
     var fontFamily = (0, _String.trimQuotes)((0, _DOM.getClosestAttribute)(node, 'font-family'));
     var fontWeight = (0, _DOM.getClosestAttribute)(node, 'font-weight');
+    var fontStyle = (0, _DOM.getClosestAttribute)(node, 'font-style');
     var fontSize = (0, _DOM.getClosestAttribute)(node, 'font-size').replace('px', '');
-    var type = (0, _TextToSVGUtils.convertFontWeightToType)(fontWeight);
+    var type = (0, _TextToSVGUtils.convertFontWeightToType)(fontWeight, fontStyle);
     var key = "".concat(fontFamily, ".").concat(type);
     var textToSVG = textToSVGInstances[key];
     if (!textToSVG) {

package/CanvasAdapters/PaperJs/Utils/TextToSVGUtils.js

@@ -4,16 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.convertFontWeightToType = exports.cleanText = void 0;
-var convertFontWeightToType = exports.convertFontWeightToType = function convertFontWeightToType(fontWeight) {
+var convertFontWeightToType = exports.convertFontWeightToType = function convertFontWeightToType(fontWeight, fontStyle) {
   var isBold = false;
   var isItalic = false;
-  if (fontWeight !== undefined && fontWeight !== null) {
-    if (fontWeight.indexOf('bold') !== -1) {
-      isBold = true;
-    }
-    if (fontWeight.indexOf('italic') !== -1) {
-      isItalic = true;
-    }
+  if (fontWeight && /bold|700/i.test(fontWeight)) {
+    isBold = true;
+  }
+  // paper.js exports the italic value as part of the fontWeight attribute
+  if (fontWeight && /italic/i.test(fontWeight)) {
+    isItalic = true;
+  }
+  if (fontStyle && /italic/i.test(fontStyle)) {
+    isItalic = true;
   }
   return isBold && isItalic ? 'boldItalic' : isBold ? 'bold' : isItalic ? 'italic' : 'regular';
 };

package/CanvasAdapters/PaperJs/Utils/__tests__/TextToSVGUtils.test.js

@@ -6,7 +6,10 @@ describe('CanvasAdapters/PaperJs/Utils/TextToSVGUtils', function () {
     expect((0, _TextToSVGUtils.convertFontWeightToType)('bold')).toEqual('bold');
     expect((0, _TextToSVGUtils.convertFontWeightToType)('italic')).toEqual('italic');
     expect((0, _TextToSVGUtils.convertFontWeightToType)('bold italic')).toEqual('boldItalic');
+    expect((0, _TextToSVGUtils.convertFontWeightToType)('700 italic')).toEqual('boldItalic');
     expect((0, _TextToSVGUtils.convertFontWeightToType)('')).toEqual('regular');
+    expect((0, _TextToSVGUtils.convertFontWeightToType)(false, 'italic')).toEqual('italic');
+    expect((0, _TextToSVGUtils.convertFontWeightToType)('700', 'italic')).toEqual('boldItalic');
   });
   test('cleanText replaces nbsps with normal spaces', function () {
     var textWithUnicodeNbsp = "hello".concat(String.fromCharCode(160), "world");

package/Utils/DOM.js

@@ -76,7 +76,7 @@ function getNextNode(node, rootNode) {
 }
 var getClosestAttribute = exports.getClosestAttribute = function getClosestAttribute(node, attributeName) {
   var defaultValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-  return node.hasAttribute(attributeName) ? node.getAttribute(attributeName) : node.parentNode ? getClosestAttribute(node.parentNode, attributeName) : defaultValue;
+  return node.hasAttribute && node.hasAttribute(attributeName) ? node.getAttribute(attributeName) : node.parentNode ? getClosestAttribute(node.parentNode, attributeName) : defaultValue;
 };
 var placeCaretAtEnd = exports.placeCaretAtEnd = function placeCaretAtEnd(el) {
   el.focus();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redhotmagma-graphics-editor",
-  "version": "1.45.0",
+  "version": "1.46.0",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",

package/src/CanvasAdapters/PaperJs/Canvas.ts

@@ -15,6 +15,13 @@ import { useColorLayer } from './Utils/UseColorLayer';
 const logger = new Logger('Canvas');
 
 export class Canvas extends AbstractCanvas {
+  public static Image = Image;
+  public static Text = Text;
+  public static Group = Group;
+  Image = Canvas.Image;
+  Text = Canvas.Text;
+  Group = Canvas.Group;
+
   protected _project: paper.Project;
   protected _view: paper.View;
   // prevents dragging out the object (by default lets dragging only up to the 2/3 of the object width)
@@ -300,14 +307,14 @@ export class Canvas extends AbstractCanvas {
   }
 
   addText(options: any): Text {
-    const text = new Text(options);
+    const text = new this.Text(options);
     this.add(text);
     return text;
   }
 
-  async addImage(options: any): Image {
+  async addImage(options: any): Promise<Image> {
     const { src } = options;
-    const image = new Image(options);
+    const image = new this.Image(options);
     if (src) {
       await image.loadFromURL(src);
     }
@@ -316,9 +323,9 @@ export class Canvas extends AbstractCanvas {
     return image;
   }
 
-  async addGroup(options: any): Group {
+  async addGroup(options: any): Promise<Group> {
     const { src } = options;
-    const group = new Group(options);
+    const group = new this.Group(options);
     if (src) {
       await group.loadFromURL(src);
     }
@@ -327,7 +334,7 @@ export class Canvas extends AbstractCanvas {
     return group;
   }
 
-  async addItemFromObject(options: any, index?: number, overwrite?: boolean): Promise<CanvasObject> {
+  async addItemFromObject(options: any, index?: number, overwrite?: boolean): Promise<typeof CanvasObject> {
     const { type, ...props } = options;
     let object;
     switch (type) {

package/src/CanvasAdapters/PaperJs/CanvasRepository.ts

@@ -1,12 +1,16 @@
 import { Canvas } from './Canvas';
 
+export const AdapterClasses = {
+  Canvas,
+};
+
 export const createCanvasRepository = (repositoryMap = new Map()) => {
   let activeCanvas;
 
   const requestCanvas = (key, canvasSize = null, options = {}) => {
     const { updateCanvas = false } = options;
     if (!repositoryMap.has(key) || updateCanvas) {
-      const canvas = new Canvas();
+      const canvas = new AdapterClasses.Canvas();
       canvas.init(); // create canvas element
       if (canvasSize) {
         canvas.setSize(canvasSize);

package/src/CanvasAdapters/PaperJs/Utils/TextToSVGRepository.js

@@ -9,7 +9,8 @@ function getFontsFromSvg(node, fontToFileMap) {
   if (node.nodeName === 'text') {
     const fontFamily = trimQuotes(getClosestAttribute(node, 'font-family'));
     const fontWeight = getClosestAttribute(node, 'font-weight');
-    const type = convertFontWeightToType(fontWeight);
+    const fontStyle = getClosestAttribute(node, 'font-style');
+    const type = convertFontWeightToType(fontWeight, fontStyle);
 
     if (fontFamily) {
       const url = fontToFileMap[fontFamily] && fontToFileMap[fontFamily][type];
@@ -33,8 +34,9 @@ function replaceTextNodesWithPaths(node, textToSVGInstances) {
   if (node.nodeName === 'text') {
     const fontFamily = trimQuotes(getClosestAttribute(node, 'font-family'));
     const fontWeight = getClosestAttribute(node, 'font-weight');
+    const fontStyle = getClosestAttribute(node, 'font-style');
     const fontSize = getClosestAttribute(node, 'font-size').replace('px', '');
-    const type = convertFontWeightToType(fontWeight);
+    const type = convertFontWeightToType(fontWeight, fontStyle);
     const key = `${fontFamily}.${type}`;
 
     let textToSVG = textToSVGInstances[key];

package/src/CanvasAdapters/PaperJs/Utils/TextToSVGUtils.js

@@ -1,13 +1,15 @@
-export const convertFontWeightToType = fontWeight => {
+export const convertFontWeightToType = (fontWeight, fontStyle) => {
   let isBold = false;
   let isItalic = false;
-  if (fontWeight !== undefined && fontWeight !== null) {
-    if (fontWeight.indexOf('bold') !== -1) {
-      isBold = true;
-    }
-    if (fontWeight.indexOf('italic') !== -1) {
-      isItalic = true;
-    }
+  if (fontWeight && /bold|700/i.test(fontWeight)) {
+    isBold = true;
+  }
+  // paper.js exports the italic value as part of the fontWeight attribute
+  if (fontWeight && /italic/i.test(fontWeight)) {
+    isItalic = true;
+  }
+  if (fontStyle && /italic/i.test(fontStyle)) {
+    isItalic = true;
   }
   return isBold && isItalic ? 'boldItalic' : isBold ? 'bold' : isItalic ? 'italic' : 'regular';
 };

package/src/CanvasAdapters/PaperJs/Utils/__tests__/TextToSVGUtils.test.js

@@ -5,7 +5,10 @@ describe('CanvasAdapters/PaperJs/Utils/TextToSVGUtils', () => {
     expect(convertFontWeightToType('bold')).toEqual('bold');
     expect(convertFontWeightToType('italic')).toEqual('italic');
     expect(convertFontWeightToType('bold italic')).toEqual('boldItalic');
+    expect(convertFontWeightToType('700 italic')).toEqual('boldItalic');
     expect(convertFontWeightToType('')).toEqual('regular');
+    expect(convertFontWeightToType(false, 'italic')).toEqual('italic');
+    expect(convertFontWeightToType('700', 'italic')).toEqual('boldItalic');
   });
   test('cleanText replaces nbsps with normal spaces', () => {
     const textWithUnicodeNbsp = `hello${String.fromCharCode(160)}world`;

package/src/Utils/DOM.ts

@@ -68,7 +68,7 @@ export const getClosestAttribute = (
   attributeName: string,
   defaultValue: any = ''
 ): any =>
-  (<Element>node).hasAttribute(attributeName)
+  (<Element>node).hasAttribute && (<Element>node).hasAttribute(attributeName)
     ? (<Element>node).getAttribute(attributeName)
     : node.parentNode
     ? getClosestAttribute(node.parentNode, attributeName)