@4i/modal-manager 1.1.33 → 1.1.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4i/modal-manager",
-  "version": "1.1.33",
+  "version": "1.1.40",
   "description": "",
   "main": "src/index.ts",
   "scripts": {

package/src/components/modal-provider.d.ts

@@ -7,6 +7,7 @@ interface ModalProviderProps {
     isOverflow?: boolean;
     className?: string;
     backdropClassName?: string;
+    onClickBackdrop?: (cb: any) => void;
     onModalStateChange?: (modalState: boolean, data: ModalData[], names: string[]) => void;
 }
 type ModalData = {

package/src/components/modal-provider.js

@@ -70,6 +70,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -127,7 +138,6 @@ var ModalProvider = function (_a) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        console.log("handleClose", position);
                         if (!(position === "all")) return [3 /*break*/, 5];
                         i = modals.length - 1;
                         _a.label = 1;
@@ -188,14 +198,19 @@ var ModalProvider = function (_a) {
         e.stopPropagation();
     };
     return (react_1.default.createElement(react_1.default.Fragment, null, modals.map(function (modalItem, index) {
-        var name = modalItem.name, payload = modalItem.payload, options = modalItem.options, id = modalItem.id;
+        var name = modalItem.name, payload = modalItem.payload, options = modalItem.options, id = modalItem.id, props = __rest(modalItem, ["name", "payload", "options", "id"]);
         var Modal = modalList[name] || (function () { return react_1.default.createElement("div", null,
             "Modal not found: ",
             name); });
         var hideBackdrop = (options === null || options === void 0 ? void 0 : options.hideBackdrop) || false;
         var extraClass = (options === null || options === void 0 ? void 0 : options.extraClass) || "";
         return (react_1.default.createElement("div", { key: id, "data-modal-id": id, "data-modal-index": index, className: "modal_container ".concat(extraClass) },
-            !hideBackdrop && (react_1.default.createElement("div", { onClick: function () { return handleCloseModal(index); }, className: "modal_backdrop" })),
+            !hideBackdrop && (react_1.default.createElement("div", { onClick: function () {
+                    var _a;
+                    (options === null || options === void 0 ? void 0 : options.onClickBackdrop)
+                        ? (_a = options === null || options === void 0 ? void 0 : options.onClickBackdrop) === null || _a === void 0 ? void 0 : _a.call(options, function () { return handleCloseModal(index); })
+                        : handleCloseModal(index);
+                }, className: "modal_backdrop" })),
             react_1.default.createElement("div", { className: "".concat(className, " modal_paper"), onClick: stopPropagation, ref: function (ref) { return saveModalRef(id, ref); } },
                 react_1.default.createElement(Modal, __assign({}, (payload.data || {}), { modalIndex: index })))));
     })));

package/src/components/modal-provider.tsx

@@ -10,6 +10,7 @@ interface ModalProviderProps {
   isOverflow?: boolean;
   className?: string;
   backdropClassName?: string;
+  onClickBackdrop?: (cb: any) => void;
   onModalStateChange?: (
     modalState: boolean,
     data: ModalData[],
@@ -81,7 +82,6 @@ const ModalProvider: React.FC<ModalProviderProps> = ({
     };
 
     const handleClose = async (position: number | string) => {
-      console.log("handleClose", position);
       if (position === "all") {
         // Закрыть все модальные окна с анимацией
         for (let i = modals.length - 1; i >= 0; i--) {
@@ -143,7 +143,7 @@ const ModalProvider: React.FC<ModalProviderProps> = ({
   return (
     <>
       {modals.map((modalItem, index) => {
-        const { name, payload, options, id } = modalItem;
+        const { name, payload, options, id, ...props } = modalItem;
         const Modal =
           modalList[name] || (() => <div>Modal not found: {name}</div>);
         const hideBackdrop = options?.hideBackdrop || false;
@@ -158,7 +158,11 @@ const ModalProvider: React.FC<ModalProviderProps> = ({
           >
             {!hideBackdrop && (
               <div
-                onClick={() => handleCloseModal(index)}
+                onClick={() => {
+                  options?.onClickBackdrop
+                    ? options?.onClickBackdrop?.(() => handleCloseModal(index))
+                    : handleCloseModal(index);
+                }}
                 className="modal_backdrop"
               />
             )}

package/src/utils/ModalManager.d.ts

@@ -18,6 +18,7 @@ export interface Options {
     hideBackdrop?: boolean;
     extraClass?: string;
     openMinimized?: boolean;
+    onClickBackdrop?: (cb: () => void) => void;
 }
 export declare class ModalManager extends Manager {
     queue: string[];

package/src/utils/ModalManager.js

@@ -32,7 +32,7 @@ var ModalManager = /** @class */ (function (_super) {
     function ModalManager() {
         var _this = _super.call(this) || this;
         _this.queue = [];
-        _this.modalData = new Map(); // Сохраняем данные для каждого модального окна
+        _this.modalData = new Map();
         _this.call = function (name, data, options) {
             var modalId = uniqueID();
             var id = _this.create(name, { modalId: modalId, data: data }, options);

package/src/utils/ModalManager.ts

@@ -26,11 +26,12 @@ export interface Options {
   hideBackdrop?: boolean;
   extraClass?: string;
   openMinimized?: boolean;
+  onClickBackdrop?: (cb: () => void) => void;
 }
 
 export class ModalManager extends Manager {
   queue: string[] = [];
-  modalData: Map<string, any> = new Map(); // Сохраняем данные для каждого модального окна
+  modalData: Map<string, any> = new Map();
   _openModalStateCallback: null | ((props: ModalState) => void);
 
   constructor() {