react-native-unified-action-sheet 0.3.0 → 0.4.0

package/ios/BottomSheetViewController.swift

@@ -10,6 +10,8 @@ final class BottomSheetViewController: UIViewController {
     let label: String
     let isDestructive: Bool
     let isEnabled: Bool
+    /// Semibold, like the preferred action of an alert.
+    let isPreferred: Bool
   }
 
   private let sheetTitle: String?
@@ -168,7 +170,7 @@ final class BottomSheetViewController: UIViewController {
     config.titleAlignment = .leading
     config.titleTextAttributesTransformer = UIConfigurationTextAttributesTransformer { attributes in
       var attributes = attributes
-      attributes.font = UIFont.preferredFont(forTextStyle: .body).withWeight(isCancel ? .semibold : .regular)
+      attributes.font = UIFont.preferredFont(forTextStyle: .body).withWeight(isCancel || row.isPreferred ? .semibold : .regular)
 
       return attributes
     }

package/ios/UnifiedActionSheet.mm

@@ -68,6 +68,15 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
   payload[@"destructiveColor"] = options.destructiveColor();
   payload[@"presentationStyle"] = options.presentationStyle();
 
+  if (options.preferredButtonIndex()) {
+    payload[@"preferredButtonIndex"] = @(*options.preferredButtonIndex());
+  }
+  if (options.detents()) {
+    payload[@"detents"] = RCTConvertVecToArray(*options.detents(), ^id(NSString *element) {
+      return element;
+    });
+  }
+
   // The anchor arrives already measured from the ref on the JS side, so this
   // module never resolves a view and needs no React Native view API.
   auto anchorRect = options.anchorRect();
@@ -113,13 +122,21 @@ RCT_EXPORT_METHOD(showPromptWithOptions
       return @(element);
     });
   }
-  if (options.secureTextEntry()) {
-    payload[@"secureTextEntry"] = @(*options.secureTextEntry());
+  if (options.preferredButtonIndex()) {
+    payload[@"preferredButtonIndex"] = @(*options.preferredButtonIndex());
+  }
+  if (options.textRequiredButtonIndices()) {
+    payload[@"textRequiredButtonIndices"] =
+        RCTConvertVecToArray(*options.textRequiredButtonIndices(), ^id(double element) {
+          return @(element);
+        });
   }
 
   payload[@"title"] = options.title();
   payload[@"message"] = options.message();
+  payload[@"type"] = options.type();
   payload[@"placeholder"] = options.placeholder();
+  payload[@"passwordPlaceholder"] = options.passwordPlaceholder();
   payload[@"defaultValue"] = options.defaultValue();
   payload[@"keyboardType"] = options.keyboardType();
   payload[@"tintColor"] = options.tintColor();
@@ -129,8 +146,12 @@ RCT_EXPORT_METHOD(showPromptWithOptions
 
   dispatch_async(dispatch_get_main_queue(), ^{
     [UnifiedActionSheetImpl.shared showPromptWithOptions:payload
-                                             completion:^(NSInteger buttonIndex, NSString *text) {
-                                               resolve(@{@"buttonIndex" : @(buttonIndex), @"text" : text});
+                                             completion:^(NSInteger buttonIndex, NSString *text, NSString *password) {
+                                               resolve(@{
+                                                 @"buttonIndex" : @(buttonIndex),
+                                                 @"text" : text,
+                                                 @"password" : password,
+                                               });
                                              }];
   });
 }

package/ios/UnifiedActionSheetImpl.swift

@@ -26,6 +26,7 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
     let tintColor = Self.color(options["tintColor"])
     let cancelButtonTintColor = Self.color(options["cancelButtonTintColor"])
     let destructiveColor = Self.color(options["destructiveColor"])
+    let preferredIndex = (options["preferredButtonIndex"] as? NSNumber)?.intValue
 
     guard let parent = Self.presentedViewController() else {
       completion(cancelButtonIndex)
@@ -46,6 +47,7 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
         cancelButtonIndex: cancelButtonIndex,
         destructiveIndices: destructiveIndices,
         disabledIndices: disabledIndices,
+        preferredIndex: preferredIndex,
         tintColor: tintColor,
         cancelButtonTintColor: cancelButtonTintColor,
         destructiveColor: destructiveColor,
@@ -69,7 +71,7 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
     let presentation = Presentation(
       controller: alert,
       cancelButtonIndex: cancelButtonIndex,
-      completion: { index, _ in completion(index) }
+      completion: { index, _, _ in completion(index) }
     )
 
     for (index, label) in labels.enumerated() {
@@ -77,7 +79,10 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
       let style: UIAlertAction.Style =
         destructiveIndices.contains(index) ? .destructive : (isCancel ? .cancel : .default)
 
-      let action = UIAlertAction(title: label, style: style) { [weak self] _ in
+      // Weak: the presentation holds the alert, which holds this handler.
+      let action = UIAlertAction(title: label, style: style) { [weak self, weak presentation] _ in
+        guard let presentation else { return }
+
         self?.finish(presentation, index: index)
       }
 
@@ -98,6 +103,12 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
       alert.addAction(action)
     }
 
+    // UIKit only honors a preferred action in the alert style; the action
+    // sheet already bolds its cancel button.
+    if isCentered, let preferredIndex, alert.actions.indices.contains(preferredIndex) {
+      alert.preferredAction = alert.actions[preferredIndex]
+    }
+
     alert.view.tintColor = tintColor
 
     switch options["userInterfaceStyle"] as? String {
@@ -140,7 +151,7 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
   /// sheet, and a prompt is inherently a centered, modal question.
   @objc public func showPrompt(
     options: NSDictionary,
-    completion: @escaping (Int, String) -> Void
+    completion: @escaping (Int, String, String) -> Void
   ) {
     let labels = options["options"] as? [String] ?? []
     let cancelButtonIndex = (options["cancelButtonIndex"] as? NSNumber)?.intValue ?? -1
@@ -153,9 +164,14 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
     let tintColor = Self.color(options["tintColor"])
     let cancelButtonTintColor = Self.color(options["cancelButtonTintColor"])
     let destructiveColor = Self.color(options["destructiveColor"])
+    let preferredIndex = (options["preferredButtonIndex"] as? NSNumber)?.intValue
+    let textRequiredIndices = Set(
+      (options["textRequiredButtonIndices"] as? [NSNumber])?.map { $0.intValue } ?? []
+    )
+    let type = options["type"] as? String ?? "plain-text"
 
     guard let parent = Self.presentedViewController() else {
-      completion(cancelButtonIndex, "")
+      completion(cancelButtonIndex, "", "")
 
       return
     }
@@ -169,15 +185,35 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
     alert.addTextField { field in
       field.placeholder = Self.text(options["placeholder"])
       field.text = Self.text(options["defaultValue"])
-      field.isSecureTextEntry = (options["secureTextEntry"] as? NSNumber)?.boolValue ?? false
+      field.isSecureTextEntry = type == "secure-text"
       field.keyboardType = Self.keyboardType(options["keyboardType"])
+      if type == "login-password" {
+        field.textContentType = .username
+      }
+    }
+
+    // As in React Native's Alert.prompt: a secure field below the login one.
+    // The content types let Password AutoFill offer saved credentials.
+    if type == "login-password" {
+      alert.addTextField { field in
+        field.placeholder = Self.text(options["passwordPlaceholder"])
+        field.isSecureTextEntry = true
+        field.textContentType = .password
+      }
     }
 
     let presentation = Presentation(
       controller: alert,
       cancelButtonIndex: cancelButtonIndex,
       // Weak, or the presentation would retain the controller it is stored on.
-      currentText: { [weak alert] in alert?.textFields?.first?.text ?? "" },
+      currentValues: { [weak alert] in
+        let fields = alert?.textFields ?? []
+
+        return (
+          fields.first?.text ?? "",
+          fields.count > 1 ? (fields[1].text ?? "") : ""
+        )
+      },
       completion: completion
     )
 
@@ -186,7 +222,10 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
       let style: UIAlertAction.Style =
         destructiveIndices.contains(index) ? .destructive : (isCancel ? .cancel : .default)
 
-      let action = UIAlertAction(title: label, style: style) { [weak self] _ in
+      // Weak: the presentation holds the alert, which holds this handler.
+      let action = UIAlertAction(title: label, style: style) { [weak self, weak presentation] _ in
+        guard let presentation else { return }
+
         self?.finish(presentation, index: index)
       }
 
@@ -203,6 +242,29 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
       alert.addAction(action)
     }
 
+    // Bold, and triggered by the keyboard's return key.
+    if let preferredIndex, alert.actions.indices.contains(preferredIndex) {
+      alert.preferredAction = alert.actions[preferredIndex]
+    }
+
+    // requiresText: those buttons stay disabled while any field is empty.
+    if !textRequiredIndices.isEmpty {
+      let update: () -> Void = { [weak alert] in
+        guard let alert else { return }
+
+        let filled = (alert.textFields ?? []).allSatisfy { !($0.text ?? "").isEmpty }
+        for index in textRequiredIndices where alert.actions.indices.contains(index) {
+          alert.actions[index].isEnabled = filled && !disabledIndices.contains(index)
+        }
+      }
+
+      alert.textFields?.forEach { field in
+        field.addAction(UIAction { _ in update() }, for: .editingChanged)
+      }
+      // A defaultValue may already satisfy it.
+      update()
+    }
+
     alert.view.tintColor = tintColor
 
     switch options["userInterfaceStyle"] as? String {
@@ -222,6 +284,7 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
     cancelButtonIndex: Int,
     destructiveIndices: Set<Int>,
     disabledIndices: Set<Int>,
+    preferredIndex: Int?,
     tintColor: UIColor?,
     cancelButtonTintColor: UIColor?,
     destructiveColor: UIColor?,
@@ -232,7 +295,8 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
         index: index,
         label: label,
         isDestructive: destructiveIndices.contains(index),
-        isEnabled: !disabledIndices.contains(index)
+        isEnabled: !disabledIndices.contains(index),
+        isPreferred: index == preferredIndex
       )
     }
 
@@ -249,7 +313,7 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
     let presentation = Presentation(
       controller: sheet,
       cancelButtonIndex: cancelButtonIndex,
-      completion: { index, _ in completion(index) }
+      completion: { index, _, _ in completion(index) }
     )
 
     // Weak: the presentation holds the sheet, which holds this closure.
@@ -278,16 +342,27 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
 
       let bounds = parent.view.window?.bounds ?? parent.view.bounds
       let fitting = sheet.fittingHeight(width: bounds.width)
-
-      // A short list opens at its own height; a long one opens at half height
-      // and drags up to expand, like the Android sheet. Fitting the content
-      // needs a custom detent, iOS 16+; iOS 15 opens at half height.
-      if #available(iOS 16.0, *), fitting <= bounds.height / 2 {
-        controller.detents = [
-          .custom(identifier: .init("unifiedActionSheet.content")) { context in
-            min(fitting, context.maximumDetentValue)
-          },
-        ]
+      let requested = options["detents"] as? [String] ?? []
+
+      if !requested.isEmpty {
+        // The caller's heights; it opens at the first. Duplicates collapse,
+        // e.g. 'auto' and 'medium' on iOS 15, where 'auto' is half height.
+        var detents: [UISheetPresentationController.Detent] = []
+        var identifiers: [UISheetPresentationController.Detent.Identifier] = []
+        for name in requested {
+          let (detent, identifier) = Self.detent(named: name, fitting: fitting)
+          guard !identifiers.contains(identifier) else { continue }
+
+          detents.append(detent)
+          identifiers.append(identifier)
+        }
+        controller.detents = detents
+        controller.selectedDetentIdentifier = identifiers.first
+      } else if #available(iOS 16.0, *), fitting <= bounds.height / 2 {
+        // A short list opens at its own height; a long one opens at half
+        // height and drags up to expand, like the Android sheet. Fitting the
+        // content needs a custom detent, iOS 16+; iOS 15 opens at half height.
+        controller.detents = [Self.detent(named: "auto", fitting: fitting).0]
       } else {
         controller.detents = [.medium(), .large()]
       }
@@ -374,24 +449,45 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
     presentation.resolve(index)
   }
 
+  /// 'auto' fits the content (iOS 16+; half height on iOS 15), 'medium' is
+  /// half height, 'large' is full height.
+  private static func detent(
+    named name: String,
+    fitting: CGFloat
+  ) -> (UISheetPresentationController.Detent, UISheetPresentationController.Detent.Identifier) {
+    switch name {
+    case "large":
+      return (.large(), .large)
+    case "auto":
+      if #available(iOS 16.0, *) {
+        let identifier = UISheetPresentationController.Detent.Identifier("unifiedActionSheet.content")
+
+        return (.custom(identifier: identifier) { min(fitting, $0.maximumDetentValue) }, identifier)
+      }
+      return (.medium(), .medium)
+    default:
+      return (.medium(), .medium)
+    }
+  }
+
   private final class Presentation {
     /// A UIAlertController, or the bottom sheet on iPhone.
     let controller: UIViewController
     let cancelButtonIndex: Int
-    /// Read at resolve time, not at creation: the value that matters is
-    /// whatever is in the field when the prompt closes. Sheets pass a constant.
-    private let currentText: () -> String
-    private var completion: ((Int, String) -> Void)?
+    /// Read at resolve time, not at creation: the values that matter are
+    /// whatever is in the fields when the prompt closes. Sheets pass constants.
+    private let currentValues: () -> (String, String)
+    private var completion: ((Int, String, String) -> Void)?
 
     init(
       controller: UIViewController,
       cancelButtonIndex: Int,
-      currentText: @escaping () -> String = { "" },
-      completion: @escaping (Int, String) -> Void
+      currentValues: @escaping () -> (String, String) = { ("", "") },
+      completion: @escaping (Int, String, String) -> Void
     ) {
       self.controller = controller
       self.cancelButtonIndex = cancelButtonIndex
-      self.currentText = currentText
+      self.currentValues = currentValues
       self.completion = completion
     }
 
@@ -404,7 +500,8 @@ public class UnifiedActionSheetImpl: NSObject, UIPopoverPresentationControllerDe
       guard let completion else { return }
 
       self.completion = nil
-      completion(index, currentText())
+      let (text, password) = currentValues()
+      completion(index, text, password)
     }
   }
 

package/jest/index.d.ts

@@ -1,25 +1,28 @@
 import type {
   ActionSheetOptionsInterface,
+  ActionSheetResultInterface,
   PromptOptionsInterface,
   PromptResultInterface,
 } from 'react-native-unified-action-sheet';
 
-/// Queues the index the next sheet resolves with. Pass nothing to go back to
-/// resolving with no selection.
+/// Queues the index the next sheet resolves with; the reason is derived as the
+/// real module would. Pass nothing to go back to resolving as dismissed.
 export declare function setNextButtonIndex(index?: number): void;
 
 export declare const showActionSheetWithOptions: jest.Mock<
-  Promise<number | undefined>,
+  Promise<ActionSheetResultInterface>,
   [ActionSheetOptionsInterface]
 >;
-/// Queues what the next prompt resolves with. Pass nothing to go back to
-/// resolving with no selection.
-export declare function setNextPromptResult(
-  result?: PromptResultInterface
-): void;
+/// Queues what the next prompt resolves with; the reason is derived as the
+/// real module would. Pass nothing to go back to resolving as dismissed.
+export declare function setNextPromptResult(result?: {
+  buttonIndex: number;
+  text: string;
+  password?: string;
+}): void;
 
 export declare const showPromptWithOptions: jest.Mock<
-  Promise<PromptResultInterface | undefined>,
+  Promise<PromptResultInterface>,
   [PromptOptionsInterface]
 >;
 export declare const dismissActionSheet: jest.Mock<void, []>;

package/jest/index.js

@@ -7,9 +7,11 @@
  *     require('react-native-unified-action-sheet/jest')
  *   );
  *
- * By default every sheet resolves with no selection. To simulate a tap, queue
- * the index the next sheet should resolve with; the pressed button's onPress
- * runs, exactly as it would in the real module:
+ * By default every sheet resolves as dismissed: { reason: 'dismissed',
+ * buttonIndex: undefined }. To simulate a tap, queue the index the next sheet
+ * should resolve with; it resolves { reason, buttonIndex } with the reason the
+ * real module would give ('cancelled' for the cancel button or -1, otherwise
+ * 'selected'), and the pressed button's onPress runs as it would for real:
  *
  *   setNextButtonIndex(0);
  *   await openTheSheet();
@@ -17,11 +19,26 @@
  * Prefer that over mockResolvedValueOnce, which replaces the implementation and
  * so skips onPress.
  *
- * A prompt is queued the same way, with the text the field should resolve with:
+ * A prompt is queued the same way, with what the field(s) should hold (password
+ * only for a 'login-password' prompt); onPress receives { text, password }:
  *
  *   setNextPromptResult({ buttonIndex: 0, text: 'typed' });
  *   await openThePrompt();
  */
+const buttonsOf = (options) => (options && options.options) || [];
+
+/// The same rule as the real module: the first button styled 'cancel', or -1,
+/// is a cancellation; any other index is a selection.
+const closeResult = (buttons, buttonIndex) => {
+  if (buttonIndex == null)
+    return { reason: 'dismissed', buttonIndex: undefined };
+
+  const cancelIndex = buttons.findIndex((button) => button.style === 'cancel');
+  const cancelled = buttonIndex < 0 || buttonIndex === cancelIndex;
+
+  return { reason: cancelled ? 'cancelled' : 'selected', buttonIndex };
+};
+
 let nextButtonIndex;
 
 const setNextButtonIndex = (index) => {
@@ -29,15 +46,14 @@ const setNextButtonIndex = (index) => {
 };
 
 const showActionSheetWithOptions = jest.fn((options) => {
-  const buttonIndex = nextButtonIndex;
+  const buttons = buttonsOf(options);
+  const result = closeResult(buttons, nextButtonIndex);
   nextButtonIndex = undefined;
 
-  if (buttonIndex != null) {
-    const button = options && options.options && options.options[buttonIndex];
-    if (button && typeof button.onPress === 'function') button.onPress();
-  }
+  const button = result.buttonIndex != null && buttons[result.buttonIndex];
+  if (button && typeof button.onPress === 'function') button.onPress();
 
-  return Promise.resolve(buttonIndex);
+  return Promise.resolve(result);
 });
 
 let nextPromptResult;
@@ -47,16 +63,19 @@ const setNextPromptResult = (result) => {
 };
 
 const showPromptWithOptions = jest.fn((options) => {
-  const result = nextPromptResult;
+  const buttons = buttonsOf(options);
+  const queued = nextPromptResult;
   nextPromptResult = undefined;
 
-  if (result) {
-    const button =
-      options && options.options && options.options[result.buttonIndex];
-    if (button && typeof button.onPress === 'function') {
-      button.onPress(result.text);
-    }
-  }
+  const values = { text: (queued && queued.text) || '' };
+  if (queued && queued.password != null) values.password = queued.password;
+  const result = {
+    ...closeResult(buttons, queued ? queued.buttonIndex : undefined),
+    ...values,
+  };
+
+  const button = result.buttonIndex != null && buttons[result.buttonIndex];
+  if (button && typeof button.onPress === 'function') button.onPress(values);
 
   return Promise.resolve(result);
 });

package/lib/commonjs/NativeUnifiedActionSheet.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_default","exports","default","TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeUnifiedActionSheet.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAAqE,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAkDtDC,gCAAmB,CAACC,YAAY,CAAO,oBAAoB,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_default","exports","default","TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeUnifiedActionSheet.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAAqE,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAuDtDC,gCAAmB,CAACC,YAAY,CAAO,oBAAoB,CAAC","ignoreList":[]}

package/lib/commonjs/index.js

@@ -31,6 +31,7 @@ const toWireButtons = buttons => {
   const destructive = [];
   const disabled = [];
   let cancelButtonIndex;
+  let preferredButtonIndex;
   buttons.forEach((button, index) => {
     labels.push(button.label);
     if (button.style === 'destructive') destructive.push(index);
@@ -38,6 +39,9 @@ const toWireButtons = buttons => {
       cancelButtonIndex = index;
     }
     if (button.disabled) disabled.push(index);
+    if (button.preferred && preferredButtonIndex == null) {
+      preferredButtonIndex = index;
+    }
   });
   return {
     options: labels,
@@ -49,12 +53,40 @@ const toWireButtons = buttons => {
     }),
     ...(disabled.length === 0 ? {} : {
       disabledButtonIndices: disabled
+    }),
+    ...(preferredButtonIndex == null ? {} : {
+      preferredButtonIndex
     })
   };
 };
+
+/// Native sides only report an index: DISMISSED_BY_API, the cancel button's
+/// index, -1 (a cancel gesture with no cancel button), or another button.
+const toCloseResult = (buttonIndex, cancelButtonIndex) => {
+  if (buttonIndex === DISMISSED_BY_API) {
+    return {
+      reason: 'dismissed',
+      buttonIndex: undefined
+    };
+  }
+  if (buttonIndex < 0 || buttonIndex === cancelButtonIndex) {
+    return {
+      reason: 'cancelled',
+      buttonIndex
+    };
+  }
+  return {
+    reason: 'selected',
+    buttonIndex
+  };
+};
+const DISMISSED = {
+  reason: 'dismissed',
+  buttonIndex: undefined
+};
 const showWithNativeModule = options => nativeModule().showActionSheetWithOptions(options)
-// A programmatic dismiss resolves with no index rather than a selection.
-.then(buttonIndex => buttonIndex === DISMISSED_BY_API ? undefined : buttonIndex).catch(() => options.cancelButtonIndex ?? -1);
+// A native failure reads as a cancellation rather than a rejection.
+.catch(() => options.cancelButtonIndex ?? -1).then(buttonIndex => toCloseResult(buttonIndex, options.cancelButtonIndex));
 let warnedMaterialDisabled = false;
 
 /// 'bottom' needs Material on Android, which the app opts into at build time.
@@ -92,13 +124,15 @@ const withAnchorRect = (wire, anchor) => {
 const showActionSheetWithOptions = options => {
   const wire = toWireOptions(options);
 
-  // -1 and undefined index nothing, so optional chaining covers both.
-  const press = buttonIndex => {
-    if (buttonIndex != null) options.options[buttonIndex]?.onPress?.();
-    return buttonIndex;
+  // -1 and a dismissal index nothing, so optional chaining covers both.
+  const press = result => {
+    if (result.buttonIndex != null) {
+      options.options[result.buttonIndex]?.onPress?.();
+    }
+    return result;
   };
   if (_reactNative.Platform.OS !== 'ios' && _reactNative.Platform.OS !== 'android') {
-    return Promise.resolve(undefined);
+    return Promise.resolve(DISMISSED);
   }
   warnIfBottomUnavailable(options.presentationStyle);
 
@@ -114,8 +148,8 @@ const dismissActionSheet = () => {
   }
 };
 
-/// Closes every open sheet, not just the top-most one. Each resolves with no
-/// index, exactly as dismissActionSheet() does.
+/// Closes every open sheet, not just the top-most one. Each resolves as
+/// 'dismissed', exactly as with dismissActionSheet().
 exports.dismissActionSheet = dismissActionSheet;
 const dismissAllActionSheets = () => {
   if (_reactNative.Platform.OS === 'ios' || _reactNative.Platform.OS === 'android') {
@@ -131,24 +165,57 @@ exports.dismissAllActionSheets = dismissAllActionSheets;
 const showPromptWithOptions = options => {
   const {
     options: buttons,
+    secureTextEntry,
+    type,
     ...rest
   } = options;
+  const textRequired = buttons.flatMap((button, index) => button.requiresText ? [index] : []);
   const wire = {
     ...rest,
-    ...toWireButtons(buttons)
+    ...toWireButtons(buttons),
+    // One field of truth for the native sides: the old boolean maps onto type.
+    type: type ?? (secureTextEntry ? 'secure-text' : 'plain-text'),
+    ...(textRequired.length === 0 ? {} : {
+      textRequiredButtonIndices: textRequired
+    })
   };
+  const hasPassword = wire.type === 'login-password';
   if (_reactNative.Platform.OS !== 'ios' && _reactNative.Platform.OS !== 'android') {
-    return Promise.resolve(undefined);
+    return Promise.resolve({
+      ...DISMISSED,
+      text: ''
+    });
   }
-  return nativeModule().showPromptWithOptions(wire).then(result =>
-  // A programmatic dismiss resolves with no selection, matching the sheet.
-  result.buttonIndex === DISMISSED_BY_API ? undefined : result).catch(() => ({
+  return nativeModule().showPromptWithOptions(wire).catch(() => ({
     buttonIndex: wire.cancelButtonIndex ?? -1,
-    text: ''
+    text: '',
+    password: ''
+  })).then(({
+    buttonIndex,
+    text,
+    password
+  }) => ({
+    ...toCloseResult(buttonIndex, wire.cancelButtonIndex),
+    text,
+    // Even a dismissal carries the fields, so a draft is recoverable.
+    ...(hasPassword ? {
+      password
+    } : {})
   })).then(result => {
-    // The text goes to the handler, so a caller using onPress alone never
+    // The values go to the handler, so a caller using onPress alone never
     // has to read the resolved value.
-    if (result) buttons[result.buttonIndex]?.onPress?.(result.text);
+    if (result.buttonIndex != null) {
+      const {
+        text,
+        password
+      } = result;
+      buttons[result.buttonIndex]?.onPress?.(hasPassword ? {
+        text,
+        password
+      } : {
+        text
+      });
+    }
     return result;
   });
 };