feat(structure): support closing first collapsed DocumentPanel (#5867)

sanity-io · Feb 29, 2024 · 6d61e94 · 6d61e94
1 parent 84a0c90
commit 6d61e94
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/packages/sanity/src/structure/components/paneRouter/PaneRouterProvider.tsx b/packages/sanity/src/structure/components/paneRouter/PaneRouterProvider.tsx
@@ -149,7 +149,8 @@ export function PaneRouterProvider(props: {
       ChildLink,
 
       // Curried StateLink that pops off the last pane group
-      BackLink,
+      // Only pass if this is not the first pane
+      BackLink: flatIndex ? BackLink : undefined,
 
       // A specialized `ChildLink` that takes in the needed props to open a
       // referenced document to the right

diff --git a/packages/sanity/src/structure/components/paneRouter/types.ts b/packages/sanity/src/structure/components/paneRouter/types.ts
@@ -101,7 +101,7 @@ export interface PaneRouterContextValue {
   /**
    * Curried StateLink that pops off the last pane group
    */
-  BackLink: React.ComponentType<BackLinkProps>
+  BackLink?: React.ComponentType<BackLinkProps>
 
   /**
    * A specialized `ChildLink` that takes in the needed props to open a

diff --git a/packages/sanity/src/structure/panes/document/documentPanel/header/DocumentPanelHeader.tsx b/packages/sanity/src/structure/panes/document/documentPanel/header/DocumentPanelHeader.tsx
@@ -78,11 +78,17 @@ export const DocumentPanelHeader = memo(
     // and there is more than one split pane open (aka has-siblings)
     const showSplitPaneCloseButton = showSplitPaneButton && hasGroupSiblings
 
+    // show the back button if both the feature is enabled and the current pane
+    // is not the first
+    const showBackButton = features.backButton && index > 0
+
     // show the pane group close button if the `showSplitPaneCloseButton` is
     // _not_ showing (the split pane button replaces the group close button)
     // and if the back button is not showing (the back button and the close
-    // button) do the same thing and shouldn't be shown at the same time)
-    const showPaneGroupCloseButton = !showSplitPaneCloseButton && !features.backButton
+    // button do the same thing and shouldn't be shown at the same time)
+    // and if a BackLink component was provided
+    const showPaneGroupCloseButton = !showSplitPaneCloseButton && !showBackButton && !!BackLink
+
     const {t} = useTranslation(structureLocaleNamespace)
 
     return (
@@ -95,8 +101,7 @@ export const DocumentPanelHeader = memo(
           tabs={showTabs && <DocumentHeaderTabs />}
           tabIndex={tabIndex}
           backButton={
-            features.backButton &&
-            index > 0 && (
+            showBackButton && (
               <Button
                 as={BackLink}
                 data-as="a"