Refactor image and icon loading logic

Author: JeremyDolle

template/src/components/atoms/AssetByVariant/AssetByVariant.tsx

@@ -24,10 +24,21 @@ function AssetByVariant({ path, extension = 'png', ...props }: Props) {
         .custom<ImageSourcePropType>()
         .parse(images(`./${path}.${extension}`));
 
-      const fetchedModule = z
-        .custom<ImageSourcePropType>()
-        .parse(images(`./${variant}/${path}.${extension}`));
-      setImage(fetchedModule ?? defaultSource);
+      if (variant === 'default') {
+        setImage(defaultSource);
+        return;
+      }
+
+      try {
+        const fetchedModule = z
+          .custom<ImageSourcePropType>()
+          .parse(images(`./${variant}/${path}.${extension}`));
+        setImage(fetchedModule);
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.error(`Couldn't load the image: ${path}.${extension} for the variant ${variant}, Fallback to default`, error);
+        setImage(defaultSource);
+      }
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error(`Couldn't load the image: ${path}`, error);

template/src/components/atoms/IconByVariant/IconByVariant.tsx

@@ -24,21 +24,23 @@ function IconByVariant({ path, ...props }: Props) {
         .object({ default: z.custom<ReactElement<SvgProps>>() })
         .parse(icons(`./${path}.${EXTENSION}`));
 
-      if (variant !== 'default') {
-        try {
-          const fetchedModule = z
-            .object({ default: z.custom<ReactElement<SvgProps>>() })
-            .parse(icons(`./${variant}/${path}.${EXTENSION}`));
+      if (variant === 'default') {
+        setIcon(defaultSource.default);
+        return;
+      }
 
-          setIcon(fetchedModule.default);
-        } catch (error) {
-          // eslint-disable-next-line no-console
-          console.error(`Couldn't load the icon: ${path}.${EXTENSION} for the variant ${variant}, Fallback to default`, error);
-          setIcon(defaultSource.default);
-        }
-      } else {
+      try {
+        const fetchedModule = z
+          .object({ default: z.custom<ReactElement<SvgProps>>() })
+          .parse(icons(`./${variant}/${path}.${EXTENSION}`));
+
+        setIcon(fetchedModule.default);
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.error(`Couldn't load the icon: ${path}.${EXTENSION} for the variant ${variant}, Fallback to default`, error);
         setIcon(defaultSource.default);
       }
+
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error(`Couldn't load the icon: ${path}.${EXTENSION}`, error);