Merge branch 'manawiki:main' into main

manasites · Dec 10, 2024 · 8de210e · 8de210e
2 parents c9475ad + 0214c7f
commit 8de210e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/app/root.tsx b/app/root.tsx
@@ -195,7 +195,7 @@ function App() {
    const [searchToggle, setSearchToggle] = useState(false);
 
    return (
-      <html className={`font-body scroll-smooth ${theme ?? ""}`}>
+      <html lang="en" className={`font-body scroll-smooth ${theme ?? ""}`}>
          <head>
             {!isBot && <ClientHintCheck />}
             <meta charSet="utf-8" />

diff --git a/app/routes/_editor+/blocks+/link/_link.tsx b/app/routes/_editor+/blocks+/link/_link.tsx
@@ -557,7 +557,11 @@ export function LinkBlockElement({ element, children }: Props) {
                                  !element.removeCircleBorder ? 60 : undefined
                               }
                               url={element.icon.url}
-                              alt={element?.name}
+                              alt={
+                                 children && !element.hideLinkText
+                                    ? ""
+                                    : element?.name ?? undefined
+                              }
                            />
                         ) : (
                            <Icon
@@ -605,7 +609,11 @@ export function LinkBlockElement({ element, children }: Props) {
                         width={!element.removeCircleBorder ? 60 : 120}
                         height={!element.removeCircleBorder ? 60 : undefined}
                         url={element.icon.url}
-                        alt={element?.name}
+                        alt={
+                           children && !element.hideLinkText
+                              ? ""
+                              : element?.name ?? undefined
+                        }
                      />
                   ) : (
                      <Icon name="component" className="text-1" size={12} />
@@ -646,7 +654,11 @@ export function LinkBlockElement({ element, children }: Props) {
                                  : undefined
                            }
                            url={element.icon.url}
-                           alt={children ? "" : element?.name}
+                           alt={
+                              children && !element.hideLinkText
+                                 ? ""
+                                 : element?.name ?? undefined
+                           }
                         />
                      ) : (
                         <Image
@@ -661,7 +673,11 @@ export function LinkBlockElement({ element, children }: Props) {
                               width: element.iconWidth,
                            }}
                            url={element.icon.url}
-                           alt={element?.name}
+                           alt={
+                              children && !element.hideLinkText
+                                 ? ""
+                                 : element?.name ?? undefined
+                           }
                         />
                      )}
                      {!element.hideLinkText ? null : (
@@ -696,7 +712,11 @@ export function LinkBlockElement({ element, children }: Props) {
                         element.iconWidth ? element.iconWidth * 2 : undefined
                      }
                      url={element.icon.url}
-                     alt={children ? "" : element?.name}
+                     alt={
+                        children && !element.hideLinkText
+                           ? ""
+                           : element?.name ?? undefined
+                     }
                   />
                ) : (
                   <Image
@@ -709,7 +729,11 @@ export function LinkBlockElement({ element, children }: Props) {
                         width: element.iconWidth,
                      }}
                      url={element.icon.url}
-                     alt={element?.name}
+                     alt={
+                        children && !element.hideLinkText
+                           ? ""
+                           : element?.name ?? undefined
+                     }
                   />
                )}
                {!element.hideLinkText ? undefined : (