From 5be428a0b31cd368abb38715182d569f98d06592 Mon Sep 17 00:00:00 2001
From: Sunny Hirai <thesunny@gmail.com>
Date: Sat, 20 Mar 2021 13:47:33 -0700
Subject: [PATCH] Enable Extending `Editor` types in TypeScript (#4133)

* Change HistoryEditor from type to interface

* v0.60.8

* v0.60.9

* Have ReactEditor and HistoryEditor extend BaseEditor instead of Editor

* v0.60.10
---
 lerna.json                                      | 2 +-
 packages/slate-history/package.json             | 6 +++---
 packages/slate-history/src/history-editor.ts    | 4 ++--
 packages/slate-hyperscript/package.json         | 4 ++--
 packages/slate-react/package.json               | 8 ++++----
 packages/slate-react/src/plugin/react-editor.ts | 4 ++--
 packages/slate/package.json                     | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lerna.json b/lerna.json
index 3a2ee4506..170a5b11d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "2.7.1",
-  "version": "0.60.7",
+  "version": "0.60.10",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/slate-history/package.json b/packages/slate-history/package.json
index 46eaf8df2..d577946d7 100644
--- a/packages/slate-history/package.json
+++ b/packages/slate-history/package.json
@@ -1,7 +1,7 @@
 {
   "name": "slate-history",
   "description": "An operation-based history implementation for Slate editors.",
-  "version": "0.60.7",
+  "version": "0.60.10",
   "license": "MIT",
   "repository": "git://github.com/ianstormtaylor/slate.git",
   "main": "dist/index.js",
@@ -18,8 +18,8 @@
     "is-plain-object": "^3.0.0"
   },
   "devDependencies": {
-    "slate": "^0.60.7",
-    "slate-hyperscript": "^0.60.7"
+    "slate": "^0.60.9",
+    "slate-hyperscript": "^0.60.9"
   },
   "peerDependencies": {
     "slate": ">=0.55.0"
diff --git a/packages/slate-history/src/history-editor.ts b/packages/slate-history/src/history-editor.ts
index 8342d291c..6b0bb0a87 100644
--- a/packages/slate-history/src/history-editor.ts
+++ b/packages/slate-history/src/history-editor.ts
@@ -1,4 +1,4 @@
-import { Editor } from 'slate'
+import { BaseEditor, Editor } from 'slate'
 import { History } from './history'
 
 /**
@@ -13,7 +13,7 @@ export const MERGING = new WeakMap<Editor, boolean | undefined>()
  * `HistoryEditor` contains helpers for history-enabled editors.
  */
 
-export type HistoryEditor = Editor & {
+export interface HistoryEditor extends BaseEditor {
   history: History
   undo: () => void
   redo: () => void
diff --git a/packages/slate-hyperscript/package.json b/packages/slate-hyperscript/package.json
index b3a32fb72..b00e27d6f 100644
--- a/packages/slate-hyperscript/package.json
+++ b/packages/slate-hyperscript/package.json
@@ -1,7 +1,7 @@
 {
   "name": "slate-hyperscript",
   "description": "A hyperscript helper for creating Slate documents.",
-  "version": "0.60.7",
+  "version": "0.60.9",
   "license": "MIT",
   "repository": "git://github.com/ianstormtaylor/slate.git",
   "main": "dist/index.js",
@@ -17,7 +17,7 @@
     "is-plain-object": "^3.0.0"
   },
   "devDependencies": {
-    "slate": "^0.60.7"
+    "slate": "^0.60.9"
   },
   "peerDependencies": {
     "slate": ">=0.55.0"
diff --git a/packages/slate-react/package.json b/packages/slate-react/package.json
index d38ab0f05..6d5ff1c20 100644
--- a/packages/slate-react/package.json
+++ b/packages/slate-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "slate-react",
   "description": "Tools for building completely customizable richtext editors with React.",
-  "version": "0.60.7",
+  "version": "0.60.10",
   "license": "MIT",
   "repository": "git://github.com/ianstormtaylor/slate.git",
   "main": "dist/index.js",
@@ -23,9 +23,9 @@
     "scroll-into-view-if-needed": "^2.2.20"
   },
   "devDependencies": {
-    "slate": "^0.60.7",
-    "slate-history": "^0.60.7",
-    "slate-hyperscript": "^0.60.7"
+    "slate": "^0.60.9",
+    "slate-history": "^0.60.10",
+    "slate-hyperscript": "^0.60.9"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
diff --git a/packages/slate-react/src/plugin/react-editor.ts b/packages/slate-react/src/plugin/react-editor.ts
index 656d229e2..b2f8ba460 100644
--- a/packages/slate-react/src/plugin/react-editor.ts
+++ b/packages/slate-react/src/plugin/react-editor.ts
@@ -1,4 +1,4 @@
-import { Editor, Node, Path, Point, Range, Transforms, Descendant } from 'slate'
+import { Editor, Node, Path, Point, Range, Transforms, BaseEditor } from 'slate'
 
 import { Key } from '../utils/key'
 import {
@@ -28,7 +28,7 @@ import {
  * A React and DOM-specific version of the `Editor` interface.
  */
 
-export interface ReactEditor extends Editor {
+export interface ReactEditor extends BaseEditor {
   insertData: (data: DataTransfer) => void
   setFragmentData: (data: DataTransfer) => void
 }
diff --git a/packages/slate/package.json b/packages/slate/package.json
index 35a79c26c..685626d54 100644
--- a/packages/slate/package.json
+++ b/packages/slate/package.json
@@ -1,7 +1,7 @@
 {
   "name": "slate",
   "description": "A completely customizable framework for building rich text editors.",
-  "version": "0.60.7",
+  "version": "0.60.9",
   "license": "MIT",
   "repository": "git://github.com/ianstormtaylor/slate.git",
   "main": "dist/index.js",