Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into fix-code-block-co…
Browse files Browse the repository at this point in the history
…py-bug
  • Loading branch information
elizabetdev committed Apr 21, 2020
2 parents 10df821 + d2d69ae commit aef4d3d
Show file tree
Hide file tree
Showing 48 changed files with 1,022 additions and 526 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@

- Added `showCloseButton` and `dockedBreakpoint` flexibility to `EuiCollapsibleNav` ([#3330](https://github.com/elastic/eui/pull/3330))
- Added `panelStyle` prop to `EuiPopover` to distinguish style object configuration ([#3329](https://github.com/elastic/eui/pull/3329))
- Added `popoverPlacement` prop in `EuiDatePicker` ([#3359](https://github.com/elastic/eui/pull/3359))
- Extended `EuiDatePicker`'s `startDate` and `endDate` types to accept `null` values for better interoperability ([#3343](https://github.com/elastic/eui/pull/3343))
- Added `EuiCommentList` component ([#3344](https://github.com/elastic/eui/pull/3344))

**Bug Fixes**

- Fixed `EuiInMemoryTable` `isClearable` property to initiate reset ([#3328](https://github.com/elastic/eui/pull/3328))
- Removed `schema` attribute form `<input/>` in `EuiInMemoryTable` ([#3337](https://github.com/elastic/eui/pull/3337))
- Fixed `EuiCollapsibleNav` docked states on mobile ([#3330](https://github.com/elastic/eui/pull/3330))
- Fixed `EuiPopover` positioning from being overridden by `style` prop ([#3329](https://github.com/elastic/eui/pull/3329))
- Fixed `EuiCodeBlock` not copying updated content ([#3351](https://github.com/elastic/eui/pull/3351))
- Fixed alignment of popover of end date of `EuiDatePickerRange` ([#3359](https://github.com/elastic/eui/pull/3359))

**Breaking changes**

Expand Down
4 changes: 2 additions & 2 deletions src-docs/src/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ import { ColorPickerExample } from './views/color_picker/color_picker_example';

import { ComboBoxExample } from './views/combo_box/combo_box_example';

import { CommentExample } from './views/comment/comment_example';
import { CommentListExample } from './views/comment/comment_example';

import { ContextMenuExample } from './views/context_menu/context_menu_example';

Expand Down Expand Up @@ -371,7 +371,7 @@ const navigation = [
CallOutExample,
CardExample,
CodeExample,
CommentExample,
CommentListExample,
DescriptionListExample,
DragAndDropExample,
EmptyPromptExample,
Expand Down
12 changes: 6 additions & 6 deletions src-docs/src/views/badge/badge_example.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const badgeButtonHtml = renderToHtml(BadgeButton);
const badgeButtonSnippet = [
`<EuiBadge
color="primary"
onClick={this.onBadgeClick}
onClick={onBadgeClick}
onClickAriaLabel="Aria label applied to text button"
/>
Clickable text
Expand All @@ -53,20 +53,20 @@ const badgeButtonSnippet = [
iconType="cross"
iconSide="right"
color="hollow"
iconOnClick={this.onBadgeIconClick}
iconOnClick={onBadgeIconClick}
iconOnClickAriaLabel="Aria label applied to icon button"
/>
/>
Text with clickable icon
</EuiBadge>`,
`<EuiBadge
iconType="cross"
iconSide="right"
color="secondary"
onClick={this.onBadgeClick}
onClick={onBadgeClick}
onClickAriaLabel="Aria label applied to text button"
iconOnClick={this.onBadgeIconClick}
iconOnClick={onBadgeIconClick}
iconOnClickAriaLabel="Aria label applied to icon button"
/>
/>
Clickable text with clickable icon
</EuiBadge>`,
];
Expand Down
18 changes: 9 additions & 9 deletions src-docs/src/views/button/button_example.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ const buttonToggleSource = require('!!raw-loader!./button_toggle');
const buttonToggleHtml = renderToHtml(ButtonToggle);
const buttonToggleSnippet = `<EuiButtonToggle
label={label}
iconType={this.state.toggleOn ? onIcon : offIcon}
onChange={this.onToggleChange}
isSelected={this.state.toggleOn}
iconType={toggleOn ? onIcon : offIcon}
onChange={onToggleChange}
isSelected={toggleOn}
/>`;

import ButtonGroup from './button_group';
Expand All @@ -93,15 +93,15 @@ const buttonGroupHtml = renderToHtml(ButtonGroup);
const buttonGroupSnippet = [
`<EuiButtonGroup
legend={legend}
options={this.toggleButtons}
idSelected={this.state.toggleIdSelected}
onChange={this.onChange}
options={toggleButtons}
idSelected={toggleIdSelected}
onChange={onChange}
/>`,
`<EuiButtonGroup
legend={legend}
options={this.toggleButtonsIconsMulti}
idToSelectedMap={this.state.toggleIconIdToSelectedMap}
onChange={this.onChangeIconsMulti}
options={toggleButtonsIconsMulti}
idToSelectedMap={toggleIconIdToSelectedMap}
onChange={onChangeIconsMulti}
type="multi"
isIconOnly
/>`,
Expand Down
Loading

0 comments on commit aef4d3d

Please sign in to comment.