Merge with develop

Author: paufau

README.md

@@ -1,15 +1,16 @@
 # react-native-multiple-modals
 
-The main goal of this library is to provide a component that allows to display multiple modals at the same time.
-
-No additional props to manage StatusBar or SafeArea. I try to make the ModalView component as lightweight as possible. It solves one problem - shows a modal. Everything else is the task of other components.
+Native Modal implementation which allows to display multiple Modals simultaneously.
 
 ## ✨ Features
 
 - 📱 iOS & Android
 - 🚀 Performant Native Implementation
 - ✅ Accessibility Support
 - 💯 Compatible with Expo
+- 💥 New Architecture
+  - 🛠️ iOS - Migration Started
+  - ⌛ Android - Planned
 
 ## Installation
 
@@ -48,7 +49,7 @@ const YourComponent = () => {
 
 ### `contentContainerStyle?: ViewStyle`
 
-Styles of the content wrapper.
+Styles of the content wrapper. Use it for aligning your content view.
 
 ---
 
@@ -73,7 +74,3 @@ When backdropProps are no longer enough.
 > _**NOTE**_: While rendering custom backdrop `onRequestClose` is not called, so you should handle backdrop press by yourself
 
 ---
-
-## Roadmap
-
-[ ] New Architecture support

ios/Library/ModalView.swift

@@ -31,6 +31,7 @@ final class ModalView: UIView {
 
         if (atIndex == 0) {
             self.modalViewController?.addReactSubview(subview)
+            UIAccessibility.post(notification: .screenChanged, argument: subview)
         }
     }
 
@@ -59,6 +60,7 @@ final class ModalView: UIView {
         self.modalViewController?.dismiss()
         self.modalViewController = nil
         self.isMounted = false
+        UIAccessibility.post(notification: .screenChanged, argument: null)
     }
 
     func update() {

ios/RNTModal.xcodeproj/project.pbxproj

@@ -9,6 +9,9 @@
 /* Begin PBXBuildFile section */
 		AF43775E2CB5A09C00334A86 /* RNTModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF43775C2CB5A09C00334A86 /* RNTModalView.swift */; };
 		AF43775F2CB5A09C00334A86 /* RNTModalViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = AF43775D2CB5A09C00334A86 /* RNTModalViewManager.m */; };
+		AFEFC13A2CC7F0210008863D /* ModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFEFC1372CC7F0210008863D /* ModalView.swift */; };
+		AFEFC13B2CC7F0210008863D /* ModalShadowVIew.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFEFC1362CC7F0210008863D /* ModalShadowVIew.swift */; };
+		AFEFC13C2CC7F0210008863D /* ModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFEFC1382CC7F0210008863D /* ModalViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -24,10 +27,13 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		AF43774B2CB59EF500334A86 /* libRNTModal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libRNTModal.a; path = "/Users/pavelpakseev/code/react_native_multiple_modals_app/modules/react-native-multiple-modals/ios/build/Debug-iphoneos/libRNTModal.a"; sourceTree = "<absolute>"; };
 		AF43775C2CB5A09C00334A86 /* RNTModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNTModalView.swift; sourceTree = "<group>"; };
 		AF43775D2CB5A09C00334A86 /* RNTModalViewManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNTModalViewManager.m; sourceTree = "<group>"; };
 		AF4377602CB5A09D00334A86 /* RNTModal-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNTModal-Bridging-Header.h"; sourceTree = "<group>"; };
+		AFEFC1352CC7F0140008863D /* libRNTModal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNTModal.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		AFEFC1362CC7F0210008863D /* ModalShadowVIew.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalShadowVIew.swift; sourceTree = "<group>"; };
+		AFEFC1372CC7F0210008863D /* ModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalView.swift; sourceTree = "<group>"; };
+		AFEFC1382CC7F0210008863D /* ModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -44,12 +50,24 @@
 		AF4377422CB59EF500334A86 = {
 			isa = PBXGroup;
 			children = (
+				AFEFC1392CC7F0210008863D /* Library */,
 				AF43775C2CB5A09C00334A86 /* RNTModalView.swift */,
 				AF43775D2CB5A09C00334A86 /* RNTModalViewManager.m */,
 				AF4377602CB5A09D00334A86 /* RNTModal-Bridging-Header.h */,
+				AFEFC1352CC7F0140008863D /* libRNTModal.a */,
 			);
 			sourceTree = "<group>";
 		};
+		AFEFC1392CC7F0210008863D /* Library */ = {
+			isa = PBXGroup;
+			children = (
+				AFEFC1362CC7F0210008863D /* ModalShadowVIew.swift */,
+				AFEFC1372CC7F0210008863D /* ModalView.swift */,
+				AFEFC1382CC7F0210008863D /* ModalViewController.swift */,
+			);
+			path = Library;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -69,7 +87,7 @@
 			packageProductDependencies = (
 			);
 			productName = RNTModal;
-			productReference = AF43774B2CB59EF500334A86 /* libRNTModal.a */;
+			productReference = AFEFC1352CC7F0140008863D /* libRNTModal.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -114,6 +132,9 @@
 			files = (
 				AF43775E2CB5A09C00334A86 /* RNTModalView.swift in Sources */,
 				AF43775F2CB5A09C00334A86 /* RNTModalViewManager.m in Sources */,
+				AFEFC13A2CC7F0210008863D /* ModalView.swift in Sources */,
+				AFEFC13B2CC7F0210008863D /* ModalShadowVIew.swift in Sources */,
+				AFEFC13C2CC7F0210008863D /* ModalViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-multiple-modals",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Native implementation with the ability to display multiple Modals",
   "author": "Pavel Pakseev <[email protected]> (https://github.com/paufau)",
   "license": "MIT",

src/ModalView.tsx

@@ -14,7 +14,7 @@ import { RNTModalView } from './RNTModalView';
 import { ScrollContextResetter } from './ScrollContextResetter';
 
 export type BackdropProps = Omit<PressableProps, 'onPress' | 'style'> & {
-  style: StyleProp<ViewStyle>;
+  style?: StyleProp<ViewStyle>;
 };
 
 export enum DismissalSource {
@@ -30,6 +30,9 @@ export type ModalViewProps = {
   backdropProps?: BackdropProps;
 };
 
+const backdropAccessibilityLabel = 'Backdrop';
+const backdropAccessibilityHint = 'Double-tap to close the modal';
+
 export const ModalView: FC<ModalViewProps> = ({
   children,
   renderBackdrop,
@@ -53,10 +56,10 @@ export const ModalView: FC<ModalViewProps> = ({
               renderBackdrop()
             ) : (
               <Pressable
-                onPress={() => onRequestDismiss?.(DismissalSource.Backdrop)}
-                accessible
-                accessibilityLabel='Backdrop'
+                accessibilityLabel={backdropAccessibilityLabel}
+                accessibilityHint={backdropAccessibilityHint}
                 {...backdropProps}
+                onPress={() => onRequestDismiss?.(DismissalSource.Backdrop)}
                 style={[styles.defaultBackdrop, backdropProps?.style]}
               />
             )}