Removed unnecessary animated container

sunarya-thito · Nov 1, 2024 · 91cb6d8 · 91cb6d8
1 parent 0f57b07
commit 91cb6d8
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 182 deletions.
diff --git a/lib/src/components/form/radio_group.dart b/lib/src/components/form/radio_group.dart
@@ -238,12 +238,11 @@ class _RadioCardState<T> extends State<RadioCard<T>> with FormValueSupplier {
               borderRadius: theme.borderRadiusMd,
               padding: EdgeInsets.zero,
               clipBehavior: Clip.antiAlias,
+              duration: kDefaultDuration,
+              fillColor: _hovering
+                  ? theme.colorScheme.muted
+                  : theme.colorScheme.background,
               child: Container(
-                decoration: BoxDecoration(
-                  color: _hovering
-                      ? theme.colorScheme.muted
-                      : theme.colorScheme.background,
-                ),
                 padding: EdgeInsets.all(16 * theme.scaling),
                 child: AnimatedPadding(
                   duration: kDefaultDuration,

diff --git a/lib/src/components/form/slider.dart b/lib/src/components/form/slider.dart
@@ -161,7 +161,7 @@ class _SliderState extends State<Slider> with FormValueSupplier {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     final scaling = theme.scaling;
-    return ShadcnAnimatedContainer(
+    return AnimatedContainer(
       duration: kDefaultDuration,
       constraints: BoxConstraints(
         minWidth: 20 * scaling,
@@ -498,8 +498,7 @@ class _SliderState extends State<Slider> with FormValueSupplier {
       top: 0,
       bottom: 0,
       child: Center(
-        child: ShadcnAnimatedContainer(
-          duration: kDefaultDuration,
+        child: Container(
           height: 6 * scaling,
           decoration: BoxDecoration(
             color: theme.colorScheme.primary.scaleAlpha(0.2),
@@ -545,8 +544,7 @@ class _SliderState extends State<Slider> with FormValueSupplier {
       top: 0,
       bottom: 0,
       child: Center(
-        child: ShadcnAnimatedContainer(
-          duration: kDefaultDuration,
+        child: Container(
           height: 6 * scaling,
           decoration: BoxDecoration(
             color: theme.colorScheme.primary,
@@ -567,8 +565,7 @@ class _SliderState extends State<Slider> with FormValueSupplier {
       top: 0,
       bottom: 0,
       child: Center(
-        child: ShadcnAnimatedContainer(
-          duration: kDefaultDuration,
+        child: Container(
           height: 6 * scaling,
           decoration: BoxDecoration(
             color: theme.colorScheme.primary.scaleAlpha(0.2),
@@ -629,8 +626,7 @@ class _SliderState extends State<Slider> with FormValueSupplier {
             },
           ),
         },
-        child: ShadcnAnimatedContainer(
-          duration: kDefaultDuration,
+        child: Container(
           width: 16 * scaling,
           height: 16 * scaling,
           decoration: BoxDecoration(

diff --git a/lib/src/components/form/star_rating.dart b/lib/src/components/form/star_rating.dart
@@ -72,8 +72,7 @@ class _StarRatingState extends State<StarRating> with FormValueSupplier {
     var starInnerRadiusRatio = widget.starInnerRadiusRatio ?? 0.4;
     var starRotation = widget.starRotation ?? 0.0;
     var starSize = widget.starSize ?? 24.0;
-    return ShadcnAnimatedContainer(
-      duration: kDefaultDuration,
+    return Container(
       width: starSize * scaling,
       height: starSize * scaling,
       decoration: ShapeDecoration(

diff --git a/lib/src/components/layout/accordion.dart b/lib/src/components/layout/accordion.dart
@@ -29,8 +29,7 @@ class _AccordionState extends State<Accordion> {
               children: [
                 ...join(
                     widget.items,
-                    ShadcnAnimatedContainer(
-                      duration: kDefaultDuration,
+                    Container(
                       color: theme.colorScheme.muted,
                       height: 1 * scaling,
                     )),
@@ -226,8 +225,7 @@ class _AccordionTriggerState extends State<AccordionTrigger> {
             _hovering = value;
           });
         },
-        child: ShadcnAnimatedContainer(
-          duration: kDefaultDuration,
+        child: Container(
           decoration: BoxDecoration(
             border: Border.all(
               color: _focusing

diff --git a/lib/src/components/layout/card.dart b/lib/src/components/layout/card.dart
@@ -12,6 +12,7 @@ class Card extends StatelessWidget {
   final List<BoxShadow>? boxShadow;
   final double? surfaceOpacity;
   final double? surfaceBlur;
+  final Duration? duration;
 
   const Card({
     super.key,
@@ -26,6 +27,7 @@ class Card extends StatelessWidget {
     this.boxShadow,
     this.surfaceOpacity,
     this.surfaceBlur,
+    this.duration,
   });
 
   @override
@@ -44,6 +46,7 @@ class Card extends StatelessWidget {
       padding: padding ?? (EdgeInsets.all(16 * scaling)),
       surfaceOpacity: surfaceOpacity,
       surfaceBlur: surfaceBlur,
+      duration: duration,
       child: DefaultTextStyle.merge(
         child: child,
         style: TextStyle(
@@ -66,6 +69,7 @@ class SurfaceCard extends StatelessWidget {
   final List<BoxShadow>? boxShadow;
   final double? surfaceOpacity;
   final double? surfaceBlur;
+  final Duration? duration;
 
   const SurfaceCard({
     super.key,
@@ -80,6 +84,7 @@ class SurfaceCard extends StatelessWidget {
     this.boxShadow,
     this.surfaceOpacity,
     this.surfaceBlur,
+    this.duration,
   });
 
   @override
@@ -105,6 +110,7 @@ class SurfaceCard extends StatelessWidget {
       padding: padding,
       surfaceOpacity: surfaceOpacity ?? theme.surfaceOpacity,
       surfaceBlur: surfaceBlur ?? theme.surfaceBlur,
+      duration: duration,
       child: child,
     );
   }

diff --git a/lib/src/components/layout/outlined_container.dart b/lib/src/components/layout/outlined_container.dart
@@ -67,6 +67,7 @@ class OutlinedContainer extends StatefulWidget {
   final double? surfaceBlur;
   final double? width;
   final double? height;
+  final Duration? duration;
   const OutlinedContainer({
     super.key,
     required this.child,
@@ -82,6 +83,7 @@ class OutlinedContainer extends StatefulWidget {
     this.surfaceBlur,
     this.width,
     this.height,
+    this.duration,
   });
 
   @override
@@ -102,11 +104,11 @@ class _OutlinedContainerState extends State<OutlinedContainer> {
     if (widget.surfaceOpacity != null) {
       backgroundColor = backgroundColor.scaleAlpha(widget.surfaceOpacity!);
     }
-    Widget childWidget = ShadcnAnimatedContainer(
+    Widget childWidget = AnimatedContainer(
+      duration: widget.duration ?? Duration.zero,
       key: _mainContainerKey,
       width: widget.width,
       height: widget.height,
-      duration: kDefaultDuration,
       decoration: BoxDecoration(
         color: backgroundColor,
         border: Border.all(
@@ -117,10 +119,8 @@ class _OutlinedContainerState extends State<OutlinedContainer> {
         borderRadius: borderRadius,
         boxShadow: widget.boxShadow,
       ),
-      // padding: widget.padding,
-      // clipBehavior: widget.clipBehavior,
-      child: ShadcnAnimatedContainer(
-        duration: kDefaultDuration,
+      child: AnimatedContainer(
+        duration: widget.duration ?? Duration.zero,
         padding: widget.padding,
         clipBehavior: widget.clipBehavior,
         decoration: BoxDecoration(

diff --git a/lib/src/components/layout/scaffold.dart b/lib/src/components/layout/scaffold.dart
@@ -147,8 +147,7 @@ class ScaffoldState extends State<Scaffold> {
     final theme = Theme.of(context);
     final viewInsets = MediaQuery.viewInsetsOf(context);
     return DrawerOverlay(
-      child: ShadcnAnimatedContainer(
-        duration: kDefaultDuration,
+      child: Container(
         color: theme.colorScheme.background,
         child: _ScaffoldFlex(
           floatingHeader: widget.floatingHeader,

diff --git a/lib/src/components/navigation/navigation_bar.dart b/lib/src/components/navigation/navigation_bar.dart
@@ -130,8 +130,7 @@ class _NavigationBarState extends State<NavigationBar>
           selectedIndex: widget.index,
           onSelected: _onSelected,
         ),
-        child: ShadcnAnimatedContainer(
-          duration: kDefaultDuration,
+        child: Container(
           color: widget.backgroundColor,
           padding: resolvedPadding,
           child: _wrapIntrinsic(
@@ -265,8 +264,7 @@ class _NavigationRailState extends State<NavigationRail>
       ),
       child: SurfaceBlur(
         surfaceBlur: widget.surfaceBlur,
-        child: ShadcnAnimatedContainer(
-          duration: kDefaultDuration,
+        child: Container(
           color: widget.backgroundColor ??
               (theme.colorScheme.background
                   .scaleAlpha(widget.surfaceOpacity ?? 1)),
@@ -370,11 +368,8 @@ class _NavigationSidebarState extends State<NavigationSidebar>
             widget.constraints ?? getDefaultConstraints(context, theme),
         child: SurfaceBlur(
           surfaceBlur: widget.surfaceBlur,
-          child: ShadcnAnimatedContainer(
-            duration: kDefaultDuration,
-            color: widget.backgroundColor ??
-                (theme.colorScheme.background
-                    .scaleAlpha(widget.surfaceOpacity ?? 1)),
+          child: Container(
+            color: widget.backgroundColor,
             child: ClipRect(
               child: CustomScrollView(
                 clipBehavior: Clip.none,
@@ -821,8 +816,7 @@ class NavigationLabel extends StatelessWidget implements NavigationBarItem {
               curve: Curves.easeInOut,
             );
           },
-          child: ShadcnAnimatedContainer(
-            duration: kDefaultDuration,
+          child: Container(
             alignment: alignment,
             padding: padding ?? EdgeInsets.symmetric(horizontal: 16 * scaling),
             // child: OverflowMarquee(child: child),

diff --git a/lib/src/components/navigation/tabs.dart b/lib/src/components/navigation/tabs.dart
@@ -39,7 +39,7 @@ class Tabs extends StatelessWidget {
                     child: MouseRegion(
                       hitTestBehavior: HitTestBehavior.translucent,
                       cursor: SystemMouseCursors.click,
-                      child: ShadcnAnimatedContainer(
+                      child: AnimatedContainer(
                         duration: const Duration(
                             milliseconds:
                                 50), // slightly faster than kDefaultDuration

diff --git a/lib/src/components/overlay/tooltip.dart b/lib/src/components/overlay/tooltip.dart
@@ -28,8 +28,7 @@ class TooltipContainer extends StatelessWidget {
     if (surfaceOpacity != null) {
       backgroundColor = backgroundColor.scaleAlpha(surfaceOpacity);
     }
-    Widget animatedContainer = ShadcnAnimatedContainer(
-      duration: kDefaultDuration,
+    Widget animatedContainer = Container(
       padding: const EdgeInsets.symmetric(
             horizontal: 12,
             vertical: 6,

diff --git a/lib/src/components/text/text.dart b/lib/src/components/text/text.dart
@@ -331,8 +331,7 @@ extension TextExtension on Widget {
         child = WrappedText(
             style: (context, theme) => theme.typography.h2, child: this);
       }
-      return ShadcnAnimatedContainer(
-        duration: kDefaultDuration,
+      return Container(
         margin: const EdgeInsets.only(top: 40),
         padding: const EdgeInsets.only(bottom: 8),
         decoration: BoxDecoration(