Update CommandBar styling on iOS 18 to match iOS 26 (#2235)

Author: joannaquu

Sources/FluentUI_iOS/Components/CommandBar/CommandBar.swift

@@ -151,9 +151,7 @@ public class CommandBar: UIView, Shadowable, TokenizedControl {
     public override func layoutSubviews() {
         super.layoutSubviews()
 
-        if #available(iOS 26, *) {
-            layer.cornerRadius = bounds.height / 2
-        }
+        layer.cornerRadius = bounds.height / 2
         updateShadow()
         updateScrollViewShadow()
     }
@@ -372,12 +370,7 @@ public class CommandBar: UIView, Shadowable, TokenizedControl {
     }
 
     private func stackViewLayoutMargins() -> NSDirectionalEdgeInsets {
-        var padding: CGFloat
-        if #available(iOS 26, *) {
-            padding = CommandBarTokenSet.barInsets
-        } else {
-            padding = 0
-        }
+        let padding: CGFloat = CommandBarTokenSet.barInsets
         return NSDirectionalEdgeInsets(top: 0,
                                        leading: leadingCommandGroupsView.isHidden ? 0 : padding,
                                        bottom: 0,

Sources/FluentUI_iOS/Components/CommandBar/CommandBarButton.swift

@@ -53,11 +53,7 @@ class CommandBarButton: UIButton {
             var buttonConfiguration = UIButton.Configuration.plain()
             buttonConfiguration.imagePadding = CommandBarTokenSet.buttonImagePadding
             buttonConfiguration.contentInsets = CommandBarTokenSet.buttonContentInsets
-            if #available(iOS 26, *) {
-                buttonConfiguration.background.cornerRadius = tokenSet[.cornerRadius].float
-            } else {
-                buttonConfiguration.background.cornerRadius = 0
-            }
+            buttonConfiguration.background.cornerRadius = tokenSet[.cornerRadius].float
             configuration = buttonConfiguration
 
             let accessibilityDescription = item.accessibilityLabel

Sources/FluentUI_iOS/Components/CommandBar/CommandBarTokenSet.swift

@@ -12,8 +12,7 @@ public enum CommandBarToken: Int, TokenSetKey {
     /// The background color of the Command Bar.
     case backgroundColor
 
-    /// The corner radius for each group of item(s) inside the Command Bar.
-    /// On iOS 26+, this is also the corner radius for each Command Bar Button.
+    /// The corner radius for each Command Bar Button.
     case cornerRadius
 
     /// The background color of a single Command Bar Item when in rest.
@@ -65,11 +64,7 @@ public class CommandBarTokenSet: ControlTokenSet<CommandBarToken> {
                 return .float { GlobalTokens.corner(.radius120) }
 
             case .itemBackgroundColorRest:
-                if #available(iOS 26, *) {
-                    return .uiColor { .clear }
-                } else {
-                    return .uiColor { theme.color(.background5) }
-                }
+                return .uiColor { .clear }
 
             case .itemBackgroundColorHover:
                 return .uiColor { theme.color(.background5) }
@@ -102,11 +97,7 @@ public class CommandBarTokenSet: ControlTokenSet<CommandBarToken> {
                 return .uiFont { theme.typography(.caption2, adjustsForContentSizeCategory: false) }
 
             case .shadow:
-                if #available(iOS 26, *) {
-                    return .shadowInfo { theme.shadow(.shadow08) }
-                } else {
-                    return .shadowInfo { theme.shadow(.clear) }
-                }
+                return .shadowInfo { theme.shadow(.shadow08) }
             }
         }
     }
@@ -116,13 +107,7 @@ public class CommandBarTokenSet: ControlTokenSet<CommandBarToken> {
 
 extension CommandBarTokenSet {
     /// The spacing between each Command Bar Group.
-    static var groupInterspace: CGFloat {
-        if #available(iOS 26, *) {
-            GlobalTokens.spacing(.size20)
-        } else {
-            GlobalTokens.spacing(.size80)
-        }
-    }
+    static let groupInterspace: CGFloat = GlobalTokens.spacing(.size20)
 
     /// The spacing between each Command Bar Group for iPad.
     static let groupInterspaceWide: CGFloat = GlobalTokens.spacing(.size160)
@@ -137,13 +122,7 @@ extension CommandBarTokenSet {
     static let dismissGradientWidth: CGFloat = GlobalTokens.spacing(.size160)
 
     /// The edge inset values for the Command Bar.
-    static var barInsets: CGFloat {
-        if #available(iOS 26, *) {
-            GlobalTokens.spacing(.size40)
-        } else {
-            GlobalTokens.spacing(.size80)
-        }
-    }
+    static let barInsets: CGFloat = GlobalTokens.spacing(.size40)
 
     /// The edge inset values for the Command Bar Button.
     static let buttonContentInsets = NSDirectionalEdgeInsets(top: 8.0,