🐛 (condition) Greater and Less should compare list length when possible

baptisteArno · Apr 20, 2023 · c77b8e7 · c77b8e7
1 parent 4d1fe4c
commit c77b8e7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/apps/viewer/src/features/blocks/logic/condition/executeCondition.ts b/apps/viewer/src/features/blocks/logic/condition/executeCondition.ts
@@ -63,24 +63,24 @@ const executeComparison =
         return compare((a, b) => a !== b, inputValue, value)
       }
       case ComparisonOperators.GREATER: {
-        return compare(
-          (a, b) =>
-            isDefined(a) && isDefined(b)
-              ? parseFloat(a) > parseFloat(b)
-              : false,
-          inputValue,
-          value
-        )
+        if (typeof inputValue === 'string') {
+          if (typeof value === 'string')
+            return parseFloat(inputValue) > parseFloat(value)
+          return parseFloat(inputValue) > value.length
+        }
+        if (typeof value === 'string')
+          return inputValue.length > parseFloat(value)
+        return inputValue.length > value.length
       }
       case ComparisonOperators.LESS: {
-        return compare(
-          (a, b) =>
-            isDefined(a) && isDefined(b)
-              ? parseFloat(a) < parseFloat(b)
-              : false,
-          inputValue,
-          value
-        )
+        if (typeof inputValue === 'string') {
+          if (typeof value === 'string')
+            return parseFloat(inputValue) < parseFloat(value)
+          return parseFloat(inputValue) < value.length
+        }
+        if (typeof value === 'string')
+          return inputValue.length < parseFloat(value)
+        return inputValue.length < value.length
       }
       case ComparisonOperators.IS_SET: {
         return isDefined(inputValue) && inputValue.length > 0

diff --git a/packages/embeds/js/package.json b/packages/embeds/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typebot.io/js",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Javascript library to display typebots on your website",
   "type": "module",
   "main": "dist/index.js",

diff --git a/packages/embeds/js/src/features/blocks/inputs/textInput/components/TextInput.tsx b/packages/embeds/js/src/features/blocks/inputs/textInput/components/TextInput.tsx
@@ -29,6 +29,11 @@ export const TextInput = (props: Props) => {
     if (e.key === 'Enter') submit()
   }
 
+  const submitIfCtrlEnter = (e: KeyboardEvent) => {
+    if (!props.block.options.isLong) return
+    if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) submit()
+  }
+
   onMount(() => {
     if (!isMobile() && inputRef) inputRef.focus()
   })
@@ -46,6 +51,7 @@ export const TextInput = (props: Props) => {
         <Textarea
           ref={inputRef as HTMLTextAreaElement}
           onInput={handleInput}
+          onKeyDown={submitIfCtrlEnter}
           value={inputValue()}
           placeholder={
             props.block.options?.labels?.placeholder ?? 'Type your answer...'

diff --git a/packages/embeds/react/package.json b/packages/embeds/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typebot.io/react",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "React library to display typebots on your website",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",