From 163fa5dd4cc15bb0c925ce6de5e3b31ce70888ca Mon Sep 17 00:00:00 2001
From: JFH <20402845+jfhenon@users.noreply.github.com>
Date: Fri, 24 Dec 2021 16:05:45 +0100
Subject: [PATCH] fix #683

---
 src/editor/components/jgraduate/Util.js | 27 +++++--------------------
 src/svgcanvas/svg-exec.js               |  2 +-
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/editor/components/jgraduate/Util.js b/src/editor/components/jgraduate/Util.js
index 061a4d75..f71ee549 100644
--- a/src/editor/components/jgraduate/Util.js
+++ b/src/editor/components/jgraduate/Util.js
@@ -104,10 +104,7 @@ export function getClosest(elem, selector) {
  */
 export function getParents(elem, selector) {
   const parents = [];
-  let firstChar;
-  if ( selector ) {
-    firstChar = selector.charAt(0);
-  }
+  const firstChar = selector?.charAt(0);
   // Get matches
   for ( ; elem && elem !== document; elem = elem.parentNode ) {
     if ( selector ) {
@@ -138,23 +135,13 @@ export function getParents(elem, selector) {
     }
   }
   // Return parents if any exist
-  if ( parents.length === 0 ) {
-    return null;
-  } else {
-    return parents;
-  }
+  return parents.length? parents : null;
 }
 
 export function getParentsUntil(elem, parent, selector) {
   const parents = [];
-  let parentType;
-  let selectorType;
-  if ( parent ) {
-    parentType = parent.charAt(0);
-  }
-  if ( selector ) {
-    selectorType = selector.charAt(0);
-  }
+  const parentType = parent?.charAt(0);
+  const selectorType = selector?.selector.charAt(0);
   // Get matches
   for ( ; elem && elem !== document; elem = elem.parentNode ) {
     // Check if parent has been reached
@@ -210,9 +197,5 @@ export function getParentsUntil(elem, parent, selector) {
     }
   }
   // Return parents if any exist
-  if ( parents.length === 0 ) {
-    return null;
-  } else {
-    return parents;
-  }
+  return parents.length? parents : null;
 }
\ No newline at end of file
diff --git a/src/svgcanvas/svg-exec.js b/src/svgcanvas/svg-exec.js
index 955bfa9f..54e542d4 100644
--- a/src/svgcanvas/svg-exec.js
+++ b/src/svgcanvas/svg-exec.js
@@ -529,7 +529,7 @@ export const importSvgString = function (xmlString) {
     // Look for symbol and make sure symbol exists in image
     if (svgContext_.getImportIds(uid) && svgContext_.getImportIds(uid).symbol) {
       const parents = getParents(svgContext_.getImportIds(uid).symbol, '#svgroot');
-      if (parents.length) {
+      if (parents?.length) {
         useExisting = true;
       }
     }