react-native-fast-image 8.6.33 → 8.6.35

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

@@ -0,0 +1,45 @@
+package com.dylanvann.fastimage;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
+
+// An event for a FastImage view, sent with the EventDispatcher (see
+// FastImageEvents) instead of the RCTEventEmitter JS module, which the New
+// Architecture warns about on every event.
+class FastImageEvent extends Event<FastImageEvent> {
+    private final String name;
+    private final WritableMap data;
+
+    // Event(viewTag) works back to React Native 0.60. Without a surface id,
+    // Fabric finds the view by its tag.
+    @SuppressWarnings("deprecation")
+    FastImageEvent(int viewTag, String name, WritableMap data) {
+        super(viewTag);
+        this.name = name;
+        this.data = data;
+    }
+
+    @Override
+    public String getEventName() {
+        return name;
+    }
+
+    // Every event reaches JS, e.g. each progress update, as before.
+    @Override
+    public boolean canCoalesce() {
+        return false;
+    }
+
+    // Overrides Event.getEventData on React Native 0.65+ (not on older ones,
+    // hence no @Override).
+    protected WritableMap getEventData() {
+        return data;
+    }
+
+    @Override
+    @SuppressWarnings("deprecation")
+    public void dispatch(RCTEventEmitter rctEventEmitter) {
+        rctEventEmitter.receiveEvent(getViewTag(), name, data);
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.dylanvann.fastimage;
+
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.events.EventDispatcher;
+
+import java.lang.reflect.Method;
+
+// Sends FastImage view events through React Native's EventDispatcher.
+final class FastImageEvents {
+    // UIManagerHelper.getEventDispatcherForReactTag (React Native 0.63+, also
+    // bridgeless). Looked up by reflection so older versions still compile.
+    @Nullable
+    private static final Method GET_EVENT_DISPATCHER = findGetEventDispatcher();
+
+    private FastImageEvents() {
+    }
+
+    static void send(View view, String name) {
+        send(view, name, Arguments.createMap());
+    }
+
+    static void send(View view, String name, WritableMap data) {
+        ReactContext context = FastImageViewManager.getReactContext(view.getContext());
+        if (context == null) return;
+        EventDispatcher dispatcher = eventDispatcher(context, view.getId());
+        if (dispatcher != null) {
+            dispatcher.dispatchEvent(new FastImageEvent(view.getId(), name, data));
+        }
+    }
+
+    @Nullable
+    private static EventDispatcher eventDispatcher(ReactContext context, int viewTag) {
+        if (GET_EVENT_DISPATCHER != null) {
+            try {
+                return (EventDispatcher) GET_EVENT_DISPATCHER.invoke(null, context, viewTag);
+            } catch (Exception ignored) {
+                // Fall back to the UIManagerModule's.
+            }
+        }
+        UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
+        return uiManager == null ? null : uiManager.getEventDispatcher();
+    }
+
+    @Nullable
+    private static Method findGetEventDispatcher() {
+        try {
+            return Class.forName("com.facebook.react.uimanager.UIManagerHelper")
+                    .getMethod("getEventDispatcherForReactTag", ReactContext.class, int.class);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}

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

@@ -11,8 +11,6 @@ import com.bumptech.glide.request.target.ImageViewTarget;
 import com.bumptech.glide.request.target.Target;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 public class FastImageRequestListener implements RequestListener<Drawable> {
     static final String REACT_ON_ERROR_EVENT = "onFastImageError";
@@ -33,14 +31,8 @@ public class FastImageRequestListener implements RequestListener<Drawable> {
             return false;
         }
         FastImageViewWithUrl view = (FastImageViewWithUrl) ((ImageViewTarget) target).getView();
-        ReactContext context = FastImageViewManager.getReactContext(view.getContext());
-        if (context == null) {
-            return false;
-        }
-        RCTEventEmitter eventEmitter = context.getJSModule(RCTEventEmitter.class);
-        int viewId = view.getId();
-        eventEmitter.receiveEvent(viewId, REACT_ON_ERROR_EVENT, new WritableNativeMap());
-        eventEmitter.receiveEvent(viewId, REACT_ON_LOAD_END_EVENT, new WritableNativeMap());
+        FastImageEvents.send(view, REACT_ON_ERROR_EVENT);
+        FastImageEvents.send(view, REACT_ON_LOAD_END_EVENT);
         return false;
     }
 
@@ -70,16 +62,10 @@ public class FastImageRequestListener implements RequestListener<Drawable> {
     }
 
     private static void sendLoad(FastImageViewWithUrl view, int[] size) {
-        ReactContext context = FastImageViewManager.getReactContext(view.getContext());
-        if (context == null) {
-            return;
-        }
-        RCTEventEmitter eventEmitter = context.getJSModule(RCTEventEmitter.class);
-        int viewId = view.getId();
         WritableMap event = new WritableNativeMap();
         event.putInt("width", size[0]);
         event.putInt("height", size[1]);
-        eventEmitter.receiveEvent(viewId, REACT_ON_LOAD_EVENT, event);
-        eventEmitter.receiveEvent(viewId, REACT_ON_LOAD_END_EVENT, new WritableNativeMap());
+        FastImageEvents.send(view, REACT_ON_LOAD_EVENT, event);
+        FastImageEvents.send(view, REACT_ON_LOAD_END_EVENT);
     }
 }

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

@@ -23,7 +23,6 @@ import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
 
 import java.util.List;
@@ -39,9 +38,6 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
     static final String REACT_ON_PROGRESS_EVENT = "onFastImageProgress";
     private static final Map<String, List<FastImageViewWithUrl>> VIEWS_FOR_URLS = new WeakHashMap<>();
 
-    @Nullable
-    private RequestManager requestManager = null;
-
     @NonNull
     @Override
     public String getName() {
@@ -51,6 +47,10 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
     @NonNull
     @Override
     protected FastImageViewWithUrl createViewInstance(@NonNull ThemedReactContext reactContext) {
+        // Each view keeps the RequestManager for its own Activity. A single one
+        // shared by all views kept the last view's Activity alive after it was
+        // destroyed, and gave views another Activity's manager (#492).
+        RequestManager requestManager = null;
         if (isValidContextForGlide(reactContext)) {
             requestManager = Glide.with(reactContext);
         } else if (getActivityFromContext(reactContext) == null) {
@@ -60,7 +60,7 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
             requestManager = Glide.with(reactContext.getApplicationContext());
         }
 
-        return new FastImageViewWithUrl(reactContext);
+        return new FastImageViewWithUrl(reactContext, requestManager);
     }
 
     @ReactProp(name = "source")
@@ -93,7 +93,7 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
     @Override
     public void onDropViewInstance(@NonNull FastImageViewWithUrl view) {
         // This will cancel existing requests.
-        view.clearView(requestManager);
+        view.clearView(view.requestManager);
 
         // Same key as when the view was tracked (toStringUrl, not toString,
         // which differ for urls that need escaping).
@@ -121,11 +121,7 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
                 WritableMap event = new WritableNativeMap();
                 event.putInt("loaded", (int) bytesRead);
                 event.putInt("total", (int) expectedLength);
-                ReactContext context = getReactContext(view.getContext());
-                if (context == null) continue;
-                RCTEventEmitter eventEmitter = context.getJSModule(RCTEventEmitter.class);
-                int viewId = view.getId();
-                eventEmitter.receiveEvent(viewId, REACT_ON_PROGRESS_EVENT, event);
+                FastImageEvents.send(view, REACT_ON_PROGRESS_EVENT, event);
             }
         }
     }
@@ -206,6 +202,6 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
     @Override
     protected void onAfterUpdateTransaction(@NonNull FastImageViewWithUrl view) {
         super.onAfterUpdateTransaction(view);
-        view.onAfterUpdate(this, requestManager, VIEWS_FOR_URLS);
+        view.onAfterUpdate(this, view.requestManager, VIEWS_FOR_URLS);
     }
 }

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

@@ -18,8 +18,6 @@ import com.bumptech.glide.request.Request;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,9 +32,13 @@ class FastImageViewWithUrl extends AppCompatImageView {
     private Drawable mDefaultSource = null;
 
     public GlideUrl glideUrl;
+    // Null when the view was created in a destroyed Activity (nothing loads).
+    @Nullable
+    final RequestManager requestManager;
 
-    public FastImageViewWithUrl(Context context) {
+    public FastImageViewWithUrl(Context context, @Nullable RequestManager requestManager) {
         super(context);
+        this.requestManager = requestManager;
     }
 
     public void setSource(@Nullable ReadableMap source) {
@@ -97,15 +99,10 @@ class FastImageViewWithUrl extends AppCompatImageView {
         // resolved: fire onError and onLoadEnd and show defaultSource, as on iOS
         // (#1028, #945).
         if (mSource != null && (imageSource == null || imageSource.getUri().toString().length() == 0)) {
-            ReactContext context = FastImageViewManager.getReactContext(getContext());
-            if (context != null) {
-                RCTEventEmitter eventEmitter = context.getJSModule(RCTEventEmitter.class);
-                int viewId = getId();
-                WritableMap event = new WritableNativeMap();
-                event.putString("message", "Invalid source prop:" + mSource);
-                eventEmitter.receiveEvent(viewId, REACT_ON_ERROR_EVENT, event);
-                eventEmitter.receiveEvent(viewId, REACT_ON_LOAD_END_EVENT, new WritableNativeMap());
-            }
+            WritableMap event = new WritableNativeMap();
+            event.putString("message", "Invalid source prop:" + mSource);
+            FastImageEvents.send(this, REACT_ON_ERROR_EVENT, event);
+            FastImageEvents.send(this, REACT_ON_LOAD_END_EVENT);
 
             // Cancel existing requests.
             clearView(requestManager);
@@ -140,15 +137,9 @@ class FastImageViewWithUrl extends AppCompatImageView {
             }
         }
 
-        ReactContext reactContext = FastImageViewManager.getReactContext(getContext());
-        if (imageSource != null && reactContext != null) {
+        if (imageSource != null) {
             // This is an orphan even without a load/loadend when only loading a placeholder
-            RCTEventEmitter eventEmitter = reactContext.getJSModule(RCTEventEmitter.class);
-            int viewId = this.getId();
-
-            eventEmitter.receiveEvent(viewId,
-                    FastImageViewManager.REACT_ON_LOAD_START_EVENT,
-                    new WritableNativeMap());
+            FastImageEvents.send(this, FastImageViewManager.REACT_ON_LOAD_START_EVENT);
         }
 
         if (requestManager != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-fast-image",
-    "version": "8.6.33",
+    "version": "8.6.35",
     "description": "🚩 FastImage, performant React Native image component.",
     "keywords": [
         "cache",
@@ -15,7 +15,7 @@
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/DylanVann/react-native-fast-image.git"
+        "url": "git+https://github.com/DylanVann/react-native-fast-image.git"
     },
     "license": "(MIT AND Apache-2.0)",
     "author": "Dylan Vann <dylan@dylanvann.com> (https://dylanvann.com)",