[base] Restructure user-color files

packages/@sanity/base/src/hooks.ts

@@ -1,4 +1,4 @@
 export {useDocumentPresence, useGlobalPresence} from './datastores/presence/hooks'
 export {useUser} from './datastores/user/hooks'
-export {useUserColor} from './user-color/useUserColor'
+export {useUserColor} from './user-color/hooks'
 export {useTimeAgo} from './time/useTimeAgo'

packages/@sanity/base/src/user-color/context.ts

@@ -0,0 +1,5 @@
+import {createContext} from 'react'
+import {userColorManager} from './singleton'
+import {UserColorManager} from './types'
+
+export const UserColorManagerContext = createContext<UserColorManager>(userColorManager)

packages/@sanity/base/src/user-color/useUserColor.ts → packages/@sanity/base/src/user-color/hooks.ts

@@ -1,7 +1,12 @@
+import {useContext} from 'react'
 import {of} from 'rxjs'
 import {useObservable} from '../util/useObservable'
-import {useUserColorManager} from './provider'
-import {UserColor} from './types'
+import {UserColorManagerContext} from './context'
+import {UserColor, UserColorManager} from './types'
+
+export function useUserColorManager(): UserColorManager {
+  return useContext(UserColorManagerContext)
+}
 
 export function useUserColor(userId: string | null): UserColor | null {
   const manager = useUserColorManager()

packages/@sanity/base/src/user-color/index.ts

@@ -1,5 +1,5 @@
-export {createUserColorManager} from './manager'
-export {useUserColorManager, UserColorManagerProvider} from './provider'
-export {userColorManager} from './singleton'
-export {useUserColor} from './useUserColor'
+export * from './hooks'
+export * from './manager'
+export * from './provider'
+export * from './singleton'
 export * from './types'

packages/@sanity/base/src/user-color/manager.ts

@@ -1,10 +1,16 @@
 import {Observable} from 'rxjs'
 import {filter, shareReplay} from 'rxjs/operators'
 import {color as SanityColor, ColorHueKey, COLOR_HUES} from '@sanity/color'
-import {UserColorHue, ManagerOptions, UserColorManager, UserColor} from './types'
+import {UserColorHue, UserColorManager, UserColor} from './types'
 
 type UserId = string
 
+export interface UserColorManagerOptions {
+  userStore?: {currentUser: Observable<{type: 'snapshot' | 'error'; user?: {id: string} | null}>}
+  colors?: Readonly<Record<UserColorHue, UserColor>>
+  currentUserColor?: UserColorHue
+}
+
 const defaultCurrentUserHue: ColorHueKey = 'purple'
 
 // Remove green and red because they can be confused with "add" and "remove"
@@ -21,7 +27,7 @@ const defaultColors = defaultHues.reduce((colors, hue) => {
   return colors
 }, {} as Record<ColorHueKey, UserColor>)
 
-export function createUserColorManager(options?: ManagerOptions): UserColorManager {
+export function createUserColorManager(options?: UserColorManagerOptions): UserColorManager {
   const colors = (options && options.colors) || defaultColors
   const currentUserColor = (options && options.currentUserColor) || defaultCurrentUserHue
   if (!colors.hasOwnProperty(currentUserColor)) {

packages/@sanity/base/src/user-color/provider.ts

@@ -1,18 +1,15 @@
-import React, {createContext, useContext} from 'react'
+import React from 'react'
+import {UserColorManagerContext} from './context'
 import {UserColorManager} from './types'
-import {userColorManager} from './singleton'
 
-interface ProviderProps {
+interface UserColorManagerProviderProps {
   children: React.ReactNode
   manager: UserColorManager
 }
 
-const UserColorManagerContext = createContext<UserColorManager>(userColorManager)
-
-export function useUserColorManager(): UserColorManager {
-  return useContext(UserColorManagerContext)
-}
-
-export function UserColorManagerProvider({children, manager}: ProviderProps) {
+export function UserColorManagerProvider({
+  children,
+  manager
+}: UserColorManagerProviderProps): React.ReactElement {
   return React.createElement(UserColorManagerContext.Provider, {value: manager}, children)
 }

packages/@sanity/base/src/user-color/types.ts

@@ -14,9 +14,3 @@ export interface UserColorManager {
   get: (userId: string) => UserColor
   listen: (userId: string) => Observable<UserColor>
 }
-
-export interface ManagerOptions {
-  userStore?: {currentUser: Observable<{type: 'snapshot' | 'error'; user?: {id: string} | null}>}
-  colors?: Readonly<Record<UserColorHue, UserColor>>
-  currentUserColor?: UserColorHue
-}