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

fix: Revert "fix: keep placeholder in multivalue select when a value exists" #11270

Merged
merged 1 commit into from
Oct 14, 2020
Merged

fix: Revert "fix: keep placeholder in multivalue select when a value exists" #11270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 20 additions & 47 deletions superset-frontend/spec/javascripts/explore/components/SelectControl_spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/* eslint-disable no-unused-expressions */
import React from 'react';
import sinon from 'sinon';
import { shallow, mount } from 'enzyme';
import { shallow } from 'enzyme';
import { Select, CreatableSelect } from 'src/components/Select';
import OnPasteSelect from 'src/components/Select/OnPasteSelect';
import SelectControl from 'src/explore/components/controls/SelectControl';
Expand Down Expand Up @@ -47,6 +47,25 @@ describe('SelectControl', () => {
wrapper = shallow(<SelectControl {...defaultProps} />);
});

it('renders with Select by default', () => {
expect(wrapper.find(OnPasteSelect)).not.toExist();
expect(wrapper.findWhere(x => x.type() === Select)).toHaveLength(1);
});

it('renders with OnPasteSelect when multi', () => {
wrapper.setProps({ multi: true });
expect(wrapper.find(OnPasteSelect)).toExist();
expect(wrapper.findWhere(x => x.type() === Select)).toHaveLength(0);
});

it('renders with Creatable when freeForm', () => {
wrapper.setProps({ freeForm: true });
expect(wrapper.find(OnPasteSelect)).not.toExist();
expect(wrapper.findWhere(x => x.type() === CreatableSelect)).toHaveLength(
1,
);
});

it('uses Select in onPasteSelect when freeForm=false', () => {
wrapper = shallow(<SelectControl {...defaultProps} multi />);
const select = wrapper.find(OnPasteSelect);
Expand Down Expand Up @@ -81,52 +100,6 @@ describe('SelectControl', () => {
expect(selectAllProps.onChange.calledWith(expectedValues)).toBe(true);
});

describe('render', () => {
it('renders with Select by default', () => {
expect(wrapper.find(OnPasteSelect)).not.toExist();
expect(wrapper.findWhere(x => x.type() === Select)).toHaveLength(1);
});

it('renders with OnPasteSelect when multi', () => {
wrapper.setProps({ multi: true });
expect(wrapper.find(OnPasteSelect)).toExist();
expect(wrapper.findWhere(x => x.type() === Select)).toHaveLength(0);
});

it('renders with Creatable when freeForm', () => {
wrapper.setProps({ freeForm: true });
expect(wrapper.find(OnPasteSelect)).not.toExist();
expect(wrapper.findWhere(x => x.type() === CreatableSelect)).toHaveLength(
1,
);
});
describe('when select is multi', () => {
it('renders the placeholder when a selection has been made', () => {
wrapper = mount(
<SelectControl
{...defaultProps}
multi
value={50}
placeholder="add something"
/>,
);
expect(wrapper.html()).toContain('add something');
});
});
describe('when select is single', () => {
it('does not render the placeholder when a selection has been made', () => {
wrapper = mount(
<SelectControl
{...defaultProps}
value={50}
placeholder="add something"
/>,
);
expect(wrapper.html()).not.toContain('add something');
});
});
});

describe('getOptions', () => {
it('returns the correct options', () => {
wrapper.setProps(defaultProps);
Expand Down
44 changes: 3 additions & 41 deletions superset-frontend/src/components/Select/styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import React, { CSSProperties, ComponentType } from 'react';
import React, { CSSProperties } from 'react';
import { css, SerializedStyles, ClassNames } from '@emotion/core';
import { supersetTheme } from '@superset-ui/core';
import {
Expand Down Expand Up @@ -241,39 +241,9 @@ export const DEFAULT_STYLES: PartialStylesConfig = {
}),
};

const multiInputSpanStyle = css`
color: '#879399',
position: 'absolute',
top: '2px',
left: '4px',
width: '100vw',
`;
const { ClearIndicator, DropdownIndicator, Option } = defaultComponents;

const { ClearIndicator, DropdownIndicator, Option, Input } = defaultComponents;

type SelectComponentsType = SelectComponentsConfig<any> & {
Input: ComponentType<InputProps>;
};

// react-select is missing selectProps from their props type
// so overwriting it here to avoid errors
type InputProps = {
selectProps: {
isMulti: boolean;
value: {
length: number;
};
placeholder: string;
};
cx: (a: string | null, b: any, c: string) => string | void;
innerRef: (element: React.Ref<any>) => void;
isHidden: boolean;
isDisabled?: boolean | undefined;
className?: string | undefined;
getStyles: any;
};

export const DEFAULT_COMPONENTS: SelectComponentsType = {
export const DEFAULT_COMPONENTS: SelectComponentsConfig<any> = {
Option: ({ children, innerProps, data, ...props }) => (
<ClassNames>
{({ css }) => (
Expand Down Expand Up @@ -302,14 +272,6 @@ export const DEFAULT_COMPONENTS: SelectComponentsType = {
/>
</DropdownIndicator>
),
Input: (props: InputProps) => (
<div style={{ position: 'relative' }}>
<Input {...props} />
{!!(props.selectProps.isMulti && props.selectProps.value.length) && (
<span css={multiInputSpanStyle}>{props.selectProps.placeholder}</span>
)}
</div>
),
};

export const VALUE_LABELED_STYLES: PartialStylesConfig = {
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/explore/components/controls/AdhocFilterControl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export default class AdhocFilterControl extends React.Component {
<OnPasteSelect
isMulti
name={`select-${this.props.name}`}
placeholder={t('choose one or more column or metric')}
placeholder={t('choose a column or metric')}
options={this.state.options}
value={this.state.values}
labelKey="label"
Expand Down
6 changes: 1 addition & 5 deletions superset-frontend/src/explore/components/controls/MetricsControl.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,11 +337,7 @@ export default class MetricsControl extends React.PureComponent {
<OnPasteSelect
isMulti={this.props.multi}
name={`select-${this.props.name}`}
placeholder={
this.props.multi
? t('choose one or more column or aggregate function')
: t('choose a column or aggregate function')
}
placeholder={t('choose a column or aggregate function')}
options={this.state.options}
value={this.state.value}
labelKey="label"
Expand Down