Merge branch 'feature/7.8.0/DOC-3131' into feature/7.8.0/DOC-3131_DOC-3193

Author: kemister85

modules/ROOT/nav.adoc

@@ -239,7 +239,7 @@
 ** xref:editor-important-options.adoc[Integration options]
 ** xref:editor-size-options.adoc[Size]
 ** xref:editor-save-and-submit.adoc[Save and submit]
-** xref:editor-premium-upgrade-promotion.adoc[Premium upgrade promotion]
+** xref:promotions.adoc[Promotions]
 * Interface
 ** Editor modes
 *** xref:use-tinymce-classic.adoc[Classic editing mode]

modules/ROOT/pages/7.8.0-release-notes.adoc

@@ -101,6 +101,8 @@ For information on the **Comments** plugin, see: xref:introduction-to-tiny-comme
 
 {productname} {release-version} introduces the **Image Optimizer (Powered by Uploadcare)** plugin.
 
+**Image Optimizers** includes the following fix and addition.
+
 === Added support for `+uploadcare_filters+` option in the Image Optimizer (Powered by Uploadcare) plugin
 // #EPIC-146
 
@@ -124,6 +126,11 @@ tinymce.init({
 });
 ----
 
+==== Keyboard navigation between toolbars no longer loses focus.
+// #TINY-11880
+
+In previous versions of **Image Optimizer**, navigating between toolbars and sub toolbars could cause the toolbar focus state to be lost. This issue required users to press `+Ctrl+F9+` to manually restore focus to the context toolbar, disrupting keyboard navigation workflows. {productname} {release-version} addresses this issue, by updating the focus handling using new sub toolbar APIs, ensuring that focus is now properly retained when moving between toolbars and sub toolbars. This improvement enhances accessibility and allows users to navigate the toolbar system more efficiently.
+
 For information on the **Image Optimizer (Powered by Uploadcare)** plugin, see xref:uploadcare.adoc[Image Optimizer (Powered by Uploadcare)].
 
 === Math
@@ -240,6 +247,47 @@ For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-a
 
 // CCFR here.
 
+=== New subtoolbar support for context toolbars.
+// #TINY-11748
+
+{productname} {release-version} introduces support for multi-level context toolbars, enabling more advanced and interactive editing experiences directly within the editor interface. Previously, developers had to manually configure separate toolbars and manage transitions between them using predicate logic. This release simplifies that process by adding a new API for defining and navigating subtoolbars, similar to the existing context form functionality.
+
+A new `+navigateback+` button streamlines navigation between toolbar levels, while improved focus management ensures input fields are automatically focused when switching toolbars. These enhancements provide a more flexible, intuitive, and responsive workflow for both developers and end users.
+
+.Example of a multi-level context toolbar configuration:
+[source, js]
+----
+tinymce.init({
+  selector: 'textarea',
+  height: 350,
+  setup: (editor) => {
+    editor.ui.registry.addContextToolbar('bar', {
+      predicate: () => true,
+      items: 'bold italic | undo redo | subbar1',
+      position: 'line',
+      scope: 'editor'
+    });
+
+    editor.ui.registry.addContextToolbar('subbar1', {
+      launch: { text: 'Subbar 1' },
+      items: 'navigateback bold italic | undo redo | subbar2'
+    });
+
+    editor.ui.registry.addContextToolbar('subbar2', {
+      launch: { text: 'Subbar 2' },
+      items: 'navigateback bold italic | undo redo | subbar3'
+    });
+
+    editor.ui.registry.addContextToolbar('subbar3', {
+      launch: { text: 'Subbar 3' },
+      items: 'navigateback bold italic | undo redo'
+    });
+  }
+});
+----
+
+For more information on context toolbars, see xref:contexttoolbar.adoc[Context toolbars].
+
 === The `+editor.selection.scrollIntoView()+` method now pads the target scroll area with a small margin, ensuring content doesn't sit at the very edge of the viewport.
 // #TINY-11786
 

modules/ROOT/pages/contexttoolbar.adoc

@@ -60,6 +60,34 @@ items: [
 ]
 ----
 
+[NOTE]
+For editors using 7.8.0+, context toolbars also support the `+navigateback+` button for multi-level toolbar navigation. This built-in button allows returning to the previous context toolbar when using nested toolbars.
+
+.Example of a multi-level context toolbar configuration:
+[source, js]
+----
+tinymce.init({
+  selector: 'textarea',
+  setup: (editor) => {
+    // Register the main context toolbar named 'bar'
+    editor.ui.registry.addContextToolbar('bar', {
+      predicate: () => true, // Always show the toolbar when triggered
+      items: 'bold italic | undo redo | subbar1', // Toolbar buttons and nested toolbar trigger
+      position: 'line',
+      scope: 'editor'
+    });
+
+    // Register a nested context toolbar named 'subbar1'
+    editor.ui.registry.addContextToolbar('subbar1', {
+      launch: { text: 'Subbar 1' }, // Button label that appears in the parent toolbar
+      items: 'navigateback bold italic | undo redo | subbar2' 
+      // 'navigateback' allows users to return to the previous toolbar
+      // 'subbar2' is another nested toolbar (can be defined similarly)
+    });
+  }
+});
+----
+
 liveDemo::context-toolbar-labels[height="600", tab="js"]
 
 == Launching a context toolbar programmatically

modules/ROOT/pages/editor-premium-upgrade-promotion.adoc

@@ -29,7 +29,7 @@ Editor options related to saving or submitting editor content.
 
 |
 [.lead]
-xref:editor-premium-upgrade-promotion.adoc[Premium upgrade promotion]
+xref:promotions.adoc[Promotions]
 
 Editor options related to turning the Premium promotion display off.
 

modules/ROOT/pages/initial-configuration.adoc

@@ -0,0 +1,6 @@
+= Premium upgrade promotion
+:navtitle: {productname} Premium upgrade promotion
+:description: Editor options related to turning the Premium promotion display off
+:keywords: upgrade, promotion, premium, button, lightning bolt
+
+include::partial$misc/premium-upgrade-promotion-option.adoc[]

modules/ROOT/pages/promotions.adoc

@@ -0,0 +1,21 @@
+[[onboarding]]
+== `+onboarding+`
+
+The cloud version of {productname} contains a promotion for paid features included in the 14-day trial. This promotion can be toggled on or off with the `+onboarding+` option.
+
+The promotion will automatically disappear when the trial ends.
+
+*Type:* `+Boolean+`
+
+*Default value:* `+true+` for cloud instances; otherwise `+false+`.
+
+*Possible values:* `+true+`, `+false+`
+
+.Example: using cloud `+onboarding+`
+[source,js]
+----
+tinymce.init({
+  selector: "textarea",  // change this value according to your HTML
+  onboarding: false
+});
+----

modules/ROOT/partials/configuration/onboarding.adoc

@@ -1,26 +1,19 @@
 [[promotion]]
-== `+promotion+`
+== `+promotion+`  
 
-{productname} 6.2 and later includes the `promotion` option. It controls the presentation or otherwise of a Tiny-specific promotion button.
+The open source version of {productname} contains a promotion for paid features. This promotion can be toggled on or off with the `+promotion+` option.
 
 *Type:* `+Boolean+`
 
 *Default value:* `+true+` in Community self-hosted instances; otherwise `+false+`.
 
 *Possible values:* `+true+`, `+false+`
 
-See xref:editor-premium-upgrade-promotion.adoc#premium-upgrade-promotion-defaults[Premium upgrade promotion defaults] for details.
-
-=== Example: using `+promotion+`
-
+.Example: using open source `+promotion+`
 [source,js]
 ----
 tinymce.init({
   selector: "textarea",  // change this value according to your HTML
   promotion: true
 });
-----
-
-The *Upgrade* promotion appears in the unused corner of the {productname} menu bar. Consequently it does not appear if the menu bar is disabled.
-
-NOTE: The distribution-specific defaults are not fixed. Someone running {productname} as part of a Premium plan can turn this option on. And someone running the Community distribution of {productname} as a self-hosted instance can turn this option off.
+----

modules/ROOT/partials/configuration/promotion.adoc

@@ -1,4 +1,7 @@
-[[premium-upgrade-promotion-option]]
-== Premium upgrade promotion option
+== Open source promotion
 
-include::partial$configuration/promotion.adoc[leveloffset=+1]
+include::partial$configuration/promotion.adoc[leveloffset=+1]
+
+== Cloud promotion
+
+include::partial$configuration/onboarding.adoc[leveloffset=+1]

modules/ROOT/partials/misc/premium-upgrade-promotion-option.adoc

@@ -30,6 +30,7 @@ The `+fontsize+` and `+fontsizeinput+` toolbar buttons should not be placed in a
 |`+italic+` |Applies the italic format to the current selection.
 |`+language+` |Dropdown list with languages to apply to the selection. This button requires the xref:content-localization.adoc#content_langs[`+content_langs+` option].
 |`+lineheight+` |Dropdown list with line heights to apply to selection.
+|`+navigateback+` | Allows navigation between subtoolbar levels for multi-level toolbar configurations.
 |`+newdocument+` |Creates a new document.
 |`+outdent+` |Outdents the current list item or block element.
 |`+paste+` |Pastes the current clipboard into the editor.