refactor(sanity): move changeIndicators out of components

packages/sanity/src/core/components/changeIndicators/ChangeIndicator.tsx → packages/sanity/src/core/changeIndicators/ChangeIndicator.tsx

@@ -3,7 +3,7 @@ import React, {memo} from 'react'
 import deepCompare from 'react-fast-compare'
 import * as PathUtils from '@sanity/util/paths'
 import {Path} from '@sanity/types'
-import {EMPTY_ARRAY} from '../../util'
+import {EMPTY_ARRAY} from '../util'
 import {useReporter} from './tracker'
 import {ElementWithChangeBar} from './ElementWithChangeBar'
 

packages/sanity/src/core/components/changeIndicators/helpers/isChangeBar.ts → packages/sanity/src/core/changeIndicators/helpers/isChangeBar.ts

@@ -1,4 +1,4 @@
-import {Reported} from '../../react-track-elements'
+import {Reported} from '../../components/react-track-elements'
 import {TrackedArea, TrackedChange} from '../tracker'
 
 export function isChangeBar(

packages/sanity/src/core/components/changeIndicators/overlay/ChangeConnectorRoot.tsx → packages/sanity/src/core/changeIndicators/overlay/ChangeConnectorRoot.tsx

@@ -1,6 +1,6 @@
 import React, {useMemo} from 'react'
 import {Path} from '@sanity/types'
-import {ScrollContainer} from '../../scroll'
+import {ScrollContainer} from '../../components/scroll'
 import {ConnectorContext} from '../ConnectorContext'
 import {ENABLED} from '../constants'
 import {Tracker} from '../tracker'

packages/sanity/src/core/components/changeIndicators/overlay/ConnectorsOverlay.tsx → packages/sanity/src/core/changeIndicators/overlay/ConnectorsOverlay.tsx

@@ -1,15 +1,15 @@
 import React, {useCallback, useMemo, useState} from 'react'
 import {sortBy} from 'lodash'
 import {Path} from '@sanity/types'
-import {ScrollMonitor} from '../../scroll'
+import {ScrollMonitor} from '../../components/scroll'
 import {findMostSpecificTarget} from '../helpers/findMostSpecificTarget'
 import {isChangeBar} from '../helpers/isChangeBar'
 import {scrollIntoView} from '../helpers/scrollIntoView'
 import {DEBUG_LAYER_BOUNDS} from '../constants'
 import {getOffsetsTo} from '../helpers/getOffsetsTo'
 import {TrackedArea, TrackedChange, useReportedValues} from '../tracker'
-import {Reported} from '../../react-track-elements'
-import {isNonNullable} from '../../../util'
+import {Reported} from '../../components/react-track-elements'
+import {isNonNullable} from '../../util'
 import {Connector} from './Connector'
 import {DebugLayers} from './DebugLayers'
 import {useResizeObserver} from './useResizeObserver'

packages/sanity/src/core/components/changeIndicators/overlay/useResizeObserver.ts → packages/sanity/src/core/changeIndicators/overlay/useResizeObserver.ts

@@ -1,5 +1,5 @@
 import {useEffect} from 'react'
-import {resizeObserver} from '../../../util'
+import {resizeObserver} from '../../util'
 
 export function useResizeObserver(
   element: HTMLDivElement,

packages/sanity/src/core/components/changeIndicators/tracker.tsx → packages/sanity/src/core/changeIndicators/tracker.tsx

@@ -1,5 +1,5 @@
 import {Path} from '@sanity/types'
-import {createNoopTrackerScope, createTrackerScope} from '../react-track-elements'
+import {createNoopTrackerScope, createTrackerScope} from '../components/react-track-elements'
 import {ENABLED} from './constants'
 
 /** @internal */

packages/sanity/src/core/components/__workshop__/changeBar.tsx

@@ -1,7 +1,7 @@
 import {Container, Flex, TextArea} from '@sanity/ui'
 import {useBoolean} from '@sanity/ui-workshop'
 import React, {useCallback, useState} from 'react'
-import {ElementWithChangeBar} from '../changeIndicators/ElementWithChangeBar'
+import {ElementWithChangeBar} from '../../changeIndicators/ElementWithChangeBar'
 
 export default function ChangeBarStory() {
   const isChanged = useBoolean('Changed', true, 'Props')

packages/sanity/src/core/components/__workshop__/changeConnector.tsx

@@ -3,9 +3,9 @@ import {Card, Container, Flex, LayerProvider, Stack, Text} from '@sanity/ui'
 import React, {useCallback, useState} from 'react'
 import styled from 'styled-components'
 import {ScrollContainer} from '../scroll'
-import {ChangeFieldWrapper} from '../changeIndicators/ChangeFieldWrapper'
-import {ChangeIndicator} from '../changeIndicators/ChangeIndicator'
-import {ChangeConnectorRoot} from '../changeIndicators/overlay/ChangeConnectorRoot'
+import {ChangeFieldWrapper} from '../../changeIndicators/ChangeFieldWrapper'
+import {ChangeIndicator} from '../../changeIndicators/ChangeIndicator'
+import {ChangeConnectorRoot} from '../../changeIndicators/overlay/ChangeConnectorRoot'
 
 const TestContainer = styled(Container).attrs({
   height: 'fill',

packages/sanity/src/core/components/index.ts

@@ -5,7 +5,6 @@ export * from './PreviewCard'
 export * from './TextWithTone'
 export * from './UserAvatar'
 export * from './WithReferringDocuments'
-export * from './changeIndicators'
 export * from './collapseMenu'
 export * from './globalErrorHandler'
 export * from './hookCollection'

packages/sanity/src/core/field/types/portableText/diff/components/Annotation.tsx

@@ -8,7 +8,7 @@ import {ChangeList, DiffContext, DiffTooltip, useDiffAnnotationColor} from '../.
 import {ObjectDiff} from '../../../../types'
 import {PortableTextChild} from '../types'
 import {isEmptyObject} from '../helpers'
-import {ConnectorContext, useReportedValues} from '../../../../../components'
+import {ConnectorContext, useReportedValues} from '../../../../../changeIndicators'
 import {InlineBox, InlineText, PopoverContainer, PreviewContainer} from './styledComponents'
 
 interface AnnotationProps {

packages/sanity/src/core/field/types/portableText/diff/components/Block.tsx

@@ -4,7 +4,7 @@ import React, {useCallback, useContext} from 'react'
 import {DiffContext, DiffTooltip, useDiffAnnotationColor} from '../../../../diff'
 import {isHeader} from '../helpers'
 import {PortableTextBlock, PortableTextDiff} from '../types'
-import {ConnectorContext} from '../../../../../components'
+import {ConnectorContext} from '../../../../../changeIndicators'
 import Blockquote from './Blockquote'
 import Header from './Header'
 import Paragraph from './Paragraph'

packages/sanity/src/core/field/types/portableText/diff/components/InlineObject.tsx

@@ -9,7 +9,7 @@ import {ObjectDiff} from '../../../../types'
 import {PortableTextChild} from '../types'
 import {isEmptyObject} from '../helpers'
 import {SanityPreview} from '../../../../../preview'
-import {ConnectorContext, useReportedValues} from '../../../../../components'
+import {ConnectorContext, useReportedValues} from '../../../../../changeIndicators'
 import {InlineBox, InlineText, PopoverContainer, PreviewContainer} from './styledComponents'
 
 interface InlineObjectProps {

packages/sanity/src/core/field/types/portableText/diff/components/Text.tsx

@@ -3,7 +3,7 @@ import React, {SyntheticEvent, useCallback, useMemo} from 'react'
 import {startCase} from 'lodash'
 import {DiffCard, DiffContext} from '../../../../diff'
 import {ObjectDiff, StringDiff, StringDiffSegment} from '../../../../types'
-import {ConnectorContext} from '../../../../../components'
+import {ConnectorContext} from '../../../../../changeIndicators'
 import {InlineBox} from './styledComponents'
 
 interface TextProps {

packages/sanity/src/core/form/inputs/CrossDatasetReferenceInput/CrossDatasetReferenceInput.tsx

@@ -26,7 +26,8 @@ import {AlertStrip} from '../../components/AlertStrip'
 import {useOnClickOutside} from '../../hooks/useOnClickOutside'
 import {getPublishedId, isNonNullable} from '../../../util'
 import {FIXME} from '../../../FIXME'
-import {ChangeIndicator, PreviewCard} from '../../../components'
+import {PreviewCard} from '../../../components'
+import {ChangeIndicator} from '../../../changeIndicators'
 import {CrossDatasetReferenceInfo, CrossDatasetSearchHit, SearchState} from './types'
 import {OptionPreview} from './OptionPreview'
 import {GetReferenceInfoFn, useReferenceInfo} from './useReferenceInfo'

packages/sanity/src/core/form/inputs/PortableText/Compositor.tsx

@@ -22,7 +22,7 @@ import {FormInput} from '../../components'
 import {ActivateOnFocus} from '../../components/ActivateOnFocus/ActivateOnFocus'
 import {EMPTY_ARRAY} from '../../../util'
 import {FIXME} from '../../../FIXME'
-import {ChangeIndicator} from '../../../components'
+import {ChangeIndicator} from '../../../changeIndicators'
 import {BlockObject} from './object/BlockObject'
 import {InlineObject} from './object/InlineObject'
 import {Annotation, TextBlock} from './text'

packages/sanity/src/core/form/inputs/PortableText/_common/StyledChangeIndicatorWithProvidedFullPath.tsx

@@ -1,5 +1,5 @@
 import styled, {css} from 'styled-components'
-import {ChangeIndicator} from '../../../../components'
+import {ChangeIndicator} from '../../../../changeIndicators'
 
 export const StyledChangeIndicatorWithProvidedFullPath = styled(ChangeIndicator)(() => {
   return css`

packages/sanity/src/core/form/inputs/ReferenceInput/ReferenceInput.tsx

@@ -40,7 +40,8 @@ import {set, setIfMissing, unset} from '../../patch'
 import {AlertStrip} from '../../components/AlertStrip'
 import {Alert} from '../../components/Alert'
 import {useOnClickOutside} from '../../hooks/useOnClickOutside'
-import {ChangeIndicator, PreviewCard} from '../../../components'
+import {ChangeIndicator} from '../../../changeIndicators'
+import {PreviewCard} from '../../../components'
 import {EMPTY_ARRAY, getPublishedId, isNonNullable} from '../../../util'
 import {FIXME} from '../../../FIXME'
 import {ReferenceInputProps, CreateReferenceOption, ReferenceSearchState} from './types'

packages/sanity/src/core/form/inputs/SelectInput.tsx

@@ -3,7 +3,7 @@ import {isTitledListValue, TitledListValue} from '@sanity/types'
 import {Box, Card, Flex, Inline, Radio, Select, Stack, Text} from '@sanity/ui'
 import {capitalize} from 'lodash'
 import React, {forwardRef, useCallback, useMemo} from 'react'
-import {ChangeIndicator} from '../../components'
+import {ChangeIndicator} from '../../changeIndicators'
 import {PatchEvent, set, unset} from '../patch'
 import {StringInputProps} from '../types'
 

packages/sanity/src/core/form/inputs/arrays/ArrayOfObjectsInput/item/ArrayItem.tsx

@@ -3,7 +3,7 @@
 import {isReferenceSchemaType, Path, SchemaType} from '@sanity/types'
 import {Box} from '@sanity/ui'
 import React, {memo, useCallback, useRef} from 'react'
-import {ChangeIndicator} from '../../../../../components'
+import {ChangeIndicator} from '../../../../../changeIndicators'
 import {ArrayInputMember} from '../types'
 import {useScrollIntoViewOnFocusWithin} from '../../../../hooks/useScrollIntoViewOnFocusWithin'
 import {useDidUpdate} from '../../../../hooks/useDidUpdate'

packages/sanity/src/core/form/inputs/files/FileInput/FileInput.tsx

@@ -37,7 +37,8 @@ import {UploadWarning} from '../common/UploadWarning'
 import {InputProps, ObjectInputProps} from '../../../types'
 import {PatchEvent, setIfMissing, unset} from '../../../patch'
 import {MemberField, MemberFieldError, MemberFieldSet} from '../../../members'
-import {ChangeIndicator, ImperativeToast} from '../../../../components'
+import {ImperativeToast} from '../../../../components'
+import {ChangeIndicator} from '../../../../changeIndicators'
 import {FIXME} from '../../../../FIXME'
 import {CardOverlay, FlexContainer} from './styles'
 import {FileDetails} from './FileDetails'

packages/sanity/src/core/form/inputs/files/ImageInput/ImageInput.tsx

@@ -49,7 +49,8 @@ import {FormInput} from '../../../components'
 import {MemberField, MemberFieldError, MemberFieldSet} from '../../../members'
 import {PresenceOverlay} from '../../../../presence'
 import {FIXME} from '../../../../FIXME'
-import {ChangeIndicator, ImperativeToast} from '../../../../components'
+import {ImperativeToast} from '../../../../components'
+import {ChangeIndicator} from '../../../../changeIndicators'
 import {ImageActionsMenu} from './ImageActionsMenu'
 import {ImagePreview} from './ImagePreview'
 import {InvalidImageWarning} from './InvalidImageWarning'

packages/sanity/src/core/form/inputs/files/ImageToolInput/ImageToolInput.tsx

@@ -7,7 +7,7 @@ import {set} from '../../../patch'
 import {RatioBox} from '../common/RatioBox'
 import type {ObjectInputProps} from '../../../types'
 import {useDidUpdate} from '../../../hooks/useDidUpdate'
-import {ChangeIndicator} from '../../../../components'
+import {ChangeIndicator} from '../../../../changeIndicators'
 import {EMPTY_ARRAY} from '../../../../util'
 import {ImageTool, HotspotImage, DEFAULT_CROP, DEFAULT_HOTSPOT} from './imagetool'
 import {useLoadImage} from './useLoadImage'

packages/sanity/src/core/form/studio/inputResolver/inputResolver.tsx

@@ -12,7 +12,8 @@ import {FieldMember} from '../../store'
 import {ArrayFieldProps, FieldProps, InputProps, ItemProps, ObjectFieldProps} from '../../types'
 import * as is from '../../utils/is'
 import {FormField, FormFieldSet} from '../../components/formField'
-import {ChangeIndicator, PreviewProps} from '../../../components'
+import {PreviewProps} from '../../../components'
+import {ChangeIndicator} from '../../../changeIndicators'
 import {SanityPreview} from '../../../preview'
 import {FIXME} from '../../../FIXME'
 import {resolveReferenceInput} from './resolveReferenceInput'

packages/sanity/src/core/index.ts

@@ -6,7 +6,7 @@ export * from './components/PreviewCard'
 export * from './components/TextWithTone'
 export * from './components/UserAvatar'
 export * from './components/WithReferringDocuments'
-export * from './components/changeIndicators'
+export * from './changeIndicators'
 export * from './components/collapseMenu'
 export * from './components/globalErrorHandler'
 export * from './components/hookCollection'

packages/sanity/src/core/store/_legacy/__workshop__/HistoryTimelineStory.tsx

@@ -5,7 +5,7 @@ import {format} from 'date-fns'
 import {omit} from 'lodash'
 import React, {useCallback, useEffect, useMemo, useState} from 'react'
 import {useMemoObservable} from 'react-rx'
-import {ChangeFieldWrapper} from '../../../components'
+import {ChangeFieldWrapper} from '../../../changeIndicators'
 import {
   ChangeList,
   DocumentChangeContext,