@antscorp/antsomi-ui 1.3.5-beta.11 → 1.3.5-beta.111

package/es/assets/svg/mobile-frame.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="416.004" height="713" viewBox="0 0 416.004 713">
+  <path id="mobile_frame" data-name="mobile frame" d="M17657,3124a32.975,32.975,0,0,1-33-33V2444a32.977,32.977,0,0,1,33-33H18004a32.97,32.97,0,0,1,33,33v122.032a3.5,3.5,0,0,1,3,3.464v110a3.5,3.5,0,0,1-3,3.469v31.07a3.5,3.5,0,0,1,3,3.464v44a3.5,3.5,0,0,1-3,3.464V3091a32.97,32.97,0,0,1-33,33Zm-22-681v618a21.022,21.022,0,0,0,21,21h349.008a21.022,21.022,0,0,0,21-21V2443a21.022,21.022,0,0,0-21-21H17656A21.022,21.022,0,0,0,17635,2443Z" transform="translate(-17623.998 -2411)" fill="black"/>
+</svg>

package/es/components/atoms/InputDynamic/EditCaretPositioning.js

@@ -59,6 +59,21 @@ if (window.getSelection && document.createRange) {
             }
         }
         let sel = window.getSelection();
+        // NOTE: add new text node after span contain shortlink content
+        if (range.endContainer) {
+            const { parentNode } = range.endContainer;
+            if (parentNode && parentNode.classList && parentNode.classList.contains('detect-url')) {
+                const textNode = document.createTextNode('\u00A0'); // Create a text node with a non-breaking space
+                if (parentNode.nextSibling) {
+                    parentNode.parentNode.insertBefore(textNode, parentNode.nextSibling);
+                }
+                else {
+                    parentNode.parentNode.appendChild(textNode);
+                }
+                range.setStart(textNode, textNode.length);
+                range.collapse(true);
+            }
+        }
         sel === null || sel === void 0 ? void 0 : sel.removeAllRanges();
         sel === null || sel === void 0 ? void 0 : sel.addRange(range);
     };

package/es/components/atoms/InputDynamic/InputDynamic.js

@@ -144,15 +144,17 @@ export const InputDynamic = (props) => {
                 if (innerHTML) {
                     // remove span url và focus vào vị trí remove để add tag shortlink vào vị trí này.
                     const index = Array.from((_a = personalizationInputRef.current) === null || _a === void 0 ? void 0 : _a.childNodes).findIndex((element) => element.id === data.id);
-                    const range = document.createRange(); // Tạo một đối tượng Range
-                    const sel = window.getSelection(); // Lấy đối tượng Selection hiện tại
-                    range.setStart((_b = personalizationInputRef.current) === null || _b === void 0 ? void 0 : _b.childNodes[index], 0); // Đặt điểm bắt đầu của Range
-                    range.collapse(true); // Thu gọn Range để tập trung vào điểm bắt đầu
-                    sel === null || sel === void 0 ? void 0 : sel.removeAllRanges(); // Xóa tất cả các Range hiện có
-                    sel === null || sel === void 0 ? void 0 : sel.addRange(range); // Thêm Range mới vào Selection
-                    caretPositionRef.current = CaretPositioning.saveSelection(personalizationInputRef.current);
-                    const newDataUpdate = innerHTML.replace(data.outerHTML, '');
-                    personalizationInputRef.current.innerHTML = newDataUpdate;
+                    if (index !== -1) {
+                        const range = document.createRange(); // Tạo một đối tượng Range
+                        const sel = window.getSelection(); // Lấy đối tượng Selection hiện tại
+                        range.setStart((_b = personalizationInputRef.current) === null || _b === void 0 ? void 0 : _b.childNodes[index], 0); // Đặt điểm bắt đầu của Range
+                        range.collapse(true); // Thu gọn Range để tập trung vào điểm bắt đầu
+                        sel === null || sel === void 0 ? void 0 : sel.removeAllRanges(); // Xóa tất cả các Range hiện có
+                        sel === null || sel === void 0 ? void 0 : sel.addRange(range); // Thêm Range mới vào Selection
+                        caretPositionRef.current = CaretPositioning.saveSelection(personalizationInputRef.current);
+                        const newDataUpdate = innerHTML.replace(data.outerHTML, '');
+                        personalizationInputRef.current.innerHTML = newDataUpdate;
+                    }
                 }
                 break;
             }

package/es/components/atoms/MobileFrame/MobileFrame.d.ts

@@ -1,4 +1,6 @@
 import React from 'react';
 export interface MobileFrameProps extends React.HtmlHTMLAttributes<HTMLDivElement> {
+    size?: 'large' | 'medium';
+    backgroundColor?: string;
 }
 export declare const MobileFrame: React.FC<React.PropsWithChildren<MobileFrameProps>>;

package/es/components/atoms/MobileFrame/MobileFrame.js

@@ -16,7 +16,7 @@ import { MobileWrapper, MobileInner, MobileBottomLine } from './styled';
 export const MobileFrame = (_a) => {
     var { children } = _a, restOfProps = __rest(_a, ["children"]);
     return (React.createElement(MobileWrapper, Object.assign({}, restOfProps),
-        React.createElement(MobileInner, null,
+        React.createElement(MobileInner, { backgroundColor: restOfProps.backgroundColor, size: restOfProps.size },
             children,
             React.createElement(MobileBottomLine, null))));
 };

package/es/components/atoms/MobileFrame/styled.d.ts

@@ -1,3 +1,4 @@
+import type { MobileFrameProps } from './MobileFrame';
 export declare const MobileWrapper: import("styled-components").StyledComponent<"div", any, {}, never>;
-export declare const MobileInner: import("styled-components").StyledComponent<"div", any, {}, never>;
+export declare const MobileInner: import("styled-components").StyledComponent<"div", any, MobileFrameProps, never>;
 export declare const MobileBottomLine: import("styled-components").StyledComponent<"div", any, {}, never>;

package/es/components/atoms/MobileFrame/styled.js

@@ -1,5 +1,5 @@
 // Libraries
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 // Assets
 import MobileFrame from '@antscorp/antsomi-ui/es/assets/images/iphone.png';
 export const MobileWrapper = styled.div `
@@ -12,12 +12,17 @@ export const MobileWrapper = styled.div `
 export const MobileInner = styled.div `
   position: relative;
   width: 100%;
-  max-width: 336px;
-  height: 695px;
-  margin: 61px 23px 20px 24px;
-  border-bottom-left-radius: 50px;
-  border-bottom-right-radius: 50px;
+  max-width: ${props => (props.size === 'medium' ? 290 : 336)}px;
+  height: ${props => (props.size === 'medium' ? 600 : 695)}px;
+  margin: ${props => (props.size === 'medium' ? '52px 23px 18px 24px' : '61px 23px 20px 24px')};
+  border-bottom-left-radius: ${props => (props.size === 'medium' ? 37 : 50)}px;
+  border-bottom-right-radius: ${props => (props.size === 'medium' ? 37 : 50)}px;
   overflow: hidden;
+
+  ${props => props.backgroundColor &&
+    css `
+      background-color: ${props.backgroundColor};
+    `}
 `;
 export const MobileBottomLine = styled.div `
   width: 145px;

package/es/components/atoms/MobileFrameV2/MobileFrameV2.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+export interface MobileFrameV2Props extends React.HtmlHTMLAttributes<HTMLDivElement> {
+}
+export declare const MobileFrameV2: React.FC<React.PropsWithChildren<MobileFrameV2Props>>;

package/es/components/atoms/MobileFrameV2/MobileFrameV2.js

@@ -0,0 +1,22 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+// Libraries
+import React from 'react';
+// Styled
+import { MobileWrapper, MobileInner, MobileCamera } from './styled';
+export const MobileFrameV2 = (_a) => {
+    var { children } = _a, restOfProps = __rest(_a, ["children"]);
+    return (React.createElement(MobileWrapper, Object.assign({}, restOfProps),
+        React.createElement(MobileInner, null,
+            React.createElement("div", { className: "mobile-inner-content" }, children),
+            React.createElement(MobileCamera, null))));
+};

package/es/components/atoms/MobileFrameV2/constants.d.ts

@@ -0,0 +1,4 @@
+export declare const MOBILE_VIEWPORT: {
+    width: number;
+    height: number;
+};

package/es/components/atoms/MobileFrameV2/constants.js

@@ -0,0 +1,4 @@
+export const MOBILE_VIEWPORT = {
+    width: 352.5,
+    height: 764.2,
+};

package/es/components/atoms/MobileFrameV2/index.d.ts

@@ -0,0 +1,2 @@
+export { MobileFrameV2 } from './MobileFrameV2';
+export type { MobileFrameV2Props } from './MobileFrameV2';

package/es/components/atoms/MobileFrameV2/index.js

@@ -0,0 +1 @@
+export { MobileFrameV2 } from './MobileFrameV2';

package/es/components/atoms/MobileFrameV2/styled.d.ts

@@ -0,0 +1,3 @@
+export declare const MobileWrapper: import("styled-components").StyledComponent<"div", any, {}, never>;
+export declare const MobileInner: import("styled-components").StyledComponent<"div", any, {}, never>;
+export declare const MobileCamera: import("styled-components").StyledComponent<"div", any, {}, never>;

package/es/components/atoms/MobileFrameV2/styled.js

@@ -0,0 +1,43 @@
+// Libraries
+import styled from 'styled-components';
+// Assets
+import MobileFrameV2 from '@antscorp/antsomi-ui/es/assets/images/ip14-pro-mobile-frame.png';
+import cameraImage from '@antscorp/antsomi-ui/es/assets/images/ip14-pro-camera.png';
+// Constants
+import { MOBILE_VIEWPORT } from './constants';
+export const MobileWrapper = styled.div `
+  position: relative;
+  display: flex;
+  justify-content: center;
+  background: url(${MobileFrameV2}) no-repeat center center;
+  background-size: contain;
+`;
+export const MobileInner = styled.div `
+  position: relative;
+  width: ${MOBILE_VIEWPORT.width}px;
+  max-width: ${MOBILE_VIEWPORT.width}px;
+  height: ${MOBILE_VIEWPORT.height}px;
+  margin: 18px 21px;
+  border-radius: 50px;
+  overflow: hidden;
+
+  .mobile-inner-content {
+    position: absolute;
+    z-index: 0;
+    width: 100%;
+    height: 100%;
+  }
+`;
+export const MobileCamera = styled.div `
+  position: absolute;
+  pointer-events: none;
+  width: 112.11px;
+  height: 32.29px;
+  margin: auto;
+  top: 10px;
+  left: 50%;
+  z-index: 1;
+  transform: translateX(-50%);
+  background: url(${cameraImage}) no-repeat center center;
+  background-size: contain;
+`;

package/es/components/atoms/SlideBar/SlideBar.js

@@ -264,7 +264,7 @@ export const SlideBar = props => {
                 fontSize: `${BTN_ADD_SIZE}px`,
                 cursor: disabledAdd ? 'not-allowed' : 'pointer',
                 color: disabledAdd ? (_c = THEME.token) === null || _c === void 0 ? void 0 : _c.colorTextDisabled : (_d = THEME.token) === null || _d === void 0 ? void 0 : _d.colorPrimary,
-            }, disabled: disabledAdd, onClick: (e) => {
+            }, onClick: (e) => {
                 e.stopPropagation();
                 if (!disabledAdd) {
                     handleAddSlide();

package/es/components/atoms/Spin/Spin.js

@@ -19,10 +19,10 @@ import { StyledSpin } from './styled';
 import { THEME } from '@antscorp/antsomi-ui/es/constants';
 export const Spin = (props) => {
     var _a;
-    const { indicatorSize } = props, restOf = __rest(props, ["indicatorSize"]);
+    const { indicatorSize, children } = props, restOf = __rest(props, ["indicatorSize", "children"]);
     return (React.createElement(StyledSpin, Object.assign({}, Object.assign({ indicator: (React.createElement(LoadingOutlined, { style: {
                 fontSize: indicatorSize || 30,
                 color: (_a = THEME.token) === null || _a === void 0 ? void 0 : _a.colorPrimary,
-            }, spin: true })) }, restOf)), props.children));
+            }, spin: true })) }, restOf)), children));
 };
 Spin.defaultProps = {};

package/es/components/atoms/index.d.ts

@@ -36,6 +36,7 @@ export * from './Flex';
 export * from './RateV2';
 export * from './PreviewTabs';
 export * from './MobileFrame';
+export * from './MobileFrameV2';
 export * from './SlideBar';
 export type { SliderProps } from './Slider';
 export type { PaginationProps } from './Pagination';

package/es/components/atoms/index.js

@@ -36,4 +36,5 @@ export * from './Flex';
 export * from './RateV2';
 export * from './PreviewTabs';
 export * from './MobileFrame';
+export * from './MobileFrameV2';
 export * from './SlideBar';

package/es/components/common/ConfigProvider/ConfigProvider.js

@@ -11,7 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 // Libraries
 import { StyleProvider } from '@ant-design/cssinjs';
-import { ConfigProvider as AntdConfigProvider } from 'antd';
+import { ConfigProvider as AntdConfigProvider, App } from 'antd';
 import dayjs from 'dayjs';
 import React, { useEffect } from 'react';
 import weekday from 'dayjs/plugin/weekday';
@@ -43,8 +43,9 @@ const ConfigProvider = props => {
         }
     }, [locale]);
     return (React.createElement(AntdConfigProvider, Object.assign({}, restOfProps),
-        React.createElement(GlobalStyle, null),
-        React.createElement(StyleProvider, { hashPriority: "high" }, children)));
+        React.createElement(App, null,
+            React.createElement(GlobalStyle, null),
+            React.createElement(StyleProvider, { hashPriority: "high" }, children))));
 };
 ConfigProvider.defaultProps = {
     theme: THEME,

package/es/components/common/ConfigProvider/GlobalStyle.js

@@ -291,25 +291,24 @@ export const GlobalStyle = () => {
             }
           }
 
-          .antsomi-picker-date-panel {
+          /* .antsomi-picker-date-panel {
             position: relative;
-          }
+          } */
 
-          .antsomi-picker-date-panel::before {
+          /* .antsomi-picker-date-panel::before {
             content: 'Hours';
             position: absolute;
             top: 0;
             right: 0;
             transform: translateX(100%);
             width: 61px;
-            /* width: 53.5px; */
             font-weight: bold;
             border-right: 1px solid rgba(5, 5, 5, 0.06);
             height: 38px;
             display: flex;
             align-items: center;
             justify-content: center;
-          }
+          } */
 
           .antsomi-picker-time-panel {
             .antsomi-picker-time-panel-column:after {
@@ -336,43 +335,94 @@ export const GlobalStyle = () => {
               display: none;
             }
 
-            .antsomi-picker-content {
+            .antsomi-picker-time-panel-column {
+              width: 60px;
+              margin-top: 38px;
+              /* margin-top: 0; */
+              scrollbar-width: unset;
+              scrollbar-color: unset;
+
+              &::-webkit-scrollbar {
+                width: 6px;
+                background: transparent;
+              }
+              &::-webkit-scrollbar-track {
+                /* margin-top: 38px; */
+                border-radius: 10px;
+              }
+            }
+
+            /* ul.antsomi-picker-time-panel-column::before {
+              content: '';
+              position: absolute;
+              background: red;
+              top: 0;
+              right: 0;
+              width: 1px;
+              bottom: 0;
+            } */
+
+            /* .antsomi-picker-time-panel-column::before {
+              content: 'Hours';
+              position: sticky;
+              display: block;
+              top: 0;
+              height: 38px;
+              line-height: 38px;
+              text-align: center;
+              font-weight: bold;
+              background-color: #fff;
+            }
+
+            .antsomi-picker-time-panel-column:nth-child(1)::before {
+              content: 'Hours';
+            }
+            .antsomi-picker-time-panel-column:nth-child(2)::before {
+              content: 'Minutes';
+            }
+            .antsomi-picker-time-panel-column:nth-child(3)::before {
+              content: 'Seconds';
+            } */
+
+            /* .antsomi-picker-content {
               position: relative;
 
               .antsomi-picker-time-panel-column {
                 margin-top: 38px;
                 width: 60px;
               }
+            } */
+
+            .antsomi-picker-content {
+              position: relative;
             }
 
-            .antsomi-picker-content::after,
+            /* .antsomi-picker-content::after,
             .antsomi-picker-content::before {
               content: 'Minutes';
               position: absolute;
               top: 0;
               left: 61px;
-              /* left: 53.5px; */
               width: 60px;
-              /* width: 52.5px; */
               height: 38px;
               display: flex;
               align-items: center;
               justify-content: center;
               font-weight: bold;
-            }
+            } */
 
-            .antsomi-picker-content::before {
+            /* .antsomi-picker-content::before {
               border-right: 1px solid rgba(5, 5, 5, 0.06);
-            }
-            .antsomi-picker-content::after {
+            } */
+            /* .antsomi-picker-content::after {
               content: 'Seconds';
               left: 120px;
-            }
+            } */
           }
 
           /* Custom css scrollbar */
           ul {
-            padding-left: 8px;
+            padding-left: 6px;
             scrollbar-gutter: stable;
           }
         }
@@ -415,6 +465,16 @@ export const GlobalStyle = () => {
               content: 'Hours';
               border: none;
               left: 0;
+
+              position: absolute;
+              top: 0;
+              /* left: 61px; */
+              width: 60px;
+              height: 38px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              font-weight: bold;
             }
           }
           &.is-minutes-picker {

package/es/components/molecules/AddDynamicContent/AddDynamicContent.js

@@ -14,6 +14,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 // Libraries
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useState } from 'react';
 import { omit, isEmpty, flatMapDeep, set, get, isNaN } from 'lodash';
+import { useQueryClient } from '@tanstack/react-query';
 // Hooks
 import { useDeepCompareEffect, useDeepCompareMemo } from '@antscorp/antsomi-ui/es/hooks';
 // Components
@@ -27,7 +28,6 @@ import { translations } from '@antscorp/antsomi-ui/es/locales/translations';
 import { useGetDynamicContentAttr, useGetListPromotionPool, useGetListEventAttr, useGetListPromotionCodeAttr, useGetListBO, useGetListAllEvents, useGetListSourceByEvent, useGetListAttributeBO, useGetCustomFunction, useAddSavedCSFunction, useUpdateCSFunction, } from '@antscorp/antsomi-ui/es/queries';
 import { useGetEventTrackingAttributes } from '@antscorp/antsomi-ui/es/queries/ThirdParty';
 // Queries config
-import { queryClientAntsomiUI } from '@antscorp/antsomi-ui/es/queries/configs';
 import { QUERY_KEYS } from '@antscorp/antsomi-ui/es/constants/queries';
 import { dateExample } from './components/FormatDatetime';
 import DisplayFormat from './components/DisplayFormat';
@@ -126,6 +126,7 @@ export const AddDynamicContent = props => {
     const [attrDFOptions, setAttrDFOptions] = useState([]);
     // Template Custom
     const [templateId, settemplateId] = useState();
+    const queryClient = useQueryClient();
     const { data: listBoAttributes = [], isFetching: isFetchingListBoAttr, isError: isErrorBoAttr, } = useGetListAttributeBO({
         url,
         itemTypeIds: itemTypeId ? [itemTypeId] : [],
@@ -911,7 +912,7 @@ export const AddDynamicContent = props => {
                             break;
                         setItemTypeId(Number(selectedItemTypeId));
                         const key = [QUERY_KEYS.GET_EVENT_ATTRIBUTE_BO, [selectedItemTypeId]];
-                        const listAttBOByItemTypeId = serilizeBOAttr(queryClientAntsomiUI.getQueryData(key));
+                        const listAttBOByItemTypeId = serilizeBOAttr(queryClient.getQueryData(key));
                         if (listAttBOByItemTypeId.length) {
                             form.setFieldsValue({
                                 [DYNAMIC_CONTENT_SETTING_KEY.ATTRIBUTE]: listAttBOByItemTypeId[0],

package/es/components/molecules/CalendarSelection/CalendarSelection.js

@@ -3,14 +3,14 @@ import React, { useLayoutEffect, useReducer, useRef } from 'react';
 import { Divider } from 'antd';
 import { ActionContext, StateContext } from './context';
 import { reducer, INITIAL_STATE } from './reducer';
-import { StyledPopover, StyledPopoverBody } from './styled';
+import { StyledPopover, StyledPopoverBody, StyledPopoverContainer } from './styled';
 import { CustomPicker, Footer, RangeSelectOptions, TimeRangeDisplay } from './components';
 import { LOCAL_TIMEZONE, RANGE_LIMIT } from './constants';
-import { initState } from './actions';
+import { initState, resetValue } from './actions';
 import { useTriggerOut } from './hooks/useTriggerOut';
 export const CalendarSelection = props => {
     const initialed = useRef(false);
-    const { value, popoverProps, rangeLimit = RANGE_LIMIT, timezone = LOCAL_TIMEZONE, timeDisplayProps, onChange, } = props;
+    const { value, rangeLimit = RANGE_LIMIT, timezone = LOCAL_TIMEZONE, timeDisplayProps, popoverProps, rangePickerProps, onChange, } = props;
     const [state, dispatch] = useReducer(reducer, INITIAL_STATE);
     useLayoutEffect(() => {
         if (!value)
@@ -18,19 +18,19 @@ export const CalendarSelection = props => {
         dispatch(initState(value, !initialed.current));
         initialed.current = true;
     }, [value]);
-    // useLayoutEffect(() => {
-    //   if (!state.open) {
-    //     return () => {
-    //       dispatch(resetValue());
-    //     };
-    //   }
-    // }, [state.open]);
+    useLayoutEffect(() => {
+        if (!state.open) {
+            return () => {
+                dispatch(resetValue());
+            };
+        }
+    }, [state.open]);
     useTriggerOut({ state, dispatch, onChange });
-    const popoverContent = (React.createElement(React.Fragment, null,
+    const popoverContent = (React.createElement(StyledPopoverContainer, null,
         React.createElement(StyledPopoverBody, null,
             React.createElement(RangeSelectOptions, null),
             React.createElement(Divider, { type: "vertical", style: { margin: 0, height: 'auto' } }),
-            React.createElement(CustomPicker, null)),
+            React.createElement(CustomPicker, Object.assign({}, rangePickerProps))),
         React.createElement(Divider, { style: { margin: 0 } }),
         React.createElement(Footer, null)));
     // console.log(state.value.current.rangeValue);
@@ -41,5 +41,5 @@ export const CalendarSelection = props => {
                     if (!isOpen)
                         dispatch({ type: 'toggle_popover' });
                 } }),
-                React.createElement(TimeRangeDisplay, { showType: timeDisplayProps === null || timeDisplayProps === void 0 ? void 0 : timeDisplayProps.showType })))));
+                React.createElement(TimeRangeDisplay, Object.assign({}, timeDisplayProps))))));
 };

package/es/components/molecules/CalendarSelection/components/CustomPicker/CustomPicker.js

@@ -1,3 +1,14 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 /* eslint-disable react/no-array-index-key */
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { TinyColor } from '@ctrl/tinycolor';
@@ -19,7 +30,8 @@ const generateRangeInputLabel = (idx, label) => {
         return 'custom';
     return `custom compare${idx > 1 ? ` ${idx}}` : ''}`;
 };
-export const CustomPicker = () => {
+export const CustomPicker = props => {
+    const rest = __rest(props, []);
     const popupContainer = useRef(null);
     const { state, action } = useCalendarSelectionContext();
     const { rangeValue } = state.value.current;
@@ -30,12 +42,9 @@ export const CustomPicker = () => {
         }
     }, [rangeValue.length]);
     const handleCalendarChange = (start, end) => {
-        var _a, _b;
         if (!start || !end || activeRangeIdx === null)
             return;
         const replacedRange = rangeValue[activeRangeIdx];
-        if (((_a = replacedRange.start) === null || _a === void 0 ? void 0 : _a.isSame(start)) && ((_b = replacedRange.end) === null || _b === void 0 ? void 0 : _b.isSame(end)))
-            return;
         const updatedRangeValue = [...rangeValue];
         updatedRangeValue.splice(activeRangeIdx, 1, Object.assign(Object.assign({}, replacedRange), { start,
             end }));
@@ -69,7 +78,7 @@ export const CustomPicker = () => {
             } },
             React.createElement("div", { className: "range-input" },
                 React.createElement("div", { className: "range-input-label" }, generateRangeInputLabel(rangeIdx, range.label)),
-                React.createElement(RangePicker, { open: true, value: [range.start, range.end], onClick: () => setActiveRangeIdx(rangeIdx), getPopupContainer: () => popupContainer.current || document.body, panelRender: originalPanel => {
+                React.createElement(RangePicker, Object.assign({}, rest, { open: true, value: [dayjs(range.start), dayjs(range.end)], onClick: () => setActiveRangeIdx(rangeIdx), getPopupContainer: () => popupContainer.current || document.body, panelRender: originalPanel => {
                         if (activeRangeIdx !== rangeIdx)
                             return null;
                         return originalPanel;
@@ -80,10 +89,20 @@ export const CustomPicker = () => {
                         return renderCellDate(current, info.originNode);
                     }, onCalendarChange: value => {
                         var _a, _b;
-                        const start = dayjs((_a = value === null || value === void 0 ? void 0 : value.at(0)) === null || _a === void 0 ? void 0 : _a.toDate());
-                        const end = dayjs((_b = value === null || value === void 0 ? void 0 : value.at(1)) === null || _b === void 0 ? void 0 : _b.toDate());
+                        let start = '';
+                        let end = '';
+                        const valueFirst = dayjs((_a = value === null || value === void 0 ? void 0 : value.at(0)) === null || _a === void 0 ? void 0 : _a.toDate());
+                        const valueSecond = dayjs((_b = value === null || value === void 0 ? void 0 : value.at(1)) === null || _b === void 0 ? void 0 : _b.toDate());
+                        if (valueFirst.isBefore(valueSecond)) {
+                            start = valueFirst.toISOString();
+                            end = valueSecond.toISOString();
+                        }
+                        else {
+                            start = valueSecond.toISOString();
+                            end = valueFirst.toISOString();
+                        }
                         handleCalendarChange(start, end);
-                    } })))))),
+                    } }))))))),
         React.createElement(AutoUpdateTo, null),
         React.createElement(CalendarContainerStyled, { className: "calendar-container", ref: popupContainer })));
 };