@momo-kits/native-kits 0.167.1-beta.9-debug → 0.167.1-duo-search.1

package/ios/CalculatorKeyboard/CalculatorKeyboard.swift

@@ -26,7 +26,10 @@ public struct CalculatorKeyboard: View {
         if (value.count > 0 ){
             value.removeLast()
         }
-        
+        // Keys map 1:1 onto `tempValue` characters, so both trims stay aligned.
+        if (tempValue.count > 0 ){
+            tempValue.removeLast()
+        }
     }
     
     func onPressClear(key: String){
@@ -41,12 +44,63 @@ public struct CalculatorKeyboard: View {
         if (tempValue.last?.isNumber == false){
             tempValue.removeLast()
         }
-        let expression = NSExpression(format: tempValue)
-        
-        value = String(expression.expressionValue(with: nil, context: nil) as! Int)
-        if (Int(value) ?? 0 < 0){
+        // Overflow and division by zero are treated like a negative result: cleared.
+        if let result = Self.evaluate(tempValue), result >= 0 {
+            value = String(result)
+        } else {
             value = ""
         }
+        // The next keys continue from the shown result, not the old expression.
+        tempValue = value
+    }
+
+    /// Integer `+ - * /` with the usual precedence, as NSExpression did, but nil instead of a
+    /// crash when a number or result leaves `Int` range.
+    static func evaluate(_ expression: String) -> Int? {
+        var numbers: [Int] = []
+        var operators: [Character] = []
+        var digits = ""
+        for char in expression {
+            if ("0"..."9").contains(char) {
+                digits.append(char)
+                continue
+            }
+            guard let number = Int(digits) else { return nil }
+            numbers.append(number)
+            operators.append(char)
+            digits = ""
+        }
+        guard let last = Int(digits) else { return nil }
+        numbers.append(last)
+
+        var terms = [numbers[0]]
+        var signs: [Character] = []
+        for (op, number) in zip(operators, numbers.dropFirst()) {
+            switch op {
+            case "*":
+                let (product, overflow) = terms[terms.count - 1].multipliedReportingOverflow(by: number)
+                if overflow { return nil }
+                terms[terms.count - 1] = product
+            case "/":
+                guard number != 0 else { return nil }
+                terms[terms.count - 1] /= number
+            case "+", "-":
+                terms.append(number)
+                signs.append(op)
+            default:
+                return nil
+            }
+        }
+
+        var result = terms[0]
+        for (sign, term) in zip(signs, terms.dropFirst()) {
+            let (next, overflow) = sign == "+"
+                ? result.addingReportingOverflow(term)
+                : result.subtractingReportingOverflow(term)
+            if overflow { return nil }
+            result = next
+        }
+        return result
     }
     
     func onPressKey(key:String){

package/ios/Colors+Radius+Spacing/Colors.swift

@@ -133,7 +133,7 @@ public enum Colors {
     public static let yellow06 = Color(hex: "ffe066")
     public static let yellow05 = Color(hex: "ffd633")
     public static let yellow04 = Color(hex: "ffd119")
-    public static let yellow03 = Color(hex: "fc0")
+    public static let yellow03 = Color(hex: "ffcc00")
     public static let yellow02 = Color(hex: "e6b800")
     public static let yellow01 = Color(hex: "cca300")
 

package/ios/Extensions/Color++.swift

@@ -43,15 +43,26 @@ public extension Color {
         )
     }
 
+    /// CSS-style `RGB`, `RGBA`, `RRGGBB` or `RRGGBBAA`, `#` optional; anything else is black.
     init(hex: String) {
-        let scanner = Scanner(string: hex)
-        var rgbValue: UInt64 = 0
-        scanner.scanHexInt64(&rgbValue)
-        
-        let r = (rgbValue & 0xff0000) >> 16
-        let g = (rgbValue & 0xff00) >> 8
-        let b = rgbValue & 0xff
-        
-        self.init(red: Double(r) / 0xff, green: Double(g) / 0xff, blue: Double(b) / 0xff)
+        var digits = hex.trimmingCharacters(in: .whitespacesAndNewlines)
+        if digits.hasPrefix("#") { digits.removeFirst() }
+        if digits.count == 3 || digits.count == 4 {
+            digits = String(digits.flatMap { [$0, $0] })
+        }
+        guard digits.count == 6 || digits.count == 8,
+              digits.allSatisfy(\.isHexDigit),
+              let value = UInt64(digits, radix: 16) else {
+            self.init(red: 0, green: 0, blue: 0)
+            return
+        }
+        let rgba = digits.count == 8 ? value : value << 8 | 0xFF
+        self.init(
+            .sRGB,
+            red: Double((rgba >> 24) & 0xFF) / 255,
+            green: Double((rgba >> 16) & 0xFF) / 255,
+            blue: Double((rgba >> 8) & 0xFF) / 255,
+            opacity: Double(rgba & 0xFF) / 255
+        )
     }
 }

package/ios/Extensions/OptionalEnvironmentObject.swift

@@ -0,0 +1,12 @@
+import SwiftUI
+
+/// `@EnvironmentObject` that reads nil instead of trapping when nothing was injected.
+/// `_store` is the backing field of the `@frozen` `EnvironmentObject`, so its layout is ABI-stable.
+@propertyWrapper
+struct OptionalEnvironmentObject<Object: ObservableObject>: DynamicProperty {
+    @EnvironmentObject private var object: Object
+
+    var wrappedValue: Object? {
+        Mirror(reflecting: _object).descendant("_store") as? Object
+    }
+}

package/ios/Icon/Icon.swift

@@ -4,27 +4,16 @@ struct IconSource: Codable {
     let uri: String
 }
 
-func loadIconSources() -> [String: IconSource] {
-    guard let url = Bundle.main.url(forResource: "icon", withExtension: "json") else {
-        print("Error: icon.json not found")
-        return [:]
+// The compiled-in map (Icons.swift) wins; a host `icon.json` in the main bundle only adds keys
+// the kit doesn't know, so hosts that shipped one keep their extra icons.
+let iconSources: [String: String] = {
+    guard let url = Bundle.main.url(forResource: "icon", withExtension: "json"),
+          let data = try? Data(contentsOf: url),
+          let hostIcons = try? JSONDecoder().decode([String: IconSource].self, from: data) else {
+        return kitIcons
     }
-    
-    do {
-        let data = try Data(contentsOf: url)
-        let decoded = try JSONDecoder().decode([String: IconSource].self, from: data)
-        return decoded
-    } catch {
-        print("Error decoding icon.json: \(error)")
-        return [:]
-    }
-}
-
-// Load the JSON data into a global variable
-let iconSources: [String: IconSource] = loadIconSources()
-
-// Icons that must never be tinted (mirror Compose `noThemeIcons`)
-let noThemeIcons: [String] = ["ic_round_momo_tiny"]
+    return kitIcons.merging(hostIcons.mapValues(\.uri)) { kit, _ in kit }
+}()
 
 // Compose defaults `color` to the theme text color while `color = null` means "no tint".
 // Swift can't tell an omitted argument from an explicit `nil`, so the default is this
@@ -53,8 +42,8 @@ public struct Icon: View {
         }
 
     public var body: some View {
-        // Mirror Compose: an https source is used as-is, anything else is a key into icon.json
-        if let uri = source.contains("https") ? source : iconSources[source]?.uri {
+        // Mirror Compose: an https source is used as-is, anything else is a key into the icon map
+        if let uri = source.contains("https") ? source : iconSources[source] {
             let requestedColor = color == iconThemeColor ? theme.colors.text.default : color
             // Mirror Compose: certain icons (e.g. branded glyphs) are never tinted
             let resolvedColor = noThemeIcons.contains(source) ? nil : requestedColor
@@ -63,6 +52,9 @@ public struct Icon: View {
                 // Mirrors Compose's auto-generated `contentDescription = "img|$iconUrl"`
                 // when no explicit label is provided.
                 .accessibilityLabel(accessibilityLabel ?? "img|\(uri)")
+        } else {
+            // Compose keeps the sized box for an unknown key, so layouts don't collapse.
+            Color.clear.frame(width: size, height: size)
         }
     }
 }