Merge pull request #1940 from sophialee0416/sople/cherryPick

[main_0.24] Cherry-picking PopupMenuController + iOS 17 changes

ios/FluentUI/Bottom Commanding/BottomCommandingController.swift

@@ -277,6 +277,7 @@ open class BottomCommandingController: UIViewController, TokenizedControlInterna
         }
     }
 
+    @available(iOS, deprecated: 17.0)
     public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
 

ios/FluentUI/Button/Button.swift

@@ -162,6 +162,7 @@ open class Button: UIButton, Shadowable, TokenizedControlInternal {
         initialize()
     }
 
+    @available(iOS, deprecated: 17.0)
     public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
 

ios/FluentUI/Card/CardView.swift

@@ -378,6 +378,7 @@ open class CardView: UIView, Shadowable, TokenizedControlInternal {
         preconditionFailure("init(coder:) has not been implemented")
     }
 
+    @available(iOS, deprecated: 17.0)
     open override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
         if let previousTraitCollection = previousTraitCollection {

ios/FluentUI/Core/SwiftUI+ViewModifiers.swift

@@ -43,7 +43,7 @@ extension View {
 
     /// Adds a large content viewer for the view. If the text and image are both nil,
     /// the default large content viewer will be used.
-    /// - Parameters
+    /// - Parameters:
     ///  - text: Optional String to display in the large content viewer.
     ///  - image: Optional UIImage to display in the large content viewer.
     /// - Returns: The modified view.
@@ -52,12 +52,29 @@ extension View {
     }
 
     /// Applies multiple shadows on a View
-    /// - Parameters
+    /// - Parameters:
     ///  - shadowInfo: The values of the two shadows to be applied
     /// - Returns: The modified view.
     func applyShadow(shadowInfo: ShadowInfo) -> some View {
         modifier(ShadowModifier(shadowInfo: shadowInfo))
     }
+
+    /// Abstracts away differences in pre-iOS 17 `onChange(of:perform:)` versus post-iOS 17 `onChange(of:_:)`.
+    ///
+    /// This function will be removed once FluentUI moves to iOS 17 as a minimum target.
+    /// - Parameters:
+    ///   - value: The value to check against when determining whether to run the closure.
+    ///   - action: A closure to run when the value changes.
+    /// - Returns: A view that fires an action when the specified value changes.
+    func onChange_iOS17<V>(of value: V, _ action: @escaping (V) -> Void) -> some View where V: Equatable {
+        if #available(iOS 17, *) {
+            return self.onChange(of: value) { _, newValue in
+                return action(newValue)
+            }
+        } else {
+            return self.onChange(of: value, perform: action)
+        }
+    }
 }
 
 /// PreferenceKey that will store the measured size of the view

ios/FluentUI/Date Time Pickers/Date Picker/DatePickerController.swift

@@ -224,6 +224,7 @@ class DatePickerController: UIViewController, GenericDateTimePicker {
         navigationItem.leftBarButtonItem?.tintColor = view.fluentTheme.color(.foreground2)
     }
 
+    @available(iOS, deprecated: 17.0)
     public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
 

ios/FluentUI/Drawer/DrawerPresentationController.swift

@@ -225,7 +225,7 @@ class DrawerPresentationController: UIPresentationController {
             }
         case .up:
             if actualPresentationOrigin == containerView.bounds.maxY {
-                return containerView.safeAreaInsets.bottom + keyboardHeight
+                return keyboardHeight == 0 ? containerView.safeAreaInsets.bottom : keyboardHeight
             }
         case .fromLeading:
             if actualPresentationOrigin == containerView.bounds.minX {
@@ -344,6 +344,9 @@ class DrawerPresentationController: UIPresentationController {
     }
 
     private func frameForContentView(in bounds: CGRect) -> CGRect {
+        guard let containerView = containerView else {
+            return .zero
+        }
         var contentFrame = bounds.inset(by: marginsForContentView())
 
         var contentSize = presentedViewController.preferredContentSize
@@ -380,7 +383,8 @@ class DrawerPresentationController: UIPresentationController {
 
             contentFrame.origin.x += (contentFrame.width - contentSize.width) / 2
             if presentationDirection == .up {
-                contentFrame.origin.y = contentFrame.maxY - contentSize.height
+                contentFrame.origin.y = keyboardHeight != 0 ? max(landscapeMode ? 0 : sourceViewController.view.safeAreaInsets.top,
+                                                                  containerView.frame.maxY - keyboardHeight - contentSize.height) : contentFrame.maxY - contentSize.height
             }
         } else {
             if actualPresentationOffset == 0 {
@@ -510,7 +514,7 @@ class DrawerPresentationController: UIPresentationController {
         keyboardAnimationDuration = (notificationInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber)?.doubleValue
 
         keyboardFrame = containerView.convert(keyboardFrame, from: nil)
-        keyboardHeight = max(0, containerView.bounds.maxY - containerView.safeAreaInsets.bottom - keyboardFrame.minY)
+        keyboardHeight = max(0, containerView.bounds.maxY - keyboardFrame.minY)
     }
 }
 

ios/FluentUI/Extensions/UIColor+Extensions.swift

@@ -217,10 +217,19 @@ extension UIColor {
     private func resolvedColorValue(userInterfaceStyle: UIUserInterfaceStyle,
                                     accessibilityContrast: UIAccessibilityContrast = .unspecified,
                                     userInterfaceLevel: UIUserInterfaceLevel = .unspecified) -> UIColor {
-        let traitCollectionStyle = UITraitCollection(userInterfaceStyle: userInterfaceStyle)
-        let traitCollectionContrast = UITraitCollection(accessibilityContrast: accessibilityContrast)
-        let traitCollectionLevel = UITraitCollection(userInterfaceLevel: userInterfaceLevel)
-        let traitCollection = UITraitCollection(traitsFrom: [traitCollectionStyle, traitCollectionContrast, traitCollectionLevel])
+        let traitCollection: UITraitCollection
+        if #available(iOS 17, *) {
+            traitCollection = UITraitCollection { mutableTraits in
+                mutableTraits.userInterfaceStyle = userInterfaceStyle
+                mutableTraits.accessibilityContrast = accessibilityContrast
+                mutableTraits.userInterfaceLevel = userInterfaceLevel
+            }
+        } else {
+            let traitCollectionStyle = UITraitCollection(userInterfaceStyle: userInterfaceStyle)
+            let traitCollectionContrast = UITraitCollection(accessibilityContrast: accessibilityContrast)
+            let traitCollectionLevel = UITraitCollection(userInterfaceLevel: userInterfaceLevel)
+            traitCollection = UITraitCollection(traitsFrom: [traitCollectionStyle, traitCollectionContrast, traitCollectionLevel])
+        }
         let resolvedColor = self.resolvedColor(with: traitCollection)
         return resolvedColor
     }

ios/FluentUI/MultilineCommandBar/MultilineCommandBar.swift

@@ -68,6 +68,7 @@ public class MultilineCommandBar: UIViewController {
         bottomSheetController = sheetController
     }
 
+    @available(iOS, deprecated: 17.0)
     public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
 

ios/FluentUI/Navigation/NavigationBar.swift

@@ -564,6 +564,7 @@ open class NavigationBar: UINavigationBar, TokenizedControlInternal, TwoLineTitl
             contentStackView.point(inside: convert(point, to: contentStackView), with: event)
     }
 
+    @available(iOS, deprecated: 17.0)
     open override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
         if traitCollection.verticalSizeClass != previousTraitCollection?.verticalSizeClass {

ios/FluentUI/Navigation/Shy Header/ShyHeaderView.swift

@@ -213,6 +213,7 @@ class ShyHeaderView: UIView, TokenizedControlInternal {
     /// e.g. should cancel a search on scroll
     private var cancelsContentFirstRespondingOnHide: Bool = false
 
+    @available(iOS, deprecated: 17.0)
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
         updateContentInsets()

ios/FluentUI/Notification/FluentNotification.swift

@@ -313,13 +313,13 @@ public struct FluentNotification: View, TokenizedControlView {
                     notification
                         .frame(idealWidth: isFlexibleWidthToast ? innerContentsSize.width - horizontalPadding : calculatedNotificationWidth,
                                maxWidth: isFlexibleWidthToast ? proposedWidth : calculatedNotificationWidth, alignment: .center)
-                        .onChange(of: isPresented, perform: { present in
-                            if present {
+                        .onChange_iOS17(of: isPresented) { newPresent in
+                            if newPresent {
                                 presentAnimated()
                             } else {
                                 dismissAnimated()
                             }
-                        })
+                        }
                         .padding(.bottom, tokenSet[.bottomPresentationPadding].float)
                         .onSizeChange { newSize in
                             bottomOffsetForDismissedState = newSize.height + (tokenSet[.shadow].shadowInfo.yKey / 2)

ios/FluentUI/Popup Menu/PopupMenuController.swift

@@ -257,7 +257,7 @@ open class PopupMenuController: DrawerController {
     }
 
     private func initTableView() {
-        tableView.backgroundColor = backgroundColor
+        tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
         tableView.alwaysBounceVertical = false
         tableView.isAccessibilityElement = true

ios/FluentUI/Popup Menu/PopupMenuItemTokenSet.swift

@@ -20,7 +20,7 @@ class PopupMenuItemTokenSet: TableViewCellTokenSet {
                 self.fluentTheme.color(.foreground3)
             },
             .cellBackgroundColor: .uiColor {
-                self.fluentTheme.color(.background1)
+                .clear
             }
         ])
     }

ios/FluentUI/SegmentedControl/SegmentedControl.swift

@@ -369,6 +369,7 @@ open class SegmentedControl: UIView, TokenizedControlInternal {
                                    height: CGFloat.greatestFiniteMagnitude))
     }
 
+    @available(iOS, deprecated: 17.0)
     open override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
         invalidateIntrinsicContentSize()

ios/FluentUI/Tab Bar/TabBarItemView.swift

@@ -158,6 +158,7 @@ class TabBarItemView: UIControl, TokenizedControlInternal {
         return size
     }
 
+    @available(iOS, deprecated: 17.0)
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
         if previousTraitCollection?.horizontalSizeClass != traitCollection.horizontalSizeClass || previousTraitCollection?.verticalSizeClass != traitCollection.verticalSizeClass {

ios/FluentUI/Tab Bar/TabBarView.swift

@@ -122,6 +122,7 @@ open class TabBarView: UIView, TokenizedControlInternal {
         preconditionFailure("init(coder:) has not been implemented")
     }
 
+    @available(iOS, deprecated: 17.0)
     open override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)
         if previousTraitCollection?.horizontalSizeClass != traitCollection.horizontalSizeClass || previousTraitCollection?.verticalSizeClass != traitCollection.verticalSizeClass {

ios/FluentUI/Tooltip/TooltipViewController.swift

@@ -49,6 +49,7 @@ class TooltipViewController: UIViewController {
         }
     }
 
+    @available(iOS, deprecated: 17.0)
     override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
         super.traitCollectionDidChange(previousTraitCollection)