quasar 1.22.3 → 1.22.4

package/dist/quasar.umd.modern.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v1.22.3
+ * Quasar Framework v1.22.4
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -12,7 +12,7 @@
 
   Vue = Vue && Object.prototype.hasOwnProperty.call(Vue, 'default') ? Vue['default'] : Vue;
 
-  var version = "1.22.3";
+  var version = "1.22.4";
 
   /* eslint-disable no-useless-escape */
 
@@ -5210,17 +5210,32 @@
     }
 
     return {
-      top,
-      left,
-      right,
-      bottom,
-      width,
-      height,
+      top, bottom, height,
+      left, right, width,
       middle: left + (right - left) / 2,
       center: top + (bottom - top) / 2
     }
   }
 
+  function getAbsoluteAnchorProps (el, absoluteOffset, offset) {
+    let { top, left } = el.getBoundingClientRect();
+
+    top += absoluteOffset.top;
+    left += absoluteOffset.left;
+
+    if (offset !== void 0) {
+      top += offset[ 1 ];
+      left += offset[ 0 ];
+    }
+
+    return {
+      top, bottom: top + 1, height: 1,
+      left, right: left + 1, width: 1,
+      middle: left,
+      center: top
+    }
+  }
+
   function getTargetProps (el) {
     return {
       top: 0,
@@ -5232,6 +5247,13 @@
     }
   }
 
+  function getTopLeftProps (anchorProps, targetProps, cfg) {
+    return {
+      top: anchorProps[ cfg.anchorOrigin.vertical ] - targetProps[ cfg.selfOrigin.vertical ],
+      left: anchorProps[ cfg.anchorOrigin.horizontal ] - targetProps[ cfg.selfOrigin.horizontal ]
+    }
+  }
+
   // cfg: { el, anchorEl, anchorOrigin, selfOrigin, offset, absoluteOffset, cover, fit, maxHeight, maxWidth }
   function setPosition (cfg) {
     if (client.is.ios === true && window.visualViewport !== void 0) {
@@ -5250,25 +5272,15 @@
       }
     }
 
-    let anchorProps;
-
     // scroll position might change
     // if max-height/-width changes, so we
     // need to restore it after we calculate
     // the new positioning
     const { scrollLeft, scrollTop } = cfg.el;
 
-    if (cfg.absoluteOffset === void 0) {
-      anchorProps = getAnchorProps(cfg.anchorEl, cfg.cover === true ? [0, 0] : cfg.offset);
-    }
-    else {
-      const
-        { top: anchorTop, left: anchorLeft } = cfg.anchorEl.getBoundingClientRect(),
-        top = anchorTop + cfg.absoluteOffset.top,
-        left = anchorLeft + cfg.absoluteOffset.left;
-
-      anchorProps = { top, left, width: 1, height: 1, right: left + 1, center: top, middle: left, bottom: top + 1 };
-    }
+    const anchorProps = cfg.absoluteOffset === void 0
+      ? getAnchorProps(cfg.anchorEl, cfg.cover === true ? [ 0, 0 ] : cfg.offset)
+      : getAbsoluteAnchorProps(cfg.anchorEl, cfg.absoluteOffset, cfg.offset);
 
     let elStyle = {
       maxHeight: cfg.maxHeight,
@@ -5285,14 +5297,44 @@
 
     Object.assign(cfg.el.style, elStyle);
 
-    const
-      targetProps = getTargetProps(cfg.el),
-      props = {
-        top: anchorProps[cfg.anchorOrigin.vertical] - targetProps[cfg.selfOrigin.vertical],
-        left: anchorProps[cfg.anchorOrigin.horizontal] - targetProps[cfg.selfOrigin.horizontal]
-      };
+    const targetProps = getTargetProps(cfg.el);
+    let props = getTopLeftProps(anchorProps, targetProps, cfg);
+
+    if (cfg.absoluteOffset === void 0 || cfg.offset === void 0) {
+      applyBoundaries(props, anchorProps, targetProps, cfg.anchorOrigin, cfg.selfOrigin);
+    }
+    else { // we have touch position or context menu with offset
+      const { top, left } = props; // cache initial values
+
+      // apply initial boundaries
+      applyBoundaries(props, anchorProps, targetProps, cfg.anchorOrigin, cfg.selfOrigin);
 
-    applyBoundaries(props, anchorProps, targetProps, cfg.anchorOrigin, cfg.selfOrigin);
+      let hasChanged = false;
+
+      // did it flip vertically?
+      if (props.top !== top) {
+        hasChanged = true;
+        const offsetY = 2 * cfg.offset[ 1 ];
+        anchorProps.center = anchorProps.top -= offsetY;
+        anchorProps.bottom -= offsetY + 2;
+      }
+
+      // did it flip horizontally?
+      if (props.left !== left) {
+        hasChanged = true;
+        const offsetX = 2 * cfg.offset[ 0 ];
+        anchorProps.middle = anchorProps.left -= offsetX;
+        anchorProps.right -= offsetX + 2;
+      }
+
+      if (hasChanged === true) {
+        // re-calculate props with the new anchor
+        props = getTopLeftProps(anchorProps, targetProps, cfg);
+
+        // and re-apply boundaries
+        applyBoundaries(props, anchorProps, targetProps, cfg.anchorOrigin, cfg.selfOrigin);
+      }
+    }
 
     elStyle = {
       top: props.top + 'px',