@momo-kits/native-kits 0.167.1-duo.1-debug → 0.167.1-duo.10-debug

package/ios/Icon/Icon.swift

@@ -1,30 +1,20 @@
+import SDWebImageSwiftUI
 import SwiftUI
 
 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,16 +43,24 @@ 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
-            ImageView(uri, color: resolvedColor)
+            // Bare WebImage like Compose's AsyncImage: no skeleton while loading, nothing on failure.
+            WebImage(url: URL(string: uri), isAnimating: .constant(true))
+                .resizable()
+                .renderingMode(resolvedColor != nil ? .template : .original)
+                .scaledToFit()
+                .foregroundColor(resolvedColor)
                 .frame(width: size, height: size)
                 // 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)
         }
     }
 }