@momo-kits/native-kits 0.162.36 → 0.162.37

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.164.1-swipeback.1'
+  s.version          = '0.167.1-beta.2'
   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.164.1-swipeback.1'
+  s.version          = '0.167.1-beta.2'
   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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.36",
+  "version": "0.162.37",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},