Skip to content

Commit

Permalink
[field] Rename Change to DiffFromTo
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuslundgard authored and rexxars committed Oct 6, 2020
1 parent acb3976 commit 257f675
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {getChangeVerb} from '../helpers'
import {ChangeLayout} from './ChangeLayout'
import {DiffAnnotationTooltip} from './DiffAnnotationTooltip'

import styles from './Change.css'
import styles from './DiffFromTo.css'

interface ChangeProps {
previewComponent: IPreviewComponent<any>
Expand All @@ -17,7 +17,7 @@ interface ChangeProps {
layout?: 'grid' | 'inline'
}

export function Change({
export function DiffFromTo({
layout = 'inline',
diff,
path,
Expand Down
9 changes: 7 additions & 2 deletions packages/@sanity/field/src/diff/components/FallbackDiff.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 './Change'
import {DiffFromTo} from './DiffFromTo'

import styles from './FallbackDiff.css'

Expand All @@ -16,6 +16,11 @@ const FallbackPreview: PreviewComponent<any> = ({color, value, schemaType}) => {

export const FallbackDiff: DiffComponent<any> = ({diff, schemaType}) => {
return (
<Change diff={diff} schemaType={schemaType} previewComponent={FallbackPreview} layout="grid" />
<DiffFromTo
diff={diff}
schemaType={schemaType}
previewComponent={FallbackPreview}
layout="grid"
/>
)
}
2 changes: 1 addition & 1 deletion packages/@sanity/field/src/diff/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
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 './DiffFromTo'
export * from './DiffString'
export * from './DocumentChangeContext'
export * from './MetaInfo'
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import React from 'react'
import {DiffComponent, StringDiff, Change} from '../../../diff'
import {DiffComponent, DiffFromTo, StringDiff} from '../../../diff'
import {DatetimePreview} from '../preview'

export const DatetimeFieldDiff: DiffComponent<StringDiff> = ({diff, schemaType}) => {
return (
<Change diff={diff} layout="grid" schemaType={schemaType} previewComponent={DatetimePreview} />
<DiffFromTo
diff={diff}
layout="grid"
schemaType={schemaType}
previewComponent={DatetimePreview}
/>
)
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import React from 'react'
import {DiffComponent, NumberDiff, Change} from '../../../diff'
import {DiffComponent, DiffFromTo, NumberDiff} from '../../../diff'
import {NumberPreview} from '../preview/NumberPreview'

export const NumberFieldDiff: DiffComponent<NumberDiff> = ({diff, schemaType}) => {
return (
<Change diff={diff} schemaType={schemaType} previewComponent={NumberPreview} layout="inline" />
<DiffFromTo
diff={diff}
schemaType={schemaType}
previewComponent={NumberPreview}
layout="inline"
/>
)
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React from 'react'
import {DiffComponent, ReferenceDiff} from '../../../diff'
import {Change} from '../../../diff/components'
import {DiffComponent, DiffFromTo, ReferenceDiff} from '../../../diff'
import {ReferencePreview} from '../preview/ReferencePreview'

export const ReferenceFieldDiff: DiffComponent<ReferenceDiff> = ({diff, schemaType}) => {
return (
<Change
<DiffFromTo
diff={diff}
layout="grid"
path="_ref"
Expand Down
6 changes: 4 additions & 2 deletions packages/@sanity/field/src/types/slug/diff/SlugFieldDiff.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React from 'react'
import {DiffComponent, ObjectDiff, Change} from '../../../diff'
import {DiffComponent, DiffFromTo, ObjectDiff} from '../../../diff'
import {SlugPreview} from '../preview'

interface Slug {
current?: string
}

export const SlugFieldDiff: DiffComponent<ObjectDiff<Slug>> = ({diff, schemaType}) => {
return <Change layout="grid" diff={diff} schemaType={schemaType} previewComponent={SlugPreview} />
return (
<DiffFromTo layout="grid" diff={diff} schemaType={schemaType} previewComponent={SlugPreview} />
)
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import {DiffComponent, DiffString, StringDiff, Change} from '../../../diff'
import {DiffComponent, DiffFromTo, DiffString, StringDiff} from '../../../diff'
import {StringPreview} from '../preview/StringPreview'

import styles from './StringFieldDiff.css'
Expand All @@ -10,7 +10,7 @@ export const StringFieldDiff: DiffComponent<StringDiff> = ({diff, schemaType}) =
if (options?.list) {
// When the string is considered to be an "enum", don't show individual
// string segment changes, rather treat is as a "from -> to" diff
return <Change diff={diff} previewComponent={StringPreview} schemaType={schemaType} />
return <DiffFromTo diff={diff} previewComponent={StringPreview} schemaType={schemaType} />
}

return (
Expand Down
4 changes: 2 additions & 2 deletions packages/@sanity/field/src/types/url/diff/UrlFieldDiff.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import {StringDiff, DiffComponent, Change} from '../../../diff'
import {DiffComponent, DiffFromTo, StringDiff} from '../../../diff'
import {StringPreview} from '../../string/preview'

export const UrlFieldDiff: DiffComponent<StringDiff> = ({diff, schemaType}) => {
return <Change diff={diff} schemaType={schemaType} previewComponent={StringPreview} />
return <DiffFromTo diff={diff} schemaType={schemaType} previewComponent={StringPreview} />
}

0 comments on commit 257f675

Please sign in to comment.