merge conflicts resolved

This commit is contained in:
vicky_primathon.in 2020-05-22 16:16:24 +05:30
commit 627eea093f
2 changed files with 4 additions and 2 deletions

View File

@ -315,6 +315,7 @@ class DynamicAutocompleteInput extends Component<Props, State> {
isFocused: false,
autoCompleteVisible: false,
};
this.updatePropertyValue = this.updatePropertyValue.bind(this);
}
componentDidMount(): void {
@ -531,7 +532,7 @@ class DynamicAutocompleteInput extends Component<Props, State> {
}
};
updatePropertyValue = (value: string, cursor?: number) => {
updatePropertyValue(value: string, cursor?: number) {
this.editor.setValue(value);
this.editor.focus();
if (cursor === undefined) {
@ -544,7 +545,7 @@ class DynamicAutocompleteInput extends Component<Props, State> {
this.setState({ isFocused: true }, () => {
this.handleAutocompleteVisibility(this.editor);
});
};
}
render() {
const {

View File

@ -213,6 +213,7 @@ const ApiEditorForm: React.FC<Props> = (props: Props) => {
className="t--path"
placeholder="v1/method"
name="actionConfiguration.path"
showLightningMenu={false}
leftIcon={FormIcons.SLASH_ICON}
normalize={value => value.trim()}
singleLine