quasar 1.17.8 → 1.18.3

package/dist/quasar.umd.modern.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v1.17.8
+ * Quasar Framework v1.18.3
  * (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.17.8";
+  var version = "1.18.3";
 
   /* eslint-disable no-useless-escape */
 
@@ -631,12 +631,23 @@
         return
       }
 
+      const { visualViewport } = window;
+      const target = visualViewport || window;
+      const scrollingElement = document.scrollingElement || document.documentElement;
+      const getSize = visualViewport === void 0 || client.is.mobile === true
+        ? () => [
+          Math.max(window.innerWidth, scrollingElement.clientWidth),
+          Math.max(window.innerHeight, scrollingElement.clientHeight)
+        ]
+        : () => [
+          visualViewport.width * visualViewport.scale + window.innerWidth - scrollingElement.clientWidth,
+          visualViewport.height * visualViewport.scale + window.innerHeight - scrollingElement.clientHeight
+        ];
+
       const classes = cfg.screen !== void 0 && cfg.screen.bodyClasses === true;
 
       const update = force => {
-        const
-          w = window.innerWidth,
-          h = window.innerHeight;
+        const [ w, h ] = getSize();
 
         if (h !== this.height) {
           this.height = h;
@@ -694,11 +705,7 @@
       };
 
       const start = () => {
-        const
-          style = getComputedStyle(document.body),
-          target = window.visualViewport !== void 0
-            ? window.visualViewport
-            : window;
+        const style = getComputedStyle(document.body);
 
         // if css props available
         if (style.getPropertyValue('--q-size-sm')) {
@@ -7365,6 +7372,10 @@
       falseValue: { default: false },
       indeterminateValue: { default: null },
 
+      checkedIcon: String,
+      uncheckedIcon: String,
+      indeterminateIcon: String,
+
       toggleOrder: {
         type: String,
         validator: v => v === 'tf' || v === 'ft'
@@ -7568,33 +7579,57 @@
 
     mixins: [ CheckboxMixin ],
 
+    computed: {
+      computedIcon () {
+        return this.isTrue === true
+          ? this.checkedIcon
+          : (this.isIndeterminate === true
+            ? this.indeterminateIcon
+            : this.uncheckedIcon
+          )
+      }
+    },
+
     methods: {
       __getInner (h) {
-        return [
-          h('div', {
-            staticClass: 'q-checkbox__bg absolute'
-          }, [
-            h('svg', {
-              staticClass: 'q-checkbox__svg fit absolute-full',
-              attrs: { focusable: 'false' /* needed for IE11 */, viewBox: '0 0 24 24', 'aria-hidden': 'true' }
+        return this.computedIcon !== void 0
+          ? [
+            h('div', {
+              key: 'icon',
+              staticClass: 'q-checkbox__icon-container absolute flex flex-center no-wrap'
             }, [
-              h('path', {
-                staticClass: 'q-checkbox__truthy',
-                attrs: {
-                  fill: 'none',
-                  d: 'M1.73,12.91 8.1,19.28 22.79,4.59'
-                }
-              }),
-
-              h('path', {
-                staticClass: 'q-checkbox__indet',
-                attrs: {
-                  d: 'M4,14H20V10H4'
-                }
+              h(QIcon, {
+                staticClass: 'q-checkbox__icon',
+                props: { name: this.computedIcon }
               })
             ])
-          ])
-        ]
+          ]
+          : [
+            h('div', {
+              key: 'svg',
+              staticClass: 'q-checkbox__bg absolute'
+            }, [
+              h('svg', {
+                staticClass: 'q-checkbox__svg fit absolute-full',
+                attrs: { focusable: 'false' /* needed for IE11 */, viewBox: '0 0 24 24', 'aria-hidden': 'true' }
+              }, [
+                h('path', {
+                  staticClass: 'q-checkbox__truthy',
+                  attrs: {
+                    fill: 'none',
+                    d: 'M1.73,12.91 8.1,19.28 22.79,4.59'
+                  }
+                }),
+
+                h('path', {
+                  staticClass: 'q-checkbox__indet',
+                  attrs: {
+                    d: 'M4,14H20V10H4'
+                  }
+                })
+              ])
+            ])
+          ]
       }
     },
 
@@ -11586,8 +11621,8 @@
       days = '(' + dateLocale.days.join('|') + ')',
       key = mask + days;
 
-    if (regexStore[key] !== void 0) {
-      return regexStore[key]
+    if (regexStore[ key ] !== void 0) {
+      return regexStore[ key ]
     }
 
     const
@@ -11705,7 +11740,7 @@
 
         default:
           index--;
-          if (match[0] === '[') {
+          if (match[ 0 ] === '[') {
             match = match.substring(1, match.length - 1);
           }
           return match.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
@@ -11713,7 +11748,7 @@
     });
 
     const res = { map, regex: new RegExp('^' + regexText) };
-    regexStore[key] = res;
+    regexStore[ key ] = res;
 
     return res
   }
@@ -11741,25 +11776,18 @@
   function applyYearMonthDayChange (date, mod, sign) {
     let
       year = date.getFullYear(),
-      month = date.getMonth(),
-      day = date.getDate();
+      month = date.getMonth();
 
-    if (mod.years !== void 0) {
-      year += sign * mod.years;
-    }
-    else if (mod.year !== void 0) {
+    const day = date.getDate();
+
+    if (mod.year !== void 0) {
       year += sign * mod.year;
+      delete mod.year;
     }
 
-    if (mod.months !== void 0) {
-      month += sign * mod.months;
-    }
-    else if (mod.month !== void 0) {
+    if (mod.month !== void 0) {
       month += sign * mod.month;
-    }
-
-    if (mod.days !== void 0) {
-      day += sign * mod.days;
+      delete mod.month;
     }
 
     date.setDate(1);
@@ -11767,74 +11795,110 @@
 
     date.setFullYear(year);
     date.setMonth(month);
-    date.setDate(day);
+    date.setDate(Math.min(day, daysInMonth(date)));
+
+    if (mod.date !== void 0) {
+      date.setDate(date.getDate() + sign * mod.date);
+      delete mod.date;
+    }
 
     return date
   }
 
-  const yearMonDay = [ 'years', 'year', 'months', 'month', 'days' ];
+  function applyYearMonthDay (date, mod, middle) {
+    const
+      year = mod.year !== void 0 ? mod.year : date[ `get${middle}FullYear` ](),
+      month = mod.month !== void 0 ? mod.month - 1 : date[ `get${middle}Month` ](),
+      maxDay = (new Date(year, month + 1, 0)).getDate(),
+      day = Math.min(maxDay, mod.date !== void 0 ? mod.date : date[ `get${middle}Date` ]());
+
+    date[ `set${middle}Date` ](1);
+    date[ `set${middle}Month` ](2);
 
-  function getChange (date, mod, sign) {
+    date[ `set${middle}FullYear` ](year);
+    date[ `set${middle}Month` ](month);
+    date[ `set${middle}Date` ](day);
+
+    delete mod.year;
+    delete mod.month;
+    delete mod.date;
+
+    return date
+  }
+
+  function getChange (date, rawMod, sign) {
     const
+      mod = normalizeMod(rawMod),
       d = new Date(date),
-      t = (
-        mod.years !== void 0 || mod.year !== void 0 ||
-        mod.months !== void 0 || mod.month !== void 0 ||
-        mod.days !== void 0
-      )
-        ? applyYearMonthDayChange(d, mod, sign)
+      t = mod.year !== void 0 || mod.month !== void 0 || mod.date !== void 0
+        ? applyYearMonthDayChange(d, mod, sign) // removes year/month/day
         : d;
 
     for (const key in mod) {
-      if (yearMonDay.includes(key) === false) {
-        const op = capitalize(key);
-        t[`set${op}`](t[`get${op}`]() + sign * mod[key]);
-      }
+      const op = capitalize(key);
+      t[ `set${op}` ](t[ `get${op}` ]() + sign * mod[ key ]);
     }
 
     return t
   }
 
-  function applyYearMonthDay (date, mod, middle) {
-    const
-      year = mod.year !== void 0
-        ? mod.year
-        : (mod.years !== void 0 ? mod.years : date[`get${middle}FullYear`]()),
-      month = mod.month !== void 0
-        ? mod.month - 1
-        : (mod.months !== void 0 ? mod.months : date[`get${middle}Month`]()),
-      maxDay = (new Date(year, month + 1, 0)).getDate(),
-      day = Math.min(maxDay, mod.date !== void 0 ? mod.date : date[`get${middle}Date`]());
+  function normalizeMod (mod) {
+    const acc = { ...mod };
+
+    if (mod.years !== void 0) {
+      acc.year = mod.years;
+      delete acc.years;
+    }
+
+    if (mod.months !== void 0) {
+      acc.month = mod.months;
+      delete acc.months;
+    }
+
+    if (mod.days !== void 0) {
+      acc.date = mod.days;
+      delete acc.days;
+    }
+    if (mod.day !== void 0) {
+      acc.date = mod.day;
+      delete acc.day;
+    }
 
-    date[`set${middle}Date`](1);
-    date[`set${middle}Month`](2);
+    if (mod.hour !== void 0) {
+      acc.hours = mod.hour;
+      delete acc.hour;
+    }
 
-    date[`set${middle}FullYear`](year);
-    date[`set${middle}Month`](month);
-    date[`set${middle}Date`](day);
+    if (mod.minute !== void 0) {
+      acc.minutes = mod.minute;
+      delete acc.minute;
+    }
 
-    return date
-  }
+    if (mod.second !== void 0) {
+      acc.seconds = mod.second;
+      delete acc.second;
+    }
 
-  const yearMonDayAdj = [ 'years', 'year', 'months', 'month', 'days' ];
+    if (mod.millisecond !== void 0) {
+      acc.milliseconds = mod.millisecond;
+      delete acc.millisecond;
+    }
 
-  function adjustDate (date, mod, utc) {
+    return acc
+  }
+
+  function adjustDate (date, rawMod, utc) {
     const
+      mod = normalizeMod(rawMod),
       middle = utc === true ? 'UTC' : '',
       d = new Date(date),
-      t = (
-        mod.years !== void 0 || mod.year !== void 0 ||
-        mod.months !== void 0 || mod.month !== void 0 ||
-        mod.days !== void 0
-      )
-        ? applyYearMonthDay(d, mod, middle)
+      t = mod.year !== void 0 || mod.month !== void 0 || mod.date !== void 0
+        ? applyYearMonthDay(d, mod, middle) // removes year/month/day
         : d;
 
     for (const key in mod) {
-      if (yearMonDayAdj.includes(key) === false) {
-        const op = key.charAt(0).toUpperCase() + key.slice(1);
-        t[`set${middle}${op}`](mod[key]);
-      }
+      const op = key.charAt(0).toUpperCase() + key.slice(1);
+      t[ `set${middle}${op}` ](mod[ key ]);
     }
 
     return t
@@ -11905,7 +11969,7 @@
     let tzString = '';
 
     if (map.X !== void 0 || map.x !== void 0) {
-      const stamp = parseInt(match[map.X !== void 0 ? map.X : map.x], 10);
+      const stamp = parseInt(match[ map.X !== void 0 ? map.X : map.x ], 10);
 
       if (isNaN(stamp) === true || stamp < 0) {
         return date
@@ -11923,28 +11987,28 @@
     }
     else {
       if (map.YYYY !== void 0) {
-        date.year = parseInt(match[map.YYYY], 10);
+        date.year = parseInt(match[ map.YYYY ], 10);
       }
       else if (map.YY !== void 0) {
-        const y = parseInt(match[map.YY], 10);
+        const y = parseInt(match[ map.YY ], 10);
         date.year = y < 0 ? y : 2000 + y;
       }
 
       if (map.M !== void 0) {
-        date.month = parseInt(match[map.M], 10);
+        date.month = parseInt(match[ map.M ], 10);
         if (date.month < 1 || date.month > 12) {
           return date
         }
       }
       else if (map.MMM !== void 0) {
-        date.month = monthsShort.indexOf(match[map.MMM]) + 1;
+        date.month = monthsShort.indexOf(match[ map.MMM ]) + 1;
       }
       else if (map.MMMM !== void 0) {
-        date.month = months.indexOf(match[map.MMMM]) + 1;
+        date.month = months.indexOf(match[ map.MMMM ]) + 1;
       }
 
       if (map.D !== void 0) {
-        date.day = parseInt(match[map.D], 10);
+        date.day = parseInt(match[ map.D ], 10);
 
         if (date.year === null || date.month === null || date.day < 1) {
           return date
@@ -11960,14 +12024,14 @@
       }
 
       if (map.H !== void 0) {
-        date.hour = parseInt(match[map.H], 10) % 24;
+        date.hour = parseInt(match[ map.H ], 10) % 24;
       }
       else if (map.h !== void 0) {
-        date.hour = parseInt(match[map.h], 10) % 12;
+        date.hour = parseInt(match[ map.h ], 10) % 12;
         if (
-          (map.A && match[map.A] === 'PM') ||
-          (map.a && match[map.a] === 'pm') ||
-          (map.aa && match[map.aa] === 'p.m.')
+          (map.A && match[ map.A ] === 'PM') ||
+          (map.a && match[ map.a ] === 'pm') ||
+          (map.aa && match[ map.aa ] === 'p.m.')
         ) {
           date.hour += 12;
         }
@@ -11975,20 +12039,20 @@
       }
 
       if (map.m !== void 0) {
-        date.minute = parseInt(match[map.m], 10) % 60;
+        date.minute = parseInt(match[ map.m ], 10) % 60;
       }
 
       if (map.s !== void 0) {
-        date.second = parseInt(match[map.s], 10) % 60;
+        date.second = parseInt(match[ map.s ], 10) % 60;
       }
 
       if (map.S !== void 0) {
-        date.millisecond = parseInt(match[map.S], 10) * 10 ** (3 - match[map.S].length);
+        date.millisecond = parseInt(match[ map.S ], 10) * 10 ** (3 - match[ map.S ].length);
       }
 
       if (map.Z !== void 0 || map.ZZ !== void 0) {
-        tzString = (map.Z !== void 0 ? match[map.Z].replace(':', '') : match[map.ZZ]);
-        date.timezoneOffset = (tzString[0] === '+' ? -1 : 1) * (60 * tzString.slice(1, 3) + 1 * tzString.slice(3, 5));
+        tzString = (map.Z !== void 0 ? match[ map.Z ].replace(':', '') : match[ map.ZZ ]);
+        date.timezoneOffset = (tzString[ 0 ] === '+' ? -1 : 1) * (60 * tzString.slice(1, 3) + 1 * tzString.slice(3, 5));
       }
     }
 
@@ -12068,17 +12132,24 @@
 
     switch (unit) {
       case 'year':
-        t[`${prefix}Month`](0);
+      case 'years':
+        t[ `${prefix}Month` ](0);
       case 'month':
-        t[`${prefix}Date`](1);
+      case 'months':
+        t[ `${prefix}Date` ](1);
       case 'day':
-        t[`${prefix}Hours`](0);
+      case 'days':
+      case 'date':
+        t[ `${prefix}Hours` ](0);
       case 'hour':
-        t[`${prefix}Minutes`](0);
+      case 'hours':
+        t[ `${prefix}Minutes` ](0);
       case 'minute':
-        t[`${prefix}Seconds`](0);
+      case 'minutes':
+        t[ `${prefix}Seconds` ](0);
       case 'second':
-        t[`${prefix}Milliseconds`](0);
+      case 'seconds':
+        t[ `${prefix}Milliseconds` ](0);
     }
     return t
   }
@@ -12090,17 +12161,24 @@
 
     switch (unit) {
       case 'year':
-        t[`${prefix}Month`](11);
+      case 'years':
+        t[ `${prefix}Month` ](11);
       case 'month':
-        t[`${prefix}Date`](daysInMonth(t));
+      case 'months':
+        t[ `${prefix}Date` ](daysInMonth(t));
       case 'day':
-        t[`${prefix}Hours`](23);
+      case 'days':
+      case 'date':
+        t[ `${prefix}Hours` ](23);
       case 'hour':
-        t[`${prefix}Minutes`](59);
+      case 'hours':
+        t[ `${prefix}Minutes` ](59);
       case 'minute':
-        t[`${prefix}Seconds`](59);
+      case 'minutes':
+        t[ `${prefix}Seconds` ](59);
       case 'second':
-        t[`${prefix}Milliseconds`](999);
+      case 'seconds':
+        t[ `${prefix}Milliseconds` ](999);
     }
     return t
   }
@@ -12135,21 +12213,28 @@
 
     switch (unit) {
       case 'years':
+      case 'year':
         return (t.getFullYear() - sub.getFullYear())
 
       case 'months':
+      case 'month':
         return (t.getFullYear() - sub.getFullYear()) * 12 + t.getMonth() - sub.getMonth()
 
       case 'days':
+      case 'day':
+      case 'date':
         return getDiff(startOfDate(t, 'day'), startOfDate(sub, 'day'), MILLISECONDS_IN_DAY)
 
       case 'hours':
+      case 'hour':
         return getDiff(startOfDate(t, 'hour'), startOfDate(sub, 'hour'), MILLISECONDS_IN_HOUR)
 
       case 'minutes':
+      case 'minute':
         return getDiff(startOfDate(t, 'minute'), startOfDate(sub, 'minute'), MILLISECONDS_IN_MINUTE)
 
       case 'seconds':
+      case 'second':
         return getDiff(startOfDate(t, 'second'), startOfDate(sub, 'second'), 1000)
     }
   }
@@ -12195,26 +12280,33 @@
 
     switch (unit) {
       case 'second':
+      case 'seconds':
         if (t.getSeconds() !== d.getSeconds()) {
           return false
         }
       case 'minute': // intentional fall-through
+      case 'minutes':
         if (t.getMinutes() !== d.getMinutes()) {
           return false
         }
       case 'hour': // intentional fall-through
+      case 'hours':
         if (t.getHours() !== d.getHours()) {
           return false
         }
       case 'day': // intentional fall-through
+      case 'days':
+      case 'date':
         if (t.getDate() !== d.getDate()) {
           return false
         }
       case 'month': // intentional fall-through
+      case 'months':
         if (t.getMonth() !== d.getMonth()) {
           return false
         }
       case 'year': // intentional fall-through
+      case 'years':
         if (t.getFullYear() !== d.getFullYear()) {
           return false
         }
@@ -12272,12 +12364,12 @@
 
     // Month Short Name: Jan, Feb, ...
     MMM (date, dateLocale) {
-      return dateLocale.monthsShort[date.getMonth()]
+      return dateLocale.monthsShort[ date.getMonth() ]
     },
 
     // Month Name: January, February, ...
     MMMM (date, dateLocale) {
-      return dateLocale.months[date.getMonth()]
+      return dateLocale.months[ date.getMonth() ]
     },
 
     // Quarter: 1, 2, 3, 4
@@ -12327,12 +12419,12 @@
 
     // Day of week: Sun, Mon, ...
     ddd (date, dateLocale) {
-      return dateLocale.daysShort[date.getDay()]
+      return dateLocale.daysShort[ date.getDay() ]
     },
 
     // Day of week: Sunday, Monday, ...
     dddd (date, dateLocale) {
-      return dateLocale.days[date.getDay()]
+      return dateLocale.days[ date.getDay() ]
     },
 
     // Day of ISO week: 1, 2, ..., 7
@@ -12481,7 +12573,7 @@
       token,
       (match, text) => (
         match in formatter
-          ? formatter[match](date, locale, __forcedYear, __forcedTimezoneOffset)
+          ? formatter[ match ](date, locale, __forcedYear, __forcedTimezoneOffset)
           : (text === void 0 ? match : text.split('\\]').join(']'))
       )
     )
@@ -17912,7 +18004,14 @@
         else if (this.isDirty === false) {
           this.isDirty = true;
 
-          if (this.hasRules === true && this.lazyRules !== 'ondemand') {
+          if (
+            this.hasActiveRules === true &&
+            this.lazyRules !== 'ondemand' &&
+            // Don't re-trigger if it's already in progress;
+            // It might mean that focus switched to submit btn and
+            // QForm's submit() has been called already (ENTER key)
+            this.innerLoading === false
+          ) {
             this.debouncedValidate();
           }
         }
@@ -17926,12 +18025,15 @@
 
     computed: {
       hasRules () {
-        return this.disable !== true &&
-          this.rules !== void 0 &&
+        return this.rules !== void 0 &&
           this.rules !== null &&
           this.rules.length > 0
       },
 
+      hasActiveRules () {
+        return this.disable !== true && this.hasRules === true
+      },
+
       hasError () {
         return this.error === true || this.innerError === true
       },
@@ -17969,11 +18071,11 @@
        *   - Promise (pending async validation)
        */
       validate (val = this.value) {
-        if (this.hasRules !== true) {
+        if (this.hasActiveRules !== true) {
           return true
         }
 
-        this.validateIndex++;
+        const index = ++this.validateIndex;
 
         if (this.innerLoading !== true && this.lazyRules !== true) {
           this.isDirty = true;
@@ -18026,31 +18128,24 @@
           this.innerLoading = true;
         }
 
-        const index = this.validateIndex;
-
         return Promise.all(promises).then(
           res => {
-            if (index !== this.validateIndex) {
-              return true
-            }
-
             if (res === void 0 || Array.isArray(res) === false || res.length === 0) {
-              update(false);
+              index === this.validateIndex && update(false);
               return true
             }
 
             const msg = res.find(r => r === false || typeof r === 'string');
-            update(msg !== void 0, msg);
+            index === this.validateIndex && update(msg !== void 0, msg);
             return msg === void 0
           },
           e => {
             if (index === this.validateIndex) {
               console.error(e);
               update(true);
-              return false
             }
 
-            return true
+            return false
           }
         )
       },
@@ -18065,7 +18160,7 @@
 
       __validateIfNeeded (changedRules) {
         if (
-          this.hasRules === true &&
+          this.hasActiveRules === true &&
           this.lazyRules !== 'ondemand' &&
           (this.isDirty === true || (this.lazyRules !== true && changedRules !== true))
         ) {
@@ -19506,7 +19601,7 @@
           ? shouldFocus
           : this.noErrorFocus !== true;
 
-        this.validateIndex++;
+        const index = ++this.validateIndex;
 
         const components = this.getValidationComponents().filter(c => c.disable !== true);
 
@@ -19522,7 +19617,7 @@
             promises.push(
               valid.then(
                 valid => ({ valid, comp }),
-                error => ({ valid: false, comp, error })
+                err => ({ valid: false, comp, err })
               )
             );
           }
@@ -19546,19 +19641,19 @@
           return Promise.resolve(true)
         }
 
-        const index = this.validateIndex;
-
         return Promise.all(promises).then(
           res => {
-            if (index === this.validateIndex) {
-              const errors = res.filter(r => r.valid !== true);
+            const errors = res.filter(r => r.valid !== true);
 
-              if (errors.length === 0) {
-                emit(true);
-                return true
-              }
+            if (errors.length === 0) {
+              index === this.validateIndex && emit(true);
+              return true
+            }
+
+            const { valid, comp, err } = errors[0];
 
-              const { valid, comp } = errors[0];
+            if (index === this.validateIndex) {
+              err !== void 0 && console.error(err);
 
               emit(false, comp);
 
@@ -19569,9 +19664,9 @@
               ) {
                 comp.focus();
               }
-
-              return false
             }
+
+            return false
           }
         )
       },
@@ -19587,8 +19682,11 @@
       submit (evt) {
         evt !== void 0 && stopAndPrevent(evt);
 
+        const index = this.validateIndex + 1;
+
         this.validate().then(val => {
-          if (val === true) {
+          // if not outdated && validation succeeded
+          if (index === this.validateIndex && val === true) {
             if (this.qListeners.submit !== void 0) {
               this.$emit('submit', evt);
             }
@@ -21088,6 +21186,15 @@
         this.autogrow === true && this.$nextTick(this.__adjustHeight);
       },
 
+      // some browsers lose the native input value
+      // so we need to reattach it dynamically
+      // (like type="password" <-> type="text"; see #12078)
+      type () {
+        if (this.$refs.input) {
+          this.$refs.input.value = this.value;
+        }
+      },
+
       autogrow (autogrow) {
         // textarea only
         if (autogrow === true) {
@@ -22286,6 +22393,9 @@
       label: String,
       leftLabel: Boolean,
 
+      checkedIcon: String,
+      uncheckedIcon: String,
+
       color: String,
       keepColor: Boolean,
       dense: Boolean,
@@ -22318,6 +22428,12 @@
         return `q-radio__inner--${this.isTrue === true ? 'truthy' : 'falsy'}${color}`
       },
 
+      computedIcon () {
+        return this.isTrue === true
+          ? this.checkedIcon
+          : this.uncheckedIcon
+      },
+
       computedTabindex () {
         return this.disable === true ? -1 : this.tabindex || 0
       },
@@ -22369,25 +22485,38 @@
     },
 
     render (h) {
-      const content = [
-        h('svg', {
-          staticClass: 'q-radio__bg absolute non-selectable',
-          attrs: { focusable: 'false' /* needed for IE11 */, viewBox: '0 0 24 24', 'aria-hidden': 'true' }
-        }, [
-          h('path', {
-            attrs: {
-              d: 'M12,22a10,10 0 0 1 -10,-10a10,10 0 0 1 10,-10a10,10 0 0 1 10,10a10,10 0 0 1 -10,10m0,-22a12,12 0 0 0 -12,12a12,12 0 0 0 12,12a12,12 0 0 0 12,-12a12,12 0 0 0 -12,-12'
-            }
-          }),
+      const content = this.computedIcon !== void 0
+        ? [
+          h('div', {
+            key: 'icon',
+            staticClass: 'q-radio__icon-container absolute flex flex-center no-wrap'
+          }, [
+            h(QIcon, {
+              staticClass: 'q-radio__icon',
+              props: { name: this.computedIcon }
+            })
+          ])
+        ]
+        : [
+          h('svg', {
+            key: 'svg',
+            staticClass: 'q-radio__bg absolute non-selectable',
+            attrs: { focusable: 'false' /* needed for IE11 */, viewBox: '0 0 24 24', 'aria-hidden': 'true' }
+          }, [
+            h('path', {
+              attrs: {
+                d: 'M12,22a10,10 0 0 1 -10,-10a10,10 0 0 1 10,-10a10,10 0 0 1 10,10a10,10 0 0 1 -10,10m0,-22a12,12 0 0 0 -12,12a12,12 0 0 0 12,12a12,12 0 0 0 12,-12a12,12 0 0 0 -12,-12'
+              }
+            }),
 
-          h('path', {
-            staticClass: 'q-radio__check',
-            attrs: {
-              d: 'M12,6a6,6 0 0 0 -6,6a6,6 0 0 0 6,6a6,6 0 0 0 6,-6a6,6 0 0 0 -6,-6'
-            }
-          })
-        ])
-      ];
+            h('path', {
+              staticClass: 'q-radio__check',
+              attrs: {
+                d: 'M12,6a6,6 0 0 0 -6,6a6,6 0 0 0 6,6a6,6 0 0 0 6,-6a6,6 0 0 0 -6,-6'
+              }
+            })
+          ])
+        ];
 
       this.disable !== true && this.__injectFormInput(
         content,
@@ -22444,9 +22573,6 @@
 
     props: {
       icon: String,
-      checkedIcon: String,
-      uncheckedIcon: String,
-      indeterminateIcon: String,
 
       iconColor: String
     },
@@ -26554,7 +26680,7 @@
         const { options, optionEls } = this.__optionScopeCache;
 
         return this.options.slice(from, to).map((opt, i) => {
-          const disable = this.isOptionDisabled(opt) === true;
+          const disable = this.isOptionDisabled(opt);
           const index = from + i;
 
           const itemProps = {
@@ -26652,7 +26778,8 @@
       // returns method to tell if an option is disabled;
       // takes into account 'option-disable' prop
       isOptionDisabled () {
-        return this.__getPropValueFn('optionDisable', 'disable')
+        const fn = this.__getPropValueFn('optionDisable', 'disable');
+        return (...args) => fn.apply(null, args) === true
       },
 
       inputControlEvents () {
@@ -34792,14 +34919,12 @@
       __onClick (node, meta, e, keyboard) {
         keyboard !== true && this.__blur(meta.key);
 
-        if (this.hasSelection) {
-          if (meta.selectable) {
-            if (this.noSelectionUnset === false) {
-              this.$emit('update:selected', meta.key !== this.selected ? meta.key : null);
-            }
-            else if (meta.key !== this.selected) {
-              this.$emit('update:selected', meta.key || null);
-            }
+        if (this.hasSelection && meta.selectable) {
+          if (this.noSelectionUnset === false) {
+            this.$emit('update:selected', meta.key !== this.selected ? meta.key : null);
+          }
+          else if (meta.key !== this.selected) {
+            this.$emit('update:selected', meta.key || null);
           }
         }
         else {
@@ -39152,7 +39277,7 @@
   function getAttr (seed) {
     return att => {
       const val = seed[att];
-      return att + (val !== void 0 ? `="${val}"` : '')
+      return att + (val !== true && val !== void 0 ? `="${val}"` : '')
     }
   }