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

Misc. small fixes against outstanding issues #487

Merged
merged 4 commits into from
Mar 9, 2018
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# [`master`](https://github.com/elastic/eui/tree/master)

No public interface changes since `0.0.25`.
**Bug fixes**

- `EuiBottomBar` now uses `EuiPortal` to avoid zindex conflicts ([#487](https://github.com/elastic/eui/pull/487))
- Upped dark theme contrast on disabled buttons ([#487](https://github.com/elastic/eui/pull/487))

# [`0.0.25`](https://github.com/elastic/eui/tree/v0.0.25)

Expand Down
1 change: 0 additions & 1 deletion src-docs/src/views/pagination/customizable_pagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ export default class extends Component {
isOpen={this.state.isPopoverOpen}
closePopover={this.closePopover.bind(this)}
panelPaddingSize="none"
withTitle
>
<EuiContextMenuPanel
items={items}
Expand Down
16 changes: 10 additions & 6 deletions src/components/bottom_bar/bottom_bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';

import { EuiPortal } from '../portal'

const paddingSizeToClassNameMap = {
none: null,
s: 'euiBottomBar--paddingSmall',
Expand All @@ -24,12 +26,14 @@ export const EuiBottomBar = ({
);

return (
<div
className={classes}
{...rest}
>
{children}
</div>
<EuiPortal>
<div
className={classes}
{...rest}
>
{children}
</div>
</EuiPortal>
);
};

Expand Down
6 changes: 6 additions & 0 deletions src/components/bottom_bar/bottom_bar.test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { render } from 'enzyme';
import { requiredProps } from '../../test/required_props';

import { EuiBottomBar, PADDING_SIZES } from './bottom_bar';


// TODO: Temporary hack which we can remove once react-test-renderer supports portals.
// More info at https://github.com/facebook/react/issues/11565.
ReactDOM.createPortal = node => node;

describe('EuiBottomBar', () => {
test('is rendered', () => {
const component = render(
Expand Down
2 changes: 1 addition & 1 deletion src/components/button/_index.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$euiButtonHeightSmall: $euiSizeXL;
$euiButtonColorDisabled: tintOrShade($euiTextColor, 70%, 80%);
$euiButtonColorDisabled: tintOrShade($euiTextColor, 70%, 70%);

@mixin euiButton {

Expand Down