armtek-uikit-react 1.0.26 → 1.0.28

package/assets/variables.scss

@@ -109,7 +109,9 @@ $box-shadow: 0px 8px 10px 0px rgba(0, 0, 0, 0.1);
   --box-shadow: 0px 8px 10px 0px rgba(0, 0, 0, 0.1);
 }
 
-
+.react-datepicker-popper{
+  z-index: 6;
+}
 
 
 @mixin transition($time: 0.5s, $target: all, $animation: ease) {

package/package.json

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

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

@@ -4,23 +4,16 @@ export type DateFieldProps = {
     format?: string;
     onInput?: (e: ChangeEvent<HTMLInputElement>) => void;
     onChange?: (value: Date | null) => void;
+    value?: Date | null;
     showTime?: boolean;
     showTimeOnly?: boolean;
-} & TextFieldProps;
+} & Omit<TextFieldProps, 'onChange' | 'value'>;
 declare const DateField: import("react").ForwardRefExoticComponent<{
     format?: string | undefined;
     onInput?: ((e: ChangeEvent<HTMLInputElement>) => void) | undefined;
     onChange?: ((value: Date | null) => void) | undefined;
+    value?: Date | null | undefined;
     showTime?: boolean | undefined;
     showTimeOnly?: boolean | undefined;
-} & {
-    label?: string | undefined;
-    size?: "large" | "small" | undefined;
-    variant?: import("../../../types/theme").VariantType | undefined;
-    error?: boolean | undefined;
-    success?: boolean | undefined;
-    helperText?: string | undefined;
-    endAdornment?: import("react").ReactNode;
-    multiline?: boolean | undefined;
-} & Omit<import("react").InputHTMLAttributes<any>, "size"> & import("react").RefAttributes<unknown>>;
+} & Omit<TextFieldProps, "value" | "onChange"> & import("react").RefAttributes<unknown>>;
 export default DateField;

package/ui/Form/DateField/DateField.js

@@ -2,6 +2,7 @@
 
 import TextField from "../TextField/TextField";
 import { forwardRef, useState } from 'react';
+import Card from "../../Card/Card";
 import DatePicker from "../DatePicker/DatePicker";
 import ButtonIcon from "../../ButtonIcon";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -33,6 +34,8 @@ const DateField = /*#__PURE__*/forwardRef((props, ref) => {
     onInput,
     showTime,
     showTimeOnly,
+    disabled,
+    value,
     ...restProps
   } = props;
   let [date, setDate] = useState(null);
@@ -41,10 +44,11 @@ const DateField = /*#__PURE__*/forwardRef((props, ref) => {
     setDate(d);
     if (onChange) onChange(d);
   };
+  let realValue = value !== undefined ? value : date;
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(DatePicker, {
       onChange: handleChange,
-      selected: date,
+      selected: realValue,
       showTimeSelect: !!showTime,
       timeIntervals: 15,
       showTimeSelectOnly: !!showTimeOnly && !!showTime,
@@ -54,12 +58,18 @@ const DateField = /*#__PURE__*/forwardRef((props, ref) => {
         ref: ref,
         ...restProps
       }),
-      inline: false
-      // calendarContainer={Card}
-      ,
+      inline: false,
+      disabled: disabled,
+      calendarContainer: PickerCard,
       popperPlacement: "top-end",
       dateFormat: format
     })
   });
 });
+const PickerCard = props => {
+  return /*#__PURE__*/_jsx(Card, {
+    className: props.className,
+    children: props.children
+  });
+};
 export default DateField;