Skip to content

[Select] Add IconComponent property #11136

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

Merged
merged 1 commit into from
May 3, 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
1 change: 1 addition & 0 deletions packages/material-ui/src/Select/Select.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export interface SelectProps
Pick<SelectInputProps, 'onChange'> {
autoWidth?: boolean;
displayEmpty?: boolean;
IconComponent?: React.ReactType;
input?: React.ReactNode;
MenuProps?: Partial<MenuProps>;
multiple?: boolean;
Expand Down
8 changes: 8 additions & 0 deletions packages/material-ui/src/Select/Select.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import SelectInput from './SelectInput';
import withStyles from '../styles/withStyles';
import ArrowDropDownIcon from '../internal/svg-icons/ArrowDropDown';
import Input from '../Input'; // Import to enforce the CSS injection order

export const styles = theme => ({
Expand Down Expand Up @@ -65,6 +66,7 @@ function Select(props) {
children,
classes,
displayEmpty,
IconComponent,
input,
inputProps,
MenuProps,
Expand All @@ -87,6 +89,7 @@ function Select(props) {
children,
classes,
displayEmpty,
IconComponent,
MenuProps,
multiple,
native,
Expand Down Expand Up @@ -123,6 +126,10 @@ Select.propTypes = {
* You can only use it when the `native` property is `false` (default).
*/
displayEmpty: PropTypes.bool,
/**
* The icon that displays the arrow.
*/
IconComponent: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
/**
* An `Input` element; does not have to be a material-ui specific `Input`.
*/
Expand Down Expand Up @@ -198,6 +205,7 @@ Select.propTypes = {
Select.defaultProps = {
autoWidth: false,
displayEmpty: false,
IconComponent: ArrowDropDownIcon,
input: <Input />,
multiple: false,
native: false,
Expand Down
1 change: 1 addition & 0 deletions packages/material-ui/src/Select/SelectInput.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export interface SelectInputProps extends StandardProps<{}, SelectInputClassKey>
autoFocus?: boolean;
autoWidth: boolean;
disabled?: boolean;
IconComponent?: React.ReactType;
inputRef?: (
ref: HTMLSelectElement | { node: HTMLInputElement; value: SelectInputProps['value'] },
) => void;
Expand Down
10 changes: 7 additions & 3 deletions packages/material-ui/src/Select/SelectInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
import classNames from 'classnames';
import keycode from 'keycode';
import warning from 'warning';
import ArrowDropDownIcon from '../internal/svg-icons/ArrowDropDown';
import Menu from '../Menu/Menu';
import { isFilled } from '../Input/Input';

Expand Down Expand Up @@ -165,6 +164,7 @@ class SelectInput extends React.Component {
className: classNameProp,
disabled,
displayEmpty,
IconComponent,
inputRef,
MenuProps = {},
multiple,
Expand Down Expand Up @@ -223,7 +223,7 @@ class SelectInput extends React.Component {
>
{children}
</select>
<ArrowDropDownIcon className={classes.icon} />
<IconComponent className={classes.icon} />
</div>
);
}
Expand Down Expand Up @@ -332,7 +332,7 @@ class SelectInput extends React.Component {
type={type}
{...other}
/>
<ArrowDropDownIcon className={classes.icon} />
<IconComponent className={classes.icon} />
<Menu
id={`menu-${name || ''}`}
anchorEl={this.displayNode}
Expand Down Expand Up @@ -390,6 +390,10 @@ SelectInput.propTypes = {
* You can only use it when the `native` property is `false` (default).
*/
displayEmpty: PropTypes.bool,
/**
* The icon that displays the arrow.
*/
IconComponent: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
/**
* Use that property to pass a ref callback to the native select element.
*/
Expand Down
1 change: 1 addition & 0 deletions packages/material-ui/src/Select/SelectInput.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ describe('<SelectInput />', () => {
native: false,
multiple: false,
displayEmpty: false,
IconComponent: 'div',
children: [
<MenuItem key={1} value={10}>
Ten
Expand Down
1 change: 1 addition & 0 deletions pages/api/select.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ filename: /packages/material-ui/src/Select/Select.js
| <span class="prop-name">children</span> | <span class="prop-type">node | | The option elements to populate the select with. Can be some `MenuItem` when `native` is false and `option` when `native` is true. |
| <span class="prop-name">classes</span> | <span class="prop-type">object | | Useful to extend the style applied to components. |
| <span class="prop-name">displayEmpty</span> | <span class="prop-type">bool | <span class="prop-default">false</span> | If `true`, the selected item is displayed even if its value is empty. You can only use it when the `native` property is `false` (default). |
| <span class="prop-name">IconComponent</span> | <span class="prop-type">union:&nbsp;string&nbsp;&#124;<br>&nbsp;func<br> | <span class="prop-default">ArrowDropDownIcon</span> | The icon that displays the arrow. |
| <span class="prop-name">input</span> | <span class="prop-type">element | <span class="prop-default">&lt;Input /></span> | An `Input` element; does not have to be a material-ui specific `Input`. |
| <span class="prop-name">inputProps</span> | <span class="prop-type">object | | Properties applied to the `input` element. When `native` is `true`, the properties are applied on the `select` element. |
| <span class="prop-name">MenuProps</span> | <span class="prop-type">object | | Properties applied to the `Menu` element. |
Expand Down