@jackuait/blok 0.10.0-beta.3 → 0.10.0-beta.5

package/src/components/i18n/locales/th/messages.json

@@ -18,6 +18,8 @@
   "toolNames.numberedList": "รายการแบบตัวเลข",
   "toolNames.todoList": "รายการสิ่งที่ต้องทำ",
   "toolNames.toggleList": "รายการพับได้",
+  "toolNames.board": "บอร์ด",
+  "toolNames.database": "ฐานข้อมูล",
   "tools.link.addLink": "เพิ่มลิงก์",
   "tools.link.invalidLink": "ลิงก์ไม่ถูกต้อง",
   "tools.marker.textColor": "ข้อความ",
@@ -141,6 +143,20 @@
   "tools.callout.emojiCategoryObjects": "วัตถุ",
   "tools.callout.emojiCategorySymbols": "สัญลักษณ์",
   "tools.callout.emojiCategoryFlags": "ธง",
+  "tools.database.addCard": "เพิ่มการ์ด",
+  "tools.database.newPage": "หน้าใหม่",
+  "tools.database.addColumn": "เพิ่มคอลัมน์",
+  "tools.database.cardTitlePlaceholder": "หน้าเปล่า",
+  "tools.database.columnTitlePlaceholder": "คอลัมน์",
+  "tools.database.deleteCard": "ลบการ์ด",
+  "tools.database.deleteColumn": "ลบคอลัมน์",
+  "tools.database.emptyColumn": "ไม่มีการ์ด",
+  "tools.database.rowTitlePlaceholder": "หน้าเปล่า",
+  "tools.database.addRow": "เพิ่มแถว",
+  "tools.database.newRow": "แถวใหม่",
+  "tools.database.openRow": "เปิดแถว",
+  "tools.database.deleteRow": "ลบแถว",
+  "tools.database.renameColumn": "เปลี่ยนชื่อคอลัมน์",
   "tools.callout.color": "สี",
   "tools.callout.colorDefault": "ค่าเริ่มต้น",
   "tools.callout.colorGray": "สีเทา",

package/src/components/i18n/locales/tr/messages.json

@@ -18,6 +18,8 @@
   "toolNames.numberedList": "Numaralı liste",
   "toolNames.todoList": "Yapılacaklar listesi",
   "toolNames.toggleList": "Açılır liste",
+  "toolNames.board": "Pano",
+  "toolNames.database": "Veritabanı",
   "tools.link.addLink": "Bağlantı ekle",
   "tools.link.invalidLink": "Geçersiz bağlantı",
   "tools.marker.textColor": "Metin",
@@ -141,6 +143,20 @@
   "tools.callout.emojiCategoryObjects": "Nesneler",
   "tools.callout.emojiCategorySymbols": "Semboller",
   "tools.callout.emojiCategoryFlags": "Bayraklar",
+  "tools.database.addCard": "Kart ekle",
+  "tools.database.newPage": "Yeni sayfa",
+  "tools.database.addColumn": "Sütun ekle",
+  "tools.database.cardTitlePlaceholder": "Boş sayfa",
+  "tools.database.columnTitlePlaceholder": "Sütun",
+  "tools.database.deleteCard": "Kartı sil",
+  "tools.database.deleteColumn": "Sütunu sil",
+  "tools.database.emptyColumn": "Kart yok",
+  "tools.database.rowTitlePlaceholder": "Boş sayfa",
+  "tools.database.addRow": "Satır ekle",
+  "tools.database.newRow": "Yeni satır",
+  "tools.database.openRow": "Satırı aç",
+  "tools.database.deleteRow": "Satırı sil",
+  "tools.database.renameColumn": "Sütunu yeniden adlandır",
   "tools.callout.color": "Renk",
   "tools.callout.colorDefault": "Varsayılan",
   "tools.callout.colorGray": "Gri",

package/src/components/i18n/locales/ug/messages.json

@@ -18,6 +18,8 @@
   "toolNames.numberedList": "نومۇرلۇق تىزىملىك",
   "toolNames.todoList": "ۋەزىپە تىزىملىكى",
   "toolNames.toggleList": "يىغىلما تىزىملىك",
+  "toolNames.board": "تاختا",
+  "toolNames.database": "سانداق",
   "tools.link.addLink": "ئۇلانما قوشۇش",
   "tools.link.invalidLink": "ئىناۋەتسىز ئۇلانما",
   "tools.marker.textColor": "تېكىست",
@@ -141,6 +143,20 @@
   "tools.callout.emojiCategoryObjects": "نەرسىلەر",
   "tools.callout.emojiCategorySymbols": "بەلگىلەر",
   "tools.callout.emojiCategoryFlags": "بايراقلار",
+  "tools.database.addCard": "كارتا قوشۇش",
+  "tools.database.newPage": "يېڭى بەت",
+  "tools.database.addColumn": "ئىستون قوشۇش",
+  "tools.database.cardTitlePlaceholder": "بوش بەت",
+  "tools.database.columnTitlePlaceholder": "ئىستون",
+  "tools.database.deleteCard": "كارتىنى ئۆچۈرۈش",
+  "tools.database.deleteColumn": "ئىستوننى ئۆچۈرۈش",
+  "tools.database.emptyColumn": "كارتا يوق",
+  "tools.database.rowTitlePlaceholder": "بوش بەت",
+  "tools.database.addRow": "قۇر قوشۇش",
+  "tools.database.newRow": "يېڭى قۇر",
+  "tools.database.openRow": "قۇرنى ئېچىش",
+  "tools.database.deleteRow": "قۇرنى ئۆچۈرۈش",
+  "tools.database.renameColumn": "ئىستون نامىنى ئۆزگەرتىش",
   "tools.callout.color": "رەڭ",
   "tools.callout.colorDefault": "سۈكۈتتىكى",
   "tools.callout.colorGray": "كۈلرەڭ",

package/src/components/i18n/locales/uk/messages.json

@@ -18,6 +18,8 @@
   "toolNames.numberedList": "Нумерований список",
   "toolNames.todoList": "Список справ",
   "toolNames.toggleList": "Згортний список",
+  "toolNames.board": "Дошка",
+  "toolNames.database": "База даних",
   "tools.link.addLink": "Додати посилання",
   "tools.link.invalidLink": "Недійсне посилання",
   "tools.marker.textColor": "Текст",
@@ -141,6 +143,20 @@
   "tools.callout.emojiCategoryObjects": "Об'єкти",
   "tools.callout.emojiCategorySymbols": "Символи",
   "tools.callout.emojiCategoryFlags": "Прапори",
+  "tools.database.addCard": "Додати картку",
+  "tools.database.newPage": "Нова сторінка",
+  "tools.database.addColumn": "Додати стовпець",
+  "tools.database.cardTitlePlaceholder": "Порожня сторінка",
+  "tools.database.columnTitlePlaceholder": "Стовпець",
+  "tools.database.deleteCard": "Видалити картку",
+  "tools.database.deleteColumn": "Видалити стовпець",
+  "tools.database.emptyColumn": "Немає карток",
+  "tools.database.rowTitlePlaceholder": "Порожня сторінка",
+  "tools.database.addRow": "Додати рядок",
+  "tools.database.newRow": "Новий рядок",
+  "tools.database.openRow": "Відкрити рядок",
+  "tools.database.deleteRow": "Видалити рядок",
+  "tools.database.renameColumn": "Перейменувати стовпець",
   "tools.callout.color": "Колір",
   "tools.callout.colorDefault": "за замовчуванням",
   "tools.callout.colorGray": "Сірий",

package/src/components/i18n/locales/ur/messages.json

@@ -18,6 +18,8 @@
   "toolNames.numberedList": "نمبر فہرست",
   "toolNames.todoList": "کام کی فہرست",
   "toolNames.toggleList": "ٹوگل فہرست",
+  "toolNames.board": "بورڈ",
+  "toolNames.database": "ڈیٹابیس",
   "tools.link.addLink": "لنک شامل کریں",
   "tools.link.invalidLink": "غلط لنک",
   "tools.marker.textColor": "متن",
@@ -141,6 +143,20 @@
   "tools.callout.emojiCategoryObjects": "اشیاء",
   "tools.callout.emojiCategorySymbols": "علامات",
   "tools.callout.emojiCategoryFlags": "جھنڈے",
+  "tools.database.addCard": "کارڈ شامل کریں",
+  "tools.database.newPage": "نیا صفحہ",
+  "tools.database.addColumn": "کالم شامل کریں",
+  "tools.database.cardTitlePlaceholder": "خالی صفحہ",
+  "tools.database.columnTitlePlaceholder": "کالم",
+  "tools.database.deleteCard": "کارڈ حذف کریں",
+  "tools.database.deleteColumn": "کالم حذف کریں",
+  "tools.database.emptyColumn": "کوئی کارڈ نہیں",
+  "tools.database.rowTitlePlaceholder": "خالی صفحہ",
+  "tools.database.addRow": "قطار شامل کریں",
+  "tools.database.newRow": "نئی قطار",
+  "tools.database.openRow": "قطار کھولیں",
+  "tools.database.deleteRow": "قطار حذف کریں",
+  "tools.database.renameColumn": "کالم کا نام بدلیں",
   "tools.callout.color": "رنگ",
   "tools.callout.colorDefault": "طے شدہ",
   "tools.callout.colorGray": "سرمئی",

package/src/components/i18n/locales/vi/messages.json

@@ -18,6 +18,8 @@
   "toolNames.numberedList": "Danh sách đánh số",
   "toolNames.todoList": "Danh sách việc cần làm",
   "toolNames.toggleList": "Danh sách thu gọn",
+  "toolNames.board": "Bảng",
+  "toolNames.database": "Cơ sở dữ liệu",
   "tools.link.addLink": "Thêm liên kết",
   "tools.link.invalidLink": "Liên kết không hợp lệ",
   "tools.marker.textColor": "Chữ",
@@ -141,6 +143,20 @@
   "tools.callout.emojiCategoryObjects": "Đồ vật",
   "tools.callout.emojiCategorySymbols": "Biểu tượng",
   "tools.callout.emojiCategoryFlags": "Cờ",
+  "tools.database.addCard": "Thêm thẻ",
+  "tools.database.newPage": "Trang mới",
+  "tools.database.addColumn": "Thêm cột",
+  "tools.database.cardTitlePlaceholder": "Trang trống",
+  "tools.database.columnTitlePlaceholder": "Cột",
+  "tools.database.deleteCard": "Xóa thẻ",
+  "tools.database.deleteColumn": "Xóa cột",
+  "tools.database.emptyColumn": "Không có thẻ",
+  "tools.database.rowTitlePlaceholder": "Trang trống",
+  "tools.database.addRow": "Thêm hàng",
+  "tools.database.newRow": "Hàng mới",
+  "tools.database.openRow": "Mở hàng",
+  "tools.database.deleteRow": "Xóa hàng",
+  "tools.database.renameColumn": "Đổi tên cột",
   "tools.callout.color": "Màu",
   "tools.callout.colorDefault": "Mặc định",
   "tools.callout.colorGray": "Xám",

package/src/components/i18n/locales/yi/messages.json

@@ -18,6 +18,8 @@
   "toolNames.numberedList": "נומעריקע ליסטע",
   "toolNames.todoList": "צו-טאָן ליסטע",
   "toolNames.toggleList": "אויפֿקלאַפּ ליסטע",
+  "toolNames.board": "טאָוול",
+  "toolNames.database": "דאַטאַבאַנק",
   "tools.link.addLink": "צולייגן לינק",
   "tools.link.invalidLink": "אומגילטיקער לינק",
   "tools.marker.textColor": "טעקסט",
@@ -141,6 +143,20 @@
   "tools.callout.emojiCategoryObjects": "זאַכן",
   "tools.callout.emojiCategorySymbols": "סימבאָלן",
   "tools.callout.emojiCategoryFlags": "פֿאָנען",
+  "tools.database.addCard": "צוגעבן קאַרטל",
+  "tools.database.newPage": "נייע בלאט",
+  "tools.database.addColumn": "צוגעבן שפּאַלט",
+  "tools.database.cardTitlePlaceholder": "ליידיק בלאַט",
+  "tools.database.columnTitlePlaceholder": "שפּאַלט",
+  "tools.database.deleteCard": "אויסמעקן קאַרטל",
+  "tools.database.deleteColumn": "אויסמעקן שפּאַלט",
+  "tools.database.emptyColumn": "קיין קארטן",
+  "tools.database.rowTitlePlaceholder": "ליידיק בלאַט",
+  "tools.database.addRow": "צוגעבן שורה",
+  "tools.database.newRow": "נייע שורה",
+  "tools.database.openRow": "עפֿענען שורה",
+  "tools.database.deleteRow": "אויסמעקן שורה",
+  "tools.database.renameColumn": "באַנענען שפּאַלט",
   "tools.callout.color": "קאָליר",
   "tools.callout.colorDefault": "שטאַנדאַרד",
   "tools.callout.colorGray": "גרוי",

package/src/components/i18n/locales/zh/messages.json

@@ -18,6 +18,8 @@
   "toolNames.numberedList": "有序列表",
   "toolNames.todoList": "清单",
   "toolNames.toggleList": "折叠列表",
+  "toolNames.board": "看板",
+  "toolNames.database": "数据库",
   "tools.link.addLink": "添加链接",
   "tools.link.invalidLink": "链接无效",
   "tools.marker.textColor": "文字",
@@ -141,6 +143,20 @@
   "tools.callout.emojiCategoryObjects": "物品",
   "tools.callout.emojiCategorySymbols": "符号",
   "tools.callout.emojiCategoryFlags": "旗帜",
+  "tools.database.addCard": "添加卡片",
+  "tools.database.newPage": "新页面",
+  "tools.database.addColumn": "添加列",
+  "tools.database.cardTitlePlaceholder": "空白页面",
+  "tools.database.columnTitlePlaceholder": "列",
+  "tools.database.deleteCard": "删除卡片",
+  "tools.database.deleteColumn": "删除列",
+  "tools.database.emptyColumn": "没有卡片",
+  "tools.database.rowTitlePlaceholder": "空白页面",
+  "tools.database.addRow": "添加行",
+  "tools.database.newRow": "新行",
+  "tools.database.openRow": "打开行",
+  "tools.database.deleteRow": "删除行",
+  "tools.database.renameColumn": "重命名列",
   "tools.callout.color": "颜色",
   "tools.callout.colorDefault": "默认",
   "tools.callout.colorGray": "灰色",

package/src/components/icons/index.ts

@@ -370,6 +370,13 @@ export const IconCopy = `
 </svg>
 `;
 
+// Pencil/Rename icon
+export const IconPencil = `
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M12.5 5.5l2 2M4.5 13.5l8-8 2 2-8 8H4.5v-2z" stroke="currentColor" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
+`;
+
 // Trash/Delete icon
 export const IconTrash = `
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -547,3 +554,52 @@ export const IconEmojiFlag = `
   <path d="M5 3c2 0 3 1.5 5 1.5S14 3 16 3v8c-2 0-3 1.5-5 1.5S7 11 5 11" stroke="currentColor" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
 `;
+
+export const IconDatabase = `
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <ellipse cx="10" cy="5.5" rx="6" ry="2.5" stroke="currentColor" stroke-width="1.25"/>
+  <path d="M4 5.5v4c0 1.38 2.69 2.5 6 2.5s6-1.12 6-2.5v-4" stroke="currentColor" stroke-width="1.25"/>
+  <path d="M4 9.5v4c0 1.38 2.69 2.5 6 2.5s6-1.12 6-2.5v-4" stroke="currentColor" stroke-width="1.25"/>
+</svg>
+`;
+
+export const IconBoard = `
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect x="3" y="4" width="14" height="12" rx="1.5" stroke="currentColor" stroke-width="1.25"/>
+  <path d="M7.5 4v12M12.5 4v12" stroke="currentColor" stroke-width="1.25"/>
+  <rect x="4.5" y="6" width="1.5" height="2" rx="0.5" fill="currentColor"/>
+  <rect x="4.5" y="9" width="1.5" height="2" rx="0.5" fill="currentColor"/>
+  <rect x="9" y="6" width="1.5" height="2" rx="0.5" fill="currentColor"/>
+  <rect x="14" y="6" width="1.5" height="2" rx="0.5" fill="currentColor"/>
+</svg>
+`;
+
+export const IconGallery = `
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect x="3" y="4" width="6" height="5" rx="1" stroke="currentColor" stroke-width="1.25"/>
+  <rect x="11" y="4" width="6" height="5" rx="1" stroke="currentColor" stroke-width="1.25"/>
+  <rect x="3" y="11" width="6" height="5" rx="1" stroke="currentColor" stroke-width="1.25"/>
+  <rect x="11" y="11" width="6" height="5" rx="1" stroke="currentColor" stroke-width="1.25"/>
+</svg>
+`;
+
+export const IconList = `
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="4.5" cy="6.5" r="1" fill="currentColor"/>
+  <circle cx="4.5" cy="10" r="1" fill="currentColor"/>
+  <circle cx="4.5" cy="13.5" r="1" fill="currentColor"/>
+  <path d="M7.5 6.5h9M7.5 10h9M7.5 13.5h9" stroke="currentColor" stroke-width="1.25" stroke-linecap="round"/>
+</svg>
+`;
+
+// Calendar icon (date property type)
+export const IconCalendar = `
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect x="3" y="4.5" width="14" height="12" rx="1.5" stroke="currentColor" stroke-width="1.25"/>
+  <path d="M3 8.5h14" stroke="currentColor" stroke-width="1.25" stroke-linecap="round"/>
+  <path d="M7 3v3M13 3v3" stroke="currentColor" stroke-width="1.25" stroke-linecap="round"/>
+  <circle cx="7" cy="12" r="1" fill="currentColor"/>
+  <circle cx="10" cy="12" r="1" fill="currentColor"/>
+  <circle cx="13" cy="12" r="1" fill="currentColor"/>
+</svg>
+`;

package/src/components/modules/api/tools.ts

@@ -11,6 +11,25 @@ export class ToolsAPI extends Module {
   public get methods(): ToolsAPIInterface {
     return {
       getBlockTools: () => Array.from(this.Blok.Tools.blockTools.values()),
+      getToolsConfig: () => {
+        const result: ReturnType<ToolsAPIInterface['getToolsConfig']> = {
+          tools: this.config.tools,
+        };
+
+        if (this.config.inlineToolbar !== undefined) {
+          result.inlineToolbar = this.config.inlineToolbar;
+        }
+
+        if (this.config.tunes !== undefined) {
+          result.tunes = this.config.tunes;
+        }
+
+        if (this.config.theme !== undefined) {
+          result.theme = this.config.theme;
+        }
+
+        return result;
+      },
     };
   }
 }

package/src/components/modules/blockEvents/composers/keyboardNavigation.ts

@@ -91,14 +91,14 @@ export class KeyboardNavigation extends BlockEventComposer {
       return;
     }
 
-    const isNavigated = event.shiftKey ? Caret.navigatePrevious(true) : Caret.navigateNext(true);
+    event.shiftKey ? Caret.navigatePrevious(true) : Caret.navigateNext(true);
 
     /**
-     * If we have next Block/input to focus, then focus it. Otherwise, leave native Tab behaviour
+     * Always prevent default Tab behaviour to keep focus inside the editor.
+     * Without this, pressing Tab on the last block of a nested editor (e.g. a
+     * database card drawer) lets the browser move focus out of the editor entirely.
      */
-    if (isNavigated) {
-      event.preventDefault();
-    }
+    event.preventDefault();
   }
 
   /**

package/src/components/modules/blockManager/blockManager.ts

@@ -300,6 +300,17 @@ export class BlockManager extends Module {
       eventsDispatcher: this.eventsDispatcher,
       getBlockIndex: (block) => this.repository.getBlockIndex(block),
       onBlockMutated: this.blockDidMutated.bind(this),
+      shouldHandleEvent: (event: Event) => {
+        const target = event.target;
+
+        if (target instanceof Element) {
+          const closestEditor = target.closest('[data-blok-testid="blok-editor"]');
+
+          return closestEditor === null || closestEditor === this.Blok.UI.nodes.wrapper;
+        }
+
+        return true;
+      },
     });
 
     // Initialize factory

package/src/components/modules/blockManager/event-binder.ts

@@ -51,6 +51,8 @@ export interface BlockEventBinderDependencies {
   getBlockIndex: (block: Block) => number;
   /** Callback when block is mutated */
   onBlockMutated: BlockMutationCallback;
+  /** Check if an event should be handled by this editor instance */
+  shouldHandleEvent?: (event: Event) => boolean;
 }
 
 /**
@@ -76,22 +78,31 @@ export class BlockEventBinder {
    * @param block - Block to bind events to
    */
   public bindBlockEvents(block: Block): void {
-    const { blockEvents, listeners, onBlockMutated, getBlockIndex } = this.dependencies;
+    const { blockEvents, listeners, onBlockMutated, getBlockIndex, shouldHandleEvent } = this.dependencies;
 
     listeners.on(block.holder, 'keydown', (event: Event) => {
       if (event instanceof KeyboardEvent) {
+        if (shouldHandleEvent && !shouldHandleEvent(event)) {
+          return;
+        }
         blockEvents.keydown(event);
       }
     });
 
     listeners.on(block.holder, 'keyup', (event: Event) => {
       if (event instanceof KeyboardEvent) {
+        if (shouldHandleEvent && !shouldHandleEvent(event)) {
+          return;
+        }
         blockEvents.keyup(event);
       }
     });
 
     listeners.on(block.holder, 'input', (event: Event) => {
       if (event instanceof InputEvent) {
+        if (shouldHandleEvent && !shouldHandleEvent(event)) {
+          return;
+        }
         blockEvents.input(event);
       }
     });

package/src/components/modules/themeManager.ts

@@ -108,7 +108,9 @@ export class ThemeManager extends Module {
     }
 
     if (this.mode === 'auto') {
-      this.removeAttribute();
+      if (state.activeInstances <= 1) {
+        this.removeAttribute();
+      }
     } else {
       document.documentElement.setAttribute(ATTR, this.mode);
     }

package/src/components/modules/toolbar/blockSettings.ts

@@ -191,7 +191,6 @@ export class BlockSettings extends Module<BlockSettingsNodes> {
         searchable: true,
         trigger: trigger || this.nodes.wrapper,
         items: await this.getTunesItems(block, commonTunes, toolTunes),
-        scopeElement: this.Blok.API.methods.ui.nodes.redactor,
         messages: {
           nothingFound: this.Blok.I18n.t('popover.nothingFound'),
           search: this.Blok.I18n.t('popover.search'),

package/src/components/modules/toolbar/inline/index.ts

@@ -330,11 +330,8 @@ export class InlineToolbar extends Module<InlineToolbarNodes> {
     const popoverItems = await this.buildPopoverItems();
 
     // Create popover
-    const scopeElement = this.Blok.API?.methods?.ui?.nodes?.redactor ?? this.Blok.UI.nodes.redactor;
-
     this.popover = new PopoverInline({
       items: popoverItems,
-      scopeElement,
       messages: {
         nothingFound: this.Blok.I18n.t('popover.nothingFound'),
         search: this.Blok.I18n.t('popover.search'),

package/src/components/modules/uiControllers/controllers/keyboard.ts

@@ -78,6 +78,21 @@ export class KeyboardController extends Controller {
         return;
       }
 
+      const target = event.target;
+
+      if (target instanceof HTMLInputElement || target instanceof HTMLTextAreaElement) {
+        return;
+      }
+
+      // Skip events from nested editors
+      if (target instanceof Element) {
+        const closestEditor = target.closest('[data-blok-testid="blok-editor"]');
+
+        if (closestEditor !== null && closestEditor !== this.Blok.UI.nodes.wrapper) {
+          return;
+        }
+      }
+
       if (KEYS_REQUIRING_CARET_CAPTURE.has(event.key)) {
         this.Blok.YjsManager.markCaretBeforeChange();
       }
@@ -89,6 +104,20 @@ export class KeyboardController extends Controller {
    * @param event - keyboard event
    */
   private handleKeydown(event: KeyboardEvent): void {
+    const target = event.target;
+
+    if (target instanceof HTMLInputElement || target instanceof HTMLTextAreaElement) {
+      return;
+    }
+
+    if (target instanceof Element) {
+      const closestEditor = target.closest('[data-blok-testid="blok-editor"]');
+
+      if (closestEditor !== null && closestEditor !== this.Blok.UI.nodes.wrapper) {
+        return;
+      }
+    }
+
     const key = event.key ?? '';
 
     switch (key) {

package/src/components/modules/uiControllers/controllers/selection.ts

@@ -167,10 +167,22 @@ export class SelectionController extends Controller {
    * @returns true if current block should be updated
    */
   private shouldUpdateCurrentBlock(): boolean {
+    const focusedElement = Selection.anchorElement;
+
+    if (!focusedElement || !this.wrapperElement) {
+      return false;
+    }
+
     /**
-     * Always update current block when focus moves to a different block.
-     * This handles Tab key navigation, programmatic focus, and accessibility tools.
+     * Skip updating current block when focus is inside a nested editor instance.
+     * The closest editor wrapper must match this instance's wrapper.
      */
+    const closestEditor = focusedElement.closest('[data-blok-testid="blok-editor"]');
+
+    if (closestEditor !== null && closestEditor !== this.wrapperElement) {
+      return false;
+    }
+
     return true;
   }
 }

package/src/components/ui/toolbox.ts

@@ -411,7 +411,6 @@ export class Toolbox extends EventsDispatcher<ToolboxEventMap> {
     const PopoverClass = isMobileScreen() ? PopoverMobile : PopoverDesktop;
 
     this.popover = new PopoverClass({
-      scopeElement: this.api.ui.nodes.redactor,
       trigger: this.triggerElement || this.nodes.toolbox,
       leftAlignElement: this.leftAlignElement,
       messages: {

package/src/components/utils/popover/popover-position.ts

@@ -32,7 +32,9 @@ export interface ResolvedPosition {
 
 /**
  * Determines whether the popover should flip to the alternate side.
- * Returns true when the popover doesn't fit on the preferred side and the alternate side has more (or equal) space.
+ * Returns true only when the popover fits on the alternate side but not the preferred side.
+ * When neither side fits, stays on the preferred side so the popover remains adjacent
+ * to the anchor instead of getting clamped to a distant boundary edge.
  */
 function shouldFlip(popoverDimension: number, spaceOnPreferred: number, spaceOnAlternate: number): boolean {
   if (popoverDimension <= spaceOnPreferred) {
@@ -43,7 +45,7 @@ function shouldFlip(popoverDimension: number, spaceOnPreferred: number, spaceOnA
     return true;
   }
 
-  return spaceOnAlternate > spaceOnPreferred;
+  return false;
 }
 
 /**