Skip to content

FloorFilter - Resolve NavigationStack incompatibility #823

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.

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

Merged
merged 64 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
85197f5
Documentation cleanup
dfeinzimer Jul 17, 2024
fe84b25
Progress
dfeinzimer Jul 17, 2024
cc9c4f8
Add `SiteAndFacilitySelector.Header.upperHeader`
dfeinzimer Jul 18, 2024
df8a252
Add `String.allSites `
dfeinzimer Jul 18, 2024
72c3280
Remove toolbar
dfeinzimer Jul 18, 2024
f940896
Remove `CloseButton`
dfeinzimer Jul 18, 2024
f46c657
Add `Text.sites`
dfeinzimer Jul 18, 2024
79971f8
Add `Header.upperHeader`
dfeinzimer Jul 18, 2024
3967f38
Remove searchables
dfeinzimer Jul 18, 2024
5350c5b
Define `SiteAndFacilitySelector.Header.body`
dfeinzimer Jul 18, 2024
cd8a773
Add String extensions
dfeinzimer Jul 18, 2024
a755eb8
Refactor nav title
dfeinzimer Jul 18, 2024
f571df2
Reorder properties, update parameters accordingly
dfeinzimer Jul 18, 2024
9538873
Remove toolbar and nav title
dfeinzimer Jul 18, 2024
08d738a
Remove navigation stack items
dfeinzimer Jul 18, 2024
869275a
Use `Text.allSites`
dfeinzimer Jul 18, 2024
f965dd1
Doc cleanup
dfeinzimer Jul 18, 2024
e9afe4e
`SitesList` -> `SiteList`
dfeinzimer Jul 18, 2024
f81a68d
`FacilitiesList` -> `FacilityList`
dfeinzimer Jul 18, 2024
853ca31
Add doc stubs
dfeinzimer Jul 18, 2024
10bce52
Move `makeFacilitiesList` to `SiteAndFacilitySelector`
dfeinzimer Jul 18, 2024
d189a86
Remove `navigationDestination`s
dfeinzimer Jul 18, 2024
6b987ca
`sitesList` -> `siteList`
dfeinzimer Jul 18, 2024
ed85bc8
`facilityListView` -> `facilityList`
dfeinzimer Jul 18, 2024
339533d
Use `ContentUnavailableView`
dfeinzimer Jul 18, 2024
e7edb4e
Remove outdated documentation
dfeinzimer Jul 18, 2024
a15016c
Add `userDidBackOutToSiteList`
dfeinzimer Jul 18, 2024
70868bb
Apply back button visibility conditions
dfeinzimer Jul 19, 2024
cc73bca
Update header title
dfeinzimer Jul 19, 2024
99987b0
Declare `allSitesIsSelected`
dfeinzimer Jul 19, 2024
cb97e4f
Add bound `allSitesIsSelected` properties
dfeinzimer Jul 19, 2024
5782e70
Fix header title for facility lists
dfeinzimer Jul 19, 2024
be8d4b9
Switch navigation link for button
dfeinzimer Jul 19, 2024
f951f4e
Add all sites mode
dfeinzimer Jul 19, 2024
8811528
Add title for all sites mode
dfeinzimer Jul 19, 2024
acde2f5
Simplify site buttons
dfeinzimer Jul 19, 2024
a8fedf6
Mark `lowerHeader` `@MainActor`
dfeinzimer Jul 19, 2024
18ffa73
Change search text based on selection
dfeinzimer Jul 19, 2024
7cec6aa
Update doc
dfeinzimer Jul 19, 2024
cb6aa74
Set `allSitesIsSelected` on back navigation
dfeinzimer Jul 19, 2024
a739de0
Remove `navigationTitle`
dfeinzimer Jul 19, 2024
2dab9b7
Cleanup
dfeinzimer Jul 19, 2024
2464370
Simplify `SiteAndFacilitySelector` body
dfeinzimer Jul 19, 2024
0426994
MainActor cleanup
dfeinzimer Jul 20, 2024
274165d
Add `multipleSitesAreAvailable`
dfeinzimer Jul 20, 2024
1903b4f
Add multipleSitesAreAvailable to header
dfeinzimer Jul 20, 2024
e95ec9d
Add helpers
dfeinzimer Jul 20, 2024
0f290f3
Use helpers
dfeinzimer Jul 20, 2024
65f1638
Move allSitesIsSelected toggle
dfeinzimer Jul 20, 2024
755a105
Fix all sites button
dfeinzimer Jul 20, 2024
e7fe43f
Add text field clear button
dfeinzimer Jul 20, 2024
ca1dd2c
Hide header when text field focused
dfeinzimer Jul 20, 2024
02bd686
Reorganize
dfeinzimer Jul 20, 2024
f6c2bb5
Reorganize
dfeinzimer Jul 20, 2024
f04beb0
Documentation
dfeinzimer Jul 20, 2024
a4ce674
Shorten frames
dfeinzimer Jul 20, 2024
8bebb3b
Clear query on site selection
dfeinzimer Jul 22, 2024
6c69a72
`TextField` styling
dfeinzimer Jul 22, 2024
1ed685f
Animations
dfeinzimer Jul 23, 2024
b261105
Fix site selection indicator
dfeinzimer Jul 23, 2024
db4dd98
Add accessibilityIdentifier
dfeinzimer Jul 23, 2024
74060f9
Update FloorFilterTests.swift
dfeinzimer Jul 23, 2024
e05ca08
Merge branch 'v.next' into pr/823
dfeinzimer Jul 24, 2024
2a07d61
Revert "Fix site selection indicator"
dfeinzimer Jul 24, 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
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public struct FloorFilter: View {
siteAndFacilitySelectorIsPresented.toggle()
} label: {
Image(systemName: "building.2")
.accessibilityIdentifier("Floor Filter button")
.padding(.toolkitDefault)
.opacity(viewModel.isLoading ? .zero : 1)
.overlay {
Expand Down Expand Up @@ -175,13 +176,7 @@ public struct FloorFilter: View {
)
}

/// A configured `SiteAndFacilitySelector` view.
///
/// The layering of the `SiteAndFacilitySelector` over a `RoundedRectangle` is needed to
/// produce a rounded corners effect. We can not simply use `.esriBorder()` here because
/// applying the `cornerRadius()` modifier on `SiteAndFacilitySelector`'s underlying
/// `NavigationView` causes a rendering bug. This bug remains in iOS 16 with
/// `NavigationStack` and has been reported to Apple as FB10034457.
/// A configured `SiteAndFacilitySelector`.
@ViewBuilder private var siteAndFacilitySelector: some View {
if horizontalSizeClass == .compact {
Color.clear
Expand Down
Loading