From 81560d5357f5980953ea00de0d15162833ba7f31 Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Tue, 8 Feb 2022 11:53:22 +0200
Subject: [PATCH] fix: more random fixes related to incorrect parsing svg-icon
 content, added static Icon.isSvg(content: string)

Signed-off-by: Roman <ixrock@gmail.com>
---
 src/renderer/components/+catalog/catalog-entity-details.tsx   | 2 +-
 .../components/+catalog/catalog-entity-drawer-menu.tsx        | 2 +-
 src/renderer/components/+catalog/catalog-menu.tsx             | 2 +-
 src/renderer/components/hotbar/hotbar-entity-icon.tsx         | 2 +-
 src/renderer/components/icon/icon.tsx                         | 4 ++++
 webpack.dev-server.ts                                         | 4 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/+catalog/catalog-entity-details.tsx b/src/renderer/components/+catalog/catalog-entity-details.tsx
index 6001f4a9a0..0603821322 100644
--- a/src/renderer/components/+catalog/catalog-entity-details.tsx
+++ b/src/renderer/components/+catalog/catalog-entity-details.tsx
@@ -25,7 +25,7 @@ interface Props<T extends CatalogEntity> {
 @observer
 export class CatalogEntityDetails<T extends CatalogEntity> extends Component<Props<T>> {
   categoryIcon(category: CatalogCategory) {
-    if (category.metadata.icon.includes("<svg")) {
+    if (Icon.isSvg(category.metadata.icon)) {
       return <Icon svg={category.metadata.icon} smallest />;
     } else {
       return <Icon material={category.metadata.icon} smallest />;
diff --git a/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx b/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
index d93d8e1cf9..3d4c6f93ad 100644
--- a/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
+++ b/src/renderer/components/+catalog/catalog-entity-drawer-menu.tsx
@@ -65,7 +65,7 @@ export class CatalogEntityDrawerMenu<T extends CatalogEntity> extends React.Comp
         continue;
       }
 
-      const key = menuItem.icon.includes("<svg") ? "svg" : "material";
+      const key = Icon.isSvg(menuItem.icon) ? "svg" : "material";
 
       items.push(
         <MenuItem key={menuItem.title} onClick={() => this.onMenuItemClick(menuItem)}>
diff --git a/src/renderer/components/+catalog/catalog-menu.tsx b/src/renderer/components/+catalog/catalog-menu.tsx
index 53b78f8fc8..ccd347aefe 100644
--- a/src/renderer/components/+catalog/catalog-menu.tsx
+++ b/src/renderer/components/+catalog/catalog-menu.tsx
@@ -28,7 +28,7 @@ function getCategoryIcon(category: CatalogCategory) {
   const { icon } = category.metadata ?? {};
 
   if (typeof icon === "string") {
-    return icon.includes("<svg")
+    return Icon.isSvg(icon)
       ? <Icon small svg={icon}/>
       : <Icon small material={icon}/>;
   }
diff --git a/src/renderer/components/hotbar/hotbar-entity-icon.tsx b/src/renderer/components/hotbar/hotbar-entity-icon.tsx
index a58eb74c36..58b3e8f18e 100644
--- a/src/renderer/components/hotbar/hotbar-entity-icon.tsx
+++ b/src/renderer/components/hotbar/hotbar-entity-icon.tsx
@@ -47,7 +47,7 @@ export class HotbarEntityIcon extends React.Component<Props> {
       return <Icon material="bug_report" className={className} />;
     }
 
-    if (category.metadata.icon.includes("svg+xml")) {
+    if (Icon.isSvg(category.metadata.icon)) {
       return <Icon svg={category.metadata.icon} className={className} />;
     } else {
       return <Icon material={category.metadata.icon} className={className} />;
diff --git a/src/renderer/components/icon/icon.tsx b/src/renderer/components/icon/icon.tsx
index d2166ea000..d61d57c663 100644
--- a/src/renderer/components/icon/icon.tsx
+++ b/src/renderer/components/icon/icon.tsx
@@ -37,6 +37,10 @@ export class Icon extends React.PureComponent<IconProps> {
     focusable: true,
   };
 
+  static isSvg(content: string){
+    return String(content).includes("svg+xml"); // data-url for raw svg-icon
+  }
+
   get isInteractive() {
     const { interactive, onClick, href, link } = this.props;
 
diff --git a/webpack.dev-server.ts b/webpack.dev-server.ts
index 8468edbdf0..40498abcf3 100755
--- a/webpack.dev-server.ts
+++ b/webpack.dev-server.ts
@@ -33,8 +33,8 @@ export function createDevServer(lensProxyPort: number): WebpackDevServer {
       }
     },
     client: {
-      // don't show warnings and errors on top of rendered app view
-      overlay: false,
+      overlay: false, // don't show warnings and errors on top of rendered app view
+      logging: "error",
     },
   }, compiler);
 }