refactor(structure): move CommentsContext to singletons

sanity-io · Apr 29, 2024 · 94950b7 · 94950b7
1 parent 6555ffc
commit 94950b7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/packages/sanity/src/_singletons/index.ts b/packages/sanity/src/_singletons/index.ts
@@ -27,6 +27,7 @@ export * from './presence/FormFieldPresenceContext'
 export * from './router/RouterContext'
 export * from './store/_legacy/ResourceCacheContext'
 export * from './structure/comments/authoring-path/CommentsAuthoringPathContext'
+export * from './structure/comments/CommentsContext'
 export * from './structure/comments/components/pte/comment-input/CommentInputContext'
 export * from './structure/components/pane/PaneContext'
 export * from './structure/panes/document/DocumentPaneContext'

diff --git a/...ments/context/comments/CommentsContext.ts → ...ons/structure/comments/CommentsContext.ts b/...ments/context/comments/CommentsContext.ts → ...ons/structure/comments/CommentsContext.ts
@@ -1,5 +1,8 @@
 import {createContext} from 'react'
 
-import {type CommentsContextValue} from './types'
+import {CommentsContextValue} from '../../../core/comments/context/comments/types'
 
+/**
+ * @internal
+ */
 export const CommentsContext = createContext<CommentsContextValue | null>(null)
diff --git a/packages/sanity/src/core/comments/context/comments/CommentsProvider.tsx b/packages/sanity/src/core/comments/context/comments/CommentsProvider.tsx
@@ -1,6 +1,7 @@
 import {type Path} from '@sanity/types'
 import {orderBy} from 'lodash'
 import {memo, type ReactNode, useCallback, useMemo, useState} from 'react'
+import {CommentsContext} from 'sanity/_singletons'
 
 import {useEditState, useSchema, useUserListWithPermissions} from '../../../hooks'
 import {useCurrentUser} from '../../../store'
@@ -19,8 +20,7 @@ import {
   type CommentThreadItem,
   type CommentUpdatePayload,
 } from '../../types'
-import {buildCommentThreadItems} from '../../utils'
-import {CommentsContext} from './CommentsContext'
+import {buildCommentThreadItems} from '../../utils/buildCommentThreadItems'
 import {type CommentsContextValue} from './types'
 
 const EMPTY_ARRAY: [] = []

diff --git a/packages/sanity/src/core/comments/context/comments/index.ts b/packages/sanity/src/core/comments/context/comments/index.ts
@@ -1,2 +1 @@
-export * from './CommentsContext'
 export * from './CommentsProvider'
diff --git a/packages/sanity/src/core/comments/hooks/useComments.ts b/packages/sanity/src/core/comments/hooks/useComments.ts
@@ -1,6 +1,6 @@
 import {useContext} from 'react'
+import {CommentsContext} from 'sanity/_singletons'
 
-import {CommentsContext} from '../context'
 import {type CommentsContextValue} from '../context/comments/types'
 
 /**