armtek-uikit-react 1.0.116 → 1.0.118

package/assets/Checkbox.scss

@@ -6,6 +6,9 @@
 .checkbox__input{
   display: none;
 }
+.checkbox__text_raw{
+  padding-top: 2px;
+}
 .checkbox__label{
   cursor: pointer;
   text-align: left;
@@ -13,22 +16,21 @@
   display: block;
   font-size: 16px;
   line-height: 1.2;
-  width:22px;
-  height: 22px;
+  min-height: 22px;
   & .checkbox__text{
     display: block;
     padding-left: 31px;
   }
   &:before{
-    width: 100%;
-    height: 100%;
+    width:22px;
+    height: 22px;
     border-radius: $radius;
     border: 1px solid $color-gray-700;
     background: #fff;
     position: absolute;
     content: '';
     left: 0;
-    top: -3px;
+    top: 0px;
     box-sizing: border-box;
   }
   &:after{
@@ -36,7 +38,7 @@
     position: absolute;
     transform: rotate(45deg);
     left: 8px;
-    top: 1px;
+    top: 4px;
     width: 7px;
     height: 11px;
     border-bottom: 2px solid;
@@ -44,61 +46,61 @@
     display: none;
     box-sizing: border-box;
   }
-  & span{
-    display: inline-block;
-    padding-left: 5px;
-  }
 }
 
 .checkbox_medium{
-  width:18px;
-  height: 18px;
+  min-height: 18px;
   & .checkbox__text{
     //padding-left: 27px;
   }
+  &:before{
+    width:18px;
+    height: 18px;
+  }
   &:after{
     left: 6px;
     top: 2px;
     width: 6px;
     height: 10px;
   }
-  &:before{
-    top:-1px;
+  & .checkbox__text_raw{
+    padding-top: 0px;
   }
 }
 .checkbox_small{
   font-size: 14px;
-  width:16px;
-  height: 16px;
+  min-height: 16px;
   & .checkbox__text{
     padding-left: 25px;
   }
+  &:before{
+    width:16px;
+    height: 16px;
+  }
   &:after{
     left: 5px;
-    top: 1px;
+    top: 3px;
     height: 8px;
     width: 6px;
   }
-  &:before{
-    top: -2px;
-  }
 }
 .checkbox__label_intermediate{
   &:after{
     border-left: none;
     width: 14px;
     transform: none;
-    top: 7px;
+    top: 10px;
     height: 0;
     left: 4px;
     border-right: none;
   }
   &.checkbox_medium:after{
     width: 11px;
+    top: 8px;
   }
   &.checkbox_small:after{
     width: 9px;
-    top: 5px;
+    top: 7px;
   }
 }
 

package/assets/global.css

@@ -198,8 +198,19 @@ body{
 
 .border-radius {border-radius: var(--border-radius)}
 
+.w-full{width: 100%}
+.h-full{height: 100%}
+
+.border-top{ border-top: 1px solid}
+.border-bottom{ border-top: 1px solid}
+.border-gray-50{ border-color: var(--color-gray-50)}
+.border-gray-100{ border-color: var(--color-gray-100)}
+.border-gray-200{ border-color: var(--color-gray-200)}
+.border-gray-300{ border-color: var(--color-gray-300)}
+
 .flex{display: flex}
 .block{display: block}
+.d-none{display: none}
 .items-center {align-items: center}
 .flex-wrap {flex-wrap: wrap}
 .justify-center {justify-content: center}

package/package.json

@@ -1 +1 @@
-{"name":"armtek-uikit-react","version":"1.0.116","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.118","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/ButtonIcon/ButtonIcon.js

@@ -10,6 +10,8 @@ const ButtonIconClasses = ['button_icon'];
 function ButtonIcon(props) {
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(Button, {
+      color: 'neutral',
+      variant: 'transparent',
       ...props,
       asIcon: true,
       className: clsx(css.button_icon, css['button_icon_' + props.size], props.className),

package/ui/Form/Checkbox/Checkbox.js

@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from 'react';
+import { isValidElement, useState } from 'react';
 import clsx from 'clsx';
 import css from "./Checkbox.module.scss";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -43,7 +43,9 @@ const Checkbox = props => {
           onChange: handleChange,
           type: props.type || 'checkbox'
         }), label && /*#__PURE__*/_jsx("span", {
-          className: css.checkbox__text,
+          className: clsx(css.checkbox__text, {
+            [css.checkbox__text_raw]: ! /*#__PURE__*/isValidElement(label)
+          }),
           children: label
         })]
       })

package/ui/Form/DateField/DateField.js

@@ -57,7 +57,6 @@ export const DateField = /*#__PURE__*/forwardRef((props, ref) => {
   const inputIcon = showTime && showTimeOnly ? 'schedule' : 'calendar_today';
   let dateValue = typeof realValue === 'string' ? new Date(realValue) : realValue;
   if (!(dateValue instanceof Date && !isNaN(dateValue.getDate()))) dateValue = null;
-  console.log(dateValue);
 
   //TODO Подключение Popover ломает тесты, разобраться почему
   return /*#__PURE__*/_jsxs(_Fragment, {