Skip to content

refactor: refactor Icon to Icons in sqlEditor component #14463

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

Merged
rusackas merged 4 commits into from
Jun 16, 2021
Merged

refactor: refactor Icon to Icons in sqlEditor component #14463

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a287eea
add triangle-down
pkdotson May 4, 2021
9312fc5
lint fix
pkdotson May 4, 2021
f7fc35b
Merge branch 'master' of https://github.com/preset-io/superset into t…
pkdotson Jun 15, 2021
34366fd
add suggestions
pkdotson Jun 15, 2021
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
13 changes: 7 additions & 6 deletions superset-frontend/src/SqlLab/components/SqlEditor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import PropTypes from 'prop-types';
import Split from 'react-split';
import { t, styled, supersetTheme } from '@superset-ui/core';
import { t, styled, supersetTheme, withTheme } from '@superset-ui/core';
import debounce from 'lodash/debounce';
import throttle from 'lodash/throttle';
import StyledModal from 'src/components/Modal';
Expand All @@ -38,7 +38,7 @@ import {
Switch,
Input,
} from 'src/common/components';
import Icon from 'src/components/Icon';
import Icons from 'src/components/Icons';
import { detectOS } from 'src/utils/common';
import {
addQueryEditor,
Expand Down Expand Up @@ -564,7 +564,7 @@ class SqlEditor extends React.PureComponent {
this.props.database || {};

const showMenu = allowCTAS || allowCVAS;

const { theme } = this.props;
const runMenuBtn = (
<Menu>
{allowCTAS && (
Expand Down Expand Up @@ -639,7 +639,7 @@ class SqlEditor extends React.PureComponent {
this.props.defaultQueryLimit,
)}
</span>
<Icon name="triangle-down" />
<Icons.TriangleDown iconColor={theme.colors.grayscale.base} />
</a>
</Dropdown>
</LimitSelectStyled>
Expand Down Expand Up @@ -667,7 +667,7 @@ class SqlEditor extends React.PureComponent {
<ShareSqlLabQuery queryEditor={qe} />
</span>
<Dropdown overlay={this.renderDropdown()} trigger="click">
<Icon name="more-horiz" />
<Icons.MoreHoriz iconColor={theme.colors.grayscale.base} />
</Dropdown>
</div>
</StyledToolbar>
Expand Down Expand Up @@ -783,4 +783,5 @@ function mapDispatchToProps(dispatch) {
);
}

export default connect(mapStateToProps, mapDispatchToProps)(SqlEditor);
const themedSqlEditor = withTheme(SqlEditor);
export default connect(mapStateToProps, mapDispatchToProps)(themedSqlEditor);