From 8a5b3cf67ad88f8cb3a5f85451ccfae5e33a9964 Mon Sep 17 00:00:00 2001
From: Shaun Tan <35413456+EvitanRelta@users.noreply.github.com>
Date: Tue, 21 Jun 2022 01:41:33 +0800
Subject: [PATCH] Prevent overriding 'whiteSpace' styling for NodeView React
 components (#2884)

Fixes ueberdosis/tiptap#2883
---
 packages/react/src/NodeViewContent.tsx | 2 +-
 packages/react/src/NodeViewWrapper.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/NodeViewContent.tsx b/packages/react/src/NodeViewContent.tsx
index 01089cd4..61fda9a0 100644
--- a/packages/react/src/NodeViewContent.tsx
+++ b/packages/react/src/NodeViewContent.tsx
@@ -17,8 +17,8 @@ export const NodeViewContent: React.FC<NodeViewContentProps> = props => {
       ref={nodeViewContentRef}
       data-node-view-content=""
       style={{
-        ...props.style,
         whiteSpace: 'pre-wrap',
+        ...props.style,
       }}
     />
   )
diff --git a/packages/react/src/NodeViewWrapper.tsx b/packages/react/src/NodeViewWrapper.tsx
index 971a9c8e..c5a19e40 100644
--- a/packages/react/src/NodeViewWrapper.tsx
+++ b/packages/react/src/NodeViewWrapper.tsx
@@ -18,8 +18,8 @@ export const NodeViewWrapper: React.FC<NodeViewWrapperProps> = React.forwardRef(
       data-node-view-wrapper=""
       onDragStart={onDragStart}
       style={{
-        ...props.style,
         whiteSpace: 'normal',
+        ...props.style,
       }}
     />
   )