Skip to content

Commit e18dc72

Browse files
committedJul 12, 2021
refactor(field): migrate ptdiff block to @ssanity/ui
1 parent 53c1258 commit e18dc72

File tree

2 files changed

+21
-41
lines changed

2 files changed

+21
-41
lines changed
 

‎packages/@sanity/field/src/types/portableText/diff/components/Block.css

-25
This file was deleted.

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

+21-16
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, {useCallback} from 'react'
22
import {ConnectorContext} from '@sanity/base/lib/change-indicators'
3+
import {Box, Card, Stack, Text} from '@sanity/ui'
34
import {DiffContext, DiffTooltip, useDiffAnnotationColor} from '../../../../diff'
45
import {isHeader} from '../helpers'
56
import {PortableTextBlock, PortableTextDiff} from '../types'
6-
import styles from './Block.css'
77
import Blockquote from './Blockquote'
88
import Header from './Header'
99
import Paragraph from './Paragraph'
@@ -18,11 +18,6 @@ export default function Block({
1818
children: JSX.Element
1919
}): JSX.Element {
2020
const color = useDiffAnnotationColor(diff, [])
21-
const classNames = [
22-
styles.root,
23-
styles[diff.action],
24-
`style_${diff.displayValue.style || 'undefined'}`,
25-
]
2621
const {path: fullPath} = React.useContext(DiffContext)
2722
const {onSetFocus} = React.useContext(ConnectorContext)
2823
const isRemoved = diff.action === 'removed'
@@ -54,27 +49,37 @@ export default function Block({
5449
diff.origin.fields.style.action === 'changed' &&
5550
diff.origin.fields.style.annotation
5651
) {
57-
fromStyle = diff.origin.fromValue.style
58-
classNames.push(`changed_from_style_${fromStyle || 'undefined'}`)
52+
fromStyle = diff?.origin?.fromValue?.style
5953
const style = color ? {background: color.background, color: color.text} : {}
6054

6155
returned = (
62-
<div className={styles.styleIsChanged}>
63-
<div className={styles.changedBlockStyleNotice}>
56+
<Card
57+
padding={3}
58+
border
59+
radius={2}
60+
style={{borderStyle: 'dotted'}}
61+
diff-block-action={diff.action}
62+
data-block-note={`changed_from_style_${fromStyle || 'undefined'}`}
63+
>
64+
<Stack space={2}>
6465
<DiffTooltip
65-
annotations={[diff.origin.fields.style.annotation]}
66+
annotations={[diff.origin.fields.style?.annotation]}
6667
diff={diff.origin.fields.style}
6768
>
68-
<div>Changed block style from '{fromStyle}'</div>
69+
<Text size={0}>Changed block style from '{fromStyle}'</Text>
6970
</DiffTooltip>
70-
</div>
71-
<div style={style}>{returned}</div>
72-
</div>
71+
<Box style={style}>{returned}</Box>
72+
</Stack>
73+
</Card>
7374
)
7475
}
7576

7677
return (
77-
<div onClick={handleClick} className={classNames.join(' ')}>
78+
<div
79+
onClick={handleClick}
80+
diff-block-action={diff.action}
81+
data-block-note={`changed_from_style_${fromStyle || 'undefined'}`}
82+
>
7883
{returned}
7984
</div>
8085
)

0 commit comments

Comments
 (0)
Please sign in to comment.