feat: 🎸 [JIRA: HCPSDKFIORIUIKIT-2559] list style configurable (#674)

* feat: 🎸 [JIRA: HCPSDKFIORIUIKIT-2559] list style configurable * feat: 🎸 rename to listPickerListStyle
SAP · Apr 2, 2024 · 376fdb1 · 376fdb1
1 parent 51a4078
commit 376fdb1
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 7 deletions.
diff --git a/Apps/Examples/Examples/FioriSwiftUICore/FormCells/ListPicker.swift b/Apps/Examples/Examples/FioriSwiftUICore/FormCells/ListPicker.swift
@@ -127,6 +127,7 @@ struct ListPickerItemDataNonIdentifiableExample: View {
                 Text(framework.name)
             }))
         }
+        .listPickerListStyle(.inset)
         .navigationBarTitle(Text("Form"))
     }
 }

diff --git a/Apps/Examples/Examples/FioriSwiftUICore/FormCells/SearchableListViewExample.swift b/Apps/Examples/Examples/FioriSwiftUICore/FormCells/SearchableListViewExample.swift
@@ -24,6 +24,8 @@ struct SearchableListViewExample: View {
                 Spacer()
                 NavigationLink {
                     self.pickerView(self.$selection1)
+                        .listStyle(.insetGrouped)
+                        .listPickerListStyle(.grouped)
                         .navigationTitle("Title: Pick One")
                 } label: {
                     let str = self.selectedValues(Array(self.selection1))

diff --git a/Sources/FioriSwiftUICore/Models/ModelDefinitions.swift b/Sources/FioriSwiftUICore/Models/ModelDefinitions.swift
@@ -107,6 +107,7 @@ public protocol ActivityItemsModel: ActionItemsComponent {}
 
 // sourcery: generated_component
 // sourcery: add_env_props = "listBackground"
+// sourcery: add_env_props = "listpickerListStyle"
 // sourcery: virtualPropDestinationView = "var destinationView: AnyView? = nil"
 public protocol ListPickerItemModel: KeyComponent, ValueComponent {}
 
@@ -365,6 +366,7 @@ public protocol DurationPickerModel: DurationPickerComponent {}
 // sourcery: availableAttributeContent = "iOS 15.0, macOS 12.0, *"
 // sourcery: add_env_props = "presentationMode"
 // sourcery: add_env_props = "listBackground"
+// sourcery: add_env_props = "listpickerListStyle"
 // sourcery: virtualPropContentView = "var contentView: AnyView? = nil"
 // sourcery: virtualPropIsTopLevel = "var isTopLevel: Bool = true"
 // sourcery: virtualPropDataHandler = "var dataHandler: (() -> ())? = nil"

diff --git a/Sources/FioriSwiftUICore/Views/ListPickerItem+View.swift b/Sources/FioriSwiftUICore/Views/ListPickerItem+View.swift
@@ -29,7 +29,7 @@ extension Fiori {
 extension ListPickerItem: View {
     public var body: some View {
         NavigationLink(
-            destination: destinationView?.environment(\.listBackground, listBackground),
+            destination: destinationView?.listStyle(listpickerListStyle).listPickerListStyle(listpickerListStyle).listBackground(listBackground).typeErased,
             label: {
                 KeyValueItem {
                     key
@@ -188,7 +188,6 @@ extension ListPickerItemConfiguration {
                                                   searchFilter: searchFilter,
                                                   rowContent: rowContent,
                                                   rowBackground: rowBackground)
-            .listStyle(.plain)
             .typeErased
     }
 }
@@ -234,3 +233,24 @@ extension ListPickerItem {
         }
     }
 }
+
+struct ListpickerListStyleKey: EnvironmentKey {
+    static let defaultValue: any ListStyle = .automatic
+}
+
+extension EnvironmentValues {
+    /// listpickerListStyle environment value.
+    var listpickerListStyle: any ListStyle {
+        get { self[ListpickerListStyleKey.self] }
+        set { self[ListpickerListStyleKey.self] = newValue }
+    }
+}
+
+public extension View {
+    /// List style for destination list in list picker.
+    /// - Parameter style: some `ListStyle`.
+    /// - Returns: New destination list style for list picker.
+    func listPickerListStyle(_ style: some ListStyle) -> some View {
+        self.environment(\.listpickerListStyle, style)
+    }
+}
diff --git a/Sources/FioriSwiftUICore/Views/SearchableListContent.swift b/Sources/FioriSwiftUICore/Views/SearchableListContent.swift
@@ -6,7 +6,8 @@ import SwiftUI
 
 struct SearchableListContent<Data: RandomAccessCollection, ID: Hashable, RowContent: View, RowBackground: View>: View {
     @Environment(\.listBackground) var listBackground
-
+    @Environment(\.listpickerListStyle) var listpickerListStyle
+
     @State var searchText = ""
     @State var selectionBuffer: Set<ID>
 

diff --git a/Sources/FioriSwiftUICore/Views/SearchableListView+View.swift b/Sources/FioriSwiftUICore/Views/SearchableListView+View.swift
@@ -34,7 +34,6 @@ extension SearchableListView: View {
     public var body: some View {
         if let contentView {
             contentView
-                .listStyle(.plain)
                 .environment(\.listBackground, listBackground)
                 .ifApply(isTopLevel) {
                     $0.toolbar {

diff --git a/Sources/FioriSwiftUICore/_generated/ViewModels/API/ListPickerItem+API.generated.swift b/Sources/FioriSwiftUICore/_generated/ViewModels/API/ListPickerItem+API.generated.swift
@@ -5,6 +5,7 @@ import SwiftUI
 public struct ListPickerItem<Key: View, Value: View> {
     @Environment(\.keyModifier) private var keyModifier
 	@Environment(\.valueModifier) private var valueModifier
+	@Environment(\.listpickerListStyle) var listpickerListStyle
 	@Environment(\.listBackground) var listBackground
 
     let _key: Key

diff --git a/Sources/FioriSwiftUICore/_generated/ViewModels/API/SearchableListView+API.generated.swift b/Sources/FioriSwiftUICore/_generated/ViewModels/API/SearchableListView+API.generated.swift
@@ -5,9 +5,10 @@ import SwiftUI
 @available(iOS 15.0, macOS 12.0, *)
 public struct SearchableListView<CancelActionView: View, DoneActionView: View> {
     @Environment(\.cancelActionModifier) private var cancelActionModifier
-	@Environment(\.doneActionModifier) private var doneActionModifier
-	@Environment(\.listBackground) var listBackground
-	@Environment(\.presentationMode) var presentationMode
+    @Environment(\.doneActionModifier) private var doneActionModifier
+    @Environment(\.listBackground) var listBackground
+    @Environment(\.listpickerListStyle) var listpickerListStyle
+    @Environment(\.presentationMode) var presentationMode
 
     let _cancelAction: CancelActionView
 	let _doneAction: DoneActionView