fix: preserve pending import until consumed

Author: cfbender

assets/react/src/lib/native-shared-import.ts

@@ -36,6 +36,34 @@ function isNativeLinkPayload(payload?: NativeOpenPayload | null): payload is Ext
   return Boolean(payload && "url" in payload && payload.url.trim())
 }
 
+function receiveSharedImport(payload: SharedImportPayload) {
+  if (listeners.size === 0) {
+    pendingImport = payload
+    return
+  }
+
+  pendingImport = null
+  for (const listener of listeners) listener(payload)
+}
+
+export function receiveNativeOpenPayload(
+  payload: NativeOpenPayload | null | undefined,
+  onOpen: (payload: NativeOpenPayload) => void,
+) {
+  if (isSharedImportPayload(payload)) {
+    receiveSharedImport(payload)
+    onOpen(payload)
+    return true
+  }
+
+  if (isNativeLinkPayload(payload)) {
+    onOpen(payload)
+    return true
+  }
+
+  return false
+}
+
 export function takeSharedImport() {
   const payload = pendingImport
   pendingImport = null
@@ -44,6 +72,10 @@ export function takeSharedImport() {
 
 export function subscribeSharedImport(listener: (payload: SharedImportPayload) => void) {
   listeners.add(listener)
+
+  const payload = takeSharedImport()
+  if (payload) listener(payload)
+
   return () => {
     listeners.delete(listener)
   }
@@ -53,14 +85,7 @@ export async function initializeNativeSharedImport(onOpen: (payload: NativeOpenP
   if (!Capacitor.isNativePlatform()) return
 
   const receive = (payload?: NativeOpenPayload | null) => {
-    if (isSharedImportPayload(payload)) {
-      pendingImport = payload
-      for (const listener of listeners) listener(payload)
-      onOpen(payload)
-      return
-    }
-
-    if (isNativeLinkPayload(payload)) onOpen(payload)
+    receiveNativeOpenPayload(payload, onOpen)
   }
 
   try {

assets/react/test/native-shared-import.test.mjs

@@ -0,0 +1,60 @@
+import test from "node:test"
+import assert from "node:assert/strict"
+
+import {
+  receiveNativeOpenPayload,
+  subscribeSharedImport,
+  takeSharedImport,
+} from "../src/lib/native-shared-import.ts"
+
+const sharedPayload = {
+  text: "1 Lightning Bolt",
+  fileName: "manabox.txt",
+  mimeType: "text/plain",
+  source: "android-share",
+}
+
+test("receiveNativeOpenPayload stores shared imports until the collection route consumes them", () => {
+  const opened = []
+
+  assert.equal(receiveNativeOpenPayload(sharedPayload, (payload) => opened.push(payload)), true)
+  assert.deepEqual(opened, [sharedPayload])
+  assert.deepEqual(takeSharedImport(), sharedPayload)
+  assert.equal(takeSharedImport(), null)
+})
+
+test("subscribeSharedImport immediately delivers a pending shared import", () => {
+  const opened = []
+  const delivered = []
+
+  receiveNativeOpenPayload(sharedPayload, (payload) => opened.push(payload))
+  const unsubscribe = subscribeSharedImport((payload) => delivered.push(payload))
+  unsubscribe()
+
+  assert.deepEqual(opened, [sharedPayload])
+  assert.deepEqual(delivered, [sharedPayload])
+  assert.equal(takeSharedImport(), null)
+})
+
+test("receiveNativeOpenPayload sends active subscribers without leaving stale pending imports", () => {
+  const opened = []
+  const delivered = []
+  const unsubscribe = subscribeSharedImport((payload) => delivered.push(payload))
+
+  assert.equal(receiveNativeOpenPayload(sharedPayload, (payload) => opened.push(payload)), true)
+  unsubscribe()
+
+  assert.deepEqual(opened, [sharedPayload])
+  assert.deepEqual(delivered, [sharedPayload])
+  assert.equal(takeSharedImport(), null)
+})
+
+test("receiveNativeOpenPayload routes native links without creating a shared import", () => {
+  const linkPayload = { url: "https://manavault.cfb.dev/collection", source: "android-view" }
+  const opened = []
+
+  assert.equal(receiveNativeOpenPayload(linkPayload, (payload) => opened.push(payload)), true)
+
+  assert.deepEqual(opened, [linkPayload])
+  assert.equal(takeSharedImport(), null)
+})