From 36629df8537b04d161ca974d063020d501c2289c Mon Sep 17 00:00:00 2001 From: Favour Ohanekwu Date: Tue, 4 Jan 2022 01:29:23 -0800 Subject: [PATCH] fix: improve slash command conditional (#10102) --- .../editorComponents/CodeEditor/BindingPromptHelper.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/client/src/components/editorComponents/CodeEditor/BindingPromptHelper.ts b/app/client/src/components/editorComponents/CodeEditor/BindingPromptHelper.ts index ea62cd5ca5..4911972593 100644 --- a/app/client/src/components/editorComponents/CodeEditor/BindingPromptHelper.ts +++ b/app/client/src/components/editorComponents/CodeEditor/BindingPromptHelper.ts @@ -1,14 +1,19 @@ import { isString } from "lodash"; +import { isDynamicValue } from "utils/DynamicBindingUtils"; export const showBindingPrompt = ( showEvaluatedValue: boolean, inputValue: any, isHinterOpen: boolean, ): boolean => { + const isDynamicInputValue = inputValue && isDynamicValue(inputValue); + const lastCharacterOfSlash = + inputValue && isString(inputValue) && inputValue.slice(-1); + return ( showEvaluatedValue && (!isString(inputValue) || (!inputValue && !isHinterOpen) || - (!inputValue?.includes("{{") && !inputValue?.includes("/"))) + (!isDynamicInputValue && lastCharacterOfSlash !== "/")) ); };