Merge branch 'main' of https://github.com/ueberdosis/tiptap
# Conflicts: # packages/react/src/NodeViewContent.tsx # packages/react/src/NodeViewWrapper.tsx
This commit is contained in:
@@ -9,14 +9,14 @@ export const NodeViewContent: React.FC<NodeViewContentProps> = React.forwardRef(
|
||||
const Tag = props.as || 'div'
|
||||
|
||||
return (
|
||||
<Tag
|
||||
{...props}
|
||||
ref={ref}
|
||||
data-node-view-content=""
|
||||
style={{
|
||||
...props.style,
|
||||
whiteSpace: 'pre-wrap',
|
||||
}}
|
||||
/>
|
||||
<Tag
|
||||
{...props}
|
||||
ref={ref}
|
||||
data-node-view-content=""
|
||||
style={{
|
||||
...props.style,
|
||||
whiteSpace: 'pre-wrap',
|
||||
}}
|
||||
/>
|
||||
)
|
||||
})
|
||||
|
||||
@@ -11,15 +11,15 @@ export const NodeViewWrapper: React.FC<NodeViewWrapperProps> = React.forwardRef(
|
||||
const Tag = props.as || 'div'
|
||||
|
||||
return (
|
||||
<Tag
|
||||
{...props}
|
||||
ref={ref}
|
||||
data-node-view-wrapper=""
|
||||
onDragStart={onDragStart}
|
||||
style={{
|
||||
...props.style,
|
||||
whiteSpace: 'normal',
|
||||
}}
|
||||
/>
|
||||
<Tag
|
||||
{...props}
|
||||
ref={ref}
|
||||
data-node-view-wrapper=""
|
||||
onDragStart={onDragStart}
|
||||
style={{
|
||||
...props.style,
|
||||
whiteSpace: 'normal',
|
||||
}}
|
||||
/>
|
||||
)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user