chore(release): 3.11.0 [skip ci]

# [3.11.0](https://github.com/expo/react-native-action-sheet/compare/v3.10.0...v3.11.0) (2021-09-07)

### Bug Fixes

* yarn lock issues ([#238](https://github.com/expo/react-native-action-sheet/issues/238)) ([22fc214](https://github.com/expo/react-native-action-sheet/commit/22fc2144b3ce3b5fc1892eefd86f484dc1af58e9))

### Features

* default useModal to true when autoFocus is set ([688fd47](https://github.com/expo/react-native-action-sheet/commit/688fd47227dab6994b59ed85af622cb04ebed220))

CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+# [3.11.0](https://github.com/expo/react-native-action-sheet/compare/v3.10.0...v3.11.0) (2021-09-07)
+
+
+### Bug Fixes
+
+* yarn lock issues ([#238](https://github.com/expo/react-native-action-sheet/issues/238)) ([22fc214](https://github.com/expo/react-native-action-sheet/commit/22fc2144b3ce3b5fc1892eefd86f484dc1af58e9))
+
+
+### Features
+
+* default useModal to true when autoFocus is set ([688fd47](https://github.com/expo/react-native-action-sheet/commit/688fd47227dab6994b59ed85af622cb04ebed220))
+
+# [3.10.0](https://github.com/expo/react-native-action-sheet/compare/v3.8.0...v3.10.0) (2021-08-09)
+
+### Features
+* Allow multiple destructive indices ([#210](https://github.com/expo/react-native-action-sheet/issues/210)) ([81112b9](https://github.com/expo/react-native-action-sheet/commit/81112b9553dc34725e2708b02b64b7a5e5c57509))
+
+# [3.9.0](https://github.com/expo/react-native-action-sheet/compare/v3.8.0...v3.9.0) (2021-03-12)
+
+
+### Bug Fixes
+
+* allow callback to be async ([#183](https://github.com/expo/react-native-action-sheet/issues/183)) ([d0d5182](https://github.com/expo/react-native-action-sheet/commit/d0d518278028556a80deec3d9b57c332b82ba28d))
+* center icons with titles ([#188](https://github.com/expo/react-native-action-sheet/issues/188)) ([d48c323](https://github.com/expo/react-native-action-sheet/commit/d48c323e4563363c8683c427d1803e1ff4cddcb5))
+
+
+### Features
+
+* add `userInterfaceStyle` option for iOS ([#206](https://github.com/expo/react-native-action-sheet/issues/206)) ([735cfa5](https://github.com/expo/react-native-action-sheet/commit/735cfa54ba1bfd90139671489aca525fdbd59626))
+
+# [3.8.0](https://github.com/expo/react-native-action-sheet/compare/v3.7.0...v3.8.0) (2020-05-19)
+
+
+### Features
+
+* Add destructiveColor option ([#171](https://github.com/expo/react-native-action-sheet/issues/171)) ([5549e36](https://github.com/expo/react-native-action-sheet/commit/5549e36a92d8afcc0ce2bf6a601e83209b5ce080))
+* Improvements to Android accessibility ([#168](https://github.com/expo/react-native-action-sheet/issues/168)) ([b605fb8](https://github.com/expo/react-native-action-sheet/commit/b605fb8a3b6421c244f7f18d934bb5ea0753d461))
+
 # [3.7.0](https://github.com/expo/react-native-action-sheet/compare/v3.6.0...v3.7.0) (2020-05-06)
 
 

README.md

@@ -1,7 +1,7 @@
 # react-native-action-sheet
 [![npm](https://img.shields.io/npm/v/@expo/react-native-action-sheet.svg?style=flat-square)](https://www.npmjs.com/package/@expo/react-native-action-sheet)
 [![License: MIT](https://img.shields.io/github/license/nd-02110114/goofi-mobile.svg)](https://opensource.org/licenses/MIT)
-[![Slack](https://slack.expo.io/badge.svg)](https://slack.expo.io)
+[![Discord](https://img.shields.io/badge/discord-expo-green?style=flat-square&logo=discord)](https://discord.gg/4gtbPAdpaE)
 
 ActionSheet is a cross-platform React Native component that uses the native UIActionSheet on iOS and a JS implementation on Android. Almost a drop in replacement for [ActionSheetIOS](https://facebook.github.io/react-native/docs/actionsheetios.html) except it cannot be called statically.
 
@@ -98,13 +98,17 @@ The same options available on React Native's [ActionSheetIOS](https://facebook.g
 
 ### iOS Only Props
 
-| Name             | Type   | Required | Default |
-| -----------------| -------| -------- | ------- |
-| anchor           | number | No       |         |
+| Name               | Type   | Required | Default |
+| -------------------| -------| -------- | ------- |
+| anchor             | number | No       |         |
+| userInterfaceStyle | string | No       |         |
 
 #### `anchor` (optional)
 iPad only option that allows for docking the action sheet to a node. See [ShowActionSheetButton.tsx](/example/ShowActionSheetButton.tsx) for an example on how to implement this.
 
+#### `userInterfaceStyle` (optional)
+The interface style used for the action sheet, can be set to `light` or `dark`, otherwise the default system style will be used.
+
 ### Android/Web-Only Props
 
 The below props allow modification of the Android ActionSheet. They have no effect on the look on iOS as the native iOS Action Sheet does not have options for modifying these options.
@@ -117,10 +121,12 @@ The below props allow modification of the Android ActionSheet. They have no effe
 | textStyle        | TextStyle                         | No       |         |
 | titleTextStyle   | TextStyle                         | No       |         |
 | messageTextStyle | TextStyle                         | No       |         |
+| autoFocus        | boolean                           | No       |  false  |
 | showSeparators   | boolean                           | No       |  false  |
 | containerStyle   | ViewStyle                         | No       |         |
 | separatorStyle   | ViewStyle                         | No       |         |
-| useModal         | boolean                           | No       |  false  |
+| useModal         | boolean                           | No       | false (true if autoFocus is true)   |
+| destructiveColor | string                            | No       | #d32f2f |
 
 #### `icons` (optional)
 
@@ -138,6 +144,10 @@ Apply any text style props to the title if present.
 #### `messageTextStyle` (optional)
 Apply any text style props to the message if present.
 
+#### `autoFocus`: (optional)
+If true, will give the first option screen reader focus automatically when the action sheet becomes visible.
+On iOS, this is the default behavior of the native action sheet.
+
 #### `showSeparators`: (optional)
 Show separators between items. On iOS, separators always show so this prop has no effect.
 
@@ -150,6 +160,17 @@ Modify the look of the separators rather than use the default look.
 #### `useModal`: (optional)
 Wrap the ActionSheet with a Modal, in order to show in front of other Modals that were already opened ([issue reference](https://github.com/expo/react-native-action-sheet/issues/164)).
 
+#### `destructiveColor`: (optional)
+Modify color for text of destructive option.
+
+## ActionSheetProvider Props
+
+The following props can be set directly on the `ActionSheetProvider`
+
+#### `useNativeDriver` (optional)
+Windows only option that provides the option to disable the [native animation](https://reactnative.dev/docs/animated#using-the-native-driver) driver for React Native Windows projects targeting _Windows 10 Version-1809 ; Build-10.0.17763.0_ and earlier. `useNativeDriver` is [supported in Version-1903 and later](https://microsoft.github.io/react-native-windows/docs/win10-compat) so if your project is targeting that, you don't need to set this prop.
+
+
 ## Try it out
 
 Try it in Expo: https://expo.io/@community/react-native-action-sheet-example

example/app.json

@@ -4,7 +4,6 @@
     "description": "A cross-platform ActionSheet component. https://github.com/expo/react-native-action-sheet",
     "slug": "react-native-action-sheet-example",
     "privacy": "public",
-    "sdkVersion": "35.0.0",
     "version": "3.0.0",
     "orientation": "portrait",
     "primaryColor": "#cccccc",
@@ -15,4 +14,4 @@
       "web"
     ]
   }
-}
+}

example/package.json

@@ -14,17 +14,17 @@
   "dependencies": {
     "@expo/react-native-action-sheet": "../src",
     "@expo/vector-icons": "^10.0.0",
-    "expo": "^35.0.0",
+    "expo": "^39.0.0",
     "hoist-non-react-statics": "^3.3.0",
-    "react": "16.8.3",
-    "react-dom": "16.8.3",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-35.0.0.tar.gz",
-    "react-native-web": "^0.11.5"
+    "react": "16.13.1",
+    "react-dom": "16.13.1",
+    "react-native": "https://github.com/expo/react-native/archive/sdk-39.0.3.tar.gz",
+    "react-native-web": "~0.13.7"
   },
   "devDependencies": {
-    "@types/react": "^16.8.23",
-    "@types/react-native": "^0.57.65",
-    "babel-preset-expo": "^7.0.0",
-    "typescript": "^3.5.3"
+    "@types/react": "~16.9.35",
+    "@types/react-native": "~0.63.2",
+    "babel-preset-expo": "^8.3.0",
+    "typescript": "~3.9.2"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/react-native-action-sheet",
-  "version": "3.7.0",
+  "version": "3.11.0",
   "description": "A cross-platform ActionSheet for React Native",
   "react-native": "lib/module/index.js",
   "types": "lib/typescript/index.d.ts",
@@ -35,8 +35,8 @@
   "devDependencies": {
     "@react-native-community/bob": "^0.6.1",
     "@react-native-community/eslint-config": "^0.0.5",
-    "@semantic-release/changelog": "^3.0.5",
-    "@semantic-release/git": "^7.0.18",
+    "@semantic-release/changelog": "^5.0.1",
+    "@semantic-release/git": "^9.0.0",
     "@types/react": "^16.8.23",
     "@types/react-native": "^0.57.65",
     "@typescript-eslint/eslint-plugin": "^1.12.0",
@@ -49,7 +49,7 @@
     "prettier": "^1.18.2",
     "react": "^16.8.6",
     "react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz",
-    "semantic-release": "^15.13.28",
+    "semantic-release": "^17.4.4",
     "typescript": "^3.5.3"
   },
   "peerDependencies": {

src/ActionSheet/ActionGroup.tsx

@@ -1,5 +1,15 @@
 import * as React from 'react';
-import { StyleSheet, Text, Image, View, ScrollView } from 'react-native';
+import {
+  AccessibilityInfo,
+  findNodeHandle,
+  Image,
+  Platform,
+  ScrollView,
+  StyleSheet,
+  Text,
+  UIManager,
+  View,
+} from 'react-native';
 import TouchableNativeFeedbackSafe from './TouchableNativeFeedbackSafe';
 import { ActionSheetOptions } from '../types';
 
@@ -14,6 +24,36 @@ const BLACK_54PC_TRANSPARENT = '#0000008a';
 const BLACK_87PC_TRANSPARENT = '#000000de';
 const DESTRUCTIVE_COLOR = '#d32f2f';
 
+/**
+ * Can be used as a React ref for a component to auto-focus for accessibility on render.
+ * @param ref The component to auto-focus
+ */
+const focusViewOnRender = (ref: React.Component | null) => {
+  if (ref) {
+    const reactTag = findNodeHandle(ref);
+    if (reactTag) {
+      if (Platform.OS === 'android') {
+        // @ts-ignore: sendAccessibilityEvent is missing from @types/react-native
+        UIManager.sendAccessibilityEvent(
+          reactTag,
+          // @ts-ignore: AccessibilityEventTypes is missing from @types/react-native
+          UIManager.AccessibilityEventTypes.typeViewFocused
+        );
+      } else {
+        AccessibilityInfo.setAccessibilityFocus(reactTag);
+      }
+    }
+  }
+};
+
+const isIndexDestructive = (index: number, destructiveIndex?: number | number[]) => {
+  if (Array.isArray(destructiveIndex)) {
+    return destructiveIndex.includes(index);
+  }
+
+  return index === destructiveIndex;
+};
+
 export default class ActionGroup extends React.Component<Props> {
   static defaultProps = {
     title: null,
@@ -75,11 +115,13 @@ export default class ActionGroup extends React.Component<Props> {
       options,
       icons,
       destructiveButtonIndex,
+      destructiveColor = DESTRUCTIVE_COLOR,
       onSelect,
       startIndex,
       length,
       textStyle,
       tintColor,
+      autoFocus,
       showSeparators,
     } = this.props;
     const optionViews: React.ReactNode[] = [];
@@ -92,16 +134,18 @@ export default class ActionGroup extends React.Component<Props> {
       const defaultColor = tintColor
         ? tintColor
         : (textStyle || {}).color || BLACK_87PC_TRANSPARENT;
-      const color = i === destructiveButtonIndex ? DESTRUCTIVE_COLOR : defaultColor;
+      const color = isIndexDestructive(i, destructiveButtonIndex) ? destructiveColor : defaultColor;
       const iconSource = icons != null ? icons[i] : null;
 
       optionViews.push(
         <TouchableNativeFeedbackSafe
+          ref={autoFocus && i === 0 ? focusViewOnRender : undefined}
           key={i}
           pressInDelay={0}
           background={nativeFeedbackBackground}
           onPress={() => onSelect(i)}
           style={styles.button}
+          accessibilityRole="button"
           accessibilityLabel={options[i]}>
           {this._renderIconElement(iconSource, color)}
           <Text style={[styles.text, textStyle, { color }]}>{options[i]}</Text>
@@ -133,6 +177,7 @@ const styles = StyleSheet.create({
     width: 24,
     height: 24,
     marginRight: 32,
+    justifyContent: 'center',
   },
   message: {
     marginTop: 12,

src/ActionSheet/index.ios.tsx

@@ -32,7 +32,9 @@ export default class ActionSheet extends React.Component<Props> {
       title: dataOptions.title || undefined,
       message: dataOptions.message || undefined,
       anchor: dataOptions.anchor || undefined,
+      userInterfaceStyle: dataOptions.userInterfaceStyle || undefined,
     };
+    // @ts-ignore: Even though ActionSheetIOS supports array of numbers for `destructiveIndex` the types are not yet updated. See https://github.com/facebook/react-native/pull/18254.
     ActionSheetIOS.showActionSheetWithOptions(iosOptions, onSelect);
   }
 }

src/ActionSheet/index.tsx

@@ -55,7 +55,7 @@ export default class ActionSheet extends React.Component<Props, State> {
 
   render() {
     const { isVisible, overlayOpacity, options } = this.state;
-    const useModal = options ? options.useModal === true : false;
+    const useModal = options ? options.autoFocus || options.useModal === true : false;
     const overlay = isVisible ? (
       <Animated.View
         style={[
@@ -66,13 +66,19 @@ export default class ActionSheet extends React.Component<Props, State> {
         ]}
       />
     ) : null;
-    return (
+
+    // While the sheet is visible, hide the rest of the app's content from screen readers.
+    const appContent = (
       <View
-        pointerEvents={this.props.pointerEvents}
-        style={{
-          flex: 1,
-        }}>
+        style={styles.flexContainer}
+        importantForAccessibility={isVisible ? 'no-hide-descendants' : 'auto'}>
         {React.Children.only(this.props.children)}
+      </View>
+    );
+
+    return (
+      <View pointerEvents={this.props.pointerEvents} style={styles.flexContainer}>
+        {appContent}
         {isVisible && !useModal && (
           <React.Fragment>
             {overlay}
@@ -101,18 +107,20 @@ export default class ActionSheet extends React.Component<Props, State> {
       icons,
       tintIcons,
       destructiveButtonIndex,
+      destructiveColor,
       textStyle,
       tintColor,
       title,
       titleTextStyle,
       message,
       messageTextStyle,
+      autoFocus,
       showSeparators,
       containerStyle,
       separatorStyle,
     } = options;
     return (
-      <TouchableWithoutFeedback onPress={this._selectCancelButton}>
+      <TouchableWithoutFeedback importantForAccessibility="yes" onPress={this._selectCancelButton}>
         <Animated.View
           needsOffscreenAlphaCompositing={isAnimating}
           style={[
@@ -135,6 +143,7 @@ export default class ActionSheet extends React.Component<Props, State> {
               icons={icons}
               tintIcons={tintIcons === undefined ? true : tintIcons}
               destructiveButtonIndex={destructiveButtonIndex}
+              destructiveColor={destructiveColor}
               onSelect={this._onSelect}
               startIndex={0}
               length={optionsArray.length}
@@ -144,6 +153,7 @@ export default class ActionSheet extends React.Component<Props, State> {
               titleTextStyle={titleTextStyle}
               message={message || undefined}
               messageTextStyle={messageTextStyle}
+              autoFocus={autoFocus}
               showSeparators={showSeparators}
               containerStyle={containerStyle}
               separatorStyle={separatorStyle}
@@ -264,6 +274,9 @@ export default class ActionSheet extends React.Component<Props, State> {
 }
 
 const styles = StyleSheet.create({
+  flexContainer: {
+    flex: 1,
+  },
   overlay: {
     position: 'absolute',
     top: 0,

src/ActionSheetProvider.tsx

@@ -5,6 +5,7 @@ import { ActionSheetOptions } from './types';
 
 interface Props {
   children: React.ReactNode;
+  useNativeDriver?: boolean;
 }
 
 export default class ActionSheetProvider extends React.Component<Props> {
@@ -27,7 +28,7 @@ export default class ActionSheetProvider extends React.Component<Props> {
   render() {
     return (
       <Provider value={this.getContext()}>
-        <ActionSheet ref={this._actionSheetRef}>
+        <ActionSheet ref={this._actionSheetRef} useNativeDriver={this.props.useNativeDriver}>
           {React.Children.only(this.props.children)}
         </ActionSheet>
       </Provider>

src/types.ts

@@ -2,7 +2,10 @@ import * as React from 'react';
 import { TextStyle, ViewStyle } from 'react-native';
 
 export interface ActionSheetProps {
-  showActionSheetWithOptions: (options: ActionSheetOptions, callback: (i: number) => void) => void;
+  showActionSheetWithOptions: (
+    options: ActionSheetOptions,
+    callback: (i: number) => void | Promise<void>
+  ) => void;
 }
 
 // for iOS
@@ -12,8 +15,9 @@ export interface ActionSheetIOSOptions {
   message?: string;
   tintColor?: string;
   cancelButtonIndex?: number;
-  destructiveButtonIndex?: number;
+  destructiveButtonIndex?: number | number[];
   anchor?: number;
+  userInterfaceStyle?: 'light' | 'dark';
 }
 
 // for Android or Web
@@ -23,8 +27,10 @@ export interface ActionSheetOptions extends ActionSheetIOSOptions {
   textStyle?: TextStyle;
   titleTextStyle?: TextStyle;
   messageTextStyle?: TextStyle;
+  autoFocus?: boolean;
   showSeparators?: boolean;
   containerStyle?: ViewStyle;
   separatorStyle?: ViewStyle;
   useModal?: boolean;
+  destructiveColor?: string;
 }