From de64d3d9d4ff8ecdc6d1b0bfe5bb5f333b98c9c9 Mon Sep 17 00:00:00 2001 From: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Date: Tue, 17 Jan 2023 19:10:47 +0000 Subject: [PATCH] Move exports up a folder (#6519) * Move exports up a folder * Fix imports * Fix imports again Co-authored-by: zomars --- .../api-keys/components/ApiKeyDialogForm.tsx | 2 +- .../components/MemberInvitationModal.tsx | 2 +- .../components/v2/TeamAvailabilityModal.tsx | 2 +- packages/ui/components/card/FormCard.tsx | 3 +- packages/ui/components/index.ts | 114 ------------ packages/ui/form/fields.tsx | 2 +- packages/ui/index.tsx | 171 ++++++++---------- 7 files changed, 80 insertions(+), 216 deletions(-) delete mode 100644 packages/ui/components/index.ts diff --git a/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx b/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx index 6c3c95365f..f257ef3745 100644 --- a/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx +++ b/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx @@ -9,7 +9,7 @@ import { trpc } from "@calcom/trpc/react"; import { Button, Icon, - DatePickerField as DatePicker, + DatePicker, DialogFooter, Form, showToast, diff --git a/packages/features/ee/teams/components/MemberInvitationModal.tsx b/packages/features/ee/teams/components/MemberInvitationModal.tsx index dbc0dcfcf8..ccd98e2f32 100644 --- a/packages/features/ee/teams/components/MemberInvitationModal.tsx +++ b/packages/features/ee/teams/components/MemberInvitationModal.tsx @@ -7,7 +7,7 @@ import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { Button, - CheckboxField, + Checkbox as CheckboxField, Dialog, DialogContent, DialogFooter, diff --git a/packages/features/ee/teams/components/v2/TeamAvailabilityModal.tsx b/packages/features/ee/teams/components/v2/TeamAvailabilityModal.tsx index e794fbdd9e..91569754e1 100644 --- a/packages/features/ee/teams/components/v2/TeamAvailabilityModal.tsx +++ b/packages/features/ee/teams/components/v2/TeamAvailabilityModal.tsx @@ -5,7 +5,7 @@ import { WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { RouterOutputs, trpc } from "@calcom/trpc/react"; import type { ITimezone } from "@calcom/ui"; -import { Avatar, DatePickerField as DatePicker, Label, Select, TimezoneSelect } from "@calcom/ui"; +import { Avatar, DatePicker, Label, Select, TimezoneSelect } from "@calcom/ui"; import LicenseRequired from "../../../common/components/LicenseRequired"; import TeamAvailabilityTimes from "./TeamAvailabilityTimes"; diff --git a/packages/ui/components/card/FormCard.tsx b/packages/ui/components/card/FormCard.tsx index f46d43c6b1..d3841d7270 100644 --- a/packages/ui/components/card/FormCard.tsx +++ b/packages/ui/components/card/FormCard.tsx @@ -2,8 +2,7 @@ import Link from "next/link"; import { classNames } from "@calcom/lib"; -import { Badge, BadgeProps } from ".."; -import { Icon } from "../.."; +import { Icon, Badge, BadgeProps } from "../.."; import { Divider } from "../divider"; type Action = { check: () => boolean; fn: () => void }; diff --git a/packages/ui/components/index.ts b/packages/ui/components/index.ts deleted file mode 100644 index aef616439a..0000000000 --- a/packages/ui/components/index.ts +++ /dev/null @@ -1,114 +0,0 @@ -export { Avatar, AvatarGroup } from "./avatar"; -export type { AvatarProps, AvatarGroupProps } from "./avatar"; -export { Badge, UpgradeTeamsBadge } from "./badge"; -export type { BadgeProps } from "./badge"; -export { Breadcrumb, BreadcrumbContainer, BreadcrumbItem } from "./breadcrumb"; -export { Button, LinkIconButton } from "./button"; -export type { ButtonBaseProps, ButtonProps } from "./button"; -export { ButtonGroup } from "./buttonGroup"; -export { - Checkbox, - EmailField, - EmailInput, - FieldsetLegend, - Form, - HintsOrErrors, - Input, - InputField, - InputGroupBox, - InputLeading, - Label, - PasswordField, - TextArea, - TextAreaField, - TextField, - InputFieldWithSelect, - Select, - SelectField, - SelectWithValidation, - TimezoneSelect, - BooleanToggleGroup, - BooleanToggleGroupField, - DatePicker, - DateRangePicker, - MultiSelectCheckbox, - ToggleGroup, - ToggleGroupItem, - getReactSelectProps, - ColorPicker, - FormStep, - Dropdown, - DropdownItem, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuLabel, - DropdownMenuPortal, - DropdownMenuSeparator, - DropdownMenuTrigger, - DropdownMenuCheckboxItem, - DropdownMenuRadioGroup, - ButtonOrLink, - DropdownMenuGroup, - DropdownMenuRadioItem, - DropdownMenuTriggerItem, - Steps, - WizardForm, - SettingsToggle, - Stepper, - Switch, -} from "./form"; -export type { ITimezone, ITimezoneOption } from "./form"; -export { - AllApps, - AppCard, - AppSkeletonLoader, - SkeletonLoader, - Slider, - TrendingAppsSlider, - useShouldShowArrows, - AppStoreCategories, -} from "./apps"; -export { TopBanner } from "./top-banner"; -export type { TopBannerProps } from "./top-banner"; -export { AnimatedPopover, MeetingTimeInTimezones } from "./popover"; -export { TableActions, DropdownActions } from "./table/TableActions"; -export type { ActionType } from "./table/TableActions"; -export { Icon } from "./icon"; -export { ErrorBoundary } from "./errorBoundary"; -export { Logo } from "./logo"; -export { Alert } from "./alert"; -export type { AlertProps } from "./alert"; -export { Credits } from "./credits"; -export { Divider, VerticalDivider } from "./divider"; -export { EmptyScreen } from "./empty-screen"; -export { List, ListItem, ListItemText, ListItemTitle, ListLinkItem } from "./list"; -export type { ListItemProps, ListProps } from "./list"; -export { HeadSeo } from "./head-seo"; -export { - Skeleton, - SkeletonAvatar, - SkeletonButton, - SkeletonContainer, - SkeletonText, - Loader, -} from "./skeleton"; -export { HorizontalTabs, HorizontalTabItem, VerticalTabs, VerticalTabItem } from "./navigation"; -export type { HorizontalTabItemProps, NavTabProps, VerticalTabItemProps } from "./navigation"; -export { Card, StepCard, FormCard } from "./card"; -export type { BaseCardProps } from "./card"; -export { Tooltip } from "./tooltip"; -export { Editor, AddVariablesDropdown } from "./editor"; -export { - Dialog, - DialogClose, - DialogContent, - DialogFooter, - DialogHeader, - DialogTrigger, - ConfirmationDialogContent, -} from "./dialog"; -export type { DialogProps, ConfirmationDialogContentProps } from "./dialog"; -export { showToast } from "./toast"; // We don't export the toast components as they are only used in local storybook file -export { Meta, MetaProvider, useMeta } from "./meta"; -export { Swatch } from "./swatch"; -export { ShellSubHeading } from "./layout"; diff --git a/packages/ui/form/fields.tsx b/packages/ui/form/fields.tsx index 8e1cb4d0dd..244341fd4e 100644 --- a/packages/ui/form/fields.tsx +++ b/packages/ui/form/fields.tsx @@ -6,7 +6,7 @@ import classNames from "@calcom/lib/classNames"; import { getErrorFromUnknown } from "@calcom/lib/errors"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { Alert, showToast } from "../components"; +import { Alert, showToast } from "../"; type InputProps = Omit & { name: string }; diff --git a/packages/ui/index.tsx b/packages/ui/index.tsx index 1d35ecc384..215249e6de 100644 --- a/packages/ui/index.tsx +++ b/packages/ui/index.tsx @@ -1,92 +1,42 @@ +export { Avatar, AvatarGroup } from "./components/avatar"; +export type { AvatarProps, AvatarGroupProps } from "./components/avatar"; +export { Badge, UpgradeTeamsBadge } from "./components/badge"; +export type { BadgeProps } from "./components/badge"; +export { Breadcrumb, BreadcrumbContainer, BreadcrumbItem } from "./components/breadcrumb"; +export { Button, LinkIconButton } from "./components/button"; +export type { ButtonBaseProps, ButtonProps } from "./components/button"; +export { ButtonGroup } from "./components/buttonGroup"; export { - Avatar, - AvatarGroup, - Badge, - UpgradeTeamsBadge, - Breadcrumb, - BreadcrumbContainer, - BreadcrumbItem, - Button, - ButtonGroup, Checkbox, - Credits, - Divider, EmailField, EmailInput, - EmptyScreen, FieldsetLegend, Form, - HeadSeo, HintsOrErrors, Input, InputField, InputGroupBox, - InputFieldWithSelect, InputLeading, Label, - List, - ListItem, - ListItemText, - ListItemTitle, - ListLinkItem, PasswordField, TextArea, TextAreaField, TextField, - TopBanner, - AnimatedPopover, + InputFieldWithSelect, Select, SelectField, SelectWithValidation, - TableActions, TimezoneSelect, - VerticalDivider, - Skeleton, - SkeletonAvatar, - SkeletonText, - SkeletonButton, - SkeletonContainer, - DropdownActions, - Icon, - ErrorBoundary, - Alert, - TrendingAppsSlider, - AppCard, - Card, - AllApps, - AppSkeletonLoader, - SkeletonLoader, - AppStoreCategories, - Slider, - Tooltip, - useShouldShowArrows, - HorizontalTabs, - HorizontalTabItem, - VerticalTabs, - VerticalTabItem, - StepCard, - LinkIconButton, - Editor, - AddVariablesDropdown, - Dialog, - DialogClose, - DialogContent, - DialogFooter, - DialogHeader, - DialogTrigger, - ConfirmationDialogContent, - DateRangePicker, - MultiSelectCheckbox, BooleanToggleGroup, BooleanToggleGroupField, + DatePicker, + DateRangePicker, + MultiSelectCheckbox, ToggleGroup, ToggleGroupItem, - showToast, - ShellSubHeading, - DatePicker as DatePickerField, - FormCard, - FormStep, + getReactSelectProps, ColorPicker, + FormStep, Dropdown, DropdownItem, DropdownMenuContent, @@ -96,44 +46,73 @@ export { DropdownMenuSeparator, DropdownMenuTrigger, DropdownMenuCheckboxItem, - DropdownMenuGroup, DropdownMenuRadioGroup, + ButtonOrLink, + DropdownMenuGroup, DropdownMenuRadioItem, DropdownMenuTriggerItem, - WizardForm, - Stepper, Steps, - Switch, + WizardForm, SettingsToggle, - MeetingTimeInTimezones, + Stepper, + Switch, +} from "./components/form"; +export type { ITimezone, ITimezoneOption } from "./components/form"; +export { + AllApps, + AppCard, + AppSkeletonLoader, + SkeletonLoader, + Slider, + TrendingAppsSlider, + useShouldShowArrows, + AppStoreCategories, +} from "./components/apps"; +export { TopBanner } from "./components/top-banner"; +export type { TopBannerProps } from "./components/top-banner"; +export { AnimatedPopover, MeetingTimeInTimezones } from "./components/popover"; +export { TableActions, DropdownActions } from "./components/table/TableActions"; +export type { ActionType } from "./components/table/TableActions"; +export { Icon } from "./components/icon"; +export { ErrorBoundary } from "./components/errorBoundary"; +export { Logo } from "./components/logo"; +export { Alert } from "./components/alert"; +export type { AlertProps } from "./components/alert"; +export { Credits } from "./components/credits"; +export { Divider, VerticalDivider } from "./components/divider"; +export { EmptyScreen } from "./components/empty-screen"; +export { List, ListItem, ListItemText, ListItemTitle, ListLinkItem } from "./components/list"; +export type { ListItemProps, ListProps } from "./components/list"; +export { HeadSeo } from "./components/head-seo"; +export { + Skeleton, + SkeletonAvatar, + SkeletonButton, + SkeletonContainer, + SkeletonText, Loader, - Meta, - MetaProvider, - useMeta, - Swatch, - Logo, -} from "./components"; -export type { - ActionType, - AlertProps, - AvatarProps, - BadgeProps, - ButtonBaseProps, - BaseCardProps, - ButtonProps, - DialogProps, - ConfirmationDialogContentProps, - ITimezone, - ITimezoneOption, - ListItemProps, - ListProps, - TopBannerProps, - NavTabProps, - HorizontalTabItemProps, - VerticalTabItemProps, - AvatarGroupProps, -} from "./components"; -export { default as CheckboxField } from "./components/form/checkbox/Checkbox"; +} from "./components/skeleton"; +export { HorizontalTabs, HorizontalTabItem, VerticalTabs, VerticalTabItem } from "./components/navigation"; +export type { HorizontalTabItemProps, NavTabProps, VerticalTabItemProps } from "./components/navigation"; +export { Card, StepCard, FormCard } from "./components/card"; +export type { BaseCardProps } from "./components/card"; +export { Tooltip } from "./components/tooltip"; +export { Editor, AddVariablesDropdown } from "./components/editor"; +export { + Dialog, + DialogClose, + DialogContent, + DialogFooter, + DialogHeader, + DialogTrigger, + ConfirmationDialogContent, +} from "./components/dialog"; +export type { DialogProps, ConfirmationDialogContentProps } from "./components/dialog"; +export { showToast } from "./components/toast"; // We don't export the toast components as they are only used in local storybook file +export { Meta, MetaProvider, useMeta } from "./components/meta"; +export { Swatch } from "./components/swatch"; +export { ShellSubHeading } from "./components/layout"; + /** ⬇️ TODO - Move these to components */ export { default as AddressInput } from "./form/AddressInputLazy"; export { default as PhoneInput } from "./form/PhoneInputLazy";