@@ -152,36 +152,34 @@ const ColumnManagement: FunctionComponent<ColumnProps> = (
152152 < DataList aria-label = "Selected columns" isCompact data-ouia-component-id = { `${ ouiaId } -column-list` } >
153153 { currentColumns . map ( ( column , index ) =>
154154 < Draggable key = { column . key } id = { column . key } >
155- < ul >
156- < DataListItem key = { column . key } data-testid = { `column-item-${ column . key } ` } >
157- < DataListItemRow >
158- < DataListControl >
159- < DataListDragButton
160- aria-label = "Reorder"
161- aria-labelledby = { `${ ouiaId } -column-${ index } -label` }
162- />
163- </ DataListControl >
164- < DataListCheck
165- data-testid = { `column-check-${ column . key } ` }
166- isChecked = { column . isShown }
167- onChange = { ( ) => handleChange ( index ) }
168- isDisabled = { column . isUntoggleable }
155+ < DataListItem key = { column . key } data-testid = { `column-item-${ column . key } ` } >
156+ < DataListItemRow >
157+ < DataListControl >
158+ < DataListDragButton
159+ aria-label = "Reorder"
169160 aria-labelledby = { `${ ouiaId } -column-${ index } -label` }
170- ouiaId = { `${ ouiaId } -column-${ index } -checkbox` }
171- id = { `${ ouiaId } -column-${ index } -checkbox` }
172161 />
173- < DataListItemCells
174- dataListCells = { [
175- < DataListCell key = { column . key } data-ouia-component-id = { `${ ouiaId } -column-${ index } -label` } >
176- < label htmlFor = { `${ ouiaId } -column-${ index } -checkbox` } id = { `${ ouiaId } -column-${ index } -label` } >
177- { column . title }
178- </ label >
179- </ DataListCell >
180- ] }
181- />
182- </ DataListItemRow >
183- </ DataListItem >
184- </ ul >
162+ </ DataListControl >
163+ < DataListCheck
164+ data-testid = { `column-check-${ column . key } ` }
165+ isChecked = { column . isShown }
166+ onChange = { ( ) => handleChange ( index ) }
167+ isDisabled = { column . isUntoggleable }
168+ aria-labelledby = { `${ ouiaId } -column-${ index } -label` }
169+ ouiaId = { `${ ouiaId } -column-${ index } -checkbox` }
170+ id = { `${ ouiaId } -column-${ index } -checkbox` }
171+ />
172+ < DataListItemCells
173+ dataListCells = { [
174+ < DataListCell key = { column . key } data-ouia-component-id = { `${ ouiaId } -column-${ index } -label` } >
175+ < label htmlFor = { `${ ouiaId } -column-${ index } -checkbox` } id = { `${ ouiaId } -column-${ index } -label` } >
176+ { column . title }
177+ </ label >
178+ </ DataListCell >
179+ ] }
180+ />
181+ </ DataListItemRow >
182+ </ DataListItem >
185183 </ Draggable >
186184 ) }
187185 </ DataList >
0 commit comments