From 5b56e604e2aad32d493a8cf5636fd8065319ab1b Mon Sep 17 00:00:00 2001 From: Dominic Go <18517029+dominicstop@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=20Refactor:=20Use=20`RNI`=20Prefix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Rename `RCT` prefix usage with `RNI. --- .../RCTModalView/RCTModalViewDelegate.swift | 31 ------- .../RNIModalView.swift} | 88 +++++++++---------- .../RNIModalViewController.swift} | 20 ++--- .../RNIModalView/RNIModalViewDelegate.swift | 31 +++++++ .../RNIModalViewError.swift} | 10 +-- .../RNIModalViewManager.m} | 2 +- .../RNIModalViewManager.swift} | 36 ++++---- .../RNIModalViewModule.m} | 4 +- .../RNIModalViewModule.swift} | 20 ++--- src/ModalView.ios.js | 2 +- src/ModalViewModule.js | 2 +- 11 files changed, 123 insertions(+), 123 deletions(-) delete mode 100644 ios/src_library/React Native/RCTModalView/RCTModalViewDelegate.swift rename ios/src_library/React Native/{RCTModalView/RCTModalView.swift => RNIModalView/RNIModalView.swift} (88%) rename ios/src_library/React Native/{RCTModalView/RCTModalViewController.swift => RNIModalView/RNIModalViewController.swift} (88%) create mode 100644 ios/src_library/React Native/RNIModalView/RNIModalViewDelegate.swift rename ios/src_library/React Native/{RCTModalView/RCTModalViewError.swift => RNIModalView/RNIModalViewError.swift} (73%) rename ios/src_library/React Native/{RCTModalView/RCTModalViewManager.m => RNIModalView/RNIModalViewManager.m} (96%) rename ios/src_library/React Native/{RCTModalView/RCTModalViewManager.swift => RNIModalView/RNIModalViewManager.swift} (75%) rename ios/src_library/React Native/{RCTModalView/RCTModalViewModule.m => RNIModalView/RNIModalViewModule.m} (80%) rename ios/src_library/React Native/{RCTModalView/RCTModalViewModule.swift => RNIModalView/RNIModalViewModule.swift} (88%) diff --git a/ios/src_library/React Native/RCTModalView/RCTModalViewDelegate.swift b/ios/src_library/React Native/RCTModalView/RCTModalViewDelegate.swift deleted file mode 100644 index 572e9372..00000000 --- a/ios/src_library/React Native/RCTModalView/RCTModalViewDelegate.swift +++ /dev/null @@ -1,31 +0,0 @@ -// -// RCTModalViewDelegate.swift -// nativeUIModulesTest -// -// Created by Dominic Go on 6/17/20. -// Copyright © 2020 Facebook. All rights reserved. -// - -import Foundation - -@objc protocol RCTModalViewPresentDelegate: AnyObject { - - func onPresentModalView(modalView: RCTModalView); - - func onDismissModalView(modalView: RCTModalView); - -}; - -@objc protocol RCTModalViewFocusDelegate: AnyObject { - - /** - - Parameters: - - modalLevel: the `RCTModalView` sender's current modalLevel - - modalUUID : the `RCTModalView` sender's modalUUID - - isInFocus : Whether or not the modal is going in or out of focus - */ - func onModalChangeFocus(modalLevel: Int, modalUUID: String, isInFocus: Bool); - -}; - - diff --git a/ios/src_library/React Native/RCTModalView/RCTModalView.swift b/ios/src_library/React Native/RNIModalView/RNIModalView.swift similarity index 88% rename from ios/src_library/React Native/RCTModalView/RCTModalView.swift rename to ios/src_library/React Native/RNIModalView/RNIModalView.swift index 72f18cef..c05055ee 100644 --- a/ios/src_library/React Native/RCTModalView/RCTModalView.swift +++ b/ios/src_library/React Native/RNIModalView/RNIModalView.swift @@ -1,5 +1,5 @@ // -// RCTModalView.swift +// RNIModalView.swift // nativeUIModulesTest // // Created by Dominic Go on 6/9/20. @@ -9,9 +9,9 @@ import Foundation -class RCTModalView: UIView { +class RNIModalView: UIView { - typealias completionResult = ((_ isSuccess: Bool, _ error: RCTModalViewError?) -> ())?; + typealias completionResult = ((_ isSuccess: Bool, _ error: RNIModalViewError?) -> ())?; struct DefaultValues { static let presentationStyle: UIModalPresentationStyle = { @@ -36,12 +36,12 @@ class RCTModalView: UIView { // ---------------- weak var bridge : RCTBridge?; - weak var delegate: RCTModalViewPresentDelegate?; + weak var delegate: RNIModalViewPresentDelegate?; var isInFocus : Bool = false; var isPresented: Bool = false; - private var modalVC : RCTModalViewController?; + private var modalVC : RNIModalViewController?; private var modalNVC : UINavigationController?; private var touchHandler: RCTTouchHandler!; private var reactSubview: UIView?; @@ -59,7 +59,7 @@ class RCTModalView: UIView { // MARK: Properties: React Props - Events/Callbacks // ------------------------------------------------ - // RN event callback for when a RCTModalViewManager "command" + // RN event callback for when a RNIModalViewManager "command" // has been completed via dispatchViewManagerCommand from js. // Used in js/rn-side for wrapping UIManager commands inside // promises so they can be resolved/rejected. @@ -108,7 +108,7 @@ class RCTModalView: UIView { guard let blurStyle = UIBlurEffect.Style.fromString(self.modalBGBlurEffectStyle) else { RCTLogWarn( - "RCTModalView, modalBGBlurEffectStyle: Invalid value - " + "RNIModalView, modalBGBlurEffectStyle: Invalid value - " + "\(self.modalBGBlurEffectStyle) is not a valid blur style" ); return; @@ -128,7 +128,7 @@ class RCTModalView: UIView { guard let style = UIModalPresentationStyle.fromString(self.modalPresentationStyle) else { RCTLogWarn( - "RCTModalView, modalPresentationStyle: Invalid value - " + "RNIModalView, modalPresentationStyle: Invalid value - " + "\(self.modalPresentationStyle) is not a valid presentation style" ); return; @@ -143,12 +143,12 @@ class RCTModalView: UIView { self._modalPresentationStyle = style; #if DEBUG - print("RCTModalView, modalPresentationStyle didSet: \(style.stringDescription())"); + print("RNIModalView, modalPresentationStyle didSet: \(style.stringDescription())"); #endif default: RCTLogWarn( - "RCTModalView, modalPresentationStyle: Unsupported Presentation Style - " + "RNIModalView, modalPresentationStyle: Unsupported Presentation Style - " + "\(self.modalPresentationStyle) is not a supported presenatation style" ); }; @@ -163,13 +163,13 @@ class RCTModalView: UIView { guard let style = UIModalTransitionStyle.fromString(self.modalTransitionStyle as String) else { - RCTLogWarn("RCTModalView, modalTransitionStyle: Invalid value"); + RCTLogWarn("RNIModalView, modalTransitionStyle: Invalid value"); return; }; self._modalTransitionStyle = style; #if DEBUG - print("RCTModalView, modalTransitionStyle didSet: \(style.stringDescription())"); + print("RNIModalView, modalTransitionStyle didSet: \(style.stringDescription())"); #endif } }; @@ -234,7 +234,7 @@ class RCTModalView: UIView { let reactSubview = self.reactSubview else { return }; #if DEBUG - print("RCTModalView, layoutSubviews - for reactTag: \(self.reactTag ?? -1)"); + print("RNIModalView, layoutSubviews - for reactTag: \(self.reactTag ?? -1)"); #endif if !reactSubview.isDescendant(of: modalVC.view) { @@ -264,12 +264,12 @@ class RCTModalView: UIView { super.insertReactSubview(subview, at: atIndex); guard (self.reactSubview == nil) else { - RCTLogWarn("RCTModalView, insertReactSubview: Modal view can only have one subview"); + RCTLogWarn("RNIModalView, insertReactSubview: Modal view can only have one subview"); return; }; #if DEBUG - print("RCTModalView, insertReactSubview - for reactTag: \(self.reactTag ?? -1)"); + print("RNIModalView, insertReactSubview - for reactTag: \(self.reactTag ?? -1)"); #endif subview.removeFromSuperview(); @@ -294,12 +294,12 @@ class RCTModalView: UIView { super.removeReactSubview(subview); guard self.reactSubview == subview else { - RCTLogWarn("RCTModalView, removeReactSubview: Cannot remove view other than modal view"); + RCTLogWarn("RNIModalView, removeReactSubview: Cannot remove view other than modal view"); return; }; #if DEBUG - print("RCTModalView, removeReactSubview - for reactTag: \(self.reactTag ?? -1)"); + print("RNIModalView, removeReactSubview - for reactTag: \(self.reactTag ?? -1)"); #endif // modal contents has been unmounted so reset react subview @@ -315,7 +315,7 @@ class RCTModalView: UIView { // MARK: Public Functions // ---------------------- -extension RCTModalView { +extension RNIModalView { public func presentModal(completion: completionResult = nil) { let hasWindow: Bool = (self.window != nil); @@ -325,7 +325,7 @@ extension RCTModalView { let (index, topMostPresentedVC) = self.getTopMostPresentedVC() else { #if DEBUG - print("RCTModalView, presentModal: guard check failed"); + print("RNIModalView, presentModal: guard check failed"); #endif completion?(false, .modalAlreadyPresented); return; @@ -347,7 +347,7 @@ extension RCTModalView { self.isPresented = true; #if DEBUG - print("RCTModalView, presentModal: Start" + print("RNIModalView, presentModal: Start" + " - for reactTag: \(self.reactTag ?? -1)" + " - modalLevel: \(self.modalLevel)" + " - modalID: \(self.modalID ?? "N/A")" @@ -373,7 +373,7 @@ extension RCTModalView { completion?(true, nil); #if DEBUG - print("RCTModalView, presentModal: Finished"); + print("RNIModalView, presentModal: Finished"); #endif }; }; @@ -383,7 +383,7 @@ extension RCTModalView { let modalVC = self.modalVC else { #if DEBUG - print("RCTModalView, dismissModal failed:" + print("RNIModalView, dismissModal failed:" + " - isPresented \(self.isPresented)" ); #endif @@ -394,7 +394,7 @@ extension RCTModalView { let isModalInFocus = self.isModalInFocus(); guard isModalInFocus, self.allowModalForceDismiss else { #if DEBUG - print("RCTModalView, dismissModal failed: Modal not in focus"); + print("RNIModalView, dismissModal failed: Modal not in focus"); #endif completion?(false, .modalDismissFailedNotInFocus); return; @@ -405,7 +405,7 @@ extension RCTModalView { : modalVC.presentingViewController! #if DEBUG - print("RCTModalView, dismissModal: Start - for reactTag: \(self.reactTag ?? -1)"); + print("RNIModalView, dismissModal: Start - for reactTag: \(self.reactTag ?? -1)"); #endif /// begin temp. hiding modals that are no longer visibile @@ -428,7 +428,7 @@ extension RCTModalView { completion?(true, nil); #if DEBUG - print("RCTModalView, dismissModal: Finished"); + print("RNIModalView, dismissModal: Finished"); #endif }; }; @@ -437,7 +437,7 @@ extension RCTModalView { // MARK: Public Functions for ViewManager // -------------------------------------- - // called by RCTModalViewManager + // called by RNIModalViewManager // set isModalInPresentation for this modal from RN public func requestModalPresentation( _ requestID : NSNumber, @@ -461,7 +461,7 @@ extension RCTModalView { params["success"] = success; if let errorCode = error { params["errorCode" ] = errorCode.rawValue; - params["errorMessage"] = RCTModalViewError.getErrorMessage(for: errorCode); + params["errorMessage"] = RNIModalViewError.getErrorMessage(for: errorCode); }; completion?(success, error); @@ -486,15 +486,15 @@ extension RCTModalView { // MARK: Extension: Private Functions // ---------------------------------- -extension RCTModalView { +extension RNIModalView { private func initControllers(){ #if DEBUG - print("RCTModalView init - initControllers for modal: \(self.modalID ?? self.modalUUID as NSString)"); + print("RNIModalView init - initControllers for modal: \(self.modalID ?? self.modalUUID as NSString)"); #endif self.modalVC = { - let vc = RCTModalViewController(); + let vc = RNIModalViewController(); vc.modalViewRef = self; vc.isBGBlurred = self.isModalBGBlurred; @@ -522,7 +522,7 @@ extension RCTModalView { private func deinitControllers(){ #if DEBUG - print("RCTModalView init - deinitControllers for modal: \(self.modalID ?? self.modalUUID as NSString)"); + print("RNIModalView init - deinitControllers for modal: \(self.modalID ?? self.modalUUID as NSString)"); #endif self.modalVC?.reactView = nil; @@ -538,13 +538,13 @@ extension RCTModalView { let reactSubview = self.reactSubview else { #if DEBUG - print("RCTModalView, notifyForBoundsChange: guard check failed"); + print("RNIModalView, notifyForBoundsChange: guard check failed"); #endif return; }; #if DEBUG - print("RCTModalView, notifyForBoundsChange - for reactTag: \(self.reactTag ?? -1)"); + print("RNIModalView, notifyForBoundsChange - for reactTag: \(self.reactTag ?? -1)"); #endif bridge.uiManager.setSize(newBounds.size, for: reactSubview); @@ -553,7 +553,7 @@ extension RCTModalView { private func getTopMostPresentedVC() -> (topLevel: Int, topVC: UIViewController)? { guard let rootVC = UIWindow.key?.rootViewController else { #if DEBUG - print("RCTModalView, getTopMostVC Error: could not get root VC. "); + print("RNIModalView, getTopMostVC Error: could not get root VC. "); #endif return nil; }; @@ -575,7 +575,7 @@ extension RCTModalView { private func getPresentedVCList() -> [UIViewController] { guard let rootVC = UIWindow.key?.rootViewController else { #if DEBUG - print("RCTModalView, getTopMostVC Error: could not get root VC. "); + print("RNIModalView, getTopMostVC Error: could not get root VC. "); #endif return []; }; @@ -643,7 +643,7 @@ extension RCTModalView { // MARK: Extension: UIAdaptivePresentationControllerDelegate // --------------------------------------------------------- -extension RCTModalView: UIAdaptivePresentationControllerDelegate { +extension RNIModalView: UIAdaptivePresentationControllerDelegate { func presentationControllerWillDismiss(_ presentationController: UIPresentationController) { if self.hideNonVisibleModals { @@ -655,7 +655,7 @@ extension RCTModalView: UIAdaptivePresentationControllerDelegate { ); #if DEBUG - print("RCTModalView, presentationControllerWillDismiss" + print("RNIModalView, presentationControllerWillDismiss" + " - for reactTag: \(self.reactTag ?? -1)" ); #endif @@ -679,7 +679,7 @@ extension RCTModalView: UIAdaptivePresentationControllerDelegate { self.deinitControllers(); #if DEBUG - print("RCTModalView, presentationControllerDidDismiss" + print("RNIModalView, presentationControllerDidDismiss" + " - for reactTag: \(self.reactTag ?? -1)" ); #endif @@ -691,7 +691,7 @@ extension RCTModalView: UIAdaptivePresentationControllerDelegate { ); #if DEBUG - print("RCTModalView, presentationControllerDidAttemptToDismiss" + print("RNIModalView, presentationControllerDidAttemptToDismiss" + " - for reactTag: \(self.reactTag ?? -1)" ); #endif @@ -699,21 +699,21 @@ extension RCTModalView: UIAdaptivePresentationControllerDelegate { }; // ------------------------------------------ -// MARK: Extension: RCTModalViewFocusDelegate +// MARK: Extension: RNIModalViewFocusDelegate // ------------------------------------------ -extension RCTModalView: RCTModalViewFocusDelegate { +extension RNIModalView: RNIModalViewFocusDelegate { func onModalChangeFocus(modalLevel: Int, modalUUID: String, isInFocus: Bool) { guard /// defer if the receiver of the event is the same as the sender - /// i.e defer if this instance of `RCTModalView` was the one who broadcasted the event + /// i.e defer if this instance of `RNIModalView` was the one who broadcasted the event self.modalUUID != modalUUID, /// defer if the modal is not currently presented or if the modalLevel is -1 self.isPresented && self.modalLevel > 0 else { return }; if isInFocus && self.isInFocus { - /// a new `RCTModalView` instance is in focus and this modal was prev. in focus so + /// a new `RNIModalView` instance is in focus and this modal was prev. in focus so /// this modal shoud be now 'blurred' self.isInFocus = false; self.onModalBlur?( @@ -721,7 +721,7 @@ extension RCTModalView: RCTModalViewFocusDelegate { ); } else if !isInFocus && !self.isInFocus { - /// a `RCTModalView` instance has lost focus, so the prev modal shoul be focused + /// a `RNIModalView` instance has lost focus, so the prev modal shoul be focused /// defer if the receiver's modalLevel isn't 1 value below the sender's modalLevel guard self.modalLevel + 1 >= modalLevel else { return }; diff --git a/ios/src_library/React Native/RCTModalView/RCTModalViewController.swift b/ios/src_library/React Native/RNIModalView/RNIModalViewController.swift similarity index 88% rename from ios/src_library/React Native/RCTModalView/RCTModalViewController.swift rename to ios/src_library/React Native/RNIModalView/RNIModalViewController.swift index 7936ca09..83f69974 100644 --- a/ios/src_library/React Native/RCTModalView/RCTModalViewController.swift +++ b/ios/src_library/React Native/RNIModalView/RNIModalViewController.swift @@ -1,5 +1,5 @@ // -// RCTModalViewController.swift +// RNIModalViewController.swift // nativeUIModulesTest // // Created by Dominic Go on 6/9/20. @@ -8,13 +8,13 @@ import Foundation -class RCTModalViewController: UIViewController { +class RNIModalViewController: UIViewController { var lastViewFrame: CGRect?; var boundsDidChangeBlock: ((CGRect) -> Void)?; var modalID: NSString? = nil; - weak var modalViewRef: RCTModalView?; + weak var modalViewRef: RNIModalView?; var isBGTransparent: Bool = true { didSet { @@ -42,7 +42,7 @@ class RCTModalViewController: UIViewController { let blurEffectStyle = self.blurEffectStyle else { return }; #if DEBUG - print("RCTModalViewController, didSet blurEffectStyle: \(blurEffectStyle.stringDescription())"); + print("RNIModalViewController, didSet blurEffectStyle: \(blurEffectStyle.stringDescription())"); #endif self.setBGBlur(); @@ -63,7 +63,7 @@ class RCTModalViewController: UIViewController { super.viewDidLoad(); #if DEBUG - print("RCTModalViewController, viewDidLoad"); + print("RNIModalViewController, viewDidLoad"); #endif // setup vc's view @@ -86,13 +86,13 @@ class RCTModalViewController: UIViewController { guard let boundsDidChangeBlock = self.boundsDidChangeBlock else { #if DEBUG - print("RCTModalViewController, viewDidLayoutSubviews: guard check failed"); + print("RNIModalViewController, viewDidLayoutSubviews: guard check failed"); #endif return; }; #if DEBUG - print("RCTModalViewController, viewDidLayoutSubviews"); + print("RNIModalViewController, viewDidLayoutSubviews"); #endif let didChangeViewFrame: Bool = !( @@ -121,7 +121,7 @@ class RCTModalViewController: UIViewController { #if DEBUG print( - "RCTModalViewController, setBGTransparent" + "RNIModalViewController, setBGTransparent" + " - set backgroundColor: \(self.isBGTransparent)" ); #endif @@ -140,7 +140,7 @@ class RCTModalViewController: UIViewController { blurEffectView.effect = UIBlurEffect(style: blurEffectStyle); #if DEBUG - print("RCTModalViewController, setBGBlur: update blurEffectStyle"); + print("RNIModalViewController, setBGBlur: update blurEffectStyle"); #endif } else { @@ -158,7 +158,7 @@ class RCTModalViewController: UIViewController { }(); #if DEBUG - print("RCTModalViewController, setBGBlur: init. blurEffectView"); + print("RNIModalViewController, setBGBlur: init. blurEffectView"); #endif }; diff --git a/ios/src_library/React Native/RNIModalView/RNIModalViewDelegate.swift b/ios/src_library/React Native/RNIModalView/RNIModalViewDelegate.swift new file mode 100644 index 00000000..4af13a0e --- /dev/null +++ b/ios/src_library/React Native/RNIModalView/RNIModalViewDelegate.swift @@ -0,0 +1,31 @@ +// +// RNIModalViewDelegate.swift +// nativeUIModulesTest +// +// Created by Dominic Go on 6/17/20. +// Copyright © 2020 Facebook. All rights reserved. +// + +import Foundation + +@objc protocol RNIModalViewPresentDelegate: AnyObject { + + func onPresentModalView(modalView: RNIModalView); + + func onDismissModalView(modalView: RNIModalView); + +}; + +@objc protocol RNIModalViewFocusDelegate: AnyObject { + + /** + - Parameters: + - modalLevel: the `RNIModalView` sender's current modalLevel + - modalUUID : the `RNIModalView` sender's modalUUID + - isInFocus : Whether or not the modal is going in or out of focus + */ + func onModalChangeFocus(modalLevel: Int, modalUUID: String, isInFocus: Bool); + +}; + + diff --git a/ios/src_library/React Native/RCTModalView/RCTModalViewError.swift b/ios/src_library/React Native/RNIModalView/RNIModalViewError.swift similarity index 73% rename from ios/src_library/React Native/RCTModalView/RCTModalViewError.swift rename to ios/src_library/React Native/RNIModalView/RNIModalViewError.swift index 1fdce807..88458a40 100644 --- a/ios/src_library/React Native/RCTModalView/RCTModalViewError.swift +++ b/ios/src_library/React Native/RNIModalView/RNIModalViewError.swift @@ -1,5 +1,5 @@ // -// RCTModalViewError.swift +// RNIModalViewError.swift // nativeUIModulesTest // // Created by Dominic Go on 6/26/20. @@ -7,20 +7,20 @@ import Foundation -public enum RCTModalViewError: String, CaseIterable { +public enum RNIModalViewError: String, CaseIterable { case modalAlreadyPresented; case modalAlreadyDismissed; case modalDismissFailedNotInFocus; var errorMessage: String { - RCTModalViewError.getErrorMessage(for: self); + RNIModalViewError.getErrorMessage(for: self); }; - static func withLabel(_ label: String) -> RCTModalViewError? { + static func withLabel(_ label: String) -> RNIModalViewError? { return self.allCases.first{ $0.rawValue == label }; }; - static func getErrorMessage(for errorCase: RCTModalViewError) -> String { + static func getErrorMessage(for errorCase: RNIModalViewError) -> String { switch errorCase { case .modalAlreadyDismissed: return "Cannot dismiss modal because it's currently not presenetd"; diff --git a/ios/src_library/React Native/RCTModalView/RCTModalViewManager.m b/ios/src_library/React Native/RNIModalView/RNIModalViewManager.m similarity index 96% rename from ios/src_library/React Native/RCTModalView/RCTModalViewManager.m rename to ios/src_library/React Native/RNIModalView/RNIModalViewManager.m index 11fc5c5f..c7a74a4a 100644 --- a/ios/src_library/React Native/RCTModalView/RCTModalViewManager.m +++ b/ios/src_library/React Native/RNIModalView/RNIModalViewManager.m @@ -1,7 +1,7 @@ #import -@interface RCT_EXTERN_MODULE(RCTModalViewManager, RCTViewManager) +@interface RCT_EXTERN_MODULE(RNIModalViewManager, RCTViewManager) // ------------------------------ // MARK: Props - Callbacks/Events diff --git a/ios/src_library/React Native/RCTModalView/RCTModalViewManager.swift b/ios/src_library/React Native/RNIModalView/RNIModalViewManager.swift similarity index 75% rename from ios/src_library/React Native/RCTModalView/RCTModalViewManager.swift rename to ios/src_library/React Native/RNIModalView/RNIModalViewManager.swift index 40f3434d..f0565c7f 100644 --- a/ios/src_library/React Native/RCTModalView/RCTModalViewManager.swift +++ b/ios/src_library/React Native/RNIModalView/RNIModalViewManager.swift @@ -1,5 +1,5 @@ // -// RCTModalViewManager.swift +// RNIModalViewManager.swift // nativeUIModulesTest // // Created by Dominic Go on 6/9/20. @@ -9,9 +9,9 @@ import Foundation -@objc (RCTModalViewManager) -class RCTModalViewManager: RCTViewManager { - static var sharedInstance: RCTModalViewManager!; +@objc (RNIModalViewManager) +class RNIModalViewManager: RCTViewManager { + static var sharedInstance: RNIModalViewManager!; override static func requiresMainQueueSetup() -> Bool { return true; @@ -19,17 +19,17 @@ class RCTModalViewManager: RCTViewManager { // a weak ref to the currently presented modals // currently unused, remove later - var presentedModalRefs = NSMapTable.init( + var presentedModalRefs = NSMapTable.init( keyOptions : .copyIn, valueOptions: .weakMemory ); - var delegatesFocus = MulticastDelegate(); + var delegatesFocus = MulticastDelegate(); private var currentModalLevel = -1; override func view() -> UIView! { - let view = RCTModalView(bridge: self.bridge); + let view = RNIModalView(bridge: self.bridge); view.delegate = self; self.delegatesFocus.add(view); @@ -38,7 +38,7 @@ class RCTModalViewManager: RCTViewManager { override init() { super.init(); - RCTModalViewManager.sharedInstance = self; + RNIModalViewManager.sharedInstance = self; }; @objc override func constantsToExport() -> [AnyHashable : Any]! { @@ -55,17 +55,17 @@ class RCTModalViewManager: RCTViewManager { DispatchQueue.main.async { guard let component = self.bridge.uiManager.view(forReactTag: node), - let modalView = component as? RCTModalView + let modalView = component as? RNIModalView else { #if DEBUG - print("RCTModalViewManager, requestModalOpen failed"); + print("RNIModalViewManager, requestModalOpen failed"); #endif return; }; #if DEBUG print( - "RCTModalViewManager, requestModalOpen Received - " + "RNIModalViewManager, requestModalOpen Received - " + "prevVisibility: \(modalView.isPresented) and nextVisibility: \(visibility) - " + "For node: \(node) and requestID: \(requestID)" ); @@ -79,17 +79,17 @@ class RCTModalViewManager: RCTViewManager { DispatchQueue.main.async { guard let component = self.bridge.uiManager.view(forReactTag: node), - let modalView = component as? RCTModalView + let modalView = component as? RNIModalView else { #if DEBUG - print("RCTModalViewManager, requestModalInfo failed"); + print("RNIModalViewManager, requestModalInfo failed"); #endif return; }; #if DEBUG print( - "RCTModalViewManager, requestModalInfo Received - " + "RNIModalViewManager, requestModalInfo Received - " + "For node: \(node) and requestID: \(requestID)" ); #endif @@ -100,12 +100,12 @@ class RCTModalViewManager: RCTViewManager { }; // --------------------------------- -// MARK: RCTModalViewPresentDelegate +// MARK: RNIModalViewPresentDelegate // --------------------------------- -extension RCTModalViewManager: RCTModalViewPresentDelegate { +extension RNIModalViewManager: RNIModalViewPresentDelegate { - func onPresentModalView(modalView: RCTModalView) { + func onPresentModalView(modalView: RNIModalView) { let modalLevel = modalView.modalLevel; let modalUUID = modalView.modalUUID; @@ -122,7 +122,7 @@ extension RCTModalViewManager: RCTModalViewPresentDelegate { }; }; - func onDismissModalView(modalView: RCTModalView) { + func onDismissModalView(modalView: RNIModalView) { let modalLevel = modalView.modalLevelPrev; let modalUUID = modalView.modalUUID; diff --git a/ios/src_library/React Native/RCTModalView/RCTModalViewModule.m b/ios/src_library/React Native/RNIModalView/RNIModalViewModule.m similarity index 80% rename from ios/src_library/React Native/RCTModalView/RCTModalViewModule.m rename to ios/src_library/React Native/RNIModalView/RNIModalViewModule.m index ca3194e6..fbfc20f1 100644 --- a/ios/src_library/React Native/RCTModalView/RCTModalViewModule.m +++ b/ios/src_library/React Native/RNIModalView/RNIModalViewModule.m @@ -1,5 +1,5 @@ // -// RCTModalViewModule.m +// RNIModalViewModule.m // RNSwiftReviewer // // Created by Dominic Go on 7/11/20. @@ -9,7 +9,7 @@ #import "React/RCTEventEmitter.h" -@interface RCT_EXTERN_MODULE(RCTModalViewModule, RCTEventEmitter) +@interface RCT_EXTERN_MODULE(RNIModalViewModule, RCTEventEmitter) RCT_EXTERN_METHOD(dismissModalByID : (NSString)modalID diff --git a/ios/src_library/React Native/RCTModalView/RCTModalViewModule.swift b/ios/src_library/React Native/RNIModalView/RNIModalViewModule.swift similarity index 88% rename from ios/src_library/React Native/RCTModalView/RCTModalViewModule.swift rename to ios/src_library/React Native/RNIModalView/RNIModalViewModule.swift index 6d04b923..fddf7fea 100644 --- a/ios/src_library/React Native/RCTModalView/RCTModalViewModule.swift +++ b/ios/src_library/React Native/RNIModalView/RNIModalViewModule.swift @@ -1,5 +1,5 @@ // -// RCTModalViewModule.swift +// RNIModalViewModule.swift // RNSwiftReviewer // // Created by Dominic Go on 7/11/20. @@ -8,8 +8,8 @@ import Foundation -@objc(RCTModalViewModule) -class RCTModalViewModule: RCTEventEmitter { +@objc(RNIModalViewModule) +class RNIModalViewModule: RCTEventEmitter { enum Events: String, CaseIterable { case placeholderEvent; @@ -40,12 +40,12 @@ class RCTModalViewModule: RCTEventEmitter { // MARK: Extension: JS Functions // ----------------------------- -extension RCTModalViewModule { +extension RNIModalViewModule { @objc func dismissModalByID(_ modalID: NSString, callback: @escaping RCTResponseSenderBlock) { DispatchQueue.main.async { guard let rootVC = UIWindow.key?.rootViewController else { #if DEBUG - print("RCTModalViewModule, dismissModalByID Error: could not get root VC. "); + print("RNIModalViewModule, dismissModalByID Error: could not get root VC. "); #endif callback([false]); return; @@ -58,7 +58,7 @@ extension RCTModalViewModule { if let navVC = presentedVC as? UINavigationController, let rootVC = navVC.viewControllers.first, - let modalVC = rootVC as? RCTModalViewController, + let modalVC = rootVC as? RNIModalViewController, // check if this is the modal we want to dismiss modalVC.modalID == modalID { @@ -67,7 +67,7 @@ extension RCTModalViewModule { callback([true]); #if DEBUG - print("RCTModalViewModule, dismissModalByID: dismissing \(modalVC.modalID ?? "N/A")"); + print("RNIModalViewModule, dismissModalByID: dismissing \(modalVC.modalID ?? "N/A")"); #endif }; @@ -77,7 +77,7 @@ extension RCTModalViewModule { guard isSuccess else { #if DEBUG print( - "RCTModalViewModule, dismissModalByID Fail: modalID \(modalRef.modalID ?? "N/A")" + "RNIModalViewModule, dismissModalByID Fail: modalID \(modalRef.modalID ?? "N/A")" + " - error code: \(error?.rawValue ?? "N/A")" + " - error message: \(error?.errorMessage ?? "N/A")" ); @@ -89,7 +89,7 @@ extension RCTModalViewModule { // modal dismissed completion(); - let manager = RCTModalViewManager.sharedInstance; + let manager = RNIModalViewManager.sharedInstance; manager?.presentedModalRefs.removeObject(forKey: modalRef.modalUUID as NSString); }; @@ -127,7 +127,7 @@ extension RCTModalViewModule { // MARK: Extension: JS Events // -------------------------- -extension RCTModalViewModule { +extension RNIModalViewModule { func sendModalEvent(event: Events, params: Dictionary) { guard self.hasListeners else { return }; self.sendEvent(withName: event.rawValue, body: params); diff --git a/src/ModalView.ios.js b/src/ModalView.ios.js index 4611e89d..0cc4212d 100644 --- a/src/ModalView.ios.js +++ b/src/ModalView.ios.js @@ -10,7 +10,7 @@ import { ModalEventKeys } from './constants/Enums'; import { ModalContext } from './context/ModalContext'; -const componentName = "RCTModalView"; +const componentName = "RNIModalView"; const NativeCommands = UIManager[componentName]?.Commands; const NativeConstants = UIManager[componentName]?.Constants; const NativeModalView = requireNativeComponent(componentName); diff --git a/src/ModalViewModule.js b/src/ModalViewModule.js index 139c6292..5e744831 100644 --- a/src/ModalViewModule.js +++ b/src/ModalViewModule.js @@ -1,7 +1,7 @@ import { NativeModules, NativeEventEmitter } from 'react-native'; import * as Helpers from './functions/helpers'; -const moduleName = "ModalViewModule"; +const moduleName = "RNIModalViewModule"; const NativeModule = NativeModules[moduleName]; const COMMAND_KEYS = {