[field] Fix up some imports with the components being moved from [des…

…k-tool]
sanity-io · Oct 6, 2020 · dbce776 · dbce776
1 parent abd547b
commit dbce776
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/packages/@sanity/field/package.json b/packages/@sanity/field/package.json
@@ -28,6 +28,7 @@
     "@sanity/base": "1.150.3",
     "@sanity/diff": "1.150.1",
     "@sanity/react-hooks": "1.150.4",
+    "@sanity/block-content-to-react": "^2.0.7",
     "date-fns": "^1.29.0",
     "sanity-diff-patch": "^1.0.7"
   },

diff --git a/packages/@sanity/field/src/diff/components/portableText/PTDiff.tsx b/packages/@sanity/field/src/diff/components/portableText/PTDiff.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import PortableText from '@sanity/block-content-to-react'
-import {DiffComponent, ObjectDiff, ObjectSchemaType} from '@sanity/field/diff'
+import {DiffComponent, ObjectDiff, ObjectSchemaType} from '../../index'
 
 import Blockquote from './previews/Blockquote'
 import Decorator from './previews/Decorator'

diff --git a/packages/@sanity/field/src/diff/components/portableText/helpers.tsx b/packages/@sanity/field/src/diff/components/portableText/helpers.tsx
@@ -1,11 +1,5 @@
 import React from 'react'
-import {
-  AnnotatedStringDiff,
-  ArrayDiff,
-  ObjectDiff,
-  ObjectSchemaType,
-  StringDiff
-} from '@sanity/field/diff'
+import {AnnotatedStringDiff, ArrayDiff, ObjectDiff, ObjectSchemaType, StringDiff} from '../../index'
 import {startCase} from 'lodash'
 import {ChildMap, PortableTextBlock, PortableTextChild} from './types'
 

diff --git a/packages/@sanity/field/src/diff/components/portableText/types.ts b/packages/@sanity/field/src/diff/components/portableText/types.ts
@@ -1,5 +1,5 @@
-import {ArrayDiff, ObjectDiff} from '@sanity/field/diff'
-import {ReactElement} from 'react'
+import {ArrayDiff, ObjectDiff} from '../../index'
+import {ReactNode} from 'react'
 
 export type PortableTextBlock = {
   _key: string
@@ -18,9 +18,9 @@ export type PortableTextChild = {
 export type ChildMap = Record<
   string,
   {
-    annotation: React.ReactNode | undefined
+    annotation: ReactNode | undefined
     child: PortableTextChild
     diffs: ObjectDiff[] | ArrayDiff[]
-    summary: React.ReactNode[]
+    summary: ReactNode[]
   }
 >
diff --git a/packages/@sanity/field/src/diff/resolve/diffResolver.ts b/packages/@sanity/field/src/diff/resolve/diffResolver.ts
@@ -18,7 +18,7 @@ export const diffResolver: DiffComponentResolver = function diffResolver({schema
     return SlugFieldDiff
   }
 
-  if (isPTSchemaType(schemaType)) {
+  if (schemaType.jsonType === 'object' && isPTSchemaType(schemaType)) {
     return PTDiff
   }