[field] Move components to "components" directory

packages/@sanity/field/src/diff/annotations/index.ts

@@ -1,7 +1,2 @@
 export * from './hooks'
 export * from './helpers'
-export * from './DiffAnnotation'
-export * from './DiffAnnotationCard'
-export * from './DiffAnnotationTooltip'
-export * from './DiffAnnotationTooltipContent'
-export * from './AnnotatedStringDiff'

packages/@sanity/field/src/diff/annotations/AnnotatedStringDiff.tsx → packages/@sanity/field/src/diff/components/AnnotatedStringDiff.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import {StringDiffSegment, StringDiff} from '../../types'
-import {DiffAnnotation} from '../annotations'
+import {DiffAnnotation} from './DiffAnnotation'
 import styles from './AnnotatedStringDiff.css'
 
 function FormattedPreviewText({

packages/@sanity/field/src/diff/components/Change.tsx

@@ -1,10 +1,11 @@
 import React from 'react'
 import {Path} from '../../paths'
 import {PreviewComponent as IPreviewComponent} from '../../preview/types'
-import {DiffAnnotationTooltip, getAnnotationAtPath, useAnnotationColor} from '../annotations'
+import {getAnnotationAtPath, useAnnotationColor} from '../annotations'
 import {Diff, SchemaType} from '../../types'
 import {getChangeVerb} from '../helpers'
 import {ChangeLayout} from './ChangeLayout'
+import {DiffAnnotationTooltip} from './DiffAnnotationTooltip'
 
 import styles from './Change.css'
 

packages/@sanity/field/src/diff/changes/ChangeBreadcrumb.tsx → packages/@sanity/field/src/diff/components/ChangeBreadcrumb.tsx

@@ -1,6 +1,7 @@
 import React, {Fragment} from 'react'
 import {ChangeTitlePath, FieldChangeNode} from '../../types'
 import {ChangeTitleSegment} from './ChangeTitleSegment'
+
 import styles from './ChangeBreadcrumb.css'
 
 export function ChangeBreadcrumb({

packages/@sanity/field/src/diff/components/ChangeLayout.tsx

@@ -1,5 +1,6 @@
 import React from 'react'
 import ArrowIcon from 'part:@sanity/base/arrow-right'
+
 import styles from './ChangeLayout.css'
 
 export interface ChangeLayoutProps {

packages/@sanity/field/src/diff/changes/ChangeList.tsx → packages/@sanity/field/src/diff/components/ChangeList.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import {ObjectDiff, ObjectSchemaType, ChangeNode} from '../../types'
 import {Path} from '../../paths'
 import {DiffContext} from '../context/DiffContext'
-import {buildObjectChangeList} from './buildChangeList'
+import {buildObjectChangeList} from '../changes/buildChangeList'
 import {ChangeResolver} from './ChangeResolver'
 
 interface Props {

packages/@sanity/field/src/diff/changes/ChangeTitleSegment.tsx → packages/@sanity/field/src/diff/components/ChangeTitleSegment.tsx

@@ -1,6 +1,8 @@
 import * as React from 'react'
 import {FromToIndex, Annotation, FieldChangeNode} from '../../types'
-import {DiffAnnotation, DiffAnnotationCard} from '../annotations'
+import {DiffAnnotation} from './DiffAnnotation'
+import {DiffAnnotationCard} from './DiffAnnotationCard'
+
 import styles from './ChangeTitleSegment.css'
 
 export function ChangeTitleSegment({

packages/@sanity/field/src/diff/annotations/DiffAnnotation.tsx → packages/@sanity/field/src/diff/components/DiffAnnotation.tsx

@@ -1,8 +1,8 @@
 import {useUserColorManager} from '@sanity/base/user-color'
 import * as React from 'react'
+import {getAnnotationAtPath, getAnnotationColor} from '../annotations'
 import {Annotation, Diff, Path} from '../../types'
 import {DiffAnnotationTooltip} from './DiffAnnotationTooltip'
-import {getAnnotationAtPath, getAnnotationColor} from './helpers'
 
 export interface AnnotationProps {
   annotation: Annotation | undefined | null

packages/@sanity/field/src/diff/annotations/DiffAnnotationCard.tsx → packages/@sanity/field/src/diff/components/DiffAnnotationCard.tsx

@@ -1,9 +1,8 @@
 import React, {createElement} from 'react'
-import {Diff, Annotation} from '../../types'
+import {getAnnotationAtPath, useAnnotationColor} from '../annotations'
 import {Path} from '../../paths'
-import {useAnnotationColor} from './hooks'
+import {Diff, Annotation} from '../../types'
 import {AnnotationProps, AnnotatedDiffProps} from './DiffAnnotation'
-import {getAnnotationAtPath} from './helpers'
 
 interface BaseDiffAnnotationCardProps {
   as?: React.ElementType | keyof JSX.IntrinsicElements

packages/@sanity/field/src/diff/annotations/DiffAnnotationTooltip.tsx → packages/@sanity/field/src/diff/components/DiffAnnotationTooltip.tsx

@@ -1,8 +1,8 @@
 import {Tooltip} from 'part:@sanity/components/tooltip'
 import React, {createElement} from 'react'
+import {getAnnotationAtPath} from '../annotations'
 import {DiffAnnotationTooltipContent} from './DiffAnnotationTooltipContent'
 import {AnnotationProps, AnnotatedDiffProps} from './DiffAnnotation'
-import {getAnnotationAtPath} from './helpers'
 
 interface BaseAnnotationProps {
   as?: React.ElementType | keyof JSX.IntrinsicElements

packages/@sanity/field/src/diff/annotations/DiffAnnotationTooltipContent.tsx → packages/@sanity/field/src/diff/components/DiffAnnotationTooltipContent.tsx

@@ -3,8 +3,9 @@ import {useUser, useTimeAgo} from '@sanity/base/hooks'
 import {UserAvatar} from '@sanity/base/components'
 import {useUserColorManager} from '@sanity/base/user-color'
 import {AnnotationDetails} from '../../types'
+import {getAnnotationColor} from '../annotations'
+
 import styles from './DiffAnnotationTooltipContent.css'
-import {getAnnotationColor} from './helpers'
 
 export function DiffAnnotationTooltipContent({
   annotations,

packages/@sanity/field/src/diff/fallback/FallbackDiff.tsx → packages/@sanity/field/src/diff/components/FallbackDiff.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import Preview from 'part:@sanity/base/preview'
 import {PreviewComponent} from '../../preview/types'
 import {DiffComponent} from '../../types'
-import {Change} from '../components'
+import {Change} from './Change'
 
 import styles from './FallbackDiff.css'
 

packages/@sanity/field/src/diff/changes/FieldChange.tsx → packages/@sanity/field/src/diff/components/FieldChange.tsx

@@ -1,18 +1,18 @@
 import {useDocumentOperation} from '@sanity/react-hooks'
 import classNames from 'classnames'
 import React, {useCallback, useContext, useState} from 'react'
-import {FieldChangeNode, OperationsAPI} from '../../types'
+import {undoChange} from '../changes/undoChange'
 import {DiffContext} from '../context/DiffContext'
-import {FallbackDiff} from '../fallback/FallbackDiff'
-import {ValueError} from './ValueError'
+import {FieldChangeNode, OperationsAPI} from '../../types'
+import {ChangeBreadcrumb} from './ChangeBreadcrumb'
 import {DiffErrorBoundary} from './DiffErrorBoundary'
+import {DiffInspectWrapper} from './DiffInspectWrapper'
 import {DocumentChangeContext} from './DocumentChangeContext'
+import {FallbackDiff} from './FallbackDiff'
 import {RevertChangesButton} from './RevertChangesButton'
-import {undoChange} from './undoChange'
+import {ValueError} from './ValueError'
 
 import styles from './FieldChange.css'
-import {DiffInspectWrapper} from './DiffInspectWrapper'
-import {ChangeBreadcrumb} from './ChangeBreadcrumb'
 
 export function FieldChange({change}: {change: FieldChangeNode}) {
   const DiffComponent = change.diffComponent || FallbackDiff

packages/@sanity/field/src/diff/changes/GroupChange.tsx → packages/@sanity/field/src/diff/components/GroupChange.tsx

@@ -1,15 +1,16 @@
 import * as React from 'react'
 import classNames from 'classnames'
 import {useDocumentOperation} from '@sanity/react-hooks'
+import {undoChange} from '../changes/undoChange'
+import {isFieldChange} from '../helpers'
 import {isPTSchemaType} from '../../types/portableText/diff'
-import {useHover} from '../../utils/useHover'
 import {GroupChangeNode, OperationsAPI} from '../../types'
-import {isFieldChange} from '../helpers'
+import {useHover} from '../../utils/useHover'
 import {ChangeBreadcrumb} from './ChangeBreadcrumb'
 import {ChangeResolver} from './ChangeResolver'
 import {DocumentChangeContext} from './DocumentChangeContext'
 import {RevertChangesButton} from './RevertChangesButton'
-import {undoChange} from './undoChange'
+
 import styles from './GroupChange.css'
 
 export function GroupChange({change: group}: {change: GroupChangeNode}): React.ReactElement {

packages/@sanity/field/src/diff/components/index.ts

@@ -1,3 +1,11 @@
+export * from './AnnotatedStringDiff'
+export * from './Change'
 export * from './ChangeLayout'
+export * from './ChangeList'
+export * from './ChangeResolver'
+export * from './DiffAnnotation'
+export * from './DiffAnnotationCard'
+export * from './DiffAnnotationTooltip'
+export * from './DiffAnnotationTooltipContent'
+export * from './DocumentChangeContext'
 export * from './MetaInfo'
-export * from './Change'

packages/@sanity/field/src/diff/hooks/hooks.ts

@@ -2,7 +2,6 @@ import {useState, useEffect} from 'react'
 import client from 'part:@sanity/base/client'
 import {observeForPreview} from 'part:@sanity/base/preview'
 import {Reference, SchemaType} from '../../types'
-import {noop} from '../helpers'
 
 interface PreviewSnapshot {
   title: string
@@ -12,7 +11,7 @@ export function useRefValue<T = unknown>(refId: string | undefined | null): T |
   const [value, setValue] = useState<T | undefined>(undefined)
   useEffect(() => {
     if (!refId) {
-      return noop
+      return undefined
     }
 
     const subscription = client.observable.getDocument(refId).subscribe(setValue)

packages/@sanity/field/src/diff/index.ts

@@ -1,6 +1,6 @@
 export * from '../types'
+
 export * from './annotations'
-export * from './changes'
-export * from './resolve'
 export * from './components'
 export * from './helpers'
+export * from './resolve'