armtek-uikit-react 1.0.97 → 1.0.99

package/assets/Card.scss

@@ -4,4 +4,5 @@
   padding: $size-step;
   box-shadow: $box-shadow;
   border-radius: $radius;
+  background-color: #ffffff;
 }

package/package.json

@@ -1 +1 @@
-{"name":"armtek-uikit-react","version":"1.0.97","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.99","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.js

@@ -49,6 +49,8 @@ export const DateField = /*#__PURE__*/forwardRef((props, ref) => {
   const btnRef = useRef();
   const inputIcon = showTime && showTimeOnly ? 'schedule' : 'calendar_today';
   let dateValue = typeof realValue === 'string' ? new Date(realValue) : realValue;
+
+  //TODO Подключение Popover ломает тесты, разобраться почему
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(TextField, {
       ref: ref,

package/ui/Form/Select/Select.d.ts

@@ -6,6 +6,8 @@ type SelectBaseProps = {
     inline?: boolean;
     search?: boolean;
     open?: boolean;
+    onClose?: () => void;
+    defaultOpen?: boolean;
     listStyle?: SelectOptionsType<true>['listStyle'];
     onSelectAll?: () => void;
     onClearAll?: () => void;

package/ui/Form/Select/Select.js

@@ -24,6 +24,7 @@ function Select(props) {
   var _options$find;
   let {
     options,
+    defaultOpen,
     endAdornment,
     className,
     inline,
@@ -35,11 +36,12 @@ function Select(props) {
     open,
     listStyle,
     onSubmit,
+    onClose,
     onClearAll,
     onSelectAll,
     ...inputProps
   } = props;
-  let [active, setActive] = useState(false);
+  let [active, setActive] = useState(!!defaultOpen);
   let [selected, setSelected] = useState(defaultValue || (multiple ? [] : ''));
   let [focused, setFocused] = useState(false);
   let [q, setQ] = useState('');
@@ -113,6 +115,9 @@ function Select(props) {
   if (!!search) options = options.filter(item => item.text.toLowerCase().includes(q.toLowerCase()));
   let valueArr = realValue ? Array.isArray(realValue) ? realValue : [realValue] : [];
   let selectedOptions = options.filter(item => valueArr.includes(getOptionValue(item)));
+  const handleClose = () => {
+    if (onClose) onClose();else setActive(false);
+  };
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs("div", {
       className: css.select,
@@ -138,10 +143,11 @@ function Select(props) {
         disabled: inputProps.disabled,
         onDelete: handleSelect
       })]
-    }), anchorEl && /*#__PURE__*/_jsx(Popover, {
+    }), realActive && anchorEl && /*#__PURE__*/_jsx(Popover, {
+      matchWidth: true,
       anchorEl: anchorEl,
       open: realActive,
-      onClose: () => setActive(false),
+      onClose: handleClose,
       placement: 'bottom-start',
       children: /*#__PURE__*/_jsx(SelectOptions, {
         disabled: inputProps.disabled,

package/ui/Icon/Mi.js

@@ -13,12 +13,12 @@ export const Mi = props => {
       ...tooltipProps,
       text: title,
       children: /*#__PURE__*/_jsx(Icon, {
-        ...iconProps,
-        variant: 'outlined'
+        variant: 'outlined',
+        ...iconProps
       })
     }) : /*#__PURE__*/_jsx(Icon, {
-      ...iconProps,
-      variant: 'outlined'
+      variant: 'outlined',
+      ...iconProps
     })
   });
 };

package/ui/Popover/Popover.js

@@ -5,7 +5,7 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 export const Popover = props => {
   const {
     onClose,
-    matchWidth = true,
+    matchWidth = false,
     children,
     ...poperProps
   } = props;

package/ui/Popover/index.d.ts

@@ -1 +1,2 @@
 export { default } from './Popover';
+export * from './Popover';

package/ui/Popover/index.js

@@ -1 +1,2 @@
-export { default } from "./Popover";
+export { default } from "./Popover";
+export * from "./Popover";