Fix attribute fieldtypes in 1.5

packages/admin/src/Support/Forms/AttributeData.php

@@ -52,12 +52,14 @@ public function getFilamentComponent(Attribute $attribute): Component
             ->label(
                 $attribute->translate('name')
             )
-            ->formatStateUsing(function ($state) {
-                if ($state instanceof FieldType) {
-                    return $state->getValue();
+            ->formatStateUsing(function ($state) use ($attribute) {
+                $value = $state instanceof FieldType ? $state->getValue() : $state;
+
+                if ($value === null) {
+                    $value = (new $attribute->type)->getValue();
                 }
 
-                return $state;
+                return is_string($value) && blank($value) ? null : $value;
             })
             ->mutateStateForValidationUsing(function ($state) {
                 if ($state instanceof FieldType) {

packages/admin/src/Support/Forms/Components/Attributes.php

@@ -51,6 +51,30 @@ public function getKey(bool $isAbsolute = true): ?string
         return 'attributeData'.$this->modelClassOverride;
     }
 
+    public function loadStateFromRelationships(bool $hydrateAll = false): void
+    {
+        parent::loadStateFromRelationships($hydrateAll);
+
+        $rawState = $this->getRawState();
+
+        if (! ($rawState instanceof Arrayable || is_array($rawState))) {
+            return;
+        }
+
+        $data = $rawState instanceof Arrayable ? $rawState->toArray() : $rawState;
+
+        foreach ($data as $key => $value) {
+            if ($value instanceof FieldType) {
+                $fieldValue = $value->getValue();
+                if (is_scalar($fieldValue) || is_null($fieldValue)) {
+                    $data[$key] = is_string($fieldValue) && blank($fieldValue) ? null : $fieldValue;
+                }
+            }
+        }
+
+        $this->rawState($data);
+    }
+
     public function hydrateState(?array &$hydratedDefaultState, bool $shouldCallHydrationHooks = true): void
     {
         if ($hydratedDefaultState === null) {