simplify a couple of things

Author: stipsan

apps/studio/src/perspective-example.tsx

@@ -10,12 +10,10 @@ import type {ClientPerspective} from '@sanity/client'
  */
 export function PerspectiveExample() {
   const client = useClient({apiVersion: '2025-03-04'})
-  // Get the global perspective from Sanity Studio
   const {perspectiveStack} = usePerspective()
-  const globalPerspective = perspectiveStack[0] || 'published'
 
   return (
-    <LiveQueryProvider client={client} perspective={globalPerspective}>
+    <LiveQueryProvider client={client} perspective={perspectiveStack}>
       <Box padding={4} height="fill">
         <Stack space={5}>
           <Card padding={4} shadow={1} radius={2}>
@@ -27,7 +25,7 @@ export function PerspectiveExample() {
                 <Code>LiveQueryProvider</Code>.
               </Text>
               <Text size={1} muted>
-                Global Studio Perspective: <Code>{globalPerspective}</Code>
+                Global Studio Perspective: <Code>{JSON.stringify(perspectiveStack)}</Code>
               </Text>
             </Stack>
           </Card>
@@ -44,13 +42,10 @@ export function PerspectiveExample() {
             <Text size={1}>
               This query uses the global Studio perspective from <Code>usePerspective</Code>:
             </Text>
-            {globalPerspective !== 'raw' && (
-              <PerspectiveQuery
-                perspective={globalPerspective as Exclude<ClientPerspective, 'raw'>}
-                title={`Global (${globalPerspective})`}
-              />
-            )}
-
+            <PerspectiveQuery
+              perspective={perspectiveStack}
+              title={`Global (${perspectiveStack})`}
+            />
             <Heading size={1}>Provider Default Perspective</Heading>
             <Text size={1}>
               This query doesn't specify a perspective, so it uses the provider's default:

packages/preview-kit/src/LiveQueryProvider/LiveQueryProvider.tsx

@@ -58,9 +58,9 @@ export default function LiveStoreProvider(props: LiveQueryProviderProps): React.
       initialSnapshot: QueryResult,
       query: string,
       params: QueryParams,
-      hookPerspective?: Exclude<ClientPerspective, 'raw'>,
+      hookPerspective: Exclude<ClientPerspective, 'raw'> | null,
     ) {
-      const effectivePerspective = hookPerspective || perspective
+      const effectivePerspective = hookPerspective === null ? perspective : hookPerspective
       const snapshotsKey = getQueryCacheKey(query, params, effectivePerspective)
       const contextSubscribe: ListenerSubscribe = (onStoreChange) => {
         const unsubscribe = subscribe({

packages/preview-kit/src/LiveQueryProvider/usePerspective.ts

@@ -1,4 +1,4 @@
-import {type ClientPerspective} from '@sanity/client'
+import type {ClientPerspective} from '@sanity/client'
 import {createNode, createNodeMachine} from '@sanity/comlink'
 import {
   createCompatibilityActors,

packages/preview-kit/src/hooks.ts

@@ -17,7 +17,7 @@ export type isEqualFn<QueryResult> = (a: QueryResult, b: QueryResult) => boolean
 /** @public */
 export interface LiveQueryHookOptions<QueryResult> {
   isEqual?: isEqualFn<QueryResult>
-  perspective?: Exclude<ClientPerspective, 'raw'>
+  perspective?: Exclude<ClientPerspective, 'raw'> | null
 }
 
 /** @public */
@@ -30,7 +30,7 @@ export function useLiveQuery<
   queryParams?: QueryParams,
   options?: LiveQueryHookOptions<QueryResult>,
 ): [QueryResult, QueryLoading, QueryEnabled] {
-  const {isEqual = isFastEqual, perspective: perspectiveOption} = options || {}
+  const {isEqual = isFastEqual, perspective: perspectiveOption = null} = options || {}
 
   const defineStore = useContext(defineStoreContext)
   const params = useQueryParams(queryParams)
@@ -117,14 +117,11 @@ export function useQueryParams(params?: undefined | null | QueryParams): QueryPa
  * @internal
  */
 export function useQueryPerspective(
-  perspective?: undefined | null | Exclude<ClientPerspective, 'raw'>,
-): Exclude<ClientPerspective, 'raw'> | undefined {
+  perspective: null | Exclude<ClientPerspective, 'raw'>,
+): Exclude<ClientPerspective, 'raw'> | null {
   const stringifiedPerspective = useMemo(() => JSON.stringify(perspective), [perspective])
   return useMemo(
-    () =>
-      stringifiedPerspective === 'null' || stringifiedPerspective === 'undefined'
-        ? undefined
-        : (JSON.parse(stringifiedPerspective) as Exclude<ClientPerspective, 'raw'>),
+    () => JSON.parse(stringifiedPerspective) as Exclude<ClientPerspective, 'raw'>,
     [stringifiedPerspective],
   )
 }

packages/preview-kit/src/live-query/client-component/useLiveQuery.ts

@@ -20,7 +20,7 @@ export function useLiveQuery<
   const defineStore = useContext(defineStoreContext)
   const queryParams = useQueryParams(queryParams2)
   const store = useMemo(
-    () => defineStore?.<QueryResult>(initialData, query, queryParams),
+    () => defineStore?.<QueryResult>(initialData, query, queryParams, null),
     [defineStore, initialData, queryParams, query],
   )
   // initialSnapshot might change before hydration is done, so deep cloning it on the first hook call

packages/preview-kit/src/types.ts

@@ -17,7 +17,7 @@ export type DefineListenerContext = <QueryResult>(
   initialSnapshot: QueryResult,
   query: string,
   params: QueryParams,
-  perspective?: Exclude<ClientPerspective, 'raw'>,
+  perspective: Exclude<ClientPerspective, 'raw'> | null,
 ) => {
   subscribe: ListenerSubscribe
   getSnapshot: ListenerGetSnapshot<QueryResult>