Merged in feat/SW-1281-ancillaries-add-flow (pull request #1399)
Feat/SW-1281 ancillaries add flow * feat(SW-1546): update design * feat(SW-1546): show points only if logged in * feat(SW-1546): always show points * feat(SW-1281): ancillary add flow initial * feat(SW-1546): add api call * feat(SW-1281): refactor naming and break out components * feat(SW-1281): handle back button * feat(SW-1281): make mobile cards clickable * feat(SW-1281): refactor spread ancillaries * feat(SW-1281): add deliverytimes * feat(SW-1281): rebase master * feat(SW-1281): add design for logged in or not * feat(SW-1281): add design * feat(SW-1281): add mobile design * feat(SW-1281): fix carousel * feat(SW-1281): show deliverytime only if ancillary has not been added * feat(SW-1281): add design * feat(SW-1281): add translations * feat(SW-1281): add translations * feat(SW-1281): add translations * feat(SW-1281): base dates on check in date only * feat(SW-1281): fix show correct toast when no valid data * feat(SW-1281): hande logic if deliverytime is not required * feat(SW-1281): fix max width for mobile * feat(SW-1281): refactor after pr comment Approved-by: Niclas Edenvin Approved-by: Linus Flood
This commit is contained in:
committed by
Linus Flood
parent
341f0c54ed
commit
541b91e34c
@@ -11,7 +11,9 @@ export default function Select({
|
||||
label,
|
||||
disabled,
|
||||
name,
|
||||
isNestedInModal = false,
|
||||
registerOptions = {},
|
||||
defaultSelectedKey,
|
||||
}: SelectProps) {
|
||||
const { control } = useFormContext()
|
||||
const { field } = useController({
|
||||
@@ -23,7 +25,7 @@ export default function Select({
|
||||
return (
|
||||
<ReactAriaSelect
|
||||
className={className}
|
||||
defaultSelectedKey={field.value}
|
||||
defaultSelectedKey={defaultSelectedKey || field.value}
|
||||
disabled={disabled || field.disabled}
|
||||
items={items}
|
||||
label={label}
|
||||
@@ -33,6 +35,7 @@ export default function Select({
|
||||
onSelect={field.onChange}
|
||||
value={field.value}
|
||||
data-testid={name}
|
||||
isNestedInModal={isNestedInModal}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user