Fix: nested repeaters

Author: Tofandel

frontend/js/components/Repeater.vue

@@ -123,6 +123,11 @@
         handle: '.block__handle' // drag handle
       }
     },
+    provide() {
+      return {
+        nested_block_name: this.name + '|',
+      }
+    },
     computed: {
       triggerVariant: function () {
         if (this.buttonAsLink) {

frontend/js/components/blocks/Blocks.vue

@@ -171,6 +171,11 @@
         handle: '.block__handle' // drag handle
       }
     },
+    provide() {
+      return {
+        nested_block_name: this.name + '|',
+      }
+    },
     computed: {
       ...mapState({
         editor: state => state.blocks.editor,

frontend/js/mixins/block.js

@@ -14,6 +14,7 @@ export default {
       opened: this.isOpen
     }
   },
+  inject: {nested_block_name: {default: ''}},
   methods: {
     open: function () {
       this.opened = true
@@ -22,10 +23,10 @@ export default {
       return this.name + '[' + id + ']' // output : nameOfBlock[UniqID][name]
     },
     repeaterName: function (id) {
-      return this.name.replace('[', '-').replace(']', '') + '|' + id // nameOfBlock-UniqID|name
+      return this.nested_block_name + this.name.replace('[', '-').replace(']', '') + '|' + id // nameOfBlock-UniqID|name
     },
     nestedEditorName: function (id) {
-      return this.name.replace('[', '-').replace(']', '') + '|' + id // nameOfBlock-UniqID|name
+      return this.repeaterName(id)
     }
   }
 }

src/Repositories/Behaviors/HandleRepeaters.php

@@ -474,22 +474,22 @@ function ($files, $role) use ($locale, $relation, $relationItem) {
             // @todo: Can we make this work without custom pivot tables?
             if (isset($relatedItemFormFields['repeaters'])) {
                 foreach ($relatedItemFormFields['repeaters'] as $childRepeaterName => $childRepeaterItems) {
-                    $fields['repeaters']["blocks-$relation-{$relationItem->id}_$childRepeaterName"] = $childRepeaterItems;
+                    $fields['repeaters']["$repeaterName|blocks-$relation-{$relationItem->id}|$childRepeaterName"] = $childRepeaterItems;
                     $repeatersFields = array_merge(
                         $repeatersFields,
-                        $relatedItemFormFields['repeaterFields'][$childRepeaterName]
+                        $relatedItemFormFields['repeaterFields'][$childRepeaterName] ?? []
                     );
                     $repeatersMedias = array_merge(
                         $repeatersMedias,
-                        $relatedItemFormFields['repeaterMedias'][$childRepeaterName]
+                        $relatedItemFormFields['repeaterMedias'][$childRepeaterName] ?? []
                     );
                     $repeatersFiles = array_merge(
                         $repeatersFiles,
-                        $relatedItemFormFields['repeaterFiles'][$childRepeaterName]
+                        $relatedItemFormFields['repeaterFiles'][$childRepeaterName] ?? []
                     );
                     $repeatersBrowsers = array_merge(
                         $repeatersBrowsers,
-                        $relatedItemFormFields['repeaterBrowsers'][$childRepeaterName]
+                        $relatedItemFormFields['repeaterBrowsers'][$childRepeaterName] ?? []
                     );
                 }
             }
@@ -613,22 +613,22 @@ function ($files, $role) use ($locale, $relation, $relationItem) {
 
             if (isset($relatedItemFormFields['repeaters'])) {
                 foreach ($relatedItemFormFields['repeaters'] as $childRepeaterName => $childRepeaterItems) {
-                    $fields['repeaters']["blocks-$relation-{$relationItem->id}_$childRepeaterName"] = $childRepeaterItems;
+                    $fields['repeaters']["$repeaterName|blocks-$relation-{$relationItem->id}|$childRepeaterName"] = $childRepeaterItems;
                     $repeatersFields = array_merge(
                         $repeatersFields,
-                        $relatedItemFormFields['repeaterFields'][$childRepeaterName]
+                        $relatedItemFormFields['repeaterFields'][$childRepeaterName] ?? []
                     );
                     $repeatersMedias = array_merge(
                         $repeatersMedias,
-                        $relatedItemFormFields['repeaterMedias'][$childRepeaterName]
+                        $relatedItemFormFields['repeaterMedias'][$childRepeaterName] ?? []
                     );
                     $repeatersFiles = array_merge(
                         $repeatersFiles,
-                        $relatedItemFormFields['repeaterFiles'][$childRepeaterName]
+                        $relatedItemFormFields['repeaterFiles'][$childRepeaterName] ?? []
                     );
                     $repeatersBrowsers = array_merge(
                         $repeatersBrowsers,
-                        $relatedItemFormFields['repeaterBrowsers'][$childRepeaterName]
+                        $relatedItemFormFields['repeaterBrowsers'][$childRepeaterName] ?? []
                     );
                 }
             }