@momo-kits/native-kits 0.163.1-sp.6-debug → 0.163.1-sp.7-debug

package/.claude/settings.local.json

@@ -139,7 +139,15 @@
       "Bash(sips -c 1900 904 --cropOffset 106 506 full.png --out crop.png)",
       "Bash(swiftc -O mouse.swift -o mouse)",
       "Bash(./mouse click *)",
-      "Bash(./mouse drag *)"
+      "Bash(./mouse drag *)",
+      "Bash(sips -c 900 924 --cropOffset 0 0 s12.png --out s12crop.png)",
+      "Bash(sips -c 300 1170 --cropOffset 300 0 s12.png --out s12top.png)",
+      "Bash(sips -c 700 1170 --cropOffset 250 0 t1.png --out t1c.png)",
+      "Bash(sips -c 700 1170 --cropOffset 250 0 t2.png --out t2c.png)",
+      "Bash(sips -c 700 1170 --cropOffset 150 0 t3.png --out t3c.png)",
+      "Bash(sips -c 1200 1170 --cropOffset 600 0 t4.png --out t4c.png)",
+      "Bash(sips -c 600 1170 --cropOffset 150 0 t5.png --out t5c.png)",
+      "Bash(sips -c 500 1170 --cropOffset 150 0 u1.png --out u1c.png)"
     ]
   }
 }

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.163.1-sp.6-debug"
+        version = "0.163.1-sp.7-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.163.1-sp.6-debug'
+    spec.version                  = '0.163.1-sp.7-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.163.1-sp.6
+version=0.163.1-sp.7
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/Navigation/Navigator.swift

@@ -194,23 +194,46 @@ public final class Navigator: ObservableObject {
     }
 
     public func pop(_ count: Int = 1, callback: (() -> Void)? = nil) {
-        var remaining = count
-        while remaining > 0 {
-            if overplay?.type == .snackBar {
-                // Mirrors Kotlin: a snackbar doesn't block back-navigation, so popping
-                // while one is showing pops the screen underneath and clears the
-                // snackbar immediately, without playing its dismiss animation.
-                overplayDismissHandler = nil
-                overplay = nil
-                if !popScreen() { break }
-            } else if overplay != nil {
-                hideOverplay()
-            } else if !popScreen() {
-                break
+        popStep(remaining: count, callback: callback)
+    }
+
+    /// One `pop` iteration. Compose runs the loop in a coroutine and suspends over the
+    /// overplay's exit animation before the next step; the same wait is needed here, or
+    /// a `pop(2)` (prevent-back: close the popup, then leave) would spend both steps on
+    /// the overplay that is still animating out and never pop the screen.
+    private func popStep(remaining: Int, callback: (() -> Void)?) {
+        guard remaining > 0 else {
+            callback?()
+            return
+        }
+
+        if overplay?.type == .snackBar {
+            // Mirrors Kotlin: a snackbar doesn't block back-navigation, so popping
+            // while one is showing pops the screen underneath and clears the
+            // snackbar immediately, without playing its dismiss animation.
+            overplayDismissHandler = nil
+            overplay = nil
+            guard popScreen() else {
+                callback?()
+                return
+            }
+            popStep(remaining: remaining - 1, callback: callback)
+        } else if overplay != nil {
+            hideOverplay()
+            DispatchQueue.main.asyncAfter(deadline: .now() + Self.overplayDismissDelay) { [weak self] in
+                guard let self else { return }
+                // The component reports back through `finishOverplayDismiss` once its exit
+                // animation ends; clear it here if it never did, so the step is not wasted.
+                if self.overplay != nil { self.finishOverplayDismiss() }
+                self.popStep(remaining: remaining - 1, callback: callback)
             }
-            remaining -= 1
+        } else {
+            guard popScreen() else {
+                callback?()
+                return
+            }
+            popStep(remaining: remaining - 1, callback: callback)
         }
-        callback?()
     }
 
     /// Pops the topmost presented screen or stack entry. Returns `false` (and requests
@@ -432,6 +455,10 @@ public final class Navigator: ObservableObject {
     /// with headroom for the slower interactive swipe.
     private static let screenDisposeDelay: TimeInterval = 0.35
 
+    /// Longest overplay exit animation (the bottom sheet's), so a queued pop step runs
+    /// after the component has taken itself down.
+    private static let overplayDismissDelay: TimeInterval = 0.3
+
     private func disposeScreens(droppedFrom previous: [DynamicScreenRoute]) {
         let live = Set(path.map(\.id))
         disposeScreens(previous.map(\.id).filter { !live.contains($0) })

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.163.1-sp.6'
+  s.version          = '0.163.1-sp.7'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.163.1-sp.6'
+  s.version          = '0.163.1-sp.7'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/NavigationDemo.swift

@@ -101,9 +101,21 @@ private struct NavigationDemoContent: View {
 
                 Divider().padding(.vertical, 4)
 
+                row("Custom Back Handler") {
+                    // The screen owns back: the header button and the edge swipe both
+                    // run this instead of popping (mirrors Compose's onBackHandler).
+                    navigator.push(
+                        { DemoLeafScreen(title: "Back is intercepted — swipe from the edge", color: Colors.blue09) },
+                        options: NavigationOptions(
+                            title: "Custom Back",
+                            onBackHandler: { print("back intercepted") }
+                        )
+                    )
+                }
+
                 row("Prevent Back") {
-                    // Tapping the header back button shows a confirm popup before
-                    // leaving (mirrors Compose's headerBackProps.preventBack).
+                    // The header back button and the edge swipe both show a confirm popup
+                    // before leaving (mirrors Compose's headerBackProps.preventBack).
                     navigator.push(
                         { DemoLeafScreen(title: "Tap the header back button", color: Colors.pink09) },
                         options: NavigationOptions(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.163.1-sp.6-debug",
+  "version": "0.163.1-sp.7-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},