Skip to content

Commit 5db3748

Browse files
committed
Align prop naming with other accessibility props
1 parent ffbec0d commit 5db3748

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

ios/RNSFullWindowOverlay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace react = facebook::react;
2626
RCTView <RCTInvalidating>
2727
#endif // RCT_NEW_ARCH_ENABLED
2828

29-
@property (nonatomic) BOOL containerAccessibilityViewIsModal;
29+
@property (nonatomic) BOOL accessibilityContainerViewIsModal;
3030

3131
#ifdef RCT_NEW_ARCH_ENABLED
3232
@property (nonatomic) react::LayoutMetrics oldLayoutMetrics;

ios/RNSFullWindowOverlay.mm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,16 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
111111
- (void)initCommonProps
112112
{
113113
// Default value used by container.
114-
_containerAccessibilityViewIsModal = YES;
114+
_accessibilityContainerViewIsModal = YES;
115115
_reactFrame = CGRectNull;
116116
_container = self.container;
117117
[self show];
118118
}
119119

120-
- (void)setContainerAccessibilityViewIsModal:(BOOL)containerAccessibilityViewIsModal
120+
- (void)setAccessibilityContainerViewIsModal:(BOOL)accessibilityContainerViewIsModal
121121
{
122-
_containerAccessibilityViewIsModal = containerAccessibilityViewIsModal;
123-
self.container.accessibilityViewIsModal = containerAccessibilityViewIsModal;
122+
_accessibilityContainerViewIsModal = accessibilityContainerViewIsModal;
123+
self.container.accessibilityViewIsModal = accessibilityContainerViewIsModal;
124124
}
125125

126126
- (void)addSubview:(UIView *)view
@@ -132,7 +132,7 @@ - (RNSFullWindowOverlayContainer *)container
132132
{
133133
if (_container == nil) {
134134
_container = [[RNSFullWindowOverlayContainer alloc] initWithFrame:_reactFrame
135-
accessibilityViewIsModal:_containerAccessibilityViewIsModal];
135+
accessibilityViewIsModal:_accessibilityContainerViewIsModal];
136136
}
137137

138138
return _container;
@@ -236,7 +236,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
236236
const auto &newComponentProps = *std::static_pointer_cast<const react::RNSFullWindowOverlayProps>(props);
237237

238238
if (newComponentProps.containerAccessibilityViewIsModal != oldComponentProps.containerAccessibilityViewIsModal) {
239-
[self setContainerAccessibilityViewIsModal:newComponentProps.containerAccessibilityViewIsModal];
239+
[self setAccessibilityContainerViewIsModal:newComponentProps.containerAccessibilityViewIsModal];
240240
}
241241

242242
[super updateProps:props oldProps:oldProps];
@@ -272,7 +272,7 @@ @implementation RNSFullWindowOverlayManager
272272

273273
RCT_EXPORT_MODULE()
274274

275-
RCT_EXPORT_VIEW_PROPERTY(containerAccessibilityViewIsModal, BOOL)
275+
RCT_EXPORT_VIEW_PROPERTY(accessibilityContainerViewIsModal, BOOL)
276276

277277
#ifdef RCT_NEW_ARCH_ENABLED
278278
#else

src/components/FullWindowOverlay.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const NativeFullWindowOverlay: React.ComponentType<
2121

2222
type FullWindowOverlayProps = {
2323
children: ReactNode;
24-
unstable_containerAccessibilityViewIsModal?: boolean;
24+
unstable_accessibilityContainerViewIsModal?: boolean;
2525
};
2626

2727
function FullWindowOverlay(props: FullWindowOverlayProps) {
@@ -33,8 +33,8 @@ function FullWindowOverlay(props: FullWindowOverlayProps) {
3333
return (
3434
<NativeFullWindowOverlay
3535
style={[StyleSheet.absoluteFill, { width, height }]}
36-
containerAccessibilityViewIsModal={
37-
props.unstable_containerAccessibilityViewIsModal
36+
accessibilityContainerViewIsModal={
37+
props.unstable_accessibilityContainerViewIsModal
3838
}>
3939
{props.children}
4040
</NativeFullWindowOverlay>

src/fabric/FullWindowOverlayNativeComponent.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { WithDefault } from 'react-native/Libraries/Types/CodegenTypes';
66

77
// Internal export, not part of stable library API.
88
export interface NativeProps extends ViewProps {
9-
containerAccessibilityViewIsModal?: WithDefault<boolean, true>;
9+
accessibilityContainerViewIsModal?: WithDefault<boolean, true>;
1010
}
1111

1212
export default codegenNativeComponent<NativeProps>('RNSFullWindowOverlay', {

0 commit comments

Comments
 (0)