diff --git a/src/aria/listbox/listbox.ts b/src/aria/listbox/listbox.ts index 31e56ed8a649..e6c345071027 100644 --- a/src/aria/listbox/listbox.ts +++ b/src/aria/listbox/listbox.ts @@ -58,7 +58,7 @@ import {ComboboxPopup} from '../combobox'; '[attr.aria-activedescendant]': '_pattern.activeDescendant()', '(keydown)': '_pattern.onKeydown($event)', '(pointerdown)': '_pattern.onPointerdown($event)', - '(focusin)': 'onFocus()', + '(focusin)': '_onFocus()', }, hostDirectives: [ComboboxPopup], }) @@ -194,7 +194,7 @@ export class Listbox { }); } - onFocus() { + _onFocus() { this._hasFocused.set(true); } diff --git a/src/aria/tabs/tabs.ts b/src/aria/tabs/tabs.ts index 01de904e57d0..0ca29a43a140 100644 --- a/src/aria/tabs/tabs.ts +++ b/src/aria/tabs/tabs.ts @@ -96,7 +96,7 @@ export class Tabs { [...this._unorderedPanels()].map(tabpanel => tabpanel._pattern), ); - register(child: TabList | TabPanel) { + _register(child: TabList | TabPanel) { if (child instanceof TabList) { this._tablist.set(child); } @@ -107,7 +107,7 @@ export class Tabs { } } - deregister(child: TabList | TabPanel) { + _unregister(child: TabList | TabPanel) { if (child instanceof TabList) { this._tablist.set(undefined); } @@ -146,7 +146,7 @@ export class Tabs { '[attr.aria-activedescendant]': '_pattern.activeDescendant()', '(keydown)': '_pattern.onKeydown($event)', '(pointerdown)': '_pattern.onPointerdown($event)', - '(focusin)': 'onFocus()', + '(focusin)': '_onFocus()', }, }) export class TabList implements OnInit, OnDestroy { @@ -235,24 +235,24 @@ export class TabList implements OnInit, OnDestroy { }); } - onFocus() { + _onFocus() { this._hasFocused.set(true); } ngOnInit() { - this._tabs.register(this); + this._tabs._register(this); } ngOnDestroy() { - this._tabs.deregister(this); + this._tabs._unregister(this); } - register(child: Tab) { + _register(child: Tab) { this._unorderedTabs().add(child); this._unorderedTabs.set(new Set(this._unorderedTabs())); } - deregister(child: Tab) { + _unregister(child: Tab) { this._unorderedTabs().delete(child); this._unorderedTabs.set(new Set(this._unorderedTabs())); } @@ -341,11 +341,11 @@ export class Tab implements HasElement, OnInit, OnDestroy { } ngOnInit() { - this._tabList.register(this); + this._tabList._register(this); } ngOnDestroy() { - this._tabList.deregister(this); + this._tabList._unregister(this); } } @@ -420,11 +420,11 @@ export class TabPanel implements OnInit, OnDestroy { } ngOnInit() { - this._Tabs.register(this); + this._Tabs._register(this); } ngOnDestroy() { - this._Tabs.deregister(this); + this._Tabs._unregister(this); } } diff --git a/src/aria/toolbar/toolbar.ts b/src/aria/toolbar/toolbar.ts index e923c8daf1e8..ea43651697b3 100644 --- a/src/aria/toolbar/toolbar.ts +++ b/src/aria/toolbar/toolbar.ts @@ -72,7 +72,7 @@ function sortDirectives(a: HasElement, b: HasElement) { '(keydown)': '_pattern.onKeydown($event)', '(click)': '_pattern.onClick($event)', '(pointerdown)': '_pattern.onPointerdown($event)', - '(focusin)': 'onFocus()', + '(focusin)': '_onFocus()', }, }) export class Toolbar { @@ -137,11 +137,11 @@ export class Toolbar { }); } - onFocus() { + _onFocus() { this._hasBeenFocused.set(true); } - register(widget: ToolbarWidget) { + _register(widget: ToolbarWidget) { const widgets = this._widgets(); if (!widgets.has(widget)) { widgets.add(widget); @@ -149,7 +149,7 @@ export class Toolbar { } } - unregister(widget: ToolbarWidget) { + _unregister(widget: ToolbarWidget) { const widgets = this._widgets(); if (widgets.delete(widget)) { this._widgets.set(new Set(widgets)); @@ -236,11 +236,11 @@ export class ToolbarWidget implements OnInit, OnDestroy { }); ngOnInit() { - this._toolbar.register(this); + this._toolbar._register(this); } ngOnDestroy() { - this._toolbar.unregister(this); + this._toolbar._unregister(this); } } diff --git a/src/aria/tree/tree.ts b/src/aria/tree/tree.ts index f3fa8232cc95..9f8c1ad4cba0 100644 --- a/src/aria/tree/tree.ts +++ b/src/aria/tree/tree.ts @@ -93,7 +93,7 @@ function sortDirectives(a: HasElement, b: HasElement) { '[tabindex]': '_pattern.tabIndex()', '(keydown)': '_pattern.onKeydown($event)', '(pointerdown)': '_pattern.onPointerdown($event)', - '(focusin)': 'onFocus()', + '(focusin)': '_onFocus()', }, hostDirectives: [ComboboxPopup], }) @@ -220,16 +220,16 @@ export class Tree { }); } - onFocus() { + _onFocus() { this._hasFocused.set(true); } - register(child: TreeItem) { + _register(child: TreeItem) { this._unorderedItems().add(child); this._unorderedItems.set(new Set(this._unorderedItems())); } - unregister(child: TreeItem) { + _unregister(child: TreeItem) { this._unorderedItems().delete(child); this._unorderedItems.set(new Set(this._unorderedItems())); } @@ -349,8 +349,8 @@ export class TreeItem extends DeferredContentAware implements OnInit, OnDestr } ngOnInit() { - this.parent().register(this); - this.tree().register(this); + this.parent()._register(this); + this.tree()._register(this); const treePattern = computed(() => this.tree()._pattern); const parentPattern = computed(() => { @@ -371,15 +371,15 @@ export class TreeItem extends DeferredContentAware implements OnInit, OnDestr } ngOnDestroy() { - this.parent().unregister(this); - this.tree().unregister(this); + this.parent()._unregister(this); + this.tree()._unregister(this); } - register(group: TreeItemGroup) { + _register(group: TreeItemGroup) { this._group.set(group); } - unregister() { + _unregister() { this._group.set(undefined); } } @@ -432,19 +432,19 @@ export class TreeItemGroup implements OnInit, OnDestroy { ngOnInit() { this._deferredContent.deferredContentAware.set(this.ownedBy()); - this.ownedBy().register(this); + this.ownedBy()._register(this); } ngOnDestroy() { - this.ownedBy().unregister(); + this.ownedBy()._unregister(); } - register(child: TreeItem) { + _register(child: TreeItem) { this._unorderedItems().add(child); this._unorderedItems.set(new Set(this._unorderedItems())); } - unregister(child: TreeItem) { + _unregister(child: TreeItem) { this._unorderedItems().delete(child); this._unorderedItems.set(new Set(this._unorderedItems())); }