Support for Silverstripe 6

_config.php

@@ -1,12 +1,22 @@
 <?php
 use SilverStripe\Core\Manifest\ModuleLoader;
-use SilverStripe\Forms\HTMLEditor\HtmlEditorConfig;
+use SilverStripe\Forms\HTMLEditor\HTMLEditorConfig;
 use SilverStripe\View\Parsers\ShortcodeParser;
+use SilverStripe\TinyMCE\TinyMCEConfig;
 
-HtmlEditorConfig::get('cms')->enablePlugins([
-	'sslinkdataobject' => ModuleLoader::getModule('flxlabs/silverstripe-dataobject-links')
-		->getResource('client/dist/js/TinyMCE_sslink-dataobject.js')
-]);
+// Register TinyMCE plugin
+call_user_func(function () {
+	$editorConfig = HTMLEditorConfig::get('cms');
+
+	if (!$editorConfig instanceof TinyMCEConfig) {
+		return;
+	}
+
+	$editorConfig->enablePlugins([
+		'sslinkdataobject' => ModuleLoader::getModule('flxlabs/silverstripe-dataobject-links')
+			->getResource('client/dist/js/TinyMCE_sslink-dataobject.js')
+	]);
+});
 
 /**
  * Register handler for our shortcodes

_config/config.yml

@@ -10,5 +10,7 @@ SilverStripe\Admin\LeftAndMain:
     - FLXLabs\DataObjectLink\DataObjectLinkExtension
 
 SilverStripe\Admin\ModalController:
+  link_modal_form_factories:
+    EditorDataObjectLink: FLXLabs\DataObjectLink\DataObjectLinkFormFactory
   extensions:
     - FLXLabs\DataObjectLink\DataObjectLinkModalExtension

client/src/TinyMCE_sslink-dataobject.jsx

@@ -3,24 +3,27 @@ import i18n from 'i18n';
 import TinyMCEActionRegistrar from 'lib/TinyMCEActionRegistrar';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { ApolloProvider } from '@apollo/client';
-import { Provider } from 'react-redux';
+import { createRoot } from 'react-dom/client';
+//import { ApolloProvider } from '@apollo/client';
+//import { Provider } from 'react-redux';
 import jQuery from 'jquery';
 import ShortcodeSerialiser from 'lib/ShortcodeSerialiser';
 import { createInsertLinkModal } from 'containers/InsertLinkModal/InsertLinkModal';
-import { provideInjector } from 'lib/Injector';
+import { loadComponent } from 'lib/Injector';
 
 const commandName = 'sslinkdataobject';
 
-// Link to a dataobject
-TinyMCEActionRegistrar.addAction('sslink', {
-	text: i18n._t('CMS.LINKLABEL_PAGE', 'Link to an Object'),
-	onclick: (editor) => editor.execCommand(commandName),
-	priority: 53,
-}).addCommandWithUrlTest(commandName, /^\[dataobject_link.+]$/);
+
 
 const plugin = {
 	init(editor) {
+		// Link to a dataobject
+		TinyMCEActionRegistrar.addAction('sslink', {
+			text: i18n._t('CMS.LINKLABEL_PAGE', 'Link to an Object'),
+			onclick: (editorInst) => editorInst.execCommand(commandName),
+			priority: 53,
+		}).addCommandWithUrlTest(commandName, /^\[dataobject_link.+]$/);
+
 		editor.addCommand(commandName, () => {
 			const field = jQuery(`#${editor.id}`).entwine('ss');
 
@@ -30,21 +33,20 @@ const plugin = {
 };
 
 const modalId = 'insert-link__dialog-wrapper--dataobject';
-const sectionConfigKey = 'SilverStripe\\CMS\\Controllers\\CMSPageEditController';
-const formName = 'editorDataObjectLink';
-const InsertLinkDataObjectModal = provideInjector(createInsertLinkModal(sectionConfigKey, formName));
+//const sectionConfigKey = 'SilverStripe\\CMS\\Controllers\\CMSPageEditController';
+const sectionConfigKey = 'SilverStripe\\Admin\\LeftAndMain';
+const formName = 'EditorDataObjectLink';
+const InsertLinkDataObjectModal = loadComponent(createInsertLinkModal(sectionConfigKey, formName));
 
 jQuery.entwine('ss', ($) => {
 	$('textarea.htmleditor').entwine({
 		openLinkDataObjectDialog() {
 			let dialog = $(`#${modalId}`);
-
 			if (!dialog.length) {
 				dialog = $(`<div id="${modalId}" />`);
 				$('body').append(dialog);
 			}
 			dialog.addClass('insert-link__dialog-wrapper');
-
 			dialog.setElement(this);
 			dialog.open();
 		},
@@ -63,15 +65,29 @@ jQuery.entwine('ss', ($) => {
 			const attrs = this.getOriginalAttributes();
 			const requireLinkText = this.getRequireLinkText();
 
+			// create/update the react component
 			let root = this.getReactRoot();
-			if (root) {
-				// Previous root is still present. Unmount it.
-				root.unmount();
-				this.setReactRoot(null);
+			if (!root) {
+				root = createRoot(this[0]);
+				this.setReactRoot(root);
 			}
-			root = ReactDOM.createRoot(this[0]);
 			// create/update the react component
 			root.render(
+				<InsertLinkDataObjectModal
+					show={isOpen}
+					isOpen={isOpen}
+					onInsert={handleInsert}
+					onHide={handleHide}
+					onClosed={handleHide}
+					title={i18n._t('CMS.LINK_PAGE', 'Link to a DataObject')}
+					bodyClassName="modal__dialog"
+					className={modalId}
+					fileAttributes={attrs}
+					identifier="Admin.InsertLinkDataObjectModal"
+					requireLinkText={requireLinkText}
+				/>
+			);
+			/*root.render(
 				<ApolloProvider client={client}>
 					<Provider store={store}>
 						<InsertLinkDataObjectModal
@@ -89,8 +105,7 @@ jQuery.entwine('ss', ($) => {
 						/>
 					</Provider>
 				</ApolloProvider>,
-			);
-			this.setReactRoot(root);
+			);*/
 		},
 
 		/**
@@ -103,7 +118,6 @@ jQuery.entwine('ss', ($) => {
 			const selectionContent = selection.getContent() || '';
 			const tagName = selection.getNode().tagName;
 			const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';
-
 			return requireLinkText;
 		},
 
@@ -130,13 +144,12 @@ jQuery.entwine('ss', ($) => {
 		getOriginalAttributes() {
 			const editor = this.getElement().getEditor();
 			const node = $(editor.getSelectedNode());
-
 			// Get href
 			const href = node.attr('href') || '';
-			if (!href || !clazz) {
+			if (!href) {
 				return {};
 			}
-
+			
 			// check if page is safe
 			const shortcode = ShortcodeSerialiser.match('dataobject_link', false, href);
 			if (!shortcode) {
@@ -145,7 +158,6 @@ jQuery.entwine('ss', ($) => {
 
 			// Parse class ourselves because shortcode parser sucks
 			const clazz = shortcode.original.match(/clazz=(.*?)\W/)[1];
-
 			return {
 				ClassName: clazz,
 				ObjectID: shortcode.properties.id ? parseInt(shortcode.properties.id, 10) : 0,

client/src/sslink-dataobject-transforms.js

@@ -1,5 +1,4 @@
 import Injector from 'lib/Injector';
-
 Injector.transform(
 	'tinymce-link-dataobject',
 	(updater) => {
@@ -13,7 +12,7 @@ Injector.transform(
 					ss.store.dispatch({
 						type: '@@redux-form/INITIALIZE',
 						meta: {
-							form: 'Admin.InsertLinkDataObjectModal.editorDataObjectLink',
+							form: 'Admin.InsertLinkDataObjectModal.linkModalForm/EditorDataObjectLink',
 							keepDirty: false,
 							keepSubmitSucceeded: true,
 						},
@@ -112,4 +111,4 @@ Injector.transform(
 	{
 		before: '*',
 	},
-);
+);

composer.json

@@ -15,9 +15,9 @@
     }
   ],
   "require": {
-    "silverstripe/framework": "^5",
-    "silverstripe/admin": "^2",
-    "silverstripe/vendor-plugin": "^2.0"
+    "silverstripe/framework": "^6",
+    "silverstripe/admin": "^3.1",
+    "silverstripe/htmleditor-tinymce": "^1.0"
   },
   "autoload": {
     "psr-4": {