✨ Improve blocks

Frontendland · Nov 7, 2024 · b415d12 · b415d12
1 parent d76b966
commit b415d12
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 4 deletions.
diff --git a/src/blocks/ErrorPage/ErrorPage.astro b/src/blocks/ErrorPage/ErrorPage.astro
@@ -32,7 +32,7 @@ const typeStyle = typeColor
     {!!buttons?.length && (
         <div class="flex xs wrap justify-center">
             {buttons?.map(button => (
-                <Button {...button}>
+                <Button {...button} icon={null}>
                     {button.icon && (
                         <Fragment>
                             {button.icon.startsWith('<svg')

diff --git a/src/blocks/ErrorPage/ErrorPage.svelte b/src/blocks/ErrorPage/ErrorPage.svelte
@@ -26,7 +26,7 @@
     {#if buttons?.length}
         <div class="flex xs wrap justify-center">
             {#each buttons as button}
-                <Button {...button}>
+                <Button {...button} icon={null}>
                     {#if button.icon}
                         {@html button.icon}
                     {/if}

diff --git a/src/blocks/ErrorPage/ErrorPage.tsx b/src/blocks/ErrorPage/ErrorPage.tsx
@@ -30,6 +30,7 @@ const ErrorPage = ({
                         <Button
                             {...button}
                             key={index}
+                            icon={null}
                             dangerouslySetInnerHTML={{ __html: button.icon
                                 ? `${button.icon} ${button.text}`
                                 : button.text

diff --git a/src/blocks/Hero/Hero.astro b/src/blocks/Hero/Hero.astro
@@ -43,7 +43,7 @@ const classes = [
         {!!buttons?.length && (
             <div class:list={[styles.cta, 'flex xs wrap']}>
                 {buttons?.map(button => (
-                    <Button {...button}>
+                    <Button {...button} icon={null}>
                         {button.icon && (
                             <Fragment>
                                 {button.icon.startsWith('<svg')

diff --git a/src/blocks/Hero/Hero.svelte b/src/blocks/Hero/Hero.svelte
@@ -39,7 +39,7 @@
         {#if buttons?.length}
             <div class={classNames([styles.cta, 'flex xs wrap'])}>
                 {#each buttons as button}
-                    <Button {...button}>
+                    <Button {...button} icon={null}>
                         {#if button.icon}
                             {@html button.icon}
                         {/if}

diff --git a/src/blocks/Hero/Hero.tsx b/src/blocks/Hero/Hero.tsx
@@ -41,6 +41,7 @@ const Hero = ({
                             <Button
                                 {...button}
                                 key={index}
+                                icon={null}
                                 dangerouslySetInnerHTML={{ __html: button.icon
                                     ? `${button.icon} ${button.text}`
                                     : button.text

diff --git a/src/components/Button/button.module.scss b/src/components/Button/button.module.scss
@@ -89,4 +89,8 @@
             @include background(alert-accent);
         }
     }
+
+    svg {
+        pointer-events: none;
+    }
 }
diff --git a/src/components/ConditionalWrapper/conditionalwrapper.ts b/src/components/ConditionalWrapper/conditionalwrapper.ts
@@ -1,5 +1,6 @@
 export type ConditionalWrapperProps = {
     condition: boolean
+    [key: string]: any
 }
 
 export type ReactConditionalWrapperProps = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,4 +89,8 @@ @@
                 @include background(alert-accent);
             }
         }
+        svg {
+            pointer-events: none;
+        }
     }