@applicaster/quick-brick-core 17.0.0-alpha.1984136194 → 17.0.0-alpha.2451166845

package/App/DeepLinking/URLSchemeListener/__tests__/URLSchemeListenerReplacement.test.tsx

@@ -0,0 +1,103 @@
+import * as React from "react";
+import { Text } from "react-native";
+import { act, render } from "@testing-library/react-native";
+
+import { URLSchemeListener } from "../index";
+import { URLSchemeContext } from "../URLSchemeContextProvider";
+
+const mockMounts: string[] = [];
+const mockFinishers: Record<string, (callback?: unknown) => void> = {};
+
+jest.mock("../../URLSchemeHandler", () => {
+  const React = require("react");
+
+  return {
+    URLSchemeHandler: ({ url, onFinish }) => {
+      // Mirrors the real scheme handlers: work starts once, on mount.
+      React.useEffect(() => {
+        mockMounts.push(url);
+        mockFinishers[url] = onFinish;
+        // eslint-disable-next-line @wogns3623/better-exhaustive-deps/exhaustive-deps
+      }, []);
+
+      return null;
+    },
+  };
+});
+
+jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
+  useNavigation: () => ({ startUpHooks: null }),
+}));
+
+jest.mock("@applicaster/zapp-react-native-redux/hooks", () => ({
+  useAppSelector: () => true,
+}));
+
+const URL_A = "pureflix://open?feed_locator=a&id=1";
+const URL_B = "pureflix://open?feed_locator=b&id=2";
+
+const tree = (url: string | null, done: () => void) => (
+  <URLSchemeContext.Provider value={{ url, done }}>
+    <URLSchemeListener>
+      <Text>app</Text>
+    </URLSchemeListener>
+  </URLSchemeContext.Provider>
+);
+
+describe("URLSchemeListener - deep link replaced while being handled", () => {
+  beforeEach(() => {
+    mockMounts.length = 0;
+    Object.keys(mockFinishers).forEach((key) => delete mockFinishers[key]);
+  });
+
+  it("starts a new handler for a new URL", () => {
+    const done = jest.fn();
+    const { rerender } = render(tree(URL_A, done));
+
+    rerender(tree(URL_B, done));
+
+    expect(mockMounts).toEqual([URL_A, URL_B]);
+  });
+
+  it("ignores the finish of a replaced handler and lets the current one finish", () => {
+    const done = jest.fn();
+    const { rerender } = render(tree(URL_A, done));
+
+    rerender(tree(URL_B, done));
+
+    const staleNavigation = jest.fn((d) => d());
+
+    act(() => mockFinishers[URL_A](staleNavigation));
+    act(() => mockFinishers[URL_A]());
+
+    expect(staleNavigation).not.toHaveBeenCalled();
+    expect(done).not.toHaveBeenCalled();
+
+    const navigation = jest.fn((d) => d());
+
+    act(() => mockFinishers[URL_B](navigation));
+
+    expect(navigation).toHaveBeenCalledWith(done);
+    expect(done).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not restart the handler when the same URL is set again", () => {
+    const done = jest.fn();
+    const { rerender } = render(tree(URL_A, done));
+
+    rerender(tree(URL_A, done));
+
+    expect(mockMounts).toEqual([URL_A]);
+
+    act(() => mockFinishers[URL_A]());
+
+    expect(done).toHaveBeenCalledTimes(1);
+  });
+
+  it("renders the app when there is no URL", () => {
+    const { getByText } = render(tree(null, jest.fn()));
+
+    expect(getByText("app")).toBeTruthy();
+    expect(mockMounts).toEqual([]);
+  });
+});

package/App/DeepLinking/URLSchemeListener/index.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useContext } from "react";
+import React, { useCallback, useContext, useRef } from "react";
 
 import { URLSchemeHandler } from "../URLSchemeHandler";
 import { URLSchemeContext } from "./URLSchemeContextProvider";
@@ -13,19 +13,30 @@ export function URLSchemeListener({ children }: { children: React.ReactNode }) {
 
   const appReady = useAppSelector(selectAppReady);
 
+  // The URL currently in the context. A handler compares its own URL with it on finish:
+  // a newer deep link may have replaced it while it was still resolving (e.g. loading a feed).
+  const latestUrl = useRef(url);
+  latestUrl.current = url;
+
   const onFinish = useCallback(
     (callback) => {
+      if (latestUrl.current !== url) {
+        // Stale handler: skip its navigation and do not clear the newer URL.
+        return;
+      }
+
       if (callback && typeof callback === "function") {
         callback?.(done);
       } else {
         done();
       }
     },
-    [url]
+    [url, done]
   );
 
   if (url && !navigator.startUpHooks && appReady) {
-    return <URLSchemeHandler url={url} onFinish={onFinish} />;
+    // key: a new URL remounts the handler so that its effects run for that URL.
+    return <URLSchemeHandler key={url} url={url} onFinish={onFinish} />;
   }
 
   return children;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "17.0.0-alpha.1984136194",
+  "version": "17.0.0-alpha.2451166845",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,13 +28,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "17.0.0-alpha.1984136194",
-    "@applicaster/quick-brick-core-plugins": "17.0.0-alpha.1984136194",
-    "@applicaster/zapp-pipes-v2-client": "17.0.0-alpha.1984136194",
-    "@applicaster/zapp-react-native-bridge": "17.0.0-alpha.1984136194",
-    "@applicaster/zapp-react-native-redux": "17.0.0-alpha.1984136194",
-    "@applicaster/zapp-react-native-ui-components": "17.0.0-alpha.1984136194",
-    "@applicaster/zapp-react-native-utils": "17.0.0-alpha.1984136194",
+    "@applicaster/applicaster-types": "17.0.0-alpha.2451166845",
+    "@applicaster/quick-brick-core-plugins": "17.0.0-alpha.2451166845",
+    "@applicaster/zapp-pipes-v2-client": "17.0.0-alpha.2451166845",
+    "@applicaster/zapp-react-native-bridge": "17.0.0-alpha.2451166845",
+    "@applicaster/zapp-react-native-redux": "17.0.0-alpha.2451166845",
+    "@applicaster/zapp-react-native-ui-components": "17.0.0-alpha.2451166845",
+    "@applicaster/zapp-react-native-utils": "17.0.0-alpha.2451166845",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",