feat: trick codegen to properly pass headers

Author: WoLewicki

android/src/main/java/com/dylanvann/fastimage/FastImageViewConverter.java

@@ -17,8 +17,8 @@
 import com.bumptech.glide.signature.ApplicationVersionSignature;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.NoSuchKeyException;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableMapKeySetIterator;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -62,15 +62,11 @@ static Headers getHeaders(ReadableMap source) {
         Headers headers = Headers.DEFAULT;
 
         if (source.hasKey("headers")) {
-            ReadableMap headersMap = source.getMap("headers");
-            ReadableMapKeySetIterator iterator = headersMap.keySetIterator();
             LazyHeaders.Builder builder = new LazyHeaders.Builder();
-
-            while (iterator.hasNextKey()) {
-                String header = iterator.nextKey();
-                String value = headersMap.getString(header);
-
-                builder.addHeader(header, value);
+            ReadableArray headersArray = source.getArray("headers");
+            for (int i = 0; i < headersArray.size(); i++) {
+                ReadableMap header = headersArray.getMap(i);
+                builder.addHeader(header.getString("name"), header.getString("value"));
             }
 
             headers = builder.build();

ios/FastImage/FFFastImageViewComponentView.mm

@@ -1,6 +1,7 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import "FFFastImageViewComponentView.h"
+#import "RCTConvert+FFFastImage.h"
 #import "FFFastImageView.h"
 
 #import <React/RCTConversions.h>
@@ -35,46 +36,47 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 
     const auto &newViewProps = *std::static_pointer_cast<FastImageViewProps const>(props);
 
-    NSString *sourceStr = [NSString stringWithCString:newViewProps.source.uri.c_str() encoding:[NSString defaultCStringEncoding]];
-     NSURL *imageUrl = [[NSURL alloc] initWithString:sourceStr];
-     FFFastImageSource *imageSource = fastImageView.source;
-     if(imageSource == NULL){
-         imageSource = [[FFFastImageSource alloc] init];
-     }
-    imageSource.url = imageUrl;
+    NSMutableDictionary *imageSourcePropsDict = [NSMutableDictionary new];
+    imageSourcePropsDict[@"uri"] = RCTNSStringFromStringNilIfEmpty(newViewProps.source.uri);
+    NSMutableDictionary* headers = [[NSMutableDictionary alloc] init];
+    for (auto & element : newViewProps.source.headers) {
+        [headers setValue:RCTNSStringFromString(element.value) forKey:RCTNSStringFromString(element.name)];
+    }
+    if (headers.count > 0) {
+        imageSourcePropsDict[@"headers"] = headers;
+    }
 
-    FFFCacheControl cacheControl;
+    NSString *cacheControl;
     switch (newViewProps.source.cache) {
         case FastImageViewCache::Web:
-            cacheControl = FFFCacheControl::FFFCacheControlWeb;
+            cacheControl = @"web";
             break;
         case FastImageViewCache::CacheOnly:
-            cacheControl = FFFCacheControl::FFFCacheControlCacheOnly;
+            cacheControl = @"cacheOnly";
             break;
         case FastImageViewCache::Immutable:
         default:
-            cacheControl = FFFCacheControl::FFFCacheControlImmutable;
+            cacheControl = @"immutable";
             break;
     }
-    imageSource.cacheControl = cacheControl;
+    imageSourcePropsDict[@"cache"] = cacheControl;
 
-    FFFPriority priority;
+    NSString *priority;
     switch (newViewProps.source.priority) {
         case FastImageViewPriority::Low:
-            priority = FFFPriority::FFFPriorityLow;
+            priority = @"low";
             break;
         case FastImageViewPriority::Normal:
-            priority = FFFPriority::FFFPriorityNormal;
+            priority = @"normal";
             break;
         case FastImageViewPriority::High:
         default:
-            priority = FFFPriority::FFFPriorityHigh;
+            priority = @"high";
             break;
     }
+    imageSourcePropsDict[@"priority"] = priority;
+    FFFastImageSource *imageSource = [RCTConvert FFFastImageSource:imageSourcePropsDict];
 
-   
-    imageSource.priority = priority;
-   
     [fastImageView setSource: imageSource];
 
 
@@ -99,6 +101,8 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     fastImageView.imageColor = RCTUIColorFromSharedColor(newViewProps.tintColor);
 
     [super updateProps:props oldProps:oldProps];
+    // this method decides whether to reload the image so we call it after updating the props
+    // It does not care about the changed props, but 
     [fastImageView didSetProps:nil];
 }
 

src/FastImageViewNativeComponent.tsx

@@ -1,13 +1,16 @@
 import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import type { ViewProps, ColorValue } from 'react-native';
+import type { 
+    ViewProps, 
+    ColorValue,
+} from 'react-native';
 import type {
   Float,
   WithDefault,
   BubblingEventHandler,
   Int32,
 } from 'react-native/Libraries/Types/CodegenTypes';
 
-type Headers = Readonly<{}>
+type Headers = ReadonlyArray<Readonly<{name: string, value: string}>>;
 type Priority = WithDefault< 'low' | 'normal' | 'high', 'normal'>
 type CacheControl = WithDefault< 'immutable' | 'web' | 'cacheOnly', 'web'>
 

src/index.tsx

@@ -14,6 +14,7 @@ import {
     AccessibilityProps,
     ViewProps,
     ColorValue,
+    ImageResolvedAssetSource,
 } from 'react-native'
 import FastImageView from './FastImageViewNativeComponent';
 
@@ -194,7 +195,16 @@ function FastImageBase({
         )
     }
 
-    const resolvedSource = Image.resolveAssetSource(source as any)
+    // this type differs based on the `source` prop passed
+    const resolvedSource = Image.resolveAssetSource(source as any) as ImageResolvedAssetSource & {headers: any}
+    if (resolvedSource?.headers) {
+        // we do it like that to trick codegen
+        const headersArray: {name: string, value: string}[] = [];
+        Object.keys(resolvedSource.headers).forEach(key => {
+            headersArray.push({name: key, value: resolvedSource.headers[key]});
+        })
+        resolvedSource.headers = headersArray;
+    }
     const resolvedDefaultSource = resolveDefaultSource(defaultSource)
     const resolvedDefaultSourceAsString = resolvedDefaultSource !== null ? String(resolvedDefaultSource) : null;