react-native-fast-image 8.6.30 → 8.6.32

package/android/build.gradle

@@ -74,6 +74,8 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
     implementation "com.github.bumptech.glide:glide:${glideVersion}"
+    // FastImageGlideModule and FastImageOkHttpProgressGlideModule use @GlideModule.
+    implementation "com.github.bumptech.glide:annotations:${glideVersion}"
     implementation "com.github.bumptech.glide:okhttp3-integration:${glideVersion}"
     annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"
 }

package/android/src/main/java/com/dylanvann/fastimage/FastImageShadowNode.java

@@ -0,0 +1,21 @@
+package com.dylanvann.fastimage;
+
+import com.facebook.react.uimanager.LayoutShadowNode;
+import com.facebook.react.uimanager.UIViewOperationQueue;
+
+// Legacy architecture only. React Native only lays out a view when its frame
+// changes, so a view that stays 0×0 at its parent's origin is never laid out,
+// and Glide waits for its size forever (#865). When the computed size is zero,
+// tell the view, so it can lay itself out and load as it does on the New
+// Architecture. Remove with legacy architecture support.
+public class FastImageShadowNode extends LayoutShadowNode {
+    static final Object ZERO_LAYOUT = new Object();
+
+    @Override
+    public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
+        super.onCollectExtraUpdates(uiViewOperationQueue);
+        if (Math.round(getLayoutWidth()) == 0 && Math.round(getLayoutHeight()) == 0) {
+            uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), ZERO_LAYOUT);
+        }
+    }
+}

package/android/src/main/java/com/dylanvann/fastimage/FastImageViewManager.java

@@ -18,6 +18,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.MapBuilder;
+import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -190,6 +191,18 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
 
     }
 
+    // Legacy architecture only; the New Architecture doesn't use shadow nodes.
+    @NonNull
+    @Override
+    public LayoutShadowNode createShadowNodeInstance() {
+        return new FastImageShadowNode();
+    }
+
+    @Override
+    public void updateExtraData(@NonNull FastImageViewWithUrl view, Object extraData) {
+        if (extraData == FastImageShadowNode.ZERO_LAYOUT) view.onZeroLayout();
+    }
+
     @Override
     protected void onAfterUpdateTransaction(@NonNull FastImageViewWithUrl view) {
         super.onAfterUpdateTransaction(view);

package/android/src/main/java/com/dylanvann/fastimage/FastImageViewWithUrl.java

@@ -9,6 +9,7 @@ import android.graphics.drawable.Drawable;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.view.ViewCompat;
 
 import com.bumptech.glide.RequestBuilder;
 import com.bumptech.glide.RequestManager;
@@ -48,6 +49,14 @@ class FastImageViewWithUrl extends AppCompatImageView {
         mDefaultSource = source;
     }
 
+    // Legacy architecture only (see FastImageShadowNode): the view's layout is
+    // 0×0 at its parent's origin, which React Native never applies. Lay it out
+    // at that size, as the New Architecture does, so Glide stops waiting for a
+    // size and loads it (#865).
+    void onZeroLayout() {
+        if (!ViewCompat.isLaidOut(this)) layout(0, 0, 0, 0);
+    }
+
     // Glide crops or fits the bitmap for the scale type when it loads, so a
     // new resizeMode needs a reload to take effect (#762).
     public void setResizeMode(ScaleType scaleType) {

package/dist/index.cjs.js

@@ -1,214 +1,153 @@
-'use strict';
-
-var _extends = require('@babel/runtime/helpers/extends');
-var React = require('react');
-var reactNative = require('react-native');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-
-// from ViewStyle so the types also work with older React Native types, where
-// it's string.
-
+//#region \0rolldown/runtime.js
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+//#endregion
+let react = require("react");
+react = __toESM(react);
+let react_native = require("react-native");
+//#region src/index.tsx
 const resizeMode = {
-  contain: 'contain',
-  cover: 'cover',
-  stretch: 'stretch',
-  center: 'center'
+	contain: "contain",
+	cover: "cover",
+	stretch: "stretch",
+	center: "center"
 };
 const priority = {
-  low: 'low',
-  normal: 'normal',
-  high: 'high'
+	low: "low",
+	normal: "normal",
+	high: "high"
 };
 const cacheControl = {
-  // Ignore headers, use uri as cache key, fetch only if not in cache.
-  immutable: 'immutable',
-  // Respect http headers, no aggressive caching.
-  web: 'web',
-  // Only load from cache.
-  cacheOnly: 'cacheOnly'
+	immutable: "immutable",
+	web: "web",
+	cacheOnly: "cacheOnly"
+};
+const resolveDefaultSource = (defaultSource) => {
+	if (!defaultSource) return null;
+	if (react_native.Platform.OS === "android") {
+		const resolved = react_native.Image.resolveAssetSource(defaultSource);
+		if (resolved) return resolved.uri;
+		return null;
+	}
+	return defaultSource;
 };
-
-const resolveDefaultSource = defaultSource => {
-  if (!defaultSource) {
-    return null;
-  }
-
-  if (reactNative.Platform.OS === 'android') {
-    // Android receives a URI string, and resolves into a Drawable using RN's methods.
-    const resolved = reactNative.Image.resolveAssetSource(defaultSource);
-
-    if (resolved) {
-      return resolved.uri;
-    }
-
-    return null;
-  } // iOS or other number mapped assets
-  // In iOS the number is passed, and bridged automatically into a UIImage
-
-
-  return defaultSource;
-}; // Finds tintColor in a style prop, where the last style that sets it wins, as
-// with StyleSheet.flatten, but without flattening (which allocates a merged
-// object for an array style on every render).
-
-
 function tintColorFromStyle(style) {
-  if (Array.isArray(style)) {
-    for (let i = style.length - 1; i >= 0; i--) {
-      const found = tintColorFromStyle(style[i]);
-      if (found !== undefined) return found;
-    }
-
-    return undefined;
-  }
-
-  if (typeof style === 'number') {
-    // A registered style from StyleSheet.create on older React Native.
-    const flattened = reactNative.StyleSheet.flatten(style);
-    return flattened ? flattened.tintColor : undefined;
-  }
-
-  return style && typeof style === 'object' ? style.tintColor : undefined;
-} // A copy of the source without `cache`.
-
-
+	if (Array.isArray(style)) {
+		for (let i = style.length - 1; i >= 0; i--) {
+			const found = tintColorFromStyle(style[i]);
+			if (found !== void 0) return found;
+		}
+		return;
+	}
+	if (typeof style === "number") {
+		const flattened = react_native.StyleSheet.flatten(style);
+		return flattened ? flattened.tintColor : void 0;
+	}
+	return style && typeof style === "object" ? style.tintColor : void 0;
+}
 function withoutCache(source) {
-  const {
-    cache: _cache,
-    ...rest
-  } = source || {};
-  return rest;
+	const { cache: _cache, ...rest } = source || {};
+	return rest;
 }
-
-function FastImageBase({
-  source,
-  defaultSource,
-  tintColor,
-  onLoadStart,
-  onProgress,
-  onLoad,
-  onError,
-  onLoadEnd,
-  style,
-  fallback,
-  children,
-  resizeMode = 'cover',
-  forwardedRef,
-  // On the wrapper, so the layout is relative to the parent (the image view
-  // inside always has x and y of 0).
-  onLayout,
-  // On the wrapper, which would otherwise still take touches. With
-  // 'box-none' the image is part of the box, so it ignores touches too.
-  pointerEvents,
-  ...viewProps
-}) {
-  // Touchables pass onClick to their child (React Native 0.73+, for
-  // accessibility clicks). It goes on the wrapper: the image view doesn't
-  // support it on iOS, which crashed (#1020). Older React Native types don't
-  // include it.
-  const {
-    onClick,
-    ...props
-  } = viewProps;
-  const wrapperProps = {
-    onLayout,
-    onClick,
-    pointerEvents
-  };
-  const imageProps = { ...props,
-    pointerEvents: pointerEvents === 'box-none' ? 'none' : undefined
-  }; // tintColor can also be set in style, as with React Native's Image. The
-  // prop wins.
-
-  const resolvedTintColor = tintColor != null ? tintColor : tintColorFromStyle(style);
-
-  if (fallback) {
-    // Remove `cache`, which React Native's Image doesn't support. A
-    // require()d source is a number: pass it through (spreading it gave {}).
-    const cleanedSource = typeof source === 'number' ? source : withoutCache(source);
-    const resolvedSource = reactNative.Image.resolveAssetSource(cleanedSource);
-    return /*#__PURE__*/React__default['default'].createElement(reactNative.View, _extends__default['default']({
-      style: [styles.imageContainer, style]
-    }, wrapperProps, {
-      ref: forwardedRef
-    }), /*#__PURE__*/React__default['default'].createElement(reactNative.Image, _extends__default['default']({}, imageProps, {
-      style: [styles.fallbackImage, {
-        tintColor: resolvedTintColor
-      }],
-      source: resolvedSource,
-      defaultSource: defaultSource,
-      onLoadStart: onLoadStart,
-      onProgress: onProgress,
-      onLoad: onLoad,
-      onError: onError,
-      onLoadEnd: onLoadEnd,
-      resizeMode: resizeMode
-    })), children);
-  }
-
-  const resolvedSource = reactNative.Image.resolveAssetSource(source);
-  const resolvedDefaultSource = resolveDefaultSource(defaultSource);
-  return /*#__PURE__*/React__default['default'].createElement(reactNative.View, _extends__default['default']({
-    style: [styles.imageContainer, style]
-  }, wrapperProps, {
-    ref: forwardedRef
-  }), /*#__PURE__*/React__default['default'].createElement(FastImageView, _extends__default['default']({}, imageProps, {
-    tintColor: resolvedTintColor,
-    style: reactNative.StyleSheet.absoluteFill,
-    source: resolvedSource,
-    defaultSource: resolvedDefaultSource,
-    onFastImageLoadStart: onLoadStart,
-    onFastImageProgress: onProgress,
-    onFastImageLoad: onLoad,
-    onFastImageError: onError,
-    onFastImageLoadEnd: onLoadEnd,
-    resizeMode: resizeMode
-  })), children);
+function FastImageBase({ source, defaultSource, tintColor, onLoadStart, onProgress, onLoad, onError, onLoadEnd, style, fallback, children, resizeMode = "cover", forwardedRef, onLayout, pointerEvents, ...viewProps }) {
+	const { onClick, ...props } = viewProps;
+	const wrapperProps = {
+		onLayout,
+		onClick,
+		pointerEvents
+	};
+	const imageProps = {
+		...props,
+		pointerEvents: pointerEvents === "box-none" ? "none" : void 0
+	};
+	const resolvedTintColor = tintColor != null ? tintColor : tintColorFromStyle(style);
+	if (fallback) {
+		const cleanedSource = typeof source === "number" ? source : withoutCache(source);
+		const resolvedSource = react_native.Image.resolveAssetSource(cleanedSource);
+		return /* @__PURE__ */ react.default.createElement(react_native.View, {
+			style: [styles.imageContainer, style],
+			...wrapperProps,
+			ref: forwardedRef
+		}, /* @__PURE__ */ react.default.createElement(react_native.Image, {
+			...imageProps,
+			style: [styles.fallbackImage, { tintColor: resolvedTintColor }],
+			source: resolvedSource,
+			defaultSource,
+			onLoadStart,
+			onProgress,
+			onLoad,
+			onError,
+			onLoadEnd,
+			resizeMode
+		}), children);
+	}
+	const resolvedSource = react_native.Image.resolveAssetSource(source);
+	const resolvedDefaultSource = resolveDefaultSource(defaultSource);
+	return /* @__PURE__ */ react.default.createElement(react_native.View, {
+		style: [styles.imageContainer, style],
+		...wrapperProps,
+		ref: forwardedRef
+	}, /* @__PURE__ */ react.default.createElement(FastImageView, {
+		...imageProps,
+		tintColor: resolvedTintColor,
+		style: react_native.StyleSheet.absoluteFill,
+		source: resolvedSource,
+		defaultSource: resolvedDefaultSource,
+		onFastImageLoadStart: onLoadStart,
+		onFastImageProgress: onProgress,
+		onFastImageLoad: onLoad,
+		onFastImageError: onError,
+		onFastImageLoadEnd: onLoadEnd,
+		resizeMode
+	}), children);
 }
-
-const FastImageMemo = /*#__PURE__*/React.memo(FastImageBase);
-const FastImageComponent = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/React__default['default'].createElement(FastImageMemo, _extends__default['default']({
-  forwardedRef: ref
-}, props)));
-FastImageComponent.displayName = 'FastImage';
+const FastImageMemo = (0, react.memo)(FastImageBase);
+const FastImageComponent = (0, react.forwardRef)((props, ref) => /* @__PURE__ */ react.default.createElement(FastImageMemo, {
+	forwardedRef: ref,
+	...props
+}));
+FastImageComponent.displayName = "FastImage";
 const FastImage = FastImageComponent;
 FastImage.resizeMode = resizeMode;
 FastImage.cacheControl = cacheControl;
 FastImage.priority = priority;
-
-FastImage.preload = sources => reactNative.NativeModules.FastImageView.preload(sources);
-
-FastImage.clearMemoryCache = () => reactNative.NativeModules.FastImageView.clearMemoryCache();
-
-FastImage.clearDiskCache = () => reactNative.NativeModules.FastImageView.clearDiskCache();
-
-const styles = reactNative.StyleSheet.create({
-  // React Native's Image sizes itself from a require()d source's width and
-  // height unless the style sets them, which would override absoluteFill.
-  fallbackImage: {
-    position: 'absolute',
-    top: 0,
-    left: 0,
-    width: '100%',
-    height: '100%'
-  },
-  imageContainer: {
-    overflow: 'hidden'
-  }
-}); // Types of requireNativeComponent are not correct.
-
-const FastImageView = reactNative.requireNativeComponent('FastImageView', FastImage, {
-  nativeOnly: {
-    onFastImageLoadStart: true,
-    onFastImageProgress: true,
-    onFastImageLoad: true,
-    onFastImageError: true,
-    onFastImageLoadEnd: true
-  }
+FastImage.preload = (sources) => react_native.NativeModules.FastImageView.preload(sources);
+FastImage.clearMemoryCache = () => react_native.NativeModules.FastImageView.clearMemoryCache();
+FastImage.clearDiskCache = () => react_native.NativeModules.FastImageView.clearDiskCache();
+const styles = react_native.StyleSheet.create({
+	fallbackImage: {
+		position: "absolute",
+		top: 0,
+		left: 0,
+		width: "100%",
+		height: "100%"
+	},
+	imageContainer: { overflow: "hidden" }
 });
-
+const FastImageView = (0, react_native.requireNativeComponent)("FastImageView", FastImage, { nativeOnly: {
+	onFastImageLoadStart: true,
+	onFastImageProgress: true,
+	onFastImageLoad: true,
+	onFastImageError: true,
+	onFastImageLoadEnd: true
+} });
+//#endregion
 module.exports = FastImage;

package/dist/index.d.ts

@@ -1,26 +1,26 @@
 import React from 'react';
 import { LayoutChangeEvent, StyleProp, ViewStyle, ImageRequireSource, AccessibilityProps, ViewProps } from 'react-native';
-declare type ColorValue = NonNullable<ViewStyle['backgroundColor']>;
-export declare type ResizeMode = 'contain' | 'cover' | 'stretch' | 'center';
+type ColorValue = NonNullable<ViewStyle['backgroundColor']>;
+export type ResizeMode = 'contain' | 'cover' | 'stretch' | 'center';
 declare const resizeMode: {
-    readonly contain: "contain";
-    readonly cover: "cover";
-    readonly stretch: "stretch";
-    readonly center: "center";
+    readonly contain: 'contain';
+    readonly cover: 'cover';
+    readonly stretch: 'stretch';
+    readonly center: 'center';
 };
-export declare type Priority = 'low' | 'normal' | 'high';
+export type Priority = 'low' | 'normal' | 'high';
 declare const priority: {
-    readonly low: "low";
-    readonly normal: "normal";
-    readonly high: "high";
+    readonly low: 'low';
+    readonly normal: 'normal';
+    readonly high: 'high';
 };
-export declare type Cache = 'immutable' | 'web' | 'cacheOnly';
+export type Cache = 'immutable' | 'web' | 'cacheOnly';
 declare const cacheControl: {
-    readonly immutable: "immutable";
-    readonly web: "web";
-    readonly cacheOnly: "cacheOnly";
+    readonly immutable: 'immutable';
+    readonly web: 'web';
+    readonly cacheOnly: 'cacheOnly';
 };
-export declare type Source = {
+export type Source = {
     uri?: string;
     headers?: {
         [key: string]: string;
@@ -103,4 +103,3 @@ export interface FastImageStaticProperties {
 }
 declare const FastImage: React.ComponentType<FastImageProps> & FastImageStaticProperties;
 export default FastImage;
-//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,207 +1,130 @@
-import _extends from '@babel/runtime/helpers/extends';
-import React, { forwardRef, memo } from 'react';
-import { NativeModules, StyleSheet, requireNativeComponent, Image, View, Platform } from 'react-native';
-
-// from ViewStyle so the types also work with older React Native types, where
-// it's string.
-
+import React, { forwardRef, memo } from "react";
+import { Image, NativeModules, Platform, StyleSheet, View, requireNativeComponent } from "react-native";
+//#region src/index.tsx
 const resizeMode = {
-  contain: 'contain',
-  cover: 'cover',
-  stretch: 'stretch',
-  center: 'center'
+	contain: "contain",
+	cover: "cover",
+	stretch: "stretch",
+	center: "center"
 };
 const priority = {
-  low: 'low',
-  normal: 'normal',
-  high: 'high'
+	low: "low",
+	normal: "normal",
+	high: "high"
 };
 const cacheControl = {
-  // Ignore headers, use uri as cache key, fetch only if not in cache.
-  immutable: 'immutable',
-  // Respect http headers, no aggressive caching.
-  web: 'web',
-  // Only load from cache.
-  cacheOnly: 'cacheOnly'
+	immutable: "immutable",
+	web: "web",
+	cacheOnly: "cacheOnly"
+};
+const resolveDefaultSource = (defaultSource) => {
+	if (!defaultSource) return null;
+	if (Platform.OS === "android") {
+		const resolved = Image.resolveAssetSource(defaultSource);
+		if (resolved) return resolved.uri;
+		return null;
+	}
+	return defaultSource;
 };
-
-const resolveDefaultSource = defaultSource => {
-  if (!defaultSource) {
-    return null;
-  }
-
-  if (Platform.OS === 'android') {
-    // Android receives a URI string, and resolves into a Drawable using RN's methods.
-    const resolved = Image.resolveAssetSource(defaultSource);
-
-    if (resolved) {
-      return resolved.uri;
-    }
-
-    return null;
-  } // iOS or other number mapped assets
-  // In iOS the number is passed, and bridged automatically into a UIImage
-
-
-  return defaultSource;
-}; // Finds tintColor in a style prop, where the last style that sets it wins, as
-// with StyleSheet.flatten, but without flattening (which allocates a merged
-// object for an array style on every render).
-
-
 function tintColorFromStyle(style) {
-  if (Array.isArray(style)) {
-    for (let i = style.length - 1; i >= 0; i--) {
-      const found = tintColorFromStyle(style[i]);
-      if (found !== undefined) return found;
-    }
-
-    return undefined;
-  }
-
-  if (typeof style === 'number') {
-    // A registered style from StyleSheet.create on older React Native.
-    const flattened = StyleSheet.flatten(style);
-    return flattened ? flattened.tintColor : undefined;
-  }
-
-  return style && typeof style === 'object' ? style.tintColor : undefined;
-} // A copy of the source without `cache`.
-
-
+	if (Array.isArray(style)) {
+		for (let i = style.length - 1; i >= 0; i--) {
+			const found = tintColorFromStyle(style[i]);
+			if (found !== void 0) return found;
+		}
+		return;
+	}
+	if (typeof style === "number") {
+		const flattened = StyleSheet.flatten(style);
+		return flattened ? flattened.tintColor : void 0;
+	}
+	return style && typeof style === "object" ? style.tintColor : void 0;
+}
 function withoutCache(source) {
-  const {
-    cache: _cache,
-    ...rest
-  } = source || {};
-  return rest;
+	const { cache: _cache, ...rest } = source || {};
+	return rest;
 }
-
-function FastImageBase({
-  source,
-  defaultSource,
-  tintColor,
-  onLoadStart,
-  onProgress,
-  onLoad,
-  onError,
-  onLoadEnd,
-  style,
-  fallback,
-  children,
-  resizeMode = 'cover',
-  forwardedRef,
-  // On the wrapper, so the layout is relative to the parent (the image view
-  // inside always has x and y of 0).
-  onLayout,
-  // On the wrapper, which would otherwise still take touches. With
-  // 'box-none' the image is part of the box, so it ignores touches too.
-  pointerEvents,
-  ...viewProps
-}) {
-  // Touchables pass onClick to their child (React Native 0.73+, for
-  // accessibility clicks). It goes on the wrapper: the image view doesn't
-  // support it on iOS, which crashed (#1020). Older React Native types don't
-  // include it.
-  const {
-    onClick,
-    ...props
-  } = viewProps;
-  const wrapperProps = {
-    onLayout,
-    onClick,
-    pointerEvents
-  };
-  const imageProps = { ...props,
-    pointerEvents: pointerEvents === 'box-none' ? 'none' : undefined
-  }; // tintColor can also be set in style, as with React Native's Image. The
-  // prop wins.
-
-  const resolvedTintColor = tintColor != null ? tintColor : tintColorFromStyle(style);
-
-  if (fallback) {
-    // Remove `cache`, which React Native's Image doesn't support. A
-    // require()d source is a number: pass it through (spreading it gave {}).
-    const cleanedSource = typeof source === 'number' ? source : withoutCache(source);
-    const resolvedSource = Image.resolveAssetSource(cleanedSource);
-    return /*#__PURE__*/React.createElement(View, _extends({
-      style: [styles.imageContainer, style]
-    }, wrapperProps, {
-      ref: forwardedRef
-    }), /*#__PURE__*/React.createElement(Image, _extends({}, imageProps, {
-      style: [styles.fallbackImage, {
-        tintColor: resolvedTintColor
-      }],
-      source: resolvedSource,
-      defaultSource: defaultSource,
-      onLoadStart: onLoadStart,
-      onProgress: onProgress,
-      onLoad: onLoad,
-      onError: onError,
-      onLoadEnd: onLoadEnd,
-      resizeMode: resizeMode
-    })), children);
-  }
-
-  const resolvedSource = Image.resolveAssetSource(source);
-  const resolvedDefaultSource = resolveDefaultSource(defaultSource);
-  return /*#__PURE__*/React.createElement(View, _extends({
-    style: [styles.imageContainer, style]
-  }, wrapperProps, {
-    ref: forwardedRef
-  }), /*#__PURE__*/React.createElement(FastImageView, _extends({}, imageProps, {
-    tintColor: resolvedTintColor,
-    style: StyleSheet.absoluteFill,
-    source: resolvedSource,
-    defaultSource: resolvedDefaultSource,
-    onFastImageLoadStart: onLoadStart,
-    onFastImageProgress: onProgress,
-    onFastImageLoad: onLoad,
-    onFastImageError: onError,
-    onFastImageLoadEnd: onLoadEnd,
-    resizeMode: resizeMode
-  })), children);
+function FastImageBase({ source, defaultSource, tintColor, onLoadStart, onProgress, onLoad, onError, onLoadEnd, style, fallback, children, resizeMode = "cover", forwardedRef, onLayout, pointerEvents, ...viewProps }) {
+	const { onClick, ...props } = viewProps;
+	const wrapperProps = {
+		onLayout,
+		onClick,
+		pointerEvents
+	};
+	const imageProps = {
+		...props,
+		pointerEvents: pointerEvents === "box-none" ? "none" : void 0
+	};
+	const resolvedTintColor = tintColor != null ? tintColor : tintColorFromStyle(style);
+	if (fallback) {
+		const cleanedSource = typeof source === "number" ? source : withoutCache(source);
+		const resolvedSource = Image.resolveAssetSource(cleanedSource);
+		return /* @__PURE__ */ React.createElement(View, {
+			style: [styles.imageContainer, style],
+			...wrapperProps,
+			ref: forwardedRef
+		}, /* @__PURE__ */ React.createElement(Image, {
+			...imageProps,
+			style: [styles.fallbackImage, { tintColor: resolvedTintColor }],
+			source: resolvedSource,
+			defaultSource,
+			onLoadStart,
+			onProgress,
+			onLoad,
+			onError,
+			onLoadEnd,
+			resizeMode
+		}), children);
+	}
+	const resolvedSource = Image.resolveAssetSource(source);
+	const resolvedDefaultSource = resolveDefaultSource(defaultSource);
+	return /* @__PURE__ */ React.createElement(View, {
+		style: [styles.imageContainer, style],
+		...wrapperProps,
+		ref: forwardedRef
+	}, /* @__PURE__ */ React.createElement(FastImageView, {
+		...imageProps,
+		tintColor: resolvedTintColor,
+		style: StyleSheet.absoluteFill,
+		source: resolvedSource,
+		defaultSource: resolvedDefaultSource,
+		onFastImageLoadStart: onLoadStart,
+		onFastImageProgress: onProgress,
+		onFastImageLoad: onLoad,
+		onFastImageError: onError,
+		onFastImageLoadEnd: onLoadEnd,
+		resizeMode
+	}), children);
 }
-
-const FastImageMemo = /*#__PURE__*/memo(FastImageBase);
-const FastImageComponent = /*#__PURE__*/forwardRef((props, ref) => /*#__PURE__*/React.createElement(FastImageMemo, _extends({
-  forwardedRef: ref
-}, props)));
-FastImageComponent.displayName = 'FastImage';
+const FastImageMemo = memo(FastImageBase);
+const FastImageComponent = forwardRef((props, ref) => /* @__PURE__ */ React.createElement(FastImageMemo, {
+	forwardedRef: ref,
+	...props
+}));
+FastImageComponent.displayName = "FastImage";
 const FastImage = FastImageComponent;
 FastImage.resizeMode = resizeMode;
 FastImage.cacheControl = cacheControl;
 FastImage.priority = priority;
-
-FastImage.preload = sources => NativeModules.FastImageView.preload(sources);
-
+FastImage.preload = (sources) => NativeModules.FastImageView.preload(sources);
 FastImage.clearMemoryCache = () => NativeModules.FastImageView.clearMemoryCache();
-
 FastImage.clearDiskCache = () => NativeModules.FastImageView.clearDiskCache();
-
 const styles = StyleSheet.create({
-  // React Native's Image sizes itself from a require()d source's width and
-  // height unless the style sets them, which would override absoluteFill.
-  fallbackImage: {
-    position: 'absolute',
-    top: 0,
-    left: 0,
-    width: '100%',
-    height: '100%'
-  },
-  imageContainer: {
-    overflow: 'hidden'
-  }
-}); // Types of requireNativeComponent are not correct.
-
-const FastImageView = requireNativeComponent('FastImageView', FastImage, {
-  nativeOnly: {
-    onFastImageLoadStart: true,
-    onFastImageProgress: true,
-    onFastImageLoad: true,
-    onFastImageError: true,
-    onFastImageLoadEnd: true
-  }
+	fallbackImage: {
+		position: "absolute",
+		top: 0,
+		left: 0,
+		width: "100%",
+		height: "100%"
+	},
+	imageContainer: { overflow: "hidden" }
 });
-
-export default FastImage;
+const FastImageView = requireNativeComponent("FastImageView", FastImage, { nativeOnly: {
+	onFastImageLoadStart: true,
+	onFastImageProgress: true,
+	onFastImageLoad: true,
+	onFastImageError: true,
+	onFastImageLoadEnd: true
+} });
+//#endregion
+export { FastImage as default };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-fast-image",
-    "version": "8.6.30",
+    "version": "8.6.32",
     "description": "🚩 FastImage, performant React Native image component.",
     "keywords": [
         "cache",
@@ -23,48 +23,43 @@
     "module": "dist/index.js",
     "typings": "dist/index.d.ts",
     "files": [
-        "android",
-        "!android/build",
-        "ios",
-        "!ios/build",
+        "android/build.gradle",
+        "android/src/main",
+        "ios/FastImage",
+        "ios/FastImage.xcodeproj/project.pbxproj",
+        "ios/FastImage.xcodeproj/xcshareddata",
         "dist",
         "RNFastImage.podspec"
     ],
     "scripts": {
-        "build": "dv-scripts build && cp src/index.js.flow dist/index.js.flow && cp src/index.js.flow dist/index.cjs.js.flow",
+        "build": "rm -rf dist && tsc -p tsconfig.build.json && rolldown -c && cp src/index.js.flow dist/index.js.flow && cp src/index.js.flow dist/index.cjs.js.flow",
         "lint": "oxlint",
-        "release": "dv-scripts release",
-        "test": "dv-scripts test",
+        "release": "semantic-release",
+        "test": "bun test",
+        "typecheck": "tsc -p tsconfig.json",
         "format": "oxfmt",
         "format:check": "oxfmt --check"
     },
     "packageManager": "bun@1.4.2",
-    "jest": {
-        "modulePathIgnorePatterns": [
-            "ReactNativeFastImageExample*",
-            "ReactNativeFastImageExampleServer*"
-        ],
-        "preset": "react-native"
-    },
     "resolutions": {
-        "@jest/create-cache-key-function": "^27"
+        "@types/react": "^17.0.14"
     },
     "devDependencies": {
-        "@babel/core": "^7.14.6",
-        "@babel/runtime": "^7.14.6",
-        "@types/jest": "^26.0.24",
+        "@semantic-release/changelog": "7.0.0",
+        "@semantic-release/git": "11.0.1",
+        "@types/bun": "^1.4.2",
         "@types/react": "^17.0.14",
         "@types/react-native": "^0.69.5",
         "@types/react-test-renderer": "^17.0.1",
-        "dv-scripts": "^1.6.0",
         "maestro-runner": "1.1.27",
-        "metro-react-native-babel-preset": "^0.66.1",
         "oxfmt": "0.70.0",
         "oxlint": "1.85.0",
+        "pretty-format": "^30.5.1",
         "react": "17.0.2",
-        "react-native": "0.64.2",
         "react-test-renderer": "17.0.2",
-        "typescript": "^4.3.5"
+        "rolldown": "1.2.11",
+        "semantic-release": "25.0.9",
+        "typescript": "7.0.2"
     },
     "peerDependencies": {
         "react": "^17 || ^18 || ^19",

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}

package/dist/index.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.test.d.ts.map

package/dist/index.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../src/index.test.tsx"],"names":[],"mappings":""}