armtek-uikit-react 1.0.63 → 1.0.65

package/assets/global.css

@@ -40,6 +40,63 @@ body{
 .text_success{
     color: #0BD998;
 }
+
+.app{
+    --font-family: 'Roboto';
+    --size-elarge: 56px;
+    --size-large: 42px;
+    --size-medium: 36px;
+    --size-small: 30px;
+    --size-step: 8px;
+    --border-radius: 4px;
+
+    --color-primary: #0D46FF;
+    --color-primary-dark: #0B3CD9;
+    --color-primary-light: #0B3CD9;
+    --color-blue-800: #406DFF;
+    --color-blue-A100: #D9E2FF;
+    --color-blue-50: #F2F5FF;
+
+    --color-info: #0D46FF;
+    --color-info-dark: #0B3CD9;
+
+    --color-secondary: #FF7F00;
+    --color-secondary-dark: #D96C00;
+    --color-secondary-light: #FFA140;
+    --color-orange-800: #FF9426;
+    --color-orange-400: #FFC68C;
+    --color-orange-300: #FFD3A6;
+    --color-orange-100: #FFE6CC;
+    --color-orange-50: #FFF8F0;
+
+    --color-neutral: #4D5359;
+    --color-neutral-dark: #40454A;
+    --color-neutral-light: #9AA4AE;
+    --color-gray-900: #212529;
+    --color-gray-800: #40454A;
+    --color-gray-700: #4D5359;
+    --color-gray-600: #6C757D;
+    --color-gray-500: #9AA4AE;
+    --color-gray-400: #B1BCC6;
+    --color-gray-300: #D3DAE1;
+    --color-gray-200: #DFE2E6;
+    --color-gray-100: #E9ECEF;
+    --color-gray-50: #F8F9FA;
+
+    --color-green-50: #F2FFFB;
+
+    --color-success: #0BD998;
+    --color-success-dark: #08996B;
+    --color-error: #FF3342;
+    --color-error-dark: #CC2935;
+    --color-warning: #FFC61A;
+    --color-warning-dark: #F7B519;
+
+    --color-red-50: #FFF0F1;
+
+    --box-shadow: 0px 8px 10px 0px rgba(0, 0, 0, 0.1);
+}
+
 .material_icon {
     font-family: 'Material Symbols Outlined';
     font-weight: normal;

package/assets/variables.scss

@@ -57,61 +57,7 @@ $color-red-100: #FCE1E1;
 
 $box-shadow: 0px 8px 10px 0px rgba(0, 0, 0, 0.1);
 
-.app{
-  --font-family: 'Roboto';
-  --size-elarge: 56px;
-  --size-large: 42px;
-  --size-medium: 36px;
-  --size-small: 30px;
-  --size-step: 8px;
-  --border-radius: 4px;
 
-  --color-primary: #0D46FF;
-  --color-primary-dark: #0B3CD9;
-  --color-primary-light: #0B3CD9;
-  --color-blue-800: #406DFF;
-  --color-blue-A100: #D9E2FF;
-  --color-blue-50: #F2F5FF;
-
-  --color-info: #0D46FF;
-  --color-info-dark: #0B3CD9;
-
-  --color-secondary: #FF7F00;
-  --color-secondary-dark: #D96C00;
-  --color-secondary-light: #FFA140;
-  --color-orange-800: #FF9426;
-  --color-orange-400: #FFC68C;
-  --color-orange-300: #FFD3A6;
-  --color-orange-100: #FFE6CC;
-  --color-orange-50: #FFF8F0;
-
-  --color-neutral: #4D5359;
-  --color-neutral-dark: #40454A;
-  --color-neutral-light: #9AA4AE;
-  --color-gray-900: #212529;
-  --color-gray-800: #40454A;
-  --color-gray-700: #4D5359;
-  --color-gray-600: #6C757D;
-  --color-gray-500: #9AA4AE;
-  --color-gray-400: #B1BCC6;
-  --color-gray-300: #D3DAE1;
-  --color-gray-200: #DFE2E6;
-  --color-gray-100: #E9ECEF;
-  --color-gray-50: #F8F9FA;
-
-  --color-green-50: #F2FFFB;
-
-  --color-success: #0BD998;
-  --color-success-dark: #08996B;
-  --color-error: #FF3342;
-  --color-error-dark: #CC2935;
-  --color-warning: #FFC61A;
-  --color-warning-dark: #F7B519;
-
-  --color-red-50: #FFF0F1;
-
-  --box-shadow: 0px 8px 10px 0px rgba(0, 0, 0, 0.1);
-}
 
 .react-datepicker-popper{
   z-index: 6;

package/package.json

@@ -1 +1 @@
-{"name":"armtek-uikit-react","version":"1.0.63","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":"*"},"peerDependencies":{"react":"*","react-dom":"*"},"scripts":{"pub":"npm version patch && npm publish"}}
+{"name":"armtek-uikit-react","version":"1.0.65","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":"*"},"peerDependencies":{"react":"*","react-dom":"*"},"scripts":{"pub":"npm version patch && npm publish"}}

package/ui/BackDrop/BackDropBase.d.ts

@@ -1,7 +1,7 @@
 import { ReactNode, MouseEvent } from 'react';
 export type BackDropProps = {
     children: ReactNode;
-    width: number;
+    width?: number;
     onClick?: (e: MouseEvent<HTMLDivElement>) => void;
 };
 export declare const BackDropBase: (props: BackDropProps) => import("react/jsx-runtime").JSX.Element;

package/ui/BackDrop/BackDropBase.js

@@ -5,7 +5,7 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 export const BackDropBase = props => {
   const {
     children,
-    width,
+    width = 500,
     onClick
   } = props;
   const handleClick = e => {

package/ui/Form/FormControls/FormControls.d.ts

@@ -9,6 +9,10 @@ export type FormControlsProps = {
     cancelProps?: Omit<ButtonProps<'button'>, 'children'> & {
         text: string;
     };
+    classes?: {
+        submitBtn?: string;
+        cancelBtn?: string;
+    };
 } & ComponentPropsWithoutRef<'div'>;
 declare const FormControls: (props: FormControlsProps) => import("react/jsx-runtime").JSX.Element;
 export default FormControls;

package/ui/Form/FormControls/FormControls.js

@@ -11,11 +11,13 @@ const FormControls = props => {
     submitProps,
     cancelProps,
     className,
+    classes,
     ...divProps
   } = props;
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsxs("div", {
-      className: clsx('Arm-FormControls', css.FormControls),
+      ...divProps,
+      className: clsx(className, 'Arm-FormControls', css.FormControls),
       children: [/*#__PURE__*/_jsx("div", {
         className: clsx('Arm-FormControls__button', css.FormControls__button),
         children: /*#__PURE__*/_jsx(Button, {
@@ -23,7 +25,7 @@ const FormControls = props => {
           color: 'primary',
           onClick: onSubmit,
           ...submitProps,
-          className: clsx('Arm-FormControls__btn', css.FormControls__btn),
+          className: clsx('Arm-FormControls__btn', classes == null ? void 0 : classes.submitBtn, css.FormControls__btn),
           children: submitProps == null ? void 0 : submitProps.text
         })
       }), onCancel && /*#__PURE__*/_jsx("div", {
@@ -33,7 +35,7 @@ const FormControls = props => {
           color: 'primary',
           onClick: onCancel,
           ...cancelProps,
-          className: clsx('Arm-FormControls__btn', css.FormControls__btn),
+          className: clsx('Arm-FormControls__btn', classes == null ? void 0 : classes.cancelBtn, css.FormControls__btn),
           children: cancelProps == null ? void 0 : cancelProps.text
         })
       })]

package/ui/Form/Period/Period.js

@@ -48,8 +48,10 @@ const Period = /*#__PURE__*/forwardRef((props, ref) => {
           variant: 'transparent',
           color: 'neutral',
           onClick: handleClick,
-          className: 'material_icon',
-          children: "calendar_today"
+          children: /*#__PURE__*/_jsx("span", {
+            className: 'material_icon',
+            children: "calendar_today"
+          })
         })
       }), active && /*#__PURE__*/_jsx(Card, {
         className: css.dateField__picker,

package/ui/Form/Select/Select.js

@@ -86,6 +86,7 @@ function Select(props) {
       children: endAdornment
     }), /*#__PURE__*/_jsx(ButtonIcon, {
       size: 'small',
+      color: 'neutral',
       variant: 'transparent',
       children: /*#__PURE__*/_jsx("span", {
         className: 'material_icon',

package/ui/Modal/BaseModal.d.ts

@@ -1,7 +1,7 @@
 import { ComponentPropsWithoutRef, MouseEvent } from 'react';
 import { FormControlsProps } from '../../ui/Form/FormControls';
-export type BaseModalProps = ComponentPropsWithoutRef<'div'> & FormControlsProps & {
-    onClose: (e: MouseEvent) => void;
+export type BaseModalProps = ComponentPropsWithoutRef<'div'> & Partial<FormControlsProps> & {
+    onClose?: (e: MouseEvent) => void;
     classes?: Record<string, string>;
 };
 export declare const BaseModal: (props: BaseModalProps) => import("react/jsx-runtime").JSX.Element;

package/ui/Modal/BaseModal.js

@@ -18,7 +18,7 @@ export const BaseModal = props => {
     classes,
     ...divProps
   } = props;
-  const showControls = !!onSubmit || !!onCancel;
+  const showControls = !!onSubmit;
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsxs("div", {
       ...divProps,

package/ui/Modal/Modal.js

@@ -2,7 +2,6 @@ import { BaseModal } from "./BaseModal";
 import BackDrop from "../BackDrop";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-//TODO Написать тесты
 const Modal = props => {
   const {
     open,
@@ -15,8 +14,7 @@ const Modal = props => {
       width: width,
       onClick: modalProps.onClose,
       children: /*#__PURE__*/_jsx(BaseModal, {
-        ...modalProps,
-        className: 'moasda'
+        ...modalProps
       })
     })
   });

package/ui/Table/Table.js

@@ -5,7 +5,6 @@ import css from "./Table.module.scss";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-// TODO TESTS
 export function Table(props) {
   const {
     className,