MBL-2220: Implement parent filter modal for search phase 2 #2399
+136
−208
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75b34cf to
74a7044
Compare
529c521 to
6e31b02
Compare
9d3a94d to
92c34eb
Compare
6e31b02 to
7190d55
Compare
| @@ -5,8 +5,6 @@ struct FilterCategoryView<T: FilterCategory>: View { | |||
| @StateObject var viewModel: FilterCategoryViewModel<T> | |||
|
|
|||
| var onSelectedCategory: ((T?) -> Void)? = nil | |||
| var onResults: (() -> Void)? = nil | |||
There was a problem hiding this comment.
The buttons are moving out of FilterCategoryView and into FilterRootView, which is why I have all these deletes.
| } | ||
| } | ||
|
|
||
| private func selectInitialCategory(selectedCategory: T) { |
There was a problem hiding this comment.
If you initialized this page with a subcategory, it wasn't reflected in the UI. This fixes it.
| struct FilterRootView: View { | ||
| @State var filterOptions: SearchFilterOptions |
There was a problem hiding this comment.
This was never changed/didn't need to be state.
stevestreza-ksr
approved these changes
Apr 25, 2025
jovaniks
approved these changes
Apr 25, 2025
| @ViewBuilder | ||
| private func subcategories(for category: T) -> some View { | ||
| if self.viewModel.isCategorySelected(category), let subcategories = category.availableSubcategories { | ||
| FlowLayout(horizontalSpacing: 8, verticalSpacing: 8, alignment: .leading) { |
There was a problem hiding this comment.
Not a blocker at all, but we could consider moving these values into Constants, same goes for the padding values.
| self.selectCategory(category, subcategory: subcategory) | ||
| return | ||
| } | ||
| } |
There was a problem hiding this comment.
We could use first(where:) instead of the manual loop for categories and subcategories lookup:
private func selectInitialCategory(selectedCategory: T) {
if let category = self.categories.first(where: { $0 == selectedCategory }) {
self.selectCategory(category, subcategory: nil)
return
}
for category in self.categories {
if let subcategory = category.availableSubcategories?.first(where: { $0 == selectedCategory }) {
self.selectCategory(category, subcategory: subcategory)
return
}
}
}There was a problem hiding this comment.
I like that better, thanks!
7190d55 to
f954a8d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📲 What
Implement the main filter page for search phase 2 🎉
