Skip to content

Scheduling infrastructure for absolutely everyone.

feat: make calcom UI dumb again (#19658)

sean-brydon4cdb8f3bae4c
diff --git a/apps/web/components/getting-started/steps-views/UserSettings.tsx b/apps/web/components/getting-started/steps-views/UserSettings.tsx
index 2e8ab496663..b6ee5f39023 100644
--- a/apps/web/components/getting-started/steps-views/UserSettings.tsx
+++ b/apps/web/components/getting-started/steps-views/UserSettings.tsx
@@ -5,11 +5,12 @@ import { z } from "zod";
import dayjs from "@calcom/dayjs";
import { useTimePreferences } from "@calcom/features/bookings/lib";
+import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import { FULL_NAME_LENGTH_MAX_LIMIT } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
import { trpc } from "@calcom/trpc/react";
-import { Button, TimezoneSelect, Input } from "@calcom/ui";
+import { Button, Input } from "@calcom/ui";
import { UsernameAvailabilityField } from "@components/ui/UsernameAvailability";
diff --git a/apps/web/components/settings/TravelScheduleModal.tsx b/apps/web/components/settings/TravelScheduleModal.tsx
index e21ef6ff278..527ac9db43b 100644
--- a/apps/web/components/settings/TravelScheduleModal.tsx
+++ b/apps/web/components/settings/TravelScheduleModal.tsx
@@ -3,6 +3,7 @@ import type { UseFormSetValue } from "react-hook-form";
import dayjs from "@calcom/dayjs";
import { useTimePreferences } from "@calcom/features/bookings/lib/timePreferences";
+import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import {
Dialog,
@@ -12,7 +13,6 @@ import {
Button,
Label,
DateRangePicker,
- TimezoneSelect,
SettingsToggle,
DatePicker,
} from "@calcom/ui";
diff --git a/apps/web/modules/event-types/views/event-types-listing-view.tsx b/apps/web/modules/event-types/views/event-types-listing-view.tsx
index 840d3f87018..152d1be6e27 100644
--- a/apps/web/modules/event-types/views/event-types-listing-view.tsx
+++ b/apps/web/modules/event-types/views/event-types-listing-view.tsx
@@ -9,6 +9,7 @@ import { memo, useEffect, useState } from "react";
import { z } from "zod";
import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
+import { CreateButton } from "@calcom/features/ee/teams/components/createButton/CreateButton";
import { EventTypeEmbedButton, EventTypeEmbedDialog } from "@calcom/features/embed/EventTypeEmbed";
import { EventTypeDescription } from "@calcom/features/eventtypes/components";
import CreateEventTypeDialog from "@calcom/features/eventtypes/components/CreateEventTypeDialog";
@@ -35,7 +36,6 @@ import {
Button,
ButtonGroup,
ConfirmationDialogContent,
- CreateButton,
Dialog,
Dropdown,
DropdownItem,
diff --git a/apps/web/modules/settings/my-account/general-view.tsx b/apps/web/modules/settings/my-account/general-view.tsx
index ba48e5072e5..924b3109a71 100644
--- a/apps/web/modules/settings/my-account/general-view.tsx
+++ b/apps/web/modules/settings/my-account/general-view.tsx
@@ -4,6 +4,7 @@ import { useSession } from "next-auth/react";
import { useState } from "react";
import { Controller, useForm } from "react-hook-form";
+import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
import { formatLocalizedDateTime } from "@calcom/lib/date-fns";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -20,7 +21,6 @@ import {
SkeletonButton,
SkeletonContainer,
SkeletonText,
- TimezoneSelect,
SettingsToggle,
} from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
diff --git a/packages/app-store/routing-forms/pages/forms/[...appPages].tsx b/packages/app-store/routing-forms/pages/forms/[...appPages].tsx
index 4ed6c57c23f..47f6fd4101e 100644
--- a/packages/app-store/routing-forms/pages/forms/[...appPages].tsx
+++ b/packages/app-store/routing-forms/pages/forms/[...appPages].tsx
@@ -6,6 +6,7 @@ import { useFormContext } from "react-hook-form";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import SkeletonLoaderTeamList from "@calcom/features/ee/teams/components/SkeletonloaderTeamList";
+import { CreateButtonWithTeamsList } from "@calcom/features/ee/teams/components/createButton/CreateButtonWithTeamsList";
import { FilterResults } from "@calcom/features/filters/components/FilterResults";
import { TeamsFilter } from "@calcom/features/filters/components/TeamsFilter";
import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery";
@@ -22,7 +23,6 @@ import {
Badge,
Button,
ButtonGroup,
- CreateButtonWithTeamsList,
EmptyScreen,
Icon,
List,
diff --git a/packages/features/bookings/Booker/components/EventMeta.tsx b/packages/features/bookings/Booker/components/EventMeta.tsx
index 777c9a768a2..7ae1c0720df 100644
--- a/packages/features/bookings/Booker/components/EventMeta.tsx
+++ b/packages/features/bookings/Booker/components/EventMeta.tsx
@@ -23,7 +23,7 @@ import { FromToTime } from "../utils/dates";
import { useBookerTime } from "./hooks/useBookerTime";
const WebTimezoneSelect = dynamic(
- () => import("@calcom/ui/components/form/timezone-select/TimezoneSelect").then((mod) => mod.TimezoneSelect),
+ () => import("@calcom/features/components/timezone-select").then((mod) => mod.TimezoneSelect),
{
ssr: false,
}
diff --git a/packages/ui/components/form/timezone-select/TimezoneSelect.tsx b/packages/features/components/timezone-select/TimezoneSelect.tsx
similarity index 98%
rename from packages/ui/components/form/timezone-select/TimezoneSelect.tsx
rename to packages/features/components/timezone-select/TimezoneSelect.tsx
index cbd9364604e..d5276852da6 100644
--- a/packages/ui/components/form/timezone-select/TimezoneSelect.tsx
+++ b/packages/features/components/timezone-select/TimezoneSelect.tsx
@@ -8,11 +8,9 @@ import { CALCOM_VERSION } from "@calcom/lib/constants";
import { filterBySearchText, addTimezonesToDropdown, handleOptionLabel } from "@calcom/lib/timezone";
import type { Timezones } from "@calcom/lib/timezone";
import { trpc } from "@calcom/trpc/react";
+import { getReactSelectProps, inputStyles } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
-import { inputStyles } from "../inputs/TextField";
-import { getReactSelectProps } from "../select";
-
const SELECT_SEARCH_DATA: Timezones = [
{ label: "San Francisco", timezone: "America/Los_Angeles" },
{ label: "Sao Francisco do Sul", timezone: "America/Sao_Paulo" },
@@ -68,6 +66,7 @@ export type TimezoneSelectComponentProps = SelectProps & {
grow?: boolean;
};
+// TODO: I wonder if we move this to ui package, and keep the TRPC version in features
export function TimezoneSelectComponent({
className,
classNames: timezoneClassNames,
diff --git a/packages/ui/components/form/timezone-select/index.ts b/packages/features/components/timezone-select/index.ts
similarity index 100%
rename from packages/ui/components/form/timezone-select/index.ts
rename to packages/features/components/timezone-select/index.ts
diff --git a/packages/ui/components/form/timezone-select/timezone-select.test.tsx b/packages/features/components/timezone-select/timezone-select.test.tsx
similarity index 88%
rename from packages/ui/components/form/timezone-select/timezone-select.test.tsx
rename to packages/features/components/timezone-select/timezone-select.test.tsx
index 0d1280e6686..a150b578208 100644
--- a/packages/ui/components/form/timezone-select/timezone-select.test.tsx
+++ b/packages/features/components/timezone-select/timezone-select.test.tsx
@@ -81,7 +81,27 @@ describe("Test TimezoneSelect", () => {
describe("Test TimezoneSelect with isPending = false", () => {
beforeAll(async () => {
- await runtimeMock(false);
+ // INFO: This needs to be here before the other calls to runtimeMock. For some reason,
+ // when we moved this file from @calcom/ui, the imports started breaking, resulting in
+ // errors of "Cannot set property 'trpc' of [object Module] which has only a getter"
+ // TODO: Update this pattern to be more consistent. Using this direct mocking in the
+ // functions below breaks some tests.
+ vi.mock("@calcom/trpc/react", () => ({
+ trpc: {
+ viewer: {
+ timezones: {
+ cityTimezones: {
+ useQuery() {
+ return {
+ data: cityTimezonesMock,
+ isPending: false,
+ };
+ },
+ },
+ },
+ },
+ },
+ }));
});
test("Should render with the correct CSS when provided with classNames prop", async () => {
renderSelect({ value: timezoneMockValues[0], classNames });
diff --git a/packages/features/ee/organizations/pages/settings/general.tsx b/packages/features/ee/organizations/pages/settings/general.tsx
index 01d2d176de1..20f721f257b 100644
--- a/packages/features/ee/organizations/pages/settings/general.tsx
+++ b/packages/features/ee/organizations/pages/settings/general.tsx
@@ -5,6 +5,7 @@ import { useRouter } from "next/navigation";
import { useEffect } from "react";
import { Controller, useForm } from "react-hook-form";
+import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -21,7 +22,6 @@ import {
SkeletonButton,
SkeletonContainer,
SkeletonText,
- TimezoneSelect,
} from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
diff --git a/packages/features/ee/teams/components/TeamAvailabilityModal.tsx b/packages/features/ee/teams/components/TeamAvailabilityModal.tsx
index 48003c5e5bf..8f926d678da 100644
--- a/packages/features/ee/teams/components/TeamAvailabilityModal.tsx
+++ b/packages/features/ee/teams/components/TeamAvailabilityModal.tsx
@@ -1,13 +1,14 @@
import { useEffect, useState } from "react";
import dayjs from "@calcom/dayjs";
+import { TimezoneSelect } from "@calcom/features/components/timezone-select";
+import type { ITimezone } from "@calcom/features/components/timezone-select";
import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
import { WEBAPP_URL, CURRENT_TIMEZONE } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { RouterOutputs } from "@calcom/trpc/react";
import { trpc } from "@calcom/trpc/react";
-import type { ITimezone } from "@calcom/ui";
-import { Avatar, DatePicker, Label, Select, TimezoneSelect } from "@calcom/ui";
+import { Avatar, DatePicker, Label, Select } from "@calcom/ui";
import TeamAvailabilityTimes from "./TeamAvailabilityTimes";
diff --git a/packages/ui/components/createButton/CreateButton.tsx b/packages/features/ee/teams/components/createButton/CreateButton.tsx
similarity index 100%
rename from packages/ui/components/createButton/CreateButton.tsx
rename to packages/features/ee/teams/components/createButton/CreateButton.tsx
diff --git a/packages/ui/components/createButton/CreateButtonWithTeamsList.tsx b/packages/features/ee/teams/components/createButton/CreateButtonWithTeamsList.tsx
similarity index 100%
rename from packages/ui/components/createButton/CreateButtonWithTeamsList.tsx
rename to packages/features/ee/teams/components/createButton/CreateButtonWithTeamsList.tsx
diff --git a/packages/ui/components/createButton/create-button-with-teams-list.test.tsx b/packages/features/ee/teams/components/createButton/create-button-with-teams-list.test.tsx
similarity index 80%
rename from packages/ui/components/createButton/create-button-with-teams-list.test.tsx
rename to packages/features/ee/teams/components/createButton/create-button-with-teams-list.test.tsx
index f60d655b94e..d2eb778bc83 100644
--- a/packages/ui/components/createButton/create-button-with-teams-list.test.tsx
+++ b/packages/features/ee/teams/components/createButton/create-button-with-teams-list.test.tsx
@@ -29,14 +29,31 @@ const renderCreateButton = (
describe("Create Button Tests", () => {
describe("Create Button Tests With Valid Team", () => {
beforeAll(async () => {
- await runtimeMock([
- {
- teamId: 1,
- name: "test",
- slug: "create-button-test",
- image: "image",
+ // INFO: This needs to be here before the other calls to runtimeMock. For some reason,
+ // when we moved this file from @calcom/ui, the imports started breaking, resulting in
+ // errors of "Cannot set property 'trpc' of [object Module] which has only a getter"
+ // TODO: Update this pattern to be more consistent. Using this direct mocking in the
+ // functions below breaks some tests.
+ vi.mock("@calcom/trpc/react", () => ({
+ trpc: {
+ viewer: {
+ teamsAndUserProfilesQuery: {
+ useQuery() {
+ return {
+ data: [
+ {
+ teamId: 1,
+ name: "test",
+ slug: "create-button-test",
+ image: "image",
+ },
+ ],
+ };
+ },
+ },
+ },
},
- ]);
+ }));
});
test("Should render the create-button-dropdown button", () => {
const createFunction = vi.fn();
diff --git a/packages/ui/components/createButton/index.ts b/packages/features/ee/teams/components/createButton/index.ts
similarity index 100%
rename from packages/ui/components/createButton/index.ts
rename to packages/features/ee/teams/components/createButton/index.ts
diff --git a/packages/features/ee/users/components/UserForm.tsx b/packages/features/ee/users/components/UserForm.tsx
index 25fe21e338f..ada3102c7a7 100644
--- a/packages/features/ee/users/components/UserForm.tsx
+++ b/packages/features/ee/users/components/UserForm.tsx
@@ -2,21 +2,12 @@
import { noop } from "lodash";
import { Controller, useForm } from "react-hook-form";
+import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { defaultLocaleOption, localeOptions } from "@calcom/lib/i18n";
import { nameOfDay } from "@calcom/lib/weekday";
-import {
- Avatar,
- Button,
- EmailField,
- Form,
- ImageUploader,
- Label,
- Select,
- TextField,
- TimezoneSelect,
-} from "@calcom/ui";
+import { Avatar, Button, EmailField, Form, ImageUploader, Label, Select, TextField } from "@calcom/ui";
import type { UserAdminRouterOutputs } from "../server/trpc-router";
diff --git a/packages/features/ee/workflows/components/EmptyScreen.tsx b/packages/features/ee/workflows/components/EmptyScreen.tsx
index b1562ef209e..1421a73d83d 100644
--- a/packages/features/ee/workflows/components/EmptyScreen.tsx
+++ b/packages/features/ee/workflows/components/EmptyScreen.tsx
@@ -1,10 +1,11 @@
import { useRouter } from "next/navigation";
+import { CreateButtonWithTeamsList } from "@calcom/features/ee/teams/components/createButton/CreateButtonWithTeamsList";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { HttpError } from "@calcom/lib/http-error";
import { trpc } from "@calcom/trpc/react";
import type { IconName } from "@calcom/ui";
-import { CreateButtonWithTeamsList, EmptyScreen as ClassicEmptyScreen, Icon, showToast } from "@calcom/ui";
+import { EmptyScreen as ClassicEmptyScreen, Icon, showToast } from "@calcom/ui";
type WorkflowExampleType = {
Icon: IconName;
diff --git a/packages/features/ee/workflows/pages/index.tsx b/packages/features/ee/workflows/pages/index.tsx
index 28fe9c5ed84..76723af5161 100644
--- a/packages/features/ee/workflows/pages/index.tsx
+++ b/packages/features/ee/workflows/pages/index.tsx
@@ -5,6 +5,7 @@ import { useRouter } from "next/navigation";
import type { Dispatch, SetStateAction } from "react";
import { useState } from "react";
+import { CreateButtonWithTeamsList } from "@calcom/features/ee/teams/components/createButton/CreateButtonWithTeamsList";
import Shell, { ShellMain } from "@calcom/features/shell/Shell";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -12,7 +13,7 @@ import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
import { HttpError } from "@calcom/lib/http-error";
import type { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
import { trpc } from "@calcom/trpc/react";
-import { AnimatedPopover, Avatar, CreateButtonWithTeamsList, showToast } from "@calcom/ui";
+import { AnimatedPopover, Avatar, showToast } from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
import { FilterResults } from "../../../filters/components/FilterResults";
diff --git a/packages/features/embed/Embed.tsx b/packages/features/embed/Embed.tsx
index 851ee92a8d6..a8ece973ab6 100644
--- a/packages/features/embed/Embed.tsx
+++ b/packages/features/embed/Embed.tsx
@@ -14,6 +14,7 @@ import { AvailableTimes, AvailableTimesHeader } from "@calcom/features/bookings"
import { useBookerStore, useInitializeBookerStore } from "@calcom/features/bookings/Booker/store";
import { useEvent, useScheduleForEvent } from "@calcom/features/bookings/Booker/utils/event";
import DatePicker from "@calcom/features/calendars/DatePicker";
+import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import type { Slot } from "@calcom/features/schedules";
import { useNonEmptyScheduleDays } from "@calcom/features/schedules";
import { useSlotsForDate } from "@calcom/features/schedules/lib/use-schedule/useSlotsForDate";
@@ -38,7 +39,6 @@ import {
showToast,
Switch,
TextField,
- TimezoneSelect,
} from "@calcom/ui";
import { useBookerTime } from "../bookings/Booker/components/hooks/useBookerTime";
diff --git a/packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx b/packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx
index ebaaf908693..610985b4855 100644
--- a/packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx
+++ b/packages/features/timezone-buddy/components/AvailabilityEditSheet.tsx
@@ -1,6 +1,7 @@
import { useFieldArray, useForm, useFormContext } from "react-hook-form";
import dayjs from "@calcom/dayjs";
+import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import { DateOverrideInputDialog, DateOverrideList } from "@calcom/features/schedules";
import Schedule from "@calcom/features/schedules/components/Schedule";
import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -22,7 +23,6 @@ import {
SheetHeader,
SheetTitle,
showToast,
- TimezoneSelect,
} from "@calcom/ui";
import type { SliderUser } from "./AvailabilitySliderTable";
diff --git a/packages/features/users/components/UserTable/EditSheet/EditUserForm.tsx b/packages/features/users/components/UserTable/EditSheet/EditUserForm.tsx
index 8177c245738..3c615e8766e 100644
--- a/packages/features/users/components/UserTable/EditSheet/EditUserForm.tsx
+++ b/packages/features/users/components/UserTable/EditSheet/EditUserForm.tsx
@@ -5,6 +5,7 @@ import { useMemo, useState } from "react";
import { Controller, useForm, useFormContext } from "react-hook-form";
import { z } from "zod";
+import { TimezoneSelect } from "@calcom/features/components/timezone-select";
import { emailSchema } from "@calcom/lib/emailSchema";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { MembershipRole } from "@calcom/prisma/enums";
@@ -15,7 +16,6 @@ import {
ToggleGroup,
InputField,
TextAreaField,
- TimezoneSelect,
Label,
showToast,
Avatar,
diff --git a/packages/features/webhooks/components/CreateNewWebhookButton.tsx b/packages/features/webhooks/components/CreateNewWebhookButton.tsx
index eaaa4eb83ea..db83c6ed98e 100644
--- a/packages/features/webhooks/components/CreateNewWebhookButton.tsx
+++ b/packages/features/webhooks/components/CreateNewWebhookButton.tsx
@@ -2,8 +2,8 @@
import { useRouter } from "next/navigation";
+import { CreateButtonWithTeamsList } from "@calcom/features/ee/teams/components/createButton/CreateButtonWithTeamsList";
import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { CreateButtonWithTeamsList } from "@calcom/ui";
export const CreateNewWebhookButton = ({ isAdmin }: { isAdmin: boolean }) => {
const router = useRouter();
diff --git a/packages/platform/atoms/availability/AvailabilitySettings.tsx b/packages/platform/atoms/availability/AvailabilitySettings.tsx
index 0dd0d44b7eb..1b0b7fa0909 100644
--- a/packages/platform/atoms/availability/AvailabilitySettings.tsx
+++ b/packages/platform/atoms/availability/AvailabilitySettings.tsx
@@ -5,6 +5,7 @@ import { useMemo, useState } from "react";
import { Controller, useFieldArray, useForm, useFormContext, useWatch } from "react-hook-form";
import dayjs from "@calcom/dayjs";
+import { TimezoneSelect as WebTimezoneSelect } from "@calcom/features/components/timezone-select";
import type {
BulkUpdatParams,
EventTypes,
@@ -32,7 +33,6 @@ import {
SelectSkeletonLoader,
Skeleton,
Switch,
- TimezoneSelect as WebTimezoneSelect,
Tooltip,
VerticalDivider,
} from "@calcom/ui";
diff --git a/packages/platform/atoms/timezone/index.tsx b/packages/platform/atoms/timezone/index.tsx
index a579e3aa548..28a770fea36 100644
--- a/packages/platform/atoms/timezone/index.tsx
+++ b/packages/platform/atoms/timezone/index.tsx
@@ -1,5 +1,5 @@
-import type { TimezoneSelectProps } from "@calcom/ui";
-import { TimezoneSelectComponent } from "@calcom/ui";
+import { TimezoneSelectComponent as TimezoneSelect } from "@calcom/features/components/timezone-select";
+import type { TimezoneSelectProps } from "@calcom/features/components/timezone-select";
import useGetCityTimezones from "../hooks/useGetCityTimezones";
@@ -7,7 +7,7 @@ export function Timezone(props: TimezoneSelectProps) {
const { isLoading, data } = useGetCityTimezones();
return (
- <TimezoneSelectComponent
+ <TimezoneSelect
{...props}
data={
Array.isArray(data)
diff --git a/packages/ui/components/form/index.ts b/packages/ui/components/form/index.ts
index 78614d41d7f..99ad07b07c6 100644
--- a/packages/ui/components/form/index.ts
+++ b/packages/ui/components/form/index.ts
@@ -16,18 +16,12 @@ export {
export { InputFieldWithSelect } from "./inputs/InputFieldWithSelect";
-export { InputField, Input, TextField } from "./inputs/TextField";
+export { InputField, Input, TextField, inputStyles } from "./inputs/TextField";
export { InputError } from "./inputs/InputError";
export { Form } from "./inputs/Form";
export { Label } from "./inputs/Label";
export { Select, SelectField, SelectWithValidation, getReactSelectProps } from "./select";
-export { TimezoneSelect, TimezoneSelectComponent } from "./timezone-select";
-export type {
- ITimezone,
- ITimezoneOption,
- TimezoneSelectComponentProps,
- TimezoneSelectProps,
-} from "./timezone-select";
+
export { DateRangePickerLazy as DateRangePicker } from "./date-range-picker";
export { BooleanToggleGroup, BooleanToggleGroupField, ToggleGroup } from "./toggleGroup";
export { DatePicker } from "./datepicker";
diff --git a/packages/ui/components/test-setup.ts b/packages/ui/components/test-setup.ts
index e57146da5c8..2150479a206 100644
--- a/packages/ui/components/test-setup.ts
+++ b/packages/ui/components/test-setup.ts
@@ -18,10 +18,6 @@ vi.mock("@calcom/features/ee/organizations/context/provider", () => ({
},
}));
-vi.mock("@calcom/trpc/react", () => ({
- trpc: {},
-}));
-
vi.mock("next/navigation", async () => ({
...((await vi.importActual("next/navigation")) as object),
useRouter() {
diff --git a/packages/ui/form/PhoneInput.tsx b/packages/ui/form/PhoneInput.tsx
index 3b14c9199fd..5047df5a118 100644
--- a/packages/ui/form/PhoneInput.tsx
+++ b/packages/ui/form/PhoneInput.tsx
@@ -1,12 +1,9 @@
"use client";
-import { isSupportedCountry } from "libphonenumber-js";
-import { useState, useEffect } from "react";
import PhoneInput from "react-phone-input-2";
import "react-phone-input-2/lib/style.css";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
-import { trpc } from "@calcom/trpc/react";
import classNames from "@calcom/ui/classNames";
export type PhoneInputProps = {
@@ -121,29 +118,30 @@ function BasePhoneInputWeb({
);
}
-const useDefaultCountry = () => {
- const [defaultCountry, setDefaultCountry] = useState("us");
- const query = trpc.viewer.public.countryCode.useQuery(undefined, {
- refetchOnWindowFocus: false,
- refetchOnReconnect: false,
- retry: false,
- });
+// Function not in use anywhere.
+// const useDefaultCountry = () => {
+// const [defaultCountry, setDefaultCountry] = useState("us");
+// const query = trpc.viewer.public.countryCode.useQuery(undefined, {
+// refetchOnWindowFocus: false,
+// refetchOnReconnect: false,
+// retry: false,
+// });
- useEffect(
- function refactorMeWithoutEffect() {
- const data = query.data;
- if (!data?.countryCode) {
- return;
- }
+// useEffect(
+// function refactorMeWithoutEffect() {
+// const data = query.data;
+// if (!data?.countryCode) {
+// return;
+// }
- isSupportedCountry(data?.countryCode)
- ? setDefaultCountry(data.countryCode.toLowerCase())
- : setDefaultCountry(navigator.language.split("-")[1]?.toLowerCase() || "us");
- },
- [query.data]
- );
+// isSupportedCountry(data?.countryCode)
+// ? setDefaultCountry(data.countryCode.toLowerCase())
+// : setDefaultCountry(navigator.language.split("-")[1]?.toLowerCase() || "us");
+// },
+// [query.data]
+// );
- return defaultCountry;
-};
+// return defaultCountry;
+// };
export default BasePhoneInput;
diff --git a/packages/ui/index.ts b/packages/ui/index.ts
index f46f1fe2836..2722a7cb18b 100644
--- a/packages/ui/index.ts
+++ b/packages/ui/index.ts
@@ -37,8 +37,6 @@ export {
Select,
SelectField,
SelectWithValidation,
- TimezoneSelect,
- TimezoneSelectComponent,
BooleanToggleGroup,
BooleanToggleGroupField,
DatePicker,
@@ -56,14 +54,9 @@ export {
Switch,
NumberInput,
InputError,
+ inputStyles,
} from "./components/form";
-export type {
- ITimezone,
- ITimezoneOption,
- TimezoneSelectProps,
- TimezoneSelectComponentProps,
-} from "./components/form";
export { Slider as RangeSlider } from "./components/form/slider";
export { RangeSliderPopover } from "./components/form/slider/RangeSliderPopover";
@@ -149,7 +142,6 @@ export { default as ImageUploader } from "./components/image-uploader/ImageUploa
export { default as BannerUploader } from "./components/image-uploader/BannerUploader";
export type { ButtonColor } from "./components/button/Button";
-export { CreateButton, CreateButtonWithTeamsList } from "./components/createButton";
export { useCalcomTheme } from "./styles/useCalcomTheme";
export { ScrollableArea } from "./components/scrollable";
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 2a69f2062d6..f06dc9a830c 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -54,7 +54,6 @@
"./components/icon/SatSymbol": "./components/icon/SatSymbol.tsx",
"./components/icon/Spinner": "./components/icon/Spinner.tsx",
"./components/unpublished-entity/UnpublishedEntity": "./components/unpublished-entity/index.ts",
- "./components/form/timezone-select/TimezoneSelect": "./components/form/timezone-select/index.ts",
"./components/table/TableNew": "./components/table/TableNew.tsx",
"./__mocks__/ui": "./__mocks__/ui.tsx"
},
@@ -69,7 +68,6 @@
},
"dependencies": {
"@calcom/lib": "*",
- "@calcom/trpc": "*",
"@formkit/auto-animate": "1.0.0-beta.5",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.4",
diff --git a/yarn.lock b/yarn.lock
index 5d7d965c19e..c927450177a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3712,7 +3712,6 @@ __metadata:
dependencies:
"@calcom/config": "*"
"@calcom/lib": "*"
- "@calcom/trpc": "*"
"@calcom/tsconfig": "*"
"@formkit/auto-animate": 1.0.0-beta.5
"@radix-ui/react-checkbox": ^1.0.4