@infomaximum/ui-kit 0.15.1 → 0.15.2

package/dist/components/InternalPicker/pickers/RangePicker/RangePicker.js

@@ -7,7 +7,7 @@ import { SwapRightOutlined } from "@infomaximum/icons";
 import { getPopupStyle } from "../../styles/Popup.styles.js";
 import { getRangeSelectorStyle } from "../../styles/RangeSelector.styles.js";
 import dayjs from "dayjs";
-import { getFormatByPicker, minDate, defaultProps } from "../SinglePicker/SinglePicker.utils.js";
+import { getFormatByPicker, minDate, getAllowClearValue, defaultProps } from "../SinglePicker/SinglePicker.utils.js";
 import { getRangePlaceholder } from "./RangePicker.utils.js";
 import { FormItemContext } from "../../../Form/components/FormItem/contexts/FormItemContext.js";
 import { useTheme } from "../../../../hooks/useTheme/useTheme.js";
@@ -21,6 +21,7 @@ const RangePickerComponent = forwardRef((props, ref) => {
     components: componentsProp,
     placeholder,
     status: statusProp,
+    allowClear: allowClearProp,
     ...rest
   } = props;
   const theme = useTheme();
@@ -42,7 +43,7 @@ const RangePickerComponent = forwardRef((props, ref) => {
     cx
   }) => {
     var _a;
-    return /* @__PURE__ */ jsx(RangePicker$1, { ref, locale, placeholder: getRangePlaceholder(locale, rest.picker, placeholder), separator: defaultSeparator, format: getFormatByPicker(rest.picker, Boolean(rest.showTime)), minDate, ...defaultProps, ...rest, components, prefixCls, className: cx(css(getRangeSelectorStyle(pickerTokens)(theme)), {
+    return /* @__PURE__ */ jsx(RangePicker$1, { ref, locale, placeholder: getRangePlaceholder(locale, rest.picker, placeholder), separator: defaultSeparator, format: getFormatByPicker(rest.picker, Boolean(rest.showTime)), minDate, allowClear: getAllowClearValue(allowClearProp), ...defaultProps, ...rest, components, prefixCls, className: cx(css(getRangeSelectorStyle(pickerTokens)(theme)), {
       [`${prefixCls}-success-status`]: status === "success"
     }, {
       [`${prefixCls}-error-status`]: status === "error"

package/dist/components/InternalPicker/pickers/SinglePicker/SinglePicker.js

@@ -9,7 +9,7 @@ import "react-intersection-observer/test-utils";
 import { getPopupStyle } from "../../styles/Popup.styles.js";
 import { getSingleSelectorStyle } from "../../styles/SingleSelector.styles.js";
 import dayjs from "dayjs";
-import { getSinglePlaceholder, getFormatByPicker, minDate, defaultProps } from "./SinglePicker.utils.js";
+import { getSinglePlaceholder, getFormatByPicker, minDate, getAllowClearValue, defaultProps } from "./SinglePicker.utils.js";
 import { FormItemContext } from "../../../Form/components/FormItem/contexts/FormItemContext.js";
 import { useTheme } from "../../../../hooks/useTheme/useTheme.js";
 import { useConfig } from "../../../ConfigProvider/hooks/useConfig/useConfig.js";
@@ -21,6 +21,7 @@ const SinglePickerComponent = forwardRef((props, ref) => {
     components: componentsProp,
     placeholder,
     status: statusProp,
+    allowClear: allowClearProp,
     ...rest
   } = props;
   const theme = useTheme();
@@ -42,7 +43,7 @@ const SinglePickerComponent = forwardRef((props, ref) => {
     cx
   }) => {
     var _a;
-    return /* @__PURE__ */ jsx(Picker, { ref, locale, placeholder: getSinglePlaceholder(locale, rest.picker, placeholder), format: getFormatByPicker(rest.picker, Boolean(rest.showTime)), minDate, ...defaultProps, ...rest, components, prefixCls, className: cx(css(getSingleSelectorStyle(pickerTokens)(theme)), {
+    return /* @__PURE__ */ jsx(Picker, { ref, locale, placeholder: getSinglePlaceholder(locale, rest.picker, placeholder), format: getFormatByPicker(rest.picker, Boolean(rest.showTime)), minDate, allowClear: getAllowClearValue(allowClearProp), ...defaultProps, ...rest, components, prefixCls, className: cx(css(getSingleSelectorStyle(pickerTokens)(theme)), {
       [`${prefixCls}-success-status`]: status === "success"
     }, {
       [`${prefixCls}-error-status`]: status === "error"

package/dist/components/InternalPicker/pickers/SinglePicker/SinglePicker.utils.d.ts

@@ -1,12 +1,11 @@
 import { Dayjs } from 'dayjs';
 import { GenerateConfig } from 'rc-picker/lib/generate';
-import { Locale } from 'rc-picker/lib/interface';
+import { Locale, SharedPickerProps } from 'rc-picker/lib/interface';
 import { SinglePickerProps } from './SinglePicker.types';
 import { PickerLocale } from '../../config';
+export declare const defaultAllowClearConfig: SharedPickerProps["allowClear"];
+export declare const getAllowClearValue: (allowClearProp: SharedPickerProps["allowClear"]) => SharedPickerProps["allowClear"];
 export declare const defaultProps: {
-    allowClear: {
-        clearIcon: import("@emotion/react/jsx-runtime").JSX.Element;
-    };
     generateConfig: GenerateConfig<Dayjs>;
 };
 export declare const quarterFormats: Partial<Locale>;

package/dist/components/InternalPicker/pickers/SinglePicker/SinglePicker.utils.js

@@ -1,7 +1,7 @@
 import { jsx } from "@emotion/react/jsx-runtime";
 import { CloseCircleFilled } from "@infomaximum/icons";
 import dayjsGenerateConfig from "rc-picker/es/generate/dayjs.js";
-import { upperFirst, isUndefined, isNull, isNumber } from "lodash-es";
+import { upperFirst, isObject, isUndefined, isEmpty, isNull, isNumber } from "lodash-es";
 import dayjs from "dayjs";
 const fieldQuarterFormat = "Q-YYYY";
 const cellQuarterFormat = "Q";
@@ -57,10 +57,19 @@ const generateConfig = {
     }
   }
 };
+const defaultAllowClearConfig = {
+  clearIcon: /* @__PURE__ */ jsx(CloseCircleFilled, {})
+};
+const getAllowClearValue = (allowClearProp) => {
+  if (isObject(allowClearProp) && allowClearProp.clearIcon) {
+    return allowClearProp;
+  }
+  if (allowClearProp === true || isUndefined(allowClearProp) || isObject(allowClearProp) && (isEmpty(allowClearProp) || isUndefined(allowClearProp.clearIcon))) {
+    return defaultAllowClearConfig;
+  }
+  return false;
+};
 const defaultProps = {
-  allowClear: {
-    clearIcon: /* @__PURE__ */ jsx(CloseCircleFilled, {})
-  },
   generateConfig
 };
 const defaultFormats = {
@@ -99,8 +108,10 @@ const getSinglePlaceholder = (locale, picker, placeholder) => {
 };
 const minDate = dayjs("1900-01-01");
 export {
+  defaultAllowClearConfig,
   defaultFormats,
   defaultProps,
+  getAllowClearValue,
   getFormatByPicker,
   getSinglePlaceholder,
   minDate

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@infomaximum/ui-kit",
   "license": "Apache-2.0",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",