Fully remove CommandBar label (#2224)

* Revert "[WIP] Add CommandBarItemGroup labels (#2143)"

This reverts commit 7e5efea.

* cleanup

Author: joannaquu

Demos/FluentUIDemo_iOS/FluentUI.Demo/Demos/CommandBarDemoController.swift

@@ -337,8 +337,10 @@ class CommandBarDemoController: DemoController {
             ]
         ]
 
-        let itemGroups: [CommandBarItemGroup] = commandGroups.map {
-            CommandBarItemGroup($0.map { newItem(for: $0) })
+        let itemGroups: [CommandBarItemGroup] = commandGroups.map { commandGroup in
+            commandGroup.map { command in
+                newItem(for: command)
+            }
         }
 
         itemGroups[0][1].isEnabled = false

MicrosoftFluentUI.podspec

@@ -115,7 +115,6 @@ Pod::Spec.new do |s|
   s.subspec 'CommandBar_ios' do |commandbar_ios|
     commandbar_ios.platform = :ios
     commandbar_ios.dependency "#{s.name}/Core_ios"
-    commandbar_ios.dependency "#{s.name}/Label_ios"
     commandbar_ios.source_files = ["#{ios_root}/#{components_dir}/CommandBar/**/*.{swift,h}"]
   end
 

Sources/FluentUI_iOS/Components/CommandBar/CommandBarButton.swift

@@ -60,9 +60,6 @@ class CommandBarButton: UIButton {
             }
             configuration = buttonConfiguration
 
-            setContentHuggingPriority(.required, for: .horizontal)
-            setContentCompressionResistancePriority(.required, for: .horizontal)
-
             let accessibilityDescription = item.accessibilityLabel
             accessibilityLabel = (accessibilityDescription != nil) ? accessibilityDescription : item.title
             accessibilityHint = item.accessibilityHint

Sources/FluentUI_iOS/Components/CommandBar/CommandBarButtonGroupView.swift

@@ -10,16 +10,18 @@ import UIKit
 
 class CommandBarButtonGroupView: UIView {
     let buttons: [CommandBarButton]
-    let title: String?
 
-    init(buttons: [CommandBarButton], title: String?, tokenSet: CommandBarTokenSet) {
+    init(buttons: [CommandBarButton], tokenSet: CommandBarTokenSet) {
         self.buttons = buttons
-        self.title = title
         self.tokenSet = tokenSet
 
         super.init(frame: .zero)
         translatesAutoresizingMaskIntoConstraints = false
 
+        clipsToBounds = true
+        layer.cornerRadius = tokenSet[.cornerRadius].float
+        layer.cornerCurve = .continuous
+
         configureHierarchy()
         applyInsets()
         hideGroupIfNeeded()
@@ -33,7 +35,7 @@ class CommandBarButtonGroupView: UIView {
     /// Hides the group view if all the views inside the `stackView` are hidden
     func hideGroupIfNeeded() {
         var allViewsHidden = true
-        for view in buttonStackView.arrangedSubviews {
+        for view in stackView.arrangedSubviews {
             if !view.isHidden {
                 allViewsHidden = false
                 break
@@ -45,51 +47,21 @@ class CommandBarButtonGroupView: UIView {
 
     var equalWidthButtons: Bool = false {
         didSet {
-            buttonStackView.distribution = equalWidthButtons ? .fillEqually : .fill
+            stackView.distribution = equalWidthButtons ? .fillEqually : .fill
         }
     }
 
-    private lazy var buttonStackView: UIStackView = {
+    private lazy var stackView: UIStackView = {
         let stackView = UIStackView(arrangedSubviews: buttons)
         stackView.translatesAutoresizingMaskIntoConstraints = false
         stackView.axis = .horizontal
         stackView.spacing = CommandBarTokenSet.itemInterspace
 
-        stackView.clipsToBounds = true
-        stackView.layer.cornerRadius = tokenSet[.cornerRadius].float
-        stackView.layer.cornerCurve = .continuous
         return stackView
     }()
 
-    private lazy var groupLabel: Label = {
-        let label = Label()
-        label.text = title
-        label.font = tokenSet[.itemGroupLabelFont].uiFont
-        label.translatesAutoresizingMaskIntoConstraints = false
-        label.setContentHuggingPriority(.required, for: .vertical)
-        label.lineBreakMode = .byClipping
-
-        label.accessibilityTraits.insert(.header)
-        label.isUserInteractionEnabled = true
-        label.addInteraction(UILargeContentViewerInteraction())
-        label.showsLargeContentViewer = true
-        label.largeContentTitle = title
-        return label
-    }()
-
     private func configureHierarchy() {
-        let stackView = UIStackView()
-        stackView.translatesAutoresizingMaskIntoConstraints = false
-        stackView.axis = .vertical
-
-        stackView.addArrangedSubview(buttonStackView)
-        if #unavailable(iOS 26) {
-            if title != nil {
-                stackView.addArrangedSubview(groupLabel)
-            }
-        }
         addSubview(stackView)
-
         NSLayoutConstraint.activate([
             stackView.topAnchor.constraint(equalTo: topAnchor),
             stackView.leadingAnchor.constraint(equalTo: leadingAnchor),

Sources/FluentUI_iOS/Components/CommandBar/CommandBarCommandGroupsView.swift

@@ -70,7 +70,7 @@ class CommandBarCommandGroupsView: UIView {
                 return button
             }
 
-            let group = CommandBarButtonGroupView(buttons: buttons, title: items.label, tokenSet: tokenSet)
+            let group = CommandBarButtonGroupView(buttons: buttons, tokenSet: tokenSet)
 
             for item in items {
                 if let button = itemsToButtonsMap[item] {

Sources/FluentUI_iOS/Components/CommandBar/CommandBarItem.swift

@@ -8,6 +8,8 @@ import FluentUI_common
 #endif
 import UIKit
 
+public typealias CommandBarItemGroup = [CommandBarItem]
+
 @objc(MSFCommandBarItem)
 open class CommandBarItem: NSObject {
     public typealias ItemTappedHandler = ((UIView, CommandBarItem) -> Void)