From d27ec18a65be51db7c0fb04722a73e4493f665c4 Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Tue, 5 Apr 2022 11:52:24 +0800
Subject: [PATCH] fix: disable editing after collapse/expand through block
 controls

---
 e2e-tests/editor.spec.ts                | 6 +++---
 src/main/frontend/components/block.cljs | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/e2e-tests/editor.spec.ts b/e2e-tests/editor.spec.ts
index 3d7c86c00..aa6f65965 100644
--- a/e2e-tests/editor.spec.ts
+++ b/e2e-tests/editor.spec.ts
@@ -77,9 +77,6 @@ test('disappeared children #4814', async ({ page }) => {
     await enterNextBlock(page)
   }
 
-  // edit the first block
-  await editFirstBlock(page)
-
   // collapse
   await page.click('.block-control >> nth=0')
 
@@ -87,6 +84,9 @@ test('disappeared children #4814', async ({ page }) => {
   await page.click('.block-control >> nth=0')
 
   await page.waitForSelector('.ls-block >> nth=6') // 7 blocks
+
+  // Ensures there's no active editor
+  await expect(page.locator('.editor-inner')).toHaveCount(0, {timeout: 500})
 })
 
 // FIXME: ClipboardItem is not defined when running with this test
diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index 634bd301c..f5506f7d6 100644
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -1415,6 +1415,7 @@
       {:id (str "control-" uuid)
        :on-click (fn [event]
                    (util/stop event)
+                   (state/clear-edit!)
                    (if ref?
                      (state/toggle-collapsed-block! uuid)
                      (if collapsed?