Skip to content

Commit d7bc24b

Browse files
committed
Address PR feedback.
1 parent 352f89f commit d7bc24b

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

Sources/ArcGISToolkit/Components/Popups/EmbeddedPopupView.swift

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ extension EmbeddedPopupView {
130130
EmptyView()
131131
}
132132
}
133-
#if targetEnvironment(macCatalyst)
134-
.listRowInsets(.toolkitDefault)
135-
#endif
133+
.popupListRowStyle()
136134
}
137135
.listStyle(.plain)
138136
}
@@ -150,3 +148,13 @@ private extension Logger {
150148
Logger(subsystem: "com.esri.ArcGISToolkit", category: "PopupView")
151149
}
152150
}
151+
152+
extension View {
153+
/// Adds the list row style for the PopupView.
154+
func popupListRowStyle() -> some View {
155+
self.listSectionSeparator(.hidden, edges: .top)
156+
#if targetEnvironment(macCatalyst)
157+
.listRowInsets(.init(top: 8, leading: 19, bottom: 8, trailing: 19))
158+
#endif
159+
}
160+
}

Sources/ArcGISToolkit/Components/Popups/UtilityAssociationsPopupElementView.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ private struct UtilityAssociationsFilterResultLink: View {
139139
NavigationLink {
140140
List(filterResult.groupResults, id: \.id) { groupResult in
141141
UtilityAssociationGroupResultView(groupResult: groupResult)
142-
#if targetEnvironment(macCatalyst)
143-
.listRowInsets(.toolkitDefault)
144-
#endif
142+
.popupListRowStyle()
145143
}
146144
.listStyle(.plain)
147145
.navigationTitle(filterResult.filter.displayTitle, subtitle: popupTitle)
@@ -250,9 +248,7 @@ private struct SearchUtilityAssociationResultsView: View {
250248
} label: {
251249
UtilityAssociationResultLabel(result: result)
252250
}
253-
#if targetEnvironment(macCatalyst)
254-
.listRowInsets(.toolkitDefault)
255-
#endif
251+
.popupListRowStyle()
256252
}
257253
.listStyle(.plain)
258254
.searchable(

0 commit comments

Comments
 (0)