Merge branch 'main' of github.com:ueberdosis/tiptap into add-empty-editor-class-to-root-div

packages/extension-placeholder/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0-beta.53](https://github.com/ueberdosis/tiptap/compare/@tiptap/extension-placeholder@2.0.0-beta.52...@tiptap/extension-placeholder@2.0.0-beta.53) (2022-06-27)
+
+**Note:** Version bump only for package @tiptap/extension-placeholder
+
+
+
+
+
+# [2.0.0-beta.52](https://github.com/ueberdosis/tiptap/compare/@tiptap/extension-placeholder@2.0.0-beta.51...@tiptap/extension-placeholder@2.0.0-beta.52) (2022-06-20)
+
+**Note:** Version bump only for package @tiptap/extension-placeholder
+
+
+
+
+
+# [2.0.0-beta.51](https://github.com/ueberdosis/tiptap/compare/@tiptap/extension-placeholder@2.0.0-beta.49...@tiptap/extension-placeholder@2.0.0-beta.51) (2022-06-17)
+
+
+### Reverts
+
+* Revert "Publish" ([9c38d27](https://github.com/ueberdosis/tiptap/commit/9c38d2713e6feac5645ad9c1bfc57abdbf054576))
+
+
+
+
+
+# [2.0.0-beta.49](https://github.com/ueberdosis/tiptap/compare/@tiptap/extension-placeholder@2.0.0-beta.49...@tiptap/extension-placeholder@2.0.0-beta.49) (2022-06-17)
+
+
+### Reverts
+
+* Revert "Publish" ([9c38d27](https://github.com/ueberdosis/tiptap/commit/9c38d2713e6feac5645ad9c1bfc57abdbf054576))
+
+
+
+
+
 # [2.0.0-beta.48](https://github.com/ueberdosis/tiptap/compare/@tiptap/extension-placeholder@2.0.0-beta.47...@tiptap/extension-placeholder@2.0.0-beta.48) (2022-02-03)
 
 

packages/extension-placeholder/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/extension-placeholder",
   "description": "placeholder extension for tiptap",
-  "version": "2.0.0-beta.48",
+  "version": "2.0.0-beta.53",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -24,9 +24,9 @@
     "@tiptap/core": "^2.0.0-beta.1"
   },
   "dependencies": {
-    "prosemirror-model": "^1.16.1",
-    "prosemirror-state": "^1.3.4",
-    "prosemirror-view": "^1.23.6"
+    "prosemirror-model": "1.18.1",
+    "prosemirror-state": "1.4.1",
+    "prosemirror-view": "1.26.2"
   },
   "repository": {
     "type": "git",

packages/extension-placeholder/src/placeholder.ts

@@ -1,7 +1,7 @@
 import { Editor, Extension } from '@tiptap/core'
 import { Node as ProsemirrorNode } from 'prosemirror-model'
-import { Decoration, DecorationSet } from 'prosemirror-view'
 import { Plugin } from 'prosemirror-state'
+import { Decoration, DecorationSet } from 'prosemirror-view'
 
 export interface PlaceholderOptions {
   emptyEditorClass: string,
@@ -42,7 +42,7 @@ export const Placeholder = Extension.create<PlaceholderOptions>({
             const decorations: Decoration[] = []
 
             if (!active) {
-              return
+              return null
             }
 
             cachedEmptyTopNode = cachedEmptyTopNode || doc.type.createAndFill()