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

This reverts commit 3bd6d9b01e.
This commit is contained in:
Eduardo Speroni
2024-04-15 09:49:32 -03:00
parent 873f711a6b
commit 614848394c
6 changed files with 13 additions and 25 deletions

View File

@@ -26,7 +26,6 @@ function makePropertyEnumConverter<T>(enumValues) {
export const accessibilityEnabledProperty = new CssProperty<Style, boolean>({
name: 'accessible',
defaultValue: true,
cssName: 'a11y-enabled',
valueConverter: booleanConverter,
});

View File

@@ -2,6 +2,7 @@ import { AlignSelf, FlexGrow, FlexShrink, FlexWrapBefore, Order } from '../../la
import { Page } from '../../page';
import { CoreTypes } from '../../../core-types';
import { Property, CssProperty, CssAnimationProperty, InheritedProperty, clearInheritedProperties, propagateInheritableProperties, propagateInheritableCssProperties, initNativeView } from '../properties';
import { setupAccessibleView } from '../../../accessibility';
import { CSSUtils } from '../../../css/system-classes';
import { Source } from '../../../utils/debug';
import { Binding, BindingOptions } from '../bindable';
@@ -598,6 +599,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
return true;
});
setupAccessibleView(<any>this);
this._emit('loaded');
}

View File

@@ -826,9 +826,8 @@ 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 {
@@ -1264,15 +1263,6 @@ export class View extends ViewCommon {
export class ContainerView extends View {
public iosOverflowSafeArea: boolean;
constructor() {
super();
/**
* mark accessible as false without triggering proerty change
* equivalent to changing the default
*/
this.style[accessibilityEnabledProperty.key] = false;
}
}
export class CustomLayoutView extends ContainerView implements CustomLayoutViewDefinition {

View File

@@ -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
*/

View File

@@ -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 {
@@ -1069,11 +1068,6 @@ export class ContainerView extends View {
constructor() {
super();
this.iosOverflowSafeArea = true;
/**
* mark accessible as false without triggering proerty change
* equivalent to changing the default
*/
this.style[accessibilityEnabledProperty.key] = false;
}
}

View File

@@ -12,7 +12,6 @@ import { EventData } from '../../../data/observable';
import { Trace } from '../../../trace';
import { CoreTypes } from '../../../core-types';
import { ViewHelper } from './view-helper';
import { setupAccessibleView } from '../../../accessibility';
import { PercentLength } from '../../styling/style-properties';
@@ -191,9 +190,6 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
}
}
super.onLoaded();
if (this.accessible) {
setupAccessibleView(this);
}
}
public _closeAllModalViewsInternal(): boolean {
@@ -827,9 +823,11 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
get accessible(): boolean {
return this.style.accessible;
// return this._accessible;
}
set accessible(value: boolean) {
this.style.accessible = value;
// this._accessible = value;
}
get accessibilityHidden(): boolean {