@antscorp/antsomi-ui 1.3.4 → 1.3.5-beta.2

package/es/components/molecules/DatePicker/components/AdvancedPicker/AdvancedPicker.js

@@ -1,7 +1,7 @@
 /* eslint-disable react/no-unused-prop-types */
 // Libraries
-import React, { useEffect, useMemo, useState } from 'react';
-import { theme } from 'antd';
+import React, { useEffect, useMemo, useCallback, useState } from 'react';
+import { Tooltip, theme, DatePicker } from 'antd';
 import dayjs from 'dayjs';
 import clsx from 'clsx';
 // Hooks
@@ -9,27 +9,27 @@ import { useDeepCompareEffect } from '../../../../../hooks';
 // Icons
 import Icon from '@antscorp/icons';
 import { EventIcon } from '../../../../icons';
-// Atoms
+// Components
 import { Input, InputNumber, Divider, Space, Button, Typography, } from '@antscorp/antsomi-ui/es/components/atoms';
-// Molecules
-import { Select, Dropdown, DatePicker } from '@antscorp/antsomi-ui/es/components';
+import { Select, Dropdown } from '@antscorp/antsomi-ui/es/components';
+import { ErrorMessage } from '../ErrorMessage/ErrorMessage';
+import { DropdownLabel } from '../DropdownLabel/DropdownLabel';
 // Utils
 import { handleError, reorder } from '@antscorp/antsomi-ui/es/utils';
-import { calculationDateAdvanced } from './utils';
+import { calculationDateAdvanced, getCellRender, getFormatDisplay, getPickerRender, getTimePickerRender, } from './utils';
 // Styled
 import { DatePickerCustomInput, DatePickerHeader, DropdownContent, DropdownHeader, DatePickerFooter, DropdownFooter, CalendarIconWrapper, } from './styled';
 // Constants
-import { CALCULATION_DATES, CALCULATION_TYPES, DATE_TYPES, DEFAULT_DATE_FORMAT, VALUE_TYPES, TIME_PICKER_TYPE, YEAR_PICKER_TYPE, ADVANCED_PICKER_TYPE, } from './constants';
-import { THEME } from '../../../../../constants';
-// Instance
-import i18nInstance from '@antscorp/antsomi-ui/es/locales/i18n';
+import { CALCULATION_DATES, CALCULATION_TYPES, DATE_TYPES, DEFAULT_DATE_FORMAT, VALUE_TYPES, ADVANCED_PICKER_TYPE, WEEK_ARR, QUARTER_PLACEHOLDER, WEEK_PLACEHOLDER, DAY_LABEL_SHORT, MONTH_LABEL_FULL, DAY_OF_MONTH, ANCHOR_LEAP_YEAR, GRANULARITY_MAPPING, } from './constants';
+import { THEME } from '@antscorp/antsomi-ui/es/constants';
+import { useOutsideClick } from '@antscorp/antsomi-ui/es/hooks/useOutsideClick';
 const PATH = '@antscorp/antsomi-ui/es/components/molecules/DatePicker/components/Advanced/DatePickerAdvanced.tsx';
 const { useToken } = theme;
 const { Text } = Typography;
 export const AdvancedPicker = props => {
     var _a, _b;
     // Props
-    const { label, inputStyle, dateTypeKeysShow, calculationTypeKeysShow, showCalculationTypeCondition, defaultDateTypeKey, valueType, option: propsOption, operatorKey, type, date: propsDate, format, formatInputDisplay, errorMessage, disableAfterDate, disableBeforeDate, showTime, disabled, onUpdatedNewDate, onApply, } = props;
+    const { label, inputStyle, dateTypeKeysShow, calculationTypeKeysShow, showCalculationTypeCondition, defaultDateTypeKey, valueType, option: propsOption, operatorKey, type, date: propsDate, format, formatInputDisplay, errorMessage, disableAfterDate, disableBeforeDate, showTime, disabled, timezone, onUpdatedNewDate, onApply, } = props;
     // Memo
     const newDateTypes = useMemo(() => {
         if (dateTypeKeysShow && dateTypeKeysShow.length) {
@@ -44,82 +44,8 @@ export const AdvancedPicker = props => {
         }
         return DATE_TYPES;
     }, [dateTypeKeysShow, defaultDateTypeKey]);
-    const newCalculationDates = useMemo(() => {
-        switch (valueType) {
-            case VALUE_TYPES.YEAR_MONTH_DAY:
-                return CALCULATION_DATES.filter(calculationDate => !['hours', 'minutes', 'seconds'].includes(calculationDate.value));
-            case VALUE_TYPES.YEAR_MONTH_DAY_HOUR:
-                return CALCULATION_DATES.filter(calculationDate => !['minutes', 'seconds'].includes(calculationDate.value));
-            case VALUE_TYPES.YEAR_MONTH_DAY_MINUTE:
-                return CALCULATION_DATES.filter(calculationDate => !['seconds'].includes(calculationDate.value));
-            case VALUE_TYPES.YEAR:
-                return CALCULATION_DATES.filter(calculationDate => ['years'].includes(calculationDate.value));
-            case VALUE_TYPES.YEAR_MONTH:
-                return CALCULATION_DATES.filter(calculationDate => ['years', 'months', 'quarters'].includes(calculationDate.value));
-            case VALUE_TYPES.YEAR_MONTH_DAY_SECOND:
-                return CALCULATION_DATES;
-            default:
-                return CALCULATION_DATES;
-        }
-    }, [valueType]);
-    const pickerType = useMemo(() => {
-        switch (valueType) {
-            case VALUE_TYPES.YEAR_MONTH_DAY:
-                return TIME_PICKER_TYPE.DATE;
-            case VALUE_TYPES.YEAR_MONTH_DAY_HOUR:
-                return TIME_PICKER_TYPE.DATE_HOUR;
-            case VALUE_TYPES.YEAR_MONTH_DAY_MINUTE:
-                return TIME_PICKER_TYPE.DATE_HOUR_MINUTE;
-            case VALUE_TYPES.YEAR_MONTH_DAY_SECOND:
-                return TIME_PICKER_TYPE.DATE_TIME;
-            case VALUE_TYPES.YEAR:
-                return YEAR_PICKER_TYPE.YEAR;
-            case VALUE_TYPES.YEAR_MONTH:
-                return YEAR_PICKER_TYPE.MONTH;
-            default:
-                return TIME_PICKER_TYPE.DATE;
-        }
-    }, [valueType]);
-    const [formatDisplay, timeFormatDisplay] = useMemo(() => {
-        let formatDisplay = '';
-        let timeFormatDisplay = '';
-        let isStartDate = false;
-        // Handle detect day is start or end
-        if (operatorKey === 'between') {
-            isStartDate = type === 'startDate';
-        }
-        else {
-            isStartDate = operatorKey === 'after';
-        }
-        switch (pickerType) {
-            case TIME_PICKER_TYPE.DATE_TIME:
-                formatDisplay = 'DD/MM/YYYY - HH:mm:ss';
-                timeFormatDisplay = 'HH:mm:ss';
-                break;
-            case TIME_PICKER_TYPE.DATE_HOUR:
-                formatDisplay = `DD/MM/YYYY - ${isStartDate ? 'HH:00:00' : 'HH:59:59'}`;
-                timeFormatDisplay = isStartDate ? 'HH:00:00' : 'HH:59:59';
-                break;
-            case TIME_PICKER_TYPE.DATE_HOUR_MINUTE:
-                formatDisplay = `DD/MM/YYYY - ${isStartDate ? 'HH:mm:00' : 'HH:mm:59'}`;
-                timeFormatDisplay = isStartDate ? 'HH:mm:00' : 'HH:mm:59';
-                break;
-            case YEAR_PICKER_TYPE.MONTH:
-                formatDisplay = 'MM/YYYY';
-                break;
-            case YEAR_PICKER_TYPE.YEAR:
-                formatDisplay = 'YYYY';
-                break;
-            default:
-                formatDisplay = `DD/MM/YYYY - ${isStartDate ? '00:00:00' : '23:59:59'}`;
-                timeFormatDisplay = isStartDate ? '00:00:00' : '23:59:59';
-                break;
-        }
-        if (formatInputDisplay) {
-            formatDisplay = formatInputDisplay;
-        }
-        return [formatDisplay, timeFormatDisplay];
-    }, [pickerType, operatorKey, type, formatInputDisplay]);
+    const newCalculationDates = useMemo(() => CALCULATION_DATES.filter(calculationDate => GRANULARITY_MAPPING[valueType].includes(calculationDate.value)), [valueType]);
+    const { formatDisplay } = getFormatDisplay(operatorKey, type, valueType, operatorKey === 'between' ? '' : formatInputDisplay);
     // State
     const [state, setState] = useState({
         isOpen: false,
@@ -135,10 +61,16 @@ export const AdvancedPicker = props => {
             calculationDate: newCalculationDates[0],
             value: 0,
         },
-        date: dayjs().format(DEFAULT_DATE_FORMAT),
-        dateDisplay: dayjs().format(DEFAULT_DATE_FORMAT),
+        date: dayjs().tz(timezone).format(format),
+        dateDisplay: dayjs().tz(timezone).format(format),
     });
     const { isOpen, option, date, dateDisplay } = state;
+    const currDate = dayjs(date, format);
+    const currWeek = currDate.isoWeek();
+    const currDay = currDate.day();
+    const currDayOfMonth = currDate.date();
+    const currMonth = currDate.month();
+    const [currMonthSelected, setCurrMonthSelected] = useState(currMonth);
     const newCalculationTypes = useMemo(() => {
         var _a;
         if (calculationTypeKeysShow && calculationTypeKeysShow.length) {
@@ -159,16 +91,30 @@ export const AdvancedPicker = props => {
     }, [calculationTypeKeysShow, showCalculationTypeCondition, option.dateType]);
     // Hooks
     const { token } = useToken();
-    // const { t } = useTranslation();
-    const { t } = i18nInstance;
     // Variables
     const contentStyle = {
         backgroundColor: token.colorBgElevated,
         borderRadius: token.borderRadius,
         boxShadow: token.boxShadowSecondary,
     };
+    const selectedDateTitle = useMemo(() => dayjs(dateDisplay, format)
+        .format(formatDisplay)
+        .replace(QUARTER_PLACEHOLDER, 'Quarter ')
+        .replace(WEEK_PLACEHOLDER, 'Week '), [dateDisplay, format, formatDisplay]);
+    const onChangeOption = (params) => {
+        try {
+            setState(state => (Object.assign(Object.assign({}, state), { option: Object.assign(Object.assign({}, state.option), params) })));
+        }
+        catch (error) {
+            handleError(error, {
+                path: PATH,
+                name: 'onChangeOption',
+                args: {},
+            });
+        }
+    };
     // Effects
-    useDeepCompareEffect(() => {
+    useEffect(() => {
         try {
             if (isOpen) {
                 setState(state => (Object.assign(Object.assign({}, state), { option: state.optionSelected, date: state.dateDisplay })));
@@ -182,10 +128,10 @@ export const AdvancedPicker = props => {
             });
         }
     }, [isOpen]);
-    useEffect(() => {
+    useDeepCompareEffect(() => {
         try {
             if (option.dateType.value !== 'fixed') {
-                const newDate = calculationDateAdvanced(option.dateType.value, option.calculationType.value, option.calculationDate.value, option.value, format);
+                const newDate = calculationDateAdvanced(option.dateType.value, option.calculationType.value, option.calculationDate.value, option.value, format, timezone);
                 setState(state => (Object.assign(Object.assign({}, state), { date: newDate })));
             }
         }
@@ -196,26 +142,27 @@ export const AdvancedPicker = props => {
                 args: { option, format },
             });
         }
-    }, [option, format]);
-    useEffect(() => {
+    }, [option, format, timezone]);
+    useDeepCompareEffect(() => {
         try {
             if (propsOption) {
                 const { dateType, calculationType, calculationDate, value = 0 } = propsOption || {};
                 const newDateTypes = DATE_TYPES;
                 const newDateType = newDateTypes.find(dType => dType.value === dateType);
                 const newCalculationType = CALCULATION_TYPES.find(calType => calType.value === calculationType);
-                const newCalculationDate = newCalculationDates.find(calDate => calDate.value === calculationDate);
+                const newCalculationDate = newCalculationDates.find(calDate => calDate.value === calculationDate) ||
+                    newCalculationDates[0];
                 let newDate = '';
                 if (newDateType) {
                     if (newDateType.value === 'fixed') {
-                        newDate = dayjs(propsDate, DEFAULT_DATE_FORMAT, true).isValid()
-                            ? dayjs(propsDate, DEFAULT_DATE_FORMAT).format(format)
+                        newDate = dayjs(propsDate, format, true).isValid()
+                            ? dayjs(propsDate, format).format(format)
                             : propsDate;
                         setState(state => (Object.assign(Object.assign({}, state), { date: newDate, dateDisplay: newDate, optionSelected: Object.assign(Object.assign({}, option), { dateType: newDateType }) })));
                     }
                     else {
                         if (newCalculationDate && newCalculationType) {
-                            const date = calculationDateAdvanced(newDateType.value, newCalculationType.value, newCalculationDate.value, value, format);
+                            const date = calculationDateAdvanced(newDateType.value, newCalculationType.value, newCalculationDate.value, value, format, timezone);
                             setState(state => (Object.assign(Object.assign({}, state), { dateDisplay: date, optionSelected: {
                                     dateType: newDateType,
                                     calculationDate: newCalculationDate,
@@ -227,7 +174,17 @@ export const AdvancedPicker = props => {
                     }
                 }
                 if (typeof onUpdatedNewDate === 'function' && propsDate !== newDate) {
-                    onUpdatedNewDate(newDate);
+                    onUpdatedNewDate({
+                        date: newDate,
+                        option: {
+                            dateType: newDateType.value,
+                            calculationDate: newDateType.value === 'fixed' ? '' : newCalculationDate.value,
+                            calculationType: newDateType.value === 'fixed'
+                                ? ''
+                                : newCalculationType.value,
+                            value: newDateType.value === 'fixed' ? 0 : value,
+                        },
+                    });
                 }
             }
         }
@@ -239,32 +196,14 @@ export const AdvancedPicker = props => {
             });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [propsOption, propsDate, format]);
+    }, [propsOption, newCalculationDates, propsDate, format]);
     // Handlers
     const disableDate = current => current > dayjs(disableAfterDate, format) || current < dayjs(disableBeforeDate, format);
-    const renderLabel = (date, locale = 'en') => {
-        let formatLabel = 'dddd, MMMM D, YYYY';
-        switch (valueType) {
-            case VALUE_TYPES.YEAR:
-                formatLabel = 'YYYY';
-                break;
-            case VALUE_TYPES.YEAR_MONTH:
-                formatLabel = 'MMMM, YYYY';
-                break;
-            default:
-                break;
-        }
-        return (React.createElement(React.Fragment, null,
-            React.createElement("div", null, dayjs(date || new Date(), format)
-                .locale(locale || 'en')
-                .format(formatLabel)),
-            ![VALUE_TYPES.YEAR, VALUE_TYPES.YEAR_MONTH].includes(valueType || '') && showTime && (React.createElement("div", null, dayjs(date || new Date(), format)
-                .locale(locale || 'en')
-                .format(timeFormatDisplay)))));
-    };
     const toggleOpenDropdown = (isOpen) => {
         try {
-            setState(() => (Object.assign(Object.assign({}, state), { isOpen: isOpen != null ? isOpen : !state.isOpen })));
+            setState(() => (Object.assign(Object.assign({}, state), { 
+                // isOpen: !state.isOpen,
+                isOpen: isOpen != null ? isOpen : !state.isOpen })));
         }
         catch (error) {
             handleError(error, {
@@ -274,30 +213,7 @@ export const AdvancedPicker = props => {
             });
         }
     };
-    const onChangeOption = (params) => {
-        try {
-            setState(state => (Object.assign(Object.assign({}, state), { option: Object.assign(Object.assign({}, state.option), params) })));
-        }
-        catch (error) {
-            handleError(error, {
-                path: PATH,
-                name: 'onChangeOption',
-                args: {},
-            });
-        }
-    };
-    const onChangeDatePicker = (value) => {
-        try {
-            setState(state => (Object.assign(Object.assign({}, state), { date: dayjs(value).format(format) })));
-        }
-        catch (error) {
-            handleError(error, {
-                path: PATH,
-                name: 'onChangeDatePicker',
-                args: { value },
-            });
-        }
-    };
+    const { ref } = useOutsideClick(() => toggleOpenDropdown(false));
     const onClickApply = () => {
         try {
             const draftOption = {
@@ -338,13 +254,6 @@ export const AdvancedPicker = props => {
             });
         }
     };
-    const renderDropdownLabel = () => {
-        var _a;
-        const title = (_a = Object.values(ADVANCED_PICKER_TYPE).find(({ value }) => value === type)) === null || _a === void 0 ? void 0 : _a.label;
-        return (React.createElement("div", { style: { textAlign: 'center' } },
-            title && operatorKey === 'between' && (React.createElement(Text, { className: "__title", style: { color: '#666666' } }, t(title))),
-            renderLabel(date, 'en')));
-    };
     const renderDropdownFooter = () => (React.createElement(React.Fragment, null,
         React.createElement(Divider, null),
         React.createElement(DropdownFooter, null,
@@ -352,64 +261,162 @@ export const AdvancedPicker = props => {
                 React.createElement(Button, { type: "primary", onClick: () => onClickApply() }, "Apply"),
                 React.createElement(Button, { type: "default", onClick: () => toggleOpenDropdown(false) }, "Cancel")),
             option.dateType.value === 'fixed' && React.createElement(Button, { onClick: () => onClickNow() }, "Now"))));
-    const renderDateTypeOptions = () => (React.createElement(Select, { options: newDateTypes.map(dateType => (Object.assign(Object.assign({}, dateType), { label: t(dateType.label) }))), value: option.dateType.value, onChange: value => {
+    const renderDateTypeOptions = () => (React.createElement(Select, { getPopupContainer: triggerNode => triggerNode.parentNode, options: newDateTypes, value: option.dateType.value, onChange: value => {
             const dateType = newDateTypes.find(dateType => dateType.value === value);
-            toggleOpenDropdown(true);
-            setTimeout(() => {
-                onChangeOption({ dateType });
-            }, 100);
+            onChangeOption({ dateType });
+            // toggleOpenDropdown(true);
+            // setTimeout(() => {
+            //   onChangeOption({ dateType });
+            // }, 100);
         } }));
-    const renderErrorMessage = () => {
-        var _a;
-        return errorMessage ? (React.createElement("div", { style: { display: 'flex', alignItems: 'center', gap: 5 } },
-            React.createElement(Icon, { type: "icon-ants-remove-circle", style: { color: (_a = THEME.token) === null || _a === void 0 ? void 0 : _a.colorError } }),
-            React.createElement(Text, { type: "danger" }, errorMessage))) : null;
+    // NOTE: valueType: 'WEEK'; 'DAY_OF_WEEK'; 'MONTH_DAY'; 'DAY'
+    const customPickerArr = {
+        WEEK: WEEK_ARR,
+        DAY_OF_WEEK: DAY_LABEL_SHORT,
+        MONTH_DAY: DAY_OF_MONTH[currMonthSelected],
+        DAY: DAY_OF_MONTH[0],
     };
-    const dropdownRender = () => (React.createElement("div", { style: contentStyle },
-        React.createElement(DropdownHeader, null, renderDropdownLabel()),
-        React.createElement(DropdownContent, null,
-            renderDateTypeOptions(),
-            React.createElement(Select, { options: newCalculationTypes.map(({ label, value }) => ({
-                    value,
-                    label: t(label),
-                })), value: option.calculationType.value, onChange: value => {
-                    const calculationType = CALCULATION_TYPES.find(calculationType => calculationType.value === value);
-                    onChangeOption({ calculationType });
-                } }),
-            React.createElement(InputNumber, { value: option.value, style: { width: '100%' }, min: 0, showHandler: false, onChange: value => onChangeOption({ value }) }),
-            React.createElement(Select, { options: newCalculationDates.map(calculationDate => (Object.assign(Object.assign({}, calculationDate), { label: t(calculationDate.label) }))), value: option.calculationDate.value, onChange: value => {
-                    const calculationDate = newCalculationDates.find(calculationDate => calculationDate.value === value);
-                    onChangeOption({ calculationDate });
-                } }),
-            renderErrorMessage()),
-        renderDropdownFooter()));
-    return (React.createElement(Space, { direction: "vertical", size: 5 },
-        !!label && typeof label === 'string' ? (React.createElement(Text, { style: { color: '#666666' } }, label)) : (label),
-        option.dateType.value === 'fixed' ? (React.createElement(DatePicker, { disabled: disabled, open: !disabled && isOpen, allowClear: false, inputReadOnly: true, status: errorMessage ? 'error' : '', inputRender: () => (React.createElement(DatePickerCustomInput, { readOnly: true, placeholder: "Select Date", value: dayjs(dateDisplay, format).format(formatDisplay), onClick: () => toggleOpenDropdown() })), value: dayjs(date, format), style: {
-                width: 120,
-            }, disabledDate: disableDate, format: formatDisplay, showToday: false, popupClassName: clsx('antsomi-picker-dropdown__advanced', {
-                '--error': errorMessage,
-            }), renderExtraFooter: () => (React.createElement(React.Fragment, null,
-                React.createElement(DatePickerHeader, null,
-                    renderDropdownLabel(),
-                    renderDateTypeOptions()),
-                React.createElement(DatePickerFooter, null,
-                    React.createElement("div", { style: { padding: '0 10px' } }, renderErrorMessage()),
-                    renderDropdownFooter()),
-                React.createElement(Divider, null))), suffixIcon: React.createElement(CalendarIconWrapper, { style: {
-                    pointerEvents: disabled ? 'none' : 'all',
-                }, onClick: () => toggleOpenDropdown() },
-                React.createElement(EventIcon, { width: 20, height: 20, fill: errorMessage ? (_a = THEME.token) === null || _a === void 0 ? void 0 : _a.colorError : (_b = THEME.token) === null || _b === void 0 ? void 0 : _b.bw10 })), dateRender: current => (React.createElement("div", { className: "antsomi-picker-cell-inner", style: { pointerEvents: 'all' }, onClick: e => {
+    const dropdownRender = () => {
+        const getCellSelected = (item, index) => {
+            switch (valueType) {
+                case 'WEEK':
+                    return currWeek === item;
+                case 'DAY_OF_WEEK':
+                    return index === currDay;
+                case 'MONTH_DAY':
+                    return item === currDayOfMonth && currMonth === currMonthSelected;
+                case 'DAY':
+                    return item === currDayOfMonth;
+                default:
+                    return false;
+            }
+        };
+        const getNewDate = (item, index) => {
+            switch (valueType) {
+                case 'WEEK':
+                    return dayjs(date).isoWeek(item);
+                case 'DAY_OF_WEEK':
+                    return dayjs(date).day(index);
+                case 'MONTH_DAY':
+                    return dayjs(date).year(ANCHOR_LEAP_YEAR).month(currMonthSelected).date(item);
+                case 'DAY':
+                    return dayjs(date).year(ANCHOR_LEAP_YEAR).month(0).date(item);
+                default:
+                    return dayjs(date);
+            }
+        };
+        return (React.createElement("div", { style: contentStyle, ref: ref },
+            React.createElement(DropdownHeader, { className: "dropdown-header" },
+                React.createElement(DropdownLabel, { valueType: valueType, date: date, format: format, type: type, showTime: showTime, operatorKey: operatorKey, formatInputDisplay: formatInputDisplay })),
+            React.createElement(DropdownContent, { className: "dropdown-content" },
+                renderDateTypeOptions(),
+                option.dateType.value === 'fixed' ? (React.createElement(React.Fragment, null,
+                    valueType === 'MONTH_DAY' ? (React.createElement("div", { className: "month-controller" },
+                        React.createElement(Icon, { type: "icon-ants-angle-left", style: { fontSize: '14px', color: '#D2D2D2' }, onClick: () => setCurrMonthSelected(prev => (prev === 0 ? 11 : prev - 1)) }),
+                        MONTH_LABEL_FULL[currMonthSelected],
+                        React.createElement(Icon, { type: "icon-ants-angle-right", style: { fontSize: '14px', color: '#D2D2D2' }, onClick: () => setCurrMonthSelected(prev => (prev === 11 ? 0 : prev + 1)) }))) : null,
+                    React.createElement("div", { className: `custom-picker-content${['MONTH_DAY', 'DAY'].includes(valueType) ? ' day-of-month-container' : ''}` }, customPickerArr[valueType].map((item, index) => (React.createElement("div", { key: `day_${item}`, className: clsx('custom-picker-item', {
+                            'custom-picker-item-selected': getCellSelected(item, index),
+                        }), onClick: () => {
+                            const newDate = getNewDate(item, index);
+                            setState(state => (Object.assign(Object.assign({}, state), { date: dayjs(newDate).format(format) })));
+                        } }, item)))))) : (React.createElement(React.Fragment, null,
+                    React.createElement(Select, { getPopupContainer: triggerNode => triggerNode.parentNode, options: newCalculationTypes, value: option.calculationType.value, onChange: value => {
+                            const calculationType = CALCULATION_TYPES.find(calculationType => calculationType.value === value);
+                            onChangeOption({ calculationType });
+                        } }),
+                    React.createElement(InputNumber, { value: option.value, style: { width: '100%' }, min: 0, showHandler: false, onChange: value => onChangeOption({ value: Math.floor(value) }) }),
+                    React.createElement(Select, { getPopupContainer: triggerNode => triggerNode.parentNode, options: newCalculationDates, value: option.calculationDate.value, onChange: value => {
+                            const calculationDate = newCalculationDates.find(calculationDate => calculationDate.value === value);
+                            onChangeOption({ calculationDate });
+                        } }))),
+                React.createElement(ErrorMessage, { errorMessage: errorMessage })),
+            renderDropdownFooter()));
+    };
+    const cellRender = useCallback((current, info) => {
+        const onChangeDatePicker = (value) => {
+            try {
+                setState(state => (Object.assign(Object.assign({}, state), { date: dayjs(value).format(format) })));
+            }
+            catch (error) {
+                handleError(error, {
+                    path: PATH,
+                    name: 'onChangeDatePicker',
+                    args: { value },
+                });
+            }
+        };
+        return (React.createElement("div", { className: "antsomi-picker-cell-inner", style: { pointerEvents: 'all', width: '100%' }, onClick: e => {
+                if (info.type === 'time' && typeof current === 'number') {
                     e.preventDefault();
                     e.stopPropagation();
-                    onChangeDatePicker(current);
-                } }, current.date())), 
-            // onChange={onChangeDatePicker}
-            onOpenChange: () => toggleOpenDropdown() })) : (React.createElement(Dropdown, { disabled: disabled, open: !disabled && isOpen, dropdownRender: dropdownRender, trigger: ['click'], onOpenChange: () => toggleOpenDropdown() },
-            React.createElement(Input, { disabled: disabled, onClick: () => toggleOpenDropdown(), readOnly: true, suffix: React.createElement(CalendarIconWrapper, { style: {
+                    let newDate;
+                    switch (info.subType) {
+                        case 'hour':
+                            newDate = dayjs(date).hour(current);
+                            break;
+                        case 'minute':
+                            newDate = dayjs(date).minute(current);
+                            break;
+                        case 'second':
+                            newDate = dayjs(date).second(current);
+                            break;
+                        default:
+                            break;
+                    }
+                    if (newDate)
+                        onChangeDatePicker(newDate);
+                    return;
+                }
+                if (info.type === 'decade' ||
+                    (info.type === 'year' && valueType !== 'YEAR') ||
+                    (info.type === 'month' && !['MONTH', 'YEAR_MONTH'].includes(valueType)))
+                    return;
+                e.preventDefault();
+                e.stopPropagation();
+                onChangeDatePicker(current);
+            } }, getCellRender(current, valueType, info)));
+    }, [valueType, format, date]);
+    return (React.createElement(Space, { direction: "vertical", size: 5, className: "antsomi-advanced-picker-container", ref: ref },
+        !!label && typeof label === 'string' ? (React.createElement(Text, { style: { color: '#666666' } }, label)) : (label),
+        option.dateType.value === 'fixed' &&
+            !['WEEK', 'DAY_OF_WEEK', 'MONTH_DAY', 'DAY'].includes(valueType) ? (React.createElement(Tooltip, { title: selectedDateTitle },
+            React.createElement(DatePicker, { disabled: disabled, open: !disabled && isOpen, allowClear: false, inputReadOnly: true, status: errorMessage ? 'error' : '', inputRender: () => (React.createElement(DatePickerCustomInput, { readOnly: true, placeholder: "Select Date", value: selectedDateTitle, onClick: () => toggleOpenDropdown() })), value: currDate, 
+                // style={{
+                //   width: 120,
+                // }}
+                disabledDate: disableDate, format: formatDisplay, showToday: false, popupClassName: clsx('antsomi-picker-dropdown__advanced', {
+                    '--error': errorMessage,
+                    'hide-picker-header': ['QUARTER', 'MONTH'].includes(valueType),
+                    'only-show-time-picker': ['HOUR', 'MINUTE'].includes(valueType),
+                    'is-minutes-picker': valueType === 'MINUTE',
+                    'is-hours-picker': valueType === 'HOUR',
+                }), renderExtraFooter: () => (React.createElement(React.Fragment, null,
+                    React.createElement(DatePickerHeader, null,
+                        React.createElement(DropdownLabel, { valueType: valueType, date: date, format: format, type: type, showTime: showTime, operatorKey: operatorKey, formatInputDisplay: formatInputDisplay }),
+                        renderDateTypeOptions()),
+                    React.createElement(DatePickerFooter, null,
+                        React.createElement("div", { style: { padding: '0 10px' } },
+                            React.createElement(ErrorMessage, { errorMessage: errorMessage })),
+                        renderDropdownFooter()),
+                    React.createElement(Divider, null))), picker: getPickerRender(valueType), showTime: getTimePickerRender(valueType)
+                    ? {
+                        format: getTimePickerRender(valueType),
+                    }
+                    : undefined, suffixIcon: React.createElement(CalendarIconWrapper, { style: {
                         pointerEvents: disabled ? 'none' : 'all',
                     }, onClick: () => toggleOpenDropdown() },
-                    React.createElement(EventIcon, { width: 19, height: 19 })), style: inputStyle, value: dayjs(dateDisplay, format).format(formatDisplay), status: errorMessage ? 'error' : '' })))));
+                    React.createElement(EventIcon, { width: 20, height: 20, fill: errorMessage ? (_a = THEME.token) === null || _a === void 0 ? void 0 : _a.colorError : (_b = THEME.token) === null || _b === void 0 ? void 0 : _b.bw10 })), cellRender: cellRender }))) : (React.createElement(Dropdown, { disabled: disabled, open: !disabled && isOpen, dropdownRender: dropdownRender, trigger: ['click'], 
+            // onOpenChange={(open, info) => {
+            //   console.log('🚀🚀🚀 ', 4, { open, info });
+            //   toggleOpenDropdown();
+            // }}
+            overlayStyle: { width: 'fit-content', minWidth: 'auto' } },
+            React.createElement(Tooltip, { title: selectedDateTitle },
+                React.createElement(Input, { disabled: disabled, onClick: () => toggleOpenDropdown(), readOnly: true, suffix: React.createElement(CalendarIconWrapper, { style: {
+                            pointerEvents: disabled ? 'none' : 'all',
+                        }, onClick: () => toggleOpenDropdown() },
+                        React.createElement(EventIcon, { width: 19, height: 19 })), style: inputStyle, value: selectedDateTitle, status: errorMessage ? 'error' : '' }))))));
 };
 AdvancedPicker.defaultProps = {
     label: '',