@maplibre/maplibre-react-native 11.0.0-alpha.1 → 11.0.0-alpha.11

package/ios/modules/snapshot/MLRNSnapshotModule.mm

@@ -0,0 +1,77 @@
+#import "MLRNSnapshotModule.h"
+#import <MapLibre/MapLibre.h>
+#import <React/RCTConvert.h>
+#import "MLRNImageUtils.h"
+#import "MLRNUtils.h"
+
+@implementation MLRNSnapshotModule
+RCT_EXPORT_MODULE()
+
++ (BOOL)requiresMainQueueSetup {
+  return YES;
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params {
+  return std::make_shared<facebook::react::NativeSnapshotModuleSpecJSI>(params);
+}
+
+- (void)takeSnap:(JS::NativeSnapshotModule::SnapshotJsonOptions &)options
+         resolve:(RCTPromiseResolveBlock)resolve
+          reject:(RCTPromiseRejectBlock)reject {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    MLNMapSnapshotOptions *mapSnapshotOptions = [self _getOptions:options];
+    MLNMapSnapshotter *snapshotter = [[MLNMapSnapshotter alloc] initWithOptions:mapSnapshotOptions];
+    __block MLNMapSnapshotter *snapshotterRef = snapshotter;
+    BOOL writeToDisk = options.writeToDisk();
+
+    [snapshotter
+        startWithCompletionHandler:^(MLNMapSnapshot *_Nullable snapshot, NSError *_Nullable error) {
+          if (error) {
+            snapshotterRef = nil;
+            reject(@"takeSnap", @"Could not create snapshot", error);
+            return;
+          }
+
+          NSString *result = nil;
+          if (writeToDisk) {
+            result = [MLRNImageUtils createTempFile:snapshot.image];
+          } else {
+            result = [MLRNImageUtils createBase64:snapshot.image];
+          }
+
+          snapshotterRef = nil;
+          resolve(result);
+        }];
+  });
+}
+
+- (MLNMapSnapshotOptions *)_getOptions:(JS::NativeSnapshotModule::SnapshotJsonOptions &)options {
+  MLNMapCamera *camera = [[MLNMapCamera alloc] init];
+
+  camera.pitch = options.pitch();
+  camera.heading = options.heading();
+
+  if (options.centerCoordinate() != nil) {
+    camera.centerCoordinate = [MLRNUtils fromFeature:options.centerCoordinate()];
+  }
+
+  CGSize size = CGSizeMake(options.width(), options.height());
+
+  MLNMapSnapshotOptions *mapSnapshotOptions =
+      [[MLNMapSnapshotOptions alloc] initWithStyleURL:[NSURL URLWithString:options.styleURL()]
+                                               camera:camera
+                                                 size:size];
+
+  if (options.zoomLevel().has_value()) {
+    mapSnapshotOptions.zoomLevel = options.zoomLevel().value();
+  }
+
+  if (options.bounds() != nil) {
+    mapSnapshotOptions.coordinateBounds = [MLRNUtils fromFeatureCollection:options.bounds()];
+  }
+
+  return mapSnapshotOptions;
+}
+
+@end

package/ios/utils/MLRNEvent.m

@@ -0,0 +1,36 @@
+#import "MLRNEvent.h"
+
+@implementation MLRNEvent
+
+- (instancetype)init {
+  if (self = [super init]) {
+    _timestamp = [[NSDate date] timeIntervalSince1970];
+  }
+
+  return self;
+}
+
+- (NSDictionary *)payload {
+  if (_payload == nil) {
+    return @{};
+  }
+
+  return _payload;
+}
+
+- (NSDictionary *)toJSON {
+  return self.payload;
+}
+
++ (MLRNEvent *)makeEvent:(NSString *)type {
+  return [MLRNEvent makeEvent:type withPayload:@{}];
+}
+
++ (MLRNEvent *)makeEvent:(NSString *)type withPayload:(NSDictionary *)payload {
+  MLRNEvent *event = [[MLRNEvent alloc] init];
+  event.type = type;
+  event.payload = payload;
+  return event;
+}
+
+@end

package/ios/utils/MLRNEventTypes.h

@@ -0,0 +1,21 @@
+#import <Foundation/Foundation.h>
+
+@interface MLRNEventTypes : NSObject
+
+extern NSString *const RCT_MLRN_PRESS;
+extern NSString *const RCT_MLRN_LONG_PRESS;
+
+extern NSString *const RCT_MLRN_ANNOTATION_TAP;
+
+extern NSString *const RCT_MLRN_OFFLINE_PROGRESS;
+extern NSString *const RCT_MLRN_OFFLINE_ERROR;
+extern NSString *const RCT_MLRN_OFFLINE_TILE_LIMIT;
+
+extern NSString *const RCT_MLRN_SHAPE_SOURCE_LAYER_PRESS;
+extern NSString *const RCT_MLRN_VECTOR_SOURCE_LAYER_PRESS;
+
+extern NSString *const RCT_MLRN_USER_LOCATION_UPDATE;
+
+extern NSString *const RCT_MLRN_MISSING_IMAGE;
+
+@end

package/ios/utils/MLRNEventTypes.m

@@ -0,0 +1,21 @@
+#import "MLRNEventTypes.h"
+
+@implementation MLRNEventTypes
+
+NSString *const RCT_MLRN_PRESS = @"Press";
+NSString *const RCT_MLRN_LONG_PRESS = @"LongPress";
+
+NSString *const RCT_MLRN_ANNOTATION_TAP = @"AnnotationTap";
+
+NSString *const RCT_MLRN_OFFLINE_PROGRESS = @"OfflineProgress";
+NSString *const RCT_MLRN_OFFLINE_ERROR = @"OfflineError";
+NSString *const RCT_MLRN_OFFLINE_TILE_LIMIT = @"OfflineTileLimit";
+
+NSString *const RCT_MLRN_SHAPE_SOURCE_LAYER_PRESS = @"ShapeSourceLayerPress";
+NSString *const RCT_MLRN_VECTOR_SOURCE_LAYER_PRESS = @"VectorSourceLayerPress";
+
+NSString *const RCT_MLRN_MISSING_IMAGE = @"MissingImage";
+
+NSString *const RCT_MLRN_USER_LOCATION_UPDATE = @"UserLocationUpdate";
+
+@end

package/ios/utils/MLRNUtils.h

@@ -0,0 +1,45 @@
+#import <MapLibre/MapLibre.h>
+#import <React/RCTBridge.h>
+#import <React/RCTConvert.h>
+#import <React/RCTImageLoader.h>
+
+@interface MLRNUtils : NSObject
+
++ (CLLocationCoordinate2D)fromFeature:(NSString *)json;
+
++ (CLLocationCoordinate2D)fromLongitude:(NSNumber *)longitude latitude:(NSNumber *)latitude;
+
++ (NSArray<NSDictionary *> *)featuresToJSON:(NSArray<id<MLNFeature>> *)features;
+
++ (MLNShape *)shapeFromGeoJSON:(NSString *)json;
+
++ (MLNCoordinateBounds)fromFeatureCollection:(NSString *)json;
+
++ (MLNCoordinateBounds)fromReactBounds:(NSArray<NSNumber *> *)bounds;
+
++ (NSArray<NSNumber *> *)fromCoordinateBounds:(MLNCoordinateBounds)bounds;
+
++ (NSTimeInterval)fromMS:(NSNumber *)number;
++ (NSNumber *)clamp:(NSNumber *)value min:(NSNumber *)min max:(NSNumber *)max;
+
++ (UIColor *)toColor:(id)value;
+
++ (void)fetchImage:(RCTBridge *)bridge
+               url:(NSString *)url
+             scale:(double)scale
+               sdf:(Boolean)sdf
+          callback:(RCTImageLoaderCompletionBlock)callback;
+
++ (void)fetchImages:(RCTBridge *)bridge
+              style:(MLNStyle *)style
+            objects:(NSDictionary<NSString *, NSString *> *)objects
+        forceUpdate:(BOOL)forceUpdate
+           callback:(void (^)(void))callback;
+
++ (CGVector)toCGVector:(NSArray<NSNumber *> *)arr;
+
++ (UIEdgeInsets)toUIEdgeInsets:(NSArray<NSNumber *> *)arr;
+
++ (NSURL *)styleURLFromStyleJSON:(NSString *)styleJSON;
+
+@end

package/ios/utils/MLRNUtils.m

@@ -0,0 +1,250 @@
+#import "MLRNUtils.h"
+#import "MLRNImageQueue.h"
+
+@import MapLibre;
+
+@implementation MLRNUtils
+
+static double const MS_TO_S = 0.001;
+
++ (CLLocationCoordinate2D)fromFeature:(NSString *)jsonStr {
+  NSData *data = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
+  MLNPointFeature *feature = (MLNPointFeature *)[MLNShape shapeWithData:data
+                                                               encoding:NSUTF8StringEncoding
+                                                                  error:nil];
+  return feature.coordinate;
+}
+
++ (CLLocationCoordinate2D)fromLongitude:(NSNumber *)longitude latitude:(NSNumber *)latitude {
+  return CLLocationCoordinate2DMake([latitude doubleValue], [longitude doubleValue]);
+}
+
++ (NSArray<NSDictionary *> *)featuresToJSON:(NSArray<id<MLNFeature>> *)features {
+  NSMutableArray<NSDictionary *> *json = [[NSMutableArray alloc] init];
+  for (id<MLNFeature> feature in features) {
+    [json addObject:feature.geoJSONDictionary];
+  }
+  return json;
+}
+
++ (UIEdgeInsets)toUIEdgeInsets:(NSArray<NSNumber *> *)arr {
+  return UIEdgeInsetsMake([arr[0] floatValue], [arr[1] floatValue], [arr[2] floatValue],
+                          [arr[3] floatValue]);
+}
+
++ (MLNShape *)shapeFromGeoJSON:(NSString *)jsonStr {
+  NSData *data = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
+  NSError *error = nil;
+  MLNShape *result = [MLNShape shapeWithData:data encoding:NSUTF8StringEncoding error:&error];
+  if (error != nil) {
+    RCTLogWarn(@"Failed to convert data to shape error:%@ src:%@", error, jsonStr);
+  }
+  return result;
+}
+
++ (NSString *)hashURI:(NSString *)uri {
+  if (uri == nil) {
+    return @"-1";
+  }
+  NSUInteger hash = [uri hash];
+  return [NSString stringWithFormat:@"%lu", (unsigned long)hash];
+}
+
++ (MLNCoordinateBounds)fromFeatureCollection:(NSString *)jsonStr {
+  NSData *data = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
+  MLNShapeCollectionFeature *featureCollection =
+      (MLNShapeCollectionFeature *)[MLNShapeCollectionFeature shapeWithData:data
+                                                                   encoding:NSUTF8StringEncoding
+                                                                      error:nil];
+
+  CLLocationCoordinate2D ne = featureCollection.shapes[0].coordinate;
+  CLLocationCoordinate2D sw = featureCollection.shapes[1].coordinate;
+
+  return MLNCoordinateBoundsMake(sw, ne);
+}
+
++ (MLNCoordinateBounds)fromReactBounds:(NSArray<NSNumber *> *)bounds {
+  CLLocationCoordinate2D sw =
+      CLLocationCoordinate2DMake([bounds[1] doubleValue], [bounds[0] doubleValue]);
+  CLLocationCoordinate2D ne =
+      CLLocationCoordinate2DMake([bounds[3] doubleValue], [bounds[2] doubleValue]);
+
+  return MLNCoordinateBoundsMake(sw, ne);
+}
+
++ (NSArray<NSNumber *> *)fromCoordinateBounds:(MLNCoordinateBounds)bounds {
+  return @[
+    @(bounds.sw.longitude),
+    @(bounds.sw.latitude),
+    @(bounds.ne.longitude),
+    @(bounds.ne.latitude),
+  ];
+}
+
++ (NSTimeInterval)fromMS:(NSNumber *)number {
+  return [number doubleValue] * MS_TO_S;
+}
+
++ (NSNumber *)clamp:(NSNumber *)value min:(NSNumber *)min max:(NSNumber *)max {
+  if ([value doubleValue] < [min doubleValue]) return min;
+  if ([value doubleValue] > [max doubleValue]) return max;
+  return value;
+}
+
++ (UIColor *)toColor:(id)value {
+  return [RCTConvert UIColor:value];
+}
+
++ (CGVector)toCGVector:(NSArray<NSNumber *> *)arr {
+  return CGVectorMake([arr[0] floatValue], [arr[1] floatValue]);
+}
+
++ (void)fetchImage:(RCTBridge *)bridge
+               url:(NSString *)url
+             scale:(double)scale
+               sdf:(Boolean)sdf
+          callback:(RCTImageLoaderCompletionBlock)callback {
+  [MLRNImageQueue.sharedInstance addImage:url
+                                    scale:scale
+                                      sdf:sdf
+                                   bridge:bridge
+                        completionHandler:callback];
+}
+
++ (void)fetchImages:(RCTBridge *)bridge
+              style:(MLNStyle *)style
+            objects:(NSDictionary<NSString *, id> *)objects
+        forceUpdate:(BOOL)forceUpdate
+           callback:(void (^)(void))callback {
+  if (objects == nil) {
+    callback();
+    return;
+  }
+
+  NSArray<NSString *> *imageNames = objects.allKeys;
+  if (imageNames.count == 0) {
+    callback();
+    return;
+  }
+
+  __block NSUInteger imagesLeftToLoad = imageNames.count;
+  __weak MLNStyle *weakStyle = style;
+
+  void (^imageLoadedBlock)(void) = ^{
+    imagesLeftToLoad--;
+
+    if (imagesLeftToLoad == 0) {
+      callback();
+    }
+  };
+
+  for (NSString *imageName in imageNames) {
+    UIImage *foundImage = forceUpdate ? nil : [style imageForName:imageName];
+
+    if (forceUpdate || foundImage == nil) {
+      NSDictionary *image = objects[imageName];
+      BOOL hasScale =
+          [image isKindOfClass:[NSDictionary class]] && ([image objectForKey:@"scale"] != nil);
+      BOOL hasSdf =
+          [image isKindOfClass:[NSDictionary class]] && ([image objectForKey:@"sdf"] != nil);
+      double scale = hasScale ? [[image objectForKey:@"scale"] doubleValue] : 1.0;
+      double sdf = hasSdf ? [[image objectForKey:@"sdf"] boolValue] : false;
+      [MLRNImageQueue.sharedInstance addImage:objects[imageName]
+                                        scale:scale
+                                          sdf:sdf
+                                       bridge:bridge
+                            completionHandler:^(NSError *error, UIImage *image) {
+                              if (!image) {
+                                RCTLogWarn(@"Failed to fetch image: %@ error:%@", imageName, error);
+                              } else {
+                                dispatch_async(dispatch_get_main_queue(), ^{
+                                  [weakStyle setImage:image forName:imageName];
+                                  imageLoadedBlock();
+                                });
+                              }
+                            }];
+    } else {
+      imageLoadedBlock();
+    }
+  }
+}
+
++ (NSString *)getStyleJsonTempDirectory {
+  static NSString *styleJsonTempDirectory;
+  if (!styleJsonTempDirectory) {
+    styleJsonTempDirectory =
+        [NSTemporaryDirectory() stringByAppendingPathComponent:@"MLRNStyleJSON"];
+  }
+  return styleJsonTempDirectory;
+}
+
+/**
+ * Clears cached style-json entries from previous app runs. Can be safely called multiple times as
+ * it will only perform the action once per app run.
+ *
+ * @see styleURLFromStyleJSON:
+ */
++ (void)cleanCustomStyleJSONCacheIfNeeded {
+  NSFileManager *fileManager = [NSFileManager defaultManager];
+  NSString *styleJsonTempDirectory = [MLRNUtils getStyleJsonTempDirectory];
+
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    if ([fileManager fileExistsAtPath:styleJsonTempDirectory]) {
+      [fileManager removeItemAtPath:styleJsonTempDirectory error:NULL];
+    }
+  });
+}
+
+/**
+ * Provides a way to convert raw style-json into a file so it can be directly referenced / used as
+ * styleURL. It's a crude / alternative approach to support Android's API: Style.Builder.fromJson().
+ */
++ (NSURL *)styleURLFromStyleJSON:(NSString *)styleJSON {
+  [MLRNUtils cleanCustomStyleJSONCacheIfNeeded];
+
+  NSFileManager *fileManager = [NSFileManager defaultManager];
+  NSString *styleJsonTempDirectory = [MLRNUtils getStyleJsonTempDirectory];
+
+  // attempt to create the temporary directory
+  if (![fileManager fileExistsAtPath:styleJsonTempDirectory]) {
+    NSError *error;
+    [fileManager createDirectoryAtPath:styleJsonTempDirectory
+           withIntermediateDirectories:YES
+                            attributes:nil
+                                 error:&error];
+    if (error) {
+      RCTLogError(@"Failed to create temporary directory '%@' for storing style-json. Error: %@",
+                  styleJsonTempDirectory, error);
+      return nil;
+    }
+  }
+
+  // Determine filename based on the md5 hash of the style-json.
+  // This way, the written file can also act as a cached entry in case
+  // the same style-json is used again.
+  NSString *hashedFilename = [RCTMD5Hash(styleJSON) stringByAppendingPathExtension:@"json"];
+
+  // Construct temporary file path (tempdir + md5 hash for filename)
+  NSString *styleJsonTempPath =
+      [styleJsonTempDirectory stringByAppendingPathComponent:hashedFilename];
+  NSURL *styleJsonTempURL = [NSURL fileURLWithPath:styleJsonTempPath isDirectory:false];
+
+  // Write style-json to temporary file in case it doesn't already exist
+  if (![fileManager fileExistsAtPath:styleJsonTempPath isDirectory:false]) {
+    NSError *error;
+    [styleJSON writeToURL:styleJsonTempURL
+               atomically:YES
+                 encoding:NSUTF8StringEncoding
+                    error:&error];
+    if (error) {
+      RCTLogError(@"Failed to write style-json to temporary file '%@'. Error: %@", styleJsonTempURL,
+                  error);
+      return nil;
+    }
+  }
+
+  return styleJsonTempURL;
+}
+
+@end

package/lib/commonjs/MLRNModule.js

@@ -3,16 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setConnected = exports.setAccessToken = exports.removeCustomHeader = exports.getAccessToken = exports.addCustomHeader = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.CameraModes = void 0;
+exports.setConnected = exports.removeCustomHeader = exports.addCustomHeader = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = void 0;
 var _reactNative = require("react-native");
 const MLRNModule = Object.create(_reactNative.NativeModules.MLRNModule);
 const {
-  CameraModes,
   OfflinePackDownloadState,
   StyleSource,
   StyleURL,
-  setAccessToken,
-  getAccessToken,
   addCustomHeader,
   removeCustomHeader,
   setConnected
@@ -20,10 +17,7 @@ const {
 exports.setConnected = setConnected;
 exports.removeCustomHeader = removeCustomHeader;
 exports.addCustomHeader = addCustomHeader;
-exports.getAccessToken = getAccessToken;
-exports.setAccessToken = setAccessToken;
 exports.StyleURL = StyleURL;
 exports.StyleSource = StyleSource;
 exports.OfflinePackDownloadState = OfflinePackDownloadState;
-exports.CameraModes = CameraModes;
 //# sourceMappingURL=MLRNModule.js.map

package/lib/commonjs/MLRNModule.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","MLRNModule","Object","create","NativeModules","CameraModes","OfflinePackDownloadState","StyleSource","StyleURL","setAccessToken","getAccessToken","addCustomHeader","removeCustomHeader","setConnected","exports"],"sourceRoot":"../../src","sources":["MLRNModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AA4CA,MAAMC,UAAuB,GAAGC,MAAM,CAACC,MAAM,CAACC,0BAAa,CAACH,UAAU,CAAC;AAEhE,MAAM;EACXI,WAAW;EACXC,wBAAwB;EACxBC,WAAW;EACXC,QAAQ;EAERC,cAAc;EACdC,cAAc;EAEdC,eAAe;EACfC,kBAAkB;EAElBC;AACF,CAAC,GAAGZ,UAAU;AAACa,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,kBAAA,GAAAA,kBAAA;AAAAE,OAAA,CAAAH,eAAA,GAAAA,eAAA;AAAAG,OAAA,CAAAJ,cAAA,GAAAA,cAAA;AAAAI,OAAA,CAAAL,cAAA,GAAAA,cAAA;AAAAK,OAAA,CAAAN,QAAA,GAAAA,QAAA;AAAAM,OAAA,CAAAP,WAAA,GAAAA,WAAA;AAAAO,OAAA,CAAAR,wBAAA,GAAAA,wBAAA;AAAAQ,OAAA,CAAAT,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","MLRNModule","Object","create","NativeModules","OfflinePackDownloadState","StyleSource","StyleURL","addCustomHeader","removeCustomHeader","setConnected","exports"],"sourceRoot":"../../src","sources":["MLRNModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAwBA,MAAMC,UAAuB,GAAGC,MAAM,CAACC,MAAM,CAACC,0BAAa,CAACH,UAAU,CAAC;AAEhE,MAAM;EACXI,wBAAwB;EACxBC,WAAW;EACXC,QAAQ;EAERC,eAAe;EACfC,kBAAkB;EAElBC;AACF,CAAC,GAAGT,UAAU;AAACU,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,kBAAA,GAAAA,kBAAA;AAAAE,OAAA,CAAAH,eAAA,GAAAA,eAAA;AAAAG,OAAA,CAAAJ,QAAA,GAAAA,QAAA;AAAAI,OAAA,CAAAL,WAAA,GAAAA,WAAA;AAAAK,OAAA,CAAAN,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/lib/commonjs/components/Images.js

@@ -4,21 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NATIVE_MODULE_NAME = exports.Images = void 0;
+var _react = require("react");
 var _reactNative = require("react-native");
 var _jsxRuntime = require("react/jsx-runtime");
 const NATIVE_MODULE_NAME = exports.NATIVE_MODULE_NAME = "MLRNImages";
-function _isUrlOrPath(value) {
-  return (typeof value === "string" || value instanceof String) && (value.startsWith("file://") || value.startsWith("http://") || value.startsWith("https://") || value.startsWith("data:") || value.startsWith("asset://") || value.startsWith("/"));
-}
-function _isImageSourcePropType(value) {
-  if (typeof value === "number" || value instanceof Number) {
-    return true;
-  }
-  const valueAsSource = value;
-  return !!valueAsSource.uri && typeof valueAsSource.uri === "string";
-}
 /**
- * Images defines the images used in Symbol etc layers
+ * Images defines the images used in Symbol layers
  */
 const Images = ({
   images,
@@ -27,45 +18,40 @@ const Images = ({
   id,
   children
 }) => {
-  const _getImages = () => {
-    if (!images && !nativeAssetImages) {
-      return {};
-    }
-    const imagesResult = {};
-    let nativeImages = [];
-    if (images) {
-      const imageNames = Object.keys(images);
-      for (const imageName of imageNames) {
-        const value = images[imageName];
-        if (value && _isUrlOrPath(value)) {
-          imagesResult[imageName] = value;
-        } else if (value && _isImageSourcePropType(value)) {
-          const res = _reactNative.Image.resolveAssetSource(value);
-          if (res && res.uri) {
-            imagesResult[imageName] = res;
+  const props = (0, _react.useMemo)(() => {
+    const getImages = () => {
+      if (!images && !nativeAssetImages) {
+        return {};
+      }
+      const imagesResult = {};
+      if (images) {
+        Object.entries(images).forEach(([imageName, value]) => {
+          if (typeof value === "string") {
+            imagesResult[imageName] = value;
+          } else if (typeof value === "object" && "source" in value && value.source) {
+            imagesResult[imageName] = {
+              ..._reactNative.Image.resolveAssetSource(value.source),
+              sdf: value.sdf
+            };
+          } else {
+            imagesResult[imageName] = _reactNative.Image.resolveAssetSource(value);
           }
-        }
+        });
       }
-    }
-    if (nativeAssetImages) {
-      nativeImages = nativeAssetImages;
-    }
+      return imagesResult;
+    };
     return {
-      images: imagesResult,
-      nativeImages
+      id,
+      hasOnImageMissing: !!onImageMissing,
+      onImageMissing: event => {
+        if (onImageMissing) {
+          onImageMissing(event.nativeEvent.payload.imageKey);
+        }
+      },
+      images: getImages(),
+      nativeImages: nativeAssetImages ?? []
     };
-  };
-  const _onImageMissing = event => {
-    if (onImageMissing) {
-      onImageMissing(event.nativeEvent.payload.imageKey);
-    }
-  };
-  const props = {
-    id,
-    hasOnImageMissing: !!onImageMissing,
-    onImageMissing: _onImageMissing,
-    ..._getImages()
-  };
+  }, [id, onImageMissing, images, nativeAssetImages]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(MLRNImages, {
     ...props,
     children: children

package/lib/commonjs/components/Images.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_jsxRuntime","NATIVE_MODULE_NAME","exports","_isUrlOrPath","value","String","startsWith","_isImageSourcePropType","Number","valueAsSource","uri","Images","images","nativeAssetImages","onImageMissing","id","children","_getImages","imagesResult","nativeImages","imageNames","Object","keys","imageName","res","Image","resolveAssetSource","_onImageMissing","event","nativeEvent","payload","imageKey","props","hasOnImageMissing","jsx","MLRNImages","requireNativeComponent"],"sourceRoot":"../../../src","sources":["components/Images.tsx"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAMsB,IAAAC,WAAA,GAAAD,OAAA;AAIf,MAAME,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,GAAG,YAAY;AAI9C,SAASE,YAAYA,CAACC,KAAiB,EAAW;EAChD,OACE,CAAC,OAAOA,KAAK,KAAK,QAAQ,IAAIA,KAAK,YAAYC,MAAM,MACpDD,KAAK,CAACE,UAAU,CAAC,SAAS,CAAC,IAC1BF,KAAK,CAACE,UAAU,CAAC,SAAS,CAAC,IAC3BF,KAAK,CAACE,UAAU,CAAC,UAAU,CAAC,IAC5BF,KAAK,CAACE,UAAU,CAAC,OAAO,CAAC,IACzBF,KAAK,CAACE,UAAU,CAAC,UAAU,CAAC,IAC5BF,KAAK,CAACE,UAAU,CAAC,GAAG,CAAC,CAAC;AAE5B;AAEA,SAASC,sBAAsBA,CAC7BH,KAAiB,EACa;EAC9B,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAIA,KAAK,YAAYI,MAAM,EAAE;IACxD,OAAO,IAAI;EACb;EACA,MAAMC,aAAa,GAAGL,KAAuB;EAC7C,OAAO,CAAC,CAACK,aAAa,CAACC,GAAG,IAAI,OAAOD,aAAa,CAACC,GAAG,KAAK,QAAQ;AACrE;AAyBA;AACA;AACA;AACO,MAAMC,MAAM,GAAGA,CAAC;EACrBC,MAAM;EACNC,iBAAiB;EACjBC,cAAc;EACdC,EAAE;EACFC;AACW,CAAC,KAAK;EACjB,MAAMC,UAAU,GAAGA,CAAA,KAGd;IACH,IAAI,CAACL,MAAM,IAAI,CAACC,iBAAiB,EAAE;MACjC,OAAO,CAAC,CAAC;IACX;IAEA,MAAMK,YAA2C,GAAG,CAAC,CAAC;IACtD,IAAIC,YAA0B,GAAG,EAAE;IAEnC,IAAIP,MAAM,EAAE;MACV,MAAMQ,UAAU,GAAGC,MAAM,CAACC,IAAI,CAACV,MAAM,CAAC;MACtC,KAAK,MAAMW,SAAS,IAAIH,UAAU,EAAE;QAClC,MAAMhB,KAAK,GAAGQ,MAAM,CAACW,SAAS,CAAC;QAC/B,IAAInB,KAAK,IAAID,YAAY,CAACC,KAAK,CAAC,EAAE;UAChCc,YAAY,CAACK,SAAS,CAAC,GAAGnB,KAAK;QACjC,CAAC,MAAM,IAAIA,KAAK,IAAIG,sBAAsB,CAACH,KAAK,CAAC,EAAE;UACjD,MAAMoB,GAAG,GAAGC,kBAAK,CAACC,kBAAkB,CAACtB,KAAK,CAAC;UAC3C,IAAIoB,GAAG,IAAIA,GAAG,CAACd,GAAG,EAAE;YAClBQ,YAAY,CAACK,SAAS,CAAC,GAAGC,GAAG;UAC/B;QACF;MACF;IACF;IAEA,IAAIX,iBAAiB,EAAE;MACrBM,YAAY,GAAGN,iBAAiB;IAClC;IAEA,OAAO;MACLD,MAAM,EAAEM,YAAY;MACpBC;IACF,CAAC;EACH,CAAC;EAED,MAAMQ,eAAe,GACnBC,KAA8D,IACrD;IACT,IAAId,cAAc,EAAE;MAClBA,cAAc,CAACc,KAAK,CAACC,WAAW,CAACC,OAAO,CAACC,QAAQ,CAAC;IACpD;EACF,CAAC;EAED,MAAMC,KAAK,GAAG;IACZjB,EAAE;IACFkB,iBAAiB,EAAE,CAAC,CAACnB,cAAc;IACnCA,cAAc,EAAEa,eAAe;IAC/B,GAAGV,UAAU,CAAC;EAChB,CAAC;EAED,oBAAO,IAAAjB,WAAA,CAAAkC,GAAA,EAACC,UAAU;IAAA,GAAKH,KAAK;IAAAhB,QAAA,EAAGA;EAAQ,CAAa,CAAC;AACvD,CAAC;AAACd,OAAA,CAAAS,MAAA,GAAAA,MAAA;AAEF,MAAMwB,UAAU,GAAG,IAAAC,mCAAsB,EAACnC,kBAAkB,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_jsxRuntime","NATIVE_MODULE_NAME","exports","Images","images","nativeAssetImages","onImageMissing","id","children","props","useMemo","getImages","imagesResult","Object","entries","forEach","imageName","value","source","Image","resolveAssetSource","sdf","hasOnImageMissing","event","nativeEvent","payload","imageKey","nativeImages","jsx","MLRNImages","requireNativeComponent"],"sourceRoot":"../../../src","sources":["components/Images.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAQsB,IAAAE,WAAA,GAAAF,OAAA;AAIf,MAAMG,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,GAAG,YAAY;AAyC9C;AACA;AACA;AACO,MAAME,MAAM,GAAGA,CAAC;EACrBC,MAAM;EACNC,iBAAiB;EACjBC,cAAc;EACdC,EAAE;EACFC;AACW,CAAC,KAAK;EACjB,MAAMC,KAAK,GAAG,IAAAC,cAAO,EAAC,MAAM;IAC1B,MAAMC,SAAS,GAAGA,CAAA,KAGb;MACH,IAAI,CAACP,MAAM,IAAI,CAACC,iBAAiB,EAAE;QACjC,OAAO,CAAC,CAAC;MACX;MAEA,MAAMO,YAEL,GAAG,CAAC,CAAC;MAEN,IAAIR,MAAM,EAAE;QACVS,MAAM,CAACC,OAAO,CAACV,MAAM,CAAC,CAACW,OAAO,CAAC,CAAC,CAACC,SAAS,EAAEC,KAAK,CAAC,KAAK;UACrD,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;YAC7BL,YAAY,CAACI,SAAS,CAAC,GAAGC,KAAK;UACjC,CAAC,MAAM,IACL,OAAOA,KAAK,KAAK,QAAQ,IACzB,QAAQ,IAAIA,KAAK,IACjBA,KAAK,CAACC,MAAM,EACZ;YACAN,YAAY,CAACI,SAAS,CAAC,GAAG;cACxB,GAAGG,kBAAK,CAACC,kBAAkB,CAACH,KAAK,CAACC,MAAM,CAAC;cACzCG,GAAG,EAAEJ,KAAK,CAACI;YACb,CAAC;UACH,CAAC,MAAM;YACLT,YAAY,CAACI,SAAS,CAAC,GAAGG,kBAAK,CAACC,kBAAkB,CAACH,KAAK,CAAC;UAC3D;QACF,CAAC,CAAC;MACJ;MAEA,OAAOL,YAAY;IACrB,CAAC;IAED,OAAO;MACLL,EAAE;MACFe,iBAAiB,EAAE,CAAC,CAAChB,cAAc;MACnCA,cAAc,EACZiB,KAA8D,IACrD;QACT,IAAIjB,cAAc,EAAE;UAClBA,cAAc,CAACiB,KAAK,CAACC,WAAW,CAACC,OAAO,CAACC,QAAQ,CAAC;QACpD;MACF,CAAC;MACDtB,MAAM,EAAEO,SAAS,CAAC,CAAC;MACnBgB,YAAY,EAAEtB,iBAAiB,IAAI;IACrC,CAAC;EACH,CAAC,EAAE,CAACE,EAAE,EAAED,cAAc,EAAEF,MAAM,EAAEC,iBAAiB,CAAC,CAAC;EAEnD,oBAAO,IAAAL,WAAA,CAAA4B,GAAA,EAACC,UAAU;IAAA,GAAKpB,KAAK;IAAAD,QAAA,EAAGA;EAAQ,CAAa,CAAC;AACvD,CAAC;AAACN,OAAA,CAAAC,MAAA,GAAAA,MAAA;AAEF,MAAM0B,UAAU,GAAG,IAAAC,mCAAsB,EAAC7B,kBAAkB,CAAC","ignoreList":[]}