fix(ios): revert rename in hippy3 and fix modal view gesture bug

Tencent · Oct 30, 2023 · bad8e37 · bad8e37
1 parent 1855da6
commit bad8e37
Show file tree

Hide file tree

Showing 52 changed files with 145 additions and 105 deletions.
diff --git a/framework/examples/ios-demo/HippyDemo/PageManager/HippyPageCacheContainerView.m b/framework/examples/ios-demo/HippyDemo/PageManager/HippyPageCacheContainerView.m
@@ -24,7 +24,7 @@
 #import "HippyPageCacheContainerView.h"
 #import "HippyPageCacheView.h"
 #import "HippyPageCache.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 @interface HippyPageCacheContainerView ()<HippyPageCacheManagerObserverProtocol> {
     __weak UIView *_lastPageCacheView; //never removed from superview

diff --git a/framework/examples/ios-demo/HippyDemo/RenderPage/HippyDemoViewController.mm b/framework/examples/ios-demo/HippyDemo/RenderPage/HippyDemoViewController.mm
@@ -30,7 +30,7 @@
 #import <hippy/HippyBridge.h>
 #import <hippy/HippyRootView.h>
 #import <hippy/HippyLog.h>
-#import <hippy/HippyAsserts.h>
+#import <hippy/HippyAssert.h>
 #import <hippy/UIView+Hippy.h>
 
 static NSString *const engineKey = @"Demo";

diff --git a/framework/examples/ios-demo/HippyDemo/TestModule.mm b/framework/examples/ios-demo/HippyDemo/TestModule.mm
@@ -30,7 +30,7 @@
 #import "HippyRedBox.h"
 #import "DemoConfigs.h"
 #import "HippyMethodInterceptorProtocol.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 static NSString *const engineKey = @"Demo";
 

diff --git a/framework/ios/base/HippyDeviceBaseInfo.mm b/framework/ios/base/HippyDeviceBaseInfo.mm
@@ -21,7 +21,7 @@
  */
 
 #import <UIKit/UIApplication.h>
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 #import "HippyDeviceBaseInfo.h"
 #import "HippyEventDispatcher.h"

diff --git a/framework/ios/base/HippyDisplayLink.m b/framework/ios/base/HippyDisplayLink.m
@@ -25,7 +25,7 @@
 #import <Foundation/Foundation.h>
 #import <QuartzCore/CADisplayLink.h>
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyBridgeModule.h"
 #import "HippyFrameUpdate.h"
 #import "HippyModuleData.h"

diff --git a/framework/ios/base/HippyKeyCommands.m b/framework/ios/base/HippyKeyCommands.m
@@ -22,7 +22,7 @@
 
 #import "HippyKeyCommands.h"
 #import <UIKit/UIKit.h>
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyDefines.h"
 #import "HippyUtils.h"
 

diff --git a/framework/ios/base/bridge/HippyBridge.mm b/framework/ios/base/bridge/HippyBridge.mm
@@ -39,7 +39,7 @@
 #import "HippyRedBox.h"
 #import "HippyTurboModule.h"
 #import "HippyUtils.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyConvert.h"
 #import "HippyDefaultImageProvider.h"
 #import "HippyI18nUtils.h"

diff --git a/framework/ios/base/enginewrapper/jsc/HippyJSCContextWrapper.mm b/framework/ios/base/enginewrapper/jsc/HippyJSCContextWrapper.mm
@@ -23,7 +23,7 @@
 #import <JavaScriptCore/JavaScriptCore.h>
 
 #import "NSObject+JSValue.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyJSCContextWrapper.h"
 #import "HippyJSStackFrame.h"
 

diff --git a/framework/ios/base/executors/HippyJSExecutor.mm b/framework/ios/base/executors/HippyJSExecutor.mm
@@ -22,7 +22,7 @@
 
 #import <UIKit/UIDevice.h>
 #import "VFSUriHandler.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyBundleURLProvider.h"
 #import "HippyContextWrapper.h"
 #import "HippyDefines.h"

diff --git a/framework/ios/base/modules/HippyEventDispatcher.mm b/framework/ios/base/modules/HippyEventDispatcher.mm
@@ -21,7 +21,7 @@
  */
 
 #import "HippyEventDispatcher.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 
 const NSInteger HippyTextUpdateLagWarningThreshold = 3;

diff --git a/framework/ios/base/modules/HippyModuleData.mm b/framework/ios/base/modules/HippyModuleData.mm
@@ -23,7 +23,7 @@
 #import "HippyModuleData.h"
 #import "HippyBridge.h"
 #import "HippyModuleMethod.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 #import "HippyUtils.h"
 

diff --git a/framework/ios/base/modules/HippyModuleMethod.mm b/framework/ios/base/modules/HippyModuleMethod.mm
@@ -24,7 +24,7 @@
 #import "HippyBridge.h"
 #import "HippyTurboModuleManager.h"
 #import "HippyUtils.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyConvert.h"
 #import "HippyLog.h"
 #import "HippyParserUtils.h"

diff --git a/framework/ios/base/modules/HippyModulesSetup.mm b/framework/ios/base/modules/HippyModulesSetup.mm
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyBridge.h"
 #import "HippyModuleData.h"
 #import "HippyModulesSetup.h"

diff --git a/framework/ios/debug/websocket/HippySRWebSocket.m b/framework/ios/debug/websocket/HippySRWebSocket.m
@@ -22,7 +22,7 @@
 
 #import <CommonCrypto/CommonDigest.h>
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 #import "HippySRSIMDHelpers.h"
 

diff --git a/framework/ios/module/dev/HippyDevMenu.mm b/framework/ios/module/dev/HippyDevMenu.mm
@@ -24,7 +24,7 @@
 #import "HippyEventDispatcher.h"
 #import "HippyKeyCommands.h"
 #import "HippyWebSocketProxy.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 #import "HippyDefines.h"
 

diff --git a/framework/ios/module/dev/HippyRedBox.mm b/framework/ios/module/dev/HippyRedBox.mm
@@ -25,7 +25,7 @@
 #import "HippyRedBox.h"
 #import "HippyUtils.h"
 #import "HippyWeakProxy.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyConvert.h"
 #import "HippyJSStackFrame.h"
 #import "HippyLog.h"

diff --git a/framework/ios/module/eventobserver/HippyEventObserverModule.mm b/framework/ios/module/eventobserver/HippyEventObserverModule.mm
@@ -22,7 +22,7 @@
 
 #import "HippyEventObserverModule.h"
 #import "HippyEventDispatcher.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 @implementation HippyEventObserverModule {
     NSMutableDictionary *_config;

diff --git a/framework/ios/module/exception/HippyExceptionModule.mm b/framework/ios/module/exception/HippyExceptionModule.mm
@@ -23,7 +23,7 @@
 #import "HippyExceptionModule.h"
 #import "HippyBridge.h"
 #import "HippyDefines.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 
 @implementation HippyExceptionModule

diff --git a/framework/ios/module/localstorage/HippyAsyncLocalStorage.mm b/framework/ios/module/localstorage/HippyAsyncLocalStorage.mm
@@ -26,7 +26,7 @@
 #import "HippyBridge.h"
 #import "HippyDefines.h"
 #import "HippyUtils.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyConvert.h"
 #import "HippyLog.h"
 #import "HippyUtils.h"

diff --git a/framework/ios/module/netinfo/HippyNetInfo.mm b/framework/ios/module/netinfo/HippyNetInfo.mm
@@ -26,7 +26,7 @@
 #import "HippyNetInfo.h"
 #import "HippyNetInfoIntenal.h"
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 @interface HippyNetInfo ()<HippyNetworkTypeChangedDelegate> {
 }

diff --git a/framework/ios/module/netinfo/HippyNetInfoIntenal.m b/framework/ios/module/netinfo/HippyNetInfoIntenal.m
@@ -24,7 +24,7 @@
 #import <SystemConfiguration/SystemConfiguration.h>
 
 #import "HippyNetInfoIntenal.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 #include <netinet/in.h>
 

diff --git a/framework/ios/module/network/HippyNetWork.mm b/framework/ios/module/network/HippyNetWork.mm
@@ -26,7 +26,7 @@
 #import "HippyBridge+VFSLoader.h"
 #import "HippyDefines.h"
 #import "HippyNetWork.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 
 static NSStringEncoding GetStringEncodingFromURLResponse(NSURLResponse *response) {

diff --git a/framework/ios/module/turbo/HippyOCTurboModule.mm b/framework/ios/module/turbo/HippyOCTurboModule.mm
@@ -25,7 +25,7 @@
 #import "HippyOCTurboModule+Inner.h"
 #import "HippyTurboModuleManager.h"
 #import "HippyJSExecutor.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 #import "HippyUtils.h"
 #import "NSObject+CtxValue.h"

diff --git a/framework/ios/module/turbo/HippyTurboModuleManager.mm b/framework/ios/module/turbo/HippyTurboModuleManager.mm
@@ -23,7 +23,7 @@
 #import "HippyJSExecutor.h"
 #import "HippyModuleData.h"
 #import "HippyTurboModuleManager.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 #include <unordered_map>
 

diff --git a/framework/ios/module/turbo/NSObject+HippyTurbo.m b/framework/ios/module/turbo/NSObject+HippyTurbo.m
@@ -21,7 +21,7 @@
  */
 
 #import "HippyModuleMethod.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 #import "NSObject+HippyTurbo.h"
 

diff --git a/framework/ios/utils/NSObject+CtxValue.mm b/framework/ios/utils/NSObject+CtxValue.mm
@@ -21,7 +21,7 @@
  */
 
 #import "NSObject+CtxValue.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 #include "driver/napi/js_ctx.h"
 #include "driver/napi/js_ctx_value.h"

diff --git a/modules/ios/base/HippyAsserts.h → modules/ios/base/HippyAssert.h b/modules/ios/base/HippyAsserts.h → modules/ios/base/HippyAssert.h
diff --git a/modules/ios/base/HippyAsserts.m → modules/ios/base/HippyAssert.m b/modules/ios/base/HippyAsserts.m → modules/ios/base/HippyAssert.m
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 
 NSString *const HippyErrorDomain = @"HippyErrorDomain";

diff --git a/modules/ios/base/HippyUtils.m b/modules/ios/base/HippyUtils.m
@@ -21,7 +21,7 @@
  */
 
 #import "HippyUtils.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 #import <objc/message.h>
 #import <CommonCrypto/CommonCrypto.h>

diff --git a/renderer/native/ios/renderer/HippyRootView.mm b/renderer/native/ios/renderer/HippyRootView.mm
@@ -21,7 +21,7 @@
  */
 
 #import "HippyRootView.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyView.h"
 #import "UIView+Hippy.h"
 #import "NativeRenderDefines.h"

diff --git a/renderer/native/ios/renderer/HippyUIManager.mm b/renderer/native/ios/renderer/HippyUIManager.mm
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyDomUtils.h"
 #import "HippyFootstoneUtils.h"
 #import "HippyOCToDomArgument.h"

diff --git a/renderer/native/ios/renderer/NativeRenderManager.mm b/renderer/native/ios/renderer/NativeRenderManager.mm
@@ -24,7 +24,7 @@
 #import "NativeRenderManager.h"
 #import "NativeRenderObjectText.h"
 #import "RenderVsyncManager.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 #include "dom/dom_manager.h"
 #include "dom/layout_node.h"

diff --git a/renderer/native/ios/renderer/component/image/NativeRenderImageView.m b/renderer/native/ios/renderer/component/image/NativeRenderImageView.m
@@ -22,7 +22,7 @@
 
 #import <Accelerate/Accelerate.h>
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 #import "NativeRenderImageView.h"
 #import "NativeRenderAnimatedImage.h"

diff --git a/renderer/native/ios/renderer/component/image/NativeRenderImageViewManager.mm b/renderer/native/ios/renderer/component/image/NativeRenderImageViewManager.mm
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 #import "NativeRenderImageViewManager.h"
 #import "NativeRenderImageView.h"

diff --git a/renderer/native/ios/renderer/component/listview/NativeRenderBaseListView.mm b/renderer/native/ios/renderer/component/listview/NativeRenderBaseListView.mm
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "NativeRenderBaseListView.h"
 #import "NativeRenderBaseListViewCell.h"
 #import "NativeRenderBaseListViewDataSource.h"

diff --git a/...iveRenderModalCustomAnimationTransition.h → ...dal/HippyModalCustomAnimationTransition.h b/...iveRenderModalCustomAnimationTransition.h → ...dal/HippyModalCustomAnimationTransition.h
@@ -24,6 +24,6 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-@interface NativeRenderModalCustomAnimationTransition : NSObject <UIViewControllerAnimatedTransitioning>
+@interface HippyModalCustomAnimationTransition : NSObject <UIViewControllerAnimatedTransitioning>
 @property (nonatomic, assign) BOOL isPresent;
 @end
diff --git a/...iveRenderModalCustomAnimationTransition.m → ...dal/HippyModalCustomAnimationTransition.m b/...iveRenderModalCustomAnimationTransition.m → ...dal/HippyModalCustomAnimationTransition.m
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#import "NativeRenderModalCustomAnimationTransition.h"
+#import "HippyModalCustomAnimationTransition.h"
 
 #define DURATION .2f
 
-@implementation NativeRenderModalCustomAnimationTransition
+@implementation HippyModalCustomAnimationTransition
 
 - (NSTimeInterval)transitionDuration:(__unused id<UIViewControllerContextTransitioning>)transitionContext {
     return DURATION;

diff --git a/...RenderModalCustomPresentationController.h → .../HippyModalCustomPresentationController.h b/...RenderModalCustomPresentationController.h → .../HippyModalCustomPresentationController.h
@@ -22,6 +22,6 @@
 
 #import <UIKit/UIKit.h>
 
-@interface NativeRenderModalCustomPresentationController : UIPresentationController
+@interface HippyModalCustomPresentationController : UIPresentationController
 
 @end
diff --git a/...RenderModalCustomPresentationController.m → .../HippyModalCustomPresentationController.m b/...RenderModalCustomPresentationController.m → .../HippyModalCustomPresentationController.m
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#import "NativeRenderModalCustomPresentationController.h"
+#import "HippyModalCustomPresentationController.h"
 
-@implementation NativeRenderModalCustomPresentationController {
+@implementation HippyModalCustomPresentationController {
 }
 
 - (void)presentationTransitionWillBegin {

diff --git a/...mponent/modal/NativeRenderModalHostView.h → ...erer/component/modal/HippyModalHostView.h b/...mponent/modal/NativeRenderModalHostView.h → ...erer/component/modal/HippyModalHostView.h
@@ -21,14 +21,15 @@
  */
 
 #import <UIKit/UIKit.h>
-
 #import "HippyComponent.h"
+#import "HippyInvalidating.h"
 
-@class NativeRenderModalHostViewController;
-
-@protocol NativeRenderModalHostViewInteractor;
+@class HippyBridge;
+@class HippyTouchHandler;
+@class HippyModalHostViewController;
+@protocol HippyModalHostViewInteractor;
 
-@interface NativeRenderModalHostView : UIView
+@interface HippyModalHostView : UIView <HippyInvalidating>
 
 @property (nonatomic, copy) NSString *animationType;
 @property (nonatomic, copy) NSString *primaryKey;
@@ -38,14 +39,16 @@
 @property (nonatomic, copy) HippyDirectEventBlock onShow;
 @property (nonatomic, copy) HippyDirectEventBlock onRequestClose;
 
-@property (nonatomic, weak) id<NativeRenderModalHostViewInteractor, UIViewControllerTransitioningDelegate> delegate;
+@property (nonatomic, weak) id<HippyModalHostViewInteractor, UIViewControllerTransitioningDelegate> delegate;
 
 @property (nonatomic, strong) NSArray<NSString *> *supportedOrientations;
 @property (nonatomic, copy) HippyDirectEventBlock onOrientationChange;
 @property (nonatomic, strong) NSNumber *hideStatusBar;
 @property (nonatomic, readonly) BOOL isPresented;
-@property (nonatomic, strong) NativeRenderModalHostViewController *modalViewController;
+@property (nonatomic, strong) HippyModalHostViewController *modalViewController;
+@property (nonatomic, readonly) HippyTouchHandler *touchHandler;
 
+- (instancetype)initWithBridge:(HippyBridge *)bridge NS_DESIGNATED_INITIALIZER;
 - (void)notifyForBoundsChange:(CGRect)newBounds;
 
 @end