Merge branch 'corel' into corel-175-2

packages/sanity/src/core/releases/hooks/usePerspective.tsx

@@ -1,4 +1,5 @@
 import {useCallback, useMemo} from 'react'
+import {isPublishedPerspective} from 'sanity'
 import {useRouter} from 'sanity/router'
 
 import {useReleases} from '../../store/release'
@@ -54,7 +55,10 @@ export function usePerspective(): PerspectiveValue {
     | `bundle.${string}`
     | undefined
 
-  const excludedPerspectives = router.stickyParams.excludedPerspectives?.split(',') || EMPTY_ARRAY
+  const excludedPerspectives = useMemo(
+    () => router.stickyParams.excludedPerspectives?.split(',') || EMPTY_ARRAY,
+    [router.stickyParams.excludedPerspectives],
+  )
 
   // TODO: Should it be possible to set the perspective within a pane, rather than globally?
   const setPerspective = useCallback(
@@ -107,15 +111,15 @@ export function usePerspective(): PerspectiveValue {
   const toggleExcludedPerspective = useCallback(
     (excluded: string) => {
       if (excluded === LATEST._id) return
-      const nextExcludedPerspectives: string[] = excludedPerspectives || []
+      const existingPerspectives = excludedPerspectives || []
 
-      const excludedPerspectiveId = excluded === 'published' ? 'published' : `bundle.${excluded}`
+      const excludedPerspectiveId = isPublishedPerspective(excluded)
+        ? 'published'
+        : `bundle.${excluded}`
 
-      if (excludedPerspectives?.includes(excludedPerspectiveId)) {
-        nextExcludedPerspectives.splice(nextExcludedPerspectives.indexOf(excludedPerspectiveId), 1)
-      } else {
-        nextExcludedPerspectives.push(excludedPerspectiveId)
-      }
+      const nextExcludedPerspectives = existingPerspectives.includes(excludedPerspectiveId)
+        ? existingPerspectives.filter((id) => id !== excludedPerspectiveId)
+        : [...existingPerspectives, excludedPerspectiveId]
 
       router.navigateStickyParams({excludedPerspectives: nextExcludedPerspectives.toString()})
     },
@@ -126,7 +130,7 @@ export function usePerspective(): PerspectiveValue {
     (perspectiveId: string) =>
       Boolean(
         excludedPerspectives?.includes(
-          perspectiveId === 'published' ? 'published' : `bundle.${perspectiveId}`,
+          isPublishedPerspective(perspectiveId) ? 'published' : `bundle.${perspectiveId}`,
         ),
       ),
     [excludedPerspectives],
@@ -140,8 +144,9 @@ export function usePerspective(): PerspectiveValue {
       setPerspectiveFromRelease,
       toggleExcludedPerspective,
       currentGlobalBundle,
-      currentGlobalBundleId:
-        currentGlobalBundle === 'published' ? 'published' : currentGlobalBundle._id,
+      currentGlobalBundleId: isPublishedPerspective(currentGlobalBundle)
+        ? 'published'
+        : currentGlobalBundle._id,
       bundlesPerspective,
       isPerspectiveExcluded,
     }),

packages/sanity/src/core/releases/navbar/GlobalPerspectiveMenuItem.tsx

@@ -170,7 +170,7 @@ export const GlobalPerspectiveMenuItem = forwardRef<
             }}
           >
             <Text size={1} weight="medium">
-              {displayTitle}
+              {isReleasePublishedPerspective ? t('release.chip.published') : release.metadata.title}
             </Text>
             {!isPublishedPerspective(release) &&
               release.metadata.releaseType !== 'undecided' &&

packages/sanity/src/core/releases/navbar/ReleasesNav.tsx

@@ -73,7 +73,7 @@ export function ReleasesNav(): JSX.Element {
           <Stack flex={1} paddingY={2} paddingRight={2} space={2}>
             <Text size={1} textOverflow="ellipsis" weight="medium">
               {isPublishedPerspective(currentGlobalBundle)
-                ? 'Published'
+                ? t('release.chip.published')
                 : (currentGlobalBundle.metadata?.title ??
                   t('release.placeholder-untitled-release'))}
             </Text>

packages/sanity/src/core/studio/components/navbar/StudioNavbar.tsx

@@ -12,7 +12,7 @@ import {
 } from '@sanity/ui'
 import {useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react'
 import {NavbarContext} from 'sanity/_singletons'
-import {type RouterState, useRouter, useRouterState} from 'sanity/router'
+import {type RouterState, useRouterState} from 'sanity/router'
 import {styled} from 'styled-components'
 
 import {Button, TooltipDelayGroupProvider} from '../../../../ui-components'
@@ -70,7 +70,6 @@ export function StudioNavbar(props: Omit<NavbarProps, 'renderDefault'>) {
   } = props
 
   const {name, tools} = useWorkspace()
-  const router = useRouter()
   const routerState = useRouterState()
   const mediaIndex = useMediaIndex()
   const activeToolName = typeof routerState.tool === 'string' ? routerState.tool : undefined
@@ -163,8 +162,6 @@ export function StudioNavbar(props: Omit<NavbarProps, 'renderDefault'>) {
     setDrawerOpen(true)
   }, [])
 
-  const perspective = useMemo(() => router.stickyParams.perspective, [router.stickyParams])
-
   const actionNodes = useMemo(() => {
     if (!shouldRender.tools) return null
 

packages/sanity/src/core/studio/components/navbar/free-trial/FreeTrial.tsx

@@ -138,6 +138,7 @@ export function FreeTrial({type}: FreeTrialProps) {
         size={0}
         scheme={scheme}
         radius={3}
+        tone="default"
         portal
         placement={type === 'sidebar' ? 'top' : 'bottom-end'}
         content={

packages/sanity/src/core/studio/components/navbar/new-document/NewDocumentButton.tsx

@@ -241,6 +241,7 @@ export function NewDocumentButton(props: NewDocumentButtonProps) {
       constrainSize
       onKeyDown={handlePopoverKeyDown}
       open={open}
+      tone="default"
       portal
       radius={3}
       ref={popoverRef}

packages/sanity/src/core/studio/components/navbar/presence/PresenceMenu.tsx

@@ -67,6 +67,7 @@ export function PresenceMenu() {
       placement: 'bottom',
       portal: true,
       scheme: scheme,
+      tone: 'default',
     }),
     [scheme],
   )

packages/sanity/src/core/studio/components/navbar/resources/ResourcesButton.tsx

@@ -33,7 +33,7 @@ export function ResourcesButton() {
           <ResourcesMenuItems error={error} isLoading={isLoading} value={value} />
         </StyledMenu>
       }
-      popover={{constrainSize: true}}
+      popover={{constrainSize: true, tone: 'default'}}
     />
   )
 }

packages/sanity/src/core/studio/components/navbar/tools/ToolCollapseMenu.tsx

@@ -2,7 +2,7 @@ import {Flex} from '@sanity/ui'
 import {startCase} from 'lodash'
 import {forwardRef, type Ref, useMemo, useState} from 'react'
 
-import {Button} from '../../../../../ui-components'
+import {Button, type MenuButtonProps} from '../../../../../ui-components'
 import {useRovingFocus} from '../../../../components'
 import {CollapseTabList} from '../../../../components/collapseTabList/CollapseTabList'
 import {type Tool} from '../../../../config'
@@ -24,12 +24,13 @@ export function ToolCollapseMenu(props: ToolCollapseMenuProps) {
     navigation: ['arrows'],
   })
 
-  const menuButtonProps = useMemo(
+  const menuButtonProps: Partial<MenuButtonProps> = useMemo(
     () => ({
       popover: {
         constrainSize: true,
         portal: true,
         scheme: scheme,
+        tone: 'default',
       },
     }),
     [scheme],

packages/sanity/src/core/studio/components/navbar/userMenu/UserMenu.tsx

@@ -51,6 +51,7 @@ export function UserMenu() {
       preventOverflow: true,
       scheme: scheme,
       constrainSize: true,
+      tone: 'default',
     }),
     [scheme],
   )

packages/sanity/src/router/RouterProvider.tsx

@@ -128,12 +128,12 @@ export function RouterProvider(props: RouterProviderProps): ReactElement {
       const allNextSearchParams = [...(state._searchParams || []), ...Object.entries(params)]
 
       const searchParams = Object.entries(
-        allNextSearchParams.reduce(
+        allNextSearchParams.reduce<SearchParam>(
           (deduppedSearchParams, [key, value]) => ({
             ...deduppedSearchParams,
             [key]: value,
           }),
-          [],
+          [] as unknown as SearchParam,
         ),
       )