fix(blocklist): Show selected block words if balloon is opened with k…

…eyboard shortcut.
CoreMedia · Nov 1, 2023 · 0dc2a58 · 0dc2a58
1 parent cf65d08
commit 0dc2a58
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/itest/src/BlocklistExpandedKeyboard.test.ts b/itest/src/BlocklistExpandedKeyboard.test.ts
@@ -53,7 +53,7 @@ describe("Blocklist", () => {
       await expect(input).not.waitToBeVisible();
 
       await useOpenBlocklistShortcut();
-      await expect(input).waitToBeVisible();
+      await expect(view.body.balloonPanel.blocklistActionsView).waitToBeVisible();
       const allBlockedWords = await blocklistActionsView.allBlockedWords;
       await expect(allBlockedWords.length).toBe(2);
       await expect(allBlockedWords).toContain(blockedWord.toLowerCase());
@@ -66,5 +66,5 @@ const useOpenBlocklistShortcut = async () => {
   // Open Blocklist Balloon via Shortcut
   await page.keyboard.down(await ctrlOrMeta());
   await page.keyboard.down("Shift");
-  await page.keyboard.press("B");
+  await page.keyboard.press("b");
 };
diff --git a/packages/ckeditor5-coremedia-blocklist/src/blocklistui.ts b/packages/ckeditor5-coremedia-blocklist/src/blocklistui.ts
@@ -303,6 +303,14 @@ export default class Blocklistui extends Plugin {
       cancel();
 
       if (editor.commands.get(BLOCKLIST_COMMAND_NAME)?.isEnabled) {
+        const blockedWords = this.#getSelectedBlocklistWords();
+        if (!blockedWords || blockedWords.length === 0) {
+          this.#showBlocklistBalloon(true);
+          return;
+        }
+
+        // Set the currently selected words in the blocklist command
+        this.blocklistCommand?.set("value", blockedWords);
         this.#showBlocklistBalloon(true);
       }
     });