fix: simplify EventData typings, drop NotifyData

This commit is contained in:
shirakaba
2022-11-23 14:35:36 +09:00
parent 3dad494136
commit b572da1e86
9 changed files with 85 additions and 79 deletions

View File

@@ -14,8 +14,8 @@ export * from './font-scale';
let clickableRolesMap = new Set<string>();
let lastFocusedView: WeakRef<Partial<View>>;
function accessibilityEventHelper(view: Partial<View>, eventType: number) {
let lastFocusedView: WeakRef<View>;
function accessibilityEventHelper(view: View, eventType: number) {
const eventName = accessibilityEventTypeMap.get(eventType);
if (!isAccessibilityServiceEnabled()) {
if (Trace.isEnabled()) {
@@ -105,7 +105,7 @@ function accessibilityEventHelper(view: Partial<View>, eventType: number) {
let TNSAccessibilityDelegate: android.view.View.androidviewViewAccessibilityDelegate;
const androidViewToTNSView = new WeakMap<android.view.View, WeakRef<Partial<View>>>();
const androidViewToTNSView = new WeakMap<android.view.View, WeakRef<View>>();
let accessibilityEventMap: Map<AndroidAccessibilityEvent, number>;
let accessibilityEventTypeMap: Map<number, string>;
@@ -440,11 +440,11 @@ export function isAccessibilityServiceEnabled(): boolean {
return accessibilityServiceEnabled;
}
export function setupAccessibleView(view: Partial<View>): void {
export function setupAccessibleView(view: View): void {
updateAccessibilityProperties(view);
}
export function updateAccessibilityProperties(view: Partial<View>): void {
export function updateAccessibilityProperties(view: View): void {
if (!view.nativeViewProtected) {
return;
}
@@ -540,7 +540,7 @@ export function updateContentDescription(view: View, forceUpdate?: boolean): str
return applyContentDescription(view, forceUpdate);
}
function setAccessibilityDelegate(view: Partial<View>): void {
function setAccessibilityDelegate(view: View): void {
if (!view.nativeViewProtected) {
return;
}
@@ -566,7 +566,7 @@ function setAccessibilityDelegate(view: Partial<View>): void {
androidView.setAccessibilityDelegate(TNSAccessibilityDelegate);
}
function applyContentDescription(view: Partial<View>, forceUpdate?: boolean) {
function applyContentDescription(view: View, forceUpdate?: boolean) {
let androidView = view.nativeViewProtected as android.view.View;
if (!androidView || (androidView instanceof android.widget.TextView && !view._androidContentDescriptionUpdated)) {
return null;