Merge pull request #243 from conceptadev/feature/fix-box-widgets

lib/src/factory/mix_provider_data.dart

@@ -5,6 +5,7 @@ import '../attributes/variant_attribute.dart';
 import '../core/attribute.dart';
 import '../core/attributes_map.dart';
 import '../helpers/compare_mixin.dart';
+import '../helpers/constants.dart';
 import '../theme/token_resolver.dart';
 import '../widgets/pressable/pressable_util.dart';
 import 'style_mix.dart';
@@ -187,7 +188,7 @@ class AnimatedData with Comparable {
 
   factory AnimatedData.withDefaults({Duration? duration, Curve? curve}) {
     return AnimatedData(
-      duration: duration ?? const Duration(milliseconds: 150),
+      duration: duration ?? kDefaultAnimationDuration,
       curve: curve ?? Curves.linear,
     );
   }

lib/src/helpers/constants.dart

@@ -0,0 +1 @@
+const kDefaultAnimationDuration = Duration(milliseconds: 200);

lib/src/specs/container/box_spec.dart

@@ -84,26 +84,30 @@ class BoxSpec extends Spec<BoxSpec> {
 
   @override
   BoxSpec lerp(BoxSpec? other, double t) {
+    if (other == null) return this;
+
     return BoxSpec(
-      alignment: AlignmentGeometry.lerp(alignment, other?.alignment, t),
-      padding: EdgeInsetsGeometry.lerp(padding, other?.padding, t),
-      margin: EdgeInsetsGeometry.lerp(margin, other?.margin, t),
-      constraints: BoxConstraints.lerp(constraints, other?.constraints, t),
-      decoration: Decoration.lerp(decoration, other?.decoration, t),
+      alignment: AlignmentGeometry.lerp(alignment, other.alignment, t),
+      padding: EdgeInsetsGeometry.lerp(padding, other.padding, t),
+      margin: EdgeInsetsGeometry.lerp(margin, other.margin, t),
+      constraints: BoxConstraints.lerp(constraints, other.constraints, t),
+      decoration: Decoration.lerp(decoration, other.decoration, t),
       foregroundDecoration: Decoration.lerp(
         foregroundDecoration,
-        other?.foregroundDecoration,
+        other.foregroundDecoration,
         t,
       ),
-      transform: Matrix4Tween(begin: transform, end: other?.transform).lerp(t),
+      transform: transform != null && other.transform != null
+          ? Matrix4Tween(begin: transform, end: other.transform).lerp(t)
+          : lerpSnap(transform, other.transform, t),
       transformAlignment: AlignmentGeometry.lerp(
         transformAlignment,
-        other?.transformAlignment,
+        other.transformAlignment,
         t,
       ),
-      clipBehavior: lerpSnap(clipBehavior, other?.clipBehavior, t),
-      width: lerpDouble(width, other?.width, t),
-      height: lerpDouble(height, other?.height, t),
+      clipBehavior: lerpSnap(clipBehavior, other.clipBehavior, t),
+      width: lerpDouble(width, other.width, t),
+      height: lerpDouble(height, other.height, t),
     );
   }
 
@@ -123,7 +127,7 @@ class BoxSpec extends Spec<BoxSpec> {
       ];
 }
 
-class BoxSpecTween extends Tween<BoxSpec> {
+class BoxSpecTween extends Tween<BoxSpec?> {
   BoxSpecTween({super.begin, super.end});
 
   @override

lib/src/specs/container/box_widget.dart

@@ -55,16 +55,16 @@ class Box extends StyledWidget {
     // This method uses `withMix` to get the `MixData` and then applies it to `MixedBox`,
     // effectively styling the [child].
     return withMix(context, (mix) {
-      final style = BoxSpec.of(mix);
+      final spec = BoxSpec.of(mix);
 
       return mix.isAnimated
           ? AnimatedMixedBox(
-              style: style,
+              spec: spec,
               duration: mix.animation!.duration,
               curve: mix.animation!.curve,
               child: child,
             )
-          : MixedBox(spec: style, child: child);
+          : MixedBox(spec: spec, child: child);
     });
   }
 }
@@ -96,7 +96,7 @@ class MixedBox extends StatelessWidget {
 
 class AnimatedMixedBox extends ImplicitlyAnimatedWidget {
   const AnimatedMixedBox({
-    required this.style,
+    required this.spec,
     super.key,
     this.child,
     required super.duration,
@@ -105,7 +105,7 @@ class AnimatedMixedBox extends ImplicitlyAnimatedWidget {
   });
 
   final Widget? child;
-  final BoxSpec style;
+  final BoxSpec spec;
 
   @override
   AnimatedWidgetBaseState<AnimatedMixedBox> createState() =>
@@ -121,9 +121,9 @@ class _AnimatedBoxSpecWidgetState
   void forEachTween(TweenVisitor<dynamic> visitor) {
     _boxSpec = visitor(
       _boxSpec,
-      widget.style,
+      widget.spec,
       // ignore: avoid-dynamic
-      (dynamic value) => BoxSpecTween(begin: value as BoxSpec),
+      (dynamic value) => BoxSpecTween(begin: value as BoxSpec?),
     ) as BoxSpecTween?;
   }
 

lib/src/specs/icon/icon_spec.dart

@@ -44,17 +44,17 @@ class IconSpec extends Spec<IconSpec> {
   }
 
   @override
-  IconSpec lerp(IconSpec other, double t) {
+  IconSpec lerp(IconSpec? other, double t) {
     return IconSpec(
-      color: Color.lerp(color, other.color, t),
-      size: lerpDouble(size, other.size, t),
-      weight: lerpDouble(weight, other.weight, t),
-      grade: lerpDouble(grade, other.grade, t),
-      opticalSize: lerpDouble(opticalSize, other.opticalSize, t),
-      shadows: Shadow.lerpList(shadows, other.shadows, t),
+      color: Color.lerp(color, other?.color, t),
+      size: lerpDouble(size, other?.size, t),
+      weight: lerpDouble(weight, other?.weight, t),
+      grade: lerpDouble(grade, other?.grade, t),
+      opticalSize: lerpDouble(opticalSize, other?.opticalSize, t),
+      shadows: Shadow.lerpList(shadows, other?.shadows, t),
       textDirection: textDirection,
       applyTextScaling: applyTextScaling,
-      fill: lerpDouble(fill, other.fill, t),
+      fill: lerpDouble(fill, other?.fill, t),
     );
   }
 

lib/src/widgets/pressable/pressable_widget.dart

@@ -2,6 +2,7 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 
 import '../../factory/style_mix.dart';
+import '../../helpers/constants.dart';
 import '../../specs/container/box_widget.dart';
 import '../../utils/custom_focusable_action_detector.dart';
 import 'pressable_state.dart';
@@ -21,7 +22,7 @@ class PressableBox extends StatelessWidget {
     @Deprecated('Use hitTestBehavior instead') HitTestBehavior? behavior,
     this.hitTestBehavior,
     @Deprecated('Use AnimatedStyle instead')
-    this.animationDuration = const Duration(milliseconds: 125),
+    this.animationDuration = kDefaultAnimationDuration,
     @Deprecated('Use AnimatedStyle instead')
     this.animationCurve = Curves.linear,
     this.disabled = false,
@@ -94,7 +95,7 @@ class Pressable extends _PressableBuilderWidget {
           onPress: onPress ?? onPressed,
           hitTestBehavior:
               hitTestBehavior ?? behavior ?? HitTestBehavior.opaque,
-          unpressDelay: unpressDelay ?? const Duration(milliseconds: 150),
+          unpressDelay: unpressDelay ?? kDefaultAnimationDuration,
         );
 
   @override