Skip to content

Commit e904f2e

Browse files
author
Amay Kataria
committed
PR feedback.
1 parent e15e034 commit e904f2e

5 files changed

Lines changed: 19 additions & 16 deletions

File tree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import React = require('react');
1111
import RN = require('react-native');
1212

1313
import Accessibility from '../native-common/Accessibility';
14-
import { NativeHelpers } from '../native-common/AccessibilityUtil';
14+
import { PlatformAccessibilityHelpers } from '../common/AccessibilityUtil';
1515

16-
export class AndroidAccessibilityUtil extends NativeHelpers {
16+
export class AndroidAccessibilityUtil extends PlatformAccessibilityHelpers {
1717
private _sendAccessibilityEvent(component: React.Component<any, any>, eventId: number) {
1818
// See list of events here:
1919
// https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html

src/common/AccessibilityUtil.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* Common accessibility interface for platform-specific accessibility utilities.
88
*/
99

10+
import React = require('react');
11+
1012
import Types = require('../common/Types');
1113

1214
export const ImportantForAccessibilityMap = {
@@ -16,6 +18,12 @@ export const ImportantForAccessibilityMap = {
1618
[Types.ImportantForAccessibility.NoHideDescendants]: 'no-hide-descendants'
1719
};
1820

21+
22+
// Platform specific helpers exposed through Native-Common AccessibilityUtil.
23+
export abstract class PlatformAccessibilityHelpers {
24+
abstract setAccessibilityFocus(component: React.Component<any, any>): void;
25+
}
26+
1927
export abstract class AccessibilityUtil {
2028
isHidden(importantForAccessibility: Types.ImportantForAccessibility): boolean {
2129
if (importantForAccessibility) {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import React = require('react');
1111
import RN = require('react-native');
1212

1313
import Accessibility from '../native-common/Accessibility';
14-
import { NativeHelpers } from '../native-common/AccessibilityUtil';
14+
import { PlatformAccessibilityHelpers } from '../common/AccessibilityUtil';
1515

16-
export class iOSAccessibilityUtil extends NativeHelpers {
16+
export class iOSAccessibilityUtil extends PlatformAccessibilityHelpers {
1717
setAccessibilityFocus(component: React.Component<any, any>): void {
1818
// NO-OP
1919
}

src/native-common/AccessibilityUtil.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import assert = require('assert');
1313
import React = require('react');
1414
import RN = require('react-native');
1515

16-
import { AccessibilityUtil as CommonAccessibilityUtil } from '../common/AccessibilityUtil';
17-
import AndroidAccessibilityUtil from '../android/AccessibilityUtil';
18-
import iOSAccessibilityUtil from '../ios/AccessibilityUtil';
19-
import WindowsAccessibilityUtil from '../windows/AccessibilityUtil';
16+
import { AccessibilityUtil as CommonAccessibilityUtil, PlatformAccessibilityHelpers } from '../common/AccessibilityUtil';
17+
import AndroidAccessibilityUtil from '../android/AndroidAccessibilityUtil';
18+
import iOSAccessibilityUtil from '../ios/iOSAccessibilityUtil';
19+
import WindowsAccessibilityUtil from '../windows/WindowsAccessibilityUtil';
2020

2121
import Types = require('../common/Types');
2222

@@ -60,14 +60,9 @@ const componentTypeMap = {
6060
[Types.AccessibilityTrait.Radio_button_unchecked]: 'radiobutton_unchecked'
6161
};
6262

63-
// Platform specific helpers exposed through Native-Common AccessibilityUtil.
64-
export abstract class NativeHelpers {
65-
abstract setAccessibilityFocus(component: React.Component<any, any>): void;
66-
}
67-
6863
export class AccessibilityUtil extends CommonAccessibilityUtil {
6964
// Specific native platform instance for AccessibilityUtil.
70-
private _instance: NativeHelpers;
65+
private _instance: PlatformAccessibilityHelpers;
7166

7267
constructor() {
7368
super();
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
import React = require('react');
1111

12-
import { NativeHelpers } from '../native-common/AccessibilityUtil';
12+
import { PlatformAccessibilityHelpers } from '../common/AccessibilityUtil';
1313

14-
export class WindowsAccessibilityUtil extends NativeHelpers {
14+
export class WindowsAccessibilityUtil extends PlatformAccessibilityHelpers {
1515
setAccessibilityFocus(component: React.Component<any, any>) {
1616
// No-Op
1717
}

0 commit comments

Comments
 (0)