fix: ♿️ Improve inputs responsivity

baptisteArno · Mar 22, 2022 · 03aadab · 03aadab · vercel · Mar 22, 2022
1 parent bd702f2
commit 03aadab
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 34 deletions.
diff --git a/apps/builder/components/shared/TableList.tsx b/apps/builder/components/shared/TableList.tsx
@@ -1,10 +1,7 @@
 import { Box, Button, Fade, Flex, IconButton, Stack } from '@chakra-ui/react'
 import { TrashIcon, PlusIcon } from 'assets/icons'
 import cuid from 'cuid'
-import { dequal } from 'dequal'
-import { Draft } from 'immer'
-import React, { useEffect, useState } from 'react'
-import { useImmer } from 'use-immer'
+import React, { useState } from 'react'
 
 type ItemWithId<T> = T & { id: string }
 
@@ -31,32 +28,28 @@ export const TableList = <T,>({
   Item,
   ComponentBetweenItems = () => <></>,
 }: Props<T>) => {
-  const [items, setItems] = useImmer(initialItems)
+  const [items, setItems] = useState(initialItems)
   const [showDeleteIndex, setShowDeleteIndex] = useState<number | null>(null)
 
-  useEffect(() => {
-    if (dequal(items, initialItems)) return
-    onItemsChange(items)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [items])
-
   const createItem = () => {
-    setItems((items) => {
-      const id = cuid()
-      const newItem = { id } as Draft<ItemWithId<T>>
-      items.push(newItem)
-    })
+    const id = cuid()
+    const newItem = { id } as ItemWithId<T>
+    setItems([...items, newItem])
+    onItemsChange([...items, newItem])
   }
 
-  const updateItem = (itemIndex: number, updates: Partial<T>) =>
-    setItems((items) => {
-      items[itemIndex] = { ...items[itemIndex], ...updates }
-    })
+  const updateItem = (itemIndex: number, updates: Partial<T>) => {
+    const newItems = items.map((item, idx) =>
+      idx === itemIndex ? { ...item, ...updates } : item
+    )
+    setItems(newItems)
+    onItemsChange(newItems)
+  }
 
   const deleteItem = (itemIndex: number) => () => {
-    setItems((items) => {
-      items.splice(itemIndex, 1)
-    })
+    items.splice(itemIndex, 1)
+    setItems([...items])
+    onItemsChange([...items])
   }
 
   const handleMouseEnter = (itemIndex: number) => () =>

diff --git a/apps/builder/components/shared/VariableSearchInput.tsx b/apps/builder/components/shared/VariableSearchInput.tsx
@@ -15,7 +15,7 @@ import { useTypebot } from 'contexts/TypebotContext'
 import cuid from 'cuid'
 import { Variable } from 'models'
 import React, { useState, useRef, ChangeEvent, useEffect } from 'react'
-import { useDebounce } from 'use-debounce'
+import { useDebouncedCallback } from 'use-debounce'
 import { byId, isNotDefined } from 'utils'
 
 type Props = {
@@ -40,8 +40,11 @@ export const VariableSearchInput = ({
   const [inputValue, setInputValue] = useState(
     variables.find(byId(initialVariableId))?.name ?? ''
   )
-  const [debouncedInputValue] = useDebounce(
-    inputValue,
+  const debounced = useDebouncedCallback(
+    (value) => {
+      const variable = variables.find((v) => v.name === value)
+      if (variable) onSelectVariable(variable)
+    },
     process.env.NEXT_PUBLIC_E2E_TEST ? 0 : debounceTimeout
   )
   const [filteredItems, setFilteredItems] = useState<Variable[]>(
@@ -60,14 +63,16 @@ export const VariableSearchInput = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
-  useEffect(() => {
-    const variable = variables.find((v) => v.name === debouncedInputValue)
-    if (variable) onSelectVariable(variable)
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [debouncedInputValue])
+  useEffect(
+    () => () => {
+      debounced.flush()
+    },
+    [debounced]
+  )
 
   const onInputChange = (e: ChangeEvent<HTMLInputElement>) => {
     setInputValue(e.target.value)
+    debounced(e.target.value)
     onOpen()
     if (e.target.value === '') {
       setFilteredItems([...variables.slice(0, 50)])
@@ -84,6 +89,7 @@ export const VariableSearchInput = ({
 
   const handleVariableNameClick = (variable: Variable) => () => {
     setInputValue(variable.name)
+    onSelectVariable(variable)
     onClose()
   }
 
@@ -100,7 +106,10 @@ export const VariableSearchInput = ({
       e.stopPropagation()
       deleteVariable(variable.id)
       setFilteredItems(filteredItems.filter((item) => item.id !== variable.id))
-      if (variable.name === inputValue) setInputValue('')
+      if (variable.name === inputValue) {
+        setInputValue('')
+        debounced('')
+      }
     }
 
   return (

diff --git a/apps/builder/layouts/dashboard/TemplatesContent.tsx b/apps/builder/layouts/dashboard/TemplatesContent.tsx
@@ -10,7 +10,7 @@ import {
 import { CreateTypebotMoreButton } from 'components/templates/ImportFileMenuItem'
 import { TemplateButton } from 'components/templates/TemplateButton'
 import { useUser } from 'contexts/UserContext'
-import { Typebot } from 'models'
+import { defaultTheme, Typebot } from 'models'
 import { useRouter } from 'next/router'
 import React, { useState } from 'react'
 import { createTypebot, importTypebot } from 'services/typebots/typebots'
@@ -40,6 +40,13 @@ export const TemplatesContent = () => {
           ...typebot,
           ownerId: user.id,
           folderId,
+          theme: {
+            ...defaultTheme,
+            chat: {
+              ...defaultTheme.chat,
+              hostAvatar: { isEnabled: true, url: user.image ?? undefined },
+            },
+          },
         })
       : await createTypebot({
           folderId,

diff --git a/apps/builder/pages/api/typebots.ts b/apps/builder/pages/api/typebots.ts
@@ -59,6 +59,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
             ? data
             : (parseNewTypebot({
                 ownerId: user.id,
+                ownerAvatarUrl: user.image,
                 ...data,
               }) as Prisma.TypebotUncheckedCreateInput),
       })

diff --git a/apps/builder/services/typebots/typebots.ts b/apps/builder/services/typebots/typebots.ts
@@ -324,10 +324,12 @@ export const parseNewTypebot = ({
   ownerId,
   folderId,
   name,
+  ownerAvatarUrl,
 }: {
   ownerId: string
   folderId: string | null
   name: string
+  ownerAvatarUrl?: string
 }): Omit<
   Typebot,
   | 'createdAt'
@@ -358,7 +360,13 @@ export const parseNewTypebot = ({
     blocks: [startBlock],
     edges: [],
     variables: [],
-    theme: defaultTheme,
+    theme: {
+      ...defaultTheme,
+      chat: {
+        ...defaultTheme.chat,
+        hostAvatar: { isEnabled: true, url: ownerAvatarUrl },
+      },
+    },
     settings: defaultSettings,
   }
 }