FIX Ensure schema data includes attributes

src/Forms/FormField.php

@@ -1493,6 +1493,14 @@ public function getSchemaDataDefaults()
         if ($titleTip instanceof Tip) {
             $data['titleTip'] = $titleTip->getTipSchema();
         }
+        $attributes = $this->getAttributes();
+        // Remove value from attributes because otherwise it breaks react fields
+        unset($attributes['value']);
+        // Remove above attributes from attributes list to avoid double-ups
+        foreach (array_keys($data) as $key) {
+            unset($attributes[$key]);
+        }
+        $data['attributes'] = $attributes;
         return $data;
     }
 

src/Forms/SearchableDropdownTrait.php

@@ -312,7 +312,6 @@ public function getAttributes(): array
             parent::getAttributes(),
             [
                 'name' => $name,
-                'data-schema' => json_encode($this->getSchemaData()),
             ]
         );
     }

src/Forms/TreeDropdownField.php

@@ -620,8 +620,6 @@ public function getAttributes()
         $attributes = [
             'class' => $this->extraClass(),
             'id' => $this->ID(),
-            'data-schema' => json_encode($this->getSchemaData()),
-            'data-state' => json_encode($this->getSchemaState()),
         ];
 
         $attributes = array_merge($attributes, $this->attributes);

templates/SilverStripe/Forms/TreeDropdownField.ss

@@ -1,6 +1,6 @@
 <div
 	class="TreeDropdownField<% if $extraClass %> $extraClass<% end_if %><% if $ShowSearch %> searchable<% end_if %>"
-	$AttributesHTML('class')
+	$AttributesHTML('class') data-schema="$SchemaData.JSON" data-state="$SchemaState.JSON"
 	<% if $Metadata %>data-metadata="$Metadata.ATT"<% end_if %>
 >
 	<input id="$ID" type="hidden" name="$Name.ATT" value="$Value.ATT" />

tests/php/Forms/FormFieldTest.php

@@ -414,6 +414,16 @@ public function testGetSchemaDataDefaultsTitleTip()
         $this->assertSame('Test tip', $schema['titleTip']['content']);
     }
 
+    public function testGetSchemaDataDefaultsAttributes()
+    {
+        $field = new FormField('MyField');
+        $field->setAttribute('foo', 'bar');
+        $this->assertEquals('bar', $field->getAttribute('foo'));
+        $schema = $field->getSchemaDataDefaults();
+        $this->assertArrayHasKey('foo', $schema['attributes']);
+        $this->assertEquals('bar', $schema['attributes']['foo']);
+    }
+
     public function testGetSchemaData()
     {
         $field = new FormField('MyField');