From ec36e21f926b98b2b078add62887754178d69ed4 Mon Sep 17 00:00:00 2001 From: zhizhi Date: Mon, 13 Jan 2025 11:52:23 +0800 Subject: [PATCH 1/6] fix: supplement of (fix: Prevent ReactEditor.toDOMRange crash in setDomSelection #5741) --- packages/slate-dom/src/plugin/with-dom.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/slate-dom/src/plugin/with-dom.ts b/packages/slate-dom/src/plugin/with-dom.ts index bf6efb7409..d693ba4598 100644 --- a/packages/slate-dom/src/plugin/with-dom.ts +++ b/packages/slate-dom/src/plugin/with-dom.ts @@ -210,7 +210,10 @@ export const withDOM = ( case 'remove_node': case 'merge_node': case 'move_node': - case 'split_node': { + case 'split_node': + case 'insert_text': + case 'remove_text': + case 'set_selection': { IS_NODE_MAP_DIRTY.set(e, true) } } From 4de9d86b7ba7022860cab651f88dd024f77f43fe Mon Sep 17 00:00:00 2001 From: Dylan Schiemann Date: Sun, 19 Jan 2025 21:05:26 -0700 Subject: [PATCH 2/6] Update packages/slate-dom/src/plugin/with-dom.ts --- packages/slate-dom/src/plugin/with-dom.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/slate-dom/src/plugin/with-dom.ts b/packages/slate-dom/src/plugin/with-dom.ts index d693ba4598..e4c91e2b1c 100644 --- a/packages/slate-dom/src/plugin/with-dom.ts +++ b/packages/slate-dom/src/plugin/with-dom.ts @@ -214,6 +214,7 @@ export const withDOM = ( case 'insert_text': case 'remove_text': case 'set_selection': { + // FIXME: Rename to something like IS_DOM_EDITOR_DESYNCED to better reflect reality, see #5792 IS_NODE_MAP_DIRTY.set(e, true) } } From 589c608480e6afb336ee1bb50bd9bbf937973085 Mon Sep 17 00:00:00 2001 From: Dylan Schiemann Date: Sun, 19 Jan 2025 21:06:00 -0700 Subject: [PATCH 3/6] Update packages/slate-dom/src/plugin/with-dom.ts --- packages/slate-dom/src/plugin/with-dom.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/slate-dom/src/plugin/with-dom.ts b/packages/slate-dom/src/plugin/with-dom.ts index e4c91e2b1c..12b24cfcd2 100644 --- a/packages/slate-dom/src/plugin/with-dom.ts +++ b/packages/slate-dom/src/plugin/with-dom.ts @@ -214,7 +214,8 @@ export const withDOM = ( case 'insert_text': case 'remove_text': case 'set_selection': { - // FIXME: Rename to something like IS_DOM_EDITOR_DESYNCED to better reflect reality, see #5792 + // FIXME: Rename to something like IS_DOM_EDITOR_DESYNCED + // to better reflect reality, see #5792 IS_NODE_MAP_DIRTY.set(e, true) } } From 0fb2fe56fa96eda4e68761d6e2f015b080bc673d Mon Sep 17 00:00:00 2001 From: Dylan Schiemann Date: Sun, 19 Jan 2025 21:07:05 -0700 Subject: [PATCH 4/6] Create gold-tomatoes-grab.md --- .changeset/gold-tomatoes-grab.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/gold-tomatoes-grab.md diff --git a/.changeset/gold-tomatoes-grab.md b/.changeset/gold-tomatoes-grab.md new file mode 100644 index 0000000000..0707d2e68a --- /dev/null +++ b/.changeset/gold-tomatoes-grab.md @@ -0,0 +1,5 @@ +--- +'slate-dom': patch +--- + +fix: additional fix for previous fix: Prevent ReactEditor.toDOMRange crash in setDomSelection #5741 From 8ec28a10207b28c4995ed216d2332f045dc00a00 Mon Sep 17 00:00:00 2001 From: Dylan Schiemann Date: Mon, 27 Jan 2025 06:48:36 -0700 Subject: [PATCH 5/6] Update packages/slate-dom/src/plugin/with-dom.ts --- packages/slate-dom/src/plugin/with-dom.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/slate-dom/src/plugin/with-dom.ts b/packages/slate-dom/src/plugin/with-dom.ts index 12b24cfcd2..43222116d6 100644 --- a/packages/slate-dom/src/plugin/with-dom.ts +++ b/packages/slate-dom/src/plugin/with-dom.ts @@ -214,7 +214,7 @@ export const withDOM = ( case 'insert_text': case 'remove_text': case 'set_selection': { - // FIXME: Rename to something like IS_DOM_EDITOR_DESYNCED + // FIXME: Rename to something like IS_DOM_EDITOR_DESYNCED // to better reflect reality, see #5792 IS_NODE_MAP_DIRTY.set(e, true) } From fe9110c86987f05e20d1a0ae928fcd0d3cdab739 Mon Sep 17 00:00:00 2001 From: Dylan Schiemann Date: Mon, 27 Jan 2025 06:58:23 -0700 Subject: [PATCH 6/6] Update packages/slate-dom/src/plugin/with-dom.ts --- packages/slate-dom/src/plugin/with-dom.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/slate-dom/src/plugin/with-dom.ts b/packages/slate-dom/src/plugin/with-dom.ts index 43222116d6..474ed12fac 100644 --- a/packages/slate-dom/src/plugin/with-dom.ts +++ b/packages/slate-dom/src/plugin/with-dom.ts @@ -215,7 +215,7 @@ export const withDOM = ( case 'remove_text': case 'set_selection': { // FIXME: Rename to something like IS_DOM_EDITOR_DESYNCED - // to better reflect reality, see #5792 + // to better reflect reality, see #5792 IS_NODE_MAP_DIRTY.set(e, true) } }