quasar 2.18.7 → 2.19.1

package/src/plugins/dialog/component/DialogPluginComponent.js

@@ -14,7 +14,9 @@ import QOptionGroup from '../../../components/option-group/QOptionGroup.js'
 import QSpinner from '../../../components/spinner/QSpinner.js'
 
 import { createComponent } from '../../../utils/private.create/create.js'
-import useDark, { useDarkProps } from '../../../composables/private.use-dark/use-dark.js'
+import useDark, {
+  useDarkProps
+} from '../../../composables/private.use-dark/use-dark.js'
 
 import { isKeyCode } from '../../../utils/private.keyboard/key-composition.js'
 import { isObject } from '../../../utils/is/is.js'
@@ -29,31 +31,31 @@ export default createComponent({
     message: String,
     prompt: Object,
     options: Object,
-    progress: [ Boolean, Object ],
+    progress: [Boolean, Object],
 
     html: Boolean,
 
     ok: {
-      type: [ String, Object, Boolean ],
+      type: [String, Object, Boolean],
       default: true
     },
-    cancel: [ String, Object, Boolean ],
+    cancel: [String, Object, Boolean],
     focus: {
       type: String,
       default: 'ok',
-      validator: v => [ 'ok', 'cancel', 'none' ].includes(v)
+      validator: v => ['ok', 'cancel', 'none'].includes(v)
     },
 
     stackButtons: Boolean,
     color: String,
 
-    cardClass: [ String, Array, Object ],
-    cardStyle: [ String, Array, Object ]
+    cardClass: [String, Array, Object],
+    cardStyle: [String, Array, Object]
   },
 
-  emits: [ 'ok', 'hide' ],
+  emits: ['ok', 'hide'],
 
-  setup (props, { emit }) {
+  setup(props, { emit }) {
     const { proxy } = getCurrentInstance()
     const { $q } = proxy
 
@@ -64,79 +66,78 @@ export default createComponent({
     const model = ref(
       props.prompt !== void 0
         ? props.prompt.model
-        : (props.options !== void 0 ? props.options.model : void 0)
+        : props.options !== void 0
+          ? props.options.model
+          : void 0
     )
 
-    const classes = computed(() =>
-      'q-dialog-plugin'
-      + (isDark.value === true ? ' q-dialog-plugin--dark q-dark' : '')
-      + (props.progress !== false ? ' q-dialog-plugin--progress' : '')
+    const classes = computed(
+      () =>
+        'q-dialog-plugin' +
+        (isDark.value === true ? ' q-dialog-plugin--dark q-dark' : '') +
+        (props.progress !== false ? ' q-dialog-plugin--progress' : '')
     )
 
-    const vmColor = computed(() =>
-      props.color || (isDark.value === true ? 'amber' : 'primary')
+    const vmColor = computed(
+      () => props.color || (isDark.value === true ? 'amber' : 'primary')
     )
 
-    const spinner = computed(() => (
+    const spinner = computed(() =>
       props.progress === false
         ? null
-        : (
-            isObject(props.progress) === true
-              ? {
-                  component: props.progress.spinner || QSpinner,
-                  props: { color: props.progress.color || vmColor.value }
-                }
-              : {
-                  component: QSpinner,
-                  props: { color: vmColor.value }
-                }
-          )
-    ))
+        : isObject(props.progress) === true
+          ? {
+              component: props.progress.spinner || QSpinner,
+              props: { color: props.progress.color || vmColor.value }
+            }
+          : {
+              component: QSpinner,
+              props: { color: vmColor.value }
+            }
+    )
 
-    const hasForm = computed(() =>
-      props.prompt !== void 0 || props.options !== void 0
+    const hasForm = computed(
+      () => props.prompt !== void 0 || props.options !== void 0
     )
 
     const formProps = computed(() => {
-      if (hasForm.value !== true) {
-        return {}
-      }
+      if (hasForm.value !== true) return {}
 
-      const { model, isValid, items, ...formProps } = props.prompt !== void 0
-        ? props.prompt
-        : props.options
+      // oxlint-disable-next-line no-shadow
+      const { model, isValid, items, ...acc } =
+        props.prompt !== void 0 ? props.prompt : props.options
 
-      return formProps
+      return acc
     })
 
-    const okLabel = computed(() => (
+    const okLabel = computed(() =>
       isObject(props.ok) === true
         ? $q.lang.label.ok
-        : (
-            props.ok === true
-              ? $q.lang.label.ok
-              : props.ok
-          )
-    ))
+        : props.ok === true
+          ? $q.lang.label.ok
+          : props.ok
+    )
 
-    const cancelLabel = computed(() => (
+    const cancelLabel = computed(() =>
       isObject(props.cancel) === true
         ? $q.lang.label.cancel
-        : (
-            props.cancel === true
-              ? $q.lang.label.cancel
-              : props.cancel
-          )
-    ))
+        : props.cancel === true
+          ? $q.lang.label.cancel
+          : props.cancel
+    )
 
     const okDisabled = computed(() => {
       if (props.prompt !== void 0) {
-        return props.prompt.isValid !== void 0
-          && props.prompt.isValid(model.value) !== true
+        return (
+          props.prompt.isValid !== void 0 &&
+          props.prompt.isValid(model.value) !== true
+        )
       }
       if (props.options !== void 0) {
-        return props.options.isValid !== void 0
-          && props.options.isValid(model.value) !== true
+        return (
+          props.options.isValid !== void 0 &&
+          props.options.isValid(model.value) !== true
+        )
       }
       return false
     })
@@ -147,7 +148,8 @@ export default createComponent({
       ripple: false,
       disable: okDisabled.value,
       ...(isObject(props.ok) === true ? props.ok : { flat: true }),
-      'data-autofocus': (props.focus === 'ok' && hasForm.value !== true) || void 0,
+      'data-autofocus':
+        (props.focus === 'ok' && hasForm.value !== true) || void 0,
       onClick: onOk
     }))
 
@@ -156,59 +158,60 @@ export default createComponent({
       label: cancelLabel.value,
       ripple: false,
       ...(isObject(props.cancel) === true ? props.cancel : { flat: true }),
-      'data-autofocus': (props.focus === 'cancel' && hasForm.value !== true) || void 0,
+      'data-autofocus':
+        (props.focus === 'cancel' && hasForm.value !== true) || void 0,
       onClick: onCancel
     }))
 
     watch(() => props.prompt && props.prompt.model, onUpdateModel)
     watch(() => props.options && props.options.model, onUpdateModel)
 
-    function show () {
+    function show() {
       dialogRef.value.show()
     }
 
-    function hide () {
+    function hide() {
       dialogRef.value.hide()
     }
 
-    function onOk () {
+    function onOk() {
       emit('ok', toRaw(model.value))
       hide()
     }
 
-    function onCancel () {
+    function onCancel() {
       hide()
     }
 
-    function onDialogHide () {
+    function onDialogHide() {
       emit('hide')
     }
 
-    function onUpdateModel (val) {
+    function onUpdateModel(val) {
       model.value = val
     }
 
-    function onInputKeyup (evt) {
+    function onInputKeyup(evt) {
       // if ENTER key
       if (
-        okDisabled.value !== true
-        && props.prompt.type !== 'textarea'
-        && isKeyCode(evt, 13) === true
+        okDisabled.value !== true &&
+        props.prompt.type !== 'textarea' &&
+        isKeyCode(evt, 13) === true
       ) {
         onOk()
       }
     }
 
-    function getSection (classes, text) {
+    function getSection(sectionClass, text) {
       return props.html === true
         ? h(QCardSection, {
-          class: classes,
-          innerHTML: text
-        })
-        : h(QCardSection, { class: classes }, () => text)
+            class: sectionClass,
+            innerHTML: text
+          })
+        : h(QCardSection, { class: sectionClass }, () => text)
     }
 
-    function getPrompt () {
+    function getPrompt() {
       return [
         h(QInput, {
           color: vmColor.value,
@@ -223,7 +226,7 @@ export default createComponent({
       ]
     }
 
-    function getOptions () {
+    function getOptions() {
       return [
         h(QOptionGroup, {
           color: vmColor.value,
@@ -236,53 +239,45 @@ export default createComponent({
       ]
     }
 
-    function getButtons () {
+    function getButtons() {
       const child = []
 
-      props.cancel && child.push(
-        h(QBtn, cancelProps.value)
-      )
-
-      props.ok && child.push(
-        h(QBtn, okProps.value)
+      if (props.cancel) child.push(h(QBtn, cancelProps.value))
+      if (props.ok) child.push(h(QBtn, okProps.value))
+
+      return h(
+        QCardActions,
+        {
+          class: props.stackButtons === true ? 'items-end' : '',
+          vertical: props.stackButtons,
+          align: 'right'
+        },
+        () => child
       )
-
-      return h(QCardActions, {
-        class: props.stackButtons === true ? 'items-end' : '',
-        vertical: props.stackButtons,
-        align: 'right'
-      }, () => child)
     }
 
-    function getCardContent () {
+    function getCardContent() {
       const child = []
 
-      props.title && child.push(
-        getSection('q-dialog__title', props.title)
-      )
+      if (props.title) child.push(getSection('q-dialog__title', props.title))
 
-      props.progress !== false && child.push(
-        h(
-          QCardSection,
-          { class: 'q-dialog__progress' },
-          () => h(spinner.value.component, spinner.value.props)
+      if (props.progress !== false) {
+        child.push(
+          h(QCardSection, { class: 'q-dialog__progress' }, () =>
+            h(spinner.value.component, spinner.value.props)
+          )
         )
-      )
+      }
 
-      props.message && child.push(
-        getSection('q-dialog__message', props.message)
-      )
+      if (props.message) {
+        child.push(getSection('q-dialog__message', props.message))
+      }
 
       if (props.prompt !== void 0) {
         child.push(
-          h(
-            QCardSection,
-            { class: 'scroll q-dialog-plugin__form' },
-            getPrompt
-          )
+          h(QCardSection, { class: 'scroll q-dialog-plugin__form' }, getPrompt)
         )
-      }
-      else if (props.options !== void 0) {
+      } else if (props.options !== void 0) {
         child.push(
           h(QSeparator, { dark: isDark.value }),
           h(
@@ -301,25 +296,31 @@ export default createComponent({
       return child
     }
 
-    function getContent () {
+    function getContent() {
       return [
-        h(QCard, {
-          class: [
-            classes.value,
-            props.cardClass
-          ],
-          style: props.cardStyle,
-          dark: isDark.value
-        }, getCardContent)
+        h(
+          QCard,
+          {
+            class: [classes.value, props.cardClass],
+            style: props.cardStyle,
+            dark: isDark.value
+          },
+          getCardContent
+        )
       ]
     }
 
     // expose public methods
     Object.assign(proxy, { show, hide })
 
-    return () => h(QDialog, {
-      ref: dialogRef,
-      onHide: onDialogHide
-    }, getContent)
+    return () =>
+      h(
+        QDialog,
+        {
+          ref: dialogRef,
+          onHide: onDialogHide
+        },
+        getContent
+      )
   }
 })

package/src/plugins/icon-set/IconSet.js

@@ -3,75 +3,82 @@ import { injectProp } from '../../utils/private.inject-obj-prop/inject-obj-prop.
 
 import materialIcons from '../../../icon-set/material-icons.js'
 
-const Plugin = createReactivePlugin({
-  iconMapFn: null,
-  __qIconSet: {}
-}, {
-  // props: object
-
-  set (setObject, ssrContext) {
-    const def = { ...setObject }
-
-    if (__QUASAR_SSR_SERVER__) {
-      if (ssrContext === void 0) {
-        console.error('SSR ERROR: second param required: IconSet.set(iconSet, ssrContext)')
-        return
-      }
-
-      def.set = ssrContext.$q.iconSet.set
-      Object.assign(ssrContext.$q.iconSet, def)
-    }
-    else {
-      def.set = Plugin.set
-      Object.assign(Plugin.__qIconSet, def)
-    }
+const Plugin = createReactivePlugin(
+  {
+    iconMapFn: null,
+    __qIconSet: {}
   },
+  {
+    // props: object
+
+    set(setObject, ssrContext) {
+      const def = { ...setObject }
 
-  install ({ $q, iconSet, ssrContext }) {
-    if (__QUASAR_SSR_SERVER__) {
-      const initialSet = iconSet || materialIcons
+      if (__QUASAR_SSR_SERVER__) {
+        if (ssrContext === void 0) {
+          console.error(
+            'SSR ERROR: second param required: IconSet.set(iconSet, ssrContext)'
+          )
+          return
+        }
 
-      $q.iconMapFn = ssrContext.$q.config.iconMapFn || this.iconMapFn || null
-      $q.iconSet = {}
-      $q.iconSet.set = setObject => {
-        this.set(setObject, ssrContext)
+        def.set = ssrContext.$q.iconSet.set
+        Object.assign(ssrContext.$q.iconSet, def)
+      } else {
+        def.set = Plugin.set
+        Object.assign(Plugin.__qIconSet, def)
       }
+    },
 
-      $q.iconSet.set(initialSet)
+    install({ $q, iconSet, ssrContext }) {
+      if (__QUASAR_SSR_SERVER__) {
+        const initialSet = iconSet || materialIcons
 
-      // one-time SSR server operation
-      if (
-        this.props === void 0
-        || this.props.name !== initialSet.name
-      ) {
-        this.props = { ...initialSet }
-      }
-    }
-    else {
-      if ($q.config.iconMapFn !== void 0) {
-        this.iconMapFn = $q.config.iconMapFn
-      }
+        $q.iconMapFn = ssrContext.$q.config.iconMapFn || this.iconMapFn || null
+        $q.iconSet = {}
+        $q.iconSet.set = setObject => {
+          this.set(setObject, ssrContext)
+        }
 
-      $q.iconSet = this.__qIconSet
-      injectProp($q, 'iconMapFn', () => this.iconMapFn, val => { this.iconMapFn = val })
+        $q.iconSet.set(initialSet)
 
-      if (this.__installed === true) {
-        iconSet !== void 0 && this.set(iconSet)
-      }
-      else {
-        this.props = new Proxy(this.__qIconSet, {
-          get () { return Reflect.get(...arguments) },
+        // one-time SSR server operation
+        if (this.props === void 0 || this.props.name !== initialSet.name) {
+          this.props = { ...initialSet }
+        }
+      } else {
+        if ($q.config.iconMapFn !== void 0) {
+          this.iconMapFn = $q.config.iconMapFn
+        }
 
-          ownKeys (target) {
-            return Reflect.ownKeys(target)
-              .filter(key => key !== 'set')
+        $q.iconSet = this.__qIconSet
+        injectProp(
+          $q,
+          'iconMapFn',
+          () => this.iconMapFn,
+          val => {
+            this.iconMapFn = val
           }
-        })
+        )
+
+        if (this.__installed === true) {
+          if (iconSet !== void 0) this.set(iconSet)
+        } else {
+          this.props = new Proxy(this.__qIconSet, {
+            get() {
+              return Reflect.get(...arguments)
+            },
+
+            ownKeys(target) {
+              return Reflect.ownKeys(target).filter(key => key !== 'set')
+            }
+          })
 
-        this.set(iconSet || materialIcons)
+          this.set(iconSet || materialIcons)
+        }
       }
     }
   }
-})
+)
 
 export default Plugin