move inspector configs within groupDefinitions array

Author: mjauvin

formwidgets/Blocks.php

@@ -27,11 +27,6 @@ class Blocks extends Repeater
      */
     public string|array|null $tags = null;
 
-    /**
-     * List of inspector configs for the blocks.
-     */
-    public array $inspectorConfigs = [];
-
     /**
      * Configuration stored with each index.
      */
@@ -212,10 +207,9 @@ protected function processGroupMode(): void
                 'name' => array_get($config, 'name'),
                 'icon' => array_get($config, 'icon', 'icon-square-o'),
                 'description' => array_get($config, 'description'),
-                'fields' => array_get($config, 'fields')
+                'fields' => array_get($config, 'fields'),
+                'config' => array_get($config, 'config', null),
             ];
-
-            $this->inspectorConfigs[$code] = array_get($config, 'config', null);
         }
 
         // Sort the builder blocks by translated name label
@@ -299,15 +293,15 @@ public function getGroupIcon(string $groupCode): ?string
      */
     public function hasInspectorConfig(string $groupCode): bool
     {
-        return isset($this->inspectorConfigs[$groupCode]);
+        return isset($this->groupDefinitions[$groupCode]['config']);
     }
 
     /**
      * Returns the Inspector config, as a JSON string, for the given group code.
      */
     public function getInspectorConfig(string $groupCode): string
     {
-        return json_encode($this->processInspectorConfig(array_get($this->inspectorConfigs, $groupCode, [])));
+        return json_encode($this->processInspectorConfig(array_get($this->groupDefinitions, $groupCode . '.config', [])));
     }
 
     /**