@licklist/design 0.72.1 → 0.72.3

package/dist/events/edit-event-modal/IntervalInput.d.ts

@@ -5,12 +5,14 @@ interface IntervalInputProps {
     productSets?: ProductSet[];
     productSetId?: number;
     disabled?: boolean;
+    disabledRecurrent?: boolean;
+    isCopyCreate?: boolean;
 }
 export interface IntervalInputValues {
     start: string;
     end: string;
     rrule: string | null;
 }
-export declare function IntervalInput({ disabled, editedProductSet, productSetId, productSets, }: IntervalInputProps): import("react/jsx-runtime").JSX.Element;
+export declare function IntervalInput({ disabled, editedProductSet, productSetId, productSets, disabledRecurrent, isCopyCreate }: IntervalInputProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=IntervalInput.d.ts.map

package/dist/events/edit-event-modal/IntervalInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IntervalInput.d.ts","sourceRoot":"","sources":["../../../src/events/edit-event-modal/IntervalInput.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAA;AAIxF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAG7D,UAAU,kBAAkB;IAC1B,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;IACvC,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CACrB;AAED,wBAAgB,aAAa,CAAC,EAC5B,QAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,WAAW,GACZ,EAAE,kBAAkB,2CA4JpB"}
+{"version":3,"file":"IntervalInput.d.ts","sourceRoot":"","sources":["../../../src/events/edit-event-modal/IntervalInput.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAA;AAIxF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAG7D,UAAU,kBAAkB;IAC1B,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;IACvC,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CACrB;AAED,wBAAgB,aAAa,CAAC,EAC5B,QAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,iBAAyB,EACzB,YAAoB,EACrB,EAAE,kBAAkB,2CAkKpB"}

package/dist/events/edit-event-modal/IntervalInput.js

@@ -110,7 +110,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 function IntervalInput(param) {
-    var _param_disabled = param.disabled, disabled = _param_disabled === void 0 ? false : _param_disabled, editedProductSet = param.editedProductSet, productSetId = param.productSetId, productSets = param.productSets;
+    var _param_disabled = param.disabled, disabled = _param_disabled === void 0 ? false : _param_disabled, editedProductSet = param.editedProductSet, productSetId = param.productSetId, productSets = param.productSets, _param_disabledRecurrent = param.disabledRecurrent, disabledRecurrent = _param_disabledRecurrent === void 0 ? false : _param_disabledRecurrent, _param_isCopyCreate = param.isCopyCreate, isCopyCreate = _param_isCopyCreate === void 0 ? false : _param_isCopyCreate;
     var _errors_start, _errors_end;
     var t = useTranslation([
         'Design',
@@ -138,7 +138,6 @@ function IntervalInput(param) {
     var endDateInput = useRef(null);
     var updateEndDate = function(param) {
         var _param_target = param.target, nextStartDate = _param_target.value;
-        setRecurrent(false);
         setValue('start', nextStartDate);
         if (DateTime.fromISO(end).diff(DateTime.fromISO(nextStartDate)).toMillis() < 0) {
             setValue('end', nextStartDate);
@@ -153,6 +152,14 @@ function IntervalInput(param) {
     }, [
         editedProductSet
     ]);
+    useEffect(function() {
+        if (!isCopyCreate) return;
+        setRecurrent(false);
+        setValue('rrule', null);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [
+        isCopyCreate
+    ]);
     useEffect(function() {
         if (!productSets) return;
         var isOverridenProductSet = productSets.find(function(productSet) {
@@ -257,7 +264,7 @@ function IntervalInput(param) {
                             var checked = param.target.checked;
                             onChangeRecurrent(checked);
                         },
-                        disabled: disabled || Boolean(editedProductSet)
+                        disabled: disabled || Boolean(editedProductSet) || disabledRecurrent
                     }),
                     !recurrent && /*#__PURE__*/ jsx(Form.Text, {
                         muted: true,
@@ -283,7 +290,7 @@ function IntervalInput(param) {
                             minDate: DateTime.fromISO(start).plus({
                                 day: 1
                             }).toFormat('yyyy-MM-dd'),
-                            disabled: disabled
+                            disabled: disabled || disabledRecurrent
                         });
                     }
                 })

package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.d.ts

@@ -36,6 +36,8 @@ export interface EditEventFormProps extends HasPermissionProp {
     timeZone: string;
     eventProductSet?: ProductSet;
     overrideNameError?: string;
+    disabledRecurrent?: boolean;
+    isCopyCreate?: boolean;
 }
-export declare const EditEventForm: ({ disabled, categories, title, hasPermission, defaultEventValues, serverErrors, onSaveEvent, productSets, createProductSet, setEditProductSetId, isExternalPaymentLinkEnabled, timeZone, eventProductSet, overrideNameError, }: EditEventFormProps) => import("react/jsx-runtime").JSX.Element;
+export declare const EditEventForm: ({ disabled, categories, title, hasPermission, defaultEventValues, serverErrors, onSaveEvent, productSets, createProductSet, setEditProductSetId, isExternalPaymentLinkEnabled, timeZone, eventProductSet, overrideNameError, disabledRecurrent, isCopyCreate, }: EditEventFormProps) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=EditEventForm.d.ts.map

package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EditEventForm.d.ts","sourceRoot":"","sources":["../../../../../src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,EACN,MAAM,sDAAsD,CAAA;AAM7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAA;AAGtF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAA;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAA;AACxF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAS5D,OAAO,EAAiB,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAGxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAA;AAGlF,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAC9D,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;IACjC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAA;IAClC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;CACxC;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,aAAa,EAAE,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,kBAAkB,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACjD,YAAY,CAAC,EAAE,WAAW,CAAA;IAC1B,WAAW,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAA;IAClD,WAAW,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IACjC,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,gBAAgB,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACtD,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,4BAA4B,CAAC,EAAE,OAAO,CAAA;IACtC,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,UAAU,CAAA;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAOD,eAAO,MAAM,aAAa,mOAevB,kBAAkB,4CAwVpB,CAAA"}
+{"version":3,"file":"EditEventForm.d.ts","sourceRoot":"","sources":["../../../../../src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,EACN,MAAM,sDAAsD,CAAA;AAO7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAA;AAGtF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAA;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAA;AACxF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAS5D,OAAO,EAAiB,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAGxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAA;AAGlF,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAC9D,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;IACjC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAA;IAClC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;CACxC;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,aAAa,EAAE,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,kBAAkB,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACjD,YAAY,CAAC,EAAE,WAAW,CAAA;IAC1B,WAAW,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAA;IAClD,WAAW,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IACjC,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,gBAAgB,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACtD,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,4BAA4B,CAAC,EAAE,OAAO,CAAA;IACtC,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,UAAU,CAAA;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAOD,eAAO,MAAM,aAAa,oQAiBvB,kBAAkB,4CAyWpB,CAAA"}

package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.js

@@ -3,6 +3,7 @@ import { useState, useCallback, useEffect } from 'react';
 import { IMAGE_TYPE_MAP, IMAGE_TYPE_IMAGE, IMAGE_TYPE_COVER } from '@licklist/core/dist/DataMapper/Media/ImageDataMapper';
 import { useId } from '@react-aria/utils';
 import { Modal, Form, Accordion, Button } from 'react-bootstrap';
+import { isEqual } from 'lodash';
 import { useForm, FormProvider, Controller } from 'react-hook-form';
 import { DateTime } from 'luxon';
 import { useTranslation } from 'react-i18next';
@@ -139,8 +140,8 @@ var eventImageTypes = {
     uploadCover: IMAGE_TYPE_MAP[IMAGE_TYPE_COVER]
 };
 var EditEventForm = function(param) {
-    var _param_disabled = param.disabled, disabled = _param_disabled === void 0 ? false : _param_disabled, categories = param.categories, title = param.title, _param_hasPermission = param.hasPermission, hasPermission = _param_hasPermission === void 0 ? true : _param_hasPermission, defaultEventValues = param.defaultEventValues, serverErrors = param.serverErrors, onSaveEvent = param.onSaveEvent, productSets = param.productSets, createProductSet = param.createProductSet, setEditProductSetId = param.setEditProductSetId, isExternalPaymentLinkEnabled = param.isExternalPaymentLinkEnabled, timeZone = param.timeZone, eventProductSet = param.eventProductSet, overrideNameError = param.overrideNameError;
-    var _errors_name, _errors_externalPaymentLink, _errors_integrationUrl;
+    var _param_disabled = param.disabled, disabled = _param_disabled === void 0 ? false : _param_disabled, categories = param.categories, title = param.title, _param_hasPermission = param.hasPermission, hasPermission = _param_hasPermission === void 0 ? true : _param_hasPermission, defaultEventValues = param.defaultEventValues, serverErrors = param.serverErrors, onSaveEvent = param.onSaveEvent, productSets = param.productSets, createProductSet = param.createProductSet, setEditProductSetId = param.setEditProductSetId, isExternalPaymentLinkEnabled = param.isExternalPaymentLinkEnabled, timeZone = param.timeZone, eventProductSet = param.eventProductSet, overrideNameError = param.overrideNameError, _param_disabledRecurrent = param.disabledRecurrent, disabledRecurrent = _param_disabledRecurrent === void 0 ? false : _param_disabledRecurrent, _param_isCopyCreate = param.isCopyCreate, isCopyCreate = _param_isCopyCreate === void 0 ? false : _param_isCopyCreate;
+    var _defaultEventValues_rrule, _defaultEventValues_rrule1, _errors_name, _errors_externalPaymentLink, _errors_integrationUrl;
     var t = useTranslation([
         'Design',
         'Validation'
@@ -160,7 +161,9 @@ var EditEventForm = function(param) {
     var visible = watch('visible');
     var editedProductSet = watch('editedProductSet');
     var productSetId = watch('productSetId');
+    var rrule = watch('rrule');
     var _useMultipleImages = useMultipleImages(initialImages), images = _useMultipleImages.images, handleImageRemove = _useMultipleImages.handleImageRemove, handleImageUploading = _useMultipleImages.handleImageUploading, isImagesLoading = _useMultipleImages.isImagesLoading, isCoverImagesLoading = _useMultipleImages.isCoverImagesLoading;
+    var watchedValues = watch();
     var onErrorSubmit = function(submitErrors) {
         scrollToError(getFirstErrorKey(submitErrors));
     };
@@ -209,6 +212,15 @@ var EditEventForm = function(param) {
         };
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
+    var defaultExDate = (defaultEventValues === null || defaultEventValues === void 0 ? void 0 : (_defaultEventValues_rrule = defaultEventValues.rrule) === null || _defaultEventValues_rrule === void 0 ? void 0 : _defaultEventValues_rrule.includes('EXDATE')) ? defaultEventValues === null || defaultEventValues === void 0 ? void 0 : (_defaultEventValues_rrule1 = defaultEventValues.rrule) === null || _defaultEventValues_rrule1 === void 0 ? void 0 : _defaultEventValues_rrule1.split(';EXDATE=')[1] : '';
+    useEffect(function() {
+        if (!defaultExDate || (rrule === null || rrule === void 0 ? void 0 : rrule.includes('EXDATE'))) return;
+        rrule && setValue('rrule', rrule === null || rrule === void 0 ? void 0 : rrule.concat(";EXDATE=".concat(defaultExDate)));
+    }, [
+        defaultExDate,
+        rrule
+    ]);
+    var isChanged = !isEqual(watchedValues, sanitizeDefaultValues(defaultEventValues));
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
             /*#__PURE__*/ jsx(Dialog, {
@@ -305,7 +317,9 @@ var EditEventForm = function(param) {
                             disabled: disabled,
                             productSetId: productSetId,
                             productSets: productSets,
-                            editedProductSet: editedProductSet
+                            disabledRecurrent: disabledRecurrent,
+                            editedProductSet: editedProductSet,
+                            isCopyCreate: isCopyCreate
                         }, watch('name')),
                         categories.length !== 0 && /*#__PURE__*/ jsx(Form.Group, {
                             children: /*#__PURE__*/ jsx(Accordion, {
@@ -471,7 +485,7 @@ var EditEventForm = function(param) {
                             overrideNameError: overrideNameError
                         }),
                         hasPermission && !showEditProductSet && /*#__PURE__*/ jsx(Button, {
-                            disabled: disabled || formState.isSubmitting || isImagesLoading || isCoverImagesLoading,
+                            disabled: disabled || formState.isSubmitting || !isChanged || isImagesLoading || isCoverImagesLoading,
                             className: "save-event",
                             type: "submit",
                             children: formState.isSubmitting ? "".concat(t('saveAndAdd'), "...") : t('saveAndAdd')
@@ -496,7 +510,7 @@ var sanitizeDefaultValues = function(values) {
             suppressSeconds: true
         });
     };
-    var _values_name, _values_description, _values_startAt, _values_endAt, _values_rrule, _values_categories, _values_termsAndConditions, _values_visible, _values_externalPaymentLink, _values_integrationUrl, _values_recurrenceEndAt;
+    var _values_name, _values_description, _values_startAt, _values_endAt, _values_rrule, _values_categories, _values_termsAndConditions, _values_visible, _values_externalPaymentLink, _values_images, _values_integrationUrl, _values_recurrenceEndAt;
     return {
         name: (_values_name = values === null || values === void 0 ? void 0 : values.name) !== null && _values_name !== void 0 ? _values_name : '',
         description: (_values_description = values === null || values === void 0 ? void 0 : values.description) !== null && _values_description !== void 0 ? _values_description : '',
@@ -508,7 +522,7 @@ var sanitizeDefaultValues = function(values) {
         visible: (_values_visible = values === null || values === void 0 ? void 0 : values.visible) !== null && _values_visible !== void 0 ? _values_visible : '',
         externalPaymentLink: (_values_externalPaymentLink = values === null || values === void 0 ? void 0 : values.externalPaymentLink) !== null && _values_externalPaymentLink !== void 0 ? _values_externalPaymentLink : '',
         productSetId: values === null || values === void 0 ? void 0 : values.productSetId,
-        images: values === null || values === void 0 ? void 0 : values.images,
+        images: (_values_images = values === null || values === void 0 ? void 0 : values.images) !== null && _values_images !== void 0 ? _values_images : [],
         saleDeadline: values === null || values === void 0 ? void 0 : values.saleDeadline,
         integrationUrl: (_values_integrationUrl = values === null || values === void 0 ? void 0 : values.integrationUrl) !== null && _values_integrationUrl !== void 0 ? _values_integrationUrl : '',
         recurrenceEndAt: (_values_recurrenceEndAt = values === null || values === void 0 ? void 0 : values.recurrenceEndAt) !== null && _values_recurrenceEndAt !== void 0 ? _values_recurrenceEndAt : undefined

package/dist/events/edit-recurrent-event-modal/EditRecurrentEventModal.d.ts

@@ -8,6 +8,9 @@ export declare const RECURRENT_MODE_TYPES_LIST: {
     thisAndFollowingEvents: number;
     allEvents: number;
 };
+export declare const RECURRENT_MODE_TYPES_WITHOUT_ALL: {
+    thisEvent: number;
+};
 export type RecurrentEventMode = (typeof MODES)[number];
 export type EditRecurrentEventModalValues = {
     mode: RecurrentEventMode;
@@ -18,7 +21,8 @@ export type EditRecurrentEventModalProps = {
     onHide: () => void;
     title: string;
     onSubmit: (values: EditRecurrentEventModalValues) => void;
+    isDateWasChanged?: boolean;
 };
-export declare const EditRecurrentEventModal: ({ disabled, isOpen, onHide, title, onSubmit, }: EditRecurrentEventModalProps) => import("react/jsx-runtime").JSX.Element;
+export declare const EditRecurrentEventModal: ({ disabled, isOpen, onHide, title, onSubmit, isDateWasChanged }: EditRecurrentEventModalProps) => import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=EditRecurrentEventModal.d.ts.map

package/dist/events/edit-recurrent-event-modal/EditRecurrentEventModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EditRecurrentEventModal.d.ts","sourceRoot":"","sources":["../../../src/events/edit-recurrent-event-modal/EditRecurrentEventModal.tsx"],"names":[],"mappings":"AAKA,eAAO,MAAM,eAAe,cAAc,CAAA;AAC1C,eAAO,MAAM,8BAA8B,2BAA2B,CAAA;AACtE,eAAO,MAAM,eAAe,cAAc,CAAA;AAE1C,QAAA,MAAM,KAAK,+DAID,CAAA;AAEV,eAAO,MAAM,2BAA2B,cAAkB,CAAA;AAE1D,eAAO,MAAM,yBAAyB;;;;CAIrC,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;AAEvD,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,kBAAkB,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,CAAC,MAAM,EAAE,6BAA6B,KAAK,IAAI,CAAA;CAC1D,CAAA;AAED,eAAO,MAAM,uBAAuB,mDAMjC,4BAA4B,4CAgF9B,CAAA"}
+{"version":3,"file":"EditRecurrentEventModal.d.ts","sourceRoot":"","sources":["../../../src/events/edit-recurrent-event-modal/EditRecurrentEventModal.tsx"],"names":[],"mappings":"AAKA,eAAO,MAAM,eAAe,cAAc,CAAA;AAC1C,eAAO,MAAM,8BAA8B,2BAA2B,CAAA;AACtE,eAAO,MAAM,eAAe,cAAc,CAAA;AAE1C,QAAA,MAAM,KAAK,+DAID,CAAA;AAEV,eAAO,MAAM,2BAA2B,cAAkB,CAAA;AAE1D,eAAO,MAAM,yBAAyB;;;;CAIrC,CAAA;AAED,eAAO,MAAM,gCAAgC;;CAE5C,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;AAEvD,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,kBAAkB,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,CAAC,MAAM,EAAE,6BAA6B,KAAK,IAAI,CAAA;IACzD,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,uBAAuB,oEAOjC,4BAA4B,4CAkF9B,CAAA"}

package/dist/events/edit-recurrent-event-modal/EditRecurrentEventModal.js

@@ -23,14 +23,16 @@ var MODE_ALL_EVENTS = 'allEvents';
 var DEFAULT_RECURRENT_MODE_TYPE = MODE_THIS_EVENT;
 var _obj;
 var RECURRENT_MODE_TYPES_LIST = (_obj = {}, _define_property(_obj, MODE_THIS_EVENT, 1), _define_property(_obj, MODE_THIS_AND_FOLLOWING_EVENTS, 2), _define_property(_obj, MODE_ALL_EVENTS, 3), _obj);
+var RECURRENT_MODE_TYPES_WITHOUT_ALL = _define_property({}, MODE_THIS_EVENT, 1);
 var EditRecurrentEventModal = function(param) {
-    var disabled = param.disabled, isOpen = param.isOpen, onHide = param.onHide, title = param.title, onSubmit = param.onSubmit;
+    var disabled = param.disabled, isOpen = param.isOpen, onHide = param.onHide, title = param.title, onSubmit = param.onSubmit, _param_isDateWasChanged = param.isDateWasChanged, isDateWasChanged = _param_isDateWasChanged === void 0 ? false : _param_isDateWasChanged;
     var t = useTranslation('Design').t;
     var _useForm = useForm({
         defaultValues: {
             mode: DEFAULT_RECURRENT_MODE_TYPE
         }
     }), control = _useForm.control, handleSubmit = _useForm.handleSubmit;
+    var recurrentListMode = isDateWasChanged ? RECURRENT_MODE_TYPES_WITHOUT_ALL : RECURRENT_MODE_TYPES_LIST;
     return /*#__PURE__*/ jsx(Modal, {
         show: isOpen,
         onHide: onHide,
@@ -67,7 +69,7 @@ var EditRecurrentEventModal = function(param) {
                             render: function(param) {
                                 var _param_field = param.field, value = _param_field.value, onChange = _param_field.onChange;
                                 return /*#__PURE__*/ jsx(Fragment, {
-                                    children: Object.keys(RECURRENT_MODE_TYPES_LIST).map(function(option) {
+                                    children: Object.keys(recurrentListMode).map(function(option) {
                                         return /*#__PURE__*/ jsxs(Form.Check, {
                                             type: "radio",
                                             id: option,
@@ -120,4 +122,4 @@ var EditRecurrentEventModal = function(param) {
     });
 };
 
-export { DEFAULT_RECURRENT_MODE_TYPE, EditRecurrentEventModal, MODE_ALL_EVENTS, MODE_THIS_AND_FOLLOWING_EVENTS, MODE_THIS_EVENT, RECURRENT_MODE_TYPES_LIST };
+export { DEFAULT_RECURRENT_MODE_TYPE, EditRecurrentEventModal, MODE_ALL_EVENTS, MODE_THIS_AND_FOLLOWING_EVENTS, MODE_THIS_EVENT, RECURRENT_MODE_TYPES_LIST, RECURRENT_MODE_TYPES_WITHOUT_ALL };

package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProductSummary.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAA;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AAKrG,UAAU,aAAc,SAAQ,SAAS;IACvC,qBAAqB,CAAC,EAAG,sBAAsB,EAAE,GAAG,IAAI,CAAC;CAC1D;AAED,KAAK,mBAAmB,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,EAAE,aAAa,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,cAAc,kDAIxB,mBAAmB,4CAyCrB,CAAA"}
+{"version":3,"file":"ProductSummary.d.ts","sourceRoot":"","sources":["../../../../../../src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,wDAAwD,CAAA;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8DAA8D,CAAA;AAIrG,UAAU,aAAc,SAAQ,SAAS;IACvC,qBAAqB,CAAC,EAAG,sBAAsB,EAAE,GAAG,IAAI,CAAC;CAC1D;AAED,KAAK,mBAAmB,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,YAAY,EAAE,aAAa,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,cAAc,kDAIxB,mBAAmB,4CAyCrB,CAAA"}

package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.js

@@ -9,7 +9,7 @@ var ProductSummary = function(param) {
     var t = useTranslation('Design').t;
     var formatNumber = useIntl().formatNumber;
     var priceForOneProduct = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.price;
-    var modifiersSets = (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.orderModifiersSets) || (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.orderProductModifiers);
+    var modifiersSets = (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.orderModifiersSets) || (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.orderProductModifiers) || [];
     var fullPrice = formatNumber(priceForOneProduct * (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.quantity), {
         style: 'currency',
         currency: Config.Currency.GBP
@@ -38,7 +38,7 @@ var ProductSummary = function(param) {
                     })
                 ]
             }),
-            !!modifiersSets.length && /*#__PURE__*/ jsx(Fragment, {
+            !!(modifiersSets === null || modifiersSets === void 0 ? void 0 : modifiersSets.length) && /*#__PURE__*/ jsx(Fragment, {
                 children: modifiersSets.map(function(modifier, index) {
                     return /*#__PURE__*/ jsx(ProductWithModifier, {
                         modifier: modifier,

package/dist/index.js

@@ -23,7 +23,7 @@ export { ErrorFallback } from './error/ErrorFallback.js';
 export { ProductSetShortForm } from './events/edit-event-modal/component/ProductSetShortForm/ProductSetShortForm.js';
 export { SelectEventProductSet } from './events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.js';
 export { EditEventForm } from './events/edit-event-modal/component/EditEventForm/EditEventForm.js';
-export { DEFAULT_RECURRENT_MODE_TYPE, EditRecurrentEventModal, MODE_ALL_EVENTS, MODE_THIS_AND_FOLLOWING_EVENTS, MODE_THIS_EVENT, RECURRENT_MODE_TYPES_LIST } from './events/edit-recurrent-event-modal/EditRecurrentEventModal.js';
+export { DEFAULT_RECURRENT_MODE_TYPE, EditRecurrentEventModal, MODE_ALL_EVENTS, MODE_THIS_AND_FOLLOWING_EVENTS, MODE_THIS_EVENT, RECURRENT_MODE_TYPES_LIST, RECURRENT_MODE_TYPES_WITHOUT_ALL } from './events/edit-recurrent-event-modal/EditRecurrentEventModal.js';
 export { EventCard } from './events/event-card/EventCard.js';
 export { EventCardSkeleton } from './events/event-card/EventCardSkeleton.js';
 export { EventStatisticModal } from './events/event-statistic-modal/EventStatisticModal.js';

package/dist/recurrence-input/RecurrenceInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecurrenceInput.d.ts","sourceRoot":"","sources":["../../src/recurrence-input/RecurrenceInput.tsx"],"names":[],"mappings":"AAIA,OAAc,EAAE,SAAS,EAAW,MAAM,OAAO,CAAA;AAWjD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,gBAAgB,CAAC,EAAE,SAAS,CAAA;CAC7B;AAED,wBAAgB,eAAe,CAAC,EAC9B,QAAgB,EAChB,IAAI,EACJ,OAAO,EACP,KAAK,EACL,QAAQ,EACR,gBAAmC,GACpC,EAAE,oBAAoB,2CAqEtB"}
+{"version":3,"file":"RecurrenceInput.d.ts","sourceRoot":"","sources":["../../src/recurrence-input/RecurrenceInput.tsx"],"names":[],"mappings":"AAIA,OAAc,EAAE,SAAS,EAAW,MAAM,OAAO,CAAA;AAWjD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,gBAAgB,CAAC,EAAE,SAAS,CAAA;CAC7B;AAED,wBAAgB,eAAe,CAAC,EAC9B,QAAgB,EAChB,IAAI,EACJ,OAAO,EACP,KAAK,EACL,QAAQ,EACR,gBAAmC,GACpC,EAAE,oBAAoB,2CAyEtB"}

package/dist/recurrence-input/RecurrenceInput.js

@@ -117,9 +117,13 @@ function RecurrenceInput(param) {
     })), 2), state = _useReducer[0], updateState = _useReducer[1];
     useEffect(// TODO: unhardcode timezone
     function() {
-        return onChange(RRule.optionsToString(_object_spread_props(_object_spread({}, state), {
+        return onChange(RRule.optionsToString(_object_spread({
+            freq: state.freq,
+            count: state.count,
+            interval: state.interval,
+            byweekday: state.byweekday,
             tzid: 'Europe/London'
-        })).replace('RRULE:', ''));
+        }, state)).replace('RRULE:', ''));
     }, [
         state
     ]);
@@ -131,8 +135,8 @@ function RecurrenceInput(param) {
                 onChange: function(param) {
                     var interval = param.interval, frequency = param.frequency;
                     updateState({
-                        interval: interval,
                         freq: frequency,
+                        interval: interval,
                         byweekday: frequency === state.freq ? state.byweekday : frequency === RRule.WEEKLY ? [
                             getWeekdayForFrequency({
                                 date: date,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.72.1",
+  "version": "0.72.3",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -42,7 +42,7 @@
     ]
   },
   "peerDependencies": {
-    "@licklist/core": "0.32.10",
+    "@licklist/core": "0.32.11",
     "@licklist/eslint-config": "0.5.6",
     "@licklist/plugins": "0.35.9",
     "lodash": "4.17.21",
@@ -61,7 +61,7 @@
     "@dnd-kit/utilities": "2.0.0",
     "@fortawesome/fontawesome-svg-core": "1.2.34",
     "@fortawesome/free-solid-svg-icons": "5.15.2",
-    "@licklist/core": "0.32.10",
+    "@licklist/core": "0.32.11",
     "@licklist/eslint-config": "0.5.6",
     "@licklist/plugins": "0.35.9",
     "@mantine/core": "6.0.22",

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

@@ -17,6 +17,8 @@ interface IntervalInputProps {
   productSets?: ProductSet[]
   productSetId?: number
   disabled?: boolean
+  disabledRecurrent?: boolean
+  isCopyCreate?: boolean
 }
 
 export interface IntervalInputValues {
@@ -30,6 +32,8 @@ export function IntervalInput({
   editedProductSet,
   productSetId,
   productSets,
+  disabledRecurrent = false,
+  isCopyCreate = false
 }: IntervalInputProps) {
   const { t } = useTranslation(['Design', 'Validation'])
   const {
@@ -54,7 +58,6 @@ export function IntervalInput({
   const endDateInput = useRef<HTMLInputDateElement | null>(null)
 
   const updateEndDate = ({ target: { value: nextStartDate } }) => {
-    setRecurrent(false)
     setValue('start', nextStartDate)
 
     if (
@@ -72,6 +75,13 @@ export function IntervalInput({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editedProductSet])
 
+  useEffect(() => {
+    if (!isCopyCreate) return
+    setRecurrent(false)
+    setValue('rrule', null)
+     // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isCopyCreate])
+
   useEffect(() => {
     if (!productSets) return
 
@@ -153,7 +163,7 @@ export function IntervalInput({
             onChange={({ target: { checked } }) => {
               onChangeRecurrent(checked)
             }}
-            disabled={disabled || Boolean(editedProductSet)}
+            disabled={disabled || Boolean(editedProductSet) || disabledRecurrent}
           />
           {!recurrent && (
             <Form.Text muted>
@@ -178,7 +188,7 @@ export function IntervalInput({
                 minDate={DateTime.fromISO(start)
                   .plus({ day: 1 })
                   .toFormat('yyyy-MM-dd')}
-                disabled={disabled}
+                disabled={disabled || disabledRecurrent}
               />
             )}
           />

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

@@ -8,6 +8,7 @@ import {
 } from '@licklist/core/dist/DataMapper/Media/ImageDataMapper'
 import { useId } from '@react-aria/utils'
 import { Accordion, Button, Form, Modal } from 'react-bootstrap'
+import { isEqual } from 'lodash'
 import { FormProvider, useForm, Controller } from 'react-hook-form'
 import { DateTime } from 'luxon'
 import { useTranslation } from 'react-i18next'
@@ -65,6 +66,8 @@ export interface EditEventFormProps extends HasPermissionProp {
   timeZone: string
   eventProductSet?: ProductSet
   overrideNameError?: string
+  disabledRecurrent?: boolean
+  isCopyCreate?: boolean
 }
 
 const eventImageTypes = {
@@ -87,6 +90,8 @@ export const EditEventForm = ({
   timeZone,
   eventProductSet,
   overrideNameError,
+  disabledRecurrent = false,
+  isCopyCreate = false,
 }: EditEventFormProps) => {
   const { t } = useTranslation(['Design', 'Validation'])
 
@@ -126,7 +131,7 @@ export const EditEventForm = ({
   const visible = watch('visible')
   const editedProductSet = watch('editedProductSet')
   const productSetId = watch('productSetId')
-
+  const rrule = watch('rrule')
   const {
     images,
     handleImageRemove,
@@ -135,6 +140,8 @@ export const EditEventForm = ({
     isCoverImagesLoading,
   } = useMultipleImages(initialImages)
 
+  const watchedValues = watch()
+
   const onErrorSubmit = (submitErrors) => {
     scrollToError(getFirstErrorKey(submitErrors))
   }
@@ -179,6 +186,18 @@ export const EditEventForm = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
+  const defaultExDate = defaultEventValues?.rrule?.includes('EXDATE')
+    ? defaultEventValues?.rrule?.split(';EXDATE=')[1]
+    : ''
+
+  useEffect(() => {
+    if (!defaultExDate || rrule?.includes('EXDATE')) return
+    rrule && setValue('rrule', rrule?.concat(`;EXDATE=${defaultExDate}`))
+  }, [defaultExDate, rrule])
+
+
+  const isChanged = !isEqual(watchedValues, sanitizeDefaultValues(defaultEventValues));
+
   return (
     <>
       <Dialog
@@ -273,7 +292,9 @@ export const EditEventForm = ({
             disabled={disabled}
             productSetId={productSetId}
             productSets={productSets}
+            disabledRecurrent={disabledRecurrent}
             editedProductSet={editedProductSet}
+            isCopyCreate={isCopyCreate}
           />
           {categories.length !== 0 && (
             <Form.Group>
@@ -416,6 +437,7 @@ export const EditEventForm = ({
               disabled={
                 disabled ||
                 formState.isSubmitting ||
+                !isChanged ||
                 isImagesLoading ||
                 isCoverImagesLoading
               }
@@ -462,7 +484,7 @@ const sanitizeDefaultValues = (
     visible: values?.visible ?? '',
     externalPaymentLink: values?.externalPaymentLink ?? '',
     productSetId: values?.productSetId,
-    images: values?.images,
+    images: values?.images ?? [],
     saleDeadline: values?.saleDeadline,
     integrationUrl: values?.integrationUrl ?? '',
     recurrenceEndAt: values?.recurrenceEndAt ?? undefined,

package/src/events/edit-recurrent-event-modal/EditRecurrentEventModal.tsx

@@ -21,6 +21,10 @@ export const RECURRENT_MODE_TYPES_LIST = {
   [MODE_ALL_EVENTS]: 3,
 }
 
+export const RECURRENT_MODE_TYPES_WITHOUT_ALL = {
+  [MODE_THIS_EVENT]: 1,
+}
+
 export type RecurrentEventMode = (typeof MODES)[number]
 
 export type EditRecurrentEventModalValues = {
@@ -33,6 +37,7 @@ export type EditRecurrentEventModalProps = {
   onHide: () => void
   title: string
   onSubmit: (values: EditRecurrentEventModalValues) => void
+  isDateWasChanged?: boolean
 }
 
 export const EditRecurrentEventModal = ({
@@ -41,6 +46,7 @@ export const EditRecurrentEventModal = ({
   onHide,
   title,
   onSubmit,
+  isDateWasChanged = false
 }: EditRecurrentEventModalProps) => {
   const { t } = useTranslation('Design')
 
@@ -50,6 +56,8 @@ export const EditRecurrentEventModal = ({
     },
   })
 
+  const recurrentListMode = isDateWasChanged? RECURRENT_MODE_TYPES_WITHOUT_ALL : RECURRENT_MODE_TYPES_LIST
+
   return (
     <Modal
       show={isOpen}
@@ -75,7 +83,7 @@ export const EditRecurrentEventModal = ({
             <Controller
               render={({ field: { value, onChange } }) => (
                 <>
-                  {Object.keys(RECURRENT_MODE_TYPES_LIST).map((option) => (
+                  {Object.keys(recurrentListMode).map((option) => (
                     <Form.Check
                       type='radio'
                       id={option}

package/src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx

@@ -3,7 +3,6 @@ import { useIntl } from 'react-intl'
 import * as Config from '@licklist/core/dist/Config'
 import { OrderItem } from '@licklist/plugins/dist/types/context/Iframe/orderItems'
 import { OrderModifierByProduct } from '@licklist/core/dist/DataMapper/Order/OrderModifiierByProduct'
-import { calculateTotalModifiersPrice } from '../../utils'
 import { ProductWithModifier } from '../../../CategoryProduct/components/ProductWithModifier/ProductWithModifier'
 
 
@@ -26,7 +25,7 @@ export const ProductSummary = ({
   const { formatNumber } = useIntl()
   const priceForOneProduct = orderProduct?.price
 
-  const modifiersSets =  orderProduct?.orderModifiersSets || orderProduct?.orderProductModifiers
+  const modifiersSets =  orderProduct?.orderModifiersSets || orderProduct?.orderProductModifiers || []
 
   const fullPrice = formatNumber(priceForOneProduct * orderProduct?.quantity, {
     style: 'currency',
@@ -44,7 +43,7 @@ export const ProductSummary = ({
         <p className='price'>{fullPrice}</p>
       </div>
 
-      {!!modifiersSets.length && (
+      {!!modifiersSets?.length && (
         <>
           {modifiersSets.map((modifier, index) => (
             <ProductWithModifier

package/src/recurrence-input/RecurrenceInput.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable prefer-destructuring */
 /* eslint-disable react-hooks/exhaustive-deps */
 import { DateTime } from 'luxon'
-import { useEffect, useReducer } from 'react'
+import { useEffect, useReducer, useState } from 'react'
 import RRule, { Frequency, Weekday } from 'rrule'
 import RecurrenceEndInput, { defaultOccurrences } from './RecurrenceEndInput'
 import RecurrenceIntervalAndFrequencyInput from './RecurrenceIntervalAndFrequencyInput'
@@ -39,10 +39,14 @@ export function RecurrenceInput({
     // TODO: unhardcode timezone
     () =>
       onChange(
-        RRule.optionsToString({ ...state, tzid: 'Europe/London' }).replace(
-          'RRULE:',
-          '',
-        ),
+        RRule.optionsToString({
+          freq: state.freq,
+          count: state.count,
+          interval: state.interval,
+          byweekday: state.byweekday,
+          tzid: 'Europe/London',
+          ...state,
+        }).replace('RRULE:', ''),
       ),
     [state],
   )
@@ -54,8 +58,8 @@ export function RecurrenceInput({
         frequency={state.freq}
         onChange={({ interval, frequency }) => {
           updateState({
-            interval,
             freq: frequency,
+            interval,
             byweekday:
               frequency === state.freq
                 ? state.byweekday