Skip to content

Commit bab5edb

Browse files
convert tags of elements with role="combobox" to buttons
1 parent ecf365b commit bab5edb

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/scripts/Lookup.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ const LookupSelectedState: FC<LookupSelectedStateProps> = ({
152152
size='small'
153153
/>
154154
)}
155-
<div
155+
<button
156+
type='button'
156157
role='combobox'
157158
tabIndex={disabled ? -1 : 0}
158159
className='slds-input_faux slds-combobox__input slds-combobox__input-value'
@@ -161,7 +162,7 @@ const LookupSelectedState: FC<LookupSelectedStateProps> = ({
161162
aria-expanded='false'
162163
>
163164
<span className='slds-truncate'>{selected.label}</span>
164-
</div>
165+
</button>
165166
<Button
166167
type='icon'
167168
icon='close'

src/scripts/Picklist.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export type PicklistProps<MultiSelect extends boolean | undefined> = {
174174
tooltip?: ReactNode;
175175
tooltipIcon?: string;
176176
elementRef?: Ref<HTMLDivElement>;
177-
buttonRef?: Ref<HTMLDivElement>;
177+
buttonRef?: Ref<HTMLButtonElement>;
178178
dropdownRef?: Ref<HTMLDivElement>;
179179
onValueChange?: Bivariant<
180180
(
@@ -338,7 +338,7 @@ export const Picklist: (<MultiSelect extends boolean | undefined>(
338338

339339
const elRef = useRef<HTMLDivElement | null>(null);
340340
const elementRef = useMergeRefs([elRef, elementRef_]);
341-
const comboboxElRef = useRef<HTMLDivElement | null>(null);
341+
const comboboxElRef = useRef<HTMLButtonElement | null>(null);
342342
const buttonRef = useMergeRefs([comboboxElRef, buttonRef_]);
343343
const dropdownElRef = useRef<HTMLDivElement | null>(null);
344344
const dropdownRef = useMergeRefs([dropdownElRef, dropdownRef_]);
@@ -572,7 +572,8 @@ export const Picklist: (<MultiSelect extends boolean | undefined>(
572572
className='slds-combobox__form-element slds-input-has-icon slds-input-has-icon_right'
573573
role='none'
574574
>
575-
<div
575+
<button
576+
type='button'
576577
ref={buttonRef}
577578
role='combobox'
578579
tabIndex={disabled ? -1 : 0}
@@ -590,7 +591,7 @@ export const Picklist: (<MultiSelect extends boolean | undefined>(
590591
{...rprops}
591592
>
592593
<span className='slds-truncate'>{selectedItemLabel}</span>
593-
</div>
594+
</button>
594595
<Icon
595596
containerClassName='slds-input__icon slds-input__icon_right'
596597
category='utility'

0 commit comments

Comments
 (0)