feat: add a fallback icon for extensions that do not have an icon (#98)

reearth · Oct 8, 2021 · 50de1f2 · 50de1f2
1 parent 58ceda4
commit 50de1f2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/components/atoms/Icon/Icons/plugin.svg b/src/components/atoms/Icon/Icons/plugin.svg
diff --git a/src/components/atoms/Icon/icons.ts b/src/components/atoms/Icon/icons.ts
@@ -118,7 +118,8 @@ import MenuForDevice from "./Icons/menuForDevice.svg";
 import Moon from "./Icons/moon.svg";
 import Sun from "./Icons/sun.svg";
 
-// Plugi-ins
+// Plug-ins
+import Plugin from "./Icons/plugin.svg";
 import UploadZipPlugin from "./Icons/uploadZipPlugin.svg";
 import PublicGitHubRepo from "./Icons/publicGitHubRepo.svg";
 import PrivateGitHubRepo from "./Icons/privateGitHubRepo.svg";
@@ -228,4 +229,5 @@ export default {
   privateGitHubRepo: PrivateGitHubRepo,
   publicGitHubRepo: PublicGitHubRepo,
   menuForDevice: MenuForDevice,
+  plugin: Plugin,
 };
diff --git a/src/components/organisms/EarthEditor/CanvasArea/convert.ts b/src/components/organisms/EarthEditor/CanvasArea/convert.ts
@@ -271,9 +271,8 @@ export const convertToBlocks = (data?: GetBlocksQuery): BlockType[] | undefined
                 icon:
                   extension.icon ||
                   // for official plugin
-                  (plugin.plugin.id === "reearth"
-                    ? extension.extensionId.replace(/block$/, "")
-                    : ""),
+                  (plugin.plugin.id === "reearth" && extension.extensionId.replace(/block$/, "")) ||
+                  "plugin",
                 name: extension.name,
                 description: extension.description,
                 pluginId: plugin.plugin.id,

diff --git a/src/components/organisms/EarthEditor/OutlinePane/hooks.tsx b/src/components/organisms/EarthEditor/OutlinePane/hooks.tsx
@@ -96,7 +96,7 @@ export default () => {
               enabled: !!widget?.enabled,
               title: e.translatedName,
               description: e.translatedDescription,
-              icon: e.icon || (pluginId === "reearth" ? extensionId : undefined),
+              icon: e.icon || (pluginId === "reearth" && extensionId) || "plugin",
             };
           })
           .filter((w): w is Widget => !!w);