refactored richtext toolbar config generation

Author: breadlesscode

Resources/Private/UiPlugin/src/CkeditorPluginUtils.js

@@ -1,6 +1,7 @@
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import AttributeCommand from '@ckeditor/ckeditor5-basic-styles/src/attributecommand';
 import {$add, $get} from 'plow-js';
+import ButtonComponent from './ButtonComponent';
 
 const getCkeditorPlugin = function(extensionName, commandName, formatting) {
     const attributeName = extensionName + 'Attribute';
@@ -40,4 +41,15 @@ const getCkeditorPluginConfig = function(formattingName, ckeditorPlugin) {
     }
 };
 
-export { getCkeditorPlugin, getCkeditorPluginConfig};
+const getRichtextToolbarConfig = function(commandName, formattingName, icon, tooltip) {
+    return {
+        commandName: commandName,
+        isActive: $get(commandName),
+        isVisible: $get(['formatting', formattingName]),
+        component: ButtonComponent(commandName),
+        icon: icon,
+        tooltip: tooltip,
+    };
+}
+
+export { getCkeditorPlugin, getCkeditorPluginConfig, getRichtextToolbarConfig};

Resources/Private/UiPlugin/src/manifest.js

@@ -1,7 +1,5 @@
 import manifest from '@neos-project/neos-ui-extensibility';
-import {$get} from 'plow-js';
-import ButtonComponent from './ButtonComponent';
-import {getCkeditorPlugin, getCkeditorPluginConfig} from './CkeditorPluginUtils';
+import {getCkeditorPlugin, getCkeditorPluginConfig, getRichtextToolbarConfig} from './CkeditorPluginUtils';
 import backend from '@neos-project/neos-ui-backend-connector';
 
 manifest('Breadlesscode.SimpleEditorExtend:UiPlugin', {}, globalRegistry => {
@@ -15,18 +13,19 @@ manifest('Breadlesscode.SimpleEditorExtend:UiPlugin', {}, globalRegistry => {
             const options = buttonConfig[formattingName];
             const commandName = options.extensionName + 'Command';
 
-            richtextToolbar.set(options.extensionName, {
-                commandName: commandName,
-                isActive: $get(commandName),
-                isVisible: $get(['formatting', formattingName]),
-                component: ButtonComponent(commandName),
-                icon: options.icon,
-                tooltip: options.tooltip,
-            }, options.position);
-            config.set(options.extensionName, getCkeditorPluginConfig(
-                formattingName,
-                getCkeditorPlugin(options.extensionName, commandName, options.formatting)
-            ));
+            richtextToolbar.set(
+                options.extensionName,
+                getRichtextToolbarConfig(commandName, formattingName, options.icon, options.tooltip),
+                options.position
+            );
+            
+            config.set(
+                options.extensionName,
+                getCkeditorPluginConfig(
+                    formattingName,
+                    getCkeditorPlugin(options.extensionName, commandName, options.formatting)
+                )
+            );
         });
     });
 });