Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions packages/eui/changelogs/upcoming/8778.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- Added new `refresh` design for input styles on form picker components:
- `EuiComboBox`
- `EuiFilePicker`
- `EuiDatePicker`
- `EuiSuperDatePicker`
- Updated the font size of `xs` size `EuiButtonEmpty` to `14px`

2 changes: 1 addition & 1 deletion packages/eui/src/components/combo_box/combo_box.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ describe('EuiComboBox', () => {
);
cy.get('[data-test-subj="comboBoxSearchInput"]')
.invoke('width')
.should('be.eq', 356);
.should('be.eq', 352);
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import { css } from '@emotion/react';

import { UseEuiTheme } from '../../../services';
import { isEuiThemeRefreshVariant, UseEuiTheme } from '../../../services';
import { logicalCSS } from '../../../global_styling';
import {
euiFormControlStyles,
Expand All @@ -18,13 +18,24 @@ import {

export const euiComboBoxInputStyles = (euiThemeContext: UseEuiTheme) => {
const { euiTheme } = euiThemeContext;
const isRefreshVariant = isEuiThemeRefreshVariant(
euiThemeContext,
'formVariant'
);
const formStyles = euiFormControlStyles(euiThemeContext);

return {
// Wrapper which visually mimics a form control
euiComboBoxInputWrapper: css`
${euiFormControlDefaultShadow(euiThemeContext)}
display: flex;

${isRefreshVariant &&
`
&:focus-within {
${formStyles.focus}
}
`}
`,
multiSelect: css`
flex-wrap: wrap;
Expand All @@ -33,7 +44,10 @@ export const euiComboBoxInputStyles = (euiThemeContext: UseEuiTheme) => {
${formStyles.uncompressed}
${logicalCSS('height', 'auto')}
${logicalCSS('padding-vertical', euiTheme.size.s)}
${logicalCSS('padding-left', euiTheme.size.s)}
${logicalCSS(
'padding-left',
isRefreshVariant ? euiTheme.size.m : euiTheme.size.s
)}
column-gap: ${euiTheme.size.s};
row-gap: ${euiTheme.size.xs};
`,
Expand All @@ -60,7 +74,9 @@ export const euiComboBoxInputStyles = (euiThemeContext: UseEuiTheme) => {

invalid: css(formStyles.invalid),
disabled: css(formStyles.disabled),
open: css(formStyles.focus),
open: css`
${formStyles.focus}
`,
inGroup: css(formStyles.inGroup),

// Actual input element, which has variable width depending on its value
Expand All @@ -75,7 +91,7 @@ export const euiComboBoxInputStyles = (euiThemeContext: UseEuiTheme) => {
background: transparent;

&:disabled {
color: ${euiTheme.colors.disabledText};
color: ${euiTheme.colors.textDisabled};
}

/* Ensure that no input states are visible on the hidden input */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import {
keys,
CanvasTextUtils,
RenderWithEuiStylesMemoizer,
isEuiThemeRefreshVariant,
RenderWithEuiTheme,
} from '../../../services';
import { EuiScreenReaderOnly } from '../../accessibility';
import {
Expand Down Expand Up @@ -317,103 +319,122 @@ export class EuiComboBoxInput<T> extends Component<
});

return (
<RenderWithEuiStylesMemoizer>
{(stylesMemoizer) => {
const styles = stylesMemoizer(euiComboBoxInputStyles);
const cssStyles = [
styles.euiComboBoxInputWrapper,
!singleSelection && styles.multiSelect,
compressed ? styles.compressed : styles.uncompressed,
...(this.asPlainText || showPlaceholder
? [
styles.plainText.plainText,
compressed
? styles.plainText.compressed
: styles.plainText.uncompressed,
]
: []),
isDisabled
? styles.disabled
: isInvalid
? styles.invalid
: isListOpen
? styles.open
: undefined,
isInGroup && styles.inGroup,
];
const formLayoutStyles = [
styles.formLayout.euiComboBox__formControlLayout,
!singleSelection && styles.formLayout.multiSelect,
];

return (
<EuiFormControlLayout
icon={icon}
{...clickProps}
inputId={id}
isLoading={isLoading}
isInvalid={isInvalid}
isDisabled={isDisabled}
compressed={compressed}
fullWidth={fullWidth}
prepend={prepend}
append={append}
css={formLayoutStyles}
>
<div
css={cssStyles}
className={wrapClasses}
data-test-subj="comboBoxInput"
onClick={onClick}
tabIndex={-1} // becomes onBlur event's relatedTarget, otherwise relatedTarget is null when clicking on this div
>
{this.renderPills()}
<EuiComboBoxOptionAppendPrepend
option={this.asPlainText ? selectedOptions?.[0] : undefined}
classNamePrefix="euiComboBoxPlainTextSelection"
marginSize="xxs"
<RenderWithEuiTheme>
{(euiThemeContext) => (
<RenderWithEuiStylesMemoizer>
{(stylesMemoizer) => {
const styles = stylesMemoizer(euiComboBoxInputStyles);
const isRefreshVariant = isEuiThemeRefreshVariant(
euiThemeContext,
'formVariant'
);

const stateCss = isRefreshVariant
? isListOpen
? styles.open
: isInvalid
? styles.invalid
: undefined
: isInvalid
? styles.invalid
: isListOpen
? styles.open
: undefined;

const cssStyles = [
styles.euiComboBoxInputWrapper,
!singleSelection && styles.multiSelect,
compressed ? styles.compressed : styles.uncompressed,
...(this.asPlainText || showPlaceholder
? [
styles.plainText.plainText,
compressed
? styles.plainText.compressed
: styles.plainText.uncompressed,
]
: []),
isDisabled ? styles.disabled : stateCss,
isInGroup && styles.inGroup,
];
const formLayoutStyles = [
styles.formLayout.euiComboBox__formControlLayout,
!singleSelection && styles.formLayout.multiSelect,
];

return (
<EuiFormControlLayout
icon={icon}
{...clickProps}
inputId={id}
isLoading={isLoading}
isInvalid={isInvalid}
isDisabled={isDisabled}
compressed={compressed}
fullWidth={fullWidth}
prepend={prepend}
append={append}
css={formLayoutStyles}
>
<input
aria-activedescendant={focusedOptionId}
aria-autocomplete="list"
aria-controls={isListOpen ? rootId('listbox') : ''}
aria-expanded={isListOpen}
aria-label={ariaLabel}
aria-labelledby={ariaLabelledby}
aria-describedby={ariaDescribedby}
aria-invalid={isInvalid}
aria-haspopup="listbox"
css={styles.euiComboBoxInput}
className="euiComboBox__input"
data-test-subj="comboBoxSearchInput"
disabled={isDisabled}
id={id}
onBlur={this.onBlur}
onChange={(event) => onChange(event.target.value)}
onFocus={this.onFocus}
onKeyDown={this.onKeyDown}
ref={this.inputRefCallback}
role="combobox"
style={{
inlineSize:
this.asPlainText || showPlaceholder
? '100%'
: this.state.inputWidth,
}}
placeholder={showPlaceholder ? placeholder : undefined}
value={this.searchValue}
autoFocus={autoFocus}
autoComplete="off"
// Force the menu to re-open on every input click - only necessary when plain text
onClick={this.asPlainText ? (onFocus as any) : undefined} // Type shenanigans - event should be mostly the same
/>
</EuiComboBoxOptionAppendPrepend>
{removeOptionMessage}
</div>
</EuiFormControlLayout>
);
}}
</RenderWithEuiStylesMemoizer>
<div
css={cssStyles}
className={wrapClasses}
data-test-subj="comboBoxInput"
onClick={onClick}
tabIndex={-1} // becomes onBlur event's relatedTarget, otherwise relatedTarget is null when clicking on this div
>
{this.renderPills()}
<EuiComboBoxOptionAppendPrepend
option={
this.asPlainText ? selectedOptions?.[0] : undefined
}
classNamePrefix="euiComboBoxPlainTextSelection"
marginSize="xxs"
>
<input
aria-activedescendant={focusedOptionId}
aria-autocomplete="list"
aria-controls={isListOpen ? rootId('listbox') : ''}
aria-expanded={isListOpen}
aria-label={ariaLabel}
aria-labelledby={ariaLabelledby}
aria-describedby={ariaDescribedby}
aria-invalid={isInvalid}
aria-haspopup="listbox"
css={styles.euiComboBoxInput}
className="euiComboBox__input"
data-test-subj="comboBoxSearchInput"
disabled={isDisabled}
id={id}
onBlur={this.onBlur}
onChange={(event) => onChange(event.target.value)}
onFocus={this.onFocus}
onKeyDown={this.onKeyDown}
ref={this.inputRefCallback}
role="combobox"
style={{
inlineSize:
this.asPlainText || showPlaceholder
? '100%'
: this.state.inputWidth,
}}
placeholder={showPlaceholder ? placeholder : undefined}
value={this.searchValue}
autoFocus={autoFocus}
autoComplete="off"
// Force the menu to re-open on every input click - only necessary when plain text
onClick={
this.asPlainText ? (onFocus as any) : undefined
} // Type shenanigans - event should be mostly the same
/>
</EuiComboBoxOptionAppendPrepend>
{removeOptionMessage}
</div>
</EuiFormControlLayout>
);
}}
</RenderWithEuiStylesMemoizer>
)}
</RenderWithEuiTheme>
);
}
}
Loading