@@ -28,8 +28,8 @@ describe('solid-ui-menu syncItems', () => {
2828 await menu . updateComplete
2929
3030 // Children should be assigned slot attributes
31- expect ( child1 . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-0' )
32- expect ( child2 . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-1' )
31+ expect ( child1 . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-index- 0' )
32+ expect ( child2 . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-index- 1' )
3333
3434 // Trigger should keep its slot
3535 const trigger = menu . querySelector ( '[slot="trigger"]' )
@@ -49,7 +49,7 @@ describe('solid-ui-menu syncItems', () => {
4949 await menu . updateComplete
5050
5151 // First sync assigned slots
52- expect ( child1 . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-0' )
52+ expect ( child1 . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-index- 0' )
5353
5454 // Trigger a re-sync by adding another child (MutationObserver)
5555 const child2 = document . createElement ( 'div' )
@@ -58,8 +58,8 @@ describe('solid-ui-menu syncItems', () => {
5858 await menu . updateComplete
5959
6060 // Both children should still have valid slot assignments
61- expect ( child1 . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-0' )
62- expect ( child2 . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-1' )
61+ expect ( child1 . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-index- 0' )
62+ expect ( child2 . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-index- 1' )
6363
6464 document . body . removeChild ( menu )
6565 } )
@@ -73,12 +73,60 @@ describe('solid-ui-menu syncItems', () => {
7373 menu . appendChild ( child )
7474 await menu . updateComplete
7575
76- expect ( child . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-0' )
76+ expect ( child . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-index- 0' )
7777
7878 // Trigger should not have been re-assigned
7979 const trigger = menu . querySelector ( '[slot="trigger"]' )
8080 expect ( trigger ?. getAttribute ( 'slot' ) ) . toBe ( 'trigger' )
8181
8282 document . body . removeChild ( menu )
8383 } )
84+
85+ it ( 'keeps keyed and positional slots distinct' , async ( ) => {
86+ const menu = createMenu ( )
87+
88+ const keyedChild = document . createElement ( 'div' )
89+ keyedChild . dataset . menuKey = '1'
90+ menu . appendChild ( keyedChild )
91+
92+ const positionalChild = document . createElement ( 'div' )
93+ menu . appendChild ( positionalChild )
94+
95+ document . body . appendChild ( menu )
96+ await menu . updateComplete
97+
98+ expect ( keyedChild . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-key-1' )
99+ expect ( positionalChild . getAttribute ( 'slot' ) ) . toBe ( 'menu-item-index-1' )
100+
101+ document . body . removeChild ( menu )
102+ } )
103+
104+ it ( 'moves keyed dropdown items instead of recreating them when actions reorder' , async ( ) => {
105+ const menu = createMenu ( )
106+ const first = document . createElement ( 'div' )
107+ first . dataset . menuKey = 'first'
108+ const second = document . createElement ( 'div' )
109+ second . dataset . menuKey = 'second'
110+ menu . append ( first , second )
111+
112+ document . body . appendChild ( menu )
113+ await menu . updateComplete
114+
115+ const firstWrapper = Array . from ( menu . shadowRoot ?. querySelectorAll ( 'wa-dropdown-item' ) || [ ] )
116+ . find ( item => item . children [ 0 ] ?. getAttribute ( 'name' ) === 'menu-item-key-first' )
117+ const secondWrapper = Array . from ( menu . shadowRoot ?. querySelectorAll ( 'wa-dropdown-item' ) || [ ] )
118+ . find ( item => item . children [ 0 ] ?. getAttribute ( 'name' ) === 'menu-item-key-second' )
119+ expect ( firstWrapper ) . toBeTruthy ( )
120+ expect ( secondWrapper ) . toBeTruthy ( )
121+
122+ menu . insertBefore ( second , first )
123+ await new Promise ( resolve => setTimeout ( resolve , 0 ) )
124+ await menu . updateComplete
125+
126+ const reorderedWrappers = Array . from ( menu . shadowRoot ?. querySelectorAll ( 'wa-dropdown-item' ) || [ ] )
127+ expect ( reorderedWrappers [ 0 ] ) . toBe ( secondWrapper )
128+ expect ( reorderedWrappers [ 1 ] ) . toBe ( firstWrapper )
129+
130+ document . body . removeChild ( menu )
131+ } )
84132} )
0 commit comments