Skip to content

Commit

Permalink
Merge pull request #12 from flashyhuckle/Fix-Navigation-Scroll
Browse files Browse the repository at this point in the history
Fix navigation scroll
  • Loading branch information
navanchauhan authored Jan 18, 2025
2 parents eb64f5d + 68bfa6e commit faee13b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 5 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2025 Navan Chauhan

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
7 changes: 2 additions & 5 deletions iGopherBrowser/BrowserView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ struct BrowserView: View {
VStack(spacing: 0) {
if gopherItems.count >= 1 {
ScrollViewReader { proxy in

List {
ForEach(Array(gopherItems.enumerated()), id: \.offset) { idx, item in
if item.parsedItemType == .info {
Expand Down Expand Up @@ -169,10 +168,7 @@ struct BrowserView: View {
.cornerRadius(10)
.onChange(of: scrollToTop) {
// TODO: Cleanup
withAnimation {
proxy.scrollTo(0, anchor: .top)

}
proxy.scrollTo(0, anchor: .top)
}
.onChange(of: selectedSearchItem) {
if let selectedSearchItem = selectedSearchItem {
Expand Down Expand Up @@ -540,6 +536,7 @@ struct BrowserView: View {
print("Different URL being processed right now... Cancelling")
} else {
self.gopherItems = resp
scrollToTop.toggle()
}

} catch is CancellationError {
Expand Down

0 comments on commit faee13b

Please sign in to comment.