diff --git a/app/client/src/components/editorComponents/CodeEditor/BindingPromptHelper.ts b/app/client/src/components/editorComponents/CodeEditor/BindingPromptHelper.ts index 52bc0b6111..ea62cd5ca5 100644 --- a/app/client/src/components/editorComponents/CodeEditor/BindingPromptHelper.ts +++ b/app/client/src/components/editorComponents/CodeEditor/BindingPromptHelper.ts @@ -3,9 +3,12 @@ import { isString } from "lodash"; export const showBindingPrompt = ( showEvaluatedValue: boolean, inputValue: any, + isHinterOpen: boolean, ): boolean => { return ( showEvaluatedValue && - (!isString(inputValue) || !inputValue?.includes("{{") || !inputValue) + (!isString(inputValue) || + (!inputValue && !isHinterOpen) || + (!inputValue?.includes("{{") && !inputValue?.includes("/"))) ); }; diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx index f652e5dae0..20027150f9 100644 --- a/app/client/src/components/editorComponents/CodeEditor/index.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx @@ -121,6 +121,7 @@ type State = { isFocused: boolean; isOpened: boolean; autoCompleteVisible: boolean; + hinterOpen: boolean; }; const CommandBtnContainer = styled.div<{ isFocused: boolean }>` @@ -153,6 +154,7 @@ class CodeEditor extends Component { isFocused: false, isOpened: false, autoCompleteVisible: false, + hinterOpen: false, }; this.updatePropertyValue = this.updatePropertyValue.bind(this); } @@ -407,6 +409,7 @@ class CodeEditor extends Component { }); if (hinterOpen) break; } + this.setState({ hinterOpen }); }; handleAutocompleteHide = (cm: any, event: KeyboardEvent) => { @@ -427,10 +430,10 @@ class CodeEditor extends Component { cursor?: number, preventAutoComplete = false, ) { + this.editor.focus(); if (value) { this.editor.setValue(value); } - this.editor.focus(); this.editor.setCursor({ line: cursor || this.editor.lineCount() - 1, ch: this.editor.getLine(this.editor.lineCount() - 1).length - 2, @@ -578,8 +581,11 @@ class CodeEditor extends Component {