listsection

flutter · May 4, 2023 · 88c697b · 88c697b
1 parent d8aa21f
commit 88c697b
Showing 1 changed file with 18 additions and 21 deletions.
diff --git a/packages/flutter/lib/src/cupertino/list_section.dart b/packages/flutter/lib/src/cupertino/list_section.dart
@@ -402,8 +402,7 @@ class CupertinoListSection extends StatelessWidget {
       );
     }
 
-    BorderRadius? childrenGroupBorderRadius;
-    DecoratedBox? decoratedChildrenGroup;
+    Widget? decoratedChildrenGroup;
     if (children != null && children!.isNotEmpty) {
       // We construct childrenWithDividers as follows:
       // Insert a short divider between all rows.
@@ -425,15 +424,11 @@ class CupertinoListSection extends StatelessWidget {
         childrenWithDividers.add(longDivider);
       }
 
-      switch (type) {
-        case CupertinoListSectionType.insetGrouped:
-          childrenGroupBorderRadius = _kDefaultInsetGroupedBorderRadius;
-        case CupertinoListSectionType.base:
-          childrenGroupBorderRadius = BorderRadius.zero;
-      }
+      final BorderRadius childrenGroupBorderRadius = switch (type) {
+        CupertinoListSectionType.insetGrouped => _kDefaultInsetGroupedBorderRadius,
+        CupertinoListSectionType.base => BorderRadius.zero,
+      };
 
-      // Refactored the decorate children group in one place to avoid repeating it
-      // twice down bellow in the returned widget.
       decoratedChildrenGroup = DecoratedBox(
         decoration: decoration ??
             BoxDecoration(
@@ -445,6 +440,17 @@ class CupertinoListSection extends StatelessWidget {
             ),
         child: Column(children: childrenWithDividers),
       );
+
+      decoratedChildrenGroup = Padding(
+        padding: margin,
+        child: clipBehavior == Clip.none
+            ? decoratedChildrenGroup
+            : ClipRRect(
+                borderRadius: childrenGroupBorderRadius,
+                clipBehavior: clipBehavior,
+                child: decoratedChildrenGroup,
+              ),
+      );
     }
 
     return DecoratedBox(
@@ -464,17 +470,8 @@ class CupertinoListSection extends StatelessWidget {
                 child: headerWidget,
               ),
             ),
-          if (children != null && children!.isNotEmpty)
-            Padding(
-              padding: margin,
-              child: clipBehavior == Clip.none
-                  ? decoratedChildrenGroup
-                  : ClipRRect(
-                      borderRadius: childrenGroupBorderRadius,
-                      clipBehavior: clipBehavior,
-                      child: decoratedChildrenGroup,
-                    ),
-            ),
+          if (decoratedChildrenGroup != null)
+            decoratedChildrenGroup,
           if (footerWidget != null)
             Align(
               alignment: AlignmentDirectional.centerStart,