Refactor FuzzyOrEmptyFilter to use it all AutoComplete by default

This commit is contained in:
Florian Rival
2018-05-02 15:43:17 +01:00
parent 8b6b896520
commit eb58f592ed
9 changed files with 5 additions and 30 deletions

View File

@@ -154,7 +154,6 @@ export default class RuntimeSceneInspector extends React.Component<
text: objectName,
value: objectName,
}))}
filter={AutoComplete.fuzzyFilter}
/>
<RaisedButton
label="Create"

View File

@@ -3,10 +3,6 @@ import AutoComplete from 'material-ui/AutoComplete';
import { defaultAutocompleteProps } from '../../../UI/AutocompleteProps';
const gd = global.gd;
const fuzzyFilterOrEmpty = (searchText, key) => {
return !key || AutoComplete.fuzzyFilter(searchText, key);
};
export default class BehaviorField extends Component {
state = { errorText: null, focused: false, text: null };
@@ -139,7 +135,6 @@ export default class BehaviorField extends Component {
text: behaviorName,
value: behaviorName,
}))}
filter={fuzzyFilterOrEmpty}
openOnFocus={!this.props.isInline}
disabled={this._behaviorNames.length <= 1}
ref={field => (this._field = field)}

View File

@@ -9,10 +9,6 @@ import {
import { type ParameterFieldProps } from './ParameterFieldProps.flow';
import { defaultAutocompleteProps } from '../../../UI/AutocompleteProps';
const fuzzyFilterOrEmpty = (searchText, key) => {
return !key || AutoComplete.fuzzyFilter(searchText, key);
};
type State = {|
focused: boolean,
text: ?string,
@@ -106,7 +102,6 @@ export default class ExternalEventsField extends Component<
}
}}
dataSource={this._fullList}
filter={fuzzyFilterOrEmpty}
openOnFocus={!this.props.isInline}
ref={field => (this._field = field)}
/>

View File

@@ -4,10 +4,6 @@ import AutoComplete from 'material-ui/AutoComplete';
import { type ParameterFieldProps } from './ParameterFieldProps.flow';
import { defaultAutocompleteProps } from '../../../UI/AutocompleteProps';
const fuzzyFilterOrEmpty = (searchText, key) => {
return !key || AutoComplete.fuzzyFilter(searchText, key);
};
type State = {|
focused: boolean,
text: ?string,
@@ -160,7 +156,6 @@ export default class KeyField extends Component<ParameterFieldProps, State> {
text: keyName,
value: keyName,
}))}
filter={fuzzyFilterOrEmpty}
openOnFocus={!this.props.isInline}
ref={field => (this._field = field)}
/>

View File

@@ -5,10 +5,6 @@ import { mapFor } from '../../../Utils/MapFor';
import { type ParameterFieldProps } from './ParameterFieldProps.flow';
import { defaultAutocompleteProps } from '../../../UI/AutocompleteProps';
const fuzzyFilterOrEmpty = (searchText, key) => {
return !key || AutoComplete.fuzzyFilter(searchText, key);
};
type State = {|
focused: boolean,
text: ?string,
@@ -92,7 +88,6 @@ export default class LayerField extends Component<ParameterFieldProps, State> {
text: layerName || '(Base layer)',
value: `"${layerName}"`,
}))}
filter={fuzzyFilterOrEmpty}
openOnFocus={!this.props.isInline}
ref={field => (this._field = field)}
/>

View File

@@ -16,10 +16,6 @@ const styles = {
},
};
const fuzzyFilterOrEmpty = (searchText, key) => {
return !key || AutoComplete.fuzzyFilter(searchText, key);
};
type Props = ParameterFieldProps & {
variablesContainer: ?gdVariablesContainer,
onOpenDialog: () => void,
@@ -104,7 +100,6 @@ export default class VariableField extends Component<Props, State> {
text: variableName,
value: variableName,
}))}
filter={fuzzyFilterOrEmpty}
openOnFocus={!this.props.isInline}
ref={field => (this._field = field)}
/>

View File

@@ -4,7 +4,6 @@ import AutoComplete from 'material-ui/AutoComplete';
import MenuItem from 'material-ui/MenuItem';
import Divider from 'material-ui/Divider';
import Add from 'material-ui/svg-icons/content/add';
import { fuzzyOrEmptyFilter } from '../Utils/FuzzyOrEmptyFilter';
import {
type ResourceSource,
type ChooseResourceFunction,
@@ -155,7 +154,6 @@ export default class ResourceSelector extends React.Component<Props, State> {
<AutoComplete
{...defaultAutocompleteProps}
floatingLabelText={this.props.floatingLabelText || 'Select an image'}
filter={fuzzyOrEmptyFilter}
openOnFocus
dataSource={this.autoCompleteData || []}
onUpdateInput={this._onUpdate}

View File

@@ -1,4 +1,5 @@
// @flow
import { fuzzyOrEmptyFilter } from '../Utils/FuzzyOrEmptyFilter';
/**
* Provides props for material-ui AutoComplete components that specify
@@ -10,10 +11,11 @@ export const defaultAutocompleteProps = {
minWidth: 300,
},
menuProps: {
maxHeight: 250, //TODO: try put it in PopoverProps
maxHeight: 250,
},
popoverProps: {
// Ensure that the Popover menu is always visible on screen
canAutoPosition: true,
},
filter: fuzzyOrEmptyFilter,
};

View File

@@ -1,3 +1,4 @@
// @flow
import AutoComplete from 'material-ui/AutoComplete';
/**
@@ -6,6 +7,6 @@ import AutoComplete from 'material-ui/AutoComplete';
* @param {*} searchText
* @param {*} key
*/
export const fuzzyOrEmptyFilter = (searchText, key) => {
export const fuzzyOrEmptyFilter = (searchText: string, key: string) => {
return !key || AutoComplete.fuzzyFilter(searchText, key);
};