chore(router): remove perspective state from router

sanity-io · Nov 5, 2024 · 241e624 · 241e624
1 parent daca134
commit 241e624
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 30 deletions.
diff --git a/packages/sanity/src/router/RouterProvider.tsx b/packages/sanity/src/router/RouterProvider.tsx
@@ -177,17 +177,6 @@ export function RouterProvider(props: RouterProviderProps): ReactElement {
 
   const stickyParamsByName = useMemo(() => Object.fromEntries(stickyParams || []), [stickyParams])
 
-  // Storing perspective state in a dedicated, stable, object allows it to be used for memoization
-  // separately to the entire router context object, which changes more frequently than the relevant
-  // sticky parameters.
-  //
-  const perspectiveState = useMemo(() => {
-    return {
-      perspective: stickyParamsByName.perspective,
-      excludedPerspectives: stickyParamsByName.excludedPerspectives,
-    }
-  }, [stickyParamsByName.excludedPerspectives, stickyParamsByName.perspective])
-
   const router: RouterContextValue = useMemo(
     () => ({
       navigate,
@@ -198,14 +187,12 @@ export function RouterProvider(props: RouterProviderProps): ReactElement {
       resolvePathFromState,
       state: routerState,
       stickyParams: stickyParamsByName,
-      perspectiveState,
     }),
     [
       handleNavigateStickyParams,
       navigate,
       navigateIntent,
       onNavigate,
-      perspectiveState,
       resolveIntentLink,
       resolvePathFromState,
       routerState,

diff --git a/packages/sanity/src/router/types.ts b/packages/sanity/src/router/types.ts
@@ -293,12 +293,4 @@ export interface RouterContextValue {
    * The current router state. See {@link RouterState}
    */
   stickyParams: Record<string, string | undefined>
-
-  /**
-   * Values pertaining to the active perspective.
-   */
-  perspectiveState: {
-    perspective: string | undefined
-    excludedPerspectives: string | undefined
-  }
 }
diff --git a/packages/sanity/src/structure/components/paneItem/PaneItem.tsx b/packages/sanity/src/structure/components/paneItem/PaneItem.tsx
@@ -24,7 +24,6 @@ import {
   useDocumentPreviewStore,
   useSchema,
 } from 'sanity'
-import {useRouter} from 'sanity/router'
 
 import {MissingSchemaType} from '../MissingSchemaType'
 import {usePaneRouter} from '../paneRouter'
@@ -77,7 +76,6 @@ export function PaneItem(props: PaneItemProps) {
   const schema = useSchema()
   const documentPreviewStore = useDocumentPreviewStore()
   const {ChildLink} = usePaneRouter()
-  const {perspective} = useRouter().perspectiveState
   const documentPresence = useDocumentPresence(id)
   const hasSchemaType = Boolean(schemaType && schemaType.name && schema.get(schemaType.name))
   const [clicked, setClicked] = useState<boolean>(false)
@@ -90,7 +88,6 @@ export function PaneItem(props: PaneItemProps) {
 
       return (
         <PaneItemPreview
-          perspective={perspective}
           documentPreviewStore={documentPreviewStore}
           icon={getIconWithFallback(icon, schemaType, DocumentIcon)}
           layout={layout}
@@ -122,7 +119,6 @@ export function PaneItem(props: PaneItemProps) {
     schemaType,
     title,
     hasSchemaType,
-    perspective,
     documentPreviewStore,
     layout,
     documentPresence,

diff --git a/packages/sanity/src/structure/components/paneItem/PaneItemPreview.tsx b/packages/sanity/src/structure/components/paneItem/PaneItemPreview.tsx
@@ -23,7 +23,6 @@ import {TooltipDelayGroupProvider} from '../../../ui-components'
 export interface PaneItemPreviewProps {
   documentPreviewStore: DocumentPreviewStore
   icon: ComponentType | false
-  perspective?: string
   layout: GeneralPreviewLayoutKey
   presence?: DocumentPresence[]
   schemaType: SchemaType
@@ -38,7 +37,7 @@ export interface PaneItemPreviewProps {
  * and are rendered by `<SanityDefaultPreview>`.
  */
 export function PaneItemPreview(props: PaneItemPreviewProps) {
-  const {icon, layout, perspective, presence, schemaType, value} = props
+  const {icon, layout, presence, schemaType, value} = props
   const title =
     (isRecord(value.title) && isValidElement(value.title)) ||
     isString(value.title) ||
@@ -47,7 +46,7 @@ export function PaneItemPreview(props: PaneItemPreviewProps) {
       : null
 
   const releases = useReleases()
-  const {bundlesPerspective} = usePerspective()
+  const {bundlesPerspective, perspective} = usePerspective()
   const previewStateObservable = useMemo(
     () =>
       getPreviewStateObservable(props.documentPreviewStore, schemaType, value._id, title, {

diff --git a/...anes/document/documentPanel/header/perspective/__tests__/DocumentPerspectiveList.test.tsx b/...anes/document/documentPanel/header/perspective/__tests__/DocumentPerspectiveList.test.tsx
@@ -36,7 +36,6 @@ vi.mock('sanity/router', () => {
   return {
     useRouter: vi.fn().mockReturnValue({
       stickyParams: {},
-      perspectiveState: {},
     }),
     route: {
       create: vi.fn(),

diff --git a/packages/sanity/src/structure/panes/documentList/__tests__/PaneContainer.test.tsx b/packages/sanity/src/structure/panes/documentList/__tests__/PaneContainer.test.tsx
@@ -34,7 +34,6 @@ vi.mock('sanity/router', async (importOriginal) => ({
     stickyParams: {},
     state: {},
     navigate: vi.fn(),
-    perspectiveState: {},
   }),
 }))