Skip to content

Commit 5b9a448

Browse files
authored
fix: Pass WebImageContext too (cacheKey) (#42)
1 parent 64942e5 commit 5b9a448

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

packages/react-native-nitro-image/ios/HybridImageView.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ class CustomImageView: UIImageView {
2020
onVisibilityChanged(isVisible: superview != nil)
2121
}
2222
}
23-
23+
2424
init() {
2525
super.init(image: nil)
2626
}
2727
required init?(coder: NSCoder) {
2828
fatalError("init(coder:) has not been implemented")
2929
}
30-
30+
3131
override func willMove(toSuperview newSuperview: UIView?) {
3232
super.willMove(toSuperview: newSuperview)
3333
onVisibilityChanged(isVisible: newSuperview != nil)
@@ -51,15 +51,15 @@ class HybridImageView: HybridNitroImageViewSpec, NativeImageView {
5151
let imageView: UIImageView
5252
let view: UIView
5353
private var resetImageBeforeLoad = false
54-
54+
5555
override init() {
5656
let imageView = CustomImageView()
5757
self.imageView = imageView
5858
self.view = imageView
5959
super.init()
6060
imageView.delegate = self
6161
}
62-
62+
6363
var resizeMode: ResizeMode? {
6464
didSet {
6565
Task { @MainActor in
@@ -79,7 +79,7 @@ class HybridImageView: HybridNitroImageViewSpec, NativeImageView {
7979
resetImageBeforeLoad = recyclingKey != oldValue
8080
}
8181
}
82-
82+
8383
private func updateResizeMode() {
8484
let mode = resizeMode ?? .cover
8585
switch mode {
@@ -93,7 +93,7 @@ class HybridImageView: HybridNitroImageViewSpec, NativeImageView {
9393
imageView.contentMode = .center
9494
}
9595
}
96-
96+
9797
private func updateImage() {
9898
switch image {
9999
case .first(let hybridImageSpec):
@@ -110,7 +110,7 @@ class HybridImageView: HybridNitroImageViewSpec, NativeImageView {
110110
imageView.image = nil
111111
}
112112
}
113-
113+
114114
private func didSetImageLoader() {
115115
// An ImageLoader was set - trigger an update (load or drop)
116116
if imageView.isVisible {
@@ -127,7 +127,7 @@ extension HybridImageView: ViewLifecycleDelegate {
127127
guard case let .second(hybridImageLoaderSpec) = image else { return nil }
128128
return hybridImageLoaderSpec
129129
}
130-
130+
131131
func willShow() {
132132
guard let imageLoader else { return }
133133
if resetImageBeforeLoad {
@@ -136,7 +136,7 @@ extension HybridImageView: ViewLifecycleDelegate {
136136
}
137137
try? imageLoader.requestImage(forView: self)
138138
}
139-
139+
140140
func willHide() {
141141
guard let imageLoader else { return }
142142
try? imageLoader.dropImage(forView: self)

packages/react-native-nitro-web-image/ios/HybridWebImageLoader.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ class HybridWebImageLoader: HybridImageLoaderSpec {
3535
guard let view = view as? NativeImageView else { throw RuntimeError.error(withMessage: "Invalid view type!") }
3636

3737
let webImageOptions = options?.toSDWebImageOptions() ?? []
38+
let webImageContext = options?.toSDWebImageContext()
3839
view.imageView.sd_setImage(with: url,
3940
placeholderImage: view.imageView.image,
4041
options: webImageOptions,
41-
context: nil)
42+
context: webImageContext)
4243
}
4344

4445
func dropImage(forView view: (any HybridNitroImageViewSpec)) throws {

0 commit comments

Comments
 (0)