Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 🐛 [IOSSDKBUG-416]FilterFeedbackBar on iPad layout #839

Merged
merged 3 commits into from
Oct 28, 2024
Merged

fix: 🐛 [IOSSDKBUG-416]FilterFeedbackBar on iPad layout #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
402a0b3
fix: 🐛 [IOSSDKBUG-416]FilterFeedbackBar on iPad layout
restaurantt Oct 28, 2024
763af0e
fix: 🐛 [IOSSDKBUG-416]FilterFeedbackBar on iPad layout
restaurantt Oct 28, 2024
d9beb84
Merge branch 'rel-4.1' into rel-4.1-filterFeedbackBar-layout
dyongxu Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Apps/Examples/Examples/FioriSwiftUICore/SortFilter/SortFilterExample.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ struct SortFilterExample: View {
[
.switch(item: .init(name: "Favorite", value: true, icon: "heart.fill"), showsOnFilterFeedbackBar: true),
.switch(item: .init(name: "Tagged", value: nil, icon: "tag"), showsOnFilterFeedbackBar: false),
.picker(item: .init(name: "JIRA Status", value: [0], valueOptions: ["Received", "Started", "Hold", "Transfer", "Completed", "Pending Review Pending Pending Pending Pending Pending", "Accepted Medium", "Pending Medium", "Completed Medium"], allowsMultipleSelection: true, allowsEmptySelection: true, showsValueForSingleSelected: false, icon: "clock", itemLayout: .fixed, displayMode: .automatic), showsOnFilterFeedbackBar: true)
.picker(item: .init(name: "List Few JIRA Status", value: [0], valueOptions: ["Received", "Started", "Hold", "Transfer", "Completed", "Pending Review Pending Pending Pending Pending Pending", "Accepted Medium", "Pending Medium", "Completed Medium"], allowsMultipleSelection: true, allowsEmptySelection: true, showsValueForSingleSelected: false, icon: "clock", itemLayout: .fixed, displayMode: .list), showsOnFilterFeedbackBar: true),
.picker(item: .init(name: "List Many JIRA Status", value: [0], valueOptions: ["Received", "Started", "Hold", "Transfer", "Completed", "Pending Review Pending Pending Pending Pending Pending", "Accepted Medium", "Pending Medium", "Completed Medium", "Checked", "Unchecked", "Partially Checked", "Checked and Unchecked", "Checked and Partially Checked", "Unchecked and Partially Checked", "Partially Checked and Unchecked", "Checked and Unchecked and Partially Checked", "Unchecked and Partially Checked and Partially Checked", "Partially Checked and Unchecked and Partially Checked", "Checked Finally", "Unchecked Finally", "Partially Checked Finally", "Checked and Unchecked Finally", "Checked and Partially Checked Finally", "Unchecked and Partially Checked Finally", "Partially Checked and Unchecked Finally", "Checked Finally and Partially Checked Finally", "Unchecked Finally and Partially Checked Finally", "Partially Checked Finally and Partially Checked Finally", "Review", "Reviewed", "To be Reviewed", "Pending for Review", "Booked", "To be Booked", "Will Book", "Booking Canceled"], allowsMultipleSelection: true, allowsEmptySelection: true, showsValueForSingleSelected: false, icon: "clock", itemLayout: .fixed, displayMode: .list), showsOnFilterFeedbackBar: true),
.picker(item: .init(name: "FormCell Flexible Filter Selection", value: [0], valueOptions: ["Received", "Started", "Hold", "Transfer", "Completed", "Pending Review Pending Pending Pending Pending Pending", "Accepted Medium", "Pending", "Completed Medium"], allowsMultipleSelection: true, allowsEmptySelection: true, showsValueForSingleSelected: false, icon: "clock", itemLayout: .flexible, displayMode: .filterFormCell), showsOnFilterFeedbackBar: true),
.picker(item: .init(name: "FormCell Fixed Few Filter Selection", value: [0], valueOptions: ["Received", "Started", "Hold", "Transfer", "Completed", "Pending Review Pending Pending Pending Pending Pending"], allowsMultipleSelection: true, allowsEmptySelection: true, showsValueForSingleSelected: false, icon: "clock", itemLayout: .fixed, displayMode: .filterFormCell), showsOnFilterFeedbackBar: true),
.picker(item: .init(name: "FormCell Fixed Many Filter Selection", value: [0], valueOptions: ["Received", "Started", "Hold", "Transfer", "Completed", "Pending Review Pending Pending Pending Pending Pending", "Accepted Medium", "Pending Medium", "Completed Medium", "Checked", "Unchecked", "Partially Checked", "Checked and Unchecked", "Checked and Partially Checked", "Unchecked and Partially Checked", "Partially Checked and Unchecked", "Checked and Unchecked and Partially Checked", "Unchecked and Partially Checked and Partially Checked", "Partially Checked and Unchecked and Partially Checked", "Checked Finally", "Unchecked Finally", "Partially Checked Finally", "Checked and Unchecked Finally", "Checked and Partially Checked Finally", "Unchecked and Partially Checked Finally", "Partially Checked and Unchecked Finally", "Checked Finally and Partially Checked Finally", "Unchecked Finally and Partially Checked Finally", "Partially Checked Finally and Partially Checked Finally", "Review", "Reviewed", "To be Reviewed", "Pending for Review", "Booked", "To be Booked", "Will Book", "Booking Canceled"], allowsMultipleSelection: true, allowsEmptySelection: true, showsValueForSingleSelected: false, icon: "clock", itemLayout: .fixed, displayMode: .filterFormCell), showsOnFilterFeedbackBar: true)
],
[
.picker(item: .init(name: "Priority", value: [0], valueOptions: ["High", "Medium", "Low"], allowsMultipleSelection: true, allowsEmptySelection: true, showsValueForSingleSelected: false, icon: "filemenu.and.cursorarrow"), showsOnFilterFeedbackBar: true),
Expand Down
17 changes: 15 additions & 2 deletions Sources/FioriSwiftUICore/Views/OptionListPickerItem+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ extension OptionListPickerItem: View {
let popverHeight = Screen.bounds.size.height - StatusBar.height
let totalSpacing: CGFloat = (UIDevice.current.userInterfaceIdiom == .pad ? 8 : 16) * 2
let totalPadding: CGFloat = (UIDevice.current.userInterfaceIdiom == .pad ? 13 : 16) * 2
let maxScrollViewHeight = popverHeight - totalSpacing - totalPadding - 120
let safeAreaInset = self.getSafeAreaInsets()
let maxScrollViewHeight = popverHeight - totalSpacing - totalPadding - safeAreaInset.top - safeAreaInset.bottom - (UIDevice.current.userInterfaceIdiom == .pad ? 210 : 30)
self._height = min(geometry.size.height, maxScrollViewHeight)
}
}
Expand Down Expand Up @@ -94,14 +95,26 @@ extension OptionListPickerItem: View {
let popverHeight = Screen.bounds.size.height - StatusBar.height
let totalSpacing: CGFloat = (UIDevice.current.userInterfaceIdiom == .pad ? 8 : 16) * 2
let totalPadding: CGFloat = (UIDevice.current.userInterfaceIdiom == .pad ? 13 : 16) * 2
let maxScrollViewHeight = popverHeight - totalSpacing - totalPadding - 120
let safeAreaInset = self.getSafeAreaInsets()
let maxScrollViewHeight = popverHeight - totalSpacing - totalPadding - safeAreaInset.top - safeAreaInset.bottom - (UIDevice.current.userInterfaceIdiom == .pad ? 210 : 30)
self._height = min(geometry.size.height, maxScrollViewHeight)
}
}
)
}
.frame(height: _height)
}

private func getSafeAreaInsets() -> UIEdgeInsets {
guard let keyWindow = UIApplication.shared.connectedScenes
.first(where: { $0.activationState == .foregroundActive })
.flatMap({ $0 as? UIWindowScene })?.windows
.first(where: \.isKeyWindow)
else {
return .zero
}
return keyWindow.safeAreaInsets
}
}

/*
Expand Down
20 changes: 17 additions & 3 deletions Sources/FioriSwiftUICore/Views/SearchListPickerItem+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,16 @@ extension SearchListPickerItem: View {
}
}
.modifier(FioriIntrospectModifier<UIScrollView> { scrollView in
if !_searchText.isEmpty {
return
}
DispatchQueue.main.async {
let popverHeight = Screen.bounds.size.height - StatusBar.height
let totalSpacing: CGFloat = (UIDevice.current.userInterfaceIdiom == .pad ? 8 : 16) * 2
let totalPadding: CGFloat = (UIDevice.current.userInterfaceIdiom == .pad ? 13 : 16) * 2
let maxScrollViewHeight = popverHeight - totalSpacing - totalPadding - 52 - 56 - 120

self._height = UIDevice.current.userInterfaceIdiom != .phone ? min(scrollView.contentSize.height, 396) : min(min(scrollView.contentSize.height, maxScrollViewHeight), 396)
let safeAreaInset = self.getSafeAreaInsets()
let maxScrollViewHeight = popverHeight - totalSpacing - totalPadding - 52 - 56 - safeAreaInset.top - safeAreaInset.bottom - (UIDevice.current.userInterfaceIdiom == .pad ? 230 : 30)
self._height = min(scrollView.contentSize.height, maxScrollViewHeight)
var isSelectAllViewShow = false
if allowsMultipleSelection {
if _value.count != _valueOptions.count || allowsEmptySelection {
Expand Down Expand Up @@ -111,6 +114,17 @@ extension SearchListPickerItem: View {
private func findIndex(of item: String) -> Int? {
_valueOptions.firstIndex(where: { $0 == item })
}

private func getSafeAreaInsets() -> UIEdgeInsets {
guard let keyWindow = UIApplication.shared.connectedScenes
.first(where: { $0.activationState == .foregroundActive })
.flatMap({ $0 as? UIWindowScene })?.windows
.first(where: \.isKeyWindow)
else {
return .zero
}
return keyWindow.safeAreaInsets
}
}

#Preview {
Expand Down
10 changes: 5 additions & 5 deletions Sources/FioriSwiftUICore/Views/SortFilter/FilterFeedbackBarItem+View.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct SliderMenuItem: View {
.onTapGesture {
self.isSheetVisible.toggle()
}
.popover(isPresented: self.$isSheetVisible, attachmentAnchor: .point(.bottom)) {
.popover(isPresented: self.$isSheetVisible) {
CancellableResettableDialogForm {
SortFilterItemTitle(title: self.item.name)
} cancelAction: {
Expand Down Expand Up @@ -153,7 +153,7 @@ struct PickerMenuItem: View {
.onTapGesture {
self.isSheetVisible.toggle()
}
.popover(isPresented: self.$isSheetVisible, attachmentAnchor: .point(.bottom)) {
.popover(isPresented: self.$isSheetVisible) {
CancellableResettableDialogForm {
SortFilterItemTitle(title: self.item.name)
} cancelAction: {
Expand Down Expand Up @@ -224,7 +224,7 @@ struct PickerMenuItem: View {
.onTapGesture {
self.isSheetVisible.toggle()
}
.popover(isPresented: self.$isSheetVisible, attachmentAnchor: .point(.bottom)) {
.popover(isPresented: self.$isSheetVisible) {
CancellableResettableDialogNavigationForm {
SortFilterItemTitle(title: self.item.name)
} cancelAction: {
Expand Down Expand Up @@ -311,7 +311,7 @@ struct DateTimeMenuItem: View {
.onTapGesture {
self.isSheetVisible.toggle()
}
.popover(isPresented: self.$isSheetVisible, attachmentAnchor: .point(.bottom)) {
.popover(isPresented: self.$isSheetVisible) {
CancellableResettableDialogForm {
SortFilterItemTitle(title: self.item.name)
} cancelAction: {
Expand Down Expand Up @@ -448,7 +448,7 @@ struct FullCFGMenuItem: View {
.onTapGesture {
self.isSheetVisible.toggle()
}
.popover(isPresented: self.$isSheetVisible, attachmentAnchor: .point(.bottom)) {
.popover(isPresented: self.$isSheetVisible) {
SortFilterView(
title: {
if let title = fullCFGButton.name {
Expand Down
Loading