Skip to content

refactor(multiple): underscore methods only for internal usage# #32340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 14, 2025
Merged

refactor(multiple): underscore methods only for internal usage# #32340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
181b54d
refactor(multiple): underscore onFocus methods for internal usage only
adolgachev Nov 14, 2025
6bbe702
refactor(multiple): underscore register methods for internal usage only
adolgachev Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/aria/listbox/listbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
})
Expand Down Expand Up @@ -194,7 +194,7 @@ export class Listbox<V> {
});
}

onFocus() {
_onFocus() {
this._hasFocused.set(true);
}

Expand Down
24 changes: 12 additions & 12 deletions src/aria/tabs/tabs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -107,7 +107,7 @@ export class Tabs {
}
}

deregister(child: TabList | TabPanel) {
_unregister(child: TabList | TabPanel) {
if (child instanceof TabList) {
this._tablist.set(undefined);
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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()));
}
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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);
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/aria/toolbar/toolbar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<V> {
Expand Down Expand Up @@ -137,19 +137,19 @@ export class Toolbar<V> {
});
}

onFocus() {
_onFocus() {
this._hasBeenFocused.set(true);
}

register(widget: ToolbarWidget<V>) {
_register(widget: ToolbarWidget<V>) {
const widgets = this._widgets();
if (!widgets.has(widget)) {
widgets.add(widget);
this._widgets.set(new Set(widgets));
}
}

unregister(widget: ToolbarWidget<V>) {
_unregister(widget: ToolbarWidget<V>) {
const widgets = this._widgets();
if (widgets.delete(widget)) {
this._widgets.set(new Set(widgets));
Expand Down Expand Up @@ -236,11 +236,11 @@ export class ToolbarWidget<V> implements OnInit, OnDestroy {
});

ngOnInit() {
this._toolbar.register(this);
this._toolbar._register(this);
}

ngOnDestroy() {
this._toolbar.unregister(this);
this._toolbar._unregister(this);
}
}

Expand Down
28 changes: 14 additions & 14 deletions src/aria/tree/tree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
})
Expand Down Expand Up @@ -220,16 +220,16 @@ export class Tree<V> {
});
}

onFocus() {
_onFocus() {
this._hasFocused.set(true);
}

register(child: TreeItem<V>) {
_register(child: TreeItem<V>) {
this._unorderedItems().add(child);
this._unorderedItems.set(new Set(this._unorderedItems()));
}

unregister(child: TreeItem<V>) {
_unregister(child: TreeItem<V>) {
this._unorderedItems().delete(child);
this._unorderedItems.set(new Set(this._unorderedItems()));
}
Expand Down Expand Up @@ -349,8 +349,8 @@ export class TreeItem<V> 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(() => {
Expand All @@ -371,15 +371,15 @@ export class TreeItem<V> 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<V>) {
_register(group: TreeItemGroup<V>) {
this._group.set(group);
}

unregister() {
_unregister() {
this._group.set(undefined);
}
}
Expand Down Expand Up @@ -432,19 +432,19 @@ export class TreeItemGroup<V> 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<V>) {
_register(child: TreeItem<V>) {
this._unorderedItems().add(child);
this._unorderedItems.set(new Set(this._unorderedItems()));
}

unregister(child: TreeItem<V>) {
_unregister(child: TreeItem<V>) {
this._unorderedItems().delete(child);
this._unorderedItems.set(new Set(this._unorderedItems()));
}
Expand Down
Loading