From 723b52b21524c4be405839e3839d744dbdbd585f Mon Sep 17 00:00:00 2001 From: Rafael Grigorian <5500199+null93@users.noreply.github.com> Date: Sat, 28 Dec 2024 22:38:11 -0600 Subject: [PATCH 1/7] Update PageHeader.tsx Signed-off-by: Rafael Grigorian <5500199+null93@users.noreply.github.com> --- packages/toolpad-core/src/PageContainer/PageHeader.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/toolpad-core/src/PageContainer/PageHeader.tsx b/packages/toolpad-core/src/PageContainer/PageHeader.tsx index d72921abefa..d6a2330f31c 100644 --- a/packages/toolpad-core/src/PageContainer/PageHeader.tsx +++ b/packages/toolpad-core/src/PageContainer/PageHeader.tsx @@ -83,7 +83,7 @@ function PageHeader(props: PageHeaderProps) { {resolvedBreadcrumbs ? resolvedBreadcrumbs.map((item, index) => { - return index < resolvedBreadcrumbs.length - 1 ? ( + return !!item.path ? ( ) : ( - + {getItemTitle(item)} ); From d50fbd6ab96f61048b9ce2fdace547d18b807b54 Mon Sep 17 00:00:00 2001 From: Rafael Grigorian <5500199+null93@users.noreply.github.com> Date: Sat, 28 Dec 2024 22:52:33 -0600 Subject: [PATCH 2/7] Fixing lint issues Signed-off-by: Rafael Grigorian <5500199+null93@users.noreply.github.com> --- packages/toolpad-core/src/PageContainer/PageHeader.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/toolpad-core/src/PageContainer/PageHeader.tsx b/packages/toolpad-core/src/PageContainer/PageHeader.tsx index d6a2330f31c..ea6dfd436aa 100644 --- a/packages/toolpad-core/src/PageContainer/PageHeader.tsx +++ b/packages/toolpad-core/src/PageContainer/PageHeader.tsx @@ -82,8 +82,8 @@ function PageHeader(props: PageHeaderProps) { {resolvedBreadcrumbs - ? resolvedBreadcrumbs.map((item, index) => { - return !!item.path ? ( + ? resolvedBreadcrumbs.map((item) => { + return Boolean(item.path) ? ( Date: Sat, 28 Dec 2024 22:58:54 -0600 Subject: [PATCH 3/7] Fixing lint issue Signed-off-by: Rafael Grigorian <5500199+null93@users.noreply.github.com> --- packages/toolpad-core/src/PageContainer/PageHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolpad-core/src/PageContainer/PageHeader.tsx b/packages/toolpad-core/src/PageContainer/PageHeader.tsx index ea6dfd436aa..1d9c1c0a0c8 100644 --- a/packages/toolpad-core/src/PageContainer/PageHeader.tsx +++ b/packages/toolpad-core/src/PageContainer/PageHeader.tsx @@ -83,7 +83,7 @@ function PageHeader(props: PageHeaderProps) { {resolvedBreadcrumbs ? resolvedBreadcrumbs.map((item) => { - return Boolean(item.path) ? ( + return item.path ? ( Date: Mon, 6 Jan 2025 22:34:13 -0600 Subject: [PATCH 4/7] Update PageHeader.tsx Changing key for Typography breadcrumb from `item.title` to `index` Signed-off-by: Rafael Grigorian <5500199+null93@users.noreply.github.com> --- packages/toolpad-core/src/PageContainer/PageHeader.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/toolpad-core/src/PageContainer/PageHeader.tsx b/packages/toolpad-core/src/PageContainer/PageHeader.tsx index 1d9c1c0a0c8..1aa10087282 100644 --- a/packages/toolpad-core/src/PageContainer/PageHeader.tsx +++ b/packages/toolpad-core/src/PageContainer/PageHeader.tsx @@ -82,7 +82,7 @@ function PageHeader(props: PageHeaderProps) { {resolvedBreadcrumbs - ? resolvedBreadcrumbs.map((item) => { + ? resolvedBreadcrumbs.map((item, index) => { return item.path ? ( ) : ( - + {getItemTitle(item)} ); From 9b74bd74911815263451d99570fb98454d8ab1e0 Mon Sep 17 00:00:00 2001 From: Rafael Grigorian <5500199+null93@users.noreply.github.com> Date: Tue, 7 Jan 2025 09:35:34 -0600 Subject: [PATCH 5/7] Update packages/toolpad-core/src/PageContainer/PageHeader.tsx Co-authored-by: Jan Potoms <2109932+Janpot@users.noreply.github.com> Signed-off-by: Rafael Grigorian <5500199+null93@users.noreply.github.com> --- packages/toolpad-core/src/PageContainer/PageHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolpad-core/src/PageContainer/PageHeader.tsx b/packages/toolpad-core/src/PageContainer/PageHeader.tsx index 1aa10087282..a9e0762d4c3 100644 --- a/packages/toolpad-core/src/PageContainer/PageHeader.tsx +++ b/packages/toolpad-core/src/PageContainer/PageHeader.tsx @@ -85,7 +85,7 @@ function PageHeader(props: PageHeaderProps) { ? resolvedBreadcrumbs.map((item, index) => { return item.path ? ( Date: Tue, 7 Jan 2025 09:55:58 -0600 Subject: [PATCH 6/7] Made breadcrumbs.path optional --- packages/toolpad-core/src/PageContainer/PageContainer.tsx | 6 +++--- packages/toolpad-core/src/PageContainer/PageHeader.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/toolpad-core/src/PageContainer/PageContainer.tsx b/packages/toolpad-core/src/PageContainer/PageContainer.tsx index 011794841f9..9e7efa226aa 100644 --- a/packages/toolpad-core/src/PageContainer/PageContainer.tsx +++ b/packages/toolpad-core/src/PageContainer/PageContainer.tsx @@ -15,7 +15,7 @@ export interface Breadcrumb { /** * The path the breadcrumb links to. */ - path: string; + path?: string; } export interface PageContainerSlotProps { header: PageHeaderProps; @@ -89,7 +89,7 @@ PageContainer.propTypes /* remove-proptypes */ = { */ breadcrumbs: PropTypes.arrayOf( PropTypes.shape({ - path: PropTypes.string.isRequired, + path: PropTypes.string, title: PropTypes.string.isRequired, }), ), @@ -104,7 +104,7 @@ PageContainer.propTypes /* remove-proptypes */ = { header: PropTypes.shape({ breadcrumbs: PropTypes.arrayOf( PropTypes.shape({ - path: PropTypes.string.isRequired, + path: PropTypes.string, title: PropTypes.string.isRequired, }), ), diff --git a/packages/toolpad-core/src/PageContainer/PageHeader.tsx b/packages/toolpad-core/src/PageContainer/PageHeader.tsx index a9e0762d4c3..8268213da7c 100644 --- a/packages/toolpad-core/src/PageContainer/PageHeader.tsx +++ b/packages/toolpad-core/src/PageContainer/PageHeader.tsx @@ -120,7 +120,7 @@ PageHeader.propTypes /* remove-proptypes */ = { */ breadcrumbs: PropTypes.arrayOf( PropTypes.shape({ - path: PropTypes.string.isRequired, + path: PropTypes.string, title: PropTypes.string.isRequired, }), ), From 76050cada0fbd6179979401ee626480131c21e0a Mon Sep 17 00:00:00 2001 From: Rafael Grigorian Date: Tue, 7 Jan 2025 23:12:25 -0600 Subject: [PATCH 7/7] Built api docs --- docs/pages/toolpad/core/api/page-container.json | 4 ++-- docs/pages/toolpad/core/api/page-header.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/pages/toolpad/core/api/page-container.json b/docs/pages/toolpad/core/api/page-container.json index 95ddd5e232d..7102f8ecba1 100644 --- a/docs/pages/toolpad/core/api/page-container.json +++ b/docs/pages/toolpad/core/api/page-container.json @@ -1,12 +1,12 @@ { "props": { "breadcrumbs": { - "type": { "name": "arrayOf", "description": "Array<{ path: string, title: string }>" } + "type": { "name": "arrayOf", "description": "Array<{ path?: string, title: string }>" } }, "slotProps": { "type": { "name": "shape", - "description": "{ header: { breadcrumbs?: Array<{ path: string, title: string }>, slotProps?: { toolbar: object }, slots?: { toolbar?: elementType }, title?: string } }" + "description": "{ header: { breadcrumbs?: Array<{ path?: string, title: string }>, slotProps?: { toolbar: object }, slots?: { toolbar?: elementType }, title?: string } }" } }, "slots": { diff --git a/docs/pages/toolpad/core/api/page-header.json b/docs/pages/toolpad/core/api/page-header.json index 68523c20a64..b6217f6ebc8 100644 --- a/docs/pages/toolpad/core/api/page-header.json +++ b/docs/pages/toolpad/core/api/page-header.json @@ -1,7 +1,7 @@ { "props": { "breadcrumbs": { - "type": { "name": "arrayOf", "description": "Array<{ path: string, title: string }>" } + "type": { "name": "arrayOf", "description": "Array<{ path?: string, title: string }>" } }, "slotProps": { "type": { "name": "shape", "description": "{ toolbar: { children?: node } }" } }, "slots": {