[fluent2-tokens] Merging main -> fluent2-tokens (#1515)

* Skip failing date picker tests (#1495)

* Fix BadgeField space bug (#1497)

* attempt to fix space bug

* add comment

* [XCUITests] Activity Indicator tests (#1493)

* initial activity indicator tests

* add transition to dark mode

* whitespace change

* add dark mode color assert

* add default color to identifier

* update comment

* add dark mode + update to use .*

* add #if DEBUG

* add #if DEBUG to SceneDelegate

* add constants

* add type

* change to hex code

* removing color tests

* Revert "removing color tests"

This reverts commit 79c20c0.

* removing color tests again

* remove SceneDelegate change

* small change

* make code more readable + have SwiftUI inherit from UIKit

* remove super

* [XCUITests] Indeterminate Progress Bar tests (#1503)

* add indeterminate progress bar tests

* update SwiftUI to inherit from UIKit

* remove super

* resolve comments

* [XCUITests] Table View Cell tests (#1508)

* add table view cell tests

* move single line asserts to function

* add comment

* Revert "[XCUITests] Table View Cell tests (#1508)" (#1511)

This reverts commit 1339ed0.

* Bumping FluentUI version (0.11.0) #1512

Co-authored-by: Lamine Male <106181067+laminesm@users.noreply.github.com>
Co-authored-by: Sophia Lee <sophia.lee0416@gmail.com>

MicrosoftFluentUI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MicrosoftFluentUI'
-  s.version          = '0.8.0'
+  s.version          = '0.11.0'
   s.summary          = 'Fluent UI is a set of reusable UI controls and tools'
   s.homepage         = "https://www.microsoft.com/design/fluent/#/"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }

ios/FluentUI.Demo/FluentUI.Demo.xcodeproj/xcshareddata/xcschemes/Demo.Development.xcscheme

@@ -73,6 +73,11 @@
                BlueprintName = "FluentUITests"
                ReferencedContainer = "container:../FluentUI.xcodeproj">
             </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "DatePickerControllerTests/testSelectionManagerEnd()">
+               </Test>
+            </SkippedTests>
          </TestableReference>
          <TestableReference
             skipped = "NO">

ios/FluentUI.Demo/FluentUI.Demo/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.0</string>
+	<string>1.11.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -26,7 +26,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>130</string>
+	<string>137.11.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationSceneManifest</key>

ios/FluentUI.Demo/FluentUIDemoTests/ActivityIndicatorTest.swift

@@ -8,8 +8,38 @@ import XCTest
 class ActivityIndicatorTest: BaseTest {
     override var controlName: String { "ActivityIndicator" }
 
+    let inProgress: NSPredicate = NSPredicate(format: "identifier CONTAINS %@", "Activity Indicator that is in progress")
+    let progressHalted: NSPredicate = NSPredicate(format: "identifier CONTAINS %@", "Activity Indicator that is progress halted")
+
+    func activityIndicatorExists(status: NSPredicate) -> Bool {
+        return app.images.element(matching: status).exists
+    }
+
     // launch test that ensures the demo app does not crash and is on the correct control page
     func testLaunch() throws {
         XCTAssertTrue(app.navigationBars[controlName].exists)
     }
+
+    // tests start/stop functionality as well as hiding (activity indicator should disappear when stopped)
+    func testStartStopHide() throws {
+        let startStopButton: XCUIElement = app.buttons["Start / Stop activity"]
+        let hidesWhenStoppedButton: XCUIElement = app.cells.containing(.staticText, identifier: "Hides when stopped").firstMatch
+
+        XCTAssert(activityIndicatorExists(status: inProgress))
+        startStopButton.tap()
+        XCTAssert(!activityIndicatorExists(status: inProgress))
+
+        hidesWhenStoppedButton.tap()
+        XCTAssert(activityIndicatorExists(status: progressHalted))
+
+        startStopButton.tap()
+        XCTAssert(activityIndicatorExists(status: inProgress))
+    }
+
+    func testSizes() throws {
+        // ensures all 5 activity indicators sizes are shown
+        for i in 0...4 {
+            XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size \(i).*")).element.exists)
+        }
+    }
 }

ios/FluentUI.Demo/FluentUIDemoTests/ActivityIndicatorTest_SwiftUI.swift

@@ -5,16 +5,67 @@
 
 import XCTest
 
-class ActivityIndicatorTestSwiftUI: BaseTest {
-    override var controlName: String { "ActivityIndicator" }
-
+class ActivityIndicatorTestSwiftUI: ActivityIndicatorTest {
     override func setUpWithError() throws {
         try super.setUpWithError()
         app.staticTexts["SwiftUI Demo"].tap()
     }
 
     // launch test that ensures the demo app does not crash and is on the correct control page
-    func testLaunch() throws {
+    override func testLaunch() throws {
         XCTAssertTrue(app.navigationBars.element(matching: NSPredicate(format: "identifier CONTAINS %@", controlName)).exists)
     }
+
+    override func testStartStopHide() throws {
+        let animatingSwitch: XCUIElement = app.switches["Animating"]
+        let hidesWhenStoppedSwitch: XCUIElement = app.switches["Hides when stopped"]
+
+        hidesWhenStoppedSwitch.tap()
+        XCTAssert(activityIndicatorExists(status: inProgress))
+
+        animatingSwitch.tap()
+        XCTAssert(activityIndicatorExists(status: progressHalted))
+
+        hidesWhenStoppedSwitch.tap()
+        XCTAssert(!activityIndicatorExists(status: inProgress))
+
+        animatingSwitch.tap()
+        XCTAssert(activityIndicatorExists(status: inProgress))
+    }
+
+    override func testSizes() throws {
+        let animatingSwitch: XCUIElement = app.switches["Animating"]
+        let hidesWhenStoppedSwitch: XCUIElement = app.switches["Hides when stopped"]
+
+        XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size 4")).element.exists)
+        app.buttons[".xLarge"].tap()
+        app.buttons[".large"].tap()
+        XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size 3")).element.exists)
+        app.buttons[".large"].tap()
+        app.buttons[".medium"].tap()
+        XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size 2")).element.exists)
+        app.buttons[".medium"].tap()
+        app.buttons[".small"].tap()
+        XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size 1")).element.exists)
+        app.buttons[".small"].tap()
+        app.buttons[".xSmall"].tap()
+        XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size 0")).element.exists)
+
+        hidesWhenStoppedSwitch.tap()
+        animatingSwitch.tap()
+
+        XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size 0")).element.exists)
+        app.buttons[".xSmall"].tap()
+        app.buttons[".small"].tap()
+        XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size 1")).element.exists)
+        app.buttons[".small"].tap()
+        app.buttons[".medium"].tap()
+        XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size 2")).element.exists)
+        app.buttons[".medium"].tap()
+        app.buttons[".large"].tap()
+        XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size 3")).element.exists)
+        app.buttons[".large"].tap()
+        app.buttons[".xLarge"].tap()
+        XCTAssert(app.images.containing(NSPredicate(format: "identifier MATCHES %@", "Activity Indicator.*size 4")).element.exists)
+    }
 }

ios/FluentUI.Demo/FluentUIDemoTests/IndeterminateProgressBarTest.swift

@@ -8,8 +8,35 @@ import XCTest
 class IndeterminateProgressBarTest: BaseTest {
     override var controlName: String { "IndeterminateProgressBar" }
 
+    let inProgress: NSPredicate = NSPredicate(format: "identifier CONTAINS %@", "Indeterminate Progress Bar that is in progress")
+    let progressHalted: NSPredicate = NSPredicate(format: "identifier CONTAINS %@", "Indeterminate Progress Bar that is progress halted")
+
+    func indeterminateProgressBarExists(status: NSPredicate) -> Bool {
+         return app.otherElements.element(matching: status).exists
+     }
+
     // launch test that ensures the demo app does not crash and is on the correct control page
     func testLaunch() throws {
         XCTAssertTrue(app.navigationBars[controlName].exists)
     }
+
+    // tests start/stop functionality as well as hiding (indeterminate progress bar should disappear when stopped)
+    func testStartStopHide() throws {
+        let startStopButton: XCUIElement = app.buttons["Start / Stop activity"]
+        let hidesWhenStoppedButton: XCUIElement = app.cells.containing(.staticText, identifier: "Hides when stopped").firstMatch
+
+        XCTAssert(indeterminateProgressBarExists(status: inProgress))
+        XCTAssert(!indeterminateProgressBarExists(status: progressHalted))
+        startStopButton.tap()
+        XCTAssert(!indeterminateProgressBarExists(status: inProgress))
+        XCTAssert(!indeterminateProgressBarExists(status: progressHalted))
+
+        hidesWhenStoppedButton.tap()
+        XCTAssert(!indeterminateProgressBarExists(status: inProgress))
+        XCTAssert(indeterminateProgressBarExists(status: progressHalted))
+
+        startStopButton.tap()
+        XCTAssert(indeterminateProgressBarExists(status: inProgress))
+        XCTAssert(!indeterminateProgressBarExists(status: progressHalted))
+    }
 }

ios/FluentUI.Demo/FluentUIDemoTests/IndeterminateProgressBarTest_SwiftUI.swift

@@ -5,16 +5,35 @@
 
 import XCTest
 
-class IndeterminateProgressBarTestSwiftUI: BaseTest {
-    override var controlName: String { "IndeterminateProgressBar" }
-
+class IndeterminateProgressBarTestSwiftUI: IndeterminateProgressBarTest {
     override func setUpWithError() throws {
         try super.setUpWithError()
         app.staticTexts["SwiftUI Demo"].tap()
     }
 
     // launch test that ensures the demo app does not crash and is on the correct control page
-    func testLaunch() throws {
+    override func testLaunch() throws {
         XCTAssertTrue(app.navigationBars.element(matching: NSPredicate(format: "identifier CONTAINS %@", controlName)).exists)
     }
+
+    override func testStartStopHide() throws {
+        let animatingSwitch: XCUIElement = app.switches["Animating"]
+        let hidesWhenStoppedSwitch: XCUIElement = app.switches["Hides when stopped"]
+
+        hidesWhenStoppedSwitch.tap()
+        XCTAssert(indeterminateProgressBarExists(status: inProgress))
+        XCTAssert(!indeterminateProgressBarExists(status: progressHalted))
+
+        animatingSwitch.tap()
+        XCTAssert(!indeterminateProgressBarExists(status: inProgress))
+        XCTAssert(indeterminateProgressBarExists(status: progressHalted))
+
+        hidesWhenStoppedSwitch.tap()
+        XCTAssert(!indeterminateProgressBarExists(status: inProgress))
+        XCTAssert(!indeterminateProgressBarExists(status: progressHalted))
+
+        animatingSwitch.tap()
+        XCTAssert(indeterminateProgressBarExists(status: inProgress))
+        XCTAssert(!indeterminateProgressBarExists(status: progressHalted))
+     }
 }

ios/FluentUI.Resources/Info.plist

@@ -13,8 +13,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.0</string>
+	<string>0.11.0</string>
 	<key>CFBundleVersion</key>
-	<string>0.8.0</string>
+	<string>0.11.0</string>
 </dict>
 </plist>

ios/FluentUI/ActivityIndicator/ActivityIndicator.swift

@@ -59,9 +59,23 @@ public struct ActivityIndicator: View, TokenizedControlView {
                 "Accessibility.ActivityIndicator.Stopped.label".localized
         }()
 
-        SemiRing(color: color,
-                 thickness: tokenSet[.thickness].float,
-                 accessibilityLabel: accessibilityLabel)
+#if DEBUG
+        let accessibilityIdentifier: String = {
+            let status: String = state.isAnimating ? "in progress" : "progress halted"
+            return "Activity Indicator that is \(status) and size \(state.size.rawValue)"
+        }()
+
+        let semiRing = SemiRing(color: color,
+                                thickness: tokenSet[.thickness].float,
+                                accessibilityLabel: accessibilityLabel,
+                                accessibilityIdentifier: accessibilityIdentifier)
+#else
+        let semiRing = SemiRing(color: color,
+                                thickness: tokenSet[.thickness].float,
+                                accessibilityLabel: accessibilityLabel)
+#endif
+
+        semiRing
             .modifyIf(state.isAnimating, { animatedView in
                 animatedView
                     .rotationEffect(.degrees(rotationAngle), anchor: .center)
@@ -92,6 +106,9 @@ public struct ActivityIndicator: View, TokenizedControlView {
         var color: Color
         var thickness: CGFloat
         var accessibilityLabel: String
+#if DEBUG
+        var accessibilityIdentifier: String
+#endif
 
         public var body: some View {
             Circle()
@@ -103,6 +120,9 @@ public struct ActivityIndicator: View, TokenizedControlView {
                 .accessibilityElement(children: .ignore)
                 .accessibility(addTraits: .isImage)
                 .accessibility(label: Text(accessibilityLabel))
+#if DEBUG
+                .accessibility(identifier: accessibilityIdentifier)
+#endif
         }
 
         private let semiRingStartFraction: CGFloat = 0.0

ios/FluentUI/Badge Field/BadgeField.swift

@@ -742,7 +742,9 @@ open class BadgeField: UIView {
     }
 
     private func updateLabelsVisibility(textFieldContent: String? = nil) {
-        let textFieldContent = textFieldContent ?? self.textFieldContent
+        var textFieldContent = textFieldContent ?? self.textFieldContent
+        // does not trim textFieldContent if it only contains whitespace
+        textFieldContent = textFieldContent.trimmingCharacters(in: .whitespaces) == "" ? textFieldContent : textFieldContent.trimmed()
         labelView.isHidden = label.isEmpty
         placeholderView.isHidden = !labelView.isHidden || !badges.isEmpty || !textFieldContent.isEmpty
         setNeedsLayout()
@@ -1185,13 +1187,13 @@ extension BadgeField: UITextFieldDelegate {
                 let didBadge = badgeText(newString, force: false)
                 if !didBadge {
                     // Placeholder
-                    updateLabelsVisibility(textFieldContent: newString.trimmed())
+                    updateLabelsVisibility(textFieldContent: newString)
                     badgeFieldDelegate?.badgeField?(self, willChangeTextFieldContentWithText: newString.trimmed())
                 }
                 return !didBadge
             }
 
-            updateLabelsVisibility(textFieldContent: newString.trimmed())
+            updateLabelsVisibility(textFieldContent: newString)
 
             // Handle delete key
             if string.isEmpty {

ios/FluentUI/IndeterminateProgressBar/IndeterminateProgressBar.swift

@@ -45,6 +45,9 @@ public struct IndeterminateProgressBar: View, TokenizedControlView {
                 :
                 "Accessibility.ActivityIndicator.Stopped.label".localized
         }()
+#if DEBUG
+        let accessibilityIdentifier: String = "Indeterminate Progress Bar that is \(state.isAnimating ? "in progress" : "progress halted")"
+#endif
 
         Rectangle()
             .fill(LinearGradient(gradient: Gradient(colors: [backgroundColor, gradientColor, backgroundColor]),
@@ -57,6 +60,9 @@ public struct IndeterminateProgressBar: View, TokenizedControlView {
                    alignment: .center)
             .background(backgroundColor)
             .accessibilityLabel(Text(accessibilityLabel))
+#if DEBUG
+            .accessibilityIdentifier(accessibilityIdentifier)
+#endif
             .accessibilityAddTraits(.updatesFrequently)
             .modifyIf(state.isAnimating, { view in
                 view

macos/FluentUI/FluentUI-Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.0</string>
+	<string>0.11.0</string>
 	<key>CFBundleVersion</key>
-	<string>0.8.0</string>
+	<string>0.11.0</string>
 </dict>
 </plist>

macos/FluentUITestApp/FluentUITestApp-Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.0</string>
+	<string>0.11.0</string>
 	<key>CFBundleVersion</key>
-	<string>55</string>
+	<string>62.11.0</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>