fix(ui/portal): (backport from Qv2) avoid registering portal multiple times; improve algorithm and protect against future failures quasarframework#11767

Author: rstoenescu

ui/src/mixins/portal.js

@@ -82,6 +82,9 @@ const Portal = {
         return
       }
 
+      if (this.__portalIsActive === true) { return }
+      this.__portalIsActive = true
+
       if (this.focusObj === void 0) {
         this.focusObj = {}
       }
@@ -116,6 +119,7 @@ const Portal = {
     },
 
     __hidePortal () {
+      this.__portalIsActive = false
       removeFocusWaitFlag(this.focusObj)
 
       if (this.__portal !== void 0) {

ui/src/utils/focus-manager.js

@@ -1,15 +1,17 @@
 let queue = []
-const waitFlags = []
+let waitFlags = []
+
+function clearFlag (flag) {
+  waitFlags = waitFlags.filter(entry => entry !== flag)
+}
 
 export function addFocusWaitFlag (flag) {
+  clearFlag(flag)
   waitFlags.push(flag)
 }
 
 export function removeFocusWaitFlag (flag) {
-  const index = waitFlags.indexOf(flag)
-  if (index !== -1) {
-    waitFlags.splice(index, 1)
-  }
+  clearFlag(flag)
 
   if (waitFlags.length === 0 && queue.length > 0) {
     // only call last focus handler (can't focus multiple things at once)
@@ -29,8 +31,5 @@ export function addFocusFn (fn) {
 }
 
 export function removeFocusFn (fn) {
-  const index = queue.indexOf(fn)
-  if (index !== -1) {
-    queue.splice(index, 1)
-  }
+  queue = queue.filter(entry => entry !== fn)
 }