@onekeyfe/react-native-bottom-tabs 6.7.0-alpha.412 → 6.7.0-alpha.414

package/android/build.gradle

@@ -107,7 +107,7 @@ dependencies {
 
   implementation("io.coil-kt.coil3:coil:${COIL_VERSION}")
   implementation("io.coil-kt.coil3:coil-network-okhttp:${COIL_VERSION}")
-  implementation project(":onekeyfe_react-native-image")
+  implementation("io.coil-kt.coil3:coil-svg:${COIL_VERSION}")
 }
 
 if (isNewArchitectureEnabled()) {

package/android/src/main/java/com/onekey/bottomtabs/BottomTabsView.kt

@@ -9,7 +9,6 @@ import androidx.appcompat.view.ContextThemeWrapper
 import android.graphics.Color
 import android.graphics.Canvas
 import android.graphics.Outline
-import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
@@ -40,6 +39,7 @@ import androidx.core.view.forEachIndexed
 import coil3.ImageLoader
 import coil3.asDrawable
 import coil3.request.ImageRequest
+import coil3.svg.SvgDecoder
 import coil3.size.Precision
 import coil3.size.Size as CoilSize
 import coil3.size.Scale
@@ -55,12 +55,9 @@ import com.google.android.material.navigation.NavigationBarView.LABEL_VISIBILITY
 import com.google.android.material.navigation.NavigationBarView.LABEL_VISIBILITY_LABELED
 import com.google.android.material.navigation.NavigationBarView.LABEL_VISIBILITY_UNLABELED
 import com.google.android.material.transition.platform.MaterialFadeThrough
-import com.margelo.nitro.onekeyimage.OneKeyNamedSVG
 import kotlin.math.abs
 import kotlin.math.roundToInt
 
-private const val ONEKEY_ICON_URI_PREFIX = "onekey-icon://"
-
 private fun getMaterialContext(context: Context): Context {
   return ContextThemeWrapper(context, com.google.android.material.R.style.Theme_MaterialComponents_DayNight)
 }
@@ -196,7 +193,6 @@ class BottomTabsView(context: Context) : LinearLayout(context) {
   var items: MutableList<TabInfo> = mutableListOf()
   private val iconSources: MutableMap<Int, ImageSource> = mutableMapOf()
   private val drawableCache: MutableMap<ImageSource, Drawable> = mutableMapOf()
-  private val iconRequestTokens: MutableMap<Int, Any> = mutableMapOf()
 
   private var isLayoutEnqueued = false
   private var selectedItem: String? = null
@@ -264,7 +260,7 @@ class BottomTabsView(context: Context) : LinearLayout(context) {
 
   private val imageLoader = ImageLoader.Builder(context)
     .components {
-      add(SharedSvgDecoder.Factory())
+      add(SvgDecoder.Factory())
     }
     .build()
 
@@ -470,7 +466,7 @@ class BottomTabsView(context: Context) : LinearLayout(context) {
     drawableCache.clear()
     iconSources.forEach { (index, source) ->
       bottomNavigation.menu.findItem(index)?.let { menuItem ->
-        getDrawable(index, source) { menuItem.icon = it }
+        getDrawable(source) { menuItem.icon = it }
       }
     }
   }
@@ -1257,7 +1253,7 @@ class BottomTabsView(context: Context) : LinearLayout(context) {
 
       menuItem.isVisible = !item.hidden
       if (iconSources.containsKey(index)) {
-        getDrawable(index, iconSources[index]!!) {
+        getDrawable(iconSources[index]!!) {
           menuItem.icon = it
         }
       }
@@ -1327,7 +1323,7 @@ class BottomTabsView(context: Context) : LinearLayout(context) {
 
       // Update existing item if exists.
       bottomNavigation.menu.findItem(idx)?.let { menuItem ->
-        getDrawable(idx, imageSource) {
+        getDrawable(imageSource) {
           menuItem.icon = it
         }
       }
@@ -1359,50 +1355,11 @@ class BottomTabsView(context: Context) : LinearLayout(context) {
   }
 
   @SuppressLint("CheckResult")
-  private fun getDrawable(index: Int, imageSource: ImageSource, onDrawableReady: (Drawable?) -> Unit) {
-    iconRequestTokens.remove(index)?.let { OneKeyNamedSVG.cancel(it) }
+  private fun getDrawable(imageSource: ImageSource, onDrawableReady: (Drawable?) -> Unit) {
     drawableCache[imageSource]?.let {
       onDrawableReady(it)
       return
     }
-    val rawSource = imageSource.uri.orEmpty()
-    if (rawSource.startsWith(ONEKEY_ICON_URI_PREFIX)) {
-      val iconName = rawSource.removePrefix(ONEKEY_ICON_URI_PREFIX).trim()
-      if (iconName.isEmpty()) {
-        onDrawableReady(null)
-        return
-      }
-      val token = Any()
-      iconRequestTokens[index] = token
-      val iconSizePx = bottomNavigation.itemIconSize.coerceAtLeast(1)
-      val density = resources.displayMetrics.density
-      OneKeyNamedSVG.request(
-        owner = token,
-        assets = context.applicationContext.assets,
-        name = iconName,
-        color = "rgba(0,0,0,1)",
-        width = iconSizePx,
-        height = iconSizePx,
-        scale = density,
-      ) { bitmap ->
-        if (iconRequestTokens[index] !== token) {
-          return@request
-        }
-        iconRequestTokens.remove(index)
-        if (bitmap == null) {
-          onDrawableReady(null)
-          return@request
-        }
-        val stateDrawable = BitmapDrawable(context.resources, bitmap)
-        drawableCache[imageSource] = stateDrawable
-        if (iconSources[index] == imageSource) {
-          onDrawableReady(stateDrawable)
-        }
-      }
-      return
-    }
-    val token = Any()
-    iconRequestTokens[index] = token
     val iconSizePx = bottomNavigation.itemIconSize
     val request = ImageRequest.Builder(context)
       .data(imageSource.getUri(context))
@@ -1411,15 +1368,9 @@ class BottomTabsView(context: Context) : LinearLayout(context) {
       .precision(Precision.EXACT)
       .target { drawable ->
         post {
-          if (iconRequestTokens[index] !== token) {
-            return@post
-          }
-          iconRequestTokens.remove(index)
           val stateDrawable = drawable.asDrawable(context.resources)
           drawableCache[imageSource] = stateDrawable
-          if (iconSources[index] == imageSource) {
-            onDrawableReady(stateDrawable)
-          }
+          onDrawableReady(stateDrawable)
         }
       }
       .listener(
@@ -1489,8 +1440,6 @@ class BottomTabsView(context: Context) : LinearLayout(context) {
   }
 
   fun onDropViewInstance() {
-    iconRequestTokens.values.forEach { OneKeyNamedSVG.cancel(it) }
-    iconRequestTokens.clear()
     androidBottomBlurEnabled = false
     updateBlurAppearance()
     releaseBottomBlur()

package/docs/SPEC.md

@@ -1,37 +1,5 @@
 # Native Tab View behavioral contract
 
-## Shared image SVG decoder — Implemented
-
-BottomTabs depends on the matching image SDK peer/native module and delegates
-SVG byte decoding to its native facade. No new third-party dependency or SVG
-renderer is introduced. JavaScript props, source resolution and existing tab
-behavior remain unchanged. There is no independent Web SVG reader to migrate.
-
-iOS keeps the existing SvgDecoder RCTImageDataDecoder registration (which is
-available to the React image loader beyond tabs), source detection, failure
-delivery and its no-op cancellation block; only data-to-image implementation
-moves out of the local CoreSVG fork. Existing URI loaders, selected/unselected
-and side-accessory paths, SF Symbols, resize/tint and source ordering remain.
-Raw decoding may retain intrinsic/vector dimensions where the old decoder
-ignored target dimensions; it does not use named-icon workers or wait for a
-main-thread callback.
-
-Android retains Coil fetching, cache and ordinary image decoders. Its SVG factory
-uses image's parse/render facility with the existing requested dimensions,
-Scale.FILL and Precision.EXACT semantics. The independent coil-svg dependency is
-removed once that route is replaced; no URI loading is moved to Glide. Decoder
-execution remains in Coil's existing worker/cancellation/error lifecycle, with
-no additional pool, cache or main-queue hop. Mutable drawable bounds are owned
-per request, while shared raster data remains immutable.
-
-Focused SDK fixtures cover raw SVG and ordinary images through actual RCTImageLoader
-and Coil/BottomTabs consumers, source sizing/non-square art and iOS SF Symbols.
-The current iOS 18.6 fixture does not accept iOS 27.1 side placement; complete
-App styling, platform navigation and signed release acceptance remain separate. Existing source callback races are
-not silently repaired as part of decoding unification. Builds and runtime
-evidence are reported separately. This implementation does not change global image
-loader registration or default-device configuration.
-
 ## Native left drawer
 
 Status: implemented in module source. Package TypeScript, iOS/Android Fabric

package/ios/RCTBottomAccessoryContainerView.swift

@@ -1,8 +1,6 @@
 import Foundation
 import UIKit
-#if canImport(React)
 import React
-#endif
 
 extension Notification.Name {
   static let bottomAccessoryPlacementChanged = Notification.Name("bottomAccessoryPlacementChanged")

package/ios/RCTBottomTabsContainerView.swift

@@ -1,71 +1,6 @@
 import Foundation
 import UIKit
-#if canImport(React)
 import React
-#endif
-
-@objc private protocol OneKeyNamedSVGBridgeProtocol: AnyObject {
-  @objc(cancelWithOwner:)
-  func cancel(owner: AnyObject)
-
-  @objc(requestWithOwner:name:color:width:height:scale:complete:)
-  func request(
-    owner: AnyObject,
-    name: String,
-    color: String,
-    width: Int,
-    height: Int,
-    scale: Double,
-    complete: @escaping (UIImage?) -> Void
-  )
-}
-
-/// Bridges to OneKeyNamedSVG.shared in OneKeyImage without importing the OneKeyImage
-/// Swift module (which transitively imports NitroModules C++ headers).
-private enum OneKeyNamedSVGLoader {
-  private static var bridge: OneKeyNamedSVGBridgeProtocol? {
-    guard let cls: AnyClass = NSClassFromString("OneKeyNamedSVGBridge")
-      ?? NSClassFromString("OneKeyImage.OneKeyNamedSVGBridge")
-    else {
-      return nil
-    }
-    let meta = cls as AnyObject
-    guard meta.responds(to: #selector(OneKeyNamedSVGBridgeProtocol.cancel(owner:))),
-          meta.responds(to: #selector(OneKeyNamedSVGBridgeProtocol.request(owner:name:color:width:height:scale:complete:)))
-    else {
-      return nil
-    }
-    return unsafeBitCast(meta, to: OneKeyNamedSVGBridgeProtocol.self)
-  }
-
-  static func cancel(owner: AnyObject) {
-    bridge?.cancel(owner: owner)
-  }
-
-  static func request(
-    owner: AnyObject,
-    name: String,
-    color: String,
-    width: Int,
-    height: Int,
-    scale: CGFloat,
-    complete: @escaping (UIImage?) -> Void
-  ) {
-    guard let bridge else {
-      complete(nil)
-      return
-    }
-    bridge.request(
-      owner: owner,
-      name: name,
-      color: color,
-      width: width,
-      height: height,
-      scale: Double(scale),
-      complete: complete
-    )
-  }
-}
 
 // MARK: - Data types for props from JS
 
@@ -142,10 +77,6 @@ class RCTBottomTabsContainerView: UIView {
   private var loadedSideAccessoryIcon: UIImage?
   // Increments per icon load; a completion applies only to the latest one.
   private var sideAccessoryIconRequest = 0
-  private static let oneKeyIconSchemePrefix = "onekey-icon://"
-  private var iconRequestTokens: [Int: NSObject] = [:]
-  private var selectedIconRequestTokens: [Int: NSObject] = [:]
-  private var sideAccessoryRequestToken = NSObject()
   private var isSideAccessoryLayoutScheduled = false
   private static let sideAccessorySize: CGFloat = 48
   private static let sideAccessorySpacing: CGFloat = 12
@@ -257,22 +188,6 @@ class RCTBottomTabsContainerView: UIView {
     fatalError("init(coder:) has not been implemented")
   }
 
-  deinit {
-    for token in iconRequestTokens.values {
-      OneKeyNamedSVGLoader.cancel(owner: token)
-    }
-    for token in selectedIconRequestTokens.values {
-      OneKeyNamedSVGLoader.cancel(owner: token)
-    }
-    OneKeyNamedSVGLoader.cancel(owner: sideAccessoryRequestToken)
-  }
-
-  private static func oneKeyIconName(from uri: String) -> String? {
-    guard uri.hasPrefix(oneKeyIconSchemePrefix) else { return nil }
-    let name = String(uri.dropFirst(oneKeyIconSchemePrefix.count)).trimmingCharacters(in: .whitespacesAndNewlines)
-    return name.isEmpty ? nil : name
-  }
-
   override func didAddSubview(_ subview: UIView) {
     super.didAddSubview(subview)
     if let tbcView = tabBarController?.view, subview !== tbcView {
@@ -302,7 +217,7 @@ class RCTBottomTabsContainerView: UIView {
   /// Where the system draws the tab bar: "bottom", or "leading"/"trailing" for
   /// the vertical bar some devices (iPhone Duo) place in a side strip.
   private func currentTabBarPlacement() -> String {
-    #if compiler(>=6.4) && !targetEnvironment(macCatalyst)
+    #if compiler(>=6.4)
     if #available(iOS 27.1, *), let tbc = tabBarController {
       switch tbc.traitCollection.verticalBarEdge {
       case .leading: return "leading"
@@ -315,7 +230,7 @@ class RCTBottomTabsContainerView: UIView {
   }
 
   private func registerVerticalBarTraitChanges(_ tbc: UITabBarController) {
-    #if compiler(>=6.4) && !targetEnvironment(macCatalyst)
+    #if compiler(>=6.4)
     if #available(iOS 27.1, *) {
       tbc.registerForTraitChanges(
         UITraitCollection.systemTraitsAffectingVerticalBarEdge
@@ -425,7 +340,6 @@ class RCTBottomTabsContainerView: UIView {
   private func loadSideAccessoryIcon() {
     sideAccessoryIconRequest += 1
     let request = sideAccessoryIconRequest
-    OneKeyNamedSVGLoader.cancel(owner: sideAccessoryRequestToken)
     // Drop the previous icon so a slower or failed load never leaves it shown
     // for the new source.
     if loadedSideAccessoryIcon != nil {
@@ -433,37 +347,7 @@ class RCTBottomTabsContainerView: UIView {
       scheduleSideAccessoryLayout()
     }
     let source = sideAccessoryIcon.map { IconSource(dict: $0) }
-    guard let source, !source.uri.isEmpty else { return }
-    if let iconName = Self.oneKeyIconName(from: source.uri) {
-      let token = NSObject()
-      sideAccessoryRequestToken = token
-      let scale = max(1.0, window?.screen.scale ?? UIScreen.main.scale)
-      let pxW = max(1, Int(ceil(iconSize.width * scale)))
-      let pxH = max(1, Int(ceil(iconSize.height * scale)))
-      OneKeyNamedSVGLoader.request(
-        owner: token,
-        name: iconName,
-        color: "rgba(0,0,0,1)",
-        width: pxW,
-        height: pxH,
-        scale: scale
-      ) { [weak self] image in
-        guard let self,
-              request == self.sideAccessoryIconRequest,
-              self.sideAccessoryRequestToken === token,
-              let image else { return }
-        let scaledImage: UIImage
-        if let cgImage = image.cgImage {
-          scaledImage = UIImage(cgImage: cgImage, scale: scale, orientation: .up)
-        } else {
-          scaledImage = image
-        }
-        self.loadedSideAccessoryIcon = scaledImage.withRenderingMode(.alwaysTemplate)
-        self.scheduleSideAccessoryLayout()
-      }
-      return
-    }
-    guard let url = URL(string: source.uri) else { return }
+    guard let source, let url = URL(string: source.uri) else { return }
     // The image loader arrives with the first state update; setImageLoader
     // calls this again.
     guard let imageLoader else { return }
@@ -871,69 +755,21 @@ class RCTBottomTabsContainerView: UIView {
 
   @objc func setImageLoader(_ loader: RCTImageLoaderProtocol) {
     self.imageLoader = loader
-    let iconSources = (icons ?? []).map { IconSource(dict: $0) }
-    if iconSources.contains(where: { !$0.uri.isEmpty && Self.oneKeyIconName(from: $0.uri) == nil }) {
-      loadIconsFromSources()
-    }
-    let selectedIconSources = (selectedIcons ?? []).map { IconSource(dict: $0) }
-    if selectedIconSources.contains(where: { !$0.uri.isEmpty && Self.oneKeyIconName(from: $0.uri) == nil }) {
-      loadSelectedIconsFromSources()
-    }
-    if let sideSource = sideAccessoryIcon.map({ IconSource(dict: $0) }),
-       !sideSource.uri.isEmpty,
-       Self.oneKeyIconName(from: sideSource.uri) == nil {
-      loadSideAccessoryIcon()
-    }
+    loadIconsFromSources()
+    loadSelectedIconsFromSources()
+    loadSideAccessoryIcon()
   }
 
   private func loadIconsFromSources() {
-    guard let iconDicts = icons else { return }
+    guard let imageLoader, let iconDicts = icons else { return }
 
     let iconSources = iconDicts.map { IconSource(dict: $0) }
-    let imageLoader = self.imageLoader
-
-    for staleIndex in iconRequestTokens.keys where staleIndex >= iconSources.count {
-      if let previous = iconRequestTokens.removeValue(forKey: staleIndex) {
-        OneKeyNamedSVGLoader.cancel(owner: previous)
-      }
-    }
 
     for (index, source) in iconSources.enumerated() {
-      if let previous = iconRequestTokens.removeValue(forKey: index) {
-        OneKeyNamedSVGLoader.cancel(owner: previous)
-      }
       guard !source.uri.isEmpty else { continue }
-      let token = NSObject()
-      iconRequestTokens[index] = token
-
-      if let iconName = Self.oneKeyIconName(from: source.uri) {
-        let scale = max(1.0, window?.screen.scale ?? UIScreen.main.scale)
-        let pxW = max(1, Int(ceil(iconSize.width * scale)))
-        let pxH = max(1, Int(ceil(iconSize.height * scale)))
-        OneKeyNamedSVGLoader.request(
-          owner: token,
-          name: iconName,
-          color: "rgba(0,0,0,1)",
-          width: pxW,
-          height: pxH,
-          scale: scale
-        ) { [weak self] image in
-          guard let self,
-                self.iconRequestTokens[index] === token,
-                let image else { return }
-          let scaledImage: UIImage
-          if let cgImage = image.cgImage {
-            scaledImage = UIImage(cgImage: cgImage, scale: scale, orientation: .up)
-          } else {
-            scaledImage = image
-          }
-          self.loadedIcons[index] = scaledImage
-          self.rebuildViewControllers()
-        }
-        continue
-      }
 
-      guard let imageLoader, let url = URL(string: source.uri) else { continue }
+      let url = URL(string: source.uri)
+      guard let url else { continue }
 
       let request = URLRequest(url: url)
       let size = CGSize(width: source.width, height: source.height)
@@ -951,7 +787,6 @@ class RCTBottomTabsContainerView: UIView {
           if error != nil { return }
           guard let image, let self else { return }
           DispatchQueue.main.async {
-            guard self.iconRequestTokens[index] === token else { return }
             self.loadedIcons[index] = image.resizeImageTo(size: self.iconSize)
             self.rebuildViewControllers()
           }
@@ -960,53 +795,15 @@ class RCTBottomTabsContainerView: UIView {
   }
 
   private func loadSelectedIconsFromSources() {
-    guard let iconDicts = selectedIcons else { return }
+    guard let imageLoader, let iconDicts = selectedIcons else { return }
 
     let iconSources = iconDicts.map { IconSource(dict: $0) }
-    let imageLoader = self.imageLoader
-
-    for staleIndex in selectedIconRequestTokens.keys where staleIndex >= iconSources.count {
-      if let previous = selectedIconRequestTokens.removeValue(forKey: staleIndex) {
-        OneKeyNamedSVGLoader.cancel(owner: previous)
-      }
-    }
 
     for (index, source) in iconSources.enumerated() {
-      if let previous = selectedIconRequestTokens.removeValue(forKey: index) {
-        OneKeyNamedSVGLoader.cancel(owner: previous)
-      }
       guard !source.uri.isEmpty else { continue }
-      let token = NSObject()
-      selectedIconRequestTokens[index] = token
-
-      if let iconName = Self.oneKeyIconName(from: source.uri) {
-        let scale = max(1.0, window?.screen.scale ?? UIScreen.main.scale)
-        let pxW = max(1, Int(ceil(iconSize.width * scale)))
-        let pxH = max(1, Int(ceil(iconSize.height * scale)))
-        OneKeyNamedSVGLoader.request(
-          owner: token,
-          name: iconName,
-          color: "rgba(0,0,0,1)",
-          width: pxW,
-          height: pxH,
-          scale: scale
-        ) { [weak self] image in
-          guard let self,
-                self.selectedIconRequestTokens[index] === token,
-                let image else { return }
-          let scaledImage: UIImage
-          if let cgImage = image.cgImage {
-            scaledImage = UIImage(cgImage: cgImage, scale: scale, orientation: .up)
-          } else {
-            scaledImage = image
-          }
-          self.loadedSelectedIcons[index] = scaledImage
-          self.rebuildViewControllers()
-        }
-        continue
-      }
 
-      guard let imageLoader, let url = URL(string: source.uri) else { continue }
+      let url = URL(string: source.uri)
+      guard let url else { continue }
 
       let request = URLRequest(url: url)
       let size = CGSize(width: source.width, height: source.height)
@@ -1024,7 +821,6 @@ class RCTBottomTabsContainerView: UIView {
           if error != nil { return }
           guard let image, let self else { return }
           DispatchQueue.main.async {
-            guard self.selectedIconRequestTokens[index] === token else { return }
             self.loadedSelectedIcons[index] = image.resizeImageTo(size: self.iconSize)
             self.rebuildViewControllers()
           }

package/ios/SVG/CoreSVG.h

@@ -0,0 +1,13 @@
+#import <UIKit/UIKit.h>
+typedef UIImage PlatformImage;
+
+@interface CoreSVGWrapper : NSObject
+
++ (instancetype)shared;
+
+- (PlatformImage *)imageFromSVGData:(NSData *)data;
+
++ (BOOL)isSVGData:(NSData *)data;
++ (BOOL)supportsVectorSVGImage;
+
+@end

package/ios/SVG/CoreSVG.mm

@@ -0,0 +1,177 @@
+#import "CoreSVG.h"
+#import <dlfcn.h>
+#import <objc/runtime.h>
+
+#define kSVGTagEnd @"</svg>"
+
+typedef struct CF_BRIDGED_TYPE(id) CGSVGDocument *CGSVGDocumentRef;
+
+static CGSVGDocumentRef (*CoreSVGDocumentRetain)(CGSVGDocumentRef);
+static void (*CoreSVGDocumentRelease)(CGSVGDocumentRef);
+static CGSVGDocumentRef (*CoreSVGDocumentCreateFromData)(CFDataRef data, CFDictionaryRef options);
+static void (*CoreSVGContextDrawSVGDocument)(CGContextRef context, CGSVGDocumentRef document);
+static CGSize (*CoreSVGDocumentGetCanvasSize)(CGSVGDocumentRef document);
+
+#if !TARGET_OS_OSX
+static SEL CoreSVGImageWithDocumentSEL = NULL;
+static SEL CoreSVGDocumentSEL = NULL;
+#endif
+#if TARGET_OS_OSX
+static Class CoreSVGImageRepClass = NULL;
+static Ivar CoreSVGImageRepDocumentIvar = NULL;
+#endif
+
+static inline NSString *Base64DecodedString(NSString *base64String) {
+  NSData *data = [[NSData alloc] initWithBase64EncodedString:base64String options:NSDataBase64DecodingIgnoreUnknownCharacters];
+  if (!data) {
+    return nil;
+  }
+  return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+}
+
+@implementation CoreSVGWrapper
+
++ (instancetype)shared {
+  static dispatch_once_t onceToken;
+  static CoreSVGWrapper *wrapper;
+  dispatch_once(&onceToken, ^{
+    wrapper = [[CoreSVGWrapper alloc] init];
+  });
+  return wrapper;
+}
+
++ (void)initialize {
+  CoreSVGDocumentRetain = (CGSVGDocumentRef (*)(CGSVGDocumentRef))dlsym(RTLD_DEFAULT, Base64DecodedString(@"Q0dTVkdEb2N1bWVudFJldGFpbg==").UTF8String);
+  CoreSVGDocumentRelease = (void (*)(CGSVGDocumentRef))dlsym(RTLD_DEFAULT, Base64DecodedString(@"Q0dTVkdEb2N1bWVudFJlbGVhc2U=").UTF8String);
+  CoreSVGDocumentCreateFromData = (CGSVGDocumentRef (*)(CFDataRef data, CFDictionaryRef options))dlsym(RTLD_DEFAULT, Base64DecodedString(@"Q0dTVkdEb2N1bWVudENyZWF0ZUZyb21EYXRh").UTF8String);
+  CoreSVGContextDrawSVGDocument = (void (*)(CGContextRef context, CGSVGDocumentRef document))dlsym(RTLD_DEFAULT, Base64DecodedString(@"Q0dDb250ZXh0RHJhd1NWR0RvY3VtZW50").UTF8String);
+  CoreSVGDocumentGetCanvasSize = (CGSize (*)(CGSVGDocumentRef document))dlsym(RTLD_DEFAULT, Base64DecodedString(@"Q0dTVkdEb2N1bWVudEdldENhbnZhc1NpemU=").UTF8String);
+  
+#if !TARGET_OS_OSX
+  CoreSVGImageWithDocumentSEL = NSSelectorFromString(Base64DecodedString(@"X2ltYWdlV2l0aENHU1ZHRG9jdW1lbnQ6"));
+  CoreSVGDocumentSEL = NSSelectorFromString(Base64DecodedString(@"X0NHU1ZHRG9jdW1lbnQ="));
+#endif
+#if TARGET_OS_OSX
+  CoreSVGImageRepClass = NSClassFromString(Base64DecodedString(@"X05TU1ZHSW1hZ2VSZXA="));
+  if (CoreSVGImageRepClass) {
+    CoreSVGImageRepDocumentIvar = class_getInstanceVariable(CoreSVGImageRepClass, Base64DecodedString(@"X2RvY3VtZW50").UTF8String);
+  }
+#endif
+}
+
+- (PlatformImage *)imageFromSVGData:(NSData *)data {
+  if (!data) {
+    return nil;
+  }
+  
+  if (![self.class supportsVectorSVGImage]) {
+    return nil;
+  }
+  
+  return [self createVectorSVGWithData:data];
+}
+
+- (PlatformImage *)createVectorSVGWithData:(NSData *)data {
+  if (!data) return nil;
+  
+  PlatformImage *image;
+  
+#if TARGET_OS_OSX
+  if (!CoreSVGImageRepClass) {
+    return nil;
+  }
+  Class imageRepClass = CoreSVGImageRepClass;
+  NSImageRep *imageRep = [[imageRepClass alloc] initWithData:data];
+  if (!imageRep) {
+    return nil;
+  }
+  image = [[NSImage alloc] initWithSize:imageRep.size];
+  [image addRepresentation:imageRep];
+#else
+  if (!CoreSVGDocumentCreateFromData || !CoreSVGDocumentRelease) {
+    return nil;
+  }
+  CGSVGDocumentRef document = CoreSVGDocumentCreateFromData((__bridge CFDataRef)data, NULL);
+  
+  if (!document) {
+    return nil;
+  }
+  
+  image = ((UIImage *(*)(id,SEL,CGSVGDocumentRef))[UIImage.class methodForSelector:CoreSVGImageWithDocumentSEL])(UIImage.class, CoreSVGImageWithDocumentSEL, document);
+  CoreSVGDocumentRelease(document);
+#endif
+  
+#if TARGET_OS_OSX
+  // Test render to catch potential CoreSVG crashes on macOS
+  NSBitmapImageRep *bitmap = [[NSBitmapImageRep alloc]
+                              initWithBitmapDataPlanes:NULL
+                              pixelsWide:1
+                              pixelsHigh:1
+                              bitsPerSample:8
+                              samplesPerPixel:4
+                              hasAlpha:YES
+                              isPlanar:NO
+                              colorSpaceName:NSCalibratedRGBColorSpace
+                              bytesPerRow:0
+                              bitsPerPixel:0];
+  
+  NSGraphicsContext *context = [NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap];
+  [NSGraphicsContext saveGraphicsState];
+  [NSGraphicsContext setCurrentContext:context];
+  
+  @try {
+    [image drawInRect:NSMakeRect(0, 0, 1, 1)];
+  } @catch (...) {
+    [NSGraphicsContext restoreGraphicsState];
+    return nil;
+  }
+  
+  [NSGraphicsContext restoreGraphicsState];
+#else
+  // Test render to catch potential CoreSVG crashes
+  UIGraphicsBeginImageContextWithOptions(CGSizeMake(1, 1), NO, 1.0);
+  @try {
+    [image drawInRect:CGRectMake(0, 0, 1, 1)];
+  } @catch (...) {
+    UIGraphicsEndImageContext();
+    return nil;
+  }
+  UIGraphicsEndImageContext();
+#endif
+  
+  
+  return image;
+}
+
++ (BOOL)isSVGData:(NSData *)data {
+  if (!data) {
+    return NO;
+  }
+  // Check end with SVG tag
+  return [data rangeOfData:[kSVGTagEnd dataUsingEncoding:NSUTF8StringEncoding] options:NSDataSearchBackwards range: NSMakeRange(data.length - MIN(100, data.length), MIN(100, data.length))].location != NSNotFound;
+}
+
++ (BOOL)supportsVectorSVGImage {
+  static dispatch_once_t onceToken;
+  static BOOL supports;
+  dispatch_once(&onceToken, ^{
+#if TARGET_OS_OSX
+    // macOS 10.15+ supports SVG built-in rendering, use selector to check is more accurate
+    if (CoreSVGImageRepClass) {
+      supports = YES;
+    } else {
+      supports = NO;
+    }
+#else
+    // iOS 13+ supports SVG built-in rendering, use selector to check is more accurate
+    if ([UIImage respondsToSelector:CoreSVGImageWithDocumentSEL]) {
+      supports = YES;
+    } else {
+      supports = NO;
+    }
+#endif
+  });
+  return supports;
+}
+
+@end

package/ios/SVG/SvgDecoder.mm

@@ -1,5 +1,5 @@
 #import "SvgDecoder.h"
-#import <OneKeyImage/OneKeyImageCoderBridge.h>
+#import "CoreSVG.h"
 
 @implementation SvgDecoder
 
@@ -7,11 +7,7 @@ RCT_EXPORT_MODULE()
 
 - (BOOL)canDecodeImageData:(NSData *)imageData
 {
-  if (!imageData) return NO;
-  // Preserve the existing global React image-decoder selection boundary.
-  return [imageData rangeOfData:[@"</svg>" dataUsingEncoding:NSUTF8StringEncoding]
-                       options:NSDataSearchBackwards
-                         range:NSMakeRange(imageData.length - MIN(100, imageData.length), MIN(100, imageData.length))].location != NSNotFound;
+  return [CoreSVGWrapper isSVGData:imageData];
 }
 
 - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)imageData
@@ -20,7 +16,7 @@ RCT_EXPORT_MODULE()
                                         resizeMode:(RCTResizeMode)resizeMode
                                  completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
 {
-  UIImage *image = [OneKeyImageCoderBridge decodeSVGData:imageData pixelSize:CGSizeZero];
+  UIImage *image = [CoreSVGWrapper.shared imageFromSVGData:imageData];
 
   if (image) {
     completionHandler(nil, image);

package/ios/TabBarFontSize.swift

@@ -1,6 +1,4 @@
-#if canImport(React)
 import React
-#endif
 import UIKit
 
 enum TabBarFontSize {

package/lib/module/BottomTabs.js

@@ -3,74 +3,16 @@
 import React, { useLayoutEffect, useRef } from "react";
 import { Image, Platform, StyleSheet, View, processColor } from "react-native";
 import { BottomTabBarHeightContext } from "./utils/BottomTabBarHeightContext.js";
+
+// eslint-disable-next-line @react-native/no-deep-imports
+
 import NativeBottomTabs from "./BottomTabsNativeComponent";
 import useLatestCallback from "use-latest-callback";
 import DelayedFreeze from "./DelayedFreeze.js";
 import NativeBottomTabsDrawer from "./BottomTabsDrawerNativeComponent";
 import { BottomAccessoryView } from "./BottomAccessoryView.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const isAppleSymbol = icon => Boolean(typeof icon === "object" && icon !== null && "sfSymbol" in icon && typeof icon.sfSymbol === "string");
-const ONEKEY_ICON_URI_PREFIX = "onekey-icon://";
-export const resolveTabIconSource = icon => {
-  if (!icon || isAppleSymbol(icon)) {
-    return {
-      uri: "",
-      width: 0,
-      height: 0,
-      scale: 1
-    };
-  }
-  if (typeof icon === "string") {
-    const trimmed = icon.trim();
-    if (!trimmed) {
-      return {
-        uri: "",
-        width: 0,
-        height: 0,
-        scale: 1
-      };
-    }
-    const uri = trimmed.startsWith(ONEKEY_ICON_URI_PREFIX) ? trimmed : `${ONEKEY_ICON_URI_PREFIX}${trimmed}`;
-    return {
-      uri,
-      width: 24,
-      height: 24,
-      scale: 1
-    };
-  }
-  if (typeof icon === "object" && !Array.isArray(icon) && "iconName" in icon && typeof icon.iconName === "string") {
-    const trimmed = icon.iconName.trim();
-    if (!trimmed) {
-      return {
-        uri: "",
-        width: 0,
-        height: 0,
-        scale: 1
-      };
-    }
-    return {
-      uri: `${ONEKEY_ICON_URI_PREFIX}${trimmed}`,
-      width: 24,
-      height: 24,
-      scale: 1
-    };
-  }
-  if (typeof icon === "object" && !Array.isArray(icon) && "uri" in icon && typeof icon.uri === "string" && icon.uri.startsWith(ONEKEY_ICON_URI_PREFIX)) {
-    return {
-      uri: icon.uri,
-      width: typeof icon.width === "number" && icon.width > 0 ? icon.width : 24,
-      height: typeof icon.height === "number" && icon.height > 0 ? icon.height : 24,
-      scale: typeof icon.scale === "number" && icon.scale > 0 ? icon.scale : 1
-    };
-  }
-  const resolved = Image.resolveAssetSource(icon);
-  return {
-    uri: resolved?.uri ?? "",
-    width: resolved?.width ?? 0,
-    height: resolved?.height ?? 0,
-    scale: resolved?.scale ?? 1
-  };
-};
+const isAppleSymbol = icon => icon?.sfSymbol;
 const ANDROID_MAX_TABS = 100;
 const BottomTabs = ({
   navigationState,
@@ -227,11 +169,45 @@ const BottomTabs = ({
       })
     };
   }), [trimmedRoutes, icons, getLabelText, getBadge, getBadgeBackgroundColor, getBadgeTextColor, getActiveTintColor, getHidden, getTestID, getRole, getPreventsDefault]);
-  const resolvedIconAssets = React.useMemo(() => icons.map(icon => resolveTabIconSource(icon)), [icons]);
+  const resolvedIconAssets = React.useMemo(() => icons.map(icon => {
+    if (icon && !isAppleSymbol(icon)) {
+      // @ts-ignore - resolveAssetSource accepts ImageSourcePropType
+      const resolved = Image.resolveAssetSource(icon);
+      return {
+        uri: resolved?.uri ?? "",
+        width: resolved?.width ?? 0,
+        height: resolved?.height ?? 0,
+        scale: resolved?.scale ?? 1
+      };
+    }
+    return {
+      uri: "",
+      width: 0,
+      height: 0,
+      scale: 1
+    };
+  }), [icons]);
 
   // Focused (solid) assets passed to iOS as selectedImage. iOS only — Android
   // ignores selectedIcons and keeps swapping via the focusedKey array above.
-  const resolvedSelectedIconAssets = React.useMemo(() => focusedIcons.map(icon => resolveTabIconSource(icon)), [focusedIcons]);
+  const resolvedSelectedIconAssets = React.useMemo(() => focusedIcons.map(icon => {
+    if (icon && !isAppleSymbol(icon)) {
+      // @ts-ignore - resolveAssetSource accepts ImageSourcePropType
+      const resolved = Image.resolveAssetSource(icon);
+      return {
+        uri: resolved?.uri ?? "",
+        width: resolved?.width ?? 0,
+        height: resolved?.height ?? 0,
+        scale: resolved?.scale ?? 1
+      };
+    }
+    return {
+      uri: "",
+      width: 0,
+      height: 0,
+      scale: 1
+    };
+  }), [focusedIcons]);
   const jumpTo = useLatestCallback(key => {
     const index = trimmedRoutes.findIndex(route => route.key === key);
     if (index === -1) {
@@ -282,9 +258,15 @@ const BottomTabs = ({
     if (!isIOS || !sideAccessoryIcon) {
       return undefined;
     }
-    const resolved = resolveTabIconSource(sideAccessoryIcon);
-    return resolved.uri ? resolved : undefined;
-  }, [isIOS, sideAccessoryIcon]);
+    // @ts-ignore - resolveAssetSource accepts ImageSourcePropType
+    const resolved = Image.resolveAssetSource(sideAccessoryIcon);
+    return resolved?.uri ? {
+      uri: resolved.uri,
+      width: resolved.width ?? 0,
+      height: resolved.height ?? 0,
+      scale: resolved.scale ?? 1
+    } : undefined;
+  }, [sideAccessoryIcon]);
   useLayoutEffect(() => {
     if (renderCustomTabBar && customTabBarWrapperRef.current) {
       customTabBarWrapperRef.current.measure((_x, _y, _width, height) => {

package/lib/typescript/src/BottomTabs.d.ts

@@ -1,14 +1,8 @@
 import React from "react";
 import { type ColorValue, type ImageSourcePropType, type StyleProp, type ViewStyle } from "react-native";
-import type { BaseRoute, BottomTabIconSource, NamedIcon, NavigationState, TabBarPlacement, TabRole } from "./types";
+import type { ImageSource } from "react-native/Libraries/Image/ImageSource";
+import type { AppleIcon, BaseRoute, NavigationState, TabBarPlacement, TabRole } from "./types";
 import { type RNBottomTabsAccessoryViewProps } from "./BottomAccessoryView";
-type ResolvedTabIconSource = {
-    uri: string;
-    width: number;
-    height: number;
-    scale: number;
-};
-export declare const resolveTabIconSource: (icon: BottomTabIconSource | undefined | null) => ResolvedTabIconSource;
 interface Props<Route extends BaseRoute> {
     labeled?: boolean;
     /** Optional physical-left menu; all motion and input are owned by native. */
@@ -126,10 +120,10 @@ interface Props<Route extends BaseRoute> {
     /**
      * Get icon for the tab.
      */
-    getIcon?: ({ route, focused, }: {
+    getIcon?: (props: {
         route: Route;
         focused: boolean;
-    }) => BottomTabIconSource | undefined | null;
+    }) => ImageSource | AppleIcon | undefined | null;
     /**
      * Get hidden for the tab.
      */
@@ -226,7 +220,7 @@ interface Props<Route extends BaseRoute> {
      * Icon of a round button shown above a vertical tab bar. The button only
      * appears while the tab bar is vertical and visible. iOS only.
      */
-    sideAccessoryIcon?: ImageSourcePropType | NamedIcon | string;
+    sideAccessoryIcon?: ImageSourcePropType;
     /**
      * Accessibility label of the side accessory button.
      */

package/lib/typescript/src/index.d.ts

@@ -12,5 +12,5 @@ export { BottomTabBarHeightContext } from './utils/BottomTabBarHeightContext';
 /**
  * Types
  */
-export type { AppleIcon, BottomTabIconSource, NamedIcon, TabBarPlacement, TabRole, } from './types';
+export type { AppleIcon, TabBarPlacement, TabRole } from './types';
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/types.d.ts

@@ -4,10 +4,6 @@ export type IconSource = string | ImageSourcePropType;
 export type AppleIcon = {
     sfSymbol: SFSymbol;
 };
-export type NamedIcon = {
-    iconName: string;
-};
-export type BottomTabIconSource = ImageSourcePropType | AppleIcon | NamedIcon | string;
 export type TabRole = 'search';
 export type TabBarPlacement = 'bottom' | 'leading' | 'trailing';
 export type BaseRoute = {
@@ -17,8 +13,8 @@ export type BaseRoute = {
     badgeBackgroundColor?: string;
     badgeTextColor?: string;
     lazy?: boolean;
-    focusedIcon?: BottomTabIconSource;
-    unfocusedIcon?: BottomTabIconSource;
+    focusedIcon?: ImageSourcePropType | AppleIcon;
+    unfocusedIcon?: ImageSourcePropType | AppleIcon;
     activeTintColor?: string;
     hidden?: boolean;
     testID?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-bottom-tabs",
-  "version": "6.7.0-alpha.412",
+  "version": "6.7.0-alpha.414",
   "description": "Native bottom tabs (tab bar + scene container) for React Native on iOS and Android",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
@@ -71,7 +71,6 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-image": "6.7.0-alpha.412",
     "react": "*",
     "react-native": "*"
   },

package/react-native-bottom-tabs.podspec

@@ -32,7 +32,5 @@ Pod::Spec.new do |s|
     'DEFINES_MODULE' => 'YES'
   }
 
-  s.dependency "OneKeyImage", package["peerDependencies"]["@onekeyfe/react-native-image"]
-
   install_modules_dependencies(s)
 end

package/src/BottomTabs.tsx

@@ -13,6 +13,9 @@ import {
   processColor,
 } from "react-native";
 import { BottomTabBarHeightContext } from "./utils/BottomTabBarHeightContext";
+
+// eslint-disable-next-line @react-native/no-deep-imports
+import type { ImageSource } from "react-native/Libraries/Image/ImageSource";
 import NativeBottomTabs, {
   type BottomTabsItems,
 } from "./BottomTabsNativeComponent";
@@ -20,8 +23,6 @@ import useLatestCallback from "use-latest-callback";
 import type {
   AppleIcon,
   BaseRoute,
-  BottomTabIconSource,
-  NamedIcon,
   NavigationState,
   TabBarPlacement,
   TabRole,
@@ -33,81 +34,8 @@ import {
   type RNBottomTabsAccessoryViewProps,
 } from "./BottomAccessoryView";
 
-const isAppleSymbol = (
-  icon: BottomTabIconSource | undefined | null
-): icon is AppleIcon =>
-  Boolean(
-    typeof icon === "object" &&
-      icon !== null &&
-      "sfSymbol" in icon &&
-      typeof icon.sfSymbol === "string"
-  );
-
-const ONEKEY_ICON_URI_PREFIX = "onekey-icon://";
-
-type ResolvedTabIconSource = {
-  uri: string;
-  width: number;
-  height: number;
-  scale: number;
-};
-
-export const resolveTabIconSource = (
-  icon: BottomTabIconSource | undefined | null
-): ResolvedTabIconSource => {
-  if (!icon || isAppleSymbol(icon)) {
-    return { uri: "", width: 0, height: 0, scale: 1 };
-  }
-  if (typeof icon === "string") {
-    const trimmed = icon.trim();
-    if (!trimmed) {
-      return { uri: "", width: 0, height: 0, scale: 1 };
-    }
-    const uri = trimmed.startsWith(ONEKEY_ICON_URI_PREFIX)
-      ? trimmed
-      : `${ONEKEY_ICON_URI_PREFIX}${trimmed}`;
-    return { uri, width: 24, height: 24, scale: 1 };
-  }
-  if (
-    typeof icon === "object" &&
-    !Array.isArray(icon) &&
-    "iconName" in icon &&
-    typeof icon.iconName === "string"
-  ) {
-    const trimmed = icon.iconName.trim();
-    if (!trimmed) {
-      return { uri: "", width: 0, height: 0, scale: 1 };
-    }
-    return {
-      uri: `${ONEKEY_ICON_URI_PREFIX}${trimmed}`,
-      width: 24,
-      height: 24,
-      scale: 1,
-    };
-  }
-  if (
-    typeof icon === "object" &&
-    !Array.isArray(icon) &&
-    "uri" in icon &&
-    typeof icon.uri === "string" &&
-    icon.uri.startsWith(ONEKEY_ICON_URI_PREFIX)
-  ) {
-    return {
-      uri: icon.uri,
-      width: typeof icon.width === "number" && icon.width > 0 ? icon.width : 24,
-      height:
-        typeof icon.height === "number" && icon.height > 0 ? icon.height : 24,
-      scale: typeof icon.scale === "number" && icon.scale > 0 ? icon.scale : 1,
-    };
-  }
-  const resolved = Image.resolveAssetSource(icon as ImageSourcePropType);
-  return {
-    uri: resolved?.uri ?? "",
-    width: resolved?.width ?? 0,
-    height: resolved?.height ?? 0,
-    scale: resolved?.scale ?? 1,
-  };
-};
+const isAppleSymbol = (icon: any): icon is { sfSymbol: string } =>
+  icon?.sfSymbol;
 
 interface Props<Route extends BaseRoute> {
   /*
@@ -214,13 +142,10 @@ interface Props<Route extends BaseRoute> {
   /**
    * Get icon for the tab.
    */
-  getIcon?: ({
-    route,
-    focused,
-  }: {
+  getIcon?: (props: {
     route: Route;
     focused: boolean;
-  }) => BottomTabIconSource | undefined | null;
+  }) => ImageSource | AppleIcon | undefined | null;
 
   /**
    * Get hidden for the tab.
@@ -315,7 +240,7 @@ interface Props<Route extends BaseRoute> {
    * Icon of a round button shown above a vertical tab bar. The button only
    * appears while the tab bar is vertical and visible. iOS only.
    */
-  sideAccessoryIcon?: ImageSourcePropType | NamedIcon | string;
+  sideAccessoryIcon?: ImageSourcePropType;
   /**
    * Accessibility label of the side accessory button.
    */
@@ -490,14 +415,40 @@ const BottomTabs = <Route extends BaseRoute>({
   );
 
   const resolvedIconAssets = React.useMemo(
-    () => icons.map((icon) => resolveTabIconSource(icon)),
+    () =>
+      icons.map((icon) => {
+        if (icon && !isAppleSymbol(icon)) {
+          // @ts-ignore - resolveAssetSource accepts ImageSourcePropType
+          const resolved = Image.resolveAssetSource(icon);
+          return {
+            uri: resolved?.uri ?? "",
+            width: resolved?.width ?? 0,
+            height: resolved?.height ?? 0,
+            scale: resolved?.scale ?? 1,
+          };
+        }
+        return { uri: "", width: 0, height: 0, scale: 1 };
+      }),
     [icons]
   );
 
   // Focused (solid) assets passed to iOS as selectedImage. iOS only — Android
   // ignores selectedIcons and keeps swapping via the focusedKey array above.
   const resolvedSelectedIconAssets = React.useMemo(
-    () => focusedIcons.map((icon) => resolveTabIconSource(icon)),
+    () =>
+      focusedIcons.map((icon) => {
+        if (icon && !isAppleSymbol(icon)) {
+          // @ts-ignore - resolveAssetSource accepts ImageSourcePropType
+          const resolved = Image.resolveAssetSource(icon);
+          return {
+            uri: resolved?.uri ?? "",
+            width: resolved?.width ?? 0,
+            height: resolved?.height ?? 0,
+            scale: resolved?.scale ?? 1,
+          };
+        }
+        return { uri: "", width: 0, height: 0, scale: 1 };
+      }),
     [focusedIcons]
   );
 
@@ -563,9 +514,17 @@ const BottomTabs = <Route extends BaseRoute>({
     if (!isIOS || !sideAccessoryIcon) {
       return undefined;
     }
-    const resolved = resolveTabIconSource(sideAccessoryIcon);
-    return resolved.uri ? resolved : undefined;
-  }, [isIOS, sideAccessoryIcon]);
+    // @ts-ignore - resolveAssetSource accepts ImageSourcePropType
+    const resolved = Image.resolveAssetSource(sideAccessoryIcon);
+    return resolved?.uri
+      ? {
+          uri: resolved.uri,
+          width: resolved.width ?? 0,
+          height: resolved.height ?? 0,
+          scale: resolved.scale ?? 1,
+        }
+      : undefined;
+  }, [sideAccessoryIcon]);
 
   useLayoutEffect(() => {
     if (renderCustomTabBar && customTabBarWrapperRef.current) {

package/src/index.tsx

@@ -15,10 +15,4 @@ export { BottomTabBarHeightContext } from './utils/BottomTabBarHeightContext';
 /**
  * Types
  */
-export type {
-  AppleIcon,
-  BottomTabIconSource,
-  NamedIcon,
-  TabBarPlacement,
-  TabRole,
-} from './types';
+export type { AppleIcon, TabBarPlacement, TabRole } from './types';

package/src/types.ts

@@ -5,14 +5,6 @@ export type IconSource = string | ImageSourcePropType;
 
 export type AppleIcon = { sfSymbol: SFSymbol };
 
-export type NamedIcon = { iconName: string };
-
-export type BottomTabIconSource =
-  | ImageSourcePropType
-  | AppleIcon
-  | NamedIcon
-  | string;
-
 export type TabRole = 'search';
 
 // 'leading' and 'trailing' mean a vertical tab bar on that edge.
@@ -25,8 +17,8 @@ export type BaseRoute = {
   badgeBackgroundColor?: string;
   badgeTextColor?: string;
   lazy?: boolean;
-  focusedIcon?: BottomTabIconSource;
-  unfocusedIcon?: BottomTabIconSource;
+  focusedIcon?: ImageSourcePropType | AppleIcon;
+  unfocusedIcon?: ImageSourcePropType | AppleIcon;
   activeTintColor?: string;
   hidden?: boolean;
   testID?: string;

package/android/src/main/java/com/onekey/bottomtabs/SharedSvgDecoder.kt

@@ -1,51 +0,0 @@
-package com.onekey.bottomtabs
-
-import coil3.ImageLoader
-import coil3.asImage
-import coil3.decode.DecodeResult
-import coil3.decode.DecodeUtils
-import coil3.decode.Decoder
-import coil3.fetch.SourceFetchResult
-import coil3.request.Options
-import coil3.request.maxBitmapSize
-import com.margelo.nitro.onekeyimage.OneKeySVG
-import kotlinx.coroutines.runInterruptible
-import okio.ByteString.Companion.encodeUtf8
-import kotlin.math.roundToInt
-
-/** Coil retains fetching, cancellation and sizing; image owns SVG parsing/rendering. */
-internal class SharedSvgDecoder(private val result: SourceFetchResult, private val options: Options) : Decoder {
-  override suspend fun decode(): DecodeResult = runInterruptible {
-    val document = result.source.source().inputStream().use { OneKeySVG.decode(it) }
-    val width = document.viewBoxWidth ?: document.intrinsicWidth
-    val height = document.viewBoxHeight ?: document.intrinsicHeight
-    val destination = DecodeUtils.computeDstSize(
-      if (width > 0) width.roundToInt() else 512,
-      if (height > 0) height.roundToInt() else 512,
-      options.size, options.scale, options.maxBitmapSize)
-    val dstWidth = destination.first
-    val dstHeight = destination.second
-    val (outputWidth, outputHeight) = if (width > 0 && height > 0) {
-      val multiplier = DecodeUtils.computeSizeMultiplier(width, height, dstWidth.toFloat(), dstHeight.toFloat(), options.scale)
-      (width * multiplier).toInt() to (height * multiplier).toInt()
-    } else dstWidth to dstHeight
-    DecodeResult(document.render(outputWidth, outputHeight).asImage(), isSampled = true)
-  }
-
-  class Factory : Decoder.Factory {
-    override fun create(result: SourceFetchResult, options: Options, imageLoader: ImageLoader): Decoder? {
-      if (result.mimeType != "image/svg+xml") {
-        val source = result.source.source()
-        if (!source.rangeEquals(0, "<".encodeUtf8())) return null
-        val tag = "<svg".encodeUtf8()
-        var found = false
-        for (index in 0L until (1024L - tag.size)) {
-          if (!source.request(index + tag.size)) break
-          if (source.rangeEquals(index, tag)) { found = true; break }
-        }
-        if (!found) return null
-      }
-      return SharedSvgDecoder(result, options)
-    }
-  }
-}