@svgedit/svgcanvas 7.1.5 → 7.2.0

package/{selected-elem.js → core/selected-elem.js}

@@ -29,8 +29,8 @@ import {
   transformListToTransform
 } from './math.js'
 import { recalculateDimensions } from './recalculate.js'
-import { isGecko } from '../../src/common/browser.js'
-import { getParents } from '../../src/common/util.js'
+import { isGecko } from '../common/browser.js'
+import { getParents } from '../common/util.js'
 
 const {
   MoveElementCommand,
@@ -972,7 +972,7 @@ const convertToGroup = elem => {
   } else if (dataStorage.has($elem, 'symbol')) {
     elem = dataStorage.get($elem, 'symbol')
 
-    ts = $elem.getAttribute('transform')
+    ts = $elem.getAttribute('transform') || ''
     const pos = {
       x: Number($elem.getAttribute('x')),
       y: Number($elem.getAttribute('y'))

package/{selection.js → core/selection.js}

@@ -16,7 +16,7 @@ import {
   rectsIntersect
 } from './math.js'
 import * as hstry from './history.js'
-import { getClosest } from '../../src/common/util.js'
+import { getClosest } from '../common/util.js'
 
 const { BatchCommand } = hstry
 let svgCanvas = null
@@ -324,7 +324,7 @@ const getIntersectionListMethod = (rect) => {
     if (!rubberBBox.width) {
       continue
     }
-    if (rectsIntersect(rubberBBox, curBBoxes[i].bbox)) {
+    if (curBBoxes[i].bbox && rectsIntersect(rubberBBox, curBBoxes[i].bbox)) {
       resultList.push(curBBoxes[i].elem)
     }
   }

package/{svg-exec.js → core/svg-exec.js}

@@ -25,12 +25,12 @@ import {
 } from './utilities.js'
 import { transformPoint, transformListToTransform } from './math.js'
 import { convertUnit, shortFloat, convertToNum } from './units.js'
-import { isGecko, isChrome, isWebkit } from '../../src/common/browser.js'
+import { isGecko, isChrome, isWebkit } from '../common/browser.js'
 import * as pathModule from './path.js'
 import { NS } from './namespaces.js'
 import * as draw from './draw.js'
 import { recalculateDimensions } from './recalculate.js'
-import { getParents, getClosest } from '../../src/common/util.js'
+import { getParents, getClosest } from '../common/util.js'
 
 const {
   InsertElementCommand,
@@ -617,6 +617,7 @@ const setSvgString = (xmlString, preventUndo) => {
  * `<use>` to the current layer.
  * @function module:svgcanvas.SvgCanvas#importSvgString
  * @param {string} xmlString - The SVG as XML text.
+ * @param {boolean} preserveDimension - A boolean to force to preserve initial dimension of the imported svg (force svgEdit don't apply a transformation on the imported svg)
  * @fires module:svgcanvas.SvgCanvas#event:changed
  * @returns {null|Element} This function returns null if the import was unsuccessful, or the element otherwise.
  * @todo
@@ -626,7 +627,7 @@ const setSvgString = (xmlString, preventUndo) => {
  * arbitrary transform lists, but makes some assumptions about how the transform list
  * was obtained
  */
-const importSvgString = (xmlString) => {
+const importSvgString = (xmlString, preserveDimension) => {
   const dataStorage = svgCanvas.getDataStorage()
   let j
   let ts
@@ -731,8 +732,10 @@ const importSvgString = (xmlString) => {
     batchCmd.addSubCommand(new InsertElementCommand(useEl))
     svgCanvas.clearSelection()
 
-    useEl.setAttribute('transform', ts)
-    recalculateDimensions(useEl)
+    if (!preserveDimension) {
+      useEl.setAttribute('transform', ts)
+      recalculateDimensions(useEl)
+    }
     dataStorage.put(useEl, 'symbol', symbol)
     dataStorage.put(useEl, 'ref', symbol)
     svgCanvas.addToSelection([useEl])

package/{text-actions.js → core/text-actions.js}

@@ -14,7 +14,7 @@ import {
 } from './utilities.js'
 import {
   supportsGoodTextCharPos
-} from '../../src/common/browser.js'
+} from '../common/browser.js'
 
 let svgCanvas = null
 

package/{undo.js → core/undo.js}

@@ -11,7 +11,7 @@ import {
 } from './utilities.js'
 import {
   isGecko
-} from '../../src/common/browser.js'
+} from '../common/browser.js'
 import {
   transformPoint, transformListToTransform
 } from './math.js'

package/{utilities.js → core/utilities.js}

@@ -11,7 +11,7 @@ import { setUnitAttr, getTypeMap } from './units.js'
 import {
   hasMatrixTransform, transformListToTransform, transformBox
 } from './math.js'
-import { getClosest, mergeDeep } from '../../src/common/util.js'
+import { getClosest, mergeDeep } from '../common/util.js'
 
 // Much faster than running getBBox() every time
 const visElems = 'a,circle,ellipse,foreignObject,g,image,line,path,polygon,polyline,rect,svg,text,tspan,use,clipPath'
@@ -962,17 +962,27 @@ export const getStrokedBBox = (elems, addSVGElementsFromJson, pathActions) => {
 export const getVisibleElements = (parentElement) => {
   if (!parentElement) {
     const svgContent = svgCanvas.getSvgContent()
-    parentElement = svgContent.children[0] // Prevent layers from being included
+    for (let i = 0; i < svgContent.children.length; i++) {
+      if (svgContent.children[i].getBBox) {
+        const bbox = svgContent.children[i].getBBox()
+        if (bbox.width !== 0 && bbox.height !== 0 && bbox.width !== 0 && bbox.height !== 0) {
+          parentElement = svgContent.children[i]
+          break
+        }
+      }
+    }
   }
 
   const contentElems = []
-  const children = parentElement.children
-  // eslint-disable-next-line array-callback-return
-  Array.from(children, (elem) => {
-    if (elem.getBBox) {
-      contentElems.push(elem)
-    }
-  })
+  if (parentElement) {
+    const children = parentElement.children
+    // eslint-disable-next-line array-callback-return
+    Array.from(children, (elem) => {
+      if (elem.getBBox) {
+        contentElems.push(elem)
+      }
+    })
+  }
   return contentElems.reverse()
 }
 

package/demos/canvas.html

@@ -3,9 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <title>Minimal demo of SvgCanvas</title>
-    <script src="../src/editor/jquery.min.js"></script>
     <style> #svgroot { overflow: hidden; } </style>
-    <link rel="shortcut icon" type="image/x-icon" href="../src/editor/images/logo.svg" />
   </head>
 
   <body>
@@ -41,7 +39,7 @@ const config = {
   initStroke: { color: '000000', opacity: 1, width: 1 },
   text: { stroke_width: 0, font_size: 24, font_family: 'serif' },
   initOpacity: 1,
-  imgPath: '../src/editor/images',
+  imgPath: '/src/editor/images',
   dimensions: [ width, height ],
   baseUnit: 'px'
 }