revert: "perf: disable accessibility for layout views" (NativeScript#10649)

CatchABus · web-flow · commit 712a9f4848ba · 2024-11-18T19:49:44.000-08:00
diff --git a/packages/core/accessibility/accessibility-properties.ts b/packages/core/accessibility/accessibility-properties.ts
@@ -26,7 +26,6 @@ function makePropertyEnumConverter<T>(enumValues) {
 
 export const accessibilityEnabledProperty = new CssProperty<Style, boolean>({
 	name: 'accessible',
-	defaultValue: true,
 	cssName: 'a11y-enabled',
 	valueConverter: booleanConverter,
 });
diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts
@@ -832,9 +832,7 @@ export class View extends ViewCommon {
 	[accessibilityEnabledProperty.setNative](value: boolean): void {
 		this.nativeViewProtected.setFocusable(!!value);
 
-		if (value) {
-			updateAccessibilityProperties(this);
-		}
+		updateAccessibilityProperties(this);
 	}
 
 	[accessibilityIdentifierProperty.setNative](value: string): void {
diff --git a/packages/core/ui/core/view/index.d.ts b/packages/core/ui/core/view/index.d.ts
@@ -228,6 +228,11 @@ export abstract class View extends ViewCommon {
 	 */
 	color: Color;
 
+	/**
+	 * If `true` the element is an accessibility element and all the children will be treated as a single selectable component.
+	 */
+	accessible: boolean;
+
 	/**
 	 * Hide the view and its children from the a11y service
 	 */
diff --git a/packages/core/ui/core/view/index.ios.ts b/packages/core/ui/core/view/index.ios.ts
@@ -683,9 +683,8 @@ export class View extends ViewCommon implements ViewDefinition {
 
 	[accessibilityEnabledProperty.setNative](value: boolean): void {
 		this.nativeViewProtected.isAccessibilityElement = !!value;
-		if (value) {
-			updateAccessibilityProperties(this);
-		}
+
+		updateAccessibilityProperties(this);
 	}
 
 	[accessibilityIdentifierProperty.getDefault](): string {
diff --git a/packages/core/ui/core/view/view-common.ts b/packages/core/ui/core/view/view-common.ts
@@ -194,9 +194,8 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 			}
 		}
 		super.onLoaded();
-		if (this.accessible) {
-			setupAccessibleView(this);
-		}
+
+		setupAccessibleView(this);
 	}
 
 	public _closeAllModalViewsInternal(): boolean {
diff --git a/packages/core/ui/layouts/layout-base-common.ts b/packages/core/ui/layouts/layout-base-common.ts
@@ -3,22 +3,10 @@ import { CoreTypes } from '../../core-types';
 import { View, CustomLayoutView, AddChildFromBuilder } from '../core/view';
 import { booleanConverter, getViewById } from '../core/view-base';
 import { Property } from '../core/properties';
-import { accessibilityEnabledProperty } from '../../accessibility/accessibility-properties';
 
 export class LayoutBaseCommon extends CustomLayoutView implements LayoutBaseDefinition, AddChildFromBuilder {
 	private _subViews = new Array<View>();
 
-	constructor() {
-		super();
-
-		/**
-		 * mark accessible as false without triggering property change
-		 * equivalent to changing the default
-		 * TODO: Remove this when we have a more flexible API for declaring default property values per type of view
-		 */
-		this.style[accessibilityEnabledProperty.key] = false;
-	}
-
 	public _addChildFromBuilder(name: string, value: any) {
 		if (value instanceof View) {
 			this.addChild(value);

Original file line number	Diff line number	Diff line change
`@@ -832,9 +832,7 @@ export class View extends ViewCommon {`
`832`	`832`	`[accessibilityEnabledProperty.setNative](value: boolean): void {`
`833`	`833`	`this.nativeViewProtected.setFocusable(!!value);`
`834`	`834`
`835`		`- if (value) {`
`836`		`- updateAccessibilityProperties(this);`
`837`		`- }`
	`835`	`+ updateAccessibilityProperties(this);`
`838`	`836`	`}`
`839`	`837`
`840`	`838`	`[accessibilityIdentifierProperty.setNative](value: string): void {`
Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,8 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`	`super.onLoaded();`
`197`		`- if (this.accessible) {`
`198`		`- setupAccessibleView(this);`
`199`		`- }`
	`197`	`+`
	`198`	`+ setupAccessibleView(this);`
`200`	`199`	`}`
`201`	`200`
`202`	`201`	`public _closeAllModalViewsInternal(): boolean {`