@momo-kits/native-kits 0.165.1-beta.10 → 0.165.1-beta.12-debug

package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt

@@ -5,6 +5,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.unit.Dp
+import vn.momo.kits.navigation.Navigator
 
 data class ScreenDimension(
     val width: Int,
@@ -24,8 +25,9 @@ expect fun getStatusBarHeight(): Dp
 @Composable
 expect fun BackHandler(enabled: Boolean, onBack: () -> Unit)
 
+@Suppress("ParamsComparedByRef")
 @Composable
-expect fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit)
+expect fun ProvideNavigationEventDispatcherOwner(navigator: Navigator, content: @Composable () -> Unit)
 
 @Composable
 expect fun getScreenHeight(): Dp

package/compose/src/iosMain/kotlin/vn/momo/kits/navigation/HostBackGesture.ios.kt

@@ -7,85 +7,32 @@ import androidx.navigationevent.NavigationEvent
 import androidx.navigationevent.NavigationEventDispatcher
 import androidx.navigationevent.NavigationEventInput
 
-/**
- * Kit end of the host's edge-pan recogniser. The host owns the only recogniser on iOS and replays
- * its drag here; events reach NavHost's `PredictiveBackHandler` and seek the stack transition.
- *
- * **Call every method from the main thread** — nothing here is synchronised, and [attachedInputs]
- * is also written from composition.
- */
-object HostBackGestureBridge {
-    private val attachedInputs = mutableListOf<HostNavigationEventInput>()
-    private var gestureInput: HostNavigationEventInput? = null
-
-    /** `false` means no container is mounted, or it opted out — host falls back to its own nav. */
-    val hasEnabledHandlers: Boolean
-        get() = attachedInputs.lastOrNull()?.hasEnabledHandlers == true
-
-    /** Set on tabs other than the first; host pulls it when its recogniser begins. */
-    var shouldUseFloatingArrowBack: Boolean = false
-        internal set
-
-    /** Begins a drag. Pairs with exactly one [completed] or [cancelled]. */
-    fun started() {
-        val input = attachedInputs.lastOrNull() ?: return
-        gestureInput = input
-        input.backStarted()
-    }
-
-    /** Drag progress in `0f..1f` — the fraction of the screen width travelled. */
-    fun progressed(progress: Float) {
-        gestureInput?.backProgressed(progress.coerceIn(0f, 1f))
-    }
-
-    /** Falls back to the attached input when no drag was started: a host that commits without
-     *  ever seeking still needs its back. */
-    fun completed() {
-        (gestureInput ?: attachedInputs.lastOrNull())?.backCompleted()
-        gestureInput = null
-    }
-
-    /** Released below the commit threshold: the screen springs back. */
-    fun cancelled() {
-        gestureInput?.backCancelled()
-        gestureInput = null
-    }
-
-    internal fun attach(input: HostNavigationEventInput) {
-        attachedInputs += input
-    }
-
-    internal fun detach(input: HostNavigationEventInput) {
-        attachedInputs -= input
-        // else a container unmounted mid-drag hands its terminal event to whoever is on top now
-        if (gestureInput === input) gestureInput = null
-    }
-}
-
-/** Wires one [NavigationContainer]'s dispatcher to [HostBackGestureBridge] while it is composed. */
+@Suppress("ParamsComparedByRef")
 @Composable
-internal fun AttachHostBackGesture(dispatcher: NavigationEventDispatcher) {
+internal fun AttachHostBackGesture(dispatcher: NavigationEventDispatcher, navigator: Navigator) {
     val input = remember(dispatcher) { HostNavigationEventInput() }
+    val target = remember(input, navigator) {
+        object : HostBackTarget {
+            override fun canPop() = navigator.canPop()
+            override fun onBack() = navigator.onBackSafe()
+            override fun backStarted() = input.backStarted()
+            override fun backProgressed(progress: Float) = input.backProgressed(progress)
+            override fun backCompleted() = input.backCompleted()
+            override fun backCancelled() = input.backCancelled()
+        }
+    }
 
-    DisposableEffect(dispatcher, input) {
+    DisposableEffect(dispatcher, target) {
         dispatcher.addInput(input)
-        HostBackGestureBridge.attach(input)
+        HostBackGestureBridge.attach(target)
         onDispose {
-            HostBackGestureBridge.detach(input)
+            HostBackGestureBridge.detach(target)
             dispatcher.removeInput(input)
         }
     }
 }
 
 internal class HostNavigationEventInput : NavigationEventInput() {
-    var hasEnabledHandlers: Boolean = false
-        private set
-
-    override fun onHasEnabledHandlersChanged(hasEnabledHandlers: Boolean) {
-        this.hasEnabledHandlers = hasEnabledHandlers
-    }
-
-    // Touch coordinates are not forwarded: progress alone seeks the transition.
     fun backStarted() = dispatchOnBackStarted(NavigationEvent(swipeEdge = NavigationEvent.EDGE_LEFT))
 
     fun backProgressed(progress: Float) = dispatchOnBackProgressed(

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -40,6 +40,7 @@ import platform.UIKit.UIColor
 import platform.UIKit.UIDevice
 import platform.UIKit.UIScreen
 import vn.momo.kits.navigation.AttachHostBackGesture
+import vn.momo.kits.navigation.Navigator
 
 actual fun getPlatformName(): String = "iOS"
 
@@ -62,8 +63,6 @@ actual fun getStatusBarHeight(): Dp {
     return WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
 }
 
-// Registered inside the NavHost destination, so an enabled one out-ranks NavHost's own
-// predictive-back handler — that is how a screen opts out of swipe-back.
 @Suppress("DEPRECATION")
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -73,17 +72,14 @@ actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) {
 
 @OptIn(InternalComposeUiApi::class)
 @Composable
-actual fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit) {
-    // Detached on purpose: the scene's owner would arm Compose's own recogniser alongside the
-    // host's, and UIKit resolves that by driving one to .failed — a fabricated completed back.
-    // Enabled on purpose: dispatchOn* early-returns while disabled, muting the host-driven seek.
+actual fun ProvideNavigationEventDispatcherOwner(navigator: Navigator, content: @Composable () -> Unit) {
     val navigationEventDispatcherOwner = remember {
         object : NavigationEventDispatcherOwner {
             override val navigationEventDispatcher = NavigationEventDispatcher()
         }
     }
 
-    AttachHostBackGesture(navigationEventDispatcherOwner.navigationEventDispatcher)
+    AttachHostBackGesture(navigationEventDispatcherOwner.navigationEventDispatcher, navigator)
 
     CompositionLocalProvider(
         LocalCompatNavigationEventDispatcherOwner provides navigationEventDispatcherOwner,

package/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-android-compileSdk = "36"
+android-compileSdk = "37"
 android-minSdk = "24"
 android-targetSdk = "36"
 ktor-version = "3.0.0-rc-1"

package/gradle.properties

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

package/ios/Application/Navigation/NavigatorManager.swift

@@ -1,19 +1,3 @@
-//
-//  NavigatorManager.swift
-//  MoMoUIKits
-//
-//  Host bridge for the native iOS edge-swipe back — the SwiftUI mirror of Compose's
-//  `ComposeNavigatorManager` (momo-app `vn.momo.compose.uikits.ComposeNavigatorManager`).
-//
-//  The kit does NOT own the swipe gesture. In the host app a kit screen lives inside a
-//  `UIHostingController` hosted by the mini-app container VC, and that VC owns the
-//  `UIScreenEdgePanGestureRecognizer`. When the swipe fires the host asks this manager
-//  whether a kit stack is mounted (`checkCanPop`) and, if so, routes the back into it
-//  (`pop` → `Navigator.onBackSafe`) instead of dismissing the whole mini-app. Standalone
-//  (no such host, e.g. the demo app) there is no edge swipe — same as Compose on iOS,
-//  whose `BackHandler` is a no-op and which relies entirely on the host.
-//
-
 import Foundation
 
 @available(iOS 16.0, *)
@@ -21,28 +5,17 @@ public final class NavigatorManager {
     public static let shared = NavigatorManager()
     private init() {}
 
-    /// Stack of mounted navigators; the last one is the visible top (nested mini-apps
-    /// push more than one). Held strongly, mirroring `ComposeNavigatorManager` — entries
-    /// are released by `NavigationContainer` on disappear, not by ARC.
     private var navigators: [Navigator] = []
 
-    /// Idempotent: SwiftUI can re-run a view's `onAppear`, and a double push would need a
-    /// matching double remove to unwind.
     public func push(_ navigator: Navigator) {
         guard !navigators.contains(where: { $0 === navigator }) else { return }
         navigators.append(navigator)
     }
 
-    /// Removes by identity rather than `removeLast` so a spurious disappear of a covered
-    /// (non-top) container can't drop the wrong navigator.
     public func remove(_ navigator: Navigator) {
         navigators.removeAll { $0 === navigator }
     }
 
-    /// True while any kit stack is mounted — tells the host to route the back into the kit
-    /// instead of dismissing the mini-app. Matches `ComposeNavigatorManager.checkCanPop`:
-    /// it does not inspect stack depth; `onBackSafe` handles the at-root case itself by
-    /// asking the host to dismiss (via `composeApi`).
     public func checkCanPop() -> Bool { !navigators.isEmpty }
 
     public func pop() { navigators.last?.onBackSafe() }

package/ios/Information/Information.swift

@@ -18,6 +18,7 @@ public struct Information: View {
     private let action: String?
     private let showIconClose: Bool
     private let onPressClose: (() -> Void)?
+    private let highlightText: [String]
 
     public init(
         title: String? = nil,
@@ -28,7 +29,8 @@ public struct Information: View {
         showIcon: Bool = true,
         action: String? = nil,
         showIconClose: Bool = true,
-        onPressClose: (() -> Void)? = nil
+        onPressClose: (() -> Void)? = nil,
+        highlightText: [String] = []
     ) {
         self.title = title
         self.description = description
@@ -39,6 +41,7 @@ public struct Information: View {
         self.action = action
         self.showIconClose = showIconClose
         self.onPressClose = onPressClose
+        self.highlightText = highlightText
     }
 
     private var borderColor: Color {
@@ -90,7 +93,7 @@ public struct Information: View {
                     if let title {
                         MomoText(title, typography: .labelDefaultMedium)
                     }
-                    MomoText(description, typography: .descriptionDefaultRegular)
+                    MomoText(description, typography: .descriptionDefaultRegular, highlightText: highlightText)
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
 

package/ios/InputMoney/InputMoney.swift

@@ -46,6 +46,42 @@ public func formatNumberToMoney(_ digits: String, currency: String = "đ") -> St
     return String(chars.reversed()) + currency
 }
 
+private func isMoneyDigit(_ char: Character) -> Bool { char.isASCII && char.isNumber }
+
+/// Applies an edit of `display[start..<end]` → `inserted` to the digits of `display`.
+/// Separators and currency are never deleted: removing a separator deletes the
+/// digit before it instead, removing only the currency leaves the digits untouched. Returns the new digits and the caret as a digit index.
+private func applyMoneyEdit(_ display: String, start: Int, end: Int, inserted: String) -> (digits: String, caretDigit: Int) {
+    let chars = Array(display)
+    let start = min(start, chars.count)
+    let end = min(max(end, start), chars.count)
+    let digits = chars.filter(isMoneyDigit)
+    var left = chars[..<start].filter(isMoneyDigit).count
+    var removed = chars[start..<end].filter(isMoneyDigit).count
+    let insertedDigits = inserted.filter(isMoneyDigit)
+    if removed == 0 && insertedDigits.isEmpty && left > 0 && chars[start..<end].contains(".") {
+        left -= 1
+        removed = 1
+    }
+    if removed == 0 && insertedDigits.isEmpty {
+        return (String(digits), left)
+    }
+    let next = String(digits[..<left]) + insertedDigits + String(digits[(left + removed)...])
+    var trimmed = String(next.drop(while: { $0 == "0" }))
+    if trimmed.isEmpty { trimmed = String(next.prefix(1)) }
+    return (trimmed, max(0, left + insertedDigits.count - (next.count - trimmed.count)))
+}
+
+/// Caret offset right after the `digitIndex`-th digit of `display`.
+private func moneyCaret(_ display: String, digitIndex: Int) -> Int {
+    var count = 0
+    for (index, char) in display.enumerated() where isMoneyDigit(char) {
+        count += 1
+        if count == digitIndex { return index + 1 }
+    }
+    return 0
+}
+
 // MARK: - InputMoney
 
 public struct InputMoney: View {
@@ -261,8 +297,8 @@ public struct InputMoney: View {
 // MARK: - MoneyTextField (UIViewRepresentable)
 
 /// A UITextField that shows live thousands-separated currency while the bound
-/// `digits` string holds only the raw numeric value. Caret is pinned before
-/// the trailing currency symbol.
+/// `digits` string holds only the raw numeric value. The caret can move freely
+/// but never past the trailing currency symbol; edits apply at the caret.
 private struct MoneyTextField: UIViewRepresentable {
     @Binding var digits: String
     var keyboardType: UIKeyboardType
@@ -286,11 +322,6 @@ private struct MoneyTextField: UIViewRepresentable {
         field.setContentHuggingPriority(.defaultLow, for: .horizontal)
         field.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         field.text = displayValue(digits)
-        field.addTarget(
-            context.coordinator,
-            action: #selector(Coordinator.editingChanged(_:)),
-            for: .editingChanged
-        )
         return field
     }
 
@@ -302,12 +333,13 @@ private struct MoneyTextField: UIViewRepresentable {
         field.textColor = textColor
         field.tintColor = cursorColor
         let expected = displayValue(digits)
-        if !field.isFirstResponder && field.text != expected {
+        if field.text != expected {
             field.text = expected
+            context.coordinator.setCaret(field, offset: moneyCaret(expected, digitIndex: expected.filter(isMoneyDigit).count))
         }
     }
 
-    private func displayValue(_ raw: String) -> String {
+    fileprivate func displayValue(_ raw: String) -> String {
         let numeric = raw.filter { $0.isNumber }
         return numeric.isEmpty ? "" : formatNumberToMoney(numeric)
     }
@@ -330,21 +362,44 @@ private struct MoneyTextField: UIViewRepresentable {
             return true
         }
 
-        @objc func editingChanged(_ textField: UITextField) {
-            // Extract digits from whatever the user typed/deleted.
-            let numeric = (textField.text ?? "").filter { $0.isNumber }
-            let formatted = numeric.isEmpty ? "" : formatNumberToMoney(numeric)
-            if textField.text != formatted {
-                textField.text = formatted
-                // Keep caret before the currency suffix ("đ").
-                if let end = textField.position(from: textField.endOfDocument, offset: -1) {
-                    textField.selectedTextRange = textField.textRange(from: end, to: end)
-                }
-            }
+        func textField(
+            _ textField: UITextField,
+            shouldChangeCharactersIn range: NSRange,
+            replacementString string: String
+        ) -> Bool {
+            let (numeric, caretDigit) = applyMoneyEdit(
+                textField.text ?? "",
+                start: range.location,
+                end: range.location + range.length,
+                inserted: string
+            )
+            let formatted = parent.displayValue(numeric)
+            textField.text = formatted
+            setCaret(textField, offset: moneyCaret(formatted, digitIndex: caretDigit))
             if parent.digits != numeric {
                 parent.digits = numeric
+                parent.onChangeText?(numeric)
+            }
+            return false
+        }
+
+        // Keeps the caret out of the currency suffix.
+        func textFieldDidChangeSelection(_ textField: UITextField) {
+            guard let text = textField.text, !text.isEmpty,
+                  let range = textField.selectedTextRange,
+                  let limit = textField.position(from: textField.endOfDocument, offset: -1)
+            else { return }
+            let start = textField.compare(range.start, to: limit) == .orderedDescending ? limit : range.start
+            let end = textField.compare(range.end, to: limit) == .orderedDescending ? limit : range.end
+            if start != range.start || end != range.end {
+                textField.selectedTextRange = textField.textRange(from: start, to: end)
+            }
+        }
+
+        func setCaret(_ textField: UITextField, offset: Int) {
+            if let position = textField.position(from: textField.beginningOfDocument, offset: offset) {
+                textField.selectedTextRange = textField.textRange(from: position, to: position)
             }
-            parent.onChangeText?(numeric)
         }
     }
 }

package/ios/Typography/Text.swift

@@ -139,6 +139,7 @@ public struct MomoText: View {
     private let letterSpacing: CGFloat?
     private let softWrap: Bool
     private let accessibilityId: String?
+    private var highlightText: [String] = []
 
     public init(
         _ content: String,
@@ -176,13 +177,52 @@ public struct MomoText: View {
         self.accessibilityId = accessibilityId
     }
 
+    init(_ content: String, typography: TypographyStyle, highlightText: [String]) {
+        self.init(content, typography: typography)
+        self.highlightText = highlightText
+    }
+
+    // Whole-word matches of `highlightText` render semibold; the longest keyword wins (RN parity).
+    private var baseText: SwiftUI.Text {
+        let keywords = highlightText.filter { !$0.isEmpty }.sorted { $0.count > $1.count }
+        guard !keywords.isEmpty else { return SwiftUI.Text(content) }
+        let highlightFont = momoFont(size: fontScale(typography.fontSize), weight: TypographyStyle.headerXsSemibold.fontWeight, family: theme.font)
+        func isWordChar(_ character: Character?) -> Bool {
+            guard let character else { return false }
+            return character.isLetter || character.isNumber || character == "_"
+        }
+
+        var result = SwiftUI.Text(verbatim: "")
+        var plainStart = content.startIndex
+        var index = content.startIndex
+        while index < content.endIndex {
+            let previous = index > content.startIndex ? content[content.index(before: index)] : nil
+            let keyword = isWordChar(previous) ? nil : keywords.first { keyword in
+                guard content[index...].hasPrefix(keyword) else { return false }
+                let end = content.index(index, offsetBy: keyword.count)
+                return !isWordChar(end < content.endIndex ? content[end] : nil)
+            }
+            guard let keyword else {
+                index = content.index(after: index)
+                continue
+            }
+            let end = content.index(index, offsetBy: keyword.count)
+            result = result
+                + SwiftUI.Text(verbatim: String(content[plainStart..<index]))
+                + SwiftUI.Text(verbatim: String(content[index..<end])).font(highlightFont)
+            plainStart = end
+            index = end
+        }
+        return result + SwiftUI.Text(verbatim: String(content[plainStart...]))
+    }
+
     public var body: some View {
         let textColor = color ?? theme.colors.text.default
         // Strikethrough is driven either by the typography variant (mirrors Compose
         // *Strikethrough styles) or the explicit `strikethrough` flag.
         let isStrikethrough = strikethrough || typography.isStrikethrough
 
-        var text = SwiftUI.Text(content)
+        var text = baseText
             .font(momoFont(size: fontScale(typography.fontSize), weight: typography.fontWeight, family: theme.font))
             .foregroundColor(textColor)
             .strikethrough(isStrikethrough, color: textColor)

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.165.1-beta.10'
+  s.version          = '0.165.1-beta.12'
   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.165.1-beta.10'
+  s.version          = '0.165.1-beta.12'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

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

@@ -44,6 +44,10 @@ private struct InformationPreview: View {
             Information(title: "Payment failed", description: "We couldn't process your payment.",
                         state: .error, onPressAction: {}, action: "Retry")
         }
+        BasicColumnBox("Highlight text", alignment: .leading) {
+            Information(description: "Bạn được hoàn 50.000đ, áp dụng đến hết 31/12/2026",
+                        highlightText: ["50.000đ", "31/12/2026"])
+        }
         BasicColumnBox("Without icon", alignment: .leading) {
             Information(title: "No icon", description: "showIcon is set to false.", showIcon: false)
         }
@@ -60,6 +64,7 @@ private struct InformationPlayground: View {
     @State private var showIcon = true
     @State private var showIconClose = false
     @State private var action = ""
+    @State private var highlightText = "description"
 
     var body: some View {
         PlaygroundTab(
@@ -72,12 +77,15 @@ private struct InformationPlayground: View {
                     showIcon: showIcon,
                     action: action.isEmpty ? nil : action,
                     showIconClose: showIconClose,
-                    onPressClose: {}
+                    onPressClose: {},
+                    highlightText: highlightText.components(separatedBy: ",")
+                        .map { $0.trimmingCharacters(in: .whitespaces) }
                 )
             },
             params: [
                 .string("Title", $title),
                 .string("Description", $description),
+                .string("HighlightText: [String] (comma-separated)", $highlightText),
                 .radio("State", informationStateList, $state),
                 .checkbox("ShowIcon", $showIcon),
                 .checkbox("ShowIconClose", $showIconClose),

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Apr 08 11:13:31 ICT 2025
-sdk.dir=/Users/sonnguyen/Library/Android/sdk
+#Tue May 19 15:41:04 GMT+07:00 2026
+sdk.dir=/Users/phuc/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.165.1-beta.10",
+  "version": "0.165.1-beta.12-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},

package/publish.sh

@@ -372,10 +372,34 @@ phase_publish_npm() {
     # FIRST PUBLISH: DEBUG VERSION (with compose kits included)
     # ============================================================
     echo ""
+    # A bad token surfaces as a 404 on the PUT, after the working tree was already rewritten
+    # below — so verify auth first, before anything is touched.
+    if ! npm whoami --registry https://registry.npmjs.org >/dev/null 2>&1; then
+        echo "❌ Error: npm auth failed (npm whoami). Renew the token in .npmrc / ~/.npmrc and retry."
+        exit 1
+    fi
+
     echo "🔧 Preparing debug version with compose kits..."
 
     # Create debug version
     DEBUG_VERSION="${VERSION}-debug"
+
+    # set -e aborts mid-phase on any failure; put the tree back no matter where it stopped.
+    # Idempotent: the happy path already moved the backups away and reset the version.
+    restore_npm_workspace() {
+        [ -f .npmignore.backup ] && mv .npmignore.backup .npmignore
+        [ -f compose/build.gradle.kts.backup ] && mv compose/build.gradle.kts.backup compose/build.gradle.kts
+        local pkg_version
+        pkg_version=$(node -p "require('./package.json').version")
+        if [ "$pkg_version" != "$VERSION" ]; then
+            if [[ "$OSTYPE" == "darwin"* ]]; then
+                sed -i '' "s/\"version\": \"$pkg_version\"/\"version\": \"$VERSION\"/" package.json
+            else
+                sed -i "s/\"version\": \"$pkg_version\"/\"version\": \"$VERSION\"/" package.json
+            fi
+        fi
+    }
+    trap restore_npm_workspace EXIT
     echo "📦 Debug version: $DEBUG_VERSION"
 
     # Get current version from package.json (in case it's different from $VERSION)
@@ -482,6 +506,7 @@ EOF
     npm publish --tag $NPM_TAG --access=public
 
     echo "✅ Normal version published successfully!"
+    trap - EXIT
 
     echo ""
     echo "✅ PHASE 3 COMPLETED"