@onekeyfe/react-native-image 3.0.154 → 3.0.155

package/android/src/main/java/com/margelo/nitro/onekeyimage/OneKeyImage.kt

@@ -7,9 +7,7 @@ import android.content.ContextWrapper
 import android.content.res.Configuration
 import android.graphics.Canvas
 import android.graphics.Color
-import android.graphics.Outline
 import android.graphics.Paint
-import android.graphics.Path
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.Drawable
 import android.os.Build
@@ -17,7 +15,6 @@ import android.os.Looper
 import android.os.SystemClock
 import android.provider.Settings
 import android.view.View
-import android.view.ViewOutlineProvider
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageView
 import com.bumptech.glide.Glide
@@ -47,16 +44,6 @@ private fun Context.findActivity(): Activity? {
 }
 
 private class OneKeyImageHostView(context: ThemedReactContext) : ImageView(context) {
-  private val roundClipPath = Path()
-  private val roundOutlineProvider = object : ViewOutlineProvider() {
-    override fun getOutline(view: View, outline: Outline) {
-      if (view.width > 0 && view.height > 0) {
-        outline.setOval(0, 0, view.width, view.height)
-      } else {
-        outline.setEmpty()
-      }
-    }
-  }
   private val fallbackPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
     color = Color.rgb(110, 110, 120)
     textAlign = Paint.Align.CENTER
@@ -65,16 +52,6 @@ private class OneKeyImageHostView(context: ThemedReactContext) : ImageView(conte
   var drawStateSymbol = false
   var stateSymbol = "◇"
   var autoplayEnabled = false
-  var round = false
-    set(value) {
-      if (field == value) return
-      field = value
-      outlineProvider = if (value) roundOutlineProvider else ViewOutlineProvider.BACKGROUND
-      clipToOutline = value
-      updateRoundClipPath()
-      invalidateOutline()
-      invalidate()
-    }
   private var aggregatedVisible = true
   var skeletonRequested = false
     set(value) {
@@ -88,24 +65,9 @@ private class OneKeyImageHostView(context: ThemedReactContext) : ImageView(conte
     super.onSizeChanged(w, h, oldw, oldh)
     skeleton.updateBounds(w, h)
     fallbackPaint.textSize = minOf(w, h) * 0.35f
-    if (round) {
-      updateRoundClipPath()
-      invalidateOutline()
-    }
     if (w > 0 && h > 0) onReadyForRequest?.invoke()
   }
 
-  override fun draw(canvas: Canvas) {
-    if (!round || roundClipPath.isEmpty) {
-      super.draw(canvas)
-      return
-    }
-    val saveCount = canvas.save()
-    canvas.clipPath(roundClipPath)
-    super.draw(canvas)
-    canvas.restoreToCount(saveCount)
-  }
-
   override fun onDraw(canvas: Canvas) {
     super.onDraw(canvas)
     if (drawStateSymbol) {
@@ -146,13 +108,6 @@ private class OneKeyImageHostView(context: ThemedReactContext) : ImageView(conte
     skeleton.updateBounds(width, height)
   }
 
-  private fun updateRoundClipPath() {
-    roundClipPath.reset()
-    if (round && width > 0 && height > 0) {
-      roundClipPath.addOval(0f, 0f, width.toFloat(), height.toFloat(), Path.Direction.CW)
-    }
-  }
-
   fun syncPlayback() {
     val canRun = isAttachedToWindow && aggregatedVisible
     if (skeletonRequested && canRun) skeleton.start() else skeleton.stop()
@@ -175,7 +130,6 @@ internal fun oneKeyImageRequestSignature(
   contentFit: OneKeyImageContentFit?,
   optimizeTos: Boolean?,
   overscan: Double?,
-  round: Boolean,
   width: Int,
   height: Int,
   density: Float,
@@ -188,7 +142,6 @@ internal fun oneKeyImageRequestSignature(
   (contentFit ?: OneKeyImageContentFit.COVER).name,
   optimizeTos.toString(),
   overscan.toString(),
-  round.toString(),
   resizeWidth.toString(),
   width.toString(),
   height.toString(),
@@ -288,10 +241,6 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
       field = value
       requestIdentityChanged()
     }
-  override var round: Boolean? = false
-    set(value) {
-      field = value
-    }
   override var overscan: Double? = 1.1
     set(value) {
       if (field == value) return
@@ -338,10 +287,6 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
 
   override fun afterUpdate() {
     super.afterUpdate()
-    // Fabric can reset `round` before clearing `sourceUri` while removing a view.
-    // Apply the shape once per committed prop batch so the outgoing frame keeps
-    // its clipping, while mounted and recycled views still receive the new value.
-    if (!sourceUri.isNullOrBlank()) hostView.round = round == true
     loadForCurrentLayout()
   }
 
@@ -401,7 +346,6 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     autoplay = false
     recyclingKey = null
     optimizeTos = true
-    round = false
     resizeWidth = null
     overscan = 1.1
     loadingStrategy = OneKeyImageLoadingStrategy.STATIC
@@ -472,7 +416,6 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
       contentFit = contentFit,
       optimizeTos = optimizeTos,
       overscan = overscan,
-      round = round == true,
       width = hostView.width,
       height = hostView.height,
       density = hostView.resources.displayMetrics.density,
@@ -606,7 +549,7 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
     requestManager()
       .asDrawable()
       .load(OneKeyImageModel.build(requestUrl, headersJson))
-      .apply(requestOptions(policy, requestUrl, round == true))
+      .apply(requestOptions(policy, requestUrl))
       .override(decodeDimensions.width, decodeDimensions.height)
       .listener(object : RequestListener<Drawable> {
         override fun onLoadFailed(
@@ -634,15 +577,11 @@ class HybridOneKeyImage(private val context: ThemedReactContext) :
       .into(target)
   }
 
-  private fun requestOptions(
-    policy: OneKeyImageCachePolicy,
-    uri: String,
-    round: Boolean,
-  ): RequestOptions {
+  private fun requestOptions(policy: OneKeyImageCachePolicy, uri: String): RequestOptions {
     val options = RequestOptions()
       .withOneKeyAvatarCache(uri)
+      .dontTransform()
       .downsample(OneKeyImageSafeDownsampleStrategy)
-    if (round) options.circleCrop() else options.dontTransform()
     return when (policy) {
       OneKeyImageCachePolicy.MEMORY_DISK -> options.diskCacheStrategy(oneKeyImageMemoryDiskStrategy(uri))
       OneKeyImageCachePolicy.MEMORY -> options.diskCacheStrategy(DiskCacheStrategy.NONE)

package/android/src/main/java/com/margelo/nitro/onekeyimage/OneKeyImageReusableView.kt

@@ -29,7 +29,6 @@ class OneKeyImageReusableView(context: ThemedReactContext) : FrameLayout(context
     overscan: Double,
     loadingStrategy: String,
     placeholderColor: String,
-    round: Boolean = false,
     onLoad: (() -> Unit)? = null,
     onError: (() -> Unit)? = null,
   ) {
@@ -58,7 +57,6 @@ class OneKeyImageReusableView(context: ThemedReactContext) : FrameLayout(context
     image.autoplay = autoplay
     image.recyclingKey = recyclingKey
     image.optimizeTos = optimizeTos
-    image.round = round
     image.overscan = overscan
     image.loadingStrategy = when (loadingStrategy) {
       "skeleton" -> OneKeyImageLoadingStrategy.SKELETON

package/android/src/test/java/com/margelo/nitro/onekeyimage/OneKeyImageRequestSignatureTest.kt

@@ -26,19 +26,7 @@ class OneKeyImageRequestSignatureTest {
     )
   }
 
-  @Test
-  fun roundParticipatesInRequestIdentity() {
-    assertNotEquals(
-      signature(OneKeyImageContentFit.COVER, round = false),
-      signature(OneKeyImageContentFit.COVER, round = true),
-    )
-  }
-
-  private fun signature(
-    contentFit: OneKeyImageContentFit?,
-    resizeWidth: Double? = null,
-    round: Boolean = false,
-  ): String = oneKeyImageRequestSignature(
+  private fun signature(contentFit: OneKeyImageContentFit?, resizeWidth: Double? = null): String = oneKeyImageRequestSignature(
     rawUrl = "https://example.com/image.png",
     sourceHeadersJson = null,
     recyclingKey = null,
@@ -46,7 +34,6 @@ class OneKeyImageRequestSignatureTest {
     contentFit = contentFit,
     optimizeTos = true,
     overscan = 1.1,
-    round = round,
     width = 200,
     height = 100,
     density = 2f,

package/ios/OneKeyImage.swift

@@ -7,13 +7,9 @@ import UIKit
 private final class OneKeyImageHostView: SDAnimatedImageView {
   var onLayout: (() -> Void)?
   var onWindowChanged: ((Bool) -> Void)?
-  var round = false {
-    didSet { updateRoundMask() }
-  }
 
   override func layoutSubviews() {
     super.layoutSubviews()
-    updateRoundMask()
     onLayout?()
   }
 
@@ -21,10 +17,6 @@ private final class OneKeyImageHostView: SDAnimatedImageView {
     super.didMoveToWindow()
     onWindowChanged?(window != nil)
   }
-
-  private func updateRoundMask() {
-    layer.cornerRadius = round ? min(bounds.width, bounds.height) / 2 : 0
-  }
 }
 
 private final class OneKeyImageSkeletonView: UIView {
@@ -120,9 +112,7 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
   var view: UIView { hostView }
 
   var sourceUri: String? {
-    didSet {
-      if sourceUri != oldValue { identityDidChange() }
-    }
+    didSet { if sourceUri != oldValue { identityDidChange() } }
   }
   var sourceHeadersJson: String? {
     didSet { if sourceHeadersJson != oldValue { identityDidChange() } }
@@ -144,7 +134,6 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
   var optimizeTos: Bool? = true {
     didSet { if optimizeTos != oldValue { identityDidChange() } }
   }
-  var round: Bool? = false
   var resizeWidth: Double? {
     didSet {
       if !Self.equalOptionalDouble(resizeWidth, oldValue) { identityDidChange() }
@@ -196,12 +185,6 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
   }
 
   func afterUpdate() {
-    // Fabric can reset `round` before clearing `sourceUri` while removing a view.
-    // Apply the shape once per committed prop batch so the outgoing frame keeps
-    // its clipping, while mounted and recycled views still receive the new value.
-    if let sourceUri, !sourceUri.isEmpty {
-      hostView.round = round == true
-    }
     scheduleLoad()
   }
 
@@ -260,7 +243,11 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
     guard !hostView.bounds.isEmpty else {
       cancelCurrentRequest(invalidateGeneration: true)
       lastRequestSignature = nil
-      showLoading(requestIsActive: false, letLibraryStartIndicator: false)
+      // A memory-cached image shown from `identityDidChange` before layout
+      // stays up; layout re-runs this load with real bounds and confirms it.
+      if displayState != .image {
+        showLoading(requestIsActive: false, letLibraryStartIndicator: false)
+      }
       return
     }
     guard let rawString = sourceUri, !rawString.isEmpty else {
@@ -515,7 +502,6 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
     autoplay = true
     recyclingKey = nil
     optimizeTos = true
-    round = false
     resizeWidth = nil
     overscan = 1.1
     loadingStrategy = .static
@@ -563,7 +549,13 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
   }
 
   private func showMemoryCachedImageIfAvailable(requestIsActive: Bool) -> Bool {
-    guard cachePolicy == .memory || cachePolicy == .memoryDisk,
+    // JS leaves `cachePolicy` unset for the common case and Fabric then hands
+    // Nitro a nil, which the request path already treats as memory-disk; the
+    // probe must agree, otherwise a nil policy skips the memory lookup entirely
+    // and every mount pays the async pipeline round trip (an icon skeleton
+    // frame) for an image that is already decoded in memory.
+    let effectivePolicy = cachePolicy ?? .memoryDisk
+    guard effectivePolicy == .memory || effectivePolicy == .memoryDisk,
           let sourceUri,
           let rawURL = URL(string: sourceUri) else {
       return false
@@ -583,11 +575,19 @@ final class HybridOneKeyImage: HybridOneKeyImageSpec, RecyclableView {
         hasCustomIdentity: hasCustomIdentity
       )
       : rawURL
-    let thumbnailPixelSize = OneKeyImageDecodeSizing.thumbnailPixelSize(
-      viewSize: hostView.bounds.size,
-      scale: screenScale,
-      contentFit: contentFit ?? .cover
-    )
+    // Before layout the bounds are empty; fall back to the `resizeWidth` hint so
+    // the probe key matches the prewarm / post-layout request instead of
+    // missing on every mount frame.
+    let thumbnailPixelSize = OneKeyImageDecodeSizing.probeViewSize(
+      bounds: hostView.bounds.size,
+      resizeWidth: resizeWidth
+    ).flatMap {
+      OneKeyImageDecodeSizing.thumbnailPixelSize(
+        viewSize: $0,
+        scale: screenScale,
+        contentFit: contentFit ?? .cover
+      )
+    }
     func memoryCachedImage(for url: URL) -> UIImage? {
       let context = OneKeyImageRequestContext.make(
         headersJson: sourceHeadersJson,

package/ios/OneKeyImageRequestContext.swift

@@ -610,6 +610,19 @@ enum OneKeyImageDecodeSizing {
     }
   }
 
+  /// The logical size to probe the memory cache with. Before the first layout
+  /// the host view has no bounds, but the JS side already knows the display
+  /// size through `resizeWidth` (the same hint the prewarm used), so a square
+  /// from it yields the decode-thumbnail key the laid-out view will ask for.
+  /// A cached image can then show on the mount frame instead of a skeleton
+  /// until layout re-probes.
+  static func probeViewSize(bounds: CGSize, resizeWidth: Double?) -> CGSize? {
+    if bounds.width.isFinite, bounds.height.isFinite, bounds.width > 0, bounds.height > 0 {
+      return bounds
+    }
+    return logicalViewSize(width: resizeWidth, height: nil)
+  }
+
   static func thumbnailPixelSize(
     viewSize: CGSize,
     scale: CGFloat,

package/ios/tests/OneKeyImageInfrastructureTests.swift

@@ -310,6 +310,33 @@ final class OneKeyImageInfrastructureTests: XCTestCase {
     )
   }
 
+  func testMemoryProbeFallsBackToResizeWidthBeforeLayout() throws {
+    // Laid out: the real bounds win, even with a hint.
+    XCTAssertEqual(
+      OneKeyImageDecodeSizing.probeViewSize(
+        bounds: CGSize(width: 40, height: 64),
+        resizeWidth: 32
+      ),
+      CGSize(width: 40, height: 64)
+    )
+    // Not laid out yet: a square from the hint, matching the prewarm key.
+    let probe = try XCTUnwrap(
+      OneKeyImageDecodeSizing.probeViewSize(bounds: .zero, resizeWidth: 40)
+    )
+    XCTAssertEqual(probe, CGSize(width: 40, height: 40))
+    XCTAssertEqual(
+      OneKeyImageDecodeSizing.thumbnailPixelSize(viewSize: probe, scale: 3, contentFit: .cover),
+      OneKeyImageDecodeSizing.thumbnailPixelSize(
+        viewSize: try XCTUnwrap(OneKeyImageDecodeSizing.logicalViewSize(width: 40, height: nil)),
+        scale: 3,
+        contentFit: .cover
+      )
+    )
+    // No bounds and no usable hint: nothing to probe with.
+    XCTAssertNil(OneKeyImageDecodeSizing.probeViewSize(bounds: .zero, resizeWidth: nil))
+    XCTAssertNil(OneKeyImageDecodeSizing.probeViewSize(bounds: .zero, resizeWidth: 0))
+  }
+
   func testNoSizePreloadUsesCappedDecodeTarget() {
     XCTAssertEqual(HybridOneKeyImageCache.maximumConcurrentPreloads, 4)
     XCTAssertEqual(
@@ -565,50 +592,4 @@ final class OneKeyImageInfrastructureTests: XCTestCase {
     )
     XCTAssertTrue(imageView.clearBufferWhenStopped)
   }
-
-  func testRoundPropUpdatesNativeCornerRadius() throws {
-    let image = HybridOneKeyImage()
-    let imageView = try XCTUnwrap(image.view as? SDAnimatedImageView)
-    imageView.frame = CGRect(x: 0, y: 0, width: 40, height: 40)
-
-    image.sourceUri = "https://example.com/round.png"
-    image.round = true
-    image.afterUpdate()
-    imageView.layoutIfNeeded()
-    XCTAssertEqual(imageView.layer.cornerRadius, 20)
-
-    image.round = nil
-    image.afterUpdate()
-    XCTAssertEqual(imageView.layer.cornerRadius, 20)
-
-    image.round = false
-    image.afterUpdate()
-    XCTAssertEqual(imageView.layer.cornerRadius, 0)
-  }
-
-  func testRecycleKeepsRoundMaskUntilVisibleViewDetaches() throws {
-    let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 100, height: 100))
-    let image = HybridOneKeyImage()
-    let imageView = try XCTUnwrap(image.view as? SDAnimatedImageView)
-    imageView.frame = CGRect(x: 0, y: 0, width: 40, height: 40)
-    window.addSubview(imageView)
-    image.sourceUri = "https://example.com/round.png"
-    image.round = true
-    image.afterUpdate()
-    imageView.layoutIfNeeded()
-
-    // Fabric resets props in setter order before the view leaves the hierarchy.
-    image.round = false
-    image.sourceUri = nil
-    image.afterUpdate()
-    XCTAssertEqual(imageView.layer.cornerRadius, 20)
-
-    image.prepareForRecycle()
-
-    XCTAssertEqual(imageView.layer.cornerRadius, 20)
-
-    image.sourceUri = "https://example.com/reused.png"
-    image.afterUpdate()
-    XCTAssertEqual(imageView.layer.cornerRadius, 0)
-  }
 }

package/lib/module/index.js

@@ -44,7 +44,6 @@ export function OneKeyImage({
   autoplay,
   recyclingKey,
   optimizeTos = true,
-  round = false,
   resizeWidth,
   overscan = 1.1,
   loadingStrategy = OneKeyImageLoadingStrategy.STATIC,
@@ -213,7 +212,6 @@ export function OneKeyImage({
     autoplay: autoplay ?? Platform.OS !== 'android',
     recyclingKey,
     optimizeTos,
-    round,
     resizeWidth,
     overscan,
     loadingStrategy: placeholder == null ? loadingStrategy : OneKeyImageLoadingStrategy.NONE,

package/lib/nitrogen/generated/android/c++/JHybridOneKeyImageSpec.cpp

@@ -138,15 +138,6 @@ namespace margelo::nitro::onekeyimage {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* optimizeTos */)>("setOptimizeTos");
     method(_javaPart, optimizeTos.has_value() ? jni::JBoolean::valueOf(optimizeTos.value()) : nullptr);
   }
-  std::optional<bool> JHybridOneKeyImageSpec::getRound() {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JBoolean>()>("getRound");
-    auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional(static_cast<bool>(__result->value())) : std::nullopt;
-  }
-  void JHybridOneKeyImageSpec::setRound(std::optional<bool> round) {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* round */)>("setRound");
-    method(_javaPart, round.has_value() ? jni::JBoolean::valueOf(round.value()) : nullptr);
-  }
   std::optional<double> JHybridOneKeyImageSpec::getResizeWidth() {
     static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JDouble>()>("getResizeWidth");
     auto __result = method(_javaPart);

package/lib/nitrogen/generated/android/c++/JHybridOneKeyImageSpec.hpp

@@ -66,8 +66,6 @@ namespace margelo::nitro::onekeyimage {
     void setRecyclingKey(const std::optional<std::string>& recyclingKey) override;
     std::optional<bool> getOptimizeTos() override;
     void setOptimizeTos(std::optional<bool> optimizeTos) override;
-    std::optional<bool> getRound() override;
-    void setRound(std::optional<bool> round) override;
     std::optional<double> getResizeWidth() override;
     void setResizeWidth(std::optional<double> resizeWidth) override;
     std::optional<double> getOverscan() override;

package/lib/nitrogen/generated/android/c++/views/JHybridOneKeyImageStateUpdater.cpp

@@ -93,11 +93,6 @@ void JHybridOneKeyImageStateUpdater::updateViewProps(jni::alias_ref<jni::JClass>
         : !newProps->optimizeTos.hasSameValue(oldProps->optimizeTos)) {
     hybridView->setOptimizeTos(newProps->optimizeTos.get());
   }
-  if (oldProps == nullptr
-        ? newProps->round.isProvided()
-        : !newProps->round.hasSameValue(oldProps->round)) {
-    hybridView->setRound(newProps->round.get());
-  }
   if (oldProps == nullptr
         ? newProps->resizeWidth.isProvided()
         : !newProps->resizeWidth.hasSameValue(oldProps->resizeWidth)) {

package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/onekeyimage/HybridOneKeyImageSpec.kt

@@ -75,12 +75,6 @@ abstract class HybridOneKeyImageSpec: HybridView() {
   @set:Keep
   abstract var optimizeTos: Boolean?
   
-  @get:DoNotStrip
-  @get:Keep
-  @set:DoNotStrip
-  @set:Keep
-  abstract var round: Boolean?
-  
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip

package/lib/nitrogen/generated/ios/c++/HybridOneKeyImageSpecSwift.hpp

@@ -134,13 +134,6 @@ namespace margelo::nitro::onekeyimage {
     inline void setOptimizeTos(std::optional<bool> optimizeTos) noexcept override {
       _swiftPart.setOptimizeTos(optimizeTos);
     }
-    inline std::optional<bool> getRound() noexcept override {
-      auto __result = _swiftPart.getRound();
-      return __result;
-    }
-    inline void setRound(std::optional<bool> round) noexcept override {
-      _swiftPart.setRound(round);
-    }
     inline std::optional<double> getResizeWidth() noexcept override {
       auto __result = _swiftPart.getResizeWidth();
       return __result;

package/lib/nitrogen/generated/ios/c++/views/HybridOneKeyImageComponent.mm

@@ -146,12 +146,6 @@ using namespace margelo::nitro::onekeyimage::views;
           : !newViewProps.optimizeTos.hasSameValue(oldViewProps->optimizeTos)) {
       swiftPart.setOptimizeTos(newViewProps.optimizeTos.get());
     }
-    // round: optional
-    if (oldViewProps == nullptr
-          ? newViewProps.round.isProvided()
-          : !newViewProps.round.hasSameValue(oldViewProps->round)) {
-      swiftPart.setRound(newViewProps.round.get());
-    }
     // resizeWidth: optional
     if (oldViewProps == nullptr
           ? newViewProps.resizeWidth.isProvided()

package/lib/nitrogen/generated/ios/swift/HybridOneKeyImageSpec.swift

@@ -18,7 +18,6 @@ public protocol HybridOneKeyImageSpec_protocol: HybridObject, HybridView {
   var autoplay: Bool? { get set }
   var recyclingKey: String? { get set }
   var optimizeTos: Bool? { get set }
-  var round: Bool? { get set }
   var resizeWidth: Double? { get set }
   var overscan: Double? { get set }
   var loadingStrategy: OneKeyImageLoadingStrategy? { get set }

package/lib/nitrogen/generated/ios/swift/HybridOneKeyImageSpec_cxx.swift

@@ -292,30 +292,6 @@ open class HybridOneKeyImageSpec_cxx {
     }
   }
   
-  public final var round: bridge.std__optional_bool_ {
-    @inline(__always)
-    get {
-      return { () -> bridge.std__optional_bool_ in
-        if let __unwrappedValue = self.__implementation.round {
-          return bridge.create_std__optional_bool_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__implementation.round = { () -> Bool? in
-        if bridge.has_value_std__optional_bool_(newValue) {
-          let __unwrapped = bridge.get_std__optional_bool_(newValue)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
-    }
-  }
-  
   public final var resizeWidth: bridge.std__optional_double_ {
     @inline(__always)
     get {

package/lib/nitrogen/generated/shared/c++/HybridOneKeyImageSpec.cpp

@@ -30,8 +30,6 @@ namespace margelo::nitro::onekeyimage {
       prototype.registerHybridSetter("recyclingKey", &HybridOneKeyImageSpec::setRecyclingKey);
       prototype.registerHybridGetter("optimizeTos", &HybridOneKeyImageSpec::getOptimizeTos);
       prototype.registerHybridSetter("optimizeTos", &HybridOneKeyImageSpec::setOptimizeTos);
-      prototype.registerHybridGetter("round", &HybridOneKeyImageSpec::getRound);
-      prototype.registerHybridSetter("round", &HybridOneKeyImageSpec::setRound);
       prototype.registerHybridGetter("resizeWidth", &HybridOneKeyImageSpec::getResizeWidth);
       prototype.registerHybridSetter("resizeWidth", &HybridOneKeyImageSpec::setResizeWidth);
       prototype.registerHybridGetter("overscan", &HybridOneKeyImageSpec::getOverscan);

package/lib/nitrogen/generated/shared/c++/HybridOneKeyImageSpec.hpp

@@ -76,8 +76,6 @@ namespace margelo::nitro::onekeyimage {
       virtual void setRecyclingKey(const std::optional<std::string>& recyclingKey) = 0;
       virtual std::optional<bool> getOptimizeTos() = 0;
       virtual void setOptimizeTos(std::optional<bool> optimizeTos) = 0;
-      virtual std::optional<bool> getRound() = 0;
-      virtual void setRound(std::optional<bool> round) = 0;
       virtual std::optional<double> getResizeWidth() = 0;
       virtual void setResizeWidth(std::optional<double> resizeWidth) = 0;
       virtual std::optional<double> getOverscan() = 0;

package/lib/nitrogen/generated/shared/c++/views/HybridOneKeyImageComponent.cpp

@@ -28,7 +28,6 @@ namespace margelo::nitro::onekeyimage::views {
     autoplay(nitro::ReactProp<std::optional<bool>>::fromRawValue("OneKeyImage", "autoplay", rawProps, sourceProps.autoplay)),
     recyclingKey(nitro::ReactProp<std::optional<std::string>>::fromRawValue("OneKeyImage", "recyclingKey", rawProps, sourceProps.recyclingKey)),
     optimizeTos(nitro::ReactProp<std::optional<bool>>::fromRawValue("OneKeyImage", "optimizeTos", rawProps, sourceProps.optimizeTos)),
-    round(nitro::ReactProp<std::optional<bool>>::fromRawValue("OneKeyImage", "round", rawProps, sourceProps.round)),
     resizeWidth(nitro::ReactProp<std::optional<double>>::fromRawValue("OneKeyImage", "resizeWidth", rawProps, sourceProps.resizeWidth)),
     overscan(nitro::ReactProp<std::optional<double>>::fromRawValue("OneKeyImage", "overscan", rawProps, sourceProps.overscan)),
     loadingStrategy(nitro::ReactProp<std::optional<OneKeyImageLoadingStrategy>>::fromRawValue("OneKeyImage", "loadingStrategy", rawProps, sourceProps.loadingStrategy)),
@@ -50,7 +49,6 @@ namespace margelo::nitro::onekeyimage::views {
       case hashString("autoplay"): return true;
       case hashString("recyclingKey"): return true;
       case hashString("optimizeTos"): return true;
-      case hashString("round"): return true;
       case hashString("resizeWidth"): return true;
       case hashString("overscan"): return true;
       case hashString("loadingStrategy"): return true;

package/lib/nitrogen/generated/shared/c++/views/HybridOneKeyImageComponent.hpp

@@ -56,7 +56,6 @@ namespace margelo::nitro::onekeyimage::views {
     nitro::ReactProp<std::optional<bool>> autoplay;
     nitro::ReactProp<std::optional<std::string>> recyclingKey;
     nitro::ReactProp<std::optional<bool>> optimizeTos;
-    nitro::ReactProp<std::optional<bool>> round;
     nitro::ReactProp<std::optional<double>> resizeWidth;
     nitro::ReactProp<std::optional<double>> overscan;
     nitro::ReactProp<std::optional<OneKeyImageLoadingStrategy>> loadingStrategy;
@@ -78,7 +77,6 @@ namespace margelo::nitro::onekeyimage::views {
              autoplay.hasSameValue(other.autoplay) &&
              recyclingKey.hasSameValue(other.recyclingKey) &&
              optimizeTos.hasSameValue(other.optimizeTos) &&
-             round.hasSameValue(other.round) &&
              resizeWidth.hasSameValue(other.resizeWidth) &&
              overscan.hasSameValue(other.overscan) &&
              loadingStrategy.hasSameValue(other.loadingStrategy) &&
@@ -101,7 +99,6 @@ namespace margelo::nitro::onekeyimage::views {
              autoplay.isProvided() ||
              recyclingKey.isProvided() ||
              optimizeTos.isProvided() ||
-             round.isProvided() ||
              resizeWidth.isProvided() ||
              overscan.isProvided() ||
              loadingStrategy.isProvided() ||

package/lib/nitrogen/generated/shared/json/OneKeyImageConfig.json

@@ -12,7 +12,6 @@
     "autoplay": true,
     "recyclingKey": true,
     "optimizeTos": true,
-    "round": true,
     "resizeWidth": true,
     "overscan": true,
     "loadingStrategy": true,

package/lib/typescript/src/OneKeyImage.nitro.d.ts

@@ -32,8 +32,6 @@ export interface OneKeyImageNativeProps extends HybridViewProps {
     autoplay?: boolean;
     recyclingKey?: string;
     optimizeTos?: boolean;
-    /** Clips the native image to an oval using its current bounds. */
-    round?: boolean;
     /** Display width hint in layout units. Native applies the screen density. */
     resizeWidth?: number;
     overscan?: number;

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

@@ -45,7 +45,7 @@ export interface OneKeyImageProps extends Omit<OneKeyImageNativeProps, 'sourceUr
     onError?: MaybeWrappedCallback<(event: OneKeyImageErrorEvent) => void>;
     onLoadEnd?: MaybeWrappedCallback<() => void>;
 }
-export declare function OneKeyImage({ source, placeholder, fallback, variant, contentFit, cachePolicy, autoplay, recyclingKey, optimizeTos, round, resizeWidth, overscan, loadingStrategy, placeholderColor, hybridRef, onLoadStart, onLoad, onDisplay, onError, onLoadEnd, style, ...viewProps }: OneKeyImageProps): import("react/jsx-runtime").JSX.Element;
+export declare function OneKeyImage({ source, placeholder, fallback, variant, contentFit, cachePolicy, autoplay, recyclingKey, optimizeTos, resizeWidth, overscan, loadingStrategy, placeholderColor, hybridRef, onLoadStart, onLoad, onDisplay, onError, onLoadEnd, style, ...viewProps }: OneKeyImageProps): import("react/jsx-runtime").JSX.Element;
 export declare const OneKeyImageCache: {
     preload(sources: OneKeyImagePreloadInput[]): Promise<boolean>;
     clearMemory: () => Promise<void>;

package/nitrogen/generated/android/c++/JHybridOneKeyImageSpec.cpp

@@ -138,15 +138,6 @@ namespace margelo::nitro::onekeyimage {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* optimizeTos */)>("setOptimizeTos");
     method(_javaPart, optimizeTos.has_value() ? jni::JBoolean::valueOf(optimizeTos.value()) : nullptr);
   }
-  std::optional<bool> JHybridOneKeyImageSpec::getRound() {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JBoolean>()>("getRound");
-    auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional(static_cast<bool>(__result->value())) : std::nullopt;
-  }
-  void JHybridOneKeyImageSpec::setRound(std::optional<bool> round) {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* round */)>("setRound");
-    method(_javaPart, round.has_value() ? jni::JBoolean::valueOf(round.value()) : nullptr);
-  }
   std::optional<double> JHybridOneKeyImageSpec::getResizeWidth() {
     static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JDouble>()>("getResizeWidth");
     auto __result = method(_javaPart);

package/nitrogen/generated/android/c++/JHybridOneKeyImageSpec.hpp

@@ -66,8 +66,6 @@ namespace margelo::nitro::onekeyimage {
     void setRecyclingKey(const std::optional<std::string>& recyclingKey) override;
     std::optional<bool> getOptimizeTos() override;
     void setOptimizeTos(std::optional<bool> optimizeTos) override;
-    std::optional<bool> getRound() override;
-    void setRound(std::optional<bool> round) override;
     std::optional<double> getResizeWidth() override;
     void setResizeWidth(std::optional<double> resizeWidth) override;
     std::optional<double> getOverscan() override;

package/nitrogen/generated/android/c++/views/JHybridOneKeyImageStateUpdater.cpp

@@ -93,11 +93,6 @@ void JHybridOneKeyImageStateUpdater::updateViewProps(jni::alias_ref<jni::JClass>
         : !newProps->optimizeTos.hasSameValue(oldProps->optimizeTos)) {
     hybridView->setOptimizeTos(newProps->optimizeTos.get());
   }
-  if (oldProps == nullptr
-        ? newProps->round.isProvided()
-        : !newProps->round.hasSameValue(oldProps->round)) {
-    hybridView->setRound(newProps->round.get());
-  }
   if (oldProps == nullptr
         ? newProps->resizeWidth.isProvided()
         : !newProps->resizeWidth.hasSameValue(oldProps->resizeWidth)) {

package/nitrogen/generated/android/kotlin/com/margelo/nitro/onekeyimage/HybridOneKeyImageSpec.kt

@@ -75,12 +75,6 @@ abstract class HybridOneKeyImageSpec: HybridView() {
   @set:Keep
   abstract var optimizeTos: Boolean?
   
-  @get:DoNotStrip
-  @get:Keep
-  @set:DoNotStrip
-  @set:Keep
-  abstract var round: Boolean?
-  
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip

package/nitrogen/generated/ios/c++/HybridOneKeyImageSpecSwift.hpp

@@ -134,13 +134,6 @@ namespace margelo::nitro::onekeyimage {
     inline void setOptimizeTos(std::optional<bool> optimizeTos) noexcept override {
       _swiftPart.setOptimizeTos(optimizeTos);
     }
-    inline std::optional<bool> getRound() noexcept override {
-      auto __result = _swiftPart.getRound();
-      return __result;
-    }
-    inline void setRound(std::optional<bool> round) noexcept override {
-      _swiftPart.setRound(round);
-    }
     inline std::optional<double> getResizeWidth() noexcept override {
       auto __result = _swiftPart.getResizeWidth();
       return __result;

package/nitrogen/generated/ios/c++/views/HybridOneKeyImageComponent.mm

@@ -146,12 +146,6 @@ using namespace margelo::nitro::onekeyimage::views;
           : !newViewProps.optimizeTos.hasSameValue(oldViewProps->optimizeTos)) {
       swiftPart.setOptimizeTos(newViewProps.optimizeTos.get());
     }
-    // round: optional
-    if (oldViewProps == nullptr
-          ? newViewProps.round.isProvided()
-          : !newViewProps.round.hasSameValue(oldViewProps->round)) {
-      swiftPart.setRound(newViewProps.round.get());
-    }
     // resizeWidth: optional
     if (oldViewProps == nullptr
           ? newViewProps.resizeWidth.isProvided()

package/nitrogen/generated/ios/swift/HybridOneKeyImageSpec.swift

@@ -18,7 +18,6 @@ public protocol HybridOneKeyImageSpec_protocol: HybridObject, HybridView {
   var autoplay: Bool? { get set }
   var recyclingKey: String? { get set }
   var optimizeTos: Bool? { get set }
-  var round: Bool? { get set }
   var resizeWidth: Double? { get set }
   var overscan: Double? { get set }
   var loadingStrategy: OneKeyImageLoadingStrategy? { get set }

package/nitrogen/generated/ios/swift/HybridOneKeyImageSpec_cxx.swift

@@ -292,30 +292,6 @@ open class HybridOneKeyImageSpec_cxx {
     }
   }
   
-  public final var round: bridge.std__optional_bool_ {
-    @inline(__always)
-    get {
-      return { () -> bridge.std__optional_bool_ in
-        if let __unwrappedValue = self.__implementation.round {
-          return bridge.create_std__optional_bool_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__implementation.round = { () -> Bool? in
-        if bridge.has_value_std__optional_bool_(newValue) {
-          let __unwrapped = bridge.get_std__optional_bool_(newValue)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
-    }
-  }
-  
   public final var resizeWidth: bridge.std__optional_double_ {
     @inline(__always)
     get {

package/nitrogen/generated/shared/c++/HybridOneKeyImageSpec.cpp

@@ -30,8 +30,6 @@ namespace margelo::nitro::onekeyimage {
       prototype.registerHybridSetter("recyclingKey", &HybridOneKeyImageSpec::setRecyclingKey);
       prototype.registerHybridGetter("optimizeTos", &HybridOneKeyImageSpec::getOptimizeTos);
       prototype.registerHybridSetter("optimizeTos", &HybridOneKeyImageSpec::setOptimizeTos);
-      prototype.registerHybridGetter("round", &HybridOneKeyImageSpec::getRound);
-      prototype.registerHybridSetter("round", &HybridOneKeyImageSpec::setRound);
       prototype.registerHybridGetter("resizeWidth", &HybridOneKeyImageSpec::getResizeWidth);
       prototype.registerHybridSetter("resizeWidth", &HybridOneKeyImageSpec::setResizeWidth);
       prototype.registerHybridGetter("overscan", &HybridOneKeyImageSpec::getOverscan);

package/nitrogen/generated/shared/c++/HybridOneKeyImageSpec.hpp

@@ -76,8 +76,6 @@ namespace margelo::nitro::onekeyimage {
       virtual void setRecyclingKey(const std::optional<std::string>& recyclingKey) = 0;
       virtual std::optional<bool> getOptimizeTos() = 0;
       virtual void setOptimizeTos(std::optional<bool> optimizeTos) = 0;
-      virtual std::optional<bool> getRound() = 0;
-      virtual void setRound(std::optional<bool> round) = 0;
       virtual std::optional<double> getResizeWidth() = 0;
       virtual void setResizeWidth(std::optional<double> resizeWidth) = 0;
       virtual std::optional<double> getOverscan() = 0;

package/nitrogen/generated/shared/c++/views/HybridOneKeyImageComponent.cpp

@@ -28,7 +28,6 @@ namespace margelo::nitro::onekeyimage::views {
     autoplay(nitro::ReactProp<std::optional<bool>>::fromRawValue("OneKeyImage", "autoplay", rawProps, sourceProps.autoplay)),
     recyclingKey(nitro::ReactProp<std::optional<std::string>>::fromRawValue("OneKeyImage", "recyclingKey", rawProps, sourceProps.recyclingKey)),
     optimizeTos(nitro::ReactProp<std::optional<bool>>::fromRawValue("OneKeyImage", "optimizeTos", rawProps, sourceProps.optimizeTos)),
-    round(nitro::ReactProp<std::optional<bool>>::fromRawValue("OneKeyImage", "round", rawProps, sourceProps.round)),
     resizeWidth(nitro::ReactProp<std::optional<double>>::fromRawValue("OneKeyImage", "resizeWidth", rawProps, sourceProps.resizeWidth)),
     overscan(nitro::ReactProp<std::optional<double>>::fromRawValue("OneKeyImage", "overscan", rawProps, sourceProps.overscan)),
     loadingStrategy(nitro::ReactProp<std::optional<OneKeyImageLoadingStrategy>>::fromRawValue("OneKeyImage", "loadingStrategy", rawProps, sourceProps.loadingStrategy)),
@@ -50,7 +49,6 @@ namespace margelo::nitro::onekeyimage::views {
       case hashString("autoplay"): return true;
       case hashString("recyclingKey"): return true;
       case hashString("optimizeTos"): return true;
-      case hashString("round"): return true;
       case hashString("resizeWidth"): return true;
       case hashString("overscan"): return true;
       case hashString("loadingStrategy"): return true;

package/nitrogen/generated/shared/c++/views/HybridOneKeyImageComponent.hpp

@@ -56,7 +56,6 @@ namespace margelo::nitro::onekeyimage::views {
     nitro::ReactProp<std::optional<bool>> autoplay;
     nitro::ReactProp<std::optional<std::string>> recyclingKey;
     nitro::ReactProp<std::optional<bool>> optimizeTos;
-    nitro::ReactProp<std::optional<bool>> round;
     nitro::ReactProp<std::optional<double>> resizeWidth;
     nitro::ReactProp<std::optional<double>> overscan;
     nitro::ReactProp<std::optional<OneKeyImageLoadingStrategy>> loadingStrategy;
@@ -78,7 +77,6 @@ namespace margelo::nitro::onekeyimage::views {
              autoplay.hasSameValue(other.autoplay) &&
              recyclingKey.hasSameValue(other.recyclingKey) &&
              optimizeTos.hasSameValue(other.optimizeTos) &&
-             round.hasSameValue(other.round) &&
              resizeWidth.hasSameValue(other.resizeWidth) &&
              overscan.hasSameValue(other.overscan) &&
              loadingStrategy.hasSameValue(other.loadingStrategy) &&
@@ -101,7 +99,6 @@ namespace margelo::nitro::onekeyimage::views {
              autoplay.isProvided() ||
              recyclingKey.isProvided() ||
              optimizeTos.isProvided() ||
-             round.isProvided() ||
              resizeWidth.isProvided() ||
              overscan.isProvided() ||
              loadingStrategy.isProvided() ||

package/nitrogen/generated/shared/json/OneKeyImageConfig.json

@@ -12,7 +12,6 @@
     "autoplay": true,
     "recyclingKey": true,
     "optimizeTos": true,
-    "round": true,
     "resizeWidth": true,
     "overscan": true,
     "loadingStrategy": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-image",
-  "version": "3.0.154",
+  "version": "3.0.155",
   "description": "High-performance native image view for OneKey",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -81,7 +81,7 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-skeleton": "3.0.154",
+    "@onekeyfe/react-native-skeleton": "3.0.155",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.37.0"

package/src/OneKeyImage.nitro.ts

@@ -43,8 +43,6 @@ export interface OneKeyImageNativeProps extends HybridViewProps {
   autoplay?: boolean;
   recyclingKey?: string;
   optimizeTos?: boolean;
-  /** Clips the native image to an oval using its current bounds. */
-  round?: boolean;
   /** Display width hint in layout units. Native applies the screen density. */
   resizeWidth?: number;
   overscan?: number;

package/src/index.tsx

@@ -153,7 +153,6 @@ export function OneKeyImage({
   autoplay,
   recyclingKey,
   optimizeTos = true,
-  round = false,
   resizeWidth,
   overscan = 1.1,
   loadingStrategy = OneKeyImageLoadingStrategy.STATIC,
@@ -371,7 +370,6 @@ export function OneKeyImage({
     autoplay: autoplay ?? Platform.OS !== 'android',
     recyclingKey,
     optimizeTos,
-    round,
     resizeWidth,
     overscan,
     loadingStrategy: