Merged in feat/SW-3655-input-component (pull request #3296)
feat: (SW-3655) new Input and FormInput components * First version new Input and FormInput components * Handle aria-describedby with react-aria instead of manually add it * Update breaking unit and stories tests * Merge branch 'master' into feat/SW-3655-input-component * Update example form * Merge branch 'master' into feat/SW-3655-input-component * New lock file Approved-by: Linus Flood
This commit is contained in:
@@ -16,7 +16,7 @@ import type { SelectProps, SelectFilterProps } from './types'
|
||||
|
||||
import styles from './select.module.css'
|
||||
import { useState } from 'react'
|
||||
import { Label } from '../Label'
|
||||
import { InputLabel } from '../InputLabel'
|
||||
|
||||
export function Select({
|
||||
name,
|
||||
@@ -65,12 +65,12 @@ export function Select({
|
||||
{({ selectedText }) => {
|
||||
return (
|
||||
<>
|
||||
<Label
|
||||
<InputLabel
|
||||
className={styles.label}
|
||||
selected={Boolean(selectedText || isOpen)}
|
||||
>
|
||||
{label}
|
||||
</Label>
|
||||
</InputLabel>
|
||||
<Typography variant="Body/Paragraph/mdRegular">
|
||||
<span className={styles.selectedText}>{selectedText}</span>
|
||||
</Typography>
|
||||
|
||||
@@ -26,7 +26,7 @@ import { SelectItem } from './SelectItem'
|
||||
import type { SelectFilterProps } from './types'
|
||||
|
||||
import styles from './select.module.css'
|
||||
import { Label } from '../Label'
|
||||
import { InputLabel } from '../InputLabel'
|
||||
|
||||
/**
|
||||
* ComboBoxInner
|
||||
@@ -136,9 +136,12 @@ export function SelectFilter({
|
||||
) : null}
|
||||
|
||||
<span className={styles.displayText}>
|
||||
<Label className={styles.label} selected={Boolean(focus || value)}>
|
||||
<InputLabel
|
||||
className={styles.label}
|
||||
selected={Boolean(focus || value)}
|
||||
>
|
||||
{label}
|
||||
</Label>
|
||||
</InputLabel>
|
||||
<Typography variant="Body/Paragraph/mdRegular">
|
||||
<Input
|
||||
ref={inputRef}
|
||||
|
||||
Reference in New Issue
Block a user