@craft-native/ios 0.0.99 → 0.0.100

package/dist/index.d.ts

@@ -19,6 +19,8 @@ export interface CraftConfig {
     backgroundColor?: string;
     /** The launch and webview background while the phone is in Dark Mode. */
     backgroundColorDark?: string;
+    /** Edge-swipe back and forward through the page's history, pushState entries included. */
+    swipeNavigation?: boolean;
     enableSpeechRecognition?: boolean;
     enableHaptics?: boolean;
     enableShare?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.99",
+  "version": "0.0.100",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftApp.swift

@@ -359,6 +359,8 @@ struct CraftConfig: Codable {
     var backgroundColor: String = "#1a1a2e"
     /// The background while the phone is in Dark Mode; the light one if unset.
     var backgroundColorDark: String? = nil
+    /// Edge-swipe back and forward through the page's history.
+    var swipeNavigation: Bool? = nil
     var enableSpeechRecognition: Bool = false
     var enableHaptics: Bool = false
     var enableShare: Bool = false
@@ -530,6 +532,13 @@ struct CraftWebView: UIViewRepresentable {
         let webView = WKWebView(frame: .zero, configuration: webConfig)
         webView.navigationDelegate = context.coordinator
         webView.isOpaque = false
+        // An edge swipe goes back (and forward) through the page's history,
+        // pushState entries included, the way every iOS app's stack does.
+        webView.allowsBackForwardNavigationGestures = config.swipeNavigation ?? false
+        #if DEBUG
+        // Safari's Develop menu can attach to a debug build; never a release.
+        if #available(iOS 16.4, *) { webView.isInspectable = true }
+        #endif
 
         // Before any message can be offered. Zig evaluates every reply against
         // this webview, and without it an action would run, succeed, and reach
@@ -1301,7 +1310,7 @@ struct CraftWebView: UIViewRepresentable {
             case "requestHealthAuthorization":
                 if config.enableHealthKit {
                     let types = body["types"] as? [String] ?? []
-                    requestHealthAuthorization(types: types, callbackId: callbackId)
+                    requestHealthAuthorization(types: types, readOnly: body["readOnly"] as? Bool ?? false, callbackId: callbackId)
                 } else {
                     rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
                 }
@@ -3239,19 +3248,28 @@ struct CraftWebView: UIViewRepresentable {
                 var legacyNotifications = craft.notifications;
 
                 craft.contractVersion = '1.0.0';
+                // Actions answered by a person, through a system sheet they
+                // may take a minute to read. Thirty seconds of reading the
+                // HealthKit sheet used to fail the call while the sheet was
+                // still open; these wait for the answer instead.
+                var personFacing = {
+                    requestHealthAuthorization: true,
+                    requestPermission: true,
+                    signInWithApple: true
+                };
                 craft._invoke = function(action, payload) {
                     var self = craft;
                     var id = 'cb_' + (++self._callbackId);
                     var message = Object.assign({}, payload || {}, {action: action, callbackId: id});
                     window.webkit.messageHandlers.craft.postMessage(message);
                     return new Promise(function(resolve, reject) {
-                        var timeout = setTimeout(function() {
+                        var timeout = personFacing[action] ? null : setTimeout(function() {
                             delete self._callbacks[id];
                             reject(new Error('Craft bridge timed out: ' + action));
                         }, 30000);
                         self._callbacks[id] = {
-                            resolve: function(value) { clearTimeout(timeout); resolve(value); },
-                            reject: function(error) { clearTimeout(timeout); reject(error); }
+                            resolve: function(value) { if (timeout) clearTimeout(timeout); resolve(value); },
+                            reject: function(error) { if (timeout) clearTimeout(timeout); reject(error); }
                         };
                     });
                 };
@@ -3387,7 +3405,9 @@ struct CraftWebView: UIViewRepresentable {
                     readRecording: function() { return craft._invoke('readLocationRecording'); }
                 };
                 craft.health = {
-                    requestAuthorization: function(types) { return craft._invoke('requestHealthAuthorization', {types: types || []}); },
+                    requestAuthorization: function(types, options) {
+                        return craft._invoke('requestHealthAuthorization', {types: types || [], readOnly: Boolean(options && options.write === false)});
+                    },
                     getData: function(type, options) {
                         options = options || {};
                         return craft._invoke('getHealthData', {type: type, startDate: options.startDate, endDate: options.endDate});
@@ -5125,7 +5145,7 @@ struct CraftWebView: UIViewRepresentable {
         }
 
         // MARK: - Health
-        private func requestHealthAuthorization(types: [String], callbackId: String?) {
+        private func requestHealthAuthorization(types: [String], readOnly: Bool = false, callbackId: String?) {
             guard let healthStore = healthStore else {
                 rejectCallback(callbackId, error: "HealthKit not available")
                 return
@@ -5188,6 +5208,9 @@ struct CraftWebView: UIViewRepresentable {
                 }
             }
 
+            // A page that only reads asks only to read: the sheet then says
+            // "access", not "access and update".
+            if readOnly { shareTypes.removeAll() }
             healthStore.requestAuthorization(toShare: shareTypes, read: readTypes) { [weak self] success, error in
                 if success {
                     self?.resolveCallback(callbackId, result: true)