fix: [MDS-525] Fix EdgeInsetsGeometry behaviour that is passed in as …

…props (#166)
coingaming · May 17, 2023 · c7552e3 · c7552e3
1 parent 5ef89a5
commit c7552e3
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 22 deletions.
diff --git a/lib/src/widgets/buttons/button.dart b/lib/src/widgets/buttons/button.dart
@@ -355,12 +355,14 @@ class MoonButton extends StatelessWidget {
 
     final EdgeInsets resolvedDirectionalPadding = effectivePadding.resolve(Directionality.of(context));
 
-    final EdgeInsetsDirectional correctedPadding = EdgeInsetsDirectional.fromSTEB(
-      leading == null && label != null ? resolvedDirectionalPadding.left : 0,
-      resolvedDirectionalPadding.top,
-      trailing == null && label != null ? resolvedDirectionalPadding.right : 0,
-      resolvedDirectionalPadding.bottom,
-    );
+    final EdgeInsetsGeometry correctedPadding = padding == null
+        ? EdgeInsetsDirectional.fromSTEB(
+            leading == null && label != null ? resolvedDirectionalPadding.left : 0,
+            resolvedDirectionalPadding.top,
+            trailing == null && label != null ? resolvedDirectionalPadding.right : 0,
+            resolvedDirectionalPadding.bottom,
+          )
+        : resolvedDirectionalPadding;
 
     final Duration effectiveHoverEffectDuration = hoverEffectDuration ??
         context.moonEffects?.controlHoverEffect.hoverDuration ??

diff --git a/lib/src/widgets/chips/chip.dart b/lib/src/widgets/chips/chip.dart
@@ -229,12 +229,14 @@ class MoonChip extends StatelessWidget {
 
     final EdgeInsets resolvedDirectionalPadding = effectivePadding.resolve(Directionality.of(context));
 
-    final EdgeInsetsDirectional correctedPadding = EdgeInsetsDirectional.fromSTEB(
-      leading == null && label != null ? resolvedDirectionalPadding.left : 0,
-      resolvedDirectionalPadding.top,
-      trailing == null && label != null ? resolvedDirectionalPadding.right : 0,
-      resolvedDirectionalPadding.bottom,
-    );
+    final EdgeInsetsGeometry correctedPadding = padding == null
+        ? EdgeInsetsDirectional.fromSTEB(
+            leading == null && label != null ? resolvedDirectionalPadding.left : 0,
+            resolvedDirectionalPadding.top,
+            trailing == null && label != null ? resolvedDirectionalPadding.right : 0,
+            resolvedDirectionalPadding.bottom,
+          )
+        : resolvedDirectionalPadding;
     return MoonBaseControl(
       autofocus: autofocus,
       isFocusable: isFocusable,

diff --git a/lib/src/widgets/popover/popover.dart b/lib/src/widgets/popover/popover.dart
@@ -366,6 +366,8 @@ class MoonPopoverState extends State<MoonPopover> with RouteAware, SingleTickerP
     final EdgeInsetsGeometry effectiveContentPadding =
         widget.contentPadding ?? context.moonTheme?.popoverTheme.properties.contentPadding ?? const EdgeInsets.all(12);
 
+    final EdgeInsets resolvedContentPadding = effectiveContentPadding.resolve(Directionality.of(context));
+
     final List<BoxShadow> effectivePopoverShadows =
         widget.popoverShadows ?? context.moonTheme?.popoverTheme.shadows.popoverShadows ?? MoonShadows.light.sm;
 
@@ -448,7 +450,7 @@ class MoonPopoverState extends State<MoonPopover> with RouteAware, SingleTickerP
                   child: Container(
                     key: _popoverKey,
                     constraints: BoxConstraints(maxWidth: popoverPositionParameters.popoverMaxWidth),
-                    padding: effectiveContentPadding,
+                    padding: resolvedContentPadding,
                     decoration: ShapeDecoration(
                       color: effectiveBackgroundColor,
                       shadows: effectivePopoverShadows,

diff --git a/lib/src/widgets/tag/tag.dart b/lib/src/widgets/tag/tag.dart
@@ -121,12 +121,14 @@ class MoonTag extends StatelessWidget {
 
     final EdgeInsets resolvedDirectionalPadding = effectivePadding.resolve(Directionality.of(context));
 
-    final EdgeInsetsDirectional correctedPadding = EdgeInsetsDirectional.fromSTEB(
-      leading == null && label != null ? resolvedDirectionalPadding.left : 0,
-      resolvedDirectionalPadding.top,
-      trailing == null && label != null ? resolvedDirectionalPadding.right : 0,
-      resolvedDirectionalPadding.bottom,
-    );
+    final EdgeInsetsGeometry correctedPadding = padding == null
+        ? EdgeInsetsDirectional.fromSTEB(
+            leading == null && label != null ? resolvedDirectionalPadding.left : 0,
+            resolvedDirectionalPadding.top,
+            trailing == null && label != null ? resolvedDirectionalPadding.right : 0,
+            resolvedDirectionalPadding.bottom,
+          )
+        : resolvedDirectionalPadding;
 
     return Semantics(
       label: semanticLabel,

diff --git a/lib/src/widgets/toast/toast.dart b/lib/src/widgets/toast/toast.dart
@@ -126,6 +126,8 @@ class MoonToast {
     final EdgeInsetsGeometry effectiveContentPadding =
         padding ?? context.moonTheme?.toastTheme.properties.contentPadding ?? EdgeInsets.all(MoonSizes.sizes.x2s);
 
+    final EdgeInsets resolvedContentPadding = effectiveContentPadding.resolve(Directionality.of(context));
+
     final List<BoxShadow> effectiveToastShadows =
         toastShadows ?? context.moonTheme?.toastTheme.shadows.toastShadows ?? MoonShadows.light.lg;
 
@@ -170,8 +172,8 @@ class MoonToast {
                   duration: effectiveTransitionDuration,
                   style: DefaultTextStyle.of(context).style.copyWith(color: effectiveElementColor),
                   child: Container(
-                    margin: margin ?? effectiveContentPadding,
-                    padding: effectiveContentPadding,
+                    margin: margin ?? resolvedContentPadding,
+                    padding: resolvedContentPadding,
                     decoration: ShapeDecoration(
                       color: effectiveBackgroundColor,
                       shadows: effectiveToastShadows,

diff --git a/lib/src/widgets/tooltip/tooltip.dart b/lib/src/widgets/tooltip/tooltip.dart
@@ -416,6 +416,8 @@ class _MoonTooltipState extends State<MoonTooltip> with RouteAware, SingleTicker
     final EdgeInsetsGeometry effectiveContentPadding =
         widget.contentPadding ?? context.moonTheme?.tooltipTheme.properties.contentPadding ?? const EdgeInsets.all(12);
 
+    final EdgeInsets resolvedContentPadding = effectiveContentPadding.resolve(Directionality.of(context));
+
     final List<BoxShadow> effectiveTooltipShadows =
         widget.tooltipShadows ?? context.moonTheme?.tooltipTheme.shadows.tooltipShadows ?? MoonShadows.light.sm;
 
@@ -504,7 +506,7 @@ class _MoonTooltipState extends State<MoonTooltip> with RouteAware, SingleTicker
                   child: Container(
                     key: _tooltipKey,
                     constraints: BoxConstraints(maxWidth: tooltipPositionParameters.tooltipMaxWidth),
-                    padding: effectiveContentPadding,
+                    padding: resolvedContentPadding,
                     decoration: ShapeDecoration(
                       color: effectiveBackgroundColor,
                       shadows: effectiveTooltipShadows,