aio-popup 6.5.0 → 6.6.1

package/index.d.ts

@@ -31,6 +31,8 @@ export type AP_modal = {
     animate?: boolean;
     fitHorizontal?: boolean;
     setAttrs?: AP_setAttrs;
+    pageSelector?: string;
+    focus?: boolean;
 };
 export type AP_alert = {
     rtl?: boolean;

package/index.js

@@ -16,9 +16,15 @@ import $ from 'jquery';
 import './index.css';
 const CTX = createContext({});
 function Align(p) {
-    let { modal, target, fitHorizontal, rtl, limitTo } = p;
+    let { modal, target, fitHorizontal, rtl, limitTo, pageSelector } = p;
     const bodyWidth = window.innerWidth, bodyHeight = window.innerHeight;
     let pageLimit = { left: 0, top: 0, bottom: bodyHeight, right: bodyWidth, width: bodyWidth, height: bodyHeight };
+    if (pageSelector) {
+        let page = modal.parents(pageSelector);
+        if (page.length) {
+            pageLimit = getBound(page[0]);
+        }
+    }
     let targetLimit = getBound(target[0]);
     let domLimit = getBound(modal[0]);
     targetLimit = Object.assign({}, targetLimit);
@@ -149,7 +155,7 @@ const usePopup = (props) => {
         if (!item || item.onClose === false) {
             return;
         }
-        let newItems = items.filter((o, i) => o.id !== id);
+        let newItems = items.filter((o) => o.id !== id);
         setSnackebarItems(newItems);
         if (typeof item.onClose === 'function') {
             item.onClose();
@@ -253,9 +259,9 @@ const Prompt = ({ change, placeholder }) => {
     return (_jsx("textarea", { placeholder: placeholder, value: text, onChange: (e) => { const value = e.target.value; setText(value); change(value); } }));
 };
 const POPUPCTX = createContext({});
-const Popup = ({ modal, isLast, renderCaller }) => {
+const Popup = ({ modal, isLast }) => {
     const mainContext = useContext(CTX);
-    let { setAttrs = () => { return {}; }, id, position = 'fullscreen', getTarget } = modal;
+    let { setAttrs = () => { return {}; }, position = 'fullscreen', getTarget } = modal;
     let [temp] = useState({ dom: createRef(), backdropDom: createRef(), dui: undefined });
     let [popoverStyle, setPopoverStyle] = useState({});
     let modalMouseDown = useRef(false);
@@ -278,7 +284,9 @@ const Popup = ({ modal, isLast, renderCaller }) => {
             let popup = $(temp.dom.current);
             popup.removeClass('not-mounted');
             $(temp.backdropDom.current).removeClass('not-mounted');
-            popup.focus();
+            if (modal.focus !== false) {
+                popup.focus();
+            }
         }, 0);
         $(window).unbind('click', handleBackClick);
         $(window).bind('click', handleBackClick);
@@ -307,7 +315,7 @@ const Popup = ({ modal, isLast, renderCaller }) => {
         if (!target || !target.length) {
             return {};
         }
-        let p = { modal: $(temp.dom.current), target, fitHorizontal: modal.fitHorizontal, limitTo: modal.limitTo, attrs, rtl: mainContext.rtl };
+        let p = { modal: $(temp.dom.current), target, fitHorizontal: modal.fitHorizontal, limitTo: modal.limitTo, attrs, rtl: mainContext.rtl, pageSelector: modal.pageSelector };
         let style = Align(p);
         let res = Object.assign(Object.assign({}, style), { position: 'absolute' });
         return res;
@@ -324,7 +332,7 @@ const Popup = ({ modal, isLast, renderCaller }) => {
     function mouseUp() {
         setTimeout(() => modalMouseDown.current = false, 0);
     }
-    function mouseDown(e) {
+    function mouseDown() {
         modalMouseDown.current = true;
         $(window).unbind('mouseup', mouseUp);
         $(window).bind('mouseup', mouseUp);
@@ -790,7 +798,10 @@ export class Loading {
             return (`
             <div class="aio-loading-container-0">
                 <div class="aio-loading-0">
-                    ${new Array(5).fill(0).map((o, i) => this.getLoaderItem_0(`0.${i}`)).join(' ')}
+                    ${new Array(5).fill(0).map((o, i) => {
+                if (o) { }
+                return this.getLoaderItem_0(`0.${i}`);
+            }).join(' ')}
                 </div>
             </div>
         `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aio-popup",
-  "version": "6.5.0",
+  "version": "6.6.1",
   "description": "handle all types of popup and modals in react",
   "main": "index.js",
   "scripts": {