diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm index d64db0b0d..b18ba146d 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm @@ -362,7 +362,7 @@ if (active) { [_tapListener mountWithFrame:[[UIScreen mainScreen] bounds]]; __block id rootNode = _rootNode; - + [_tapListener listenForTapWithBlock:^(CGPoint touchPoint) { SKTouch* touch = [[SKTouch alloc] initWithTouchPoint:touchPoint diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m index c52b2ae15..0ae3aaffa 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKTapListenerImpl.m @@ -36,7 +36,7 @@ _overlayWindow.hidden = YES; _overlayWindow.windowLevel = UIWindowLevelAlert; _overlayWindow.backgroundColor = [SKHighlightOverlay overlayColor]; - + [_overlayWindow addGestureRecognizer:_gestureRecognizer]; } @@ -51,7 +51,7 @@ [_overlayWindow setFrame:frame]; [_overlayWindow makeKeyAndVisible]; _overlayWindow.hidden = NO; - + [[UIApplication sharedApplication].delegate.window addSubview:_overlayWindow]; _isMounted = YES; } @@ -63,7 +63,6 @@ [_receiversWaitingForInput removeAllObjects]; [_overlayWindow removeFromSuperview]; _overlayWindow.hidden = YES; - _isMounted = NO; } diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm index a6d9e1f1a..7ad170dbd 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/descriptors/SKViewDescriptor.mm @@ -12,6 +12,7 @@ #import #import #import "SKDescriptorMapper.h" +#import "SKHiddenWindow.h" #import "SKNamed.h" #import "SKObject.h" #import "SKYogaKitHelper.h" @@ -492,7 +493,10 @@ static NSDictionary* YGUnitEnumMap = nil; viewForNode = (UIView*)childNode; } - if (viewForNode.isHidden || viewForNode.alpha <= 0) { + if (viewForNode.isHidden || viewForNode.alpha <= 0 || + [[viewForNode class] isEqual:[SKHiddenWindow class]]) { + /*SKHiddenWindow is the pink overlay which is added in window to capture + the gestures.*/ continue; }