File tree Expand file tree Collapse file tree 7 files changed +18
-25
lines changed
Expand file tree Collapse file tree 7 files changed +18
-25
lines changed Original file line number Diff line number Diff line change 77 */
88
99import {
10+ afterNextRender ,
1011 afterRenderEffect ,
1112 booleanAttribute ,
1213 computed ,
@@ -151,7 +152,7 @@ export class Grid {
151152 } ) ;
152153
153154 // Use Write mode for all direct DOM focus management actions.
154- afterRenderEffect ( { write : ( ) => this . _pattern . setDefaultStateEffect ( ) } ) ;
155+ afterNextRender ( { write : ( ) => this . _pattern . setDefaultStateEffect ( ) } ) ;
155156 afterRenderEffect ( { write : ( ) => this . _pattern . resetStateEffect ( ) } ) ;
156157 afterRenderEffect ( { write : ( ) => this . _pattern . resetFocusEffect ( ) } ) ;
157158 afterRenderEffect ( { write : ( ) => this . _pattern . restoreFocusEffect ( ) } ) ;
Original file line number Diff line number Diff line change 77 */
88
99import {
10+ afterNextRender ,
1011 afterRenderEffect ,
1112 booleanAttribute ,
1213 computed ,
@@ -158,6 +159,8 @@ export class Listbox<V> {
158159 this . _popup . _controls . set ( this . _pattern as ComboboxListboxPattern < V > ) ;
159160 }
160161
162+ afterNextRender ( { write : ( ) => this . _pattern . setDefaultState ( ) } ) ;
163+
161164 afterRenderEffect ( ( ) => {
162165 if ( typeof ngDevMode === 'undefined' || ngDevMode ) {
163166 const violations = this . _pattern . validate ( ) ;
@@ -167,10 +170,6 @@ export class Listbox<V> {
167170 }
168171 } ) ;
169172
170- afterRenderEffect ( ( ) => {
171- this . _pattern . setDefaultStateEffect ( ) ;
172- } ) ;
173-
174173 // Ensure that if the active item is removed from
175174 // the list, the listbox updates it's focus state.
176175 afterRenderEffect ( ( ) => {
Original file line number Diff line number Diff line change 77 */
88
99import {
10- afterRenderEffect ,
10+ afterNextRender ,
1111 booleanAttribute ,
1212 computed ,
1313 contentChildren ,
@@ -123,9 +123,7 @@ export class MenuBar<V> {
123123 element : computed ( ( ) => this . _elementRef . nativeElement ) ,
124124 } ) ;
125125
126- afterRenderEffect ( ( ) => {
127- this . _pattern . setDefaultStateEffect ( ) ;
128- } ) ;
126+ afterNextRender ( { write : ( ) => this . _pattern . setDefaultState ( ) } ) ;
129127 }
130128
131129 /** Closes the menubar. */
Original file line number Diff line number Diff line change 99import {
1010 Directive ,
1111 ElementRef ,
12+ afterNextRender ,
1213 afterRenderEffect ,
1314 booleanAttribute ,
1415 computed ,
@@ -166,6 +167,8 @@ export class Menu<V> {
166167 }
167168 } ) ;
168169
170+ afterNextRender ( { write : ( ) => this . _pattern . setDefaultState ( ) } ) ;
171+
169172 // TODO(wagnermaciel): This is a redundancy needed for if the user uses display: none to hide
170173 // submenus. In those cases, the ui pattern is calling focus() before the ui has a chance to
171174 // update the display property. The result is focus() being called on an element that is not
@@ -178,10 +181,6 @@ export class Menu<V> {
178181 }
179182 } ,
180183 } ) ;
181-
182- afterRenderEffect ( ( ) => {
183- this . _pattern . setDefaultStateEffect ( ) ;
184- } ) ;
185184 }
186185
187186 /** Closes the menu. */
Original file line number Diff line number Diff line change 88
99import { Directionality } from '@angular/cdk/bidi' ;
1010import {
11+ afterNextRender ,
12+ afterRenderEffect ,
1113 booleanAttribute ,
1214 computed ,
1315 Directive ,
@@ -16,7 +18,6 @@ import {
1618 input ,
1719 model ,
1820 signal ,
19- afterRenderEffect ,
2021 OnInit ,
2122 OnDestroy ,
2223} from '@angular/core' ;
@@ -118,9 +119,7 @@ export class TabList implements OnInit, OnDestroy {
118119 } ) ;
119120
120121 constructor ( ) {
121- afterRenderEffect ( ( ) => {
122- this . _pattern . setDefaultStateEffect ( ) ;
123- } ) ;
122+ afterNextRender ( { write : ( ) => this . _pattern . setDefaultState ( ) } ) ;
124123
125124 afterRenderEffect ( ( ) => {
126125 const tab = this . _pattern . selectedTab ( ) ;
Original file line number Diff line number Diff line change 77 */
88
99import {
10- afterRenderEffect ,
10+ afterNextRender ,
1111 Directive ,
1212 ElementRef ,
1313 inject ,
@@ -106,9 +106,7 @@ export class Toolbar<V> {
106106 } ) ;
107107
108108 constructor ( ) {
109- afterRenderEffect ( ( ) => {
110- this . _pattern . setDefaultStateEffect ( ) ;
111- } ) ;
109+ afterNextRender ( { write : ( ) => this . _pattern . setDefaultState ( ) } ) ;
112110 }
113111
114112 _register ( widget : ToolbarWidget < V > ) {
Original file line number Diff line number Diff line change 99import {
1010 Directive ,
1111 ElementRef ,
12+ afterNextRender ,
1213 afterRenderEffect ,
1314 booleanAttribute ,
1415 computed ,
@@ -171,6 +172,8 @@ export class Tree<V> {
171172 this . _popup ?. _controls ?. set ( this . _pattern as ComboboxTreePattern < V > ) ;
172173 }
173174
175+ afterNextRender ( { write : ( ) => this . _pattern . setDefaultState ( ) } ) ;
176+
174177 afterRenderEffect ( ( ) => {
175178 if ( typeof ngDevMode === 'undefined' || ngDevMode ) {
176179 const violations = this . _pattern . validate ( ) ;
@@ -180,10 +183,6 @@ export class Tree<V> {
180183 }
181184 } ) ;
182185
183- afterRenderEffect ( ( ) => {
184- this . _pattern . setDefaultStateEffect ( ) ;
185- } ) ;
186-
187186 afterRenderEffect ( ( ) => {
188187 const items = inputs . items ( ) ;
189188 const activeItem = untracked ( ( ) => inputs . activeItem ( ) ) ;
You can’t perform that action at this time.
0 commit comments