Skip to content

Commit 3caeff6

Browse files
Drop RCT_EXPORT_METHOD from RCTAccessibilityManager TurboModule
Summary: Changelog: [Internal] `RCTAccessibilityManager` is a TurboModule: it conforms to `NativeAccessibilityManagerSpec` and implements `getTurboModule:` returning the codegen'd `...SpecJSI`. For TurboModules, the JS->ObjC dispatch is driven by codegen (the generated spec supplies the `selector` and argument kinds, invoked at runtime via `NSMethodSignature` / `NSInvocation`), not by the `RCT_EXPORT_METHOD` macro's `__rct_export__` metadata. The exported methods here are async-void with concrete parameter types (no generic `id` requiring `RCTConvert` coercion), so the macro is not functionally required. Convert them to plain ObjC method declarations; conformance to the codegen'd `NativeAccessibilityManagerSpec` protocol keeps compiler-enforced signature parity. Signature-only refactor with no change to the JS-facing API. Sync methods, methods with `id` params, and `constantsToExport` are intentionally left untouched. Differential Revision: D113579886
1 parent aeea051 commit 3caeff6

1 file changed

Lines changed: 21 additions & 28 deletions

File tree

packages/react-native/React/CoreModules/RCTAccessibilityManager.mm

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,8 @@ - (void)setMultipliers:(NSDictionary<NSString *, NSNumber *> *)multipliers
274274
return _multipliers;
275275
}
276276

277-
RCT_EXPORT_METHOD(
278-
setAccessibilityContentSizeMultipliers : (
279-
JS::NativeAccessibilityManager::SpecSetAccessibilityContentSizeMultipliersJSMultipliers &)JSMultipliers)
277+
- (void)setAccessibilityContentSizeMultipliers:
278+
(JS::NativeAccessibilityManager::SpecSetAccessibilityContentSizeMultipliersJSMultipliers &)JSMultipliers
280279
{
281280
NSMutableDictionary<NSString *, NSNumber *> *multipliers = [NSMutableDictionary new];
282281
setMultipliers(multipliers, UIContentSizeCategoryExtraSmall, JSMultipliers.extraSmall());
@@ -308,22 +307,24 @@ static void setMultipliers(
308307
}
309308
}
310309

311-
RCT_EXPORT_METHOD(setAccessibilityFocus : (double)reactTag)
310+
- (void)setAccessibilityFocus:(double)reactTag
312311
{
313312
dispatch_async(dispatch_get_main_queue(), ^{
314313
UIView *view = [self.viewRegistry_DEPRECATED viewForReactTag:@(reactTag)];
315314
UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, view);
316315
});
317316
}
318317

319-
RCT_EXPORT_METHOD(announceForAccessibility : (NSString *)announcement)
318+
- (void)announceForAccessibility:(NSString *)announcement
320319
{
321320
UIAccessibilityPostNotification(UIAccessibilityAnnouncementNotification, announcement);
322321
}
323322

324-
RCT_EXPORT_METHOD(
325-
announceForAccessibilityWithOptions : (NSString *)announcement options : (
326-
JS::NativeAccessibilityManager::SpecAnnounceForAccessibilityWithOptionsOptions &)options)
323+
- (void)
324+
announceForAccessibilityWithOptions:(NSString *)announcement
325+
options:
326+
(JS::NativeAccessibilityManager::SpecAnnounceForAccessibilityWithOptionsOptions &)
327+
options
327328
{
328329
NSMutableDictionary<NSString *, id> *attrsDictionary = [NSMutableDictionary new];
329330
if (options.queue()) {
@@ -356,47 +357,41 @@ static void setMultipliers(
356357
}
357358
}
358359

359-
RCT_EXPORT_METHOD(getMultiplier : (RCTResponseSenderBlock)callback)
360+
- (void)getMultiplier:(RCTResponseSenderBlock)callback
360361
{
361362
if (callback) {
362363
callback(@[ @(self.multiplier) ]);
363364
}
364365
}
365366

366-
RCT_EXPORT_METHOD(
367-
getCurrentBoldTextState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)onError)
367+
- (void)getCurrentBoldTextState:(RCTResponseSenderBlock)onSuccess onError:(__unused RCTResponseSenderBlock)onError
368368
{
369369
onSuccess(@[ @(_isBoldTextEnabled) ]);
370370
}
371371

372-
RCT_EXPORT_METHOD(
373-
getCurrentGrayscaleState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)onError)
372+
- (void)getCurrentGrayscaleState:(RCTResponseSenderBlock)onSuccess onError:(__unused RCTResponseSenderBlock)onError
374373
{
375374
onSuccess(@[ @(_isGrayscaleEnabled) ]);
376375
}
377376

378-
RCT_EXPORT_METHOD(
379-
getCurrentInvertColorsState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)onError)
377+
- (void)getCurrentInvertColorsState:(RCTResponseSenderBlock)onSuccess onError:(__unused RCTResponseSenderBlock)onError
380378
{
381379
onSuccess(@[ @(_isInvertColorsEnabled) ]);
382380
}
383381

384-
RCT_EXPORT_METHOD(
385-
getCurrentReduceMotionState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)onError)
382+
- (void)getCurrentReduceMotionState:(RCTResponseSenderBlock)onSuccess onError:(__unused RCTResponseSenderBlock)onError
386383
{
387384
onSuccess(@[ @(_isReduceMotionEnabled) ]);
388385
}
389386

390-
RCT_EXPORT_METHOD(
391-
getCurrentDarkerSystemColorsState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)
392-
onError)
387+
- (void)getCurrentDarkerSystemColorsState:(RCTResponseSenderBlock)onSuccess
388+
onError:(__unused RCTResponseSenderBlock)onError
393389
{
394390
onSuccess(@[ @(_isDarkerSystemColorsEnabled) ]);
395391
}
396392

397-
RCT_EXPORT_METHOD(
398-
getCurrentPrefersCrossFadeTransitionsState : (RCTResponseSenderBlock)
399-
onSuccess onError : (__unused RCTResponseSenderBlock)onError)
393+
- (void)getCurrentPrefersCrossFadeTransitionsState:(RCTResponseSenderBlock)onSuccess
394+
onError:(__unused RCTResponseSenderBlock)onError
400395
{
401396
if (@available(iOS 14.0, *)) {
402397
onSuccess(@[ @(UIAccessibilityPrefersCrossFadeTransitions()) ]);
@@ -405,15 +400,13 @@ static void setMultipliers(
405400
}
406401
}
407402

408-
RCT_EXPORT_METHOD(
409-
getCurrentReduceTransparencyState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)
410-
onError)
403+
- (void)getCurrentReduceTransparencyState:(RCTResponseSenderBlock)onSuccess
404+
onError:(__unused RCTResponseSenderBlock)onError
411405
{
412406
onSuccess(@[ @(_isReduceTransparencyEnabled) ]);
413407
}
414408

415-
RCT_EXPORT_METHOD(
416-
getCurrentVoiceOverState : (RCTResponseSenderBlock)onSuccess onError : (__unused RCTResponseSenderBlock)onError)
409+
- (void)getCurrentVoiceOverState:(RCTResponseSenderBlock)onSuccess onError:(__unused RCTResponseSenderBlock)onError
417410
{
418411
onSuccess(@[ @(_isVoiceOverEnabled) ]);
419412
}

0 commit comments

Comments
 (0)