Merge branch 'master' into dev

Author: yrucrem

build/changelog/entries/2025/02/12557.SUP-18149.bugfix

@@ -0,0 +1,2 @@
+Typography will respect the editables configuration correctly instead of just the default configuration.
+

build/changelog/mappings/2.0.10.json

@@ -0,0 +1,8 @@
+{
+  "version": "2.0.10",
+  "date": "12.03.2025",
+  "changeLogEntryFileNames": [
+    "12557.SUP-18149.bugfix"
+  ],
+  "genericProperties": {}
+}

build/changelog/mappings/2.1.6.json

@@ -0,0 +1,6 @@
+{
+  "version": "2.1.6",
+  "date": "12.03.2025",
+  "changeLogEntryFileNames": [],
+  "genericProperties": {}
+}

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>org.alohaeditor</groupId>
 	<artifactId>alohaeditor</artifactId>
-	<version>2.1.6-SNAPSHOT</version>
+	<version>2.1.7-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Aloha Editor</name>
 	<url>http://aloha-editor.org</url>

src/plugins/common/format/lib/format-plugin.js

@@ -757,6 +757,8 @@ define('format/format-plugin', [
 		},
 
 		activeTypography: null,
+		formatOptions: [],
+		typographyOptions: [],
 
 		/**
 		 * Initialize the plugin and set initialize flag on true
@@ -881,6 +883,32 @@ define('format/format-plugin', [
 					button.handle.show();
 				}
 			});
+
+			plugin.typographyOptions = Object.entries(plugin.buttonConfig).map(function(entry) {
+				var name = entry[0];
+				var elemConfig = entry[1];
+
+				// Ignore non-typography elements
+				if (!elemConfig.typography) {
+					return null;
+				}
+
+				// Skip elements which aren't allowed
+				if (!ContentRules.isAllowed(editable, name) || !config.includes(name)) {
+					return null;
+				}
+
+				return name;
+			}).filter(function(value) {
+				return value != null;
+			});
+
+			// We need at least two options, otherwise the button/selection wouldn't make sense
+			if (plugin.typographyOptions.length <= 1) {
+				plugin.typographyButton.hide();
+			} else {
+				plugin.typographyButton.show();
+			}
 		},
 
 		/**
@@ -922,7 +950,12 @@ define('format/format-plugin', [
 				iconOnly: false,
 
 				click: function () {
-					var data = Dropdown.openDynamicDropdown(plugin.typographyButton.name, plugin._createTypographyContext());
+					var context = plugin._createTypographyContext();
+					if (context == null) {
+						return;
+					}
+
+					var data = Dropdown.openDynamicDropdown(plugin.typographyButton.name, context);
 					if (!data) {
 						return;
 					}
@@ -968,7 +1001,7 @@ define('format/format-plugin', [
 		},
 
 		_createTypographyContext: function () {
-			var latestOptions = (plugin.config || []).map(function (nodeName) {
+			var latestOptions = (plugin.typographyOptions || []).map(function (nodeName) {
 				var settings = plugin.buttonConfig[nodeName];
 
 				// If there's no settings, we have to ignore it
@@ -992,6 +1025,13 @@ define('format/format-plugin', [
 				return option != null;
 			});
 
+			// In case there's only one option, and we already have it selected,
+			// then we can skip opening the context all together, as the user can't
+			// change it to something else anyways.
+			if (latestOptions.length === 1 && latestOptions[0].id === plugin.activeTypography) {
+				return null;
+			}
+
 			return {
 				type: 'select-menu',
 				options: {