Merge pull request #5 from PRGfx/neos9

Neos 9 compatibility

Author: PRGfx

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 120
+tab_width = 4
+trim_trailing_whitespace = true

Resources/Private/JavaScript/TextPartLanguage/build.js

@@ -0,0 +1,20 @@
+const esbuild = require('esbuild');
+const extensibilityMap = require("@neos-project/neos-ui-extensibility/extensibilityMap.json");
+const isWatch = process.argv.includes('--watch');
+
+/** @type {import("esbuild").BuildOptions} */
+const options = {
+    logLevel: "info",
+    bundle: true,
+    target: "es2020",
+    entryPoints: {"Plugin": "src/index.js"},
+    loader: {".js": "tsx"},
+    outdir: "../../../Public/JavaScript/TextPartLanguage",
+    alias: extensibilityMap
+}
+
+if (isWatch) {
+    esbuild.context(options).then((ctx) => ctx.watch())
+} else {
+    esbuild.build(options)
+}

Resources/Private/JavaScript/TextPartLanguage/package.json

@@ -1,22 +1,22 @@
 {
-  "description": "",
-  "license": "GNU GPLv3",
-  "private": true,
-  "scripts": {
-    "build": "neos-react-scripts build",
-    "watch": "neos-react-scripts watch"
-  },
-  "devDependencies": {
-    "@neos-project/neos-ui-extensibility": "^8.2.0",
-    "@neos-project/build-essentials": "^8.2.0"
-  },
-  "neos": {
-    "buildTargetDirectory": "../../../Public/JavaScript/TextPartLanguage"
-  },
-  "dependencies": {
-    "@ckeditor/ckeditor5-language": "27.1.0",
-    "@ckeditor/ckeditor5-utils": "^27.1.0",
-    "null-loader": "^4.0.1",
-    "raw-loader": "^4.0.2"
-  }
+    "description": "",
+    "license": "GNU GPLv3",
+    "private": true,
+    "scripts": {
+        "build": "node build.js",
+        "watch": "node build.js --watch"
+    },
+    "devDependencies": {
+        "@neos-project/neos-ui-extensibility": "~8.3.0",
+        "esbuild": "^0.25.5"
+    },
+    "neos": {
+        "buildTargetDirectory": "../../../Public/JavaScript/TextPartLanguage"
+    },
+    "dependencies": {
+        "@ckeditor/ckeditor5-language": "27.1.0",
+        "@ckeditor/ckeditor5-utils": "^27.1.0",
+        "null-loader": "^4.0.1",
+        "raw-loader": "^4.0.2"
+    }
 }

Resources/Private/JavaScript/TextPartLanguage/src/LanguageSelect.js

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { neos } from '@neos-project/neos-ui-decorators';
 import { SelectBox } from '@neos-project/react-ui-components';
 import { connect } from 'react-redux';
-import { $transform } from 'plow-js';
 import { selectors } from '@neos-project/neos-ui-redux-store';
 import * as CkEditorApi from '@neos-project/neos-ui-ckeditor5-bindings';
 import { commandName } from './command';
@@ -15,8 +14,8 @@ export const sanitizeOptions = (options) =>
 @neos(globalRegistry => ({
     i18nRegistry: globalRegistry.get('i18n'),
 }))
-@connect($transform({
-    formattingUnderCursor: selectors.UI.ContentCanvas.formattingUnderCursor,
+@connect(state => ({
+    formattingUnderCursor: selectors.UI.ContentCanvas.formattingUnderCursor(state),
 }))
 export default class LanguageSelect extends PureComponent {
     static propTypes = {

Resources/Private/JavaScript/TextPartLanguage/src/editing.js

@@ -50,13 +50,15 @@ export default class TextPartLanguageEditing extends Plugin {
 
         conversion.for('downcast').attributeToElement({
             model: attributeName,
-            view: (attributeValue, writer) => {
+            // between Neos 8 and 9 the editor API changed and the writer is passed in an options object
+            view: (attributeValue, maybeWriter) => {
                 if (!attributeValue) {
                     return;
                 }
 
                 const { languageCode, textDirection } = parseLanguageAttribute(attributeValue);
 
+                const writer = 'writer' in maybeWriter ? maybeWriter.writer : maybeWriter;
                 return writer.createAttributeElement('span', {
                     lang: languageCode,
                     dir: textDirection || this.languageDirectionLookup(languageCode),

Resources/Private/JavaScript/TextPartLanguage/src/manifest.js

@@ -1,7 +1,6 @@
 import manifest from '@neos-project/neos-ui-extensibility';
 import TextPartLanguage from './editing';
 import LanguageSelect from './LanguageSelect';
-import { $get } from 'plow-js';
 
 manifest('Prgfx.Neos.TextPartLanguage', {}, (globalRegistry, { frontendConfiguration }) => {
 
@@ -24,7 +23,7 @@ manifest('Prgfx.Neos.TextPartLanguage', {}, (globalRegistry, { frontendConfigura
     richtextToolbar.set('textPartLanguage', {
         component: LanguageSelect,
         callbackPropName: 'onSelect',
-        isVisible: $get('textLanguages'),
+        isVisible: editorOptions => !!editorOptions?.textLanguages,
         defaultLanguages,
     });
 });