No commit message

.gitignore

@@ -19,6 +19,8 @@ java_pid*.hprof
 ## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
 build/
 DerivedData/
+.android/
+.kotlin/
 *.moved-aside
 *.pbxuser
 !default.pbxuser

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.1
+
+Released 2024-07-03
+
+
 ## 0.4.0
 
 Released 2024-05-25

Package.swift

@@ -10,11 +10,11 @@ let package = Package(
     defaultLocalization: "en",
     platforms: [.iOS(.v17), .macOS(.v13), .tvOS(.v17), .watchOS(.v10), .macCatalyst(.v17)],
     products: [
-        .library(name: "SkipWeb", targets: ["SkipWeb"]),
+        .library(name: "SkipWeb", type: .dynamic, targets: ["SkipWeb"]),
     ],
     dependencies: [
-        .package(url: "https://source.skip.tools/skip.git", from: "0.8.45"),
-        .package(url: "https://source.skip.tools/skip-ui.git", from: "0.9.3")
+        .package(url: "https://source.skip.tools/skip.git", from: "0.9.2"),
+        .package(url: "https://source.skip.tools/skip-ui.git", from: "0.10.0")
     ],
     targets: [
         .target(name: "SkipWeb", dependencies: [.product(name: "SkipUI", package: "skip-ui")], resources: [.process("Resources")], plugins: [.plugin(name: "skipstone", package: "skip")]),

Sources/SkipWeb/Skip/skip.yml

@@ -5,21 +5,12 @@
 # the blocks to add to the build.gradle.kts
 build:
   contents:
-    - block: 'android'
-      contents:
-        - block: 'buildFeatures'
-          contents:
-            - 'compose = true'
-        - block: 'composeOptions'
-          contents:
-            - 'kotlinCompilerExtensionVersion = libs.versions.kotlin.compose.compiler.extension.get()'
-
     - block: 'dependencies'
       export: false
       contents:
         - 'implementation("androidx.webkit:webkit:1.11.0")'
-        - 'androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")'
-        - 'androidTestImplementation("androidx.test.espresso:espresso-web:3.5.1")'
+        - 'androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")'
+        - 'androidTestImplementation("androidx.test.espresso:espresso-web:3.6.1")'
 
         - 'testImplementation(libs.androidx.compose.ui.test)'
         - 'androidTestImplementation(libs.androidx.compose.ui.test)'

Sources/SkipWeb/WebView.swift

@@ -94,7 +94,6 @@ public struct WebView : View {
     public internal(set) var backList: [BackForwardListItem] = []
     public internal(set) var forwardList: [BackForwardListItem] = []
     public internal(set) var scrollingDown: Bool = false
-    public internal(set) var scrollingOffset: Double = 0.0
 
     public init() {
     }
@@ -795,14 +794,19 @@ extension WebViewCoordinator: WebNavigationDelegate {
 @available(macOS 14.0, iOS 17.0, *)
 extension WebViewCoordinator: UIScrollViewDelegate {
     public func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        //logger.log("scrollView: isDecelerating=\(scrollView.isDecelerating) isDragging=\(scrollView.isDragging) isTracking=\(scrollView.isTracking) isZoomBouncing=\(scrollView.isZoomBouncing) contentOffset=\(scrollView.contentOffset.debugDescription)")
         // ignore scrolling while the page is loading
         if self.state.isLoading { return }
+        // only change the state if we are actively dragging, not if intertial scrolling is in effect
+        if !scrollView.isTracking { return }
 
         defer { self.lastScrollOffset = scrollView.contentOffset }
         let offsetY = scrollView.contentOffset.y
         let isScrollingDown = ((offsetY + scrollView.visibleSize.height) >= scrollView.contentSize.height) || (offsetY > 0 && offsetY > self.lastScrollOffset.y)
-        self.state.scrollingDown = isScrollingDown
-        self.state.scrollingOffset = offsetY
+
+        if self.state.scrollingDown != isScrollingDown {
+            self.state.scrollingDown = isScrollingDown
+        }
     }
 
     public func scrollViewDidZoom(_ scrollView: UIScrollView) {