quasar 2.17.6 → 2.18.0

package/dist/quasar.client.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.17.6
+ * Quasar Framework v2.18.0
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -504,7 +504,7 @@ var Screen_default = createReactivePlugin({
       visualViewport.width * visualViewport.scale + window.innerWidth - scrollingElement.clientWidth,
       visualViewport.height * visualViewport.scale + window.innerHeight - scrollingElement.clientHeight
     ];
-    const classes = $q.config.screen !== void 0 && $q.config.screen.bodyClasses === true;
+    const classes = $q.config.screen?.bodyClasses === true;
     this.__update = (force) => {
       const [w, h138] = getSize();
       if (h138 !== this.height) {
@@ -742,7 +742,7 @@ var Body_default = {
     if (false) {
       const { $q, ssrContext } = opts;
       const cls = getBodyClasses($q.platform, $q.config);
-      if ($q.config.screen !== void 0 && $q.config.screen.bodyClass === true) {
+      if ($q.config.screen?.bodyClass === true) {
         cls.push("screen--xs");
       }
       ssrContext._meta.bodyClasses += cls.join(" ");
@@ -802,7 +802,7 @@ var History_default = {
     const { cordova: cordova2, capacitor } = client.is;
     if (cordova2 !== true && capacitor !== true) return;
     const qConf = $q.config[cordova2 === true ? "cordova" : "capacitor"];
-    if (qConf !== void 0 && qConf.backButton === false) return;
+    if (qConf?.backButton === false) return;
     if (
       // if we're on Capacitor mode
       capacitor === true && (window.Capacitor === void 0 || window.Capacitor.Plugins.App === void 0)
@@ -889,6 +889,12 @@ var en_US_default = {
     pagination: (start, end, total) => start + "-" + end + " of " + total,
     columns: "Columns"
   },
+  pagination: {
+    first: "First page",
+    prev: "Previous page",
+    next: "Next page",
+    last: "Last page"
+  },
   editor: {
     url: "URL",
     bold: "Bold",
@@ -1392,7 +1398,7 @@ function prepareApp(app2, uiOpts, pluginOpts) {
 }
 var install_quasar_default = false ? function(parentApp, opts = {}, ssrContext) {
   const $q = {
-    version: "2.17.6",
+    version: "2.18.0",
     config: opts.config || {}
   };
   Object.assign(ssrContext, {
@@ -1422,7 +1428,7 @@ var install_quasar_default = false ? function(parentApp, opts = {}, ssrContext)
     ssrContext
   });
 } : function(parentApp, opts = {}) {
-  const $q = { version: "2.17.6" };
+  const $q = { version: "2.18.0" };
   if (globalConfigIsFrozen === false) {
     if (opts.config !== void 0) {
       Object.assign(globalConfig, opts.config);
@@ -1764,7 +1770,9 @@ var libMap = {
   "ion-logo": ionFn,
   "iconfont ": sameFn,
   "ti-": (i) => `themify-icon ${i}`,
-  "bi-": (i) => `bootstrap-icons ${i}`
+  "bi-": (i) => `bootstrap-icons ${i}`,
+  "i-": sameFn
+  // UnoCSS pure icons
 };
 var matMap = {
   o_: "-outlined",
@@ -1884,8 +1892,7 @@ var QIcon_default = createComponent({
       const data = {
         class: classes.value,
         style: sizeStyle.value,
-        "aria-hidden": "true",
-        role: "presentation"
+        "aria-hidden": "true"
       };
       if (type.value.none === true) {
         return h3(props4.tag, data, hSlot(slots.default));
@@ -2166,9 +2173,9 @@ var QBreadcrumbs_default = createComponent({
       );
       if (vnodes.length === 0) return;
       let els = 1;
-      const child = [], len = vnodes.filter((c) => c.type !== void 0 && c.type.name === "QBreadcrumbsEl").length, separator = slots.separator !== void 0 ? slots.separator : () => props4.separator;
+      const child = [], len = vnodes.filter((c) => c.type?.name === "QBreadcrumbsEl").length, separator = slots.separator !== void 0 ? slots.separator : () => props4.separator;
       vnodes.forEach((comp) => {
-        if (comp.type !== void 0 && comp.type.name === "QBreadcrumbsEl") {
+        if (comp.type?.name === "QBreadcrumbsEl") {
           const middle = els < len;
           const disabled = comp.props !== null && disabledValues.includes(comp.props.disable);
           const cls = (middle === true ? "" : " q-breadcrumbs--last") + (disabled !== true && middle === true ? activeClass.value : "");
@@ -2894,11 +2901,11 @@ var QBtn_default = createComponent({
         if (e.defaultPrevented === true) return;
         const el = document.activeElement;
         if (props4.type === "submit" && el !== document.body && rootRef.value.contains(el) === false && el.contains(rootRef.value) === false) {
-          rootRef.value.focus();
+          e.qAvoidFocus !== true && rootRef.value.focus();
           const onClickCleanup = () => {
             document.removeEventListener("keydown", stopAndPrevent, true);
             document.removeEventListener("keyup", onClickCleanup, passiveCapture);
-            rootRef.value !== null && rootRef.value.removeEventListener("blur", onClickCleanup, passiveCapture);
+            rootRef.value?.removeEventListener("blur", onClickCleanup, passiveCapture);
           };
           document.addEventListener("keydown", stopAndPrevent, true);
           document.addEventListener("keyup", onClickCleanup, passiveCapture);
@@ -2913,7 +2920,7 @@ var QBtn_default = createComponent({
       if (isKeyCode(e, [13, 32]) === true && keyboardTarget !== rootRef.value) {
         keyboardTarget !== null && cleanup();
         if (e.defaultPrevented !== true) {
-          rootRef.value.focus();
+          e.qAvoidFocus !== true && rootRef.value.focus();
           keyboardTarget = rootRef.value;
           rootRef.value.classList.add("q-btn--active");
           document.addEventListener("keyup", onPressEnd, true);
@@ -2953,8 +2960,8 @@ var QBtn_default = createComponent({
     }
     function onPressEnd(e) {
       if (rootRef.value === null) return;
-      if (e !== void 0 && e.type === "blur" && document.activeElement === rootRef.value) return;
-      if (e !== void 0 && e.type === "keyup") {
+      if (e?.type === "blur" && document.activeElement === rootRef.value) return;
+      if (e?.type === "keyup") {
         if (keyboardTarget === rootRef.value && isKeyCode(e, [13, 32]) === true) {
           const evt = new MouseEvent("click", e);
           evt.qKeyEvent = true;
@@ -2987,10 +2994,10 @@ var QBtn_default = createComponent({
       }
       if (keyboardTarget === rootRef.value) {
         document.removeEventListener("keyup", onPressEnd, true);
-        rootRef.value !== null && rootRef.value.removeEventListener("blur", onPressEnd, passiveCapture);
+        rootRef.value?.removeEventListener("blur", onPressEnd, passiveCapture);
         keyboardTarget = null;
       }
-      rootRef.value !== null && rootRef.value.classList.remove("q-btn--active");
+      rootRef.value?.classList.remove("q-btn--active");
     }
     function onLoadingEvt(evt) {
       stopAndPrevent(evt);
@@ -3370,7 +3377,7 @@ function use_model_toggle_default({
     }
   }
   function show(evt) {
-    if (props4.disable === true || evt !== void 0 && evt.qAnchorHandled === true || canShow !== void 0 && canShow(evt) !== true) return;
+    if (props4.disable === true || evt?.qAnchorHandled === true || canShow !== void 0 && canShow(evt) !== true) return;
     const listener = props4["onUpdate:modelValue"] !== void 0;
     if (listener === true && true) {
       emit("update:modelValue", true);
@@ -3539,7 +3546,7 @@ function closePortalMenus(proxy, evt) {
       }
     } else if (proxy.__qPortal === true) {
       const parent = getParentProxy(proxy);
-      if (parent !== void 0 && parent.$options.name === "QPopupProxy") {
+      if (parent?.$options.name === "QPopupProxy") {
         proxy.hide(evt);
         return parent;
       } else {
@@ -4251,6 +4258,7 @@ var QMenu_default = createComponent({
     persistent: Boolean,
     autoClose: Boolean,
     separateClosePopup: Boolean,
+    noEscDismiss: Boolean,
     noRouteDismiss: Boolean,
     noRefocus: Boolean,
     noFocus: Boolean,
@@ -4400,7 +4408,7 @@ var QMenu_default = createComponent({
       anchorCleanup(true);
       if (refocusTarget !== null && // menu was hidden from code or ESC plugin
       (evt === void 0 || evt.qClickOutside !== true)) {
-        ((evt && evt.type.indexOf("key") === 0 ? refocusTarget.closest('[tabindex]:not([tabindex^="-"])') : void 0) || refocusTarget).focus();
+        ((evt?.type.indexOf("key") === 0 ? refocusTarget.closest('[tabindex]:not([tabindex^="-"])') : void 0) || refocusTarget).focus();
         refocusTarget = null;
       }
       registerTimeout(() => {
@@ -4444,8 +4452,10 @@ var QMenu_default = createComponent({
       }
     }
     function onEscapeKey(evt) {
-      emit("escapeKey");
-      hide(evt);
+      if (props4.noEscDismiss !== true) {
+        emit("escapeKey");
+        hide(evt);
+      }
     }
     function updatePosition() {
       setPosition({
@@ -4580,8 +4590,11 @@ var QBtnDropdown_default = createComponent({
     contentStyle: [Array, String, Object],
     cover: Boolean,
     persistent: Boolean,
+    noEscDismiss: Boolean,
     noRouteDismiss: Boolean,
     autoClose: Boolean,
+    noRefocus: Boolean,
+    noFocus: Boolean,
     menuAnchor: {
       type: String,
       default: "bottom end"
@@ -4620,7 +4633,7 @@ var QBtnDropdown_default = createComponent({
     const btnDesignAttr = computed20(() => getBtnDesignAttr(props4));
     const btnProps = computed20(() => passBtnProps(props4));
     watch6(() => props4.modelValue, (val) => {
-      menuRef.value !== null && menuRef.value[val ? "show" : "hide"]();
+      menuRef.value?.[val ? "show" : "hide"]();
     });
     watch6(() => props4.split, hide);
     function onBeforeShow(e) {
@@ -4648,13 +4661,13 @@ var QBtnDropdown_default = createComponent({
       emit("click", e);
     }
     function toggle(evt) {
-      menuRef.value !== null && menuRef.value.toggle(evt);
+      menuRef.value?.toggle(evt);
     }
     function show(evt) {
-      menuRef.value !== null && menuRef.value.show(evt);
+      menuRef.value?.show(evt);
     }
     function hide(evt) {
-      menuRef.value !== null && menuRef.value.hide(evt);
+      menuRef.value?.hide(evt);
     }
     Object.assign(proxy, {
       show,
@@ -4680,8 +4693,11 @@ var QBtnDropdown_default = createComponent({
           cover: props4.cover,
           fit: true,
           persistent: props4.persistent,
+          noEscDismiss: props4.noEscDismiss,
           noRouteDismiss: props4.noRouteDismiss,
           autoClose: props4.autoClose,
+          noFocus: props4.noFocus,
+          noRefocus: props4.noRefocus,
           anchor: props4.menuAnchor,
           self: props4.menuSelf,
           offset: props4.menuOffset,
@@ -5138,8 +5154,8 @@ var TouchSwipe_default = createDirective(
           if (ctx.event === void 0) return;
           cleanEvt(ctx, "temp");
           client.is.firefox === true && preventDraggable(el, false);
-          ctx.styleCleanup !== void 0 && ctx.styleCleanup(true);
-          evt !== void 0 && ctx.event.dir !== false && stopAndPrevent(evt);
+          ctx.styleCleanup?.(true);
+          if (evt !== void 0 && ctx.event.dir !== false) stopAndPrevent(evt);
           ctx.event = void 0;
         }
       };
@@ -5172,7 +5188,7 @@ var TouchSwipe_default = createDirective(
         cleanEvt(ctx, "main");
         cleanEvt(ctx, "temp");
         client.is.firefox === true && preventDraggable(el, false);
-        ctx.styleCleanup !== void 0 && ctx.styleCleanup();
+        ctx.styleCleanup?.();
         delete el.__qtouchswipe;
       }
     }
@@ -5901,11 +5917,12 @@ function use_refocus_target_default(props4, rootRef) {
   });
   function refocusTarget(e) {
     const root = rootRef.value;
-    if (e !== void 0 && e.type.indexOf("key") === 0) {
-      if (root !== null && document.activeElement !== root && root.contains(document.activeElement) === true) {
+    if (e?.qAvoidFocus === true) return;
+    if (e?.type.indexOf("key") === 0) {
+      if (document.activeElement !== root && root?.contains(document.activeElement) === true) {
         root.focus();
       }
-    } else if (refocusRef.value !== null && (e === void 0 || root !== null && root.contains(e.target) === true)) {
+    } else if (refocusRef.value !== null && (e === void 0 || root?.contains(e.target) === true)) {
       refocusRef.value.focus();
     }
   }
@@ -6659,7 +6676,7 @@ var TouchPan_default = createDirective(
           cleanEvt(ctx, "temp");
           client.is.firefox === true && preventDraggable(el, false);
           if (abort === true) {
-            ctx.styleCleanup !== void 0 && ctx.styleCleanup();
+            ctx.styleCleanup?.();
             if (ctx.event.detected !== true && ctx.initialEvent !== void 0) {
               ctx.initialEvent.target.dispatchEvent(ctx.initialEvent.event);
             }
@@ -6710,7 +6727,7 @@ var TouchPan_default = createDirective(
         cleanEvt(ctx, "main");
         cleanEvt(ctx, "temp");
         client.is.firefox === true && preventDraggable(el, false);
-        ctx.styleCleanup !== void 0 && ctx.styleCleanup();
+        ctx.styleCleanup?.();
         delete el.__qtouchpan;
       }
     }
@@ -7426,7 +7443,7 @@ var QResizeObserver_default = createComponent({
         }
       }, onObjLoad = function() {
         cleanup();
-        if (targetEl && targetEl.contentDocument) {
+        if (targetEl?.contentDocument) {
           curDocView = targetEl.contentDocument.defaultView;
           curDocView.addEventListener("resize", trigger3, listenOpts.passive);
           emitEvent();
@@ -7748,7 +7765,7 @@ var QTabs_default = createComponent({
     }
     function updateActiveRoute() {
       let name2 = null, bestScore = { matchedLen: 0, queryDiff: 9999, hrefLen: 0 };
-      const list = tabDataList.filter((tab) => tab.routeData !== void 0 && tab.routeData.hasRouterLink.value === true);
+      const list = tabDataList.filter((tab) => tab.routeData?.hasRouterLink.value === true);
       const { hash: currentHash, query: currentQuery } = proxy.$route;
       const currentQueryLen = Object.keys(currentQuery).length;
       for (const tab of list) {
@@ -7881,7 +7898,7 @@ var QTabs_default = createComponent({
     function cleanup() {
       animateTimer !== null && clearTimeout(animateTimer);
       stopAnimScroll();
-      unwatchRoute !== void 0 && unwatchRoute();
+      unwatchRoute?.();
     }
     let hadRouteWatcher, hadActivated;
     onBeforeUnmount12(cleanup);
@@ -7979,11 +7996,11 @@ function use_tab_default(props4, slots, emit, routeData) {
   );
   const tabIndex = computed39(() => props4.disable === true || $tabs.hasFocus.value === true || isActive.value === false && $tabs.hasActiveTab.value === true ? -1 : props4.tabindex || 0);
   function onClick(e, keyboard) {
-    if (keyboard !== true && blurTargetRef.value !== null) {
-      blurTargetRef.value.focus();
+    if (keyboard !== true && e?.qAvoidFocus !== true) {
+      blurTargetRef.value?.focus();
     }
     if (props4.disable === true) {
-      if (routeData !== void 0 && routeData.hasRouterLink.value === true) {
+      if (routeData?.hasRouterLink.value === true) {
         stopAndPrevent(e);
       }
       return;
@@ -8002,7 +8019,7 @@ function use_tab_default(props4, slots, emit, routeData) {
         }).then((softError) => {
           if (reqId === $tabs.avoidRouteWatcher) {
             $tabs.avoidRouteWatcher = false;
-            if (hardError === void 0 && (softError === void 0 || softError.message !== void 0 && softError.message.startsWith("Avoided redundant navigation") === true)) {
+            if (hardError === void 0 && (softError === void 0 || softError.message?.startsWith("Avoided redundant navigation") === true)) {
               $tabs.updateModel({ name: props4.name });
             }
           }
@@ -8661,7 +8678,7 @@ var QColor_default = createComponent({
         model.value.v = hsv.v;
       }
       updateModel2(rgb2, change);
-      if (evt !== void 0 && change !== true && evt.target.selectionEnd !== void 0) {
+      if (change !== true && evt?.target.selectionEnd !== void 0) {
         const index = evt.target.selectionEnd;
         nextTick5(() => {
           evt.target.setSelectionRange(index, index);
@@ -10572,7 +10589,7 @@ var QDate_default = createComponent({
     });
     const attributes = computed43(() => props4.disable === true ? { "aria-disabled": "true" } : {});
     watch13(() => props4.modelValue, (v) => {
-      if (lastEmitValue === v) {
+      if (lastEmitValue === JSON.stringify(v)) {
         lastEmitValue = 0;
       } else {
         const model = getViewModel(innerMask.value, innerLocale.value);
@@ -10595,6 +10612,9 @@ var QDate_default = createComponent({
       updateValue2(innerMask.value, val, "locale");
       innerLocale.value = val;
     });
+    function setLastValue(v) {
+      lastEmitValue = JSON.stringify(v);
+    }
     function setToday() {
       const { year: year2, month, day } = today.value;
       const date = {
@@ -10724,7 +10744,7 @@ var QDate_default = createComponent({
     }
     function toggleDate(date, monthHash) {
       const month = daysMap.value[monthHash];
-      const fn = month !== void 0 && month.includes(date.day) === true ? removeFromModel : addToModel;
+      const fn = month?.includes(date.day) === true ? removeFromModel : addToModel;
       fn(date);
     }
     function getShortDate(date) {
@@ -10766,8 +10786,8 @@ var QDate_default = createComponent({
     }
     function emitValue(val, action, date) {
       const value2 = val !== null && val.length === 1 && props4.multiple === false ? val[0] : val;
-      lastEmitValue = value2;
       const { reason, details } = getEmitParams(action, date);
+      setLastValue(value2);
       emit("update:modelValue", value2, reason, details);
     }
     function emitImmediately(reason) {
@@ -10778,8 +10798,8 @@ var QDate_default = createComponent({
         const maxDay = props4.calendar !== "persian" ? new Date(date.year, date.month, 0).getDate() : jalaaliMonthLength(date.year, date.month);
         date.day = Math.min(Math.max(1, date.day), maxDay);
         const value2 = encodeEntry(date);
-        lastEmitValue = value2;
         const { details } = getEmitParams("", date);
+        setLastValue(value2);
         emit("update:modelValue", value2, reason, details);
       });
     }
@@ -10840,7 +10860,9 @@ var QDate_default = createComponent({
       const model = daysModel.value.concat(rangeModel.value).map((entry) => encodeEntry(entry, mask2, locale2)).filter((entry) => {
         return entry.from !== void 0 ? entry.from.dateHash !== null && entry.to.dateHash !== null : entry.dateHash !== null;
       });
-      emit("update:modelValue", (props4.multiple === true ? model : model[0]) || null, reason);
+      const value2 = (props4.multiple === true ? model : model[0]) || null;
+      setLastValue(value2);
+      emit("update:modelValue", value2, reason);
     }
     function getHeader() {
       if (props4.minimal === true) return;
@@ -11494,7 +11516,7 @@ var QDialog_default = createComponent({
       showPortal();
       animating.value = true;
       if (props4.noFocus !== true) {
-        document.activeElement !== null && document.activeElement.blur();
+        document.activeElement?.blur();
         registerTick(focus);
       } else {
         removeTick();
@@ -11527,7 +11549,7 @@ var QDialog_default = createComponent({
       animating.value = true;
       hidePortal();
       if (refocusTarget !== null) {
-        ((evt && evt.type.indexOf("key") === 0 ? refocusTarget.closest('[tabindex]:not([tabindex^="-"])') : void 0) || refocusTarget).focus();
+        ((evt?.type.indexOf("key") === 0 ? refocusTarget.closest('[tabindex]:not([tabindex^="-"])') : void 0) || refocusTarget).focus();
         refocusTarget = null;
       }
       registerTimeout(() => {
@@ -11757,7 +11779,7 @@ var QDrawer_default = createComponent({
       applyPosition(0);
       if (belowBreakpoint.value === true) {
         const otherInstance = $layout.instances[otherSide.value];
-        if (otherInstance !== void 0 && otherInstance.belowBreakpoint === true) {
+        if (otherInstance?.belowBreakpoint === true) {
           otherInstance.hide(false);
         }
         applyBackdrop(1);
@@ -11997,9 +12019,7 @@ var QDrawer_default = createComponent({
       timerMini = setTimeout(() => {
         timerMini = null;
         flagMiniAnimate.value = false;
-        if (vm2 && vm2.proxy && vm2.proxy.$el) {
-          vm2.proxy.$el.classList.remove("q-drawer--mini-animate");
-        }
+        vm2?.proxy?.$el?.classList.remove("q-drawer--mini-animate");
       }, 150);
     }
     function onOpenPan(evt) {
@@ -12097,7 +12117,7 @@ var QDrawer_default = createComponent({
       });
     });
     onBeforeUnmount16(() => {
-      layoutTotalWidthWatcher !== void 0 && layoutTotalWidthWatcher();
+      layoutTotalWidthWatcher?.();
       if (timerMini !== null) {
         clearTimeout(timerMini);
         timerMini = null;
@@ -12244,7 +12264,7 @@ var Caret = class {
   }
   get range() {
     const sel = this.selection;
-    if (sel !== null && sel.rangeCount) {
+    if (sel?.rangeCount) {
       return sel.getRangeAt(0);
     }
     return this._range;
@@ -12711,7 +12731,7 @@ var QItem_default = createComponent({
     });
     function onClick(e) {
       if (isClickable.value === true) {
-        if (blurTargetRef.value !== null) {
+        if (blurTargetRef.value !== null && e.qAvoidFocus !== true) {
           if (e.qKeyEvent !== true && document.activeElement === rootRef.value) {
             blurTargetRef.value.focus();
           } else if (document.activeElement === blurTargetRef.value) {
@@ -12814,7 +12834,7 @@ function getBtn(eVm, btn, clickHandler, active = false) {
     disable: btn.disable ? typeof btn.disable === "function" ? btn.disable(eVm) : true : false,
     size: "sm",
     onClick(e) {
-      clickHandler && clickHandler();
+      clickHandler?.();
       run(e, btn, eVm);
     }
   }, () => child);
@@ -12858,7 +12878,7 @@ function getDropdown(eVm, btn) {
         dense: true,
         onClick(e) {
           closeDropdown();
-          eVm.contentRef.value !== null && eVm.contentRef.value.focus();
+          e?.qAvoidFocus !== true && eVm.contentRef.value?.focus();
           eVm.caret.restore();
           run(e, btn2, eVm);
         }
@@ -13432,7 +13452,7 @@ var QEditor_default = createComponent({
     }
     function focus() {
       addFocusFn(() => {
-        contentRef.value !== null && contentRef.value.focus({ preventScroll: true });
+        contentRef.value?.focus({ preventScroll: true });
       });
     }
     function getContentEl() {
@@ -13553,7 +13573,7 @@ var QSlideTransition_default = createComponent({
     let animating = false, doneFn, element;
     let timer2 = null, timerFallback = null, animListener, lastEvent;
     function cleanup() {
-      doneFn && doneFn();
+      doneFn?.();
       doneFn = null;
       animating = false;
       if (timer2 !== null) {
@@ -13564,7 +13584,7 @@ var QSlideTransition_default = createComponent({
         clearTimeout(timerFallback);
         timerFallback = null;
       }
-      element !== void 0 && element.removeEventListener("transitionend", animListener);
+      element?.removeEventListener("transitionend", animListener);
       animListener = null;
     }
     function begin(el, height2, done) {
@@ -13790,7 +13810,7 @@ var QExpansionItem_default = createComponent({
       };
     });
     watch18(() => props4.group, (name2) => {
-      exitGroup !== void 0 && exitGroup();
+      exitGroup?.();
       name2 !== void 0 && enterGroup();
     });
     function onHeaderClick(e) {
@@ -13801,7 +13821,9 @@ var QExpansionItem_default = createComponent({
       e.keyCode === 13 && toggleIcon(e, true);
     }
     function toggleIcon(e, keyboard) {
-      keyboard !== true && blurTargetRef.value !== null && blurTargetRef.value.focus();
+      if (keyboard !== true && e.qAvoidFocus !== true) {
+        blurTargetRef.value?.focus();
+      }
       toggle(e);
       stopAndPrevent(e);
     }
@@ -13958,7 +13980,7 @@ var QExpansionItem_default = createComponent({
     }
     props4.group !== void 0 && enterGroup();
     onBeforeUnmount20(() => {
-      exitGroup !== void 0 && exitGroup();
+      exitGroup?.();
     });
     return () => h49("div", { class: classes.value }, [
       h49("div", { class: "q-expansion-item__container relative-position" }, getContent())
@@ -14123,8 +14145,8 @@ var QFab_default = createComponent({
       showing,
       onChildClick(evt) {
         hide(evt);
-        if (triggerRef.value !== null) {
-          triggerRef.value.$el.focus();
+        if (evt?.qAvoidFocus !== true) {
+          triggerRef.value?.$el.focus();
         }
       }
     });
@@ -14386,7 +14408,7 @@ function use_validate_default(focused, innerLoading) {
   }
   const debouncedValidate = debounce_default(validate, 0);
   onBeforeUnmount22(() => {
-    unwatchRules !== void 0 && unwatchRules();
+    unwatchRules?.();
     debouncedValidate.cancel();
   });
   Object.assign(proxy, { resetValidation, validate });
@@ -14576,11 +14598,11 @@ function use_field_default(state) {
   });
   function focusHandler() {
     const el = document.activeElement;
-    let target2 = state.targetRef !== void 0 && state.targetRef.value;
+    let target2 = state.targetRef?.value;
     if (target2 && (el === null || el.id !== state.targetUid.value)) {
       target2.hasAttribute("tabindex") === true || (target2 = target2.querySelector("[tabindex]"));
-      if (target2 && target2 !== el) {
-        target2.focus({ preventScroll: true });
+      if (target2 !== el) {
+        target2?.focus({ preventScroll: true });
       }
     }
   }
@@ -14613,13 +14635,13 @@ function use_field_default(state) {
         state.focused.value = false;
         emit("blur", e);
       }
-      then !== void 0 && then();
+      then?.();
     });
   }
   function clearValue(e) {
     stopAndPrevent(e);
     if ($q.platform.is.mobile !== true) {
-      const el = state.targetRef !== void 0 && state.targetRef.value || state.rootRef.value;
+      const el = state.targetRef?.value || state.rootRef.value;
       el.focus();
     } else if (state.rootRef.value.contains(document.activeElement) === true) {
       document.activeElement.blur();
@@ -14864,7 +14886,9 @@ function filterFiles(files, rejectedFiles, failedPropValidation, filterFn) {
   return acceptedFiles;
 }
 function stopAndPreventDrag(e) {
-  e && e.dataTransfer && (e.dataTransfer.dropEffect = "copy");
+  if (e?.dataTransfer) {
+    e.dataTransfer.dropEffect = "copy";
+  }
   stopAndPrevent(e);
 }
 var useFileProps = {
@@ -14901,11 +14925,11 @@ function use_file_default({
       if (e !== Object(e)) {
         e = { target: null };
       }
-      if (e.target !== null && e.target.matches('input[type="file"]') === true) {
+      if (e.target?.matches('input[type="file"]') === true) {
         e.clientX === 0 && e.clientY === 0 && stop(e);
       } else {
         const input = getFileInput();
-        input && input !== e.target && input.click(e);
+        if (input !== e.target) input?.click(e);
       }
     }
   }
@@ -15468,7 +15492,7 @@ var QForm_default = createComponent({
         if (index === validateIndex && val === true) {
           if (props4.onSubmit !== void 0) {
             emit("submit", evt);
-          } else if (evt !== void 0 && evt.target !== void 0 && typeof evt.target.submit === "function") {
+          } else if (evt?.target !== void 0 && typeof evt.target.submit === "function") {
             evt.target.submit();
           }
         }
@@ -15488,7 +15512,7 @@ var QForm_default = createComponent({
       addFocusFn(() => {
         if (rootRef.value === null) return;
         const target2 = rootRef.value.querySelector("[autofocus][tabindex], [data-autofocus][tabindex]") || rootRef.value.querySelector("[autofocus] [tabindex], [data-autofocus] [tabindex]") || rootRef.value.querySelector("[autofocus], [data-autofocus]") || Array.prototype.find.call(rootRef.value.querySelectorAll("[tabindex]"), (el) => el.tabIndex !== -1);
-        target2 !== null && target2 !== void 0 && target2.focus({ preventScroll: true });
+        target2?.focus({ preventScroll: true });
       });
     }
     provide3(formKey, {
@@ -15556,12 +15580,14 @@ var QFormChildMixin_default = {
     }
   },
   mounted() {
-    const $form = this.$.provides[formKey];
-    $form !== void 0 && this.disable !== true && $form.bindComponent(this);
+    if (this.disable !== true) {
+      this.$.provides[formKey]?.bindComponent(this);
+    }
   },
   beforeUnmount() {
-    const $form = this.$.provides[formKey];
-    $form !== void 0 && this.disable !== true && $form.unbindComponent(this);
+    if (this.disable !== true) {
+      this.$.provides[formKey]?.unbindComponent(this);
+    }
   }
 };
 
@@ -16039,9 +16065,7 @@ var QInfiniteScroll_default = createComponent({
         isWorking.value = false;
         isFetching.value = false;
         localScrollTarget.removeEventListener("scroll", poll, passive2);
-        if (poll !== void 0 && poll.cancel !== void 0) {
-          poll.cancel();
-        }
+        poll?.cancel?.();
       }
     }
     function updateScrollTarget() {
@@ -16126,7 +16150,7 @@ var QInfiniteScroll_default = createComponent({
     const vm2 = getCurrentInstance47();
     Object.assign(vm2.proxy, {
       poll: () => {
-        poll !== void 0 && poll();
+        poll?.();
       },
       trigger: trigger3,
       stop: stop2,
@@ -16737,7 +16761,7 @@ var QInput_default = createComponent({
       });
     }
     function select() {
-      inputRef.value !== null && inputRef.value.select();
+      inputRef.value?.select();
     }
     function onPaste(e) {
       if (hasMask.value === true && props4.reverseFillMask !== true) {
@@ -16830,7 +16854,7 @@ var QInput_default = createComponent({
         clearTimeout(emitTimer);
         emitTimer = null;
       }
-      emitValueFn !== void 0 && emitValueFn();
+      emitValueFn?.();
       emit("change", e.target.value);
     }
     function onFinishEditing(e) {
@@ -16839,7 +16863,7 @@ var QInput_default = createComponent({
         clearTimeout(emitTimer);
         emitTimer = null;
       }
-      emitValueFn !== void 0 && emitValueFn();
+      emitValueFn?.();
       typedNumber = false;
       stopValueWatcher = false;
       delete temp.value;
@@ -16931,7 +16955,7 @@ function update2(el, ctx, value2) {
   }
   if (changed2 === true) {
     ctx.cfg = cfg;
-    ctx.observer !== void 0 && ctx.observer.unobserve(el);
+    ctx.observer?.unobserve(el);
     ctx.observer = new IntersectionObserver(([entry]) => {
       if (typeof ctx.handler === "function") {
         if (entry.rootBounds === null && document.body.contains(el) === true) {
@@ -16951,7 +16975,7 @@ function update2(el, ctx, value2) {
 function destroy(el) {
   const ctx = el.__qvisible;
   if (ctx !== void 0) {
-    ctx.observer !== void 0 && ctx.observer.unobserve(el);
+    ctx.observer?.unobserve(el);
     delete el.__qvisible;
   }
 }
@@ -17310,7 +17334,7 @@ var QScrollObserver_default = createComponent({
       configureScrollTarget();
     });
     function emitEvent() {
-      clearTimer !== null && clearTimer();
+      clearTimer?.();
       const top = Math.max(0, getVerticalScrollPosition(localScrollTarget));
       const left = getHorizontalScrollPosition(localScrollTarget);
       const delta = {
@@ -17357,7 +17381,7 @@ var QScrollObserver_default = createComponent({
       configureScrollTarget();
     });
     onBeforeUnmount28(() => {
-      clearTimer !== null && clearTimer();
+      clearTimer?.();
       unconfigureScrollTarget();
     });
     Object.assign(proxy, {
@@ -18399,14 +18423,16 @@ var QPagination_default = createComponent({
           getBtn2({
             key: "bls",
             disable: props4.disable || props4.modelValue <= minProp.value,
-            icon: icons.value[0]
+            icon: icons.value[0],
+            "aria-label": $q.lang.pagination.first
           }, minProp.value)
         );
         contentEnd.unshift(
           getBtn2({
             key: "ble",
             disable: props4.disable || props4.modelValue >= maxProp.value,
-            icon: icons.value[3]
+            icon: icons.value[3],
+            "aria-label": $q.lang.pagination.last
           }, maxProp.value)
         );
       }
@@ -18415,14 +18441,16 @@ var QPagination_default = createComponent({
           getBtn2({
             key: "bdp",
             disable: props4.disable || props4.modelValue <= minProp.value,
-            icon: icons.value[1]
+            icon: icons.value[1],
+            "aria-label": $q.lang.pagination.prev
           }, props4.modelValue - 1)
         );
         contentEnd.unshift(
           getBtn2({
             key: "bdn",
             disable: props4.disable || props4.modelValue >= maxProp.value,
-            icon: icons.value[2]
+            icon: icons.value[2],
+            "aria-label": $q.lang.pagination.next
           }, props4.modelValue + 1)
         );
       }
@@ -18641,7 +18669,7 @@ var QParallax_default = createComponent({
     });
     onBeforeUnmount30(() => {
       stop2();
-      observer !== void 0 && observer.disconnect();
+      observer?.disconnect();
       mediaEl.onload = mediaEl.onloadstart = mediaEl.loadedmetadata = null;
     });
     return () => {
@@ -18832,10 +18860,10 @@ var QPopupEdit_default = createComponent({
       set: set2,
       cancel,
       show(e) {
-        menuRef.value !== null && menuRef.value.show(e);
+        menuRef.value?.show(e);
       },
       hide(e) {
-        menuRef.value !== null && menuRef.value.hide(e);
+        menuRef.value?.hide(e);
       },
       updatePosition
     });
@@ -19134,7 +19162,7 @@ var QPullToRefresh_default = createComponent({
       timer2 = setTimeout(() => {
         timer2 = null;
         animating.value = false;
-        done && done();
+        done?.();
       }, 300);
     }
     function updateScrollTarget() {
@@ -20107,7 +20135,7 @@ var setOverflowAnchor = __QUASAR_SSR__ || window.getComputedStyle(document.body)
       delete el2.dataset.qVsAnchor;
     });
     const el = children[index];
-    if (el && el.dataset) {
+    if (el?.dataset) {
       el.dataset.qVsAnchor = "";
     }
   });
@@ -20379,7 +20407,7 @@ function useVirtualScroll({
     if (rangeChanged === true && contentEl !== null && contentEl !== activeElement && contentEl.contains(activeElement) === true) {
       contentEl.addEventListener("focusout", onBlurRefocusFn);
       setTimeout(() => {
-        contentEl !== null && contentEl.removeEventListener("focusout", onBlurRefocusFn);
+        contentEl?.removeEventListener("focusout", onBlurRefocusFn);
       });
     }
     setOverflowAnchor(contentEl, toIndex - from);
@@ -20443,7 +20471,7 @@ function useVirtualScroll({
     }
   }
   function onBlurRefocusFn() {
-    contentRef.value !== null && contentRef.value !== void 0 && contentRef.value.focus();
+    contentRef.value?.focus();
   }
   function localResetVirtualScroll(toIndex, fullReset) {
     const defaultSize = 1 * virtualScrollItemSizeComputed.value;
@@ -20781,7 +20809,7 @@ var QSelect_default = createComponent({
       () => innerValue.value.map((opt) => getOptionLabel.value(opt)).join(", ")
     );
     const ariaCurrentValue = computed89(() => props4.displayValue !== void 0 ? props4.displayValue : selectedString.value);
-    const needsHtmlFn = computed89(() => props4.optionsHtml === true ? () => true : (opt) => opt !== void 0 && opt !== null && opt.html === true);
+    const needsHtmlFn = computed89(() => props4.optionsHtml === true ? () => true : (opt) => opt?.html === true);
     const valueAsHtml = computed89(() => props4.displayValueHtml === true || props4.displayValue === void 0 && (props4.optionsHtml === true || innerValue.value.some(needsHtmlFn.value)));
     const tabindex = computed89(() => state.focused.value === true ? props4.tabindex : -1);
     const comboboxAttrs = computed89(() => {
@@ -20955,13 +20983,15 @@ var QSelect_default = createComponent({
           );
           hidePopup();
         }
-        targetRef.value !== null && targetRef.value.focus();
+        targetRef.value?.focus();
         if (innerValue.value.length === 0 || isDeepEqual(getOptionValue.value(innerValue.value[0]), optValue) !== true) {
           emit("update:modelValue", props4.emitValue === true ? optValue : opt);
         }
         return;
       }
-      (hasDialog !== true || dialogFieldFocused.value === true) && state.focus();
+      if (hasDialog !== true || dialogFieldFocused.value === true) {
+        state.focus();
+      }
       selectInputText();
       if (innerValue.value.length === 0) {
         const val = props4.emitValue === true ? optValue : opt;
@@ -21166,7 +21196,7 @@ var QSelect_default = createComponent({
           const fn = mode === "toggle" ? toggleOption : add;
           fn(val, mode === "add-unique");
           if (props4.multiple !== true) {
-            targetRef.value !== null && targetRef.value.focus();
+            targetRef.value?.focus();
             hidePopup();
           }
         };
@@ -21411,7 +21441,7 @@ var QSelect_default = createComponent({
     }
     function onDialogFieldFocus(e) {
       stop(e);
-      targetRef.value !== null && targetRef.value.focus();
+      targetRef.value?.focus();
       dialogFieldFocused.value = true;
       window.scrollTo(window.pageXOffset || window.scrollX || document.body.scrollLeft || 0, 0);
     }
@@ -21640,7 +21670,7 @@ var QSelect_default = createComponent({
           prevent(e);
           if (hasDialog !== true && menu.value === true) {
             closeMenu();
-            targetRef.value !== null && targetRef.value.focus();
+            targetRef.value?.focus();
             return;
           }
           showPopup(e);
@@ -22619,7 +22649,7 @@ var StepHeader_default = createComponent({
     });
     const ripple = computed93(() => props4.stepper.headerNav !== true ? false : headerNav.value);
     function onActivate() {
-      blurRef.value !== null && blurRef.value.focus();
+      blurRef.value?.focus();
       isActive.value === false && props4.goToPanel(props4.step.name);
     }
     function onKeyup2(e) {
@@ -23122,7 +23152,7 @@ function useTableSort(props4, computedPagination, colList, setPagination) {
       col = col.name;
     } else {
       const def = colList.value.find((def2) => def2.name === col);
-      if (def !== void 0 && def.sortOrder) {
+      if (def?.sortOrder) {
         sortOrder = def.sortOrder;
       }
     }
@@ -23557,10 +23587,14 @@ var QTable_default = createComponent({
     tableClass: [String, Array, Object],
     tableHeaderStyle: [String, Array, Object],
     tableHeaderClass: [String, Array, Object],
+    tableRowStyleFn: Function,
+    tableRowClassFn: Function,
     cardContainerClass: [String, Array, Object],
     cardContainerStyle: [String, Array, Object],
     cardStyle: [String, Array, Object],
     cardClass: [String, Array, Object],
+    cardStyleFn: Function,
+    cardClassFn: Function,
     hideBottom: Boolean,
     hideSelectedBanner: Boolean,
     hideNoData: Boolean,
@@ -23596,16 +23630,16 @@ var QTable_default = createComponent({
     const cardDefaultClass = computed102(
       () => " q-table__card" + (isDark.value === true ? " q-table__card--dark q-dark" : "") + (props4.square === true ? " q-table--square" : "") + (props4.flat === true ? " q-table--flat" : "") + (props4.bordered === true ? " q-table--bordered" : "")
     );
-    const __containerClass = computed102(
+    const containerClass = computed102(
       () => `q-table__container q-table--${props4.separator}-separator column no-wrap` + (props4.grid === true ? " q-table--grid" : cardDefaultClass.value) + (isDark.value === true ? " q-table--dark" : "") + (props4.dense === true ? " q-table--dense" : "") + (props4.wrapCells === false ? " q-table--no-wrap" : "") + (inFullscreen.value === true ? " fullscreen scroll" : "")
     );
-    const containerClass = computed102(
-      () => __containerClass.value + (props4.loading === true ? " q-table--loading" : "")
+    const rootContainerClass = computed102(
+      () => containerClass.value + (props4.loading === true ? " q-table--loading" : "")
     );
     watch44(
-      () => props4.tableStyle + props4.tableClass + props4.tableHeaderStyle + props4.tableHeaderClass + __containerClass.value,
+      () => props4.tableStyle + props4.tableClass + props4.tableHeaderStyle + props4.tableHeaderClass + containerClass.value,
       () => {
-        hasVirtScroll.value === true && virtScrollRef.value !== null && virtScrollRef.value.reset();
+        hasVirtScroll.value === true && virtScrollRef.value?.reset();
       }
     );
     const {
@@ -23773,13 +23807,23 @@ var QTable_default = createComponent({
     function getTBodyTR(row, bodySlot, pageIndex) {
       const key = getRowKey.value(row), selected = isRowSelected(key);
       if (bodySlot !== void 0) {
+        const cfg = {
+          key,
+          row,
+          pageIndex,
+          __trClass: selected ? "selected" : ""
+        };
+        if (props4.tableRowStyleFn !== void 0) {
+          cfg.__trStyle = props4.tableRowStyleFn(row);
+        }
+        if (props4.tableRowClassFn !== void 0) {
+          const cls = props4.tableRowClassFn(row);
+          if (cls) {
+            cfg.__trClass = `${cls} ${cfg.__trClass}`;
+          }
+        }
         return bodySlot(
-          getBodyScope({
-            key,
-            row,
-            pageIndex,
-            __trClass: selected ? "selected" : ""
-          })
+          getBodyScope(cfg)
         );
       }
       const bodyCell = slots["body-cell"], child = computedCols.value.map((col) => {
@@ -23825,6 +23869,15 @@ var QTable_default = createComponent({
           emit("rowContextmenu", evt, row, pageIndex);
         };
       }
+      if (props4.tableRowStyleFn !== void 0) {
+        data.style = props4.tableRowStyleFn(row);
+      }
+      if (props4.tableRowClassFn !== void 0) {
+        const cls = props4.tableRowClassFn(row);
+        if (cls) {
+          data.class[cls] = true;
+        }
+      }
       return h121("tr", data, child);
     }
     function getTBody() {
@@ -24078,28 +24131,26 @@ var QTable_default = createComponent({
       child.push(
         h121("div", { class: "q-table__separator col" })
       );
-      if (hasOpts === true) {
-        child.push(
-          h121("div", { class: "q-table__control" }, [
-            h121("span", { class: "q-table__bottom-item" }, [
-              props4.rowsPerPageLabel || $q.lang.table.recordsPerPage
-            ]),
-            h121(QSelect_default, {
-              class: "q-table__select inline q-table__bottom-item",
-              color: props4.color,
-              modelValue: rowsPerPage,
-              options: computedRowsPerPageOptions.value,
-              displayValue: rowsPerPage === 0 ? $q.lang.table.allRows : rowsPerPage,
-              dark: isDark.value,
-              borderless: true,
-              dense: true,
-              optionsDense: true,
-              optionsCover: true,
-              "onUpdate:modelValue": onPagSelection
-            })
-          ])
-        );
-      }
+      hasOpts === true && child.push(
+        h121("div", { class: "q-table__control" }, [
+          h121("span", { class: "q-table__bottom-item" }, [
+            props4.rowsPerPageLabel || $q.lang.table.recordsPerPage
+          ]),
+          h121(QSelect_default, {
+            class: "q-table__select inline q-table__bottom-item",
+            color: props4.color,
+            modelValue: rowsPerPage,
+            options: computedRowsPerPageOptions.value,
+            displayValue: rowsPerPage === 0 ? $q.lang.table.allRows : rowsPerPage,
+            dark: isDark.value,
+            borderless: true,
+            dense: true,
+            optionsDense: true,
+            optionsCover: true,
+            "onUpdate:modelValue": onPagSelection
+          })
+        ])
+      );
       if (paginationSlot !== void 0) {
         control = paginationSlot(marginalsScope.value);
       } else {
@@ -24124,6 +24175,7 @@ var QTable_default = createComponent({
               ...btnProps,
               icon: navIcon.value[0],
               disable: isFirstPage.value,
+              ariaLabel: $q.lang.pagination.first,
               onClick: firstPage
             })
           );
@@ -24133,6 +24185,7 @@ var QTable_default = createComponent({
               ...btnProps,
               icon: navIcon.value[1],
               disable: isFirstPage.value,
+              ariaLabel: $q.lang.pagination.prev,
               onClick: prevPage
             }),
             h121(QBtn_default, {
@@ -24140,6 +24193,7 @@ var QTable_default = createComponent({
               ...btnProps,
               icon: navIcon.value[2],
               disable: isLastPage.value,
+              ariaLabel: $q.lang.pagination.next,
               onClick: nextPage
             })
           );
@@ -24149,6 +24203,7 @@ var QTable_default = createComponent({
               ...btnProps,
               icon: navIcon.value[3],
               disable: isLastPage.value,
+              ariaLabel: $q.lang.pagination.last,
               onClick: lastPage
             })
           );
@@ -24200,7 +24255,16 @@ var QTable_default = createComponent({
           ],
           style: props4.cardStyle
         };
-        if (props4.onRowClick !== void 0 || props4.onRowDblclick !== void 0) {
+        if (props4.cardStyleFn !== void 0) {
+          data.style = [data.style, props4.cardStyleFn(scope.row)];
+        }
+        if (props4.cardClassFn !== void 0) {
+          const cls = props4.cardClassFn(scope.row);
+          if (cls) {
+            data.class[0] += ` ${cls}`;
+          }
+        }
+        if (props4.onRowClick !== void 0 || props4.onRowDblclick !== void 0 || props4.onRowContextmenu !== void 0) {
           data.class[0] += " cursor-pointer";
           if (props4.onRowClick !== void 0) {
             data.onClick = (evt) => {
@@ -24212,6 +24276,11 @@ var QTable_default = createComponent({
               emit("RowDblclick", evt, scope.row, scope.pageIndex);
             };
           }
+          if (props4.onRowContextmenu !== void 0) {
+            data.onContextmenu = (evt) => {
+              emit("rowContextmenu", evt, scope.row, scope.pageIndex);
+            };
+          }
         }
         return h121("div", {
           class: "q-table__grid-item col-xs-12 col-sm-6 col-md-4 col-lg-3" + (scope.selected === true ? " q-table__grid-item--selected" : "")
@@ -24256,7 +24325,7 @@ var QTable_default = createComponent({
     });
     return () => {
       const child = [getTopDiv()];
-      const data = { ref: rootRef, class: containerClass.value };
+      const data = { ref: rootRef, class: rootContainerClass.value };
       if (props4.grid === true) {
         child.push(getGridHeader());
       } else {
@@ -24291,7 +24360,10 @@ var QTr_default = createComponent({
     const classes = computed103(
       () => "q-tr" + (props4.props === void 0 || props4.props.header === true ? "" : " " + props4.props.__trClass) + (props4.noHover === true ? " q-tr--no-hover" : "")
     );
-    return () => h122("tr", { class: classes.value }, hSlot(slots.default));
+    return () => h122("tr", {
+      style: props4.props?.__trStyle,
+      class: classes.value
+    }, hSlot(slots.default));
   }
 });
 
@@ -24498,7 +24570,7 @@ var QTime_default = createComponent({
       }
       const pos = [];
       for (let val = start, index = start; val <= end; val += step, index++) {
-        const actualVal = val + offset2, disable = values !== void 0 && values.includes(actualVal) === false, label = view.value === "hour" && val === 0 ? computedFormat24h.value === true ? "00" : "12" : val;
+        const actualVal = val + offset2, disable = values?.includes(actualVal) === false, label = view.value === "hour" && val === 0 ? computedFormat24h.value === true ? "00" : "12" : val;
         pos.push({ val: actualVal, index, disable, label });
       }
       return pos;
@@ -25367,7 +25439,7 @@ var QTree_default = createComponent({
             node[props4.childrenKey] = Array.isArray(children) === true ? children : [];
             nextTick21(() => {
               const localMeta = meta.value[key];
-              if (localMeta && localMeta.isParent === true) {
+              if (localMeta?.isParent === true) {
                 localSetExpanded(key, true);
               }
             });
@@ -25592,8 +25664,7 @@ var QTree_default = createComponent({
       ]);
     }
     function blur(key) {
-      const blurTarget = blurTargets[key];
-      blurTarget && blurTarget.focus();
+      blurTargets[key]?.focus();
     }
     function onClick(node, meta2, e, keyboard) {
       keyboard !== true && meta2.selectable !== false && blur(meta2.key);
@@ -26559,7 +26630,7 @@ function morph(_options) {
   elFrom.qMorphCancel = () => {
     cancelStatus = true;
     elFromClone.remove();
-    elFromTween !== void 0 && elFromTween.remove();
+    elFromTween?.remove();
     options.hideFromClone === true && elFromClone.classList.remove("q-morph--internal");
     elFrom.qMorphCancel = void 0;
   };
@@ -26584,7 +26655,7 @@ function morph(_options) {
     elTo.qMorphCancel = () => {
       cancelStatus = true;
       elFromClone.remove();
-      elFromTween !== void 0 && elFromTween.remove();
+      elFromTween?.remove();
       options.hideFromClone === true && elFromClone.classList.remove("q-morph--internal");
       options.keepToClone !== true && elTo.classList.remove("q-morph--internal");
       elFrom.qMorphCancel = void 0;
@@ -26740,10 +26811,12 @@ function morph(_options) {
           elTo.style.cssText = elToStyleSaved;
           elTo.className = elToClassSaved;
         }
-        elToClone.parentNode === elToParent && elToParent.insertBefore(elTo, elToClone);
+        if (elToClone.parentNode === elToParent) {
+          elToParent.insertBefore(elTo, elToClone);
+        }
         elFromClone.remove();
         elToClone.remove();
-        elFromTween !== void 0 && elFromTween.remove();
+        elFromTween?.remove();
         cancel = () => false;
         elFrom.qMorphCancel = void 0;
         elTo.qMorphCancel = void 0;
@@ -26875,9 +26948,9 @@ function morph(_options) {
           delay: options.delay
         });
         const cleanup = (abort) => {
-          animationFromClone !== void 0 && animationFromClone.cancel();
-          animationFromTween !== void 0 && animationFromTween.cancel();
-          animationToClone !== void 0 && animationToClone.cancel();
+          animationFromClone?.cancel();
+          animationFromTween?.cancel();
+          animationToClone?.cancel();
           animationTo.cancel();
           animationTo.removeEventListener("finish", cleanup);
           animationTo.removeEventListener("cancel", cleanup);
@@ -26908,9 +26981,9 @@ function morph(_options) {
             return true;
           }
           endElementTo = endElementTo !== true;
-          animationFromClone !== void 0 && animationFromClone.reverse();
-          animationFromTween !== void 0 && animationFromTween.reverse();
-          animationToClone !== void 0 && animationToClone.reverse();
+          animationFromClone?.reverse();
+          animationFromTween?.reverse();
+          animationToClone?.reverse();
           animationTo.reverse();
           return true;
         };
@@ -27162,7 +27235,7 @@ function trigger2(group) {
     },
     ...to.opts,
     onEnd(dir, aborted) {
-      to.opts.onEnd !== void 0 && to.opts.onEnd(dir, aborted);
+      to.opts.onEnd?.(dir, aborted);
       if (aborted === true) return;
       from.animating = false;
       to.animating = false;
@@ -27279,7 +27352,7 @@ var Morph_default = createDirective(
         if (index !== -1) {
           group.queue = group.queue.filter((item) => item !== ctx);
           if (group.queue.length === 0) {
-            group.cancel !== void 0 && group.cancel();
+            group.cancel?.();
             delete morphGroups[ctx.group];
           }
         }
@@ -27303,7 +27376,7 @@ var defaultCfg2 = {
 };
 function update3(el, ctx, value2) {
   ctx.handler = value2;
-  ctx.observer !== void 0 && ctx.observer.disconnect();
+  ctx.observer?.disconnect();
   ctx.observer = new MutationObserver((list) => {
     if (typeof ctx.handler === "function") {
       const res = ctx.handler(list);
@@ -27317,7 +27390,7 @@ function update3(el, ctx, value2) {
 function destroy2(el) {
   const ctx = el.__qmutation;
   if (ctx !== void 0) {
-    ctx.observer !== void 0 && ctx.observer.disconnect();
+    ctx.observer?.disconnect();
     delete el.__qmutation;
   }
 }
@@ -27506,7 +27579,7 @@ var TouchHold_default = createDirective(
         },
         end(evt) {
           cleanEvt(ctx, "temp");
-          ctx.styleCleanup !== void 0 && ctx.styleCleanup(ctx.triggered);
+          ctx.styleCleanup?.(ctx.triggered);
           if (ctx.triggered === true) {
             evt !== void 0 && stopAndPrevent(evt);
           } else if (ctx.timer !== void 0) {
@@ -27548,7 +27621,7 @@ var TouchHold_default = createDirective(
         cleanEvt(ctx, "main");
         cleanEvt(ctx, "temp");
         ctx.timer !== void 0 && clearTimeout(ctx.timer);
-        ctx.styleCleanup !== void 0 && ctx.styleCleanup();
+        ctx.styleCleanup?.();
         delete el.__qtouchhold;
       }
     }
@@ -27690,8 +27763,8 @@ var TouchRepeat_default = createDirective(
         },
         end(evt) {
           if (ctx.event === void 0) return;
-          ctx.styleCleanup !== void 0 && ctx.styleCleanup(true);
-          evt !== void 0 && ctx.event.repeatCount > 0 && stopAndPrevent(evt);
+          ctx.styleCleanup?.(true);
+          if (evt !== void 0 && ctx.event.repeatCount > 0) stopAndPrevent(evt);
           cleanEvt(ctx, "temp");
           if (ctx.timer !== void 0) {
             clearTimeout(ctx.timer);
@@ -27731,7 +27804,7 @@ var TouchRepeat_default = createDirective(
         ctx.timer !== void 0 && clearTimeout(ctx.timer);
         cleanEvt(ctx, "main");
         cleanEvt(ctx, "temp");
-        ctx.styleCleanup !== void 0 && ctx.styleCleanup();
+        ctx.styleCleanup?.();
         delete el.__qtouchrepeat;
       }
     }
@@ -28075,12 +28148,12 @@ function create_dialog_default(DefaultComponent, supportsCustomComponent, parent
     const dialogRef = ref68(null);
     const el = createGlobalNode(false, "dialog");
     const applyState = (cmd) => {
-      if (dialogRef.value !== null && dialogRef.value[cmd] !== void 0) {
+      if (dialogRef.value?.[cmd] !== void 0) {
         dialogRef.value[cmd]();
         return;
       }
       const target2 = vm2.$.subTree;
-      if (target2 && target2.component) {
+      if (target2?.component) {
         if (target2.component.proxy && target2.component.proxy[cmd]) {
           target2.component.proxy[cmd]();
           return;
@@ -28567,7 +28640,7 @@ var originalDefaults = {
 };
 var defaults = { ...originalDefaults };
 function registerProps(opts) {
-  if (opts && opts.group !== void 0 && activeGroups[opts.group] !== void 0) {
+  if (opts?.group !== void 0 && activeGroups[opts.group] !== void 0) {
     return Object.assign(activeGroups[opts.group], opts);
   }
   const newProps = isObject(opts) === true && opts.ignoreDefaults === true ? { ...originalDefaults, ...opts } : { ...defaults, ...opts };
@@ -29012,7 +29085,7 @@ function addNotification(config, $q, originalApi) {
   const actions = (Array.isArray(config.actions) === true ? config.actions : []).concat(
     config.ignoreDefaults !== true && Array.isArray(defaults2.actions) === true ? defaults2.actions : []
   ).concat(
-    notifTypes[config.type] !== void 0 && Array.isArray(notifTypes[config.type].actions) === true ? notifTypes[config.type].actions : []
+    Array.isArray(notifTypes[config.type]?.actions) === true ? notifTypes[config.type].actions : []
   );
   const { closeBtn } = notif;
   closeBtn && actions.push({
@@ -29731,9 +29804,9 @@ function parseFeatures(winFeatures) {
 function openWindow(url, reject, windowFeatures) {
   let open2 = window.open;
   if (Platform_default.is.cordova === true) {
-    if (cordova !== void 0 && cordova.InAppBrowser !== void 0 && cordova.InAppBrowser.open !== void 0) {
+    if (cordova?.InAppBrowser?.open !== void 0) {
       open2 = cordova.InAppBrowser.open;
-    } else if (navigator !== void 0 && navigator.app !== void 0) {
+    } else if (navigator?.app !== void 0) {
       return navigator.app.loadUrl(url, {
         openExternal: true
       });
@@ -29744,7 +29817,7 @@ function openWindow(url, reject, windowFeatures) {
     Platform_default.is.desktop && win.focus();
     return win;
   } else {
-    reject && reject();
+    reject?.();
   }
 }
 var open_url_default = (url, reject, windowFeatures) => {
@@ -29829,7 +29902,7 @@ function runSequentialPromises(sequentialPromises, { threadsNumber = 1, abortOnF
 
 // src/index.dev.js
 var Quasar = {
-  version: "2.17.6",
+  version: "2.18.0",
   install: install_quasar_default,
   // TODO: remove in Qv3 (should only be used through the plugin)
   // We provide a deprecated fallback here