Merge pull request #2055 from Skyscanner/multiselect_dropdown_chip

Update BPKMultiSelectChipGroup to handle dropdown type in chip items
Skyscanner · Aug 30, 2024 · 71d0caa · 71d0caa
2 parents f77ef9b + a82061d
commit 71d0caa
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/Backpack-SwiftUI/ChipGroup/Classes/BPKMultiSelectChipGroup.swift b/Backpack-SwiftUI/ChipGroup/Classes/BPKMultiSelectChipGroup.swift
@@ -78,14 +78,22 @@ public struct BPKMultiSelectChipGroup: View {
     @ViewBuilder
     private func chip(for chip: ChipItem) -> some View {
         switch chip.type {
-        case .option, .dropdown:
+        case .option:
             BPKChip(
                 chip.text,
                 icon: chip.icon,
                 selected: chip.selected,
                 style: style,
                 onClick: chip.onClick
             )
+        case .dropdown:
+            BPKDropdownChip(
+                chip.text,
+                icon: chip.icon,
+                selected: chip.selected,
+                style: style,
+                onClick: chip.onClick
+            )
         case .dismiss:
             BPKDismissableChip(
                 chip.text,

diff --git a/...ack/SwiftUI/Components/ChipGroup/MultiSelect/ChipGroupMultipleSelectWrapExampleView.swift b/...ack/SwiftUI/Components/ChipGroup/MultiSelect/ChipGroupMultipleSelectWrapExampleView.swift
@@ -23,22 +23,26 @@ import Backpack_SwiftUI
 struct ChipGroupMultipleSelectWrapExampleView: View {
     struct ChipData {
         let name: String
+        let type: BPKMultiSelectChipGroup.ChipItem.ChipType
         var selected: Bool
     }
 
     @State var chipsData = [
-        ChipData(name: "Shenzhen", selected: true),
-        ChipData(name: "London", selected: false),
-        ChipData(name: "Edinburgh", selected: true),
-        ChipData(name: "Manchester", selected: false),
-        ChipData(name: "Belfast", selected: false),
-        ChipData(name: "Glasgow", selected: false)
+        ChipData(name: "Shenzhen", type: .option, selected: true),
+        ChipData(name: "London", type: .dropdown, selected: false),
+        ChipData(name: "Edinburgh", type: .option, selected: true),
+        ChipData(name: "Manchester", type: .dismiss, selected: false),
+        ChipData(name: "Belfast", type: .option, selected: false),
+        ChipData(name: "Glasgow", type: .option, selected: false)
     ]
 
     var chips: [BPKMultiSelectChipGroup.ChipItem] {
         chipsData.enumerated().map({ (index, chip) in
             BPKMultiSelectChipGroup.ChipItem(
-                text: chip.name, selected: chip.selected, onClick: { chipsData[index].selected.toggle() }
+                text: chip.name,
+                type: chip.type,
+                selected: chip.selected,
+                onClick: { chipsData[index].selected.toggle() }
             )
         })
     }