@licklist/design 0.67.6 → 0.68.0-dev.1

package/dist/typeahead/Typeahead.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Typeahead.d.ts","sourceRoot":"","sources":["../../src/typeahead/Typeahead.tsx"],"names":[],"mappings":"AAGA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,iBAAS,SAAS,CAAC,EACjB,OAAO,EACP,WAAW,EACX,UAAkB,EAClB,gBAAgB,EAChB,IAAS,EACT,YAAoB,EACpB,gBAAqB,EACrB,SAAS,GACV,EAAE,cAAc,2CA4ChB;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"Typeahead.d.ts","sourceRoot":"","sources":["../../src/typeahead/Typeahead.tsx"],"names":[],"mappings":"AAAA,OAAe,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAG1D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,kBAAkB,CAAC;IACrC,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;CACnD;AAED,iBAAS,SAAS,CAAC,EACjB,OAAO,EACP,WAAW,EACX,UAAkB,EAClB,gBAAgB,EAChB,IAAS,EACT,KAAK,EACL,aAAa,EACb,eAAe,EACf,YAAoB,EACpB,gBAAqB,EACrB,SAAS,GACV,EAAE,cAAc,2CAoDhB;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}

package/dist/typeahead/Typeahead.js

@@ -31,7 +31,7 @@ function _object_spread(target) {
     return target;
 }
 function Typeahead(param) {
-    var options = param.options, placeholder = param.placeholder, _param_isRequired = param.isRequired, isRequired = _param_isRequired === void 0 ? false : _param_isRequired, isMultipleChoise = param.isMultipleChoise, _param_name = param.name, name = _param_name === void 0 ? "" : _param_name, _param_isCouponForm = param.isCouponForm, isCouponForm = _param_isCouponForm === void 0 ? false : _param_isCouponForm, _param_noOptionsMessage = param.noOptionsMessage, noOptionsMessage = _param_noOptionsMessage === void 0 ? "" : _param_noOptionsMessage, isInvalid = param.isInvalid;
+    var options = param.options, placeholder = param.placeholder, _param_isRequired = param.isRequired, isRequired = _param_isRequired === void 0 ? false : _param_isRequired, isMultipleChoise = param.isMultipleChoise, _param_name = param.name, name = _param_name === void 0 ? "" : _param_name, value = param.value, onChangeValue = param.onChangeValue, containerStyles = param.containerStyles, _param_isCouponForm = param.isCouponForm, isCouponForm = _param_isCouponForm === void 0 ? false : _param_isCouponForm, _param_noOptionsMessage = param.noOptionsMessage, noOptionsMessage = _param_noOptionsMessage === void 0 ? "" : _param_noOptionsMessage, isInvalid = param.isInvalid;
     var control = useFormContext().control;
     var getStyle = function() {
         var couponFormStyle = isCouponForm ? {
@@ -53,14 +53,21 @@ function Typeahead(param) {
                 var field = param.field;
                 return /*#__PURE__*/ jsx(Select, {
                     placeholder: placeholder,
-                    value: field.value,
+                    value: value !== null && value !== void 0 ? value : field.value,
                     isMulti: isMultipleChoise,
                     styles: {
+                        container: function(base) {
+                            return _object_spread({}, base, containerStyles);
+                        },
                         control: function(base) {
                             return _object_spread({}, base, getStyle());
                         }
                     },
                     onChange: function(value) {
+                        if (onChangeValue) {
+                            onChangeValue(value);
+                            return;
+                        }
                         field.onChange(value);
                     },
                     options: options,

package/dist/zone/form/ZoneForm.d.ts

@@ -6,10 +6,11 @@ export type ZoneFormProps = {
     onSubmit: (values: Partial<Zone>) => void;
     serverErrors?: ServerError;
     isLoading?: boolean;
-    workHours?: WorkHour[];
+    workHours: WorkHour[] | undefined;
+    timeZone: string;
 };
 export type ZoneFormValues = Partial<Zone> & {
     localImageBlobURL?: string;
 };
-export declare const ZoneForm: ({ defaultValues, onSubmit, serverErrors, isLoading, }: ZoneFormProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ZoneForm: ({ defaultValues, onSubmit, serverErrors, isLoading, workHours, timeZone, }: ZoneFormProps) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ZoneForm.d.ts.map

package/dist/zone/form/ZoneForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZoneForm.d.ts","sourceRoot":"","sources":["../../../src/zone/form/ZoneForm.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,wDAAwD,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAGtF,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IAC1C,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,QAAQ,0DAKlB,aAAa,4CAiDf,CAAC"}
+{"version":3,"file":"ZoneForm.d.ts","sourceRoot":"","sources":["../../../src/zone/form/ZoneForm.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,wDAAwD,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAGtF,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IAC1C,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAClC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,QAAQ,+EAOlB,aAAa,4CAqDf,CAAC"}

package/dist/zone/form/ZoneForm.js

@@ -86,7 +86,7 @@ function _object_without_properties_loose(source, excluded) {
     return target;
 }
 var ZoneForm = function(param) {
-    var defaultValues = param.defaultValues, onSubmit = param.onSubmit, serverErrors = param.serverErrors, _param_isLoading = param.isLoading, isLoading = _param_isLoading === void 0 ? false : _param_isLoading;
+    var defaultValues = param.defaultValues, onSubmit = param.onSubmit, serverErrors = param.serverErrors, _param_isLoading = param.isLoading, isLoading = _param_isLoading === void 0 ? false : _param_isLoading, workHours = param.workHours, timeZone = param.timeZone;
     var t = useTranslation("Design").t;
     var form = useForm({
         mode: "onChange",
@@ -121,7 +121,9 @@ var ZoneForm = function(param) {
             onSubmit: handleSubmit(onFormSubmit),
             children: [
                 /*#__PURE__*/ jsx(ZoneControl, {
-                    isLoading: isLoading
+                    isLoading: isLoading,
+                    workHours: workHours,
+                    timeZone: timeZone
                 }),
                 /*#__PURE__*/ jsxs(Row, {
                     children: [

package/dist/zone/form/components/ZoneControl.d.ts

@@ -1,7 +1,8 @@
 import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
 export type ZoneControlProps = {
     isLoading: boolean;
-    workHours?: WorkHour[];
+    workHours: WorkHour[] | undefined;
+    timeZone: string;
 };
-export declare const ZoneControl: ({ isLoading }: ZoneControlProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ZoneControl: ({ isLoading, workHours, timeZone, }: ZoneControlProps) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ZoneControl.d.ts.map

package/dist/zone/form/components/ZoneControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZoneControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneControl.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAStF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,4CA0B1D,CAAC"}
+{"version":3,"file":"ZoneControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneControl.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAStF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAClC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,WAAW,wCAIrB,gBAAgB,4CA0BlB,CAAC"}

package/dist/zone/form/components/ZoneControl.js

@@ -9,7 +9,7 @@ import { ZoneImageControl } from './ZoneImageControl.js';
 import { GameDurationControl } from './GameDurationControl.js';
 
 var ZoneControl = function(param) {
-    var isLoading = param.isLoading;
+    var isLoading = param.isLoading, workHours = param.workHours, timeZone = param.timeZone;
     return /*#__PURE__*/ jsx(Row, {
         children: /*#__PURE__*/ jsxs(Col, {
             md: 6,
@@ -19,7 +19,10 @@ var ZoneControl = function(param) {
                 /*#__PURE__*/ jsx(NameControl, {
                     isLoading: isLoading
                 }),
-                /*#__PURE__*/ jsx(ZoneRecurrencesControl, {}),
+                /*#__PURE__*/ jsx(ZoneRecurrencesControl, {
+                    workHours: workHours,
+                    timeZone: timeZone
+                }),
                 /*#__PURE__*/ jsx("hr", {}),
                 /*#__PURE__*/ jsxs(Row, {
                     children: [

package/dist/zone/form/components/ZoneRecurrencesControl.d.ts

@@ -3,9 +3,10 @@ import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMa
 export interface DateAndRecurrenceInputValues {
     zoneRecurrences?: Partial<ZoneRecurrence>[];
 }
-export type ZoneRecurrenceControlProps = {
-    workHours?: WorkHour[];
-    isLoading?: boolean;
+type ZoneRecurrenceControlProps = {
+    workHours: WorkHour[] | undefined;
+    timeZone: string;
 };
-export declare const ZoneRecurrencesControl: () => import("react/jsx-runtime").JSX.Element;
+export declare const ZoneRecurrencesControl: ({ workHours, timeZone, }: ZoneRecurrenceControlProps) => import("react/jsx-runtime").JSX.Element;
+export {};
 //# sourceMappingURL=ZoneRecurrencesControl.d.ts.map

package/dist/zone/form/components/ZoneRecurrencesControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZoneRecurrencesControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneRecurrencesControl.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAMlG,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAWtF,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,sBAAsB,+CAkMlC,CAAC"}
+{"version":3,"file":"ZoneRecurrencesControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneRecurrencesControl.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAMlG,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAWtF,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;CAC7C;AAED,KAAK,0BAA0B,GAAG;IAChC,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAClC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,sBAAsB,6BAGhC,0BAA0B,4CAoM5B,CAAC"}

package/dist/zone/form/components/ZoneRecurrencesControl.js

@@ -211,7 +211,8 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-var ZoneRecurrencesControl = function() {
+var ZoneRecurrencesControl = function(param) {
+    var workHours = param.workHours, timeZone = param.timeZone;
     var _errors_zoneRecurrences;
     var _useFormContext = useFormContext(), control = _useFormContext.control, register = _useFormContext.register, errors = _useFormContext.formState.errors, getValues = _useFormContext.getValues, setValue = _useFormContext.setValue, clearErrors = _useFormContext.clearErrors;
     var _useFieldArray = useFieldArray({
@@ -348,7 +349,9 @@ var ZoneRecurrencesControl = function() {
                             defaultValues: editState.values,
                             onChange: handleRecurringDateChange,
                             onDelete: handleDelete,
-                            setInitialStartDateAfterSelect: true
+                            setInitialStartDateAfterSelect: true,
+                            workHours: workHours,
+                            timeZone: timeZone
                         })
                     })
                 }),

package/dist/zone/form/utils/dates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/utils/dates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAOtF,eAAO,MAAM,qBAAqB,cACrB,MAAM,WACR,MAAM,6BAuChB,CAAC;AAEF,eAAO,MAAM,wBAAwB,eAAgB,QAAQ,EAAE,aA0C9D,CAAC"}
+{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/utils/dates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAOtF,eAAO,MAAM,qBAAqB,cACrB,MAAM,WACR,MAAM,6BAuChB,CAAC;AAEF,eAAO,MAAM,wBAAwB,eAAgB,QAAQ,EAAE,aAyC9D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.67.6",
+  "version": "0.68.0-dev.1",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -42,11 +42,11 @@
     ]
   },
   "peerDependencies": {
-    "@licklist/core": "0.29.3",
+    "@licklist/core": "0.29.1-dev.3",
     "@licklist/eslint-config": "0.5.5",
-    "@licklist/plugins": "0.32.0",
+    "@licklist/plugins": "0.32.0-dev.3",
     "lodash": "4.17.21",
-    "luxon": "1.26.0",
+    "luxon": "3.5.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "7.52.2",
@@ -61,10 +61,9 @@
     "@dnd-kit/utilities": "2.0.0",
     "@fortawesome/fontawesome-svg-core": "1.2.34",
     "@fortawesome/free-solid-svg-icons": "5.15.2",
-    "@fortawesome/react-fontawesome": "0.1.9",
-    "@licklist/core": "0.29.3",
+    "@licklist/core": "0.29.1-dev.3",
     "@licklist/eslint-config": "0.5.5",
-    "@licklist/plugins": "0.32.0",
+    "@licklist/plugins": "0.32.0-dev.3",
     "@mdx-js/react": "1.6.22",
     "@popperjs/core": "2.11.8",
     "@react-aria/utils": "3.9.0",
@@ -101,7 +100,7 @@
     "framer-motion": "4.1.17",
     "konva": "6.0.0",
     "lodash": "4.17.21",
-    "luxon": "1.26.0",
+    "luxon": "3.5.0",
     "moment": "2.29.1",
     "react": "17.0.2",
     "react-bootstrap": "1.6.1",
@@ -145,7 +144,7 @@
     "@svgr/rollup": "8.1.0",
     "@swc/core": "1.6.5",
     "@types/lodash": "4.17.5",
-    "@types/luxon": "1.26.2",
+    "@types/luxon": "3.4.2",
     "@types/mdx-js__react": "1.5.3",
     "@types/node": "20.9.0",
     "@types/react": "17.0.80",
@@ -200,5 +199,6 @@
   "volta": {
     "node": "20.9.0",
     "yarn": "4.4.0"
-  }
-}
+  },
+  "stableVersion": "0.66.7-dev.5"
+}

package/src/auth/ChangePassword/ChangePassword.stories.tsx

@@ -15,7 +15,7 @@ export const ChangePassword: Story<{}> = (args) => (
 );
 
 export const ChangePasswordForm: Story<ChangePasswordFormComponentProps> = (
-  args,
+  args
 ) => (
   <>
     <Router>

package/src/auth/Login/LoginComponent.tsx

@@ -44,7 +44,7 @@ const LoginComponent = ({
   const handleError = (error: any) => {
     notification.danger({
       title: "Error",
-      message: error.message,
+      message: error?.response?.data?.message || error.message,
     });
   };
 

package/src/auth/ResetPassword/ResetPassword.stories.tsx

@@ -14,7 +14,7 @@ export const ResetPassword: Story<{}> = (args) => (
   <ResetPasswordComponent {...args} />
 );
 export const ResetPasswordForm: Story<ResetPasswordFormComponentProps> = (
-  args,
+  args
 ) => (
   <>
     <Router>

package/src/calendar/components/CalendarButtons/CalendarButtons.tsx

@@ -2,7 +2,7 @@ import { useCallback, useMemo } from "react";
 import { Button } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
 import { range } from "lodash";
-import { ReactComponent as SelectArrow } from "../../../assets/iframe/selectArrow.svg";
+import { DateTime } from "luxon";
 import { CalendarSelect } from "../CalendarSelect";
 import { CalendarProps } from "../../Calendar";
 
@@ -26,15 +26,21 @@ export const CalendarButtons = ({
 }: CalendarButtonsProps) => {
   const { t } = useTranslation("Design");
 
-  const onSelectNextMonth = useCallback(() => {
-    setCurrentDate((prevDate) => prevDate.plus({ months: 1 }));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  const onSelectMonth = useCallback(
+    (value: string) => {
+      const selectedMonth = Number(value);
+      const nextDateTime = currentDate.set({ month: selectedMonth });
+
+      if (nextDateTime <= initialDate) {
+        setCurrentDate(initialDate);
+        return;
+      }
 
-  const onSelectPreviousMonth = useCallback(() => {
-    setCurrentDate((prevDate) => prevDate.minus({ month: 1 }));
+      setCurrentDate(nextDateTime);
+    },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+    [setCurrentDate, currentDate],
+  );
 
   const yearOptions = useMemo(() => {
     return range(initialDate.year, initialDate.year + 5, 1).map((year) => {
@@ -42,10 +48,18 @@ export const CalendarButtons = ({
     });
   }, [initialDate]);
 
-  const canMoveBack = useMemo(
-    () => currentDate > initialDate,
-    [currentDate, initialDate],
-  );
+  const monthOptions = useMemo(() => {
+    const initialMonth =
+      currentDate.year > initialDate.year ? 1 : initialDate.month;
+    return range(initialMonth, 13).map((monthNumber) => {
+      return {
+        label: DateTime.fromObject({ month: monthNumber }).toLocaleString({
+          month: "long",
+        }),
+        value: monthNumber,
+      };
+    });
+  }, [initialDate, currentDate]);
 
   const onSelectYear = (value: string) => {
     const selectedYear = Number(value);
@@ -107,22 +121,11 @@ export const CalendarButtons = ({
       <hr />
       <div className="calendar-buttons">
         <div className="buttons-wrapper">
-          <Button
-            className="calendar-button left-button"
-            onClick={onSelectPreviousMonth}
-            disabled={!canMoveBack}
-            variant="link"
-          >
-            <SelectArrow />
-          </Button>
-          <div className="month-title">{currentDate.toFormat("MMMM")}</div>
-          <Button
-            className="calendar-button"
-            onClick={onSelectNextMonth}
-            variant="link"
-          >
-            <SelectArrow />
-          </Button>
+          <CalendarSelect
+            options={monthOptions}
+            onChange={onSelectMonth}
+            value={currentDate.month}
+          />
         </div>
         <CalendarSelect
           options={yearOptions}

package/src/calendar/utils/index.ts

@@ -1,18 +1,40 @@
 import { DateTime, Interval } from "luxon";
 
-export const getMonthCalendarDates = (initialDate: DateTime): DateTime[] => {
+export const getMonthCalendarDates = (
+  initialDate: DateTime,
+  timeZone?: string,
+): DateTime[] => {
   const startOfMonth = initialDate.startOf("month");
   const endOfMonth = initialDate.endOf("month");
 
-  return Interval.fromDateTimes(startOfMonth, endOfMonth)
+  const dateTimes = Interval.fromDateTimes(startOfMonth, endOfMonth)
     .splitBy({ day: 1 })
     .map((d) => d.start);
+
+  if (timeZone) {
+    return dateTimes.map((date) =>
+      date.setZone(timeZone, { keepLocalTime: true }),
+    );
+  }
+
+  return dateTimes;
 };
 
-export const getWeekCalendarDates = (initialDate: DateTime): DateTime[] => {
+export const getWeekCalendarDates = (
+  initialDate: DateTime,
+  timeZone?: string,
+): DateTime[] => {
   const lastDay = initialDate.plus({ days: 7 });
 
-  return Interval.fromDateTimes(initialDate, lastDay)
+  const dateTimes = Interval.fromDateTimes(initialDate, lastDay)
     .splitBy({ day: 1 })
     .map((d) => d.start);
+
+  if (timeZone) {
+    return dateTimes.map((date) =>
+      date.setZone(timeZone, { keepLocalTime: true }),
+    );
+  }
+
+  return dateTimes;
 };

package/src/events/edit-event-modal/IntervalInput.tsx

@@ -89,6 +89,13 @@ export function IntervalInput({
     trigger("end");
   };
 
+  const onChangeRecurrent = (checked: boolean) => {
+    setRecurrent(checked);
+    if (!checked) {
+      setValue("rrule", null);
+    }
+  };
+
   return (
     <>
       <Form.Row className="interval-container">
@@ -144,7 +151,7 @@ export function IntervalInput({
             custom
             checked={recurrent}
             onChange={({ target: { checked } }) => {
-              setRecurrent(checked);
+              onChangeRecurrent(checked);
             }}
             disabled={disabled || Boolean(editedProductSet)}
           />

package/src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx

@@ -64,6 +64,7 @@ export interface EditEventFormProps extends HasPermissionProp {
   createProductSet: (props: EditEventFormValues) => void;
   setEditProductSetId: (value: string) => void;
   isExternalPaymentLinkEnabled?: boolean;
+  timeZone: string;
 }
 
 const eventImageTypes = {
@@ -83,6 +84,7 @@ export const EditEventForm = ({
   createProductSet,
   setEditProductSetId,
   isExternalPaymentLinkEnabled,
+  timeZone,
 }: EditEventFormProps) => {
   const { t } = useTranslation(["Design", "Validation"]);
 
@@ -122,7 +124,6 @@ export const EditEventForm = ({
   const visible = watch("visible");
   const editedProductSet = watch("editedProductSet");
   const productSetId = watch("productSetId");
-  const occurrenceStartAtDate = watch("start");
 
   const {
     images,
@@ -404,7 +405,7 @@ export const EditEventForm = ({
             setEditProductSetId={setEditProductSetId}
             setShowEditProductSet={setShowEditProductSet}
             showEditProductSet={showEditProductSet}
-            occurrenceStartAtDate={occurrenceStartAtDate}
+            timeZone={timeZone}
           />
 
           {hasPermission && !showEditProductSet && (

package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx

@@ -5,9 +5,11 @@ import { useId } from "@react-aria/utils";
 import { Controller, useFormContext } from "react-hook-form";
 import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
 import { ProductSet } from "@licklist/core/dist/DataMapper/Product/ProductSetDataMapper";
+import { getTypeHeadItemsFromMenus } from "../../../../product-set/utils";
 import { ConfirmModal } from "../../../../modals/confirmation/ConfirmModal";
 import { EditEventFormValues } from "../EditEventForm/EditEventForm";
 import { EditEventProductSet } from "./component/EditEventProductSet";
+import { Typeahead } from "../../../../typeahead";
 
 interface SelectEventProductSetProps extends HasPermissionProp {
   productSets?: ProductSet[];
@@ -15,7 +17,7 @@ interface SelectEventProductSetProps extends HasPermissionProp {
   setShowEditProductSet: (value: boolean) => void;
   createProductSet: (props: EditEventFormValues) => void;
   setEditProductSetId: (value: string) => void;
-  occurrenceStartAtDate: string;
+  timeZone: string;
 }
 
 export const SelectEventProductSet = ({
@@ -24,7 +26,7 @@ export const SelectEventProductSet = ({
   setEditProductSetId,
   showEditProductSet,
   setShowEditProductSet,
-  occurrenceStartAtDate,
+  timeZone,
 }: SelectEventProductSetProps) => {
   const { t } = useTranslation(["Design"]);
   const form = useFormContext<EditEventFormValues>();
@@ -42,6 +44,21 @@ export const SelectEventProductSet = ({
   const productSetId = watch("productSetId");
   const editedProductSet = watch("editedProductSet");
 
+  const typeheadValues = getTypeHeadItemsFromMenus(
+    editedProductSet
+      ? productSets.map((productSet) => {
+          if (productSet.id === editedProductSet.id) {
+            return editedProductSet;
+          }
+
+          return productSet;
+        })
+      : productSets,
+  );
+  const selectedProductSetTypeheadValue = productSetId
+    ? typeheadValues?.find((typeheadValue) => typeheadValue.id === productSetId)
+    : undefined;
+
   const onEditProductSet = useCallback(
     () => {
       setEditProductSetId(String(productSetId));
@@ -95,6 +112,7 @@ export const SelectEventProductSet = ({
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const onSubmit = (value: EditEventFormValues["editedProductSet"]) => {
     setShowEditProductSet(false);
+    setValue("productSetId", value.id);
     setValue("editedProductSet", value);
   };
 
@@ -110,49 +128,29 @@ export const SelectEventProductSet = ({
           <Controller
             control={control}
             name="productSetId"
-            render={({ field }) => {
-              const fieldValue = String(field.value);
+            render={() => {
               return (
                 <>
                   <div className="d-flex align-items-center flex-row w-100">
                     <ConfirmModal>
                       {(confirm) => {
                         return (
-                          <Form.Control
-                            as="select"
-                            onChange={(e) =>
+                          <Typeahead
+                            name="productSetId"
+                            value={selectedProductSetTypeheadValue}
+                            containerStyles={{ width: "100%" }}
+                            onChangeValue={(typeheadValue) => {
                               onChangeProductSet(
-                                Number(e.target.value),
+                                Number(typeheadValue.id),
                                 confirm,
-                              )
-                            }
-                            isInvalid={Boolean(errors.productSetId)}
-                            value={fieldValue}
-                          >
-                            <option value="" hidden>
-                              {t("Design:chooseProductSet")}
-                            </option>
-                            {productSets?.map((productSet) => {
-                              const isCurrentEditedProductSet =
-                                editedProductSet &&
-                                editedProductSet?.id === productSet?.id;
-                              return (
-                                <option
-                                  key={productSet.id}
-                                  value={productSet.id}
-                                >
-                                  {isCurrentEditedProductSet ||
-                                  productSet.isOverride
-                                    ? `[${t("edited")}] ${
-                                        isCurrentEditedProductSet
-                                          ? editedProductSet?.name
-                                          : productSet.name
-                                      }`
-                                    : productSet.name}
-                                </option>
                               );
-                            })}
-                          </Form.Control>
+                            }}
+                            options={typeheadValues}
+                            placeholder={t("Design:choose")}
+                            noOptionsMessage={t(
+                              "Design:noAvailableProductSets",
+                            )}
+                          />
                         );
                       }}
                     </ConfirmModal>
@@ -211,10 +209,10 @@ export const SelectEventProductSet = ({
       {showEditProductSet && productSetId && (
         <EditEventProductSet
           onSubmit={onSubmit}
-          occurrenceStartAtDate={occurrenceStartAtDate}
           defaultValues={
             productSetId === editedProductSet?.id && editedProductSet
           }
+          timeZone={timeZone}
         />
       )}
     </>

package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx

@@ -22,13 +22,13 @@ export interface EventDates {
 interface EditEventProductSetProps {
   onSubmit: (value: EditEventFormValues["editedProductSet"]) => void;
   defaultValues?: EditEventFormValues["editedProductSet"];
-  occurrenceStartAtDate: string;
+  timeZone: string;
 }
 
 export const EditEventProductSet = ({
   onSubmit,
   defaultValues,
-  occurrenceStartAtDate,
+  timeZone,
 }: EditEventProductSetProps) => {
   const { companyId } = useParams<{
     companyId: string;
@@ -127,8 +127,8 @@ export const EditEventProductSet = ({
             fee={feeInPercent}
             isEventEditProductSet
             isOverrides
-            occurrenceStartAtDate={occurrenceStartAtDate}
             workHours={undefined}
+            timeZone={timeZone}
           />
           <Button
             disabled={isLoading}

package/src/events/edit-event-modal/utils/getDefaultProductSet.ts

@@ -37,7 +37,6 @@ export const getDefaultValues = (
               ...product,
               subProducts: subProducts?.map(({ ...subProducts }) => ({
                 ...subProducts,
-                originalProductId: null,
                 productCategoryId: undefined,
               })),
               productCategoryId: undefined,

package/src/header/elements/Elements.stories.tsx

@@ -22,7 +22,7 @@ CompanySelector.args = {
 };
 
 export const CompanySelectorWithOneItem: Story<CompanySelectorProps> = (
-  args,
+  args
 ) => {
   return <CompanySelectorComponent {...args} />;
 };

package/src/help/popover/Popover.stories.tsx

@@ -17,7 +17,7 @@ export const HelpPopoverPrimaryVariant: Story<HelpPopoverProps> = (args) => (
   <HelpPopover {...args} />
 );
 export const HelpPopoverOutlinedInfoVariant: Story<HelpPopoverProps> = (
-  args,
+  args
 ) => <HelpPopover {...args} />;
 
 DefaultHelpPopover.args = {