Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce compressed appearance for OuiSuperDatePicker #1307

Merged
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
42 changes: 35 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,54 @@

### 📈 Features/Enhancements

- Introduce compressed appearance for OuiSuperDatePicker ([#1307](https://github.com/opensearch-project/oui/pull/1307))

### 🐛 Bug Fixes

- Fix next reset for code blocks and super update button icon ([#1306])(https://github.com/opensearch-project/oui/pull/1306)

### 🚞 Infrastructure

### 📝 Documentation

### 🛠 Maintenance

- Add @virajsanghvi as a maintainer ([#1309])(https://github.com/opensearch-project/oui/pull/1309)

### 🪛 Refactoring

### 🔩 Tests


## [`1.7.0`](https://github.com/opensearch-project/oui/tree/1.7.0)

### Deprecations

### 🛡 Security

### 📈 Features/Enhancements

- Make Super Update Button secondary instead of primary ([#1286](https://github.com/opensearch-project/oui/pull/1286))
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved
- Use faster animations for modals, popovers, and tooltips ([#1282](https://github.com/opensearch-project/oui/pull/1282))
- Use small font size consistently in buttons and button groups ([#1281](https://github.com/opensearch-project/oui/pull/1281))
- Adjust popover and context menu title styles and tooltip padding ([#1283](https://github.com/opensearch-project/oui/pull/1283))
- Remove Button translations and add inset shadow on active ([#1285](https://github.com/opensearch-project/oui/pull/1285))
- [OuiFilterGroup] Allow popovers to size to content ([#1280](https://github.com/opensearch-project/oui/pull/1280))
- Add compressed form, color-picker, and combo-box internal components ([#1301](https://github.com/opensearch-project/oui/pull/1301))
- Add small button and filter-button internal components ([#1301](https://github.com/opensearch-project/oui/pull/1301))

### 🐛 Bug Fixes
- Fix next reset for code blocks and super update button icon ([1306])(https://github.com/opensearch-project/oui/pull/1306)

### 🚞 Infrastructure

### 📝 Documentation

- Add instructions on how to test with OpenSearch Dashboards ([1279](https://github.com/opensearch-project/oui/pull/1279))
- Add Explanation for external Prop in OuiLink ([#1182](https://github.com/opensearch-project/oui/pull/1182))

### 🛠 Maintenance

- Add @virajsanghvi as a maintainer
- Clean up unused runtime and dev dependencies ([#1135](https://github.com/opensearch-project/oui/pull/1135))

### 🪛 Refactoring

### 🔩 Tests

## [`1.6.0`](https://github.com/opensearch-project/oui/tree/1.6.0)

Expand Down Expand Up @@ -4510,4 +4538,4 @@

## [`0.0.1`](https://github.com/elastic/eui/tree/v0.0.1) Initial Release

- Initial public release
- Initial public release
74 changes: 46 additions & 28 deletions i18ntokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -2237,14 +2237,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 429,
"line": 439,
"column": 14,
"index": 11292
"index": 11503
},
"end": {
"line": 432,
"line": 442,
"column": 16,
"index": 11418
"index": 11629
}
},
"filepath": "src/components/date_picker/super_date_picker/super_date_picker.tsx"
Expand All @@ -2255,14 +2255,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 127,
"line": 129,
"column": 6,
"index": 3258
"index": 3324
},
"end": {
"line": 130,
"line": 132,
"column": 8,
"index": 3357
"index": 3423
}
},
"filepath": "src/components/date_picker/super_date_picker/super_update_button.tsx"
Expand All @@ -2273,14 +2273,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 134,
"line": 136,
"column": 8,
"index": 3442
"index": 3508
},
"end": {
"line": 137,
"line": 139,
"column": 10,
"index": 3549
"index": 3615
}
},
"filepath": "src/components/date_picker/super_date_picker/super_update_button.tsx"
Expand All @@ -2291,14 +2291,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 139,
"line": 141,
"column": 8,
"index": 3570
"index": 3636
},
"end": {
"line": 142,
"line": 144,
"column": 10,
"index": 3673
"index": 3739
}
},
"filepath": "src/components/date_picker/super_date_picker/super_update_button.tsx"
Expand All @@ -2309,14 +2309,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 149,
"line": 151,
"column": 8,
"index": 3769
"index": 3835
},
"end": {
"line": 152,
"line": 154,
"column": 10,
"index": 3881
"index": 3947
}
},
"filepath": "src/components/date_picker/super_date_picker/super_update_button.tsx"
Expand All @@ -2327,14 +2327,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 156,
"line": 158,
"column": 8,
"index": 3968
"index": 4034
},
"end": {
"line": 159,
"line": 161,
"column": 10,
"index": 4081
"index": 4147
}
},
"filepath": "src/components/date_picker/super_date_picker/super_update_button.tsx"
Expand All @@ -2345,14 +2345,14 @@
"highlighting": "string",
"loc": {
"start": {
"line": 134,
"line": 139,
"column": 8,
"index": 3779
"index": 3813
},
"end": {
"line": 140,
"line": 145,
"column": 55,
"index": 4046
"index": 4080
}
},
"filepath": "src/components/filter_group/filter_button.tsx"
Expand Down Expand Up @@ -3635,6 +3635,24 @@
},
"filepath": "src/components/selectable/selectable.tsx"
},
{
"token": "ouiSplitButton.screenReaderAnnouncement",
"defString": "You are in a selector of {optionsCount} items and must select a single option.\n Use the up and down keys to navigate or escape to close.",
"highlighting": "string",
"loc": {
"start": {
"line": 317,
"column": 10,
"index": 8002
},
"end": {
"line": 322,
"column": 12,
"index": 8310
}
},
"filepath": "src/components/split_button/split_button.tsx"
},
{
"token": "ouiStat.loadingText",
"defString": "Statistic is loading",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default () => {
const [isLoading, setIsLoading] = useState(false);
const [showUpdateButton, setShowUpdateButton] = useState(true);
const [isAutoRefreshOnly, setIsAutoRefreshOnly] = useState(false);
const [compressed, setCompressed] = useState(false);
const [start, setStart] = useState('now-30m');
const [end, setEnd] = useState('now');
const [isPaused, setIsPaused] = useState(true);
Expand Down Expand Up @@ -78,6 +79,10 @@ export default () => {
setIsAutoRefreshOnly(!isAutoRefreshOnly);
};

const toggleCompressed = () => {
setCompressed(!compressed);
};

return (
<Fragment>
<OuiSwitch
Expand All @@ -98,6 +103,12 @@ export default () => {
onChange={toggleDisabled}
checked={isDisabled}
/>
&emsp;
<OuiSwitch
label="Compressed"
onChange={toggleCompressed}
checked={compressed}
/>
<OuiSpacer />
<OuiSuperDatePicker
isDisabled={isDisabled}
Expand All @@ -112,6 +123,7 @@ export default () => {
recentlyUsedRanges={recentlyUsedRanges}
showUpdateButton={showUpdateButton}
isAutoRefreshOnly={isAutoRefreshOnly}
compressed={compressed}
/>
<OuiSpacer />
</Fragment>
Expand Down
7 changes: 7 additions & 0 deletions src/components/date_picker/date_picker_range.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ export type OuiDatePickerRangeProps = CommonProps & {
* The start date `OuiDatePicker` element
*/
startDateControl: ReactNode;

/**
* when `true` creates a shorter input
*/
compressed?: boolean;
};

export const OuiDatePickerRange: FunctionComponent<OuiDatePickerRangeProps> = ({
Expand All @@ -80,13 +85,15 @@ export const OuiDatePickerRange: FunctionComponent<OuiDatePickerRangeProps> = ({
fullWidth,
isCustom,
readOnly,
compressed,
...rest
}) => {
const classes = classNames(
'ouiDatePickerRange',
{
'ouiDatePickerRange--fullWidth': fullWidth,
'ouiDatePickerRange--readOnly': readOnly,
'ouiDatePickerRange--compressed': compressed,
},
className
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exports[`OuiSuperDatePicker is rendered 1`] = `
<OuiFlexItem>
<OuiFormControlLayout
className="ouiSuperDatePicker"
compressed={false}
isDisabled={false}
prepend={
<OuiQuickSelectPopover
Expand Down Expand Up @@ -98,6 +99,7 @@ exports[`OuiSuperDatePicker is rendered 1`] = `
grow={false}
>
<OuiSuperUpdateButton
compressed={false}
data-test-subj="superDatePickerApplyTimeButton"
isDisabled={false}
isLoading={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ exports[`OuiSuperUpdateButton is rendered 1`] = `
isDisabled={false}
isLoading={false}
onClick={[Function]}
size="m"
textProps={
Object {
"className": "ouiSuperUpdateButton__text",
Expand Down Expand Up @@ -44,6 +45,7 @@ exports[`OuiSuperUpdateButton isDisabled 1`] = `
isDisabled={true}
isLoading={false}
onClick={[Function]}
size="m"
textProps={
Object {
"className": "ouiSuperUpdateButton__text",
Expand All @@ -70,6 +72,7 @@ exports[`OuiSuperUpdateButton isLoading 1`] = `
isDisabled={false}
isLoading={true}
onClick={[Function]}
size="m"
textProps={
Object {
"className": "ouiSuperUpdateButton__text",
Expand Down Expand Up @@ -102,6 +105,7 @@ exports[`OuiSuperUpdateButton needsUpdate 1`] = `
isDisabled={false}
isLoading={false}
onClick={[Function]}
size="m"
textProps={
Object {
"className": "ouiSuperUpdateButton__text",
Expand All @@ -128,6 +132,7 @@ exports[`OuiSuperUpdateButton showTooltip 1`] = `
isDisabled={false}
isLoading={false}
onClick={[Function]}
size="m"
textProps={
Object {
"className": "ouiSuperUpdateButton__text",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
// Fixes margin around delimiter
// Only needed on first popover since basic .ouiFormControlLayout takes care of the last one
margin-right: -$ouiSizeM;

&.ouiSuperDatePicker__startPopoverButton--compressed {
margin-right: -$ouiSizeS;
}
}

.ouiSuperDatePicker__prettyFormat {
Expand All @@ -70,6 +74,11 @@
display: none;
}
}

&--compressed {
line-height: $ouiFormControlLayoutGroupInputCompressedHeight;
height: $ouiFormControlLayoutGroupInputCompressedHeight;
}
}

.ouiSuperDatePicker__prettyFormatLink {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
color: $ouiColorDarkShade;
cursor: default;
}

&-compressed {
line-height: $ouiFormControlLayoutGroupInputCompressedHeight;
height: $ouiFormControlLayoutGroupInputCompressedHeight;
}
}

.ouiDatePopoverButton--start {
Expand Down
Loading
Loading