armtek-uikit-react 1.0.240 → 1.0.242

package/ui/Form/FormControls/FormControls.js

@@ -5,6 +5,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _clsx = _interopRequireDefault(require("clsx"));
 var _Button = _interopRequireDefault(require("../../Button"));
+var _const = require("./const");
 var _jsxRuntime = require("react/jsx-runtime");
 const FormControls = props => {
   const {
@@ -17,7 +18,7 @@ const FormControls = props => {
     ...divProps
   } = props;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: 'arm-form-controls',
+    className: _const.FORM_CONTROLS_CLASSNAME,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       ...divProps,
       className: (0, _clsx.default)(className, 'arm-form-controls__stack'),

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

@@ -0,0 +1 @@
+export declare const FORM_CONTROLS_CLASSNAME = "arm-form-controls";

package/ui/Form/FormControls/const.js

@@ -0,0 +1,5 @@
+"use strict";
+
+exports.__esModule = true;
+exports.FORM_CONTROLS_CLASSNAME = void 0;
+const FORM_CONTROLS_CLASSNAME = exports.FORM_CONTROLS_CLASSNAME = 'arm-form-controls';

package/ui/Form/Select/Select.js

@@ -59,12 +59,19 @@ function Select(props, ref) {
     return inputRef.current;
   }, []);
   const handleOpen = () => {
+    if (open !== undefined) return;
     if (!inputProps.disabled) {
       setActive(true);
       // if( e.target instanceof HTMLDivElement )
       // 	setAnchorEl(e.currentTarget)
     }
   };
+  function handleClose() {
+    if (onClose) onClose();else {
+      if (open !== undefined) return;
+      setActive(false);
+    }
+  }
   const handleSelect = (e, option) => {
     if (e.target.classList.contains(_const.CHECKBOX_LABEL_CLASSNAME)) {
       e.stopPropagation();
@@ -90,7 +97,7 @@ function Select(props, ref) {
     if (search && !multiple) {
       setQ(options.find(item => getOptionValue(item) === newValueS).text);
     }
-    if (!multiple) setActive(false);
+    if (!multiple) handleClose();
   };
   const handleSearch = e => {
     setQ(e.target.value);
@@ -148,9 +155,6 @@ function Select(props, ref) {
   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)));
-  function handleClose() {
-    if (onClose) onClose();else setActive(false);
-  }
   let displayClear = clear && (multiple ? realValue && realValue.length > 0 : !!realValue);
   let selectEndAdornment = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Adornment.default, {

package/ui/Modal/BaseModal.js

@@ -6,6 +6,7 @@ exports.BaseModal = void 0;
 var _clsx = _interopRequireDefault(require("clsx"));
 var _FormControls = _interopRequireDefault(require("../Form/FormControls"));
 var _ButtonIcon = _interopRequireDefault(require("../ButtonIcon"));
+var _const = require("./const");
 var _jsxRuntime = require("react/jsx-runtime");
 const BaseModal = props => {
   const {
@@ -44,12 +45,12 @@ const BaseModal = props => {
             })]
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: (0, _clsx.default)('arm-modal__body', classes == null ? void 0 : classes['Arm-Modal__body']),
+          className: (0, _clsx.default)(_const.MODAL_BODY_CLASSNAME, classes == null ? void 0 : classes['Arm-Modal__body']),
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             children: children
           })
         }), showControls && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: (0, _clsx.default)('arm-modal__footer', classes == null ? void 0 : classes['Arm-Modal__footer']),
+          className: (0, _clsx.default)(_const.MODAL_FOOTER_CLASSNAME, classes == null ? void 0 : classes['Arm-Modal__footer']),
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControls.default, {
             className: (0, _clsx.default)(classes == null ? void 0 : classes['Arm-FormControls'], 'arm-modal__controls'),
             onSubmit: onSubmit,

package/ui/Modal/Modal.js

@@ -8,8 +8,24 @@ var _react = require("react");
 var _BaseModal = require("./BaseModal");
 var _BackDrop = _interopRequireDefault(require("../BackDrop"));
 var _reactTransitionGroup = require("react-transition-group");
+var _const = require("../Form/FormControls/const");
+var _const2 = require("./const");
 var _jsxRuntime = require("react/jsx-runtime");
 const BACKDROP_CLASSNAME = 'arm-modal__backdrop';
+function replaceControlsIfExists(container, props) {
+  var _props$classes, _props$classes2;
+  if (!container) return;
+  const body = container.querySelector(`.${_const2.MODAL_BODY_CLASSNAME}`);
+  if (!body) return;
+  const controls = body.querySelectorAll(`.${_const.FORM_CONTROLS_CLASSNAME}`);
+  if (controls.length !== 1) return;
+  const footer = document.createElement("div");
+  footer.classList.add(_const2.MODAL_FOOTER_CLASSNAME);
+  if ((_props$classes = props.classes) != null && _props$classes['Arm-Modal__footer']) footer.classList.add((_props$classes2 = props.classes) == null ? void 0 : _props$classes2['Arm-Modal__footer']);
+  controls[0].remove();
+  footer.appendChild(controls[0]);
+  body.after(footer);
+}
 const Modal = props => {
   const {
     open,
@@ -30,6 +46,13 @@ const Modal = props => {
       document.removeEventListener('keyup', subscribeToEsc);
     };
   }, []);
+  (0, _react.useEffect)(() => {
+    replaceControlsIfExists(nodeRef.current, modalProps);
+  }, []);
+  const handleEntered = isAppearing => {
+    replaceControlsIfExists(nodeRef.current, modalProps);
+    transitionProps == null || transitionProps.onEntering == null || transitionProps.onEntering(isAppearing);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactTransitionGroup.CSSTransition, {
       classNames: {
@@ -46,6 +69,7 @@ const Modal = props => {
       mountOnEnter: true,
       unmountOnExit: true,
       ...transitionProps,
+      onEntering: handleEntered,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_BackDrop.default, {
         width: width,
         ref: nodeRef,

package/ui/Modal/const.d.ts

@@ -0,0 +1,2 @@
+export declare const MODAL_BODY_CLASSNAME = "arm-modal__body";
+export declare const MODAL_FOOTER_CLASSNAME = "arm-modal__footer";

package/ui/Modal/const.js

@@ -0,0 +1,6 @@
+"use strict";
+
+exports.__esModule = true;
+exports.MODAL_FOOTER_CLASSNAME = exports.MODAL_BODY_CLASSNAME = void 0;
+const MODAL_BODY_CLASSNAME = exports.MODAL_BODY_CLASSNAME = 'arm-modal__body';
+const MODAL_FOOTER_CLASSNAME = exports.MODAL_FOOTER_CLASSNAME = 'arm-modal__footer';