feat: wip

AmazeeLabs · May 8, 2024 · 7b58f2e · 7b58f2e
1 parent bee3b2c
commit 7b58f2e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 15 deletions.
diff --git a/packages/ui/src/components/Molecules/Breadcrumbs.stories.tsx b/packages/ui/src/components/Molecules/Breadcrumbs.stories.tsx
@@ -3,7 +3,7 @@ import { Meta } from '@storybook/react';
 import React from 'react';
 
 import { Default as FrameStory } from '../Routes/Frame.stories';
-import BreadCrumbs from './Breadcrumbs';
+import { BreadCrumbs } from './Breadcrumbs';
 
 export default {
   component: BreadCrumbs,

diff --git a/packages/ui/src/components/Molecules/Breadcrumbs.tsx b/packages/ui/src/components/Molecules/Breadcrumbs.tsx
@@ -6,19 +6,16 @@ import React from 'react';
 import { isTruthy } from '../../utils/isTruthy';
 import { useBreadcrumbs } from '../Routes/Menu';
 
-export default function BreadCrumbs({ className }: { className?: string }) {
+export function BreadCrumbs({ className }: { className?: string }) {
   const breadcrumbs = useBreadcrumbs();
 
   if (!breadcrumbs.length) {
     return null;
   }
 
   return (
-    <nav
-      className={clsx('pt-5 max-w-screen-xl mx-auto', className)}
-      aria-label="Breadcrumb"
-    >
-      <ol className={'rounded-lg inline-block p-2.5'}>
+    <nav className={clsx('pt-5', className)} aria-label="Breadcrumb">
+      <ol className={'rounded-lg inline-block py-2.5'}>
         {breadcrumbs?.filter(isTruthy).map(({ title, target, id }, index) => (
           <li className="inline-flex items-center" key={id}>
             {index > 0 ? (

diff --git a/packages/ui/src/components/Organisms/PageDisplay.tsx b/packages/ui/src/components/Organisms/PageDisplay.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 
 import { isTruthy } from '../../utils/isTruthy';
 import { UnreachableCaseError } from '../../utils/unreachable-case-error';
+import { BreadCrumbs } from '../Molecules/Breadcrumbs';
 import { PageTransition } from '../Molecules/PageTransition';
 import { BlockCta } from './PageContent/BlockCta';
 import { BlockForm } from './PageContent/BlockForm';
@@ -15,7 +16,14 @@ export function PageDisplay(page: PageFragment) {
   return (
     <PageTransition>
       <div>
-        {page.hero ? <PageHero {...page.hero} /> : null}
+        {page.hero ? (
+          <>
+            <PageHero {...page.hero} />
+            <BreadCrumbs className="mx-auto max-w-3xl" />
+          </>
+        ) : (
+          <BreadCrumbs />
+        )}
         <div className="bg-white pt-5 pb-12 lg:px-8">
           <div className="mx-auto max-w-3xl text-base leading-7 text-gray-700">
             {page?.content?.filter(isTruthy).map((block, index) => {

diff --git a/packages/ui/src/components/Routes/Menu.tsx b/packages/ui/src/components/Routes/Menu.tsx
@@ -26,6 +26,7 @@ export function useCurrentPath() {
 
 export function useMenuItem(path: string, menuName: MenuNameType) {
   const menus = useMenus();
+
   return (
     menus &&
     menus[menuName]?.items.find((menuItem) => menuItem?.target === path)
@@ -61,7 +62,8 @@ export function useMenuAncestors(path: string, menuName: MenuNameType) {
 
   // Set current page breadcrumb
   if (typeof processingMenuItem !== 'undefined') {
-    ancestors.push(processingMenuItem);
+    // If not home path then only push into breadcrumbs array
+    processingMenuItem.target !== '/' && ancestors.push(processingMenuItem);
   }
 
   while (

diff --git a/packages/ui/src/components/Routes/Page.stories.tsx b/packages/ui/src/components/Routes/Page.stories.tsx
@@ -40,12 +40,6 @@ export const Default = {
         },
       ],
       path: '/test' as Url,
-      hero: {
-        headline: 'Page Hero Headline',
-        lead: 'A longer lead text that even might break into multiple lines.',
-        ctaUrl: '/test' as Url,
-        ctaText: 'Call to action',
-      },
       content: [
         {
           __typename: 'BlockMarkup',
@@ -62,6 +56,25 @@ export const Default = {
       ] as Exclude<ViewPageQuery['page'], undefined>['content'],
     },
   },
+  parameters: {
+    location: new URL('local:/drupal'),
+  },
+} satisfies StoryObj<ViewPageQuery>;
+
+export const Hero = {
+  ...Default,
+  args: {
+    ...Default.args,
+    page: {
+      ...Default.args.page,
+      hero: {
+        headline: 'Page Hero Headline',
+        lead: 'A longer lead text that even might break into multiple lines.',
+        ctaUrl: '/test' as Url,
+        ctaText: 'Call to action',
+      },
+    },
+  },
 } satisfies StoryObj<ViewPageQuery>;
 
 export const FullHero = {