Fix split paragraph with multiple text fields.

thunder · Apr 17, 2024 · 51834a0 · 51834a0
1 parent d21e65f
commit 51834a0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/js/build/split_paragraph.js b/js/build/split_paragraph.js
diff --git a/js/ckeditor5_plugins/split_paragraph/src/index.js b/js/ckeditor5_plugins/split_paragraph/src/index.js
@@ -39,11 +39,14 @@ class SplitParagraph extends Plugin {
   afterInit() {
     // Set value of the new paragraph.
     if (window._splitParagraph) {
+      console.log(this.editor.sourceElement.dataset.drupalSelector);
+      console.log(this.editor.sourceElement.dataset.drupalSelector.match(window._splitParagraph.selector.replace(/-[0-9]+-?/, '-[0-9]+-')));
       if (typeof window._splitParagraph.data.second === 'string') {
-        const paragraph = this.editor.sourceElement.closest('tr');
+        const paragraph = this.editor.sourceElement.closest('tr.draggable');
+        // this.editor.sourceElement.
         // closest('.field--widget-paragraphs').querySelector('tr');
         const previousParagraph = paragraph?.previousElementSibling;
-        if (previousParagraph && previousParagraph.querySelector(`[data-drupal-selector="${window._splitParagraph.selector}"]`)) {
+        if (previousParagraph && this.editor.sourceElement.dataset.drupalSelector.match(window._splitParagraph.selector.replace(/-[0-9]+-?/, '-[0-9]+-'))) {
           // Defer to wait until init is complete.
           setTimeout(() => {
             this.editor.setData(window._splitParagraph.data.second);

diff --git a/js/ckeditor5_plugins/split_paragraph/src/splitparagraphcommand.js b/js/ckeditor5_plugins/split_paragraph/src/splitparagraphcommand.js
@@ -25,7 +25,7 @@ export default class SplitParagraphCommand extends Command {
     }
 
     // Get paragraph type and position.
-    const paragraph = sourceElement.closest('.paragraphs-subform').closest('tr');
+    const paragraph = sourceElement.closest('.paragraphs-subform').closest('tr.draggable');
     const paragraphType = paragraph.querySelector('[data-paragraphs-split-text-type]').dataset.paragraphsSplitTextType;
     const paragraphDelta = [...paragraph.parentNode.children].filter(el => el.querySelector('.paragraphs-actions')).indexOf(paragraph) + 1;
 

diff --git a/tests/src/FunctionalJavascript/ParagraphsFeaturesSplitTextTest.php b/tests/src/FunctionalJavascript/ParagraphsFeaturesSplitTextTest.php
@@ -403,7 +403,6 @@ public function testSplitTextFeature() {
     $ck_editor_id_para_1_text_0 = $page->find('xpath', '(//*[@data-drupal-selector="edit-field-paragraphs-1"]//textarea)[1]')->getAttribute('data-ckeditor5-id');
     $ck_editor_id_para_1_text_1 = $page->find('xpath', '(//*[@data-drupal-selector="edit-field-paragraphs-1"]//textarea)[2]')->getAttribute('data-ckeditor5-id');
     $ck_editor_id_para_1_text_2 = $page->find('xpath', '(//*[@data-drupal-selector="edit-field-paragraphs-1"]//textarea)[3]')->getAttribute('data-ckeditor5-id');
-
     static::assertEquals(
       $paragraph_content_0_text_0,
       $driver->evaluateScript("Drupal.CKEditor5Instances.get('$ck_editor_id_para_0_text_0').getData();")
@@ -417,15 +416,11 @@ public function testSplitTextFeature() {
       $driver->evaluateScript("Drupal.CKEditor5Instances.get('$ck_editor_id_para_0_text_2').getData();")
     );
     static::assertEquals(
-      // @todo Fix me, order should be different.
-      // '',
-      $paragraph_content_1,
+      '',
       $driver->evaluateScript("Drupal.CKEditor5Instances.get('$ck_editor_id_para_1_text_0').getData();")
     );
     static::assertEquals(
-      // Fix me, order should be different.
-      // $paragraph_content_1,
-      '',
+      $paragraph_content_1,
       $driver->evaluateScript("Drupal.CKEditor5Instances.get('$ck_editor_id_para_1_text_1').getData();")
     );
     static::assertEquals(