Merge 51325e2f4a91f08519510e199673ba8c4bc045e9 into 5db298f031638e1c48391cf54efffe1ac199e396

style/quick edit: increase the horizontal padding of the text to make space for the block toolbar button
style/text editor/block toolbar button: tweak
2026-02-28 01:23:37 +01:00 · 2026-02-02 21:03:16 +02:00 · 2026-02-02 21:03:02 +02:00 · 2026-02-02 20:57:38 +02:00 · 2026-02-02 20:13:00 +02:00 · 2026-02-02 20:06:05 +02:00
4 changed files with 35 additions and 15 deletions
--- a/apps/client/src/stylesheets/theme-next/notes/text.css
+++ b/apps/client/src/stylesheets/theme-next/notes/text.css
@ -47,9 +47,14 @@
 }

 /* The toolbar show / hide button for the current text block */
-.ck.ck-block-toolbar-button {
+:root .ck.ck-block-toolbar-button {
+    --ck-color-block-toolbar-button: var(--muted-text-color);
    --ck-color-button-on-background: transparent;
-    --ck-color-button-on-color: currentColor;
+    --ck-color-button-on-color: var(--ck-editor-toolbar-button-on-color);
+    translate: -40% 0;
+    min-width: 0;
+    padding: 0;
+    z-index: 1600;
 }

 :root .ck.ck-toolbar .ck-button:not(.ck-disabled):active,
--- a/apps/client/src/widgets/containers/scrolling_container.css
+++ b/apps/client/src/widgets/containers/scrolling_container.css
@ -4,11 +4,14 @@
    position: relative;

    > .inline-title,
-    > .note-detail > .note-detail-editable-text,
+    > .note-detail > .note-detail-editable-text > .note-detail-editable-text-editor,
    > .note-list-widget:not(.full-height) .note-list-wrapper {
-        padding-inline: 24px;
+        margin-inline: 24px;
    }

+    > .note-detail > .note-detail-editable-text > .note-detail-editable-text-editor {
+        overflow: unset;
+    }
 }

 .note-split.type-code:not(.mime-text-x-sqlite) {
--- a/apps/client/src/widgets/dialogs/PopupEditor.css
+++ b/apps/client/src/widgets/dialogs/PopupEditor.css
@ -92,7 +92,7 @@ body.mobile .modal.popup-editor-dialog .modal-dialog {
 }

 .modal.popup-editor-dialog .note-detail-editable-text {
-    padding: 0 1em;
+    padding: 0 28px;
 }

 .modal.popup-editor-dialog .note-detail-file {
--- a/packages/ckeditor5/src/plugins/indent_block_shortcut.ts
+++ b/packages/ckeditor5/src/plugins/indent_block_shortcut.ts
@ -8,21 +8,33 @@ export default class IndentBlockShortcutPlugin extends Plugin {

    init() {
        this.editor.keystrokes.set( 'Tab', ( _, cancel ) => {
-            const command = this.editor.commands.get( 'indentBlock' );
-
-            if (command && command.isEnabled && !this.isInTable() ) {
-                command.execute();
-                cancel();
+            // In tables, allow default Tab behavior for cell navigation
+            if (this.isInTable()) {
+                return;
            }
+
+            const command = this.editor.commands.get( 'indentBlock' );
+            if (command?.isEnabled) {
+                command.execute();
+            }
+
+            // Always cancel in non-table contexts to prevent widget navigation
+            cancel();
        } );

        this.editor.keystrokes.set( 'Shift+Tab', ( _, cancel ) => {
-            const command = this.editor.commands.get( 'outdentBlock' );
-
-            if (command && command.isEnabled && !this.isInTable() ) {
-                command.execute();
-                cancel();
+            // In tables, allow default Shift+Tab behavior for cell navigation
+            if (this.isInTable()) {
+                return;
            }
+
+            const command = this.editor.commands.get( 'outdentBlock' );
+            if (command?.isEnabled) {
+                command.execute();
+            }
+
+            // Always cancel in non-table contexts to prevent widget navigation
+            cancel();
        } );
    }
Author	SHA1	Message	Date
Jon Fuller	07aaebc0c7	Merge 51325e2f4a91f08519510e199673ba8c4bc045e9 into 5db298f031638e1c48391cf54efffe1ac199e396	2026-02-02 21:03:16 +02:00
Adorian Doran	5db298f031	style/quick edit: increase the horizontal padding of the text to make space for the block toolbar button Some checks are pending Checks / main (push) Waiting to run Details CodeQL Advanced / Analyze (actions) (push) Waiting to run Details CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run Details Dev / Test development (push) Waiting to run Details Dev / Build Docker image (push) Blocked by required conditions Details Dev / Check Docker build (Dockerfile) (push) Blocked by required conditions Details Dev / Check Docker build (Dockerfile.alpine) (push) Blocked by required conditions Details / Check Docker build (Dockerfile) (push) Waiting to run Details / Check Docker build (Dockerfile.alpine) (push) Waiting to run Details / Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm64) (push) Blocked by required conditions Details / Build Docker images (Dockerfile.alpine, ubuntu-latest, linux/amd64) (push) Blocked by required conditions Details / Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v7) (push) Blocked by required conditions Details / Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v8) (push) Blocked by required conditions Details / Merge manifest lists (push) Blocked by required conditions Details playwright / E2E tests on linux-arm64 (push) Waiting to run Details playwright / E2E tests on linux-x64 (push) Waiting to run Details	2026-02-02 21:03:02 +02:00
Adorian Doran	facd56cdf4	style/text editor/block toolbar button: tweak	2026-02-02 20:57:38 +02:00
Adorian Doran	348c00f86d	style/text editor: fix layout issues	2026-02-02 20:13:00 +02:00
Adorian Doran	a9c5b99ae8	style/text editor/block toolbar button: fix position and z-index	2026-02-02 20:06:05 +02:00
Adorian Doran	afe710321c	style/text editor: fix layout issues	2026-02-02 18:34:22 +02:00
perfectra1n	51325e2f4a	fix(editor): resolve strange stuck indent when a Note has images	2026-01-26 17:03:42 -08:00