Getting rid of containers

packages/flutter/lib/src/cupertino/context_menu.dart

@@ -687,7 +687,7 @@ class _DecoyChildState extends State<_DecoyChild> with TickerProviderStateMixin
   Widget _buildAnimation(BuildContext context, Widget? child) {
     return Positioned.fromRect(
       rect: _rect.value!,
-      child: Container(
+      child: DecoratedBox(
         decoration: _boxDecoration.value,
         child: widget.child,
       ),

packages/flutter/lib/src/cupertino/context_menu_action.dart

@@ -120,33 +120,30 @@ class _CupertinoContextMenuActionState extends State<CupertinoContextMenuAction>
           ),
           child: Semantics(
             button: true,
-            child: Container(
+            child: DecoratedBox(
               decoration: BoxDecoration(
                 color: _isPressed
                   ? CupertinoDynamicColor.resolve(_kBackgroundColorPressed, context)
                   : CupertinoDynamicColor.resolve(_kBackgroundColor, context),
               ),
-              padding: const EdgeInsets.only(
-                top: 8,
-                bottom: 8,
-                left: 15.5,
-                right: 17.5,
-              ),
-              child: DefaultTextStyle(
-                style: _textStyle,
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: <Widget>[
-                    Flexible(
-                      child: widget.child,
-                    ),
-                    if (widget.trailingIcon != null)
-                      Icon(
-                        widget.trailingIcon,
-                        color: _textStyle.color,
-                        size: 21.0,
+              child: Padding(
+                padding: const EdgeInsets.fromLTRB(15.5, 8.0, 17.5, 8.0),
+                child: DefaultTextStyle(
+                  style: _textStyle,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: <Widget>[
+                      Flexible(
+                        child: widget.child,
                       ),
-                  ],
+                      if (widget.trailingIcon != null)
+                        Icon(
+                          widget.trailingIcon,
+                          color: _textStyle.color,
+                          size: 21.0,
+                        ),
+                    ],
+                  ),
                 ),
               ),
             ),

packages/flutter/lib/src/cupertino/date_picker.dart

@@ -1076,17 +1076,18 @@ class _CupertinoDatePickerDateTimeState extends State<CupertinoDatePicker> {
         child: pickerBuilders[i](
           offAxisFraction,
           (BuildContext context, Widget? child) {
-            return Container(
-              alignment: i == columnWidths.length - 1
-                ? alignCenterLeft
-                : alignCenterRight,
+            return Padding(
               padding: padding,
-              child: Container(
+              child: Align(
                 alignment: i == columnWidths.length - 1 ? alignCenterLeft : alignCenterRight,
-                width: i == 0 || i == columnWidths.length - 1
-                  ? null
-                  : columnWidths[i] + _kDatePickerPadSize,
-                child: child,
+                child: ConstrainedBox(
+                  constraints: BoxConstraints(
+                    maxWidth: i == 0 || i == columnWidths.length - 1
+                        ? double.infinity
+                        : columnWidths[i] + _kDatePickerPadSize,
+                  ),
+                  child: child,
+                ),
               ),
             );
           },
@@ -1475,15 +1476,19 @@ class _CupertinoDatePickerDateState extends State<CupertinoDatePicker> {
         child: pickerBuilders[i](
           offAxisFraction,
           (BuildContext context, Widget? child) {
-            return Container(
-              alignment: i == columnWidths.length - 1
-                  ? alignCenterLeft
-                  : alignCenterRight,
-              padding: i == 0 ? null : padding,
-              child: Container(
-                alignment: i == 0 ? alignCenterLeft : alignCenterRight,
-                width: columnWidths[i] + _kDatePickerPadSize,
-                child: child,
+            return Padding(
+              padding: i == 0 ? EdgeInsets.zero : padding,
+              child: Align(
+                alignment: i == columnWidths.length - 1
+                    ? alignCenterLeft
+                    : alignCenterRight,
+                child: SizedBox(
+                  width: columnWidths[i] + _kDatePickerPadSize,
+                  child: Align(
+                    alignment: i == 0 ? alignCenterLeft : alignCenterRight,
+                    child: child,
+                  ),
+                ),
               ),
             );
           },
@@ -1774,17 +1779,21 @@ class _CupertinoDatePickerMonthYearState extends State<CupertinoDatePicker> {
         child: pickerBuilders[i](
           offAxisFraction,
           (BuildContext context, Widget? child) {
-            return Container(
-              alignment: last ? alignCenterLeft : alignCenterRight,
+            return Padding(
               padding: switch (textDirectionFactor) {
-                _ when first => null,
+                _ when first => EdgeInsets.zero,
                 -1 => const EdgeInsets.only(left: _kDatePickerPadSize),
                 _  => const EdgeInsets.only(right: _kDatePickerPadSize),
               },
-              child: Container(
-                alignment: first ? alignCenterLeft : alignCenterRight,
-                width: columnWidths[i] + _kDatePickerPadSize,
-                child: child,
+              child: Align(
+                alignment: last ? alignCenterLeft : alignCenterRight,
+                child: SizedBox(
+                  width: columnWidths[i] + _kDatePickerPadSize,
+                  child: Align(
+                    alignment: first ? alignCenterLeft : alignCenterRight,
+                    child: child,
+                  ),
+                ),
               ),
             );
           },
@@ -2127,22 +2136,24 @@ class _CupertinoTimerPickerState extends State<CupertinoTimerPicker> {
     );
 
     return IgnorePointer(
-      child: Container(
-        alignment: AlignmentDirectional.centerStart.resolve(textDirection),
+      child: Padding(
         padding: padding.resolve(textDirection),
-        child: SizedBox(
-          height: numberLabelHeight,
-          child: Baseline(
-            baseline: numberLabelBaseline,
-            baselineType: TextBaseline.alphabetic,
-            child: Text(
-              text,
-              style: const TextStyle(
-                fontSize: _kTimerPickerLabelFontSize,
-                fontWeight: FontWeight.w600,
+        child: Align(
+          alignment: AlignmentDirectional.centerStart.resolve(textDirection),
+          child: SizedBox(
+            height: numberLabelHeight,
+            child: Baseline(
+              baseline: numberLabelBaseline,
+              baselineType: TextBaseline.alphabetic,
+              child: Text(
+                text,
+                style: const TextStyle(
+                  fontSize: _kTimerPickerLabelFontSize,
+                  fontWeight: FontWeight.w600,
+                ),
+                maxLines: 1,
+                softWrap: false,
               ),
-              maxLines: 1,
-              softWrap: false,
             ),
           ),
         ),
@@ -2153,14 +2164,20 @@ class _CupertinoTimerPickerState extends State<CupertinoTimerPicker> {
   // The picker has to be wider than its content, since the separators
   // are part of the picker.
   Widget _buildPickerNumberLabel(String text, EdgeInsetsDirectional padding) {
-    return Container(
+    return SizedBox(
       width: _kTimerPickerColumnIntrinsicWidth + padding.horizontal,
-      padding: padding.resolve(textDirection),
-      alignment: AlignmentDirectional.centerStart.resolve(textDirection),
-      child: Container(
-        width: numberLabelWidth,
-        alignment: AlignmentDirectional.centerEnd.resolve(textDirection),
-        child: Text(text, softWrap: false, maxLines: 1, overflow: TextOverflow.visible),
+      child: Padding(
+        padding: padding.resolve(textDirection),
+        child: Align(
+          alignment: AlignmentDirectional.centerStart.resolve(textDirection),
+          child: SizedBox(
+            width: numberLabelWidth,
+            child: Align(
+              alignment: AlignmentDirectional.centerEnd.resolve(textDirection),
+              child: Text(text, softWrap: false, maxLines: 1, overflow: TextOverflow.visible),
+            ),
+          ),
+        ),
       ),
     );
   }
@@ -2520,13 +2537,15 @@ class _CupertinoTimerPickerState extends State<CupertinoTimerPicker> {
             ),
             child: Align(
               alignment: widget.alignment,
-              child: Container(
-                color: CupertinoDynamicColor.maybeResolve(widget.backgroundColor, context),
-                width: totalWidth,
-                height: _kPickerHeight,
-                child: DefaultTextStyle(
-                  style: _textStyleFrom(context),
-                  child: Row(children: columns.map((Widget child) => Expanded(child: child)).toList(growable: false)),
+              child: DecoratedBox(
+                decoration: BoxDecoration(color: CupertinoDynamicColor.maybeResolve(widget.backgroundColor, context)),
+                child: SizedBox(
+                  width: totalWidth,
+                  height: _kPickerHeight,
+                  child: DefaultTextStyle(
+                    style: _textStyleFrom(context),
+                    child: Row(children: columns.map((Widget child) => Expanded(child: child)).toList(growable: false)),
+                  ),
                 ),
               ),
             ),

packages/flutter/lib/src/cupertino/desktop_text_selection_toolbar.dart

@@ -18,7 +18,7 @@ const double _kToolbarScreenPadding = 8.0;
 const double _kToolbarSaturationBoost = 3;
 const double _kToolbarBlurSigma = 20;
 const double _kToolbarWidth = 222.0;
-const Radius _kToolbarBorderRadius = Radius.circular(8.0);
+const BorderRadius _kToolbarBorderRadius = BorderRadius.all(Radius.circular(8.0));
 const EdgeInsets _kToolbarPadding = EdgeInsets.all(6.0);
 const List<BoxShadow> _kToolbarShadow = <BoxShadow>[
   BoxShadow(
@@ -96,41 +96,39 @@ class CupertinoDesktopTextSelectionToolbar extends StatelessWidget {
   // Builds a toolbar just like the default Mac toolbar, with the right color
   // background, padding, and rounded corners.
   static Widget _defaultToolbarBuilder(BuildContext context, Widget child) {
-    return Container(
+    ImageFilter filter = ImageFilter.blur(
+      sigmaX: _kToolbarBlurSigma,
+      sigmaY: _kToolbarBlurSigma,
+    );
+    if (!kIsWeb) {
+      // Flutter web doesn't support ImageFilter.compose on CanvasKit yet
+      // (https://github.com/flutter/flutter/issues/120123).
+      final ImageFilter outer = ColorFilter.matrix(
+        _matrixWithSaturation(_kToolbarSaturationBoost),
+      );
+      filter = ImageFilter.compose(outer: outer, inner: filter);
+    }
+
+    return SizedBox(
       width: _kToolbarWidth,
-      clipBehavior: Clip.hardEdge,
-      decoration: const BoxDecoration(
-        boxShadow: _kToolbarShadow,
-        borderRadius: BorderRadius.all(_kToolbarBorderRadius),
-      ),
-      child: BackdropFilter(
-        // Flutter web doesn't support ImageFilter.compose on CanvasKit yet
-        // (https://github.com/flutter/flutter/issues/120123).
-        filter: kIsWeb
-            ? ImageFilter.blur(
-                sigmaX: _kToolbarBlurSigma,
-                sigmaY: _kToolbarBlurSigma,
-              )
-            : ImageFilter.compose(
-                outer: ColorFilter.matrix(
-                  _matrixWithSaturation(_kToolbarSaturationBoost),
-                ),
-                inner: ImageFilter.blur(
-                  sigmaX: _kToolbarBlurSigma,
-                  sigmaY: _kToolbarBlurSigma,
-                ),
+      child: DecoratedBox(
+        decoration: const BoxDecoration(
+          boxShadow: _kToolbarShadow,
+          borderRadius: _kToolbarBorderRadius,
+        ),
+        child: ClipRRect(
+          borderRadius: _kToolbarBorderRadius,
+          clipBehavior: Clip.hardEdge,
+          child: BackdropFilter(
+            filter: filter,
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                color: _kToolbarBackgroundColor.resolveFrom(context),
+                border: Border.all(color: _kToolbarBorderColor.resolveFrom(context)),
+                borderRadius: _kToolbarBorderRadius,
               ),
-        child: DecoratedBox(
-          decoration: BoxDecoration(
-            color: _kToolbarBackgroundColor.resolveFrom(context),
-            border: Border.all(
-              color: _kToolbarBorderColor.resolveFrom(context),
+              child: Padding(padding: _kToolbarPadding, child: child),
             ),
-            borderRadius: const BorderRadius.all(_kToolbarBorderRadius),
-          ),
-          child: Padding(
-            padding: _kToolbarPadding,
-            child: child,
           ),
         ),
       ),