🚸 (pictureChoice) Improve single picture choice with same titles

Closes #859
baptisteArno · Sep 28, 2023 · d46e801 · d46e801 · vercel · Sep 28, 2023
1 parent e10a506
commit d46e801
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/packages/bot-engine/blocks/inputs/pictureChoice/parsePictureChoicesReply.ts b/packages/bot-engine/blocks/inputs/pictureChoice/parsePictureChoicesReply.ts
@@ -68,22 +68,18 @@ export const parsePictureChoicesReply =
           .join(', '),
       }
     }
-    if (state.whatsApp) {
-      const matchedItem = displayedItems.find((item) => item.id === inputValue)
-      if (!matchedItem) return { status: 'fail' }
-      return {
-        status: 'success',
-        reply: matchedItem.title ?? matchedItem.pictureSrc ?? '',
-      }
-    }
     const longestItemsFirst = [...displayedItems].sort(
       (a, b) => (b.title?.length ?? 0) - (a.title?.length ?? 0)
     )
     const matchedItem = longestItemsFirst.find(
       (item) =>
-        item.title &&
+        item.id === inputValue ||
         item.title
-          .toLowerCase()
+          ?.toLowerCase()
+          .trim()
+          .includes(inputValue.toLowerCase().trim()) ||
+        item.pictureSrc
+          ?.toLowerCase()
           .trim()
           .includes(inputValue.toLowerCase().trim())
     )

diff --git a/packages/embeds/js/package.json b/packages/embeds/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typebot.io/js",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "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/pictureChoice/SinglePictureChoice.tsx b/packages/embeds/js/src/features/blocks/inputs/pictureChoice/SinglePictureChoice.tsx
@@ -20,10 +20,10 @@ export const SinglePictureChoice = (props: Props) => {
   })
 
   const handleClick = (itemIndex: number) => {
-    const pictureSrc = filteredItems()[itemIndex].pictureSrc
-    if (!pictureSrc) return
+    const item = filteredItems()[itemIndex]
     return props.onSubmit({
-      value: filteredItems()[itemIndex].title ?? pictureSrc,
+      label: item.title ?? item.pictureSrc ?? item.id,
+      value: item.id,
     })
   }
 

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

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