Skip to content

Commit

Permalink
⬆️ Upgrade chakra version
Browse files Browse the repository at this point in the history
  • Loading branch information
baptisteArno committed Jun 17, 2024
1 parent 0f2f4d2 commit bec9cb6
Show file tree
Hide file tree
Showing 61 changed files with 724 additions and 1,793 deletions.
16 changes: 8 additions & 8 deletions apps/builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
},
"dependencies": {
"@braintree/sanitize-url": "7.0.1",
"@chakra-ui/anatomy": "2.1.1",
"@chakra-ui/react": "2.7.1",
"@chakra-ui/theme-tools": "2.0.18",
"@chakra-ui/anatomy": "2.2.2",
"@chakra-ui/react": "2.8.2",
"@chakra-ui/theme-tools": "2.1.2",
"@dnd-kit/core": "6.0.8",
"@dnd-kit/sortable": "7.0.2",
"@dnd-kit/utilities": "3.2.1",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@faire/mjml-react": "3.3.0",
"@giphy/js-fetch-api": "5.0.0",
"@giphy/js-types": "4.4.0",
Expand Down Expand Up @@ -65,13 +65,13 @@
"dequal": "2.0.3",
"emojilib": "3.0.10",
"focus-visible": "5.2.0",
"framer-motion": "10.3.0",
"framer-motion": "11.1.7",
"google-auth-library": "8.9.0",
"google-spreadsheet": "4.1.1",
"immer": "10.0.2",
"isolated-vm": "4.7.2",
"jsonwebtoken": "9.0.1",
"ky": "1.2.3",
"ky": "1.2.4",
"libphonenumber-js": "1.10.37",
"micro": "10.0.1",
"micro-cors": "0.1.1",
Expand Down Expand Up @@ -99,7 +99,7 @@
"zustand": "4.5.0"
},
"devDependencies": {
"@chakra-ui/styled-system": "2.9.1",
"@chakra-ui/styled-system": "2.9.2",
"@playwright/test": "1.43.1",
"@typebot.io/billing": "workspace:*",
"@typebot.io/forge": "workspace:*",
Expand Down
24 changes: 14 additions & 10 deletions apps/builder/src/components/EditableEmojiOrImageIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
PopoverContent,
Flex,
useColorModeValue,
Portal,
} from '@chakra-ui/react'
import React from 'react'
import { EmojiOrImageIcon } from './EmojiOrImageIcon'
Expand Down Expand Up @@ -55,16 +56,19 @@ export const EditableEmojiOrImageIcon = ({
</PopoverTrigger>
</Flex>
</Tooltip>
<PopoverContent p="2">
<ImageUploadContent
uploadFileProps={uploadFileProps}
defaultUrl={icon ?? ''}
onSubmit={onChangeIcon}
excludedTabs={['giphy', 'unsplash']}
onClose={onClose}
initialTab="icon"
/>
</PopoverContent>
<Portal>
<PopoverContent p="2">
<ImageUploadContent
uploadFileProps={uploadFileProps}
defaultUrl={icon ?? ''}
onSubmit={onChangeIcon}
excludedTabs={['giphy', 'unsplash']}
onClose={onClose}
initialTab="icon"
linkWithVariableButton={false}
/>
</PopoverContent>
</Portal>
</>
)}
</Popover>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type Props = {
defaultUrl?: string
imageSize?: 'small' | 'regular' | 'thumb'
initialTab?: Tabs
linkWithVariableButton?: boolean
onSubmit: (url: string) => void
onClose?: () => void
} & (
Expand Down Expand Up @@ -43,6 +44,7 @@ export const ImageUploadContent = ({
imageSize = 'regular',
onClose,
initialTab,
linkWithVariableButton,
...props
}: Props) => {
const includedTabs =
Expand Down Expand Up @@ -128,6 +130,7 @@ export const ImageUploadContent = ({
imageSize={imageSize}
onSubmit={handleSubmit}
defaultUrl={defaultUrl}
linkWithVariableButton={linkWithVariableButton}
/>
</Stack>
)
Expand All @@ -138,12 +141,14 @@ const BodyContent = ({
tab,
defaultUrl,
imageSize,
linkWithVariableButton,
onSubmit,
}: {
uploadFileProps?: FilePathUploadProps
tab: Tabs
defaultUrl?: string
imageSize: 'small' | 'regular' | 'thumb'
linkWithVariableButton?: boolean
onSubmit: (url: string) => void
}) => {
switch (tab) {
Expand All @@ -157,7 +162,13 @@ const BodyContent = ({
)
}
case 'link':
return <EmbedLinkContent defaultUrl={defaultUrl} onNewUrl={onSubmit} />
return (
<EmbedLinkContent
defaultUrl={defaultUrl}
onNewUrl={onSubmit}
withVariableButton={linkWithVariableButton}
/>
)
case 'giphy':
return <GiphyContent onNewUrl={onSubmit} />
case 'emoji':
Expand Down Expand Up @@ -194,7 +205,8 @@ const UploadFileContent = ({
const EmbedLinkContent = ({
defaultUrl,
onNewUrl,
}: ContentProps & { defaultUrl?: string }) => {
withVariableButton,
}: ContentProps & { defaultUrl?: string; withVariableButton?: boolean }) => {
const { t } = useTranslate()

return (
Expand All @@ -203,6 +215,7 @@ const EmbedLinkContent = ({
placeholder={t('editor.header.linkTab.searchInputPlaceholder.label')}
onChange={onNewUrl}
defaultValue={defaultUrl ?? ''}
withVariableButton={withVariableButton}
/>
</Stack>
)
Expand Down
4 changes: 2 additions & 2 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"mintlify": "4.0.75",
"tsx": "^4.6.2",
"tsx": "4.6.2",
"dotenv-cli": "7.4.1"
}
}
}
4 changes: 2 additions & 2 deletions apps/viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"google-spreadsheet": "4.1.1",
"got": "12.6.0",
"isolated-vm": "4.7.2",
"ky": "1.2.3",
"ky": "1.2.4",
"next": "14.1.0",
"nextjs-cors": "2.1.2",
"nodemailer": "6.9.8",
Expand Down Expand Up @@ -68,4 +68,4 @@
"typescript": "5.4.5",
"zod": "3.22.4"
}
}
}
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/AccessibilityIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const AccessibilityIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/ArrowRight.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const ArrowRight = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/CaluclatorIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const CalculatorIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/CapterraIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'

export const CapterraIcon = (props: IconProps) => (
<Icon
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/CheckCircleIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const CheckCircleIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/CheckIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'
import { featherIconsBaseProps } from '.'

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/ChevronDownIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const ChevronDownIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/ChevronRightIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const ChevronRightIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/ConditionIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const ConditionIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/DoIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const DoIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/DocIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const DocIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/DontIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const DontIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/EmailIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import { featherIconsBaseProps } from './HamburgerIcon'

export const EmailIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/ExternalLinkIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import { featherIconsBaseProps } from './HamburgerIcon'

export const ExternalLinkIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/FolderIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const FolderIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/HamburgerIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const featherIconsBaseProps: IconProps = {
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/Logo.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const Logo = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/MapIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const MapIcon = (props: IconProps) => (
Expand Down
7 changes: 7 additions & 0 deletions ee/apps/landing-page/assets/icons/NewspaperIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { Icon } from '@chakra-ui/icon'

export const NewspaperIcon = () => (
<Icon viewBox="0 0 512 512" fill="currentcolor">
<path d="M96 96c0-35.3 28.7-64 64-64H448c35.3 0 64 28.7 64 64V416c0 35.3-28.7 64-64 64H80c-44.2 0-80-35.8-80-80V128c0-17.7 14.3-32 32-32s32 14.3 32 32V400c0 8.8 7.2 16 16 16s16-7.2 16-16V96zm64 24v80c0 13.3 10.7 24 24 24H296c13.3 0 24-10.7 24-24V120c0-13.3-10.7-24-24-24H184c-13.3 0-24 10.7-24 24zm208-8c0 8.8 7.2 16 16 16h48c8.8 0 16-7.2 16-16s-7.2-16-16-16H384c-8.8 0-16 7.2-16 16zm0 96c0 8.8 7.2 16 16 16h48c8.8 0 16-7.2 16-16s-7.2-16-16-16H384c-8.8 0-16 7.2-16 16zM160 304c0 8.8 7.2 16 16 16H432c8.8 0 16-7.2 16-16s-7.2-16-16-16H176c-8.8 0-16 7.2-16 16zm0 96c0 8.8 7.2 16 16 16H432c8.8 0 16-7.2 16-16s-7.2-16-16-16H176c-8.8 0-16 7.2-16 16z" />
</Icon>
)
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/PeopleCircleIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const PeopleCircleIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/PersonAddIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const PersonAddIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/ProductHuntIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'

export const ProductHuntIcon = (props: IconProps) => (
<Icon
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/QuoteLeftIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const QuoteLeftIcon = (props: IconProps) => (
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/RedditIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'

export const RedditIcon = (props: IconProps) => (
<Icon
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/landing-page/assets/icons/ShareIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Icon, { IconProps } from '@chakra-ui/icon'
import { Icon, IconProps } from '@chakra-ui/icon'
import React from 'react'

export const ShareIcon = (props: IconProps) => (
Expand Down
10 changes: 5 additions & 5 deletions ee/apps/landing-page/components/common/Header/_data.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { GitHubIcon } from 'assets/icons'
import { DocIcon } from 'assets/icons/DocIcon'
import { MapIcon } from 'assets/icons/MapIcon'
import { NewspaperIcon } from 'assets/icons/NewspaperIcon'
import { PeopleCircleIcon } from 'assets/icons/PeopleCircleIcon'
import * as React from 'react'

Expand All @@ -22,11 +22,11 @@ export const links = [
icon: <DocIcon />,
},
{
label: 'Roadmap',
label: 'Blog',
description:
"Follow the development and make suggestions for which features you'd like to see",
href: 'https://feedback.typebot.io/roadmap',
icon: <MapIcon />,
'Read the latest news and updates about Typebot and the chatbots ecosystem',
href: '/blog',
icon: <NewspaperIcon />,
},
{
label: 'Community',
Expand Down
12 changes: 6 additions & 6 deletions ee/apps/landing-page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"analyze": "cross-env ANALYZE=true next build"
},
"dependencies": {
"@chakra-ui/icon": "3.0.15",
"@chakra-ui/icon": "3.2.0",
"@chakra-ui/next-js": "2.2.0",
"@chakra-ui/react": "2.7.1",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@chakra-ui/react": "2.8.2",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@typebot.io/billing": "workspace:*",
"@typebot.io/lib": "workspace:*",
"@typebot.io/nextjs": "workspace:*",
"@typebot.io/prisma": "workspace:*",
"@typebot.io/schemas": "workspace:*",
"aos": "2.3.4",
"focus-visible": "5.2.0",
"framer-motion": "10.12.20",
"framer-motion": "11.1.7",
"next": "14.1.0",
"next-mdx-remote": "4.4.1",
"react": "18.2.0",
Expand All @@ -33,7 +33,7 @@
},
"devDependencies": {
"@babel/core": "7.22.9",
"@chakra-ui/styled-system": "2.9.1",
"@chakra-ui/styled-system": "2.9.2",
"@tailwindcss/typography": "0.5.12",
"@typebot.io/env": "workspace:*",
"@typebot.io/tsconfig": "workspace:*",
Expand Down
Loading

0 comments on commit bec9cb6

Please sign in to comment.