fix merge bug

conceptadev · Feb 2, 2024 · 6d19a9f · 6d19a9f
1 parent c3c5a2b
commit 6d19a9f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/src/attributes/decoration/decoration_dto.dart b/lib/src/attributes/decoration/decoration_dto.dart
@@ -148,7 +148,7 @@ class BoxDecorationDto extends DecorationDto<BoxDecoration> {
       boxShadow: boxShadow?.merge(other.boxShadow) ?? other.boxShadow,
       shape: other.shape ?? shape,
       backgroundBlendMode: other.backgroundBlendMode ?? backgroundBlendMode,
-      image: other.image ?? image,
+      image: image?.merge(other.image),
     );
   }
 

diff --git a/lib/src/attributes/decoration/image/decoration_image_dto.dart b/lib/src/attributes/decoration/image/decoration_image_dto.dart
@@ -4,7 +4,7 @@ import '../../../../mix.dart';
 
 class DecorationImageDto extends Dto<DecorationImage>
     with Mergeable<DecorationImageDto> {
-  final ImageProvider image;
+  final ImageProvider? image;
   final BoxFit? fit;
 
   const DecorationImageDto({
@@ -37,7 +37,7 @@ class DecorationImageDto extends Dto<DecorationImage>
   @override
   DecorationImage resolve(MixData mix) {
     return DecorationImage(
-      image: image,
+      image: image ?? const AssetImage(''),
       fit: fit,
     );
   }

diff --git a/lib/src/attributes/decoration/image/decoration_image_util.dart b/lib/src/attributes/decoration/image/decoration_image_util.dart
@@ -27,7 +27,7 @@ class DecorationImageUtility<T extends StyleAttribute>
   }) {
     return builder(
       DecorationImageDto(
-        image: image ?? const AssetImage(''),
+        image: image,
         fit: fit,
       ),
     );