@antscorp/antsomi-ui 1.3.3-beta.74 → 1.3.3-beta.76

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

@@ -312,6 +312,10 @@ export const GlobalStyle = () => {
           }
 
           .antsomi-picker-time-panel {
+            .antsomi-picker-time-panel-column:after {
+              height: 8px;
+            }
+
             .antsomi-picker-time-panel-cell-selected {
               background-color: ${(_8 = THEME.token) === null || _8 === void 0 ? void 0 : _8.colorPrimary};
               color: #fff;

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 { Tooltip, 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,20 +9,19 @@ 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, getCellRender, getLabelQuarterRange, getPickerRender, getTimePickerRender, } 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, ADVANCED_PICKER_TYPE, WEEK_ARR, QUARTER_PLACEHOLDER, WEEK_PLACEHOLDER, DAY_LABEL_SHORT, HIDE_TIME_LABEL_ARR, MONTH_LABEL_FULL, DAY_OF_MONTH, ANCHOR_LEAP_YEAR, GRANULARITY_MAPPING, } 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';
 const PATH = '@antscorp/antsomi-ui/es/components/molecules/DatePicker/components/Advanced/DatePickerAdvanced.tsx';
 const { useToken } = theme;
 const { Text } = Typography;
@@ -44,83 +43,8 @@ export const AdvancedPicker = props => {
         }
         return DATE_TYPES;
     }, [dateTypeKeysShow, defaultDateTypeKey]);
-    const newCalculationDates = useMemo(() => {
-        const granularityKey = GRANULARITY_MAPPING[valueType || 'YEAR_MONTH_DAY'].reverse();
-        return CALCULATION_DATES.filter(calculationDate => granularityKey.includes(calculationDate.value));
-    }, [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 (valueType) {
-            case 'YEAR':
-                formatDisplay = 'YYYY';
-                break;
-            case 'YEAR_QUARTER':
-                formatDisplay = `${QUARTER_PLACEHOLDER}Q, YYYY`;
-                break;
-            case 'YEAR_MONTH':
-                formatDisplay = 'MMMM, YYYY';
-                break;
-            case 'YEAR_WEEK':
-                formatDisplay = `${WEEK_PLACEHOLDER}W, YYYY`;
-                break;
-            case 'YEAR_MONTH_DAY':
-                formatDisplay = 'MMMM DD, YYYY';
-                break;
-            case 'YEAR_MONTH_DAY_HOUR':
-                formatDisplay = `MMMM DD, YYYY ${isStartDate ? 'HH:00:00' : 'HH:59:59'}`;
-                timeFormatDisplay = isStartDate ? 'HH:00:00' : 'HH:59:59';
-                break;
-            case 'YEAR_MONTH_DAY_MINUTE':
-                formatDisplay = `MMMM DD, YYYY ${isStartDate ? 'HH:mm:00' : 'HH:mm:59'}`;
-                timeFormatDisplay = isStartDate ? 'HH:mm:00' : 'HH:mm:59';
-                break;
-            case 'YEAR_MONTH_DAY_SECOND':
-                formatDisplay = 'MMMM DD, YYYY HH:mm:ss';
-                timeFormatDisplay = 'HH:mm:ss';
-                break;
-            case 'QUARTER':
-                formatDisplay = `${QUARTER_PLACEHOLDER}Q`;
-                break;
-            case 'MONTH':
-                formatDisplay = 'MMMM';
-                break;
-            case 'WEEK':
-                formatDisplay = `${WEEK_PLACEHOLDER}W`;
-                break;
-            case 'MONTH_DAY':
-                formatDisplay = 'MMMM DD';
-                break;
-            case 'DAY_OF_WEEK':
-                formatDisplay = 'dddd';
-                break;
-            case 'DAY':
-                formatDisplay = 'DD';
-                break;
-            case 'HOUR':
-                formatDisplay = 'HH';
-                break;
-            case 'MINUTE':
-                formatDisplay = 'mm';
-                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];
-    }, [valueType, operatorKey, type, formatInputDisplay]);
+    const newCalculationDates = useMemo(() => CALCULATION_DATES.filter(calculationDate => GRANULARITY_MAPPING[valueType].includes(calculationDate.value)), [valueType]);
+    const { formatDisplay } = getFormatDisplay(operatorKey, type, valueType, formatInputDisplay);
     // State
     const [state, setState] = useState({
         isOpen: false,
@@ -140,7 +64,12 @@ export const AdvancedPicker = props => {
         dateDisplay: dayjs().format(DEFAULT_DATE_FORMAT),
     });
     const { isOpen, option, date, dateDisplay } = state;
-    const [currMonthSelected, setCurrMonthSelected] = useState(dayjs(date, format).month());
+    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) {
@@ -161,13 +90,28 @@ export const AdvancedPicker = props => {
     }, [calculationTypeKeysShow, showCalculationTypeCondition, option.dateType]);
     // Hooks
     const { token } = useToken();
-    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
     useEffect(() => {
         try {
@@ -205,7 +149,8 @@ export const AdvancedPicker = props => {
                 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') {
@@ -240,75 +185,12 @@ 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 DD, YYYY';
-        let subLabel = '';
-        switch (valueType) {
-            case 'YEAR':
-                formatLabel = 'YYYY';
-                break;
-            case 'YEAR_QUARTER':
-                formatLabel = `${QUARTER_PLACEHOLDER}Q, YYYY`;
-                subLabel = getLabelQuarterRange(date, format || DEFAULT_DATE_FORMAT, locale);
-                break;
-            case 'YEAR_MONTH':
-                formatLabel = 'MMMM, YYYY';
-                break;
-            case 'YEAR_WEEK': {
-                const dayObj = dayjs(date || new Date(), format).locale(locale || 'en');
-                formatLabel = `${WEEK_PLACEHOLDER}W, YYYY`;
-                subLabel = `${dayjs(dayObj).day(0).format('MMMM DD, YYYY')} - ${dayjs(dayObj)
-                    .day(6)
-                    .format('MMMM DD, YYYY')}`;
-                break;
-            }
-            case 'YEAR_MONTH_DAY_HOUR':
-                formatLabel = 'dddd, MMMM DD, YYYY';
-                break;
-            case 'QUARTER':
-                formatLabel = `${QUARTER_PLACEHOLDER}Q`;
-                break;
-            case 'MONTH':
-                formatLabel = 'MMMM';
-                break;
-            case 'WEEK':
-                formatLabel = `${WEEK_PLACEHOLDER}W`;
-                break;
-            case 'MONTH_DAY':
-                formatLabel = 'MMMM DD';
-                break;
-            case 'DAY_OF_WEEK':
-                formatLabel = 'dddd';
-                break;
-            case 'DAY':
-                formatLabel = 'DD';
-                break;
-            case 'HOUR':
-                formatLabel = 'HH:00:00';
-                break;
-            case 'MINUTE':
-                formatLabel = '00:mm:00';
-                break;
-            default:
-                break;
-        }
-        return (React.createElement(React.Fragment, null,
-            React.createElement("div", { style: { fontWeight: 'bold' } }, dayjs(date || new Date(), format)
-                .locale(locale || 'en')
-                .format(formatLabel)
-                .replace(QUARTER_PLACEHOLDER, 'Quarter ')
-                .replace(WEEK_PLACEHOLDER, 'Week ')),
-            subLabel ? React.createElement("div", null, subLabel) : null,
-            !HIDE_TIME_LABEL_ARR.includes(valueType || '') && showTime && !subLabel ? (React.createElement("div", { style: { fontWeight: 'bold' } }, dayjs(date || new Date(), format)
-                .locale(locale || 'en')
-                .format(timeFormatDisplay))) : null));
-    };
-    const toggleOpenDropdown = (isOpen) => {
+    const toggleOpenDropdown = () => {
         try {
-            setState(() => (Object.assign(Object.assign({}, state), { isOpen: isOpen != null ? isOpen : !state.isOpen })));
+            setState(() => (Object.assign(Object.assign({}, state), { isOpen: !state.isOpen })));
         }
         catch (error) {
             handleError(error, {
@@ -318,18 +200,6 @@ 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 onClickApply = () => {
         try {
             const draftOption = {
@@ -370,46 +240,29 @@ 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,
             React.createElement(Space, null,
                 React.createElement(Button, { type: "primary", onClick: () => onClickApply() }, "Apply"),
-                React.createElement(Button, { type: "default", onClick: () => toggleOpenDropdown(false) }, "Cancel")),
+                React.createElement(Button, { type: "default", onClick: () => toggleOpenDropdown() }, "Cancel")),
             option.dateType.value === 'fixed' && React.createElement(Button, { onClick: () => onClickNow() }, "Now"))));
-    const renderDateTypeOptions = () => (React.createElement(Select, { getPopupContainer: triggerNode => triggerNode.parentElement, options: newDateTypes.map(dateType => (Object.assign(Object.assign({}, dateType), { label: t(dateType.label) }))), value: option.dateType.value, onChange: value => {
+    const renderDateTypeOptions = () => (React.createElement(Select, { 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 = useMemo(() => ({
+    const customPickerArr = {
         WEEK: WEEK_ARR,
         DAY_OF_WEEK: DAY_LABEL_SHORT,
         MONTH_DAY: DAY_OF_MONTH[currMonthSelected],
         DAY: DAY_OF_MONTH[0],
-    }), [currMonthSelected]);
+    };
     const dropdownRender = () => {
-        // const customPickerArr = valueType === 'WEEK' ? WEEK_ARR : DAY_LABEL_SHORT;
-        const currWeek = dayjs(date, format).isoWeek();
-        const currDay = dayjs(date, format).day();
-        const currDayOfMonth = dayjs(date, format).date();
-        const currMonth = dayjs(date, format).month();
         const getCellSelected = (item, index) => {
             switch (valueType) {
                 case 'WEEK':
@@ -439,7 +292,8 @@ export const AdvancedPicker = props => {
             }
         };
         return (React.createElement("div", { style: contentStyle },
-            React.createElement(DropdownHeader, { className: "dropdown-header" }, renderDropdownLabel()),
+            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,
@@ -447,28 +301,25 @@ export const AdvancedPicker = props => {
                         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', {
+                    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.map(({ label, value }) => ({
-                            value,
-                            label: t(label),
-                        })), value: option.calculationType.value, onChange: value => {
+                    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 }) }),
-                    React.createElement(Select, { getPopupContainer: triggerNode => triggerNode.parentNode, options: newCalculationDates.map(calculationDate => (Object.assign(Object.assign({}, calculationDate), { label: t(calculationDate.label) }))), value: option.calculationDate.value, onChange: value => {
+                    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 });
                         } }))),
-                renderErrorMessage()),
+                React.createElement(ErrorMessage, { errorMessage: errorMessage })),
             renderDropdownFooter()));
     };
-    const cellRender = React.useCallback((current, info) => {
+    const cellRender = useCallback((current, info) => {
         const onChangeDatePicker = (value) => {
             try {
                 setState(state => (Object.assign(Object.assign({}, state), { date: dayjs(value).format(format) })));
@@ -505,58 +356,46 @@ export const AdvancedPicker = props => {
                 }
                 if (info.type === 'decade' ||
                     (info.type === 'year' && valueType !== 'YEAR') ||
-                    (info.type === 'month' &&
-                        !['MONTH', 'YEAR_MONTH'].includes(valueType || 'YEAR_MONTH_DAY')))
+                    (info.type === 'month' && !['MONTH', 'YEAR_MONTH'].includes(valueType)))
                     return;
                 e.preventDefault();
                 e.stopPropagation();
                 onChangeDatePicker(current);
-            } }, getCellRender(current, valueType || 'YEAR_MONTH_DAY', info)));
+            } }, getCellRender(current, valueType, info)));
     }, [valueType, format, date]);
     return (React.createElement(Space, { direction: "vertical", size: 5, className: "antsomi-advanced-picker-container" },
         !!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 || 'YEAR_MONTH_DAY') ? (React.createElement(Tooltip, { title: dayjs(dateDisplay, format)
-                .format(formatDisplay)
-                .replace(QUARTER_PLACEHOLDER, 'Quarter ')
-                .replace(WEEK_PLACEHOLDER, 'Week ') },
-            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)
-                        .replace(QUARTER_PLACEHOLDER, 'Quarter ')
-                        .replace(WEEK_PLACEHOLDER, 'Week '), onClick: () => toggleOpenDropdown() })), value: dayjs(date, format), style: {
+            !['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 || 'YEAR_MONTH_DAY'),
-                    'only-show-time-picker': ['HOUR', 'MINUTE'].includes(valueType || 'YEAR_MONTH_DAY'),
+                    '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,
-                        renderDropdownLabel(),
+                        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' } }, renderErrorMessage()),
+                        React.createElement("div", { style: { padding: '0 10px' } },
+                            React.createElement(ErrorMessage, { errorMessage: errorMessage })),
                         renderDropdownFooter()),
-                    React.createElement(Divider, null))), picker: getPickerRender(valueType || 'YEAR_MONTH_DAY'), showTime: getTimePickerRender(valueType || 'YEAR_MONTH_DAY')
+                    React.createElement(Divider, null))), picker: getPickerRender(valueType), showTime: getTimePickerRender(valueType)
                     ? {
-                        format: getTimePickerRender(valueType || 'YEAR_MONTH_DAY'),
+                        format: getTimePickerRender(valueType),
                     }
                     : undefined, 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 })), cellRender: cellRender, onOpenChange: () => toggleOpenDropdown() }))) : (React.createElement(Dropdown, { disabled: disabled, open: !disabled && isOpen, dropdownRender: dropdownRender, trigger: ['click'], onOpenChange: () => toggleOpenDropdown(), overlayStyle: { width: 'fit-content', minWidth: 'auto' } },
-            React.createElement(Tooltip, { title: dayjs(dateDisplay, format)
-                    .format(formatDisplay)
-                    .replace(QUARTER_PLACEHOLDER, 'Quarter ')
-                    .replace(WEEK_PLACEHOLDER, 'Week ') },
+            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: dayjs(dateDisplay, format)
-                        .format(formatDisplay)
-                        .replace(QUARTER_PLACEHOLDER, 'Quarter ')
-                        .replace(WEEK_PLACEHOLDER, 'Week '), status: errorMessage ? 'error' : '' }))))));
+                        React.createElement(EventIcon, { width: 19, height: 19 })), style: inputStyle, value: selectedDateTitle, status: errorMessage ? 'error' : '' }))))));
 };
 AdvancedPicker.defaultProps = {
     label: '',

package/es/components/molecules/DatePicker/components/AdvancedPicker/constants.d.ts

@@ -3,34 +3,46 @@ export declare const DATE_TYPES: {
     value: string;
     label: string;
 }[];
+export declare const DATE_TYPE_MAPPING: {
+    first_day_of_week_mon_sun: string;
+    first_day_of_week_sun_sat: string;
+    first_day_of_month: string;
+    first_day_of_quarter: string;
+    first_day_of_year: string;
+    last_day_of_week_mon_sun: string;
+    last_day_of_week_sun_sat: string;
+    last_day_of_month: string;
+    last_day_of_quarter: string;
+    last_day_of_year: string;
+};
 export declare const CALCULATION_TYPES: {
     value: string;
     label: string;
 }[];
 export declare const CALCULATION_DATES: readonly [{
     readonly value: "seconds";
-    readonly label: "datePicker.seconds";
+    readonly label: string;
 }, {
     readonly value: "minutes";
-    readonly label: "datePicker.minutes";
+    readonly label: string;
 }, {
     readonly value: "hours";
-    readonly label: "datePicker.hours";
+    readonly label: string;
 }, {
     readonly value: "days";
-    readonly label: "datePicker.days";
+    readonly label: string;
 }, {
     readonly value: "weeks";
-    readonly label: "datePicker.weeks";
+    readonly label: string;
 }, {
     readonly value: "months";
-    readonly label: "datePicker.months";
+    readonly label: string;
 }, {
     readonly value: "quarters";
-    readonly label: "datePicker.quarters";
+    readonly label: string;
 }, {
     readonly value: "years";
-    readonly label: "datePicker.years";
+    readonly label: string;
 }];
 type CalculationDateValues = (typeof CALCULATION_DATES)[number]['value'];
 export declare const VALUE_TYPES: {

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

@@ -1,30 +1,44 @@
+import i18nInstance from '@antscorp/antsomi-ui/es/locales/i18n';
+const { t } = i18nInstance;
 export const DATE_TYPES = [
-    { value: 'today', label: 'datePicker.dateTypes.today' },
-    { value: 'first_day_of_week_mon_sun', label: 'datePicker.dateTypes.firstDayOfWeekMonSun' },
-    { value: 'first_day_of_week_sun_sat', label: 'datePicker.dateTypes.firstDayOfWeekSunSat' },
-    { value: 'first_day_of_month', label: 'datePicker.dateTypes.firstDayOfMonth' },
-    { value: 'first_day_of_quarter', label: 'datePicker.dateTypes.firstDayOfQuarter' },
-    { value: 'first_day_of_year', label: 'datePicker.dateTypes.firstDayOfYear' },
-    { value: 'last_day_of_week_mon_sun', label: 'datePicker.dateTypes.lastDayOfWeekMonSun' },
-    { value: 'last_day_of_week_sun_sat', label: 'datePicker.dateTypes.lastDayOfWeekSunSat' },
-    { value: 'last_day_of_month', label: 'datePicker.dateTypes.lastDayOfMonth' },
-    { value: 'last_day_of_quarter', label: 'datePicker.dateTypes.lastDayOfQuarter' },
-    { value: 'last_day_of_year', label: 'datePicker.dateTypes.lastDayOfYear' },
-    { value: 'fixed', label: 'datePicker.dateTypes.fixed' },
+    { value: 'today', label: t('datePicker.dateTypes.today') },
+    { value: 'first_day_of_week_mon_sun', label: t('datePicker.dateTypes.firstDayOfWeekMonSun') },
+    { value: 'first_day_of_week_sun_sat', label: t('datePicker.dateTypes.firstDayOfWeekSunSat') },
+    { value: 'first_day_of_month', label: t('datePicker.dateTypes.firstDayOfMonth') },
+    { value: 'first_day_of_quarter', label: t('datePicker.dateTypes.firstDayOfQuarter') },
+    { value: 'first_day_of_year', label: t('datePicker.dateTypes.firstDayOfYear') },
+    { value: 'last_day_of_week_mon_sun', label: t('datePicker.dateTypes.lastDayOfWeekMonSun') },
+    { value: 'last_day_of_week_sun_sat', label: t('datePicker.dateTypes.lastDayOfWeekSunSat') },
+    { value: 'last_day_of_month', label: t('datePicker.dateTypes.lastDayOfMonth') },
+    { value: 'last_day_of_quarter', label: t('datePicker.dateTypes.lastDayOfQuarter') },
+    { value: 'last_day_of_year', label: t('datePicker.dateTypes.lastDayOfYear') },
+    { value: 'fixed', label: t('datePicker.dateTypes.fixed') },
 ];
+export const DATE_TYPE_MAPPING = {
+    first_day_of_week_mon_sun: 'isoWeek',
+    first_day_of_week_sun_sat: 'week',
+    first_day_of_month: 'month',
+    first_day_of_quarter: 'quarter',
+    first_day_of_year: 'year',
+    last_day_of_week_mon_sun: 'isoWeek',
+    last_day_of_week_sun_sat: 'week',
+    last_day_of_month: 'month',
+    last_day_of_quarter: 'quarter',
+    last_day_of_year: 'year',
+};
 export const CALCULATION_TYPES = [
-    { value: 'minus', label: 'global.minus' },
-    { value: 'plus', label: 'global.plus' },
+    { value: 'minus', label: t('global.minus') },
+    { value: 'plus', label: t('global.plus') },
 ];
 export const CALCULATION_DATES = [
-    { value: 'seconds', label: 'datePicker.seconds' },
-    { value: 'minutes', label: 'datePicker.minutes' },
-    { value: 'hours', label: 'datePicker.hours' },
-    { value: 'days', label: 'datePicker.days' },
-    { value: 'weeks', label: 'datePicker.weeks' },
-    { value: 'months', label: 'datePicker.months' },
-    { value: 'quarters', label: 'datePicker.quarters' },
-    { value: 'years', label: 'datePicker.years' },
+    { value: 'seconds', label: t('datePicker.seconds') },
+    { value: 'minutes', label: t('datePicker.minutes') },
+    { value: 'hours', label: t('datePicker.hours') },
+    { value: 'days', label: t('datePicker.days') },
+    { value: 'weeks', label: t('datePicker.weeks') },
+    { value: 'months', label: t('datePicker.months') },
+    { value: 'quarters', label: t('datePicker.quarters') },
+    { value: 'years', label: t('datePicker.years') },
 ];
 export const VALUE_TYPES = {
     INPUT_TEXT: 'INPUT_TEXT',

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

@@ -3,7 +3,7 @@ var _a, _b, _c, _d, _e;
 import { THEME } from '../../../../../constants';
 import styled from 'styled-components';
 export const DropdownContent = styled.div `
-  width: 230px;
+  width: 250px;
   padding: 10px 10px 0px 10px;
   display: flex;
   flex-direction: column;

package/es/components/molecules/DatePicker/components/AdvancedPicker/utils.d.ts

@@ -1,6 +1,6 @@
 import type { Dayjs } from 'dayjs';
 import type { CellRenderInfo } from 'rc-picker/es/interface';
-import { ValueTypes } from './types';
+import { TAdvancedType, TOperatorKey, ValueTypes } from './types';
 /**
  * Calculates a new date based on the given parameters.
  * @param {string} [dateTypeKey='today'] - Key to determine the type of date to be used as the starting point.
@@ -33,3 +33,7 @@ export declare const getPickerRender: (valueType: ValueTypes) => 'date' | 'week'
 export declare const getTimePickerRender: (valueType: ValueTypes) => "HH" | "HHmm" | "HHmmss" | "mm" | undefined;
 export declare function getLabelQuarterRange(day: string, format: string, locale: string, showYear?: boolean): string;
 export declare function getLabelQuarterRange(quarter: number, year?: number): string;
+export declare const getFormatDisplay: (operatorKey?: TOperatorKey, type?: TAdvancedType, valueType?: ValueTypes, formatInputDisplay?: string) => {
+    formatDisplay: string;
+    timeFormatDisplay: string;
+};

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

@@ -4,7 +4,7 @@ import dayjs from 'dayjs';
 import isoWeek from 'dayjs/plugin/isoWeek';
 import quarterOfYear from 'dayjs/plugin/quarterOfYear';
 // Constants
-import { DEFAULT_DATE_FORMAT, MONTH_LABEL_SHORT } from './constants';
+import { DATE_TYPE_MAPPING, DEFAULT_DATE_FORMAT, MONTH_LABEL_SHORT, QUARTER_PLACEHOLDER, WEEK_PLACEHOLDER, } from './constants';
 dayjs.extend(isoWeek);
 dayjs.extend(quarterOfYear);
 /**
@@ -23,43 +23,12 @@ dayjs.extend(quarterOfYear);
  */
 export const calculationDateAdvanced = (dateTypeKey = 'today', calculationTypeKey = 'minus', calculationDateKey = 'days', value = 0, dateFormat = DEFAULT_DATE_FORMAT) => {
     let date = dayjs();
-    switch (dateTypeKey) {
-        case 'today':
-            date = dayjs();
-            break;
-        case 'first_day_of_week_mon_sun':
-            date = dayjs().startOf('isoWeek');
-            break;
-        case 'first_day_of_week_sun_sat':
-            date = dayjs().startOf('week');
-            break;
-        case 'first_day_of_month':
-            date = dayjs().startOf('month');
-            break;
-        case 'first_day_of_quarter':
-            date = dayjs().startOf('quarter');
-            break;
-        case 'first_day_of_year':
-            date = dayjs().startOf('year');
-            break;
-        case 'last_day_of_week_mon_sun':
-            date = dayjs().endOf('isoWeek');
-            break;
-        case 'last_day_of_week_sun_sat':
-            date = dayjs().endOf('week');
-            break;
-        case 'last_day_of_month':
-            date = dayjs().endOf('month');
-            break;
-        case 'last_day_of_quarter':
-            date = dayjs().endOf('quarter');
-            break;
-        case 'last_day_of_year':
-            date = dayjs().endOf('year');
-            break;
-        default:
-            date = dayjs();
-            break;
+    if (DATE_TYPE_MAPPING[dateTypeKey]) {
+        date = dateTypeKey.includes('first_day')
+            ? date.startOf(DATE_TYPE_MAPPING[dateTypeKey])
+            : dateTypeKey.includes('last_day')
+                ? date.endOf(DATE_TYPE_MAPPING[dateTypeKey])
+                : dayjs();
     }
     let newDate = '';
     newDate =
@@ -171,3 +140,66 @@ export function getLabelQuarterRange(quarterOrDay, yearOrFormat, locale, showYea
         ? `${startMonthQuarter[currQuarter]} 01, ${currYear} - ${endMonthQuarter[currQuarter]} ${endDayQuarter[currQuarter]}, ${currYear}`
         : `${startMonthQuarter[currQuarter]} 01 - ${endMonthQuarter[currQuarter]} ${endDayQuarter[currQuarter]}`;
 }
+export const getFormatDisplay = (operatorKey, type, valueType, formatInputDisplay) => {
+    let formatDisplay = '';
+    let timeFormatDisplay = '';
+    const isStartDate = operatorKey === 'between' ? type === 'startDate' : operatorKey === 'after';
+    switch (valueType) {
+        case 'YEAR':
+            formatDisplay = 'YYYY';
+            break;
+        case 'YEAR_QUARTER':
+            formatDisplay = `${QUARTER_PLACEHOLDER}Q, YYYY`;
+            break;
+        case 'YEAR_MONTH':
+            formatDisplay = 'MMMM, YYYY';
+            break;
+        case 'YEAR_WEEK':
+            formatDisplay = `${WEEK_PLACEHOLDER}W, YYYY`;
+            break;
+        case 'YEAR_MONTH_DAY':
+            formatDisplay = 'MMMM DD, YYYY';
+            break;
+        case 'YEAR_MONTH_DAY_HOUR':
+            formatDisplay = `MMMM DD, YYYY ${isStartDate ? 'HH:00:00' : 'HH:59:59'}`;
+            timeFormatDisplay = isStartDate ? 'HH:00:00' : 'HH:59:59';
+            break;
+        case 'YEAR_MONTH_DAY_MINUTE':
+            formatDisplay = `MMMM DD, YYYY ${isStartDate ? 'HH:mm:00' : 'HH:mm:59'}`;
+            timeFormatDisplay = isStartDate ? 'HH:mm:00' : 'HH:mm:59';
+            break;
+        case 'YEAR_MONTH_DAY_SECOND':
+            formatDisplay = 'MMMM DD, YYYY HH:mm:ss';
+            timeFormatDisplay = 'HH:mm:ss';
+            break;
+        case 'QUARTER':
+            formatDisplay = `${QUARTER_PLACEHOLDER}Q`;
+            break;
+        case 'MONTH':
+            formatDisplay = 'MMMM';
+            break;
+        case 'WEEK':
+            formatDisplay = `${WEEK_PLACEHOLDER}W`;
+            break;
+        case 'MONTH_DAY':
+            formatDisplay = 'MMMM DD';
+            break;
+        case 'DAY_OF_WEEK':
+            formatDisplay = 'dddd';
+            break;
+        case 'DAY':
+            formatDisplay = 'DD';
+            break;
+        case 'HOUR':
+            formatDisplay = 'HH';
+            break;
+        case 'MINUTE':
+            formatDisplay = 'mm';
+            break;
+        default:
+            formatDisplay = `DD/MM/YYYY - ${isStartDate ? '00:00:00' : '23:59:59'}`;
+            timeFormatDisplay = isStartDate ? '00:00:00' : '23:59:59';
+            break;
+    }
+    return { formatDisplay: formatInputDisplay || formatDisplay, timeFormatDisplay };
+};

package/es/components/molecules/DatePicker/components/DropdownLabel/DropdownLabel.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import { TAdvancedType, TOperatorKey, ValueTypes } from '../AdvancedPicker/types';
+interface DropdownLabelProps {
+    valueType?: ValueTypes;
+    date?: string;
+    format?: string;
+    type?: TAdvancedType;
+    showTime?: boolean;
+    operatorKey?: TOperatorKey;
+    formatInputDisplay?: string;
+}
+export declare const DropdownLabel: React.FC<DropdownLabelProps>;
+export {};

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

@@ -0,0 +1,82 @@
+// Libraries
+import dayjs from 'dayjs';
+import React from 'react';
+// Components
+import { Typography } from '@antscorp/antsomi-ui/es/components/atoms';
+// Constants
+import { ADVANCED_PICKER_TYPE, DEFAULT_DATE_FORMAT, HIDE_TIME_LABEL_ARR, QUARTER_PLACEHOLDER, WEEK_PLACEHOLDER, } from '../AdvancedPicker/constants';
+// Instance
+import i18nInstance from '@antscorp/antsomi-ui/es/locales/i18n';
+import { getFormatDisplay, getLabelQuarterRange } from '../AdvancedPicker/utils';
+export const DropdownLabel = React.memo(({ valueType, date, format, type, showTime, operatorKey, formatInputDisplay }) => {
+    var _a;
+    const { t } = i18nInstance;
+    const title = (_a = Object.values(ADVANCED_PICKER_TYPE).find(({ value }) => value === type)) === null || _a === void 0 ? void 0 : _a.label;
+    const { timeFormatDisplay } = getFormatDisplay(operatorKey, type, valueType, formatInputDisplay);
+    let formatLabel = 'dddd, MMMM DD, YYYY';
+    let subLabel = '';
+    switch (valueType) {
+        case 'YEAR':
+            formatLabel = 'YYYY';
+            break;
+        case 'YEAR_QUARTER':
+            formatLabel = `${QUARTER_PLACEHOLDER}Q, YYYY`;
+            subLabel = getLabelQuarterRange(date, format || DEFAULT_DATE_FORMAT, 'en');
+            // subLabel = getLabelQuarterRange(date!, format || DEFAULT_DATE_FORMAT, locale);
+            break;
+        case 'YEAR_MONTH':
+            formatLabel = 'MMMM, YYYY';
+            break;
+        case 'YEAR_WEEK': {
+            const dayObj = dayjs(date || new Date(), format).locale('en');
+            // const dayObj = dayjs(date || new Date(), format).locale(locale || 'en');
+            formatLabel = `${WEEK_PLACEHOLDER}W, YYYY`;
+            subLabel = `${dayjs(dayObj).day(0).format('MMMM DD, YYYY')} - ${dayjs(dayObj)
+                .day(6)
+                .format('MMMM DD, YYYY')}`;
+            break;
+        }
+        case 'YEAR_MONTH_DAY_HOUR':
+            formatLabel = 'dddd, MMMM DD, YYYY';
+            break;
+        case 'QUARTER':
+            formatLabel = `${QUARTER_PLACEHOLDER}Q`;
+            break;
+        case 'MONTH':
+            formatLabel = 'MMMM';
+            break;
+        case 'WEEK':
+            formatLabel = `${WEEK_PLACEHOLDER}W`;
+            break;
+        case 'MONTH_DAY':
+            formatLabel = 'MMMM DD';
+            break;
+        case 'DAY_OF_WEEK':
+            formatLabel = 'dddd';
+            break;
+        case 'DAY':
+            formatLabel = 'DD';
+            break;
+        case 'HOUR':
+            formatLabel = 'HH:00:00';
+            break;
+        case 'MINUTE':
+            formatLabel = '00:mm:00';
+            break;
+        default:
+            break;
+    }
+    return (React.createElement("div", { style: { textAlign: 'center' } },
+        title && operatorKey === 'between' && (React.createElement(Typography.Text, { className: "__title", style: { color: '#666666' } }, t(title))),
+        React.createElement("div", { style: { fontWeight: 'bold' } }, dayjs(date || new Date(), format)
+            .locale('en')
+            // .locale(locale || 'en')
+            .format(formatLabel)
+            .replace(QUARTER_PLACEHOLDER, 'Quarter ')
+            .replace(WEEK_PLACEHOLDER, 'Week ')),
+        subLabel ? React.createElement("div", null, subLabel) : null,
+        !HIDE_TIME_LABEL_ARR.includes(valueType || '') && showTime && !subLabel ? (React.createElement("div", { style: { fontWeight: 'bold' } }, dayjs(date || new Date(), format)
+            .locale('en')
+            // .locale(locale || 'en')
+            .format(timeFormatDisplay))) : null));
+});

package/es/components/molecules/DatePicker/components/ErrorMessage/ErrorMessage.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+interface ErrorMessageProps {
+    errorMessage?: string;
+}
+export declare const ErrorMessage: React.FC<ErrorMessageProps>;
+export {};

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

@@ -0,0 +1,12 @@
+import React from 'react';
+import Icon from '@antscorp/icons';
+import { Typography } from '@antscorp/antsomi-ui/es/components/atoms';
+import { THEME } from '@antscorp/antsomi-ui/es/constants';
+export const ErrorMessage = React.memo(({ errorMessage }) => {
+    var _a;
+    if (!errorMessage)
+        return null;
+    return (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(Typography.Text, { type: "danger" }, errorMessage)));
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "1.3.3-beta.74",
+  "version": "1.3.3-beta.76",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",