diff --git a/package.json b/package.json index b1664988..f54e3731 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "autoprefixer": "^10.4.19", "axios": "^1.6.8", "clsx": "^2.1.0", - "decanter": "^7.2.0", + "decanter": "^7.3.0", "drupal-jsonapi-params": "^2.3.1", "eslint": "^8.57.0", "eslint-config-next": "^14.2.2", @@ -47,7 +47,7 @@ "react-slick": "^0.30.2", "react-tiny-oembed": "^1.1.0", "sharp": "^0.33.3", - "tailwind-merge": "^2.2.2", + "tailwind-merge": "^2.3.0", "tailwindcss": "^3.4.3", "typescript": "^5.4.5", "usehooks-ts": "^3.1.0" diff --git a/src/components/elements/link.tsx b/src/components/elements/link.tsx index e754e9af..2bba10ee 100644 --- a/src/components/elements/link.tsx +++ b/src/components/elements/link.tsx @@ -12,7 +12,7 @@ type Props = HtmlHTMLAttributes & LinkPro href: string } -const DrupalLink = ({href, className, children, ...props}: Props) => { +const DrupalLink = ({href, className, button, children, ...props}: Props) => { // Make sure all links have a href. href = href || "#" const drupalBase: string = (process.env.NEXT_PUBLIC_DRUPAL_BASE_URL || "").replace(/\/$/, ""); @@ -29,12 +29,12 @@ const DrupalLink = ({href, className, children, ...props}: Props) => { ) } - if (className?.includes("button")) { + if (button || className?.includes("button")) { return (