[desk-tool] Resolve and populate diff components

sanity-io · Oct 6, 2020 · f31ec7b · f31ec7b
1 parent 1508cb1
commit f31ec7b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/packages/@sanity/desk-tool/src/panes/documentPane/changesPanel/buildChangeList.ts b/packages/@sanity/desk-tool/src/panes/documentPane/changesPanel/buildChangeList.ts
@@ -8,6 +8,7 @@ import {
   SchemaType,
   Diff
 } from '@sanity/field/diff'
+import {resolveDiffComponent} from '../../../diffs/resolveDiffComponent'
 import {ChangeNode, ChangeTitlePath} from './types'
 import {getArrayDiffItemType} from './helpers'
 
@@ -24,22 +25,25 @@ export function buildChangeList(
   path: Path = [],
   titlePath: ChangeTitlePath = []
 ): ChangeNode[] {
-  if (schemaType.jsonType === 'object' && diff.type === 'object') {
+  const diffComponent = resolveDiffComponent(schemaType)
+
+  if (!diffComponent && schemaType.jsonType === 'object' && diff.type === 'object') {
     return buildObjectChangeList(schemaType, diff, path, titlePath)
   }
 
-  if (schemaType.jsonType === 'array' && diff.type === 'array') {
+  if (!diffComponent && schemaType.jsonType === 'array' && diff.type === 'array') {
     return buildArrayChangeList(schemaType, diff, path, titlePath)
   }
 
   return [
     {
       type: 'field',
-      diff: diff,
+      diff,
+      path,
+      titlePath,
+      schemaType,
       key: pathToString(path),
-      path: path,
-      titlePath: titlePath,
-      schemaType: schemaType
+      diffComponent
     }
   ]
 }

diff --git a/packages/@sanity/desk-tool/src/panes/documentPane/changesPanel/changesPanel.tsx b/packages/@sanity/desk-tool/src/panes/documentPane/changesPanel/changesPanel.tsx
@@ -3,7 +3,6 @@ import React, {useCallback, Fragment, useContext} from 'react'
 import {useDocumentOperation} from '@sanity/react-hooks'
 import {ObjectDiff, SchemaType, ObjectSchemaType} from '@sanity/field/diff'
 import {FallbackDiff} from '../../../diffs/_fallback/FallbackDiff'
-import {resolveDiffComponent} from '../../../diffs/resolveDiffComponent'
 import {useDocumentHistory} from '../documentHistory'
 import {buildDocumentChangeList} from './buildChangeList'
 import {DiffErrorBoundary} from './diffErrorBoundary'
@@ -94,7 +93,7 @@ function ChangeHeader({change, titlePath}: {change: FieldChangeNode; titlePath:
 }
 
 function FieldChange({change}: {change: FieldChangeNode}) {
-  const DiffComponent = resolveDiffComponent(change.schemaType) || FallbackDiff
+  const DiffComponent = change.diffComponent || FallbackDiff
 
   return (
     <div className={styles.fieldChange}>

diff --git a/packages/@sanity/desk-tool/src/panes/documentPane/changesPanel/types.ts b/packages/@sanity/desk-tool/src/panes/documentPane/changesPanel/types.ts
@@ -1,4 +1,4 @@
-import {Diff, Path, SchemaType} from '@sanity/field/diff'
+import {Diff, Path, SchemaType, DiffComponent} from '@sanity/field/diff'
 
 export interface OperationsAPI {
   patch: {
@@ -41,6 +41,7 @@ export interface FieldChangeNode {
   path: Path
   titlePath: ChangeTitlePath
   schemaType: SchemaType
+  diffComponent?: DiffComponent
 }
 
 export type ChangeNode = GroupChangeNode | FieldChangeNode