import * as React from 'react';
import { WrappedFieldProps, Field } from 'redux-form';
-import { identity, memoize } from 'lodash';
+import { memoize } from 'lodash';
import { Autocomplete } from '~/components/autocomplete/autocomplete';
import { Vocabulary } from '~/models/vocabulary';
-import { require } from '~/validators/require';
-import { ITEMS_PLACEHOLDER, connectVocabulary, VocabularyProp, hasError, getErrorMsg, handleBlur } from '~/views-components/resource-properties-form/property-field-common';
+import { connectVocabulary, VocabularyProp, buildProps } from '~/views-components/resource-properties-form/property-field-common';
+import { TAG_KEY_VALIDATION } from '~/validators/validators';
export const PROPERTY_KEY_FIELD_NAME = 'key';
vocabulary={vocabulary}
validate={getValidation(vocabulary)} />);
-const PropertyKeyInput = ({ input, meta, vocabulary }: WrappedFieldProps & VocabularyProp) =>
+const PropertyKeyInput = ({ vocabulary, ...props }: WrappedFieldProps & VocabularyProp) =>
<Autocomplete
- value={input.value}
- onChange={input.onChange}
- onBlur={handleBlur(input)}
label='Key'
- suggestions={getSuggestions(input.value, vocabulary)}
- items={ITEMS_PLACEHOLDER}
- onSelect={input.onChange}
- renderSuggestion={identity}
- error={hasError(meta)}
- helperText={getErrorMsg(meta)}
+ suggestions={getSuggestions(props.input.value, vocabulary)}
+ {...buildProps(props)}
/>;
const getValidation = memoize(
(vocabulary: Vocabulary) =>
vocabulary.strict
- ? [require, matchTags(vocabulary)]
- : [require]);
+ ? [...TAG_KEY_VALIDATION, matchTags(vocabulary)]
+ : TAG_KEY_VALIDATION);
const matchTags = (vocabulary: Vocabulary) =>
(value: string) =>