#26421 include in 23.10.24 LTS

dotCMS · Jul 2, 2024 · 5c19c3b · 5c19c3b
1 parent 4704dae
commit 5c19c3b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/core-web/libs/block-editor/src/lib/extensions/bubble-menu/plugins/dot-bubble-menu.plugin.ts b/core-web/libs/block-editor/src/lib/extensions/bubble-menu/plugins/dot-bubble-menu.plugin.ts
@@ -216,7 +216,7 @@ export class DotBubbleMenuPluginView extends BubbleMenuView {
     updateComponent() {
         const { items } = this.component.instance;
         const { activeItem } = this.getActiveNode();
-        const activeMarks = this.getActiveMarks(['left', 'center', 'right']);
+        const activeMarks = this.getActiveMarks(['justify', 'left', 'center', 'right']);
 
         // Update
         this.component.instance.selected = activeItem?.label;
@@ -340,6 +340,10 @@ export class DotBubbleMenuPluginView extends BubbleMenuView {
                 this.editor.commands.toggleUnderline();
                 break;
 
+            case 'justify':
+                this.toggleTextAlign(action, active);
+                break;
+
             case 'left':
                 this.toggleTextAlign(action, active);
                 break;

diff --git a/core-web/libs/block-editor/src/lib/extensions/bubble-menu/utils/index.ts b/core-web/libs/block-editor/src/lib/extensions/bubble-menu/utils/index.ts
@@ -163,6 +163,11 @@ const alignmentMarks: Array<BubbleMenuItem> = [
     {
         icon: 'format_align_right',
         markAction: 'right',
+        active: false
+    },
+    {
+        icon: 'format_align_justify',
+        markAction: 'justify',
         active: false,
         divider: true
     }

diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -121,4 +121,5 @@ This maintenance release includes the following code fixes:
 114. https://github.com/dotCMS/core/issues/23292 : Password validation failed for few characters #23292
 115. https://github.com/dotCMS/core/issues/23131 : Remove 10k Push Publishing Limit #23131
 116. https://github.com/dotCMS/core/issues/28897 : Content Resource v1 hits the db #28897
-117. https://github.com/dotCMS/core/issues/28890 : LanguageUtil.getLanguageId is always hitting the db #28890
+117. https://github.com/dotCMS/core/issues/28890 : LanguageUtil.getLanguageId is always hitting the db #28890
+118. https://github.com/dotCMS/core/issues/26421 : Block Editor: Add align-justify option to menu #26421
diff --git a/dotCMS/src/main/webapp/html/dotcms-block-editor.js b/dotCMS/src/main/webapp/html/dotcms-block-editor.js