From 0b44fdb076aba0812f85ea83af30b66cf7aa5716 Mon Sep 17 00:00:00 2001
From: agriyadev5 <agriya.dev5@agriya.in>
Date: Wed, 2 Jun 2021 17:40:58 +0530
Subject: [PATCH 1/2] #555 Remove the icon on the cancel button

---
 src/editor/extensions/ext-imagelib/ext-imagelib.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/editor/extensions/ext-imagelib/ext-imagelib.js b/src/editor/extensions/ext-imagelib/ext-imagelib.js
index 07e6ce2d..d4f03063 100644
--- a/src/editor/extensions/ext-imagelib/ext-imagelib.js
+++ b/src/editor/extensions/ext-imagelib/ext-imagelib.js
@@ -429,7 +429,7 @@ export default {
 
         const button = document.createElement('button');
         // eslint-disable-next-line max-len
-        button.innerHTML = '<img class="svg_icon" src="./images/cancel.svg" alt="icon" width="16" height="16" />' + svgEditor.i18next.t('common.cancel');
+        button.innerHTML = svgEditor.i18next.t('common.cancel');
         browser.appendChild(button);
         button.addEventListener('click', function () {
           $id("imgbrowse_holder").style.display = 'none';

From 1ab6e09010414d50caf578f446977d3557550021 Mon Sep 17 00:00:00 2001
From: agriyadev5 <agriya.dev5@agriya.in>
Date: Thu, 3 Jun 2021 13:16:04 +0530
Subject: [PATCH 2/2] #555 import from demo library (local) does not work

---
 src/editor/extensions/ext-imagelib/index.js | 1 +
 src/svgcanvas/svg-exec.js                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/editor/extensions/ext-imagelib/index.js b/src/editor/extensions/ext-imagelib/index.js
index d7c6c2c8..eac794e4 100644
--- a/src/editor/extensions/ext-imagelib/index.js
+++ b/src/editor/extensions/ext-imagelib/index.js
@@ -1,6 +1,7 @@
 const atags = document.querySelectorAll('a');
 Array.prototype.forEach.call(atags, function (aEle) {
   aEle.addEventListener('click', function (event) {
+    event.preventDefault();
     const { href } = event.currentTarget;
     const target = window.parent;
     const post = (message) => {
diff --git a/src/svgcanvas/svg-exec.js b/src/svgcanvas/svg-exec.js
index a83c6f68..b4dd6a91 100644
--- a/src/svgcanvas/svg-exec.js
+++ b/src/svgcanvas/svg-exec.js
@@ -519,7 +519,7 @@ export const importSvgString = function (xmlString) {
     const batchCmd = new BatchCommand('Import Image');
     let symbol;
     if (useExisting) {
-      ({ symbol } = svgContext_.getImportIds());
+      symbol = svgContext_.getImportIds(uid).symbol;
       ts = svgContext_.getImportIds(uid).xform;
     } else {
       // convert string into XML document