fix(prosemirror-model): multiple versions of prosemirror-model, fixed #…

…29
donotebase · Aug 22, 2020 · a293fd1 · a293fd1
1 parent c693fac
commit a293fd1
Show file tree

Hide file tree

Showing 4 changed files with 3,093 additions and 2,836 deletions.
diff --git a/package.json b/package.json
@@ -76,7 +76,8 @@
     "last 1 version, not dead, ie >= 11"
   ],
   "resolutions": {
-    "@babel/parser": "7.7.5"
+    "@babel/parser": "7.7.5",
+    "prosemirror-model": "1.9.1"
   },
   "repository": {
     "type": "git",

diff --git a/src/components/views/OImageView.vue b/src/components/views/OImageView.vue
@@ -330,6 +330,7 @@ export default {
   .o-image-view {
     position relative
     display inline-block
+    white-space nowrap
 
     .o-toolbar {
       position absolute

diff --git a/src/css/tiptap.styl b/src/css/tiptap.styl
@@ -9,10 +9,6 @@
     outline none
   }
 
-  .ProseMirror {
-    white-space unset
-  }
-
   blockquote,
   h1,
   h2,
@@ -220,6 +216,10 @@
     word-wrap: break-word;
     word-break: break-word;
     padding 1rem
+
+    .ProseMirror {
+      white-space pre-wrap
+    }
   }
 
   .editor__content * {