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.

Sign up for GitHub

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

Jump to bottom

Created compressed EuiButtonGroup #2343

Merged
merged 6 commits into from
Sep 18, 2019
Merged

Created compressed EuiButtonGroup #2343

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4271e02
Added `compressed` option to EuiButtonGroup `buttonSize`
Sep 13, 2019
486e2f5
Beefed up tests
Sep 13, 2019
131948b
Finalize style (coloring)
Sep 17, 2019
707e9e7
More comment
Sep 17, 2019
3fa4367
cl
Sep 17, 2019
8bcb5c9
Merge branch 'master' into compressed-button-group
cchaos Sep 17, 2019
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## [`master`](https://github.com/elastic/eui/tree/master)

No public interface changes since `14.1.1`.
- Add `compressed` option to `buttonSize` prop of EuiButtonGroup ([#2343](https://github.com/elastic/eui/pull/2343))

## [`14.1.1`](https://github.com/elastic/eui/tree/v14.1.1)

Expand Down
61 changes: 59 additions & 2 deletions src-docs/src/views/button/button_group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
} from '../../../../src/components';

import makeId from '../../../../src/components/form/form_row/make_id';
import { EuiPanel } from '../../../../src/components/panel/panel';

export default class extends Component {
constructor(props) {
Expand Down Expand Up @@ -46,6 +47,21 @@ export default class extends Component {
},
];

this.toggleButtonsCompressed = [
{
id: `${idPrefix2}3`,
label: 'fine',
},
{
id: `${idPrefix2}4`,
label: 'rough',
},
{
id: `${idPrefix2}5`,
label: 'coarse',
},
];

this.toggleButtonsIcons = [
{
id: `${idPrefix3}0`,
Expand Down Expand Up @@ -98,6 +114,7 @@ export default class extends Component {
},
toggleIconIdSelected: `${idPrefix3}1`,
toggleIconIdToSelectedMap: {},
toggleCompressedIdSelected: `${idPrefix2}4`,
};
}

Expand Down Expand Up @@ -126,6 +143,12 @@ export default class extends Component {
});
};

onChangeCompressed = optionId => {
this.setState({
toggleCompressedIdSelected: optionId,
});
};

onChangeIconsMulti = optionId => {
const newToggleIconIdToSelectedMap = {
...this.state.toggleIconIdToSelectedMap,
Expand Down Expand Up @@ -173,6 +196,7 @@ export default class extends Component {
options={this.toggleButtons}
idSelected={this.state.toggleIdSelected}
onChange={this.onChange}
buttonSize="m"
isDisabled
isFullWidth
/>
Expand All @@ -184,7 +208,6 @@ export default class extends Component {
<EuiButtonGroup
legend="Text align"
name="textAlign"
className="eui-displayInlineBlock"
options={this.toggleButtonsIcons}
idSelected={this.state.toggleIconIdSelected}
onChange={this.onChangeIcons}
Expand All @@ -193,13 +216,47 @@ export default class extends Component {
&nbsp;&nbsp;
<EuiButtonGroup
legend="Text style"
className="eui-displayInlineBlock"
options={this.toggleButtonsIconsMulti}
idToSelectedMap={this.state.toggleIconIdToSelectedMap}
onChange={this.onChangeIconsMulti}
type="multi"
isIconOnly
/>
<EuiSpacer />
<EuiPanel style={{ maxWidth: 300 }}>
<EuiTitle size="xxxs">
<h3>
Compressed groups should always be fullWidth so they line up
nicely in their small container.
</h3>
</EuiTitle>
<EuiSpacer size="s" />
<EuiButtonGroup
name="coarsness"
legend="This is a basic group"
options={this.toggleButtonsCompressed}
idSelected={this.state.toggleCompressedIdSelected}
onChange={this.onChangeCompressed}
buttonSize="compressed"
isFullWidth
/>
<EuiSpacer />
<EuiTitle size="xxxs">
<h3>Unless they are icon only</h3>
</EuiTitle>
<EuiSpacer size="s" />
<EuiButtonGroup
name="textStyleCompressed"
legend="Text style"
className="eui-displayInlineBlock"
options={this.toggleButtonsIconsMulti}
idToSelectedMap={this.state.toggleIconIdToSelectedMap}
onChange={this.onChangeIconsMulti}
type="multi"
buttonSize="compressed"
isIconOnly
/>
</EuiPanel>
</Fragment>
);
}
Expand Down
133 changes: 115 additions & 18 deletions src-docs/src/views/form_compressed/complex_example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Component } from 'react';

import {
EuiButtonGroup,
EuiButtonIcon,
EuiColorPicker,
EuiColorPickerSwatch,
Expand All @@ -27,6 +28,8 @@ export default class extends Component {
constructor(props) {
super(props);
const idPrefix = makeId;
const idPrefix2 = makeId;
const idPrefix3 = makeId;

this.toggleButtons = [
{
Expand All @@ -43,6 +46,48 @@ export default class extends Component {
},
];

this.typeStyleToggleButtons = [
{
id: `${idPrefix3}3`,
label: 'Bold',
name: 'bold',
iconType: 'editorBold',
},
{
id: `${idPrefix3}4`,
label: 'Italic',
name: 'italic',
iconType: 'editorItalic',
},
{
id: `${idPrefix3}5`,
label: 'Underline',
name: 'underline',
iconType: 'editorUnderline',
},
{
id: `${idPrefix3}6`,
label: 'Strikethrough',
name: 'strikethrough',
iconType: 'editorStrike',
},
];

this.granularityToggleButtons = [
{
id: `${idPrefix2}3`,
label: 'fine',
},
{
id: `${idPrefix2}4`,
label: 'rough',
},
{
id: `${idPrefix2}5`,
label: 'coarse',
},
];

this.state = {
isSwitchChecked: false,
opacityValue: '20',
Expand All @@ -51,6 +96,8 @@ export default class extends Component {
borderValue: 3,
popoverSliderValues: 16,
dualValue: [5, 10],
typeStyleToggleButtonsIdToSelectedMap: {},
granularityToggleButtonsIdSelected: `${idPrefix2}4`,
};

this.selectTooltipContent =
Expand Down Expand Up @@ -95,6 +142,25 @@ export default class extends Component {
});
};

onTypeStyleChange = optionId => {
const newTypeStyleToggleButtonsIdToSelectedMap = {
...this.state.typeStyleToggleButtonsIdToSelectedMap,
...{
[optionId]: !this.state.typeStyleToggleButtonsIdToSelectedMap[optionId],
},
};

this.setState({
typeStyleToggleButtonsIdToSelectedMap: newTypeStyleToggleButtonsIdToSelectedMap,
});
};

onGranularityChange = optionId => {
this.setState({
granularityToggleButtonsIdSelected: optionId,
});
};

render() {
return (
<EuiPanel style={{ maxWidth: 432 }}>
Expand Down Expand Up @@ -156,6 +222,17 @@ export default class extends Component {
/>
</EuiFormRow>

<EuiFormRow label="Granularity" display="columnCompressed">
<EuiButtonGroup
legend="Granulariy of zoom levels"
options={this.granularityToggleButtons}
idSelected={this.state.granularityToggleButtonsIdSelected}
onChange={this.onGranularityChange}
buttonSize="compressed"
isFullWidth
/>
</EuiFormRow>

<EuiFormRow label="Fill" display="columnCompressed">
<EuiColorPicker
onChange={this.onColorChange}
Expand Down Expand Up @@ -229,10 +306,8 @@ export default class extends Component {

<EuiSpacer size="s" />

<EuiFormLabel htmlFor="docsExampleLabelFont">Label</EuiFormLabel>
<EuiSpacer size="xs" />
<EuiFlexGroup gutterSize="s" responsive={false} wrap>
<EuiFlexItem grow={3} style={{ minWidth: 160 }}>
<EuiFormRow label="Label" display="columnCompressed">
<div>
<EuiSelect
id="docsExampleLabelFont"
options={[
Expand All @@ -242,21 +317,43 @@ export default class extends Component {
]}
compressed
prepend="Font"
aria-label="Label font family"
/>
</EuiFlexItem>
<EuiFlexItem style={{ minWidth: 80 }}>
<EuiRange
showInput="inputWithPopover"
min={7}
max={140}
value={this.state.popoverSliderValues}
onChange={this.onPopoverSliderValueChange}
compressed
append="px"
aria-label="Label font size in pixels"
/>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size="xs" />
<EuiFlexGroup
gutterSize="s"
responsive={false}
wrap
justifyContent="flexEnd">
<EuiFlexItem>
<EuiRange
showInput="inputWithPopover"
min={7}
max={140}
value={this.state.popoverSliderValues}
onChange={this.onPopoverSliderValueChange}
compressed
append="px"
aria-label="Label font size in pixels"
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonGroup
legend="Label text style"
className="eui-displayInlineBlock"
options={this.typeStyleToggleButtons}
idToSelectedMap={
this.state.typeStyleToggleButtonsIdToSelectedMap
}
onChange={this.onTypeStyleChange}
type="multi"
isIconOnly
buttonSize="compressed"
/>
</EuiFlexItem>
</EuiFlexGroup>
</div>
</EuiFormRow>

<EuiSpacer size="s" />

Expand Down
Loading