armtek-uikit-react 1.0.52 → 1.0.54

package/package.json

@@ -1 +1 @@
-{"name":"armtek-uikit-react","version":"1.0.52","description":"Armtek UIKit for React","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"@tinymce/tinymce-react":"^4.3.2","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.54","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/BackDrop.js

@@ -6,14 +6,14 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 const BackDrop = props => {
   const {
     children,
-    width
+    ...backDropProps
   } = props;
   const childrenProp = /*#__PURE__*/isValidElement(children) ? children : /*#__PURE__*/_jsx("span", {
     children: children
   });
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/createPortal( /*#__PURE__*/_jsx(BackDropBase, {
-      width: width,
+      ...backDropProps,
       children: childrenProp
     }), document.body)
   });

package/ui/BackDrop/BackDropBase.d.ts

@@ -1,6 +1,7 @@
-import { ReactNode } from 'react';
+import { ReactNode, MouseEvent } from 'react';
 export type BackDropProps = {
     children: ReactNode;
     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,11 +5,20 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 export const BackDropBase = props => {
   const {
     children,
-    width
+    width,
+    onClick
   } = props;
+  const handleClick = e => {
+    if (e.target instanceof Element) {
+      if (e.target.classList.contains('Arm-BackDropBase')) {
+        if (onClick) onClick(e);
+      }
+    }
+  };
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx("div", {
       className: clsx('Arm-BackDropBase', css.BackDropBase),
+      onClick: handleClick,
       children: /*#__PURE__*/_jsx("div", {
         className: css.BackDropBase__inner,
         style: {

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

@@ -3,10 +3,10 @@ import { ComponentPropsWithoutRef, MouseEvent } from 'react';
 export type FormControlsProps = {
     onSubmit: (e: MouseEvent<HTMLButtonElement>) => void;
     onCancel?: (e: MouseEvent<HTMLButtonElement>) => void;
-    submitProps?: Omit<ButtonProps, 'children'> & {
+    submitProps?: Omit<ButtonProps<'button'>, 'children'> & {
         text: string;
     };
-    cancelProps?: Omit<ButtonProps, 'children'> & {
+    cancelProps?: Omit<ButtonProps<'button'>, 'children'> & {
         text: string;
     };
 } & ComponentPropsWithoutRef<'div'>;

package/ui/Modal/BaseModal.d.ts

@@ -1,6 +1,7 @@
 import { ComponentPropsWithoutRef, MouseEvent } from 'react';
 import { FormControlsProps } from '../../ui/Form/FormControls';
 export type BaseModalProps = ComponentPropsWithoutRef<'div'> & FormControlsProps & {
-    onClose: (e: MouseEvent<HTMLButtonElement>) => void;
+    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

@@ -15,21 +15,22 @@ export const BaseModal = props => {
     onCancel,
     submitProps,
     cancelProps,
+    classes,
     ...divProps
   } = props;
   const showControls = !!onSubmit || !!onCancel;
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsxs("div", {
       ...divProps,
-      className: clsx(className, 'Arm-Modal', css.Modal),
+      className: clsx(className, 'Arm-Modal', classes['Arm-Modal'], css.Modal),
       children: [title && /*#__PURE__*/_jsx("div", {
-        className: clsx('Arm-Modal__header', css.Modal__header),
+        className: clsx('Arm-Modal__header', classes['Arm-Modal__header'], css.Modal__header),
         children: /*#__PURE__*/_jsxs("div", {
-          className: clsx('Arm-Modal__title', css.Modal__title),
+          className: clsx('Arm-Modal__title', classes['Arm-Modal__title'], css.Modal__title),
           children: [title, onClose && /*#__PURE__*/_jsx(ButtonIcon, {
             variant: 'transparent',
             onClick: onClose,
-            className: clsx('Arm-Modal__close', css.Modal__close),
+            className: clsx('Arm-Modal__close', classes['Arm-Modal__close'], css.Modal__close),
             color: 'neutral',
             size: 'medium',
             children: /*#__PURE__*/_jsx("span", {
@@ -39,12 +40,12 @@ export const BaseModal = props => {
           })]
         })
       }), /*#__PURE__*/_jsx("div", {
-        className: clsx('Arm-Modal__body', css.Modal__body),
+        className: clsx('Arm-Modal__body', classes['Arm-Modal__body'], css.Modal__body),
         children: /*#__PURE__*/_jsx("div", {
           children: children
         })
       }), showControls && /*#__PURE__*/_jsx("div", {
-        className: clsx('Arm-Modal__footer', css.Modal__footer),
+        className: clsx('Arm-Modal__footer', classes['Arm-Modal__footer'], css.Modal__footer),
         children: /*#__PURE__*/_jsx(FormControls, {
           onSubmit: onSubmit,
           onCancel: onCancel,

package/ui/Modal/Modal.js

@@ -2,6 +2,7 @@ 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,
@@ -12,6 +13,7 @@ const Modal = props => {
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(BackDrop, {
       width: width,
+      onClick: modalProps.onClose,
       children: /*#__PURE__*/_jsx(BaseModal, {
         ...modalProps,
         className: 'moasda'