armtek-uikit-react 1.0.106 → 1.0.108

package/assets/Icon.scss

@@ -18,4 +18,14 @@
 .Icon_color_success{color:var(--color-success)}
 .Icon_color_info{color:var(--color-info)}
 .Icon_color_warning{color:var(--color-warning)}
-.Icon_color_error{color:var(--color-error)}
+.Icon_color_error{color:var(--color-error)}
+
+.Icon_theme_dark {
+  //&.Icon_color_primary{color: var(--color-primary-contrast)}
+  //&.Icon_color_secondary{color: var(--color-secondary-contrast)}
+  &.Icon_color_neutral{color: var(--color-neutral-contrast)}
+  //&.Icon_color_success{color:var(--color-success-contrast)}
+  //&.Icon_color_info{color:var(--color-info-contrast)}
+  //&.Icon_color_warning{color:var(--color-warning-contrast)}
+  //&.Icon_color_error{color:var(--color-error-contrast)}
+}

package/assets/styles.scss

@@ -1,6 +1,7 @@
 //@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap');
 //@import url('https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200');
 
+@import "global.css";
 @import "variables";
 @import "Button";
 @import "Adornment";

package/package.json

@@ -1 +1 @@
-{"name":"armtek-uikit-react","version":"1.0.106","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.108","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,8 @@
 import { TextFieldProps } from '../TextField/TextField';
-import { ChangeEvent } from 'react';
-export type DateFieldProps = {
+import { ChangeEvent, MouseEvent } from 'react';
+import { DatePickerProps } from '../DatePicker/DatePicker';
+type OwnProps = {
+    onClick?: (e: MouseEvent) => void;
     format?: string;
     onInput?: (e: ChangeEvent<HTMLInputElement>) => void;
     onChange?: (e: ChangeEvent<HTMLInputElement> & {
@@ -9,15 +11,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 & Omit<DatePickerProps, keyof OwnProps>;
+export declare const DateField: import("react").ForwardRefExoticComponent<OwnProps & Omit<DatePickerProps, keyof OwnProps> & import("react").RefAttributes<unknown>>;
 export default DateField;

package/ui/Form/DateField/DateField.js

@@ -14,12 +14,13 @@ export const DateField = /*#__PURE__*/forwardRef((props, ref) => {
   let {
     onChange,
     format = 'dd.MM.yyyy',
+    inputProps,
     onInput,
     showTime,
     showTimeOnly,
     disabled,
     value,
-    ...restProps
+    ...datepickerProps
   } = props;
   let [date, setDate] = useState(null);
   let [open, setOpen] = useState(false);
@@ -54,7 +55,7 @@ export const DateField = /*#__PURE__*/forwardRef((props, ref) => {
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(TextField, {
       ref: ref,
-      ...restProps,
+      ...inputProps,
       value: (dateValue == null ? void 0 : dateValue.toLocaleDateString('ru-RU')) || '',
       onChange: () => null,
       endAdornment: /*#__PURE__*/_jsx(ButtonIcon, {
@@ -80,16 +81,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>>;

package/ui/Icon/Icon.d.ts

@@ -1,10 +1,11 @@
 import { ComponentPropsWithoutRef } from 'react';
-import { ColorStatusType, ColorType, SizeType, VariantType } from '../../types/theme';
+import { ColorStatusType, ColorType, SizeType, ThemeType, VariantType } from '../../types/theme';
 type OwnProps = {
     icon: string;
     variant?: VariantType;
     color?: ColorType | ColorStatusType;
     size?: SizeType;
+    theme?: ThemeType;
     fs?: number;
 };
 export type IconProps = OwnProps & Omit<ComponentPropsWithoutRef<'span'>, keyof OwnProps>;

package/ui/Icon/Icon.js

@@ -9,6 +9,7 @@ const Icon = /*#__PURE__*/forwardRef((props, ref) => {
     className,
     size,
     icon,
+    theme,
     variant = 'outlined',
     color,
     fs,
@@ -20,13 +21,15 @@ const Icon = /*#__PURE__*/forwardRef((props, ref) => {
       ...spanProps,
       className: clsx(className, 'Arm-Icon', {
         [css['Icon_size_' + size]]: size,
+        [css['Icon_theme_' + theme]]: theme,
         'mi': variant === 'outlined',
         'mis': variant === 'contained',
         [css['Icon_color_' + color]]: color
       }),
       style: fs ? {
+        ...spanProps.style,
         fontSize: fs + 'px'
-      } : undefined,
+      } : spanProps.style,
       children: icon || children
     })
   });