diff --git a/apps/builder/src/middleware/reduxAsync/sendMessage/appInfoMethod.ts b/apps/builder/src/middleware/reduxAsync/sendMessage/appInfoMethod.ts index 91ba0c8d54..e1ea3d2ff1 100644 --- a/apps/builder/src/middleware/reduxAsync/sendMessage/appInfoMethod.ts +++ b/apps/builder/src/middleware/reduxAsync/sendMessage/appInfoMethod.ts @@ -17,7 +17,6 @@ export const appInfoAsync = ( case "updateAppContributeReducer": case "updateAppPublicReducer": case "updateAppDeployedReducer": - case "updateAppNameReducer": case "updateAppInfoReducer": { Connection.getTextRoom("app", currentAppID)?.send( getTextMessagePayload( diff --git a/apps/builder/src/page/AI/AIAgent/aiagent.tsx b/apps/builder/src/page/AI/AIAgent/aiagent.tsx index 621ae6a11d..a461bc0b88 100644 --- a/apps/builder/src/page/AI/AIAgent/aiagent.tsx +++ b/apps/builder/src/page/AI/AIAgent/aiagent.tsx @@ -19,7 +19,9 @@ import { import { RecordEditor } from "@illa-public/record-editor" import { useUpgradeModal } from "@illa-public/upgrade-modal" import { + MemberInfo, USER_ROLE, + USER_STATUS, getCurrentTeamInfo, getCurrentUser, getPlanUtils, @@ -1138,6 +1140,28 @@ export const AIAgent: FC = () => { > {(shareDialogVisible || contributedDialogVisible) && ( { + const memberListInfo: MemberInfo[] = userList.map( + (user) => { + return { + ...user, + userID: "", + nickname: "", + avatar: "", + userStatus: USER_STATUS.PENDING, + permission: {}, + createdAt: "", + updatedAt: "", + } + }, + ) + dispatch( + teamActions.updateInvitedUserReducer( + memberListInfo, + ), + ) + }} canUseBillingFeature={canUseUpgradeFeature( currentTeamInfo.myRole, getPlanUtils(currentTeamInfo), diff --git a/apps/builder/src/page/AI/AIAgentRun/AIAgentRunMobile/index.tsx b/apps/builder/src/page/AI/AIAgentRun/AIAgentRunMobile/index.tsx index fa6fc8f62c..177a8fab04 100644 --- a/apps/builder/src/page/AI/AIAgentRun/AIAgentRunMobile/index.tsx +++ b/apps/builder/src/page/AI/AIAgentRun/AIAgentRunMobile/index.tsx @@ -1,6 +1,6 @@ import { Avatar } from "@illa-public/avatar" import { CodeEditor } from "@illa-public/code-editor" -import { ShareAgentMobile, ShareAgentTab } from "@illa-public/invite-modal" +import { ShareAgentMobile } from "@illa-public/invite-modal" import { AI_AGENT_TYPE, Agent, @@ -17,7 +17,9 @@ import { import { RecordEditor } from "@illa-public/record-editor" import { useUpgradeModal } from "@illa-public/upgrade-modal" import { + MemberInfo, USER_ROLE, + USER_STATUS, getCurrentTeamInfo, getCurrentUser, getPlanUtils, @@ -30,7 +32,6 @@ import { canManageInvite, canUseUpgradeFeature, openShareAgentModal, - showShareAgentModal, } from "@illa-public/user-role-utils" import { formatNumForAgent, @@ -158,7 +159,6 @@ export const AIAgentRunMobile: FC = () => { currentTeamInfo?.totalTeamLicense?.teamLicenseAllPaid, ) - const teamInfo = useSelector(getCurrentTeamInfo)!! const dispatch = useDispatch() const { sendMessage, generationMessage, chatMessages, reconnect, connect } = @@ -215,12 +215,8 @@ export const AIAgentRunMobile: FC = () => { > {shareDialogVisible && ( { setShareDialogVisible(false) }} canInvite={canManageInvite( - teamInfo.myRole, - teamInfo.permission.allowEditorManageTeamMember, - teamInfo.permission.allowViewerManageTeamMember, + currentTeamInfo.myRole, + currentTeamInfo.permission.allowEditorManageTeamMember, + currentTeamInfo.permission.allowViewerManageTeamMember, )} - defaultTab={ShareAgentTab.SHARE_WITH_TEAM} defaultInviteUserRole={USER_ROLE.VIEWER} - teamID={teamInfo.id} - currentUserRole={teamInfo.myRole} - defaultBalance={teamInfo.currentTeamLicense.balance} - defaultAllowInviteLink={teamInfo.permission.inviteLinkEnabled} + teamID={currentTeamInfo.id} + currentUserRole={currentTeamInfo.myRole} + defaultBalance={currentTeamInfo.currentTeamLicense.balance} + defaultAllowInviteLink={ + currentTeamInfo.permission.inviteLinkEnabled + } onInviteLinkStateChange={(enableInviteLink) => { dispatch( teamActions.updateTeamMemberPermissionReducer({ - teamID: teamInfo.id, + teamID: currentTeamInfo.id, newPermission: { - ...teamInfo.permission, + ...currentTeamInfo.permission, inviteLinkEnabled: enableInviteLink, }, }), @@ -266,6 +263,8 @@ export const AIAgentRunMobile: FC = () => { ) newUrl.searchParams.set("token", getAuthToken()) window.open(newUrl, "_blank") + } else { + setCurrentMarketplaceInfo(undefined) } field.onChange(isAgentContributed) }} @@ -281,7 +280,7 @@ export const AIAgentRunMobile: FC = () => { copyToClipboard( t("user_management.modal.custom_copy_text_agent_invite", { userName: currentUserInfo.nickname, - teamName: teamInfo.name, + teamName: currentTeamInfo.name, inviteLink: link, }), ) @@ -311,9 +310,9 @@ export const AIAgentRunMobile: FC = () => { onBalanceChange={(balance) => { dispatch( teamActions.updateTeamMemberSubscribeReducer({ - teamID: teamInfo.id, + teamID: currentTeamInfo.id, subscribeInfo: { - ...teamInfo.currentTeamLicense, + ...currentTeamInfo.currentTeamLicense, balance: balance, }, }), @@ -330,6 +329,21 @@ export const AIAgentRunMobile: FC = () => { }, ) }} + onInvitedChange={(userList) => { + const memberListInfo: MemberInfo[] = userList.map((user) => { + return { + ...user, + userID: "", + nickname: "", + avatar: "", + userStatus: USER_STATUS.PENDING, + permission: {}, + createdAt: "", + updatedAt: "", + } + }) + dispatch(teamActions.updateInvitedUserReducer(memberListInfo)) + }} teamPlan={getPlanUtils(currentTeamInfo)} /> )} @@ -691,13 +705,7 @@ export const AIAgentRunMobile: FC = () => { )} )} - {showShareAgentModal( - teamInfo, - agent.teamID === teamInfo.id - ? teamInfo.myRole - : USER_ROLE.GUEST, - field.value, - ) && ( + {(canUseBillingFeature || field.value) && (
{ @@ -711,7 +719,7 @@ export const AIAgentRunMobile: FC = () => { ) if ( !openShareAgentModal( - teamInfo, + currentTeamInfo, currentTeamInfo.id === agent.teamID ? currentTeamInfo.myRole : USER_ROLE.GUEST, diff --git a/apps/builder/src/page/AI/AIAgentRun/AIAgentRunPC/index.tsx b/apps/builder/src/page/AI/AIAgentRun/AIAgentRunPC/index.tsx index bb5a125fd4..fad136f6ab 100644 --- a/apps/builder/src/page/AI/AIAgentRun/AIAgentRunPC/index.tsx +++ b/apps/builder/src/page/AI/AIAgentRun/AIAgentRunPC/index.tsx @@ -17,7 +17,9 @@ import { import { RecordEditor } from "@illa-public/record-editor" import { useUpgradeModal } from "@illa-public/upgrade-modal" import { + MemberInfo, USER_ROLE, + USER_STATUS, getCurrentTeamInfo, getCurrentUser, getPlanUtils, @@ -150,8 +152,6 @@ export const AIAgentRunPC: FC = () => { currentTeamInfo?.totalTeamLicense?.teamLicenseAllPaid, ) - const teamInfo = useSelector(getCurrentTeamInfo)!! - const { t } = useTranslation() const dispatch = useDispatch() @@ -167,11 +167,27 @@ export const AIAgentRunPC: FC = () => { > {shareDialogVisible && ( { + const memberListInfo: MemberInfo[] = userList.map((user) => { + return { + ...user, + userID: "", + nickname: "", + avatar: "", + userStatus: USER_STATUS.PENDING, + permission: {}, + createdAt: "", + updatedAt: "", + } + }) + dispatch(teamActions.updateInvitedUserReducer(memberListInfo)) + }} canUseBillingFeature={canUseUpgradeFeature( - teamInfo.myRole, - getPlanUtils(teamInfo), - teamInfo.totalTeamLicense.teamLicensePurchased, - teamInfo.totalTeamLicense.teamLicenseAllPaid, + currentTeamInfo.myRole, + getPlanUtils(currentTeamInfo), + currentTeamInfo.totalTeamLicense.teamLicensePurchased, + currentTeamInfo.totalTeamLicense.teamLicenseAllPaid, )} title={t( "user_management.modal.social_media.default_text.agent", @@ -186,21 +202,23 @@ export const AIAgentRunPC: FC = () => { setShareDialogVisible(false) }} canInvite={canManageInvite( - teamInfo.myRole, - teamInfo.permission.allowEditorManageTeamMember, - teamInfo.permission.allowViewerManageTeamMember, + currentTeamInfo.myRole, + currentTeamInfo.permission.allowEditorManageTeamMember, + currentTeamInfo.permission.allowViewerManageTeamMember, )} defaultInviteUserRole={USER_ROLE.VIEWER} - teamID={teamInfo.id} - currentUserRole={teamInfo.myRole} - defaultBalance={teamInfo.currentTeamLicense.balance} - defaultAllowInviteLink={teamInfo.permission.inviteLinkEnabled} + teamID={currentTeamInfo.id} + currentUserRole={currentTeamInfo.myRole} + defaultBalance={currentTeamInfo.currentTeamLicense.balance} + defaultAllowInviteLink={ + currentTeamInfo.permission.inviteLinkEnabled + } onInviteLinkStateChange={(enableInviteLink) => { dispatch( teamActions.updateTeamMemberPermissionReducer({ - teamID: teamInfo.id, + teamID: currentTeamInfo.id, newPermission: { - ...teamInfo.permission, + ...currentTeamInfo.permission, inviteLinkEnabled: enableInviteLink, }, }), @@ -217,6 +235,8 @@ export const AIAgentRunPC: FC = () => { ) newUrl.searchParams.set("token", getAuthToken()) window.open(newUrl, "_blank") + } else { + setCurrentMarketplaceInfo(undefined) } field.onChange(isAgentContributed) }} @@ -232,7 +252,7 @@ export const AIAgentRunPC: FC = () => { copyToClipboard( t("user_management.modal.custom_copy_text_agent_invite", { userName: currentUserInfo.nickname, - teamName: teamInfo.name, + teamName: currentTeamInfo.name, inviteLink: link, }), ) @@ -262,9 +282,9 @@ export const AIAgentRunPC: FC = () => { onBalanceChange={(balance) => { dispatch( teamActions.updateTeamMemberSubscribeReducer({ - teamID: teamInfo.id, + teamID: currentTeamInfo.id, subscribeInfo: { - ...teamInfo.currentTeamLicense, + ...currentTeamInfo.currentTeamLicense, balance: balance, }, }), @@ -339,8 +359,10 @@ export const AIAgentRunPC: FC = () => { render={({ field }) => (
{showShareAgentModal( - teamInfo, - agent.teamID === teamInfo.id ? teamInfo.myRole : USER_ROLE.GUEST, + currentTeamInfo, + agent.teamID === currentTeamInfo.id + ? currentTeamInfo.myRole + : USER_ROLE.GUEST, field.value, ) && ( -
-
- ) -} diff --git a/apps/builder/src/page/App/components/PageNavBar/AppNameEditModal/style.ts b/apps/builder/src/page/App/components/PageNavBar/AppNameEditModal/style.ts deleted file mode 100644 index f84aad9085..0000000000 --- a/apps/builder/src/page/App/components/PageNavBar/AppNameEditModal/style.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { css } from "@emotion/react" -import { getColor } from "@illa-design/react" - -export const appNameEditorWrapperStyle = css` - width: 280px; - height: 128px; - border-radius: 8px; - padding: 24px 0 16px 0; - display: flex; - flex-direction: column; - gap: 24px; - background-color: ${getColor("white", "01")}; - border: 1px solid ${getColor("grayBlue", "08")}; - box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08); -` - -export const appNameInputWrapperStyle = css` - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - padding: 0 16px; - gap: 16px; -` - -export const appNameInputLabelStyle = css` - font-size: 12px; - line-height: 20px; - color: ${getColor("grayBlue", "02")}; - text-align: center; -` - -export const appNameEditorSaveButtonWrapperStyle = css` - margin: 0 16px; -` diff --git a/apps/builder/src/page/App/components/PageNavBar/AppSettingModal/index.tsx b/apps/builder/src/page/App/components/PageNavBar/AppSettingModal/index.tsx index 1e4af06cf3..7b92da15d3 100644 --- a/apps/builder/src/page/App/components/PageNavBar/AppSettingModal/index.tsx +++ b/apps/builder/src/page/App/components/PageNavBar/AppSettingModal/index.tsx @@ -175,7 +175,7 @@ export const AppSettingModal: FC = (props) => { {...field} showWordLimit maxLength={180} - autoSize={{ minRows: 6, maxRows: 6 }} + autoSize={{ minRows: 6 }} colorScheme="techPurple" error={!!formState?.errors.description} placeholder={t( diff --git a/apps/builder/src/page/App/components/PageNavBar/ContributeButton/index.tsx b/apps/builder/src/page/App/components/PageNavBar/ContributeButton/index.tsx index 6b9d69be31..b1a3b5bb6b 100644 --- a/apps/builder/src/page/App/components/PageNavBar/ContributeButton/index.tsx +++ b/apps/builder/src/page/App/components/PageNavBar/ContributeButton/index.tsx @@ -6,6 +6,8 @@ import { } from "@illa-public/mixpanel-utils" import { useUpgradeModal } from "@illa-public/upgrade-modal" import { + MemberInfo, + USER_STATUS, getCurrentTeamInfo, getCurrentUser, getPlanUtils, @@ -77,7 +79,7 @@ export const ContributeButton: FC = (props) => { }} leftIcon={} > - {t("contribute")} + {t("contribute.first_time_modal.button")} = (props) => { > {shareModalVisible && ( { + const memberListInfo: MemberInfo[] = userList.map((user) => { + return { + ...user, + userID: "", + nickname: "", + avatar: "", + userStatus: USER_STATUS.PENDING, + permission: {}, + createdAt: "", + updatedAt: "", + } + }) + dispatch(teamActions.updateInvitedUserReducer(memberListInfo)) + }} + appDesc={appInfo.config.description} + appName={appInfo.appName} + onAppInfoUpdate={(appName, appDesc) => { + dispatch( + appInfoActions.updateAppInfoReducer({ + ...appInfo, + appName, + config: { + ...appInfo.config, + description: appDesc, + }, + }), + ) + }} isDeployed={appInfo.deployed} title={t("user_management.modal.social_media.default_text.app", { appName: appInfo.appName, diff --git a/apps/builder/src/page/App/components/PageNavBar/ShareAppButton/index.tsx b/apps/builder/src/page/App/components/PageNavBar/ShareAppButton/index.tsx index cb51f99c36..cf8dc277be 100644 --- a/apps/builder/src/page/App/components/PageNavBar/ShareAppButton/index.tsx +++ b/apps/builder/src/page/App/components/PageNavBar/ShareAppButton/index.tsx @@ -7,6 +7,8 @@ import { } from "@illa-public/mixpanel-utils" import { useUpgradeModal } from "@illa-public/upgrade-modal" import { + MemberInfo, + USER_STATUS, getCurrentTeamInfo, getCurrentUser, getPlanUtils, @@ -91,6 +93,36 @@ export const ShareAppButton: FC = (props) => { > {shareModalVisible && ( { + const memberListInfo: MemberInfo[] = userList.map((user) => { + return { + ...user, + userID: "", + nickname: "", + avatar: "", + userStatus: USER_STATUS.PENDING, + permission: {}, + createdAt: "", + updatedAt: "", + } + }) + dispatch(teamActions.updateInvitedUserReducer(memberListInfo)) + }} + appDesc={appInfo.config.description} + appName={appInfo.appName} + onAppInfoUpdate={(appName, appDesc) => { + dispatch( + appInfoActions.updateAppInfoReducer({ + ...appInfo, + appName, + config: { + ...appInfo.config, + description: appDesc, + }, + }), + ) + }} isDeployed={appInfo.deployed} title={t("user_management.modal.social_media.default_text.app", { appName: appInfo.appName, diff --git a/apps/builder/src/page/App/components/PageNavBar/index.tsx b/apps/builder/src/page/App/components/PageNavBar/index.tsx index f8eaaeab1b..d73192c118 100644 --- a/apps/builder/src/page/App/components/PageNavBar/index.tsx +++ b/apps/builder/src/page/App/components/PageNavBar/index.tsx @@ -11,14 +11,7 @@ import { isCloudVersion, } from "@illa-public/utils" import { fromNow } from "@illa-public/utils" -import { - FC, - MouseEvent, - useCallback, - useEffect, - useMemo, - useState, -} from "react" +import { FC, MouseEvent, useCallback, useEffect, useState } from "react" import { useTranslation } from "react-i18next" import { useDispatch, useSelector } from "react-redux" import { Link, useNavigate, useParams } from "react-router-dom" @@ -322,19 +315,16 @@ export const PageNavBar: FC = (props) => { } }, [canUseBillingFeature, upgradeModal]) - const PreviewButton = useMemo( - () => ( - - ), - [handlePreviewButtonClick, isEditMode, previewButtonText], + const PreviewButton = ( + ) return ( @@ -494,7 +484,7 @@ export const PageNavBar: FC = (props) => { ) : ( - <>{PreviewButton} + PreviewButton )} diff --git a/apps/builder/src/page/App/components/PageNavBar/interface.ts b/apps/builder/src/page/App/components/PageNavBar/interface.ts index 3bc9b4baab..f2c192ff5c 100644 --- a/apps/builder/src/page/App/components/PageNavBar/interface.ts +++ b/apps/builder/src/page/App/components/PageNavBar/interface.ts @@ -1,12 +1,3 @@ import { HTMLAttributes } from "react" -import { DashboardApp } from "@/redux/currentApp/appInfo/appInfoState" export interface PageNavBarProps extends HTMLAttributes {} - -export interface AppNameEditorModalProps { - onSuccess: () => void -} - -export interface AppNameProps { - appInfo: DashboardApp -} diff --git a/apps/builder/src/page/Template/GuideApp.tsx b/apps/builder/src/page/Template/GuideApp.tsx index 1795129370..068b269de8 100644 --- a/apps/builder/src/page/Template/GuideApp.tsx +++ b/apps/builder/src/page/Template/GuideApp.tsx @@ -1,6 +1,9 @@ import { getCurrentTeamInfo, getPlanUtils } from "@illa-public/user-data" -import { canManage } from "@illa-public/user-role-utils" -import { ACTION_MANAGE, ATTRIBUTE_GROUP } from "@illa-public/user-role-utils" +import { + ACTION_MANAGE, + ATTRIBUTE_GROUP, + canManage, +} from "@illa-public/user-role-utils" import { Unsubscribe } from "@reduxjs/toolkit" import { FC, useEffect, useRef } from "react" import { useSelector } from "react-redux" diff --git a/apps/builder/src/redux/currentApp/appInfo/appInfoReducer.ts b/apps/builder/src/redux/currentApp/appInfo/appInfoReducer.ts index dac09c7de2..56004409c1 100644 --- a/apps/builder/src/redux/currentApp/appInfo/appInfoReducer.ts +++ b/apps/builder/src/redux/currentApp/appInfo/appInfoReducer.ts @@ -8,13 +8,6 @@ export const updateAppInfoReducer: CaseReducer< return action.payload } -export const updateAppNameReducer: CaseReducer< - DashboardApp, - PayloadAction -> = (state, action) => { - return action.payload -} - export const updateAppContributeReducer: CaseReducer< DashboardApp, PayloadAction diff --git a/apps/builder/src/redux/currentApp/appInfo/appInfoSlice.ts b/apps/builder/src/redux/currentApp/appInfo/appInfoSlice.ts index 6a8473aedf..39cc34f3ea 100644 --- a/apps/builder/src/redux/currentApp/appInfo/appInfoSlice.ts +++ b/apps/builder/src/redux/currentApp/appInfo/appInfoSlice.ts @@ -4,7 +4,6 @@ import { updateAppContributeReducer, updateAppDeployedReducer, updateAppInfoReducer, - updateAppNameReducer, updateAppPublicReducer, } from "@/redux/currentApp/appInfo/appInfoReducer" import { DashboardApp, DashboardAppInitialState } from "./appInfoState" @@ -18,7 +17,6 @@ const appInfoSlice = createSlice< initialState: DashboardAppInitialState, reducers: { updateAppInfoReducer, - updateAppNameReducer, updateAppContributeReducer, updateAppPublicReducer, updateAppDeployedReducer, diff --git a/apps/builder/src/widgetLibrary/NumberInputWidget/numberInput.tsx b/apps/builder/src/widgetLibrary/NumberInputWidget/numberInput.tsx index 303590111a..7ecda287fd 100644 --- a/apps/builder/src/widgetLibrary/NumberInputWidget/numberInput.tsx +++ b/apps/builder/src/widgetLibrary/NumberInputWidget/numberInput.tsx @@ -38,6 +38,8 @@ export const WrappedInputNumber = forwardRef< colorScheme, displayName, handleOnChange, + handleOnBlur, + handleOnFocus, handleUpdateMultiExecutionResult, getValidateMessage, } = props @@ -75,6 +77,8 @@ export const WrappedInputNumber = forwardRef< suffix={loading ? : suffix} mode="button" onChange={changeValue} + onBlur={handleOnBlur} + onFocus={handleOnFocus} colorScheme={colorScheme} /> ) diff --git a/apps/builder/src/widgetLibrary/RangeSliderWidget/style.ts b/apps/builder/src/widgetLibrary/RangeSliderWidget/style.ts index a049d4e652..34effc6755 100644 --- a/apps/builder/src/widgetLibrary/RangeSliderWidget/style.ts +++ b/apps/builder/src/widgetLibrary/RangeSliderWidget/style.ts @@ -21,19 +21,16 @@ export const applyLabelAndComponentWrapperStyle = ( return css`` } -export const applyWrapperSlider = (): SerializedStyles => { - return css` - width: 100%; - display: flex; - flex-direction: row; - gap: 8px; - align-items: center; - ` -} +export const applyWrapperSlider = css` + width: 100%; + display: flex; + flex-direction: row; + gap: 8px; + padding: 0 8px; + align-items: center; +` -export const applyIcon = (): SerializedStyles => { - return css` - height: 16px; - width: 16px; - ` -} +export const applyIcon = css` + height: 16px; + width: 16px; +` diff --git a/apps/builder/src/widgetLibrary/SliderWidget/style.ts b/apps/builder/src/widgetLibrary/SliderWidget/style.ts index a049d4e652..0ad16be2ab 100644 --- a/apps/builder/src/widgetLibrary/SliderWidget/style.ts +++ b/apps/builder/src/widgetLibrary/SliderWidget/style.ts @@ -21,19 +21,16 @@ export const applyLabelAndComponentWrapperStyle = ( return css`` } -export const applyWrapperSlider = (): SerializedStyles => { - return css` - width: 100%; - display: flex; - flex-direction: row; - gap: 8px; - align-items: center; - ` -} +export const applyWrapperSlider = css` + width: 100%; + display: flex; + flex-direction: row; + padding: 0 8px; + gap: 8px; + align-items: center; +` -export const applyIcon = (): SerializedStyles => { - return css` - height: 16px; - width: 16px; - ` -} +export const applyIcon = css` + height: 16px; + width: 16px; +` diff --git a/packages/illa-design b/packages/illa-design index 8ba565ff71..3ab7f1734a 160000 --- a/packages/illa-design +++ b/packages/illa-design @@ -1 +1 @@ -Subproject commit 8ba565ff7140fe7f741aa4f4fb48d5360a224d83 +Subproject commit 3ab7f1734a75ea3060ab92ab52147acf22a67b7e diff --git a/packages/illa-public-component b/packages/illa-public-component index d7bb07bc43..1fffb26259 160000 --- a/packages/illa-public-component +++ b/packages/illa-public-component @@ -1 +1 @@ -Subproject commit d7bb07bc43ca974ce5fe8c38b0390c7d640fb16b +Subproject commit 1fffb26259df45a8e9598cf550eba3cefdc21483 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9445302721..5cc70fe648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -815,8 +815,8 @@ importers: specifier: workspace:* version: link:../theme framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -845,8 +845,8 @@ importers: specifier: workspace:* version: link:../theme framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -1251,8 +1251,8 @@ importers: specifier: workspace:* version: link:../theme framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -1386,8 +1386,8 @@ importers: specifier: workspace:* version: link:../theme framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -1545,8 +1545,8 @@ importers: specifier: workspace:* version: link:../theme framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -1572,8 +1572,8 @@ importers: specifier: workspace:* version: link:../theme framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -1612,8 +1612,8 @@ importers: specifier: workspace:* version: link:../trigger framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -1649,8 +1649,8 @@ importers: specifier: workspace:* version: link:../theme framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -2152,8 +2152,8 @@ importers: specifier: workspace:* version: link:../trigger framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -2227,8 +2227,8 @@ importers: specifier: ^1.11.10 version: 1.11.10 framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -2369,8 +2369,8 @@ importers: specifier: workspace:* version: link:../theme framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -2507,8 +2507,8 @@ importers: specifier: ^11.11.1 version: 11.11.1(@types/react@18.2.22)(react@18.2.0) '@floating-ui/react': - specifier: ^0.25.2 - version: 0.25.2(react-dom@18.2.0)(react@18.2.0) + specifier: ^0.26.1 + version: 0.26.1(react-dom@18.2.0)(react@18.2.0) '@illa-design/config-provider': specifier: workspace:* version: link:../config-provider @@ -2522,8 +2522,8 @@ importers: specifier: workspace:* version: link:../theme framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -2585,8 +2585,8 @@ importers: specifier: workspace:* version: link:../theme framer-motion: - specifier: ^7.6.12 - version: 7.6.12(react-dom@18.2.0)(react@18.2.0) + specifier: ^10.16.4 + version: 10.16.4(react-dom@18.2.0)(react@18.2.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -2663,6 +2663,34 @@ importers: specifier: workspace:* version: link:../../tsconfig + packages/illa-public-component/CardHashTags: + dependencies: + '@emotion/react': + specifier: ^11.11.1 + version: 11.11.1(@types/react@18.2.22)(react@18.2.0) + '@illa-design/react': + specifier: workspace:* + version: link:../../illa-design/packages/react + '@illa-public/utils': + specifier: workspace:* + version: link:../utils + '@types/react': + specifier: ^18.2.22 + version: 18.2.22 + '@types/react-dom': + specifier: ^18.2.7 + version: 18.2.7 + react: + specifier: ^18.2.0 + version: 18.2.0 + react-dom: + specifier: ^18.2.0 + version: 18.2.0(react@18.2.0) + devDependencies: + tsconfig: + specifier: workspace:* + version: link:../../tsconfig + packages/illa-public-component/CloudDashboardLayout: dependencies: '@emotion/react': @@ -2952,6 +2980,12 @@ importers: '@illa-public/layout-auto-change': specifier: workspace:* version: link:../LayoutAutoChange + '@illa-public/market-agent': + specifier: workspace:* + version: link:../MarketAgent + '@illa-public/market-app': + specifier: workspace:* + version: link:../MarketApp '@illa-public/mixpanel-utils': specifier: workspace:* version: link:../MixpanelUtils @@ -2985,6 +3019,9 @@ importers: i18next: specifier: ^23.5.1 version: 23.5.1 + lodash: + specifier: ^4.17.21 + version: 4.17.21 react: specifier: ^18.2.0 version: 18.2.0 @@ -3001,6 +3038,9 @@ importers: specifier: ^4.4.1 version: 4.4.1(react@18.2.0) devDependencies: + '@types/lodash': + specifier: ^4.14.199 + version: 4.14.199 '@types/node': specifier: ^18.14.4 version: 18.14.5 @@ -3053,6 +3093,9 @@ importers: '@illa-public/avatar': specifier: workspace:* version: link:../Avatar + '@illa-public/card-hash-tags': + specifier: workspace:* + version: link:../CardHashTags '@illa-public/illa-net': specifier: workspace:* version: link:../ILLANet @@ -3096,6 +3139,9 @@ importers: '@illa-public/avatar': specifier: workspace:* version: link:../Avatar + '@illa-public/card-hash-tags': + specifier: workspace:* + version: link:../CardHashTags '@illa-public/illa-net': specifier: workspace:* version: link:../ILLANet @@ -5201,18 +5247,18 @@ packages: /@floating-ui/core@1.4.1: resolution: {integrity: sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==} dependencies: - '@floating-ui/utils': 0.1.1 + '@floating-ui/utils': 0.1.6 dev: false /@floating-ui/dom@1.5.1: resolution: {integrity: sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==} dependencies: '@floating-ui/core': 1.4.1 - '@floating-ui/utils': 0.1.1 + '@floating-ui/utils': 0.1.6 dev: false - /@floating-ui/react-dom@2.0.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA==} + /@floating-ui/react-dom@2.0.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-5qhlDvjaLmAst/rKb3VdlCinwTF4EYMiVxuuc/HVUjs46W0zgtbMmAZ1UTsDrRTxRmUEzl92mOtWbeeXL26lSQ==} peerDependencies: react: ^18.2.0 react-dom: ^18.2.0 @@ -5222,21 +5268,21 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /@floating-ui/react@0.25.2(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-3e10G9LFOgl32/SMWLBOwT7oVCtB+d5zBsU2GxTSVOvRgZexwno5MlYbc0BaXr+TR5EEGpqe9tg9OUbjlrVRnQ==} + /@floating-ui/react@0.26.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-5gyJIJ2tZOPMgmZ/vEcVhdmQiy75b7LPO71sYIiDsxGcZ4hxLuygQWCuT0YXHqppt//Eese+L6t5KnX/gZ3tVA==} peerDependencies: react: ^18.2.0 react-dom: ^18.2.0 dependencies: - '@floating-ui/react-dom': 2.0.1(react-dom@18.2.0)(react@18.2.0) - '@floating-ui/utils': 0.1.1 + '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0) + '@floating-ui/utils': 0.1.6 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) tabbable: 6.0.1 dev: false - /@floating-ui/utils@0.1.1: - resolution: {integrity: sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==} + /@floating-ui/utils@0.1.6: + resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==} dev: false /@fortawesome/fontawesome-common-types@0.2.36: @@ -5493,53 +5539,6 @@ packages: - supports-color dev: true - /@motionone/animation@10.15.1: - resolution: {integrity: sha512-mZcJxLjHor+bhcPuIFErMDNyrdb2vJur8lSfMCsuCB4UyV8ILZLvK+t+pg56erv8ud9xQGK/1OGPt10agPrCyQ==} - dependencies: - '@motionone/easing': 10.15.1 - '@motionone/types': 10.15.1 - '@motionone/utils': 10.15.1 - tslib: 2.5.0 - dev: false - - /@motionone/dom@10.13.1: - resolution: {integrity: sha512-zjfX+AGMIt/fIqd/SL1Lj93S6AiJsEA3oc5M9VkUr+Gz+juRmYN1vfvZd6MvEkSqEjwPQgcjN7rGZHrDB9APfQ==} - dependencies: - '@motionone/animation': 10.15.1 - '@motionone/generators': 10.15.1 - '@motionone/types': 10.15.1 - '@motionone/utils': 10.15.1 - hey-listen: 1.0.8 - tslib: 2.5.0 - dev: false - - /@motionone/easing@10.15.1: - resolution: {integrity: sha512-6hIHBSV+ZVehf9dcKZLT7p5PEKHGhDwky2k8RKkmOvUoYP3S+dXsKupyZpqx5apjd9f+php4vXk4LuS+ADsrWw==} - dependencies: - '@motionone/utils': 10.15.1 - tslib: 2.5.0 - dev: false - - /@motionone/generators@10.15.1: - resolution: {integrity: sha512-67HLsvHJbw6cIbLA/o+gsm7h+6D4Sn7AUrB/GPxvujse1cGZ38F5H7DzoH7PhX+sjvtDnt2IhFYF2Zp1QTMKWQ==} - dependencies: - '@motionone/types': 10.15.1 - '@motionone/utils': 10.15.1 - tslib: 2.5.0 - dev: false - - /@motionone/types@10.15.1: - resolution: {integrity: sha512-iIUd/EgUsRZGrvW0jqdst8st7zKTzS9EsKkP+6c6n4MPZoQHwiHuVtTQLD6Kp0bsBLhNzKIBlHXponn/SDT4hA==} - dev: false - - /@motionone/utils@10.15.1: - resolution: {integrity: sha512-p0YncgU+iklvYr/Dq4NobTRdAPv9PveRDUXabPEeOjBLSO/1FNB2phNTZxOxpi1/GZwYpAoECEa0Wam+nsmhSw==} - dependencies: - '@motionone/types': 10.15.1 - hey-listen: 1.0.8 - tslib: 2.5.0 - dev: false - /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -9947,30 +9946,6 @@ packages: '@emotion/is-prop-valid': 0.8.8 dev: false - /framer-motion@7.6.12(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-Xm1jPB91v6vIr9b+V3q6c96sPzU1jWdvN+Mv4CvIAY23ZIezGNIWxWNGIWj1We0CZ8SSOQkttz8921M10TQjXg==} - peerDependencies: - react: ^18.2.0 - react-dom: ^18.2.0 - dependencies: - '@motionone/dom': 10.13.1 - framesync: 6.1.2 - hey-listen: 1.0.8 - popmotion: 11.0.5 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - style-value-types: 5.1.2 - tslib: 2.4.0 - optionalDependencies: - '@emotion/is-prop-valid': 0.8.8 - dev: false - - /framesync@6.1.2: - resolution: {integrity: sha512-jBTqhX6KaQVDyus8muwZbBeGGP0XgujBRbQ7gM7BRdS3CadCZIHiawyzYLnafYcvZIh5j8WE7cxZKFn7dXhu9g==} - dependencies: - tslib: 2.4.0 - dev: false - /framework-utils@1.1.0: resolution: {integrity: sha512-KAfqli5PwpFJ8o3psRNs8svpMGyCSAe8nmGcjQ0zZBWN2H6dZDnq+ABp3N3hdUmFeMrLtjOCTXD4yplUJIWceg==, tarball: https://registry.yarnpkg.com/framework-utils/-/framework-utils-1.1.0.tgz} dev: false @@ -10426,10 +10401,6 @@ packages: tslib: 2.5.0 dev: true - /hey-listen@1.0.8: - resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==} - dev: false - /hoist-non-react-statics@3.3.2: resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==} dependencies: @@ -12854,15 +12825,6 @@ packages: v8flags: 4.0.0 dev: true - /popmotion@11.0.5: - resolution: {integrity: sha512-la8gPM1WYeFznb/JqF4GiTkRRPZsfaj2+kCxqQgr2MJylMmIKUwBfWW8Wa5fml/8gmtlD5yI01MP1QCZPWmppA==} - dependencies: - framesync: 6.1.2 - hey-listen: 1.0.8 - style-value-types: 5.1.2 - tslib: 2.4.0 - dev: false - /postcss-modules-extract-imports@3.0.0(postcss@8.4.24): resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==} engines: {node: ^10 || ^12 || >= 14} @@ -14613,13 +14575,6 @@ packages: dependencies: inline-style-parser: 0.1.1 - /style-value-types@5.1.2: - resolution: {integrity: sha512-Vs9fNreYF9j6W2VvuDTP7kepALi7sk0xtk2Tu8Yxi9UoajJdEVpNpCov0HsLTqXvNGKX+Uv09pkozVITi1jf3Q==} - dependencies: - hey-listen: 1.0.8 - tslib: 2.4.0 - dev: false - /stylis@4.1.3: resolution: {integrity: sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==} dev: false @@ -14934,10 +14889,6 @@ packages: resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==} dev: false - /tslib@2.4.0: - resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} - dev: false - /tslib@2.5.0: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}