@livx.cc/appwrap 0.61.8 → 0.61.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livx.cc/appwrap",
-  "version": "0.61.8",
+  "version": "0.61.10",
   "description": "Wrap any PWA into a native app with native capabilities (appwrap runtime + @livx.cc/native-kit).",
   "license": "MIT",
   "author": "Elya Livshitz",

package/runtime/app/shell/handlers.ts

@@ -8,6 +8,7 @@ import { setStatusBarStyle } from './status-bar';
 import { buildCapabilityMap } from './capabilities.manifest';
 import { ACTIVE_MODULE_NAMES, PACK_MODULES } from './active-modules.generated';
 import { consumePendingBackgroundTaskId } from './background-context';
+import { settleShare, type ShareOutcome } from './share-outcome';
 
 /** Build identifier for the native shell bundle — bump per deploy to spot stale bundles. */
 export const SHELL_BUILD = 'share-target-1';
@@ -18,6 +19,40 @@ let lastWebVersion: WebVersionInfo = {};
 /** Latest version status the web reported — read by the dev-menu App Info screen. */
 export function getReportedWebVersion(): WebVersionInfo { return lastWebVersion; }
 
+/**
+ * Present the iOS share sheet and resolve when it ENDS — not when it opens — with how it ended
+ * (`{ completed, activity? }`, e.g. activity `com.apple.UIKit.activity.SaveToCameraRoll` for "Save
+ * Video"). That is what lets a caller say "Saved to Photos"; the sheet itself gives no feedback.
+ */
+function presentShareSheet(items: NSMutableArray<any>): Promise<ShareOutcome> {
+  return new Promise((resolve) => {
+    const controller = UIActivityViewController.alloc().initWithActivityItemsApplicationActivities(items, null);
+    const rootVC = Utils.ios.getRootViewController();
+    // iPad requires a popover anchor
+    if (controller.popoverPresentationController) {
+      controller.popoverPresentationController.sourceView = rootVC.view;
+    }
+    let done = false;
+    const finish = (o: ShareOutcome | null) => {
+      if (done || !o) return;
+      done = true;
+      resolve(o);
+    };
+    const presented = () => !!controller.presentingViewController && !controller.beingDismissed;
+    controller.completionWithItemsHandler = (activityType: string, completed: boolean) => {
+      // Recover the WebView on dismiss — a presented sheet can orphan a touch-stealing window / leave
+      // the renderer throttled (see CustomWebView.recoverAfterNativeSurface).
+      bridge.getWebView()?.recoverAfterNativeSurface();
+      const now = settleShare(activityType, !!completed, presented());
+      if (now) return finish(now);
+      // Still presented: a cancelled sub-activity (sheet stays) OR a dismissal still animating out.
+      // Re-check once it would have finished; a later handler call wins if it comes first.
+      setTimeout(() => finish(settleShare(null, false, presented())), 700);
+    };
+    rootVC.presentViewControllerAnimatedCompletion(controller, true, null);
+  });
+}
+
 /** Register all protocol-v1 handlers. */
 export function registerHandlers(): void {
   bridge.register('app.handshake', () => {
@@ -84,20 +119,10 @@ export function registerHandlers(): void {
     if (isIOS) {
       const items = NSMutableArray.new();
       if (content) items.addObject(content);
-      const controller = UIActivityViewController.alloc().initWithActivityItemsApplicationActivities(
-        items,
-        null
-      );
-      const rootVC = Utils.ios.getRootViewController();
-      // iPad requires a popover anchor
-      if (controller.popoverPresentationController) {
-        controller.popoverPresentationController.sourceView = rootVC.view;
-      }
-      // Recover the WebView on dismiss — a presented sheet can orphan a touch-stealing window / leave
-      // the renderer throttled (see CustomWebView.recoverAfterNativeSurface).
-      controller.completionWithItemsHandler = () => { bridge.getWebView()?.recoverAfterNativeSurface(); };
-      rootVC.presentViewControllerAnimatedCompletion(controller, true, null);
+      return presentShareSheet(items);
     } else if (isAndroid) {
+      // The chooser cannot report what (or whether) anything was picked, so there is no outcome to
+      // return: resolves undefined, which callers treat as "unknown" (no success feedback).
       const intent = new android.content.Intent(android.content.Intent.ACTION_SEND);
       intent.setType('text/plain');
       if (title) intent.putExtra(android.content.Intent.EXTRA_SUBJECT, title);
@@ -123,15 +148,7 @@ export function registerHandlers(): void {
         data.writeToFileAtomically(filePath, true);
         items.addObject(NSURL.fileURLWithPath(filePath));
       });
-      const controller = UIActivityViewController.alloc().initWithActivityItemsApplicationActivities(
-        items,
-        null
-      );
-      const rootVC = Utils.ios.getRootViewController();
-      if (controller.popoverPresentationController) {
-        controller.popoverPresentationController.sourceView = rootVC.view; // iPad anchor
-      }
-      rootVC.presentViewControllerAnimatedCompletion(controller, true, null);
+      return presentShareSheet(items);
     }
   );
 

package/runtime/app/shell/share-outcome.ts

@@ -0,0 +1,21 @@
+/** How a share sheet ended — what `share.share` / `share.files` resolve with (native-kit `ShareResult`). */
+export interface ShareOutcome {
+  completed: boolean;
+  activity?: string;
+}
+
+/**
+ * Decide whether ONE `UIActivityViewController.completionWithItemsHandler` call ends the share.
+ * iOS 13+ calls the handler with (activityType, completed=false) when a sub-activity (Mail, Messages)
+ * is cancelled while the sheet STAYS open for another pick — resolving there would report "cancelled"
+ * and lose the real outcome. So: a completed activity ends it; otherwise only a sheet that is no longer
+ * presented does. `null` = not over yet, wait for the next call (or the dismissal re-check).
+ */
+export function settleShare(
+  activityType: string | null | undefined,
+  completed: boolean,
+  sheetStillPresented: boolean
+): ShareOutcome | null {
+  if (completed) return activityType ? { completed: true, activity: String(activityType) } : { completed: true };
+  return sheetStillPresented ? null : { completed: false };
+}

package/runtime/tests/share-outcome.test.ts

@@ -0,0 +1,27 @@
+/**
+ * iOS share sheet outcome — `share.share` / `share.files` resolve when the sheet ENDS with
+ * `{ completed, activity? }`. Contract: a completed activity ends it (with its type), a dismissed sheet
+ * ends it as not completed, and a cancelled sub-activity while the sheet stays open does NOT end it.
+ */
+import { describe, expect, test } from 'bun:test';
+import { settleShare } from '../app/shell/share-outcome';
+
+describe('settleShare', () => {
+  test('"Save Video" completes with its activity type', () => {
+    expect(settleShare('com.apple.UIKit.activity.SaveToCameraRoll', true, false))
+      .toEqual({ completed: true, activity: 'com.apple.UIKit.activity.SaveToCameraRoll' });
+  });
+  test('completed while the sheet is still animating out still completes', () => {
+    expect(settleShare('com.apple.UIKit.activity.CopyToPasteboard', true, true))
+      .toEqual({ completed: true, activity: 'com.apple.UIKit.activity.CopyToPasteboard' });
+  });
+  test('completed with no activity type carries no activity key', () => {
+    expect(settleShare(null, true, false)).toEqual({ completed: true });
+  });
+  test('sheet dismissed without a pick → not completed', () => {
+    expect(settleShare(null, false, false)).toEqual({ completed: false });
+  });
+  test('sub-activity cancelled while the sheet stays open → not over yet', () => {
+    expect(settleShare('com.apple.UIKit.activity.Mail', false, true)).toBeNull();
+  });
+});