armtek-uikit-react 1.0.107 → 1.0.109

package/package.json

@@ -1 +1 @@
-{"name":"armtek-uikit-react","version":"1.0.107","description":"Armtek UIKit for React","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"build":"^0.1.4","clsx":"^2.0.0","rc-slider":"^10.2.1","react":"*","react-datepicker":"^4.16.0","react-dom":"*","react-transition-group":"^4.4.5"},"peerDependencies":{"react":"*","react-dom":"*"},"scripts":{"pub":"npm version patch && npm publish"}}
+{"name":"armtek-uikit-react","version":"1.0.109","description":"Armtek UIKit for React","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"build":"^0.1.4","clsx":"^2.0.0","rc-slider":"^10.2.1","react":"*","react-datepicker":"^4.16.0","react-dom":"*","react-transition-group":"^4.4.5"},"peerDependencies":{"react":"*","react-dom":"*"},"scripts":{"pub":"npm version patch && npm publish"}}

package/ui/Form/DateField/DateField.d.ts

@@ -1,6 +1,9 @@
 import { TextFieldProps } from '../TextField/TextField';
-import { ChangeEvent } from 'react';
-export type DateFieldProps = {
+import { ChangeEvent, MouseEvent } from 'react';
+import { DatePickerProps } from '../DatePicker/DatePicker';
+type BaseInputProps = Pick<TextFieldProps, 'label' | 'className' | 'placeholder'>;
+type OwnProps = {
+    onClick?: (e: MouseEvent) => void;
     format?: string;
     onInput?: (e: ChangeEvent<HTMLInputElement>) => void;
     onChange?: (e: ChangeEvent<HTMLInputElement> & {
@@ -9,15 +12,8 @@ export type DateFieldProps = {
     value?: Date | string | null;
     showTime?: boolean;
     showTimeOnly?: boolean;
-} & Omit<TextFieldProps, 'onChange' | 'value'>;
-export declare const DateField: import("react").ForwardRefExoticComponent<{
-    format?: string | undefined;
-    onInput?: ((e: ChangeEvent<HTMLInputElement>) => void) | undefined;
-    onChange?: ((e: ChangeEvent<HTMLInputElement> & {
-        value: Date | null;
-    }) => void) | undefined;
-    value?: string | Date | null | undefined;
-    showTime?: boolean | undefined;
-    showTimeOnly?: boolean | undefined;
-} & Omit<TextFieldProps, "value" | "onChange"> & import("react").RefAttributes<unknown>>;
+    inputProps?: Omit<TextFieldProps, 'onChange' | 'value'>;
+};
+export type DateFieldProps = OwnProps & BaseInputProps & Omit<DatePickerProps, keyof OwnProps>;
+export declare const DateField: import("react").ForwardRefExoticComponent<OwnProps & BaseInputProps & Omit<DatePickerProps, keyof OwnProps> & import("react").RefAttributes<any>>;
 export default DateField;

package/ui/Form/DateField/DateField.js

@@ -14,12 +14,16 @@ export const DateField = /*#__PURE__*/forwardRef((props, ref) => {
   let {
     onChange,
     format = 'dd.MM.yyyy',
+    inputProps,
     onInput,
+    label,
+    placeholder,
+    className,
     showTime,
     showTimeOnly,
     disabled,
     value,
-    ...restProps
+    ...datepickerProps
   } = props;
   let [date, setDate] = useState(null);
   let [open, setOpen] = useState(false);
@@ -54,7 +58,10 @@ export const DateField = /*#__PURE__*/forwardRef((props, ref) => {
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(TextField, {
       ref: ref,
-      ...restProps,
+      label: label,
+      placeholder: placeholder,
+      className: className,
+      ...inputProps,
       value: (dateValue == null ? void 0 : dateValue.toLocaleDateString('ru-RU')) || '',
       onChange: () => null,
       endAdornment: /*#__PURE__*/_jsx(ButtonIcon, {
@@ -80,16 +87,17 @@ export const DateField = /*#__PURE__*/forwardRef((props, ref) => {
             width: '100%'
           },
           children: /*#__PURE__*/_jsx(DatePicker, {
+            timeIntervals: 15,
+            calendarContainer: PickerCard,
+            popperPlacement: "top-end",
+            dateFormat: format,
+            ...datepickerProps,
             onChange: handleChange,
             selected: dateValue,
             showTimeSelect: !!showTime,
-            timeIntervals: 15,
             showTimeSelectOnly: !!showTimeOnly && !!showTime,
-            inline: true,
             disabled: disabled,
-            calendarContainer: PickerCard,
-            popperPlacement: "top-end",
-            dateFormat: format
+            inline: true
           })
         })
       })

package/ui/Form/DatePicker/DatePicker.d.ts

@@ -1,5 +1,8 @@
 import { ReactDatePickerProps } from 'react-datepicker';
 import '!style-loader!css-loader!./styles.css';
+export type DatePickerProps<T extends boolean | undefined = undefined> = {
+    selectsRange?: T;
+} & Omit<ReactDatePickerProps<never, T>, 'selectsRange'>;
 declare const DatePicker: import("react").ForwardRefExoticComponent<{
     selectsRange?: boolean | undefined;
 } & Omit<ReactDatePickerProps<never, boolean | undefined>, "selectsRange"> & import("react").RefAttributes<unknown>>;