fix Menu (0.7.2)

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   Hero add options.class
+-   Menu fix check type 'page' / 'url', add target blank for external links
 -   Update @onegeo-suite/gatsby-plugin-auth to 0.2.1
 
 ## [0.7.1] - 2023-04-04

index.d.ts

@@ -92,6 +92,7 @@ interface LinkProps {
     partiallyActive?: string
     onClick?: any
     className?: any
+    target?: string
 }
 export function Link(props: LinkProps): JSX.Element
 

src/components/core/Link.tsx

@@ -10,6 +10,7 @@ interface Props {
     partiallyActive?: any
     onClick?: any
     className?: any
+    target?: string
 }
 
 // Since DOM elements <a> cannot receive activeClassName

src/components/core/Menu.tsx

@@ -15,6 +15,7 @@ const Menu = (props: Imenu) => {
     const data = useStaticQuery(graphql`
         fragment MenuItem on DirectusData_menus {
             name
+            type
             url
             page {
                 slug
@@ -50,21 +51,22 @@ const Menu = (props: Imenu) => {
             (menu: any) => name?.toLowerCase() === menu.name?.toLowerCase()
         )?.children || []
 
+    const goto = (item) => {
+        if (!item) return "/"
+        if (item?.type === "page") {
+            const slug = item?.page?.slug || ""
+            if (slug.at(0) === "/") return slug
+            return "/" + slug
+        }
+        return item.url
+    }
     const items = (item: any) => {
         return (
             <ul className="bg-base-100 z-50 p-2 shadow-md">
                 {item.children.map((itemChild: any, idx: number) => {
                     return (
                         <li key={idx}>
-                            <Link
-                                to={
-                                    itemChild.url
-                                        ? itemChild.url
-                                        : itemChild.page?.slug
-                                        ? itemChild.page?.slug
-                                        : "#"
-                                }
-                            >
+                            <Link to={goto(itemChild)} target="_blank">
                                 {itemChild.name}
                             </Link>
                             {itemChild?.children?.length > 0 &&
@@ -83,15 +85,7 @@ const Menu = (props: Imenu) => {
                 {menu?.map((item: any, key: number) => {
                     return (
                         <li key={key}>
-                            <Link
-                                to={
-                                    item.url
-                                        ? item.url
-                                        : item.page?.slug
-                                        ? item.page?.slug
-                                        : "#"
-                                }
-                            >
+                            <Link to={goto(item)} target="_blank">
                                 {item.name}
                                 {item?.children.length > 0 && (
                                     <svg