diff --git a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm index e336b55aaf9cd4..93bfe3c8c9c282 100644 --- a/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -532,23 +532,26 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event #if TARGET_OS_VISION - (void) updateHoverEffect:(NSString*)hoverEffect withCornerRadius:(CGFloat)cornerRadius { - if (hoverEffect == nil || [hoverEffect isEqualToString:@""]) { - self.hoverStyle = nil; - return; - } - - UIShape *shape = [UIShape rectShapeWithCornerRadius:cornerRadius]; - id effect; - - if ([hoverEffect isEqualToString:@"lift"]) { - effect = [UIHoverLiftEffect effect]; - } else if ([hoverEffect isEqualToString:@"highlight"]) { - effect = [UIHoverHighlightEffect effect]; - } - - if (hoverEffect != nil) { - self.hoverStyle = [UIHoverStyle styleWithEffect:effect shape:shape]; - } + if (hoverEffect == nil) { + self.hoverStyle = nil; + return; + } + + UIShape *shape = [UIShape rectShapeWithCornerRadius:cornerRadius]; + id effect; + + if ([hoverEffect isEqualToString:@"lift"]) { + effect = [UIHoverLiftEffect effect]; + } else if ([hoverEffect isEqualToString:@"highlight"]) { + effect = [UIHoverHighlightEffect effect]; + } + + if (effect == nil) { + self.hoverStyle = nil; + return; + } + + self.hoverStyle = [UIHoverStyle styleWithEffect:effect shape:shape]; } #endif diff --git a/packages/react-native/React/Views/RCTView.m b/packages/react-native/React/Views/RCTView.m index c76270807d62b6..813f140d59e595 100644 --- a/packages/react-native/React/Views/RCTView.m +++ b/packages/react-native/React/Views/RCTView.m @@ -669,36 +669,39 @@ - (UIEdgeInsets)bordersAsInsets #if TARGET_OS_VISION - (void)setHoverEffect:(NSString *)hoverEffect { - _hoverEffect = hoverEffect; - - if (hoverEffect == nil) { - self.hoverStyle = nil; - return; - } - - CGFloat cornerRadius = 0.0; - RCTCornerRadii cornerRadii = [self cornerRadii]; - - if (RCTCornerRadiiAreEqual(cornerRadii)) { - cornerRadius = cornerRadii.topLeft; - - } else { - // TODO: Handle a case when corner radius is different for each corner. - cornerRadius = cornerRadii.topLeft; - } - - UIShape *shape = [UIShape rectShapeWithCornerRadius:cornerRadius]; - id effect; - - if ([hoverEffect isEqualToString:@"lift"]) { - effect = [UIHoverLiftEffect effect]; - } else if ([hoverEffect isEqualToString:@"highlight"]) { - effect = [UIHoverHighlightEffect effect]; - } + _hoverEffect = hoverEffect; + + if (hoverEffect == nil) { + self.hoverStyle = nil; + return; + } + + CGFloat cornerRadius = 0.0; + RCTCornerRadii cornerRadii = [self cornerRadii]; + + if (RCTCornerRadiiAreEqual(cornerRadii)) { + cornerRadius = cornerRadii.topLeft; - if (hoverEffect != nil) { - self.hoverStyle = [UIHoverStyle styleWithEffect:effect shape:shape]; - } + } else { + // TODO: Handle a case when corner radius is different for each corner. + cornerRadius = cornerRadii.topLeft; + } + + UIShape *shape = [UIShape rectShapeWithCornerRadius:cornerRadius]; + id effect; + + if ([hoverEffect isEqualToString:@"lift"]) { + effect = [UIHoverLiftEffect effect]; + } else if ([hoverEffect isEqualToString:@"highlight"]) { + effect = [UIHoverHighlightEffect effect]; + } + + if (effect == nil) { + self.hoverStyle = nil; + return; + } + + self.hoverStyle = [UIHoverStyle styleWithEffect:effect shape:shape]; } #endif