quasar 2.11.2 → 2.11.4

package/src/utils/private/global-nodes.js

@@ -1,16 +1,19 @@
 import { globalConfig } from './global-config.js'
 
-const globalNodes = []
+const nodesList = []
+const portalTypeList = []
+
+let portalIndex = 1
 let target = __QUASAR_SSR_SERVER__
   ? void 0
   : document.body
 
-export function createGlobalNode (id) {
+export function createGlobalNode (id, portalType) {
   const el = document.createElement('div')
 
-  if (id !== void 0) {
-    el.id = id
-  }
+  el.id = portalType !== void 0
+    ? `q-portal--${ portalType }--${ portalIndex++ }`
+    : id
 
   if (globalConfig.globalNodes !== void 0) {
     const cls = globalConfig.globalNodes.class
@@ -20,24 +23,52 @@ export function createGlobalNode (id) {
   }
 
   target.appendChild(el)
-  globalNodes.push(el)
+  nodesList.push(el)
+  portalTypeList.push(portalType)
 
   return el
 }
 
 export function removeGlobalNode (el) {
-  globalNodes.splice(globalNodes.indexOf(el), 1)
+  const nodeIndex = nodesList.indexOf(el)
+
+  nodesList.splice(nodeIndex, 1)
+  portalTypeList.splice(nodeIndex, 1)
+
   el.remove()
 }
 
-export function changeGlobalNodesTarget (el) {
-  if (el !== target) {
-    target = el
+export function changeGlobalNodesTarget (newTarget) {
+  if (newTarget === target) {
+    return
+  }
+
+  target = newTarget
 
-    globalNodes.forEach(el => {
-      if (el.contains(target) === false) {
-        target.appendChild(el)
+  if (
+    target === document.body
+    // or we have less than 2 dialogs:
+    || portalTypeList.reduce((acc, type) => (type === 'dialog' ? acc + 1 : acc), 0) < 2
+  ) {
+    nodesList.forEach(node => {
+      if (node.contains(target) === false) {
+        target.appendChild(node)
       }
     })
+
+    return
+  }
+
+  const lastDialogIndex = portalTypeList.lastIndexOf('dialog')
+
+  for (let i = 0; i < nodesList.length; i++) {
+    const el = nodesList[ i ]
+
+    if (
+      (i === lastDialogIndex || portalTypeList[ i ] !== 'dialog')
+      && el.contains(target) === false
+    ) {
+      target.appendChild(el)
+    }
   }
 }

package/src/utils/private/position-engine.js

@@ -62,17 +62,32 @@ export function getAnchorProps (el, offset) {
   }
 
   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
+  }
+}
+
 export function getTargetProps (el) {
   return {
     top: 0,
@@ -84,6 +99,13 @@ export function getTargetProps (el) {
   }
 }
 
+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 }
 export function setPosition (cfg) {
   if (client.is.ios === true && window.visualViewport !== void 0) {
@@ -102,25 +124,15 @@ export function setPosition (cfg) {
     }
   }
 
-  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,
@@ -137,14 +149,44 @@ export function setPosition (cfg) {
 
   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)
+
+    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
     }
 
-  applyBoundaries(props, anchorProps, targetProps, cfg.anchorOrigin, cfg.selfOrigin)
+    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',