diff options
Diffstat (limited to 'src/client/views/FieldsDropdown.tsx')
-rw-r--r-- | src/client/views/FieldsDropdown.tsx | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/client/views/FieldsDropdown.tsx b/src/client/views/FieldsDropdown.tsx index 6a5c2cb4c..0ea0ebd83 100644 --- a/src/client/views/FieldsDropdown.tsx +++ b/src/client/views/FieldsDropdown.tsx @@ -13,7 +13,7 @@ import Select from 'react-select'; import { Doc } from '../../fields/Doc'; import { DocOptions, FInfo } from '../documents/Documents'; import { SearchUtil } from '../util/SearchUtil'; -import { SettingsManager } from '../util/SettingsManager'; +import { SnappingManager } from '../util/SnappingManager'; import './FilterPanel.scss'; import { ObservableReactComponent } from './ObservableReactComponent'; @@ -64,40 +64,40 @@ export class FieldsDropdown extends ObservableReactComponent<fieldsDropdownProps return ( <Select styles={{ - control: (baseStyles, state) => ({ + control: (baseStyles /* , state */) => ({ ...baseStyles, minHeight: '5px', maxHeight: '30px', - color: SettingsManager.userColor, - backgroundColor: SettingsManager.userBackgroundColor, + color: SnappingManager.userColor, + backgroundColor: SnappingManager.userBackgroundColor, padding: 0, margin: 0, }), - singleValue: (baseStyles, state) => ({ + singleValue: (baseStyles /* , state */) => ({ ...baseStyles, - color: SettingsManager.userColor, - background: SettingsManager.userBackgroundColor, + color: SnappingManager.userColor, + background: SnappingManager.userBackgroundColor, }), - placeholder: (baseStyles, state) => ({ + placeholder: (baseStyles /* , state */) => ({ ...baseStyles, - color: SettingsManager.userColor, - background: SettingsManager.userBackgroundColor, + color: SnappingManager.userColor, + background: SnappingManager.userBackgroundColor, }), - input: (baseStyles, state) => ({ + input: (baseStyles /* , state */) => ({ ...baseStyles, padding: 0, margin: 0, - color: SettingsManager.userColor, + color: SnappingManager.userColor, background: 'transparent', }), option: (baseStyles, state) => ({ ...baseStyles, - color: SettingsManager.userColor, - background: !state.isFocused ? SettingsManager.userBackgroundColor : SettingsManager.userVariantColor, + color: SnappingManager.userColor, + background: !state.isFocused ? SnappingManager.userBackgroundColor : SnappingManager.userVariantColor, }), - menuList: (baseStyles, state) => ({ + menuList: (baseStyles /* , state */) => ({ ...baseStyles, - backgroundColor: SettingsManager.userBackgroundColor, + backgroundColor: SnappingManager.userBackgroundColor, }), }} placeholder={typeof this._props.placeholder === 'string' ? this._props.placeholder : this._props.placeholder?.()} @@ -106,12 +106,14 @@ export class FieldsDropdown extends ObservableReactComponent<fieldsDropdownProps onChange={val => this._props.selectFunc((val as any as { value: string; label: string }).value)} onKeyDown={e => { if (e.key === 'Enter') { - runInAction(() => this._props.selectFunc((this._newField = (e.nativeEvent.target as any)?.value))); + runInAction(() => { + this._props.selectFunc((this._newField = (e.nativeEvent.target as any)?.value)); + }); } e.stopPropagation(); }} onMenuClose={this._props.menuClose} - closeMenuOnSelect={true} + closeMenuOnSelect value={this._props.showPlaceholder ? null : undefined} /> ); |