PM-16860: Disable segmented control selected action for selected segment (#1250)

Author: matt-livefront

BitwardenShared/UI/Platform/Application/Views/BitwardenSegmentedControl.swift

@@ -26,18 +26,20 @@ struct BitwardenSegmentedControl<T: Menuable & Identifiable>: View {
     var body: some View {
         HStack(spacing: 0) {
             ForEach(selections) { selection in
+                let isSelected = self.selection.id == selection.id
                 Button {
+                    // Don't update the selection if this segment is already selected.
+                    guard !isSelected else { return }
                     self.selection = selection
                 } label: {
-                    segmentView(
-                        title: selection.localizedName,
-                        isDisabled: isSelectionDisabled(selection),
-                        isSelected: selection == self.selection
-                    )
-                    .matchedGeometryEffect(id: selection, in: segmentedControl)
+                    Text(selection.localizedName)
+                        .styleGuide(.callout, weight: .semibold)
                 }
+                .accessibility(if: isSelected, addTraits: .isSelected)
                 .accessibilityIdentifier(selection.accessibilityId)
+                .buttonStyle(SegmentButtonStyle(isSelected: isSelected))
                 .disabled(isSelectionDisabled(selection))
+                .matchedGeometryEffect(id: selection, in: segmentedControl)
             }
         }
         .background(
@@ -70,36 +72,38 @@ struct BitwardenSegmentedControl<T: Menuable & Identifiable>: View {
         _selection = selection
         self.selections = selections
     }
+}
 
-    // MARK: Private
+// MARK: - SegmentButtonStyle
 
-    /// Returns the foreground color for a segment.
-    ///
-    /// - Parameters:
-    ///   - isDisabled: Whether the segment is disabled.
-    ///   - isSelected: Whether the segment is selected.
-    ///
-    private func segmentForegroundColor(isDisabled: Bool, isSelected: Bool) -> Color {
-        guard !isDisabled else { return Asset.Colors.buttonFilledDisabledForeground.swiftUIColor }
+/// A `ButtonStyle` for displaying a segment within the `BitwardenSegmentedControl`.
+///
+private struct SegmentButtonStyle: ButtonStyle {
+    // MARK: Properties
+
+    @Environment(\.isEnabled) var isEnabled: Bool
+
+    /// Whether the segment is selected.
+    let isSelected: Bool
+
+    /// The color of the foreground elements in the button.
+    var foregroundColor: Color {
+        guard isEnabled else { return Asset.Colors.buttonFilledDisabledForeground.swiftUIColor }
         return isSelected ?
             Asset.Colors.textInteraction.swiftUIColor :
             Asset.Colors.textSecondary.swiftUIColor
     }
 
-    /// Returns a view for a single segment within the segmented control.
-    ///
-    /// - Parameters:
-    ///   - title: The title of the segment.
-    ///   - isDisabled: Whether the segment is disabled.
-    ///   - isSelected: Whether the segment is selected.
-    ///
-    private func segmentView(title: String, isDisabled: Bool, isSelected: Bool) -> some View {
-        Text(title)
-            .styleGuide(.callout, weight: .semibold)
+    // MARK: ButtonStyle
+
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
             .frame(maxWidth: .infinity)
-            .foregroundStyle(segmentForegroundColor(isDisabled: isDisabled, isSelected: isSelected))
+            .foregroundStyle(foregroundColor)
             .padding(.vertical, 8)
             .dynamicTypeSize(...DynamicTypeSize.xxxLarge)
+            .opacity(configuration.isPressed && !isSelected ? 0.5 : 1)
+            .contentShape(Capsule())
     }
 }
 

BitwardenShared/UI/Platform/Application/Views/BitwardenSegmentedControlTests.swift

@@ -39,4 +39,31 @@ class BitwardenSegmentedControlTests: BitwardenTestCase {
         try buttonThree.tap()
         XCTAssertEqual(selection, .three)
     }
+
+    /// Tapping on the selected segment doesn't update the selection binding.
+    func test_selectionCurrentTapped() throws {
+        var selection = Segment.one
+        var selectionChangedHistory = [Segment]()
+        let subject = BitwardenSegmentedControl(
+            selection: Binding(
+                get: { selection },
+                set: { newValue in
+                    selection = newValue
+                    selectionChangedHistory.append(newValue)
+                }
+            ),
+            selections: Segment.allCases
+        )
+
+        try subject.inspect().find(button: "One").tap()
+        XCTAssertEqual(selection, .one)
+        XCTAssertTrue(selectionChangedHistory.isEmpty)
+
+        try subject.inspect().find(button: "Two").tap()
+        XCTAssertEqual(selection, .two)
+        XCTAssertEqual(selectionChangedHistory, [.two])
+
+        try subject.inspect().find(button: "Two").tap()
+        XCTAssertEqual(selectionChangedHistory, [.two])
+    }
 }

BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemViewTests.swift

@@ -176,6 +176,7 @@ class AddEditSendItemViewTests: BitwardenTestCase { // swiftlint:disable:this ty
     /// Tapping on text button in the segmented control sends the `.typeChanged` action.
     @MainActor
     func test_segmentedControl_textTap() throws {
+        processor.state.type = .file
         let button = try subject.inspect().find(button: Localizations.text)
         try button.tap()
         XCTAssertEqual(processor.dispatchedActions, [.typeChanged(.text)])