react-native-fast-image 9.0.1 → 9.0.3

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

@@ -23,10 +23,12 @@ import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.PointerEvents;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.WeakHashMap;
 
@@ -82,6 +84,16 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
                         .getResourceDrawable(view.getContext(), source));
     }
 
+    // React Native's View manager handles pointerEvents; a SimpleViewManager
+    // doesn't. Parsed here: PointerEvents.parsePointerEvents isn't in every
+    // supported React Native version.
+    @ReactProp(name = "pointerEvents")
+    public void setPointerEvents(FastImageViewWithUrl view, @Nullable String pointerEvents) {
+        view.setPointerEvents(pointerEvents == null
+                ? PointerEvents.AUTO
+                : PointerEvents.valueOf(pointerEvents.toUpperCase(Locale.US).replace('-', '_')));
+    }
+
     @ReactProp(name = "tintColor", customType = "Color")
     public void setTintColor(FastImageViewWithUrl view, @Nullable Integer color) {
         if (color == null) {

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

@@ -43,6 +43,8 @@ import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.uimanager.PointerEvents;
+import com.facebook.react.uimanager.ReactPointerEventsView;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -51,7 +53,7 @@ import java.util.Map;
 
 import javax.annotation.Nonnull;
 
-class FastImageViewWithUrl extends AppCompatImageView {
+class FastImageViewWithUrl extends AppCompatImageView implements ReactPointerEventsView {
     private boolean mNeedsReload = false;
     private ReadableMap mSource = null;
     private Drawable mDefaultSource = null;
@@ -66,6 +68,20 @@ class FastImageViewWithUrl extends AppCompatImageView {
         this.requestManager = requestManager;
     }
 
+    // FastImage sends "none" when it has pointerEvents="box-none" (the image
+    // is part of the box, which doesn't take touches). React Native's touch
+    // handling only reads pointerEvents from a ReactPointerEventsView.
+    private PointerEvents mPointerEvents = PointerEvents.AUTO;
+
+    @Override
+    public PointerEvents getPointerEvents() {
+        return mPointerEvents;
+    }
+
+    void setPointerEvents(PointerEvents pointerEvents) {
+        mPointerEvents = pointerEvents;
+    }
+
     public void setSource(@Nullable ReadableMap source) {
         mNeedsReload = true;
         mPropSource = source;

package/dist/index.cjs.js

@@ -111,13 +111,31 @@ function withoutCache(source) {
 	const { cache: _cache, ...rest } = source || {};
 	return rest;
 }
-function FastImageBase({ source, defaultSource, tintColor, onLoadStart, onProgress, onLoad, onError, onLoadEnd, style, fallback, children, resizeMode = "cover", loop, transition, forwardedRef, onLayout, pointerEvents, ...viewProps }) {
+function FastImageBase({ source, defaultSource, tintColor, onLoadStart, onProgress, onLoad, onError, onLoadEnd, style, fallback, children, resizeMode = "cover", loop, transition, forwardedRef, onLayout, pointerEvents, hitSlop, onStartShouldSetResponder, onStartShouldSetResponderCapture, onMoveShouldSetResponder, onMoveShouldSetResponderCapture, onResponderGrant, onResponderReject, onResponderStart, onResponderMove, onResponderEnd, onResponderRelease, onResponderTerminationRequest, onResponderTerminate, onTouchStart, onTouchMove, onTouchEnd, onTouchCancel, onTouchEndCapture, ...viewProps }) {
 	const { onClick, ...props } = viewProps;
 	const fallbackResult = (0, react.useRef)(void 0);
 	const wrapperProps = {
 		onLayout,
 		onClick,
-		pointerEvents
+		pointerEvents,
+		hitSlop,
+		onStartShouldSetResponder,
+		onStartShouldSetResponderCapture,
+		onMoveShouldSetResponder,
+		onMoveShouldSetResponderCapture,
+		onResponderGrant,
+		onResponderReject,
+		onResponderStart,
+		onResponderMove,
+		onResponderEnd,
+		onResponderRelease,
+		onResponderTerminationRequest,
+		onResponderTerminate,
+		onTouchStart,
+		onTouchMove,
+		onTouchEnd,
+		onTouchCancel,
+		onTouchEndCapture
 	};
 	const imageProps = {
 		...props,
@@ -248,7 +266,6 @@ const styles = react_native.StyleSheet.create({
 	},
 	imageContainer: { overflow: "hidden" }
 });
-const FastImageWithRef = FastImageComponent;
 /**
 * An image with content on top of it, like React Native's `ImageBackground`: a
 * view that the image fills, with the children on top. Use it rather than
@@ -261,7 +278,7 @@ const FastImageBackground = (0, react.forwardRef)(({ style, imageStyle, imageRef
 	importantForAccessibility,
 	style,
 	ref
-}, /* @__PURE__ */ react.default.createElement(FastImageWithRef, {
+}, /* @__PURE__ */ react.default.createElement(FastImageComponent, {
 	...props,
 	importantForAccessibility,
 	style: [react_native.StyleSheet.absoluteFill, imageStyle],

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ColorValue, StyleProp, ViewStyle, ImageRequireSource, AccessibilityProps, ViewProps } from 'react-native';
+import { ColorValue, View, StyleProp, ViewStyle, ImageRequireSource, AccessibilityProps, ViewProps } from 'react-native';
 import { cacheControl, priority, resizeMode } from './constants';
 /** How the image fits the view: see [`resizeMode`](#resizemode). */
 export type ResizeMode = 'contain' | 'cover' | 'stretch' | 'center' | 'repeat';
@@ -499,6 +499,7 @@ export interface FastImageProps extends AccessibilityProps, ViewProps {
      */
     children?: React.ReactNode;
 }
+type ViewRef = React.ElementRef<typeof View>;
 /** A preloaded source that loaded (and is now cached). */
 export interface PreloadSuccess {
     /** The source's uri. */
@@ -556,7 +557,7 @@ export interface FastImageStaticProperties {
      */
     configureCache: (limits?: CacheLimits) => Promise<CacheState>;
 }
-declare const FastImage: React.ComponentType<FastImageProps> & FastImageStaticProperties;
+declare const FastImage: React.ForwardRefExoticComponent<FastImageProps & React.RefAttributes<ViewRef>> & FastImageStaticProperties;
 export interface FastImageBackgroundProps extends Omit<FastImageProps, 'style' | 'children'> {
     /** The container's style; the image fills it. */
     style?: StyleProp<ViewStyle>;
@@ -574,5 +575,5 @@ export interface FastImageBackgroundProps extends Omit<FastImageProps, 'style' |
  * (the image will be a single native view). The other props go to the image;
  * the ref is the view's.
  */
-export declare const FastImageBackground: React.ComponentType<FastImageBackgroundProps>;
+export declare const FastImageBackground: React.ForwardRefExoticComponent<FastImageBackgroundProps & React.RefAttributes<ViewRef>>;
 export default FastImage;

package/dist/index.js

@@ -84,13 +84,31 @@ function withoutCache(source) {
 	const { cache: _cache, ...rest } = source || {};
 	return rest;
 }
-function FastImageBase({ source, defaultSource, tintColor, onLoadStart, onProgress, onLoad, onError, onLoadEnd, style, fallback, children, resizeMode = "cover", loop, transition, forwardedRef, onLayout, pointerEvents, ...viewProps }) {
+function FastImageBase({ source, defaultSource, tintColor, onLoadStart, onProgress, onLoad, onError, onLoadEnd, style, fallback, children, resizeMode = "cover", loop, transition, forwardedRef, onLayout, pointerEvents, hitSlop, onStartShouldSetResponder, onStartShouldSetResponderCapture, onMoveShouldSetResponder, onMoveShouldSetResponderCapture, onResponderGrant, onResponderReject, onResponderStart, onResponderMove, onResponderEnd, onResponderRelease, onResponderTerminationRequest, onResponderTerminate, onTouchStart, onTouchMove, onTouchEnd, onTouchCancel, onTouchEndCapture, ...viewProps }) {
 	const { onClick, ...props } = viewProps;
 	const fallbackResult = useRef(void 0);
 	const wrapperProps = {
 		onLayout,
 		onClick,
-		pointerEvents
+		pointerEvents,
+		hitSlop,
+		onStartShouldSetResponder,
+		onStartShouldSetResponderCapture,
+		onMoveShouldSetResponder,
+		onMoveShouldSetResponderCapture,
+		onResponderGrant,
+		onResponderReject,
+		onResponderStart,
+		onResponderMove,
+		onResponderEnd,
+		onResponderRelease,
+		onResponderTerminationRequest,
+		onResponderTerminate,
+		onTouchStart,
+		onTouchMove,
+		onTouchEnd,
+		onTouchCancel,
+		onTouchEndCapture
 	};
 	const imageProps = {
 		...props,
@@ -221,7 +239,6 @@ const styles = StyleSheet.create({
 	},
 	imageContainer: { overflow: "hidden" }
 });
-const FastImageWithRef = FastImageComponent;
 /**
 * An image with content on top of it, like React Native's `ImageBackground`: a
 * view that the image fills, with the children on top. Use it rather than
@@ -234,7 +251,7 @@ const FastImageBackground = forwardRef(({ style, imageStyle, imageRef, children,
 	importantForAccessibility,
 	style,
 	ref
-}, /* @__PURE__ */ React.createElement(FastImageWithRef, {
+}, /* @__PURE__ */ React.createElement(FastImageComponent, {
 	...props,
 	importantForAccessibility,
 	style: [StyleSheet.absoluteFill, imageStyle],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-fast-image",
-    "version": "9.0.1",
+    "version": "9.0.3",
     "description": "FastImage, performant React Native image component.",
     "keywords": [
         "cache",