wave-ui 1.45.15 → 1.49.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-ui",
-  "version": "1.45.15",
+  "version": "1.49.0",
   "description": "An emerging UI framework for Vue.js & Vue 3 with only the bright side. :sunny:",
   "author": "Antoni Andre <antoniandre.web@gmail.com>",
   "main": "./dist/wave-ui.umd.js",
@@ -46,7 +46,6 @@
     "@babel/core": "^7.16.0",
     "@babel/eslint-parser": "^7.16.3",
     "@babel/plugin-proposal-class-properties": "^7.16.0",
-    "@mdi/font": "^5.9.55",
     "@vitejs/plugin-vue": "^1.10.1",
     "autoprefixer": "^10.4.0",
     "axios": "^0.21.4",
@@ -75,5 +74,8 @@
     "vue-template-compiler": "^2.6.14",
     "vueperslides": "^2.15.2",
     "vuex": "^3.6.2"
+  },
+  "dependencies": {
+    "@mdi/font": "^6.5.95"
   }
 }

package/src/wave-ui/components/w-alert.vue

@@ -229,7 +229,6 @@ export default {
   &--icon-outside &__icon {
     position: absolute;
     opacity: 1;
-    // top: 2 * $base-increment - 1px; // Needed for IE 11, but dropping support.
     left: 1px;
     z-index: 1;
     transform: translateX(-50%);

package/src/wave-ui/components/w-confirm.vue

@@ -2,23 +2,23 @@
 .w-confirm
   w-menu(v-model="showPopup" v-bind="wMenuProps")
     template(#activator="{ on }")
-      w-button.w-confirm__button(v-on="on" v-bind="buttonProps")
+      w-button.w-confirm__button(v-on="{ ...$listeners, ...on }" v-bind="buttonProps")
         slot
     w-flex(:column="!inline" align-center)
       div
-        slot(name="question") Are you sure?
+        slot(name="question") {{ question }}
       .w-flex.justify-end(:class="inline ? 'ml2' : 'mt2'")
         w-button.mr2(
-          v-if="!noCancel"
-          v-bind="cancelButton"
+          v-if="cancel !== false"
+          v-bind="cancelButtonProps"
           :bg-color="(cancelButton || {}).bgColor || 'error'"
           @click="onCancel")
-          slot(name="cancel") Cancel
+          slot(name="cancel") {{ cancelButton.label }}
         w-button(
-          v-bind="confirmButton"
+          v-bind="confirmButtonProps"
           :bg-color="(confirmButton || {}).bgColor || 'success'"
           @click="onConfirm")
-          slot(name="confirm") Confirm
+          slot(name="confirm") {{ confirmButton.label }}
 </template>
 
 <script>
@@ -30,11 +30,16 @@ export default {
     color: { type: String },
     icon: { type: String },
     mainButton: { type: Object }, // Allow passing down an object of props to the w-button component.
+    question: { type: String, default: 'Are you sure?' },
 
     // Cancel & confirm buttons props.
-    noCancel: { type: Boolean }, // Removes the cancel button.
-    cancelButton: { type: [Boolean, Object] }, // Allow passing down an object of props to the w-button component.
-    confirmButton: { type: Object }, // Allow passing down an object of props to the w-button component.
+    // Allow passing down an object of props to the w-button component.
+    // If a string is given, that will be the label of the button.
+    // If false, no cancel button.
+    cancel: { type: [Boolean, Object, String], default: undefined },
+    // Allow passing down an object of props to the w-button component.
+    // If a string is given, that will be the label of the button.
+    confirm: { type: [Object, String] },
 
     // global menu props.
     inline: { type: Boolean }, // The layout inside the menu.
@@ -63,6 +68,26 @@ export default {
   }),
 
   computed: {
+    cancelButton () {
+      let button = { label: typeof this.cancel === 'string' ? this.cancel : 'Cancel' }
+      if (typeof this.cancel === 'object') button = Object.assign({}, button, this.cancel)
+      return button
+    },
+    // Props to pass down to the w-button component.
+    cancelButtonProps () {
+      const { label, ...props } = this.cancelButton // Everything except label.
+      return props
+    },
+    confirmButton () {
+      let button = { label: typeof this.confirm === 'string' ? this.confirm : 'Confirm' }
+      if (typeof this.confirm === 'object') button = Object.assign({}, button, this.confirm)
+      return button
+    },
+    // Props to pass down to the w-button component.
+    confirmButtonProps () {
+      const { label, ...props } = this.confirmButton // Everything except label.
+      return props
+    },
     wMenuProps () {
       return {
         top: this.top,

package/src/wave-ui/components/w-input.vue

@@ -12,9 +12,16 @@ component(
   template(v-else)
     //- Left label.
     template(v-if="labelPosition === 'left'")
-      label.w-input__label.w-input__label--left.w-form-el-shakable(v-if="$slots.default" :for="`w-input--${_uid}`")
+      label.w-input__label.w-input__label--left.w-form-el-shakable(
+        v-if="$slots.default"
+        :for="`w-input--${_uid}`"
+        :class="validationClasses")
         slot
-      label.w-input__label.w-input__label--left.w-form-el-shakable(v-else-if="label" :for="`w-input--${_uid}`" v-html="label")
+      label.w-input__label.w-input__label--left.w-form-el-shakable(
+        v-else-if="label"
+        :for="`w-input--${_uid}`"
+        :class="validationClasses"
+        v-html="label")
 
     //- Input wrapper.
     .w-input__input-wrap(:class="inputWrapClasses")
@@ -58,47 +65,67 @@ component(
           @blur="onBlur"
           @change="onFileChange"
           :multiple="multiple || null"
-          v-bind="attrs")
-        transition-group.w-input__input.w-input__input--file(tag="label" name="fade" :for="`w-input--${_uid}`")
+          v-bind="attrs"
+          :data-progress="overallFilesProgress /* Needed to emit the overallProgress. */")
+        transition-group.w-input__input.w-input__input--file(
+          tag="label"
+          name="fade"
+          :for="`w-input--${_uid}`")
           span.w-input__no-file(v-if="!inputFiles.length && isFocused" key="no-file")
             slot(name="no-file")
               template(v-if="$slots['no-file'] === undefined") No file
           span(v-for="(file, i) in inputFiles" :key="file.lastModified")
             | {{ i ? ', ': '' }}
             span.filename(:key="`${i}b`") {{ file.base }}
-            | {{ file.extension }}
+            | {{ file.extension ? `.${file.extension}` : '' }}
 
       template(v-if="labelPosition === 'inside' && showLabelInside")
         label.w-input__label.w-input__label--inside.w-form-el-shakable(
           v-if="$slots.default"
           :for="`w-input--${_uid}`"
-          :class="isFocused && { [valid === false ? 'error' : color]: color || valid === false }")
+          :class="validationClasses")
           slot
         label.w-input__label.w-input__label--inside.w-form-el-shakable(
           v-else-if="label"
           :for="`w-input--${_uid}`"
           v-html="label"
-          :class="isFocused && { [valid === false ? 'error' : color]: color || valid === false }")
+          :class="validationClasses")
       w-icon.w-input__icon.w-input__icon--inner-right(
         v-if="innerIconRight"
         tag="label"
         :for="`w-input--${_uid}`"
         @click="$emit('click:inner-icon-right', $event)") {{ innerIconRight }}
 
+      w-progress.fill-width(
+        v-if="hasLoading || (showProgress && (uploadInProgress || uploadComplete))"
+        size="2"
+        :color="progressColor || color"
+        :value="showProgress ? (uploadInProgress || uploadComplete) && overallFilesProgress : loadingValue")
+
     //- Files preview.
-    label.d-flex(v-if="type === 'file' && inputFiles.length" :for="`w-input--${_uid}`")
+    label.d-flex(v-if="type === 'file' && preview && inputFiles.length" :for="`w-input--${_uid}`")
       template(v-for="(file, i) in inputFiles")
-        i.w-icon.wi-spinner.w-icon--spin.size--sm.w-input__file-preview.primary(v-if="file.progress < 100" :key="i")
+        i.w-icon.wi-spinner.w-icon--spin.size--sm.w-input__file-preview.primary(
+          v-if="file.progress < 100"
+          :key="i")
         img.w-input__file-preview(v-else-if="file.preview" :key="i" :src="file.preview" alt="")
-        i.w-icon.wi-file.w-input__file-preview.primary(v-else :key="i")
+        i.w-icon.w-input__file-preview.primary.size--md(
+          v-else
+          :key="i"
+          :class="preview && typeof preview === 'string' ? preview : 'wi-file'")
 
     //- Right label.
     template(v-if="labelPosition === 'right'")
-      label.w-input__label.w-input__label--right.w-form-el-shakable(v-if="$slots.default" :for="`w-input--${_uid}`")
+      label.w-input__label.w-input__label--right.w-form-el-shakable(
+        v-if="$slots.default"
+        :for="`w-input--${_uid}`"
+        :class="validationClasses")
         slot
-      label.w-input__label.w-input__label--right.w-form-el-shakable(v-else-if="label" :for="`w-input--${_uid}`" v-html="label")
-
-    w-progress.fill-width(v-if="loading" size="2" :color="progressColor || color")
+      label.w-input__label.w-input__label--right.w-form-el-shakable(
+        v-else-if="label"
+        :for="`w-input--${_uid}`"
+        :class="validationClasses"
+        v-html="label")
 </template>
 
 <script>
@@ -136,13 +163,17 @@ export default {
     shadow: { type: Boolean },
     tile: { type: Boolean },
     multiple: { type: Boolean }, // Only for file uploads.
-    preview: { type: Boolean }, // Only for file uploads.
-    loading: { type: Boolean }
+    preview: { type: [Boolean, String], default: true }, // Only for file uploads.
+    loading: { type: [Boolean, Number], default: false }, // If a number is given, it will be the value of the progress.
+    showProgress: { type: [Boolean] }, // Only for file uploads.
+    // Allow syncing the files 1 way: prefilling a file is not possible.
+    // https://stackoverflow.com/questions/16365668/pre-populate-html-form-file-input
+    files: { type: Array }
     // Props from mixin: name, disabled, readonly, required, tabindex, validators.
     // Computed from mixin: inputName, isDisabled & isReadonly.
   },
 
-  emits: ['input', 'update:modelValue', 'focus', 'blur', 'click:inner-icon-left', 'click:inner-icon-right'],
+  emits: ['input', 'update:modelValue', 'focus', 'blur', 'click:inner-icon-left', 'click:inner-icon-right', 'update:overallProgress'],
 
   data () {
     return {
@@ -173,23 +204,54 @@ export default {
     },
 
     hasValue () {
-      return (
-        this.inputValue ||
-        this.inputValue === 0 ||
-        ['date', 'time'].includes(this.type) ||
-        (this.type === 'number' && this.inputNumberError) ||
-        (this.type === 'file' && this.inputFiles.length)
-      )
+      switch (this.type) {
+        case 'file': return !!this.inputFiles.length
+        case 'number': return this.inputNumberError
+        case 'date':
+        case 'time':
+          return true
+        default:
+          return this.inputValue || this.inputValue === 0
+      }
     },
 
     hasLabel () {
       return this.label || this.$slots.default
     },
 
+    hasLoading () {
+      return ![undefined, false].includes(this.loading)
+    },
+
+    loadingValue () {
+      let value
+      if (typeof this.loading === 'number') value = this.loading
+      else if (this.loading) {
+        value = this.type === 'file' && this.overallFilesProgress ? this.overallFilesProgress : undefined
+      }
+      return value
+    },
+
     showLabelInside () {
       return !this.staticLabel || (!this.hasValue && !this.placeholder)
     },
 
+    overallFilesProgress () {
+      const progress = this.inputFiles.reduce((total, file) => total + file.progress, 0)
+      const total = progress / this.inputFiles.length
+      this.$emit('update:overallProgress', this.inputFiles.length ? total : undefined)
+
+      return total
+    },
+
+    uploadInProgress () {
+      return this.overallFilesProgress > 0 && this.overallFilesProgress < 100
+    },
+
+    uploadComplete () {
+      return this.overallFilesProgress === 100
+    },
+
     classes () {
       return {
         'w-input': true,
@@ -207,6 +269,12 @@ export default {
       }
     },
 
+    validationClasses () {
+      return this.isFocused && {
+        [this.valid === false ? 'error' : this.color]: this.color || this.valid === false
+      }
+    },
+
     inputWrapClasses () {
       return {
         [this.valid === false ? 'error' : this.color]: this.color || this.valid === false,
@@ -219,7 +287,8 @@ export default {
         'w-input__input-wrap--underline': !this.outline,
         'w-input__input-wrap--shadow': this.shadow,
         'w-input__input-wrap--no-padding': !this.outline && !this.bgColor && !this.shadow && !this.round,
-        'w-input__input-wrap--loading': this.loading
+        'w-input__input-wrap--loading': this.loading || (this.showProgress && this.uploadInProgress),
+        'w-input__input-wrap--upload-complete': this.uploadComplete
       }
     }
   },
@@ -244,37 +313,43 @@ export default {
     // For file input.
     onFileChange (e) {
       this.$set(this, 'inputFiles', [...e.target.files].map(original => {
-        const [, base, extension] = original.name.match(/^(.*)(\..*?)$/)
+        // `full` if there is no filename but only an extension.
+        const [, base = '', extension = '', full = ''] = original.name.match(/^(.*?)\.([^.]*)$|(.*)/)
         const file = Object.assign({}, {
           name: original.name,
-          base,
+          base: base || full,
           extension,
           type: original.type,
           size: original.size,
           lastModified: original.lastModified,
           preview: null,
-          progress: 0
+          progress: 0,
+          file: original
         })
 
-        this.filePreview(original, file)
+        this.readFile(original, file)
 
         return file
       }))
       this.$emit('update:modelValue', this.inputFiles)
       this.$emit('input', this.inputFiles)
-      this.$emit('change', this.inputFiles)
     },
 
     // For file input.
-    filePreview (original, file) {
+    readFile (original, file) {
       const reader = new FileReader()
 
+      // If the preview prop is a string, the user is setting the  preview to an icon and
+      // don't need the actual file preview.
+      const isPreviewAnIcon = typeof this.preview === 'string'
+      const isFileAnImage = original.type && original.type.startsWith('image/')
       // Check if the file is an image and set a preview image.
-      if (original.type && original.type.startsWith('image/')) {
+      if (this.preview && !isPreviewAnIcon && isFileAnImage) {
         reader.addEventListener('load', e => {
           this.$set(file, 'preview', e.target.result)
         })
       }
+      else delete file.preview
 
       // Used to display a spinner while the file is loading.
       reader.addEventListener('progress', event => {
@@ -319,6 +394,8 @@ $inactive-color: #777;
   &--file {
     flex-wrap: nowrap;
     align-items: flex-end;
+
+    span.fade-leave-to {position: absolute;}
   }
 
   // Input field wrapper.
@@ -348,7 +425,10 @@ $inactive-color: #777;
     &--round {border-radius: 99em;}
     &--tile {border-radius: initial;}
     &--shadow {box-shadow: $box-shadow;}
-    &--loading {border-bottom-color: transparent;}
+    &--loading, &--upload-complete {
+      border-bottom-color: transparent;
+      flex-wrap: wrap;
+    }
     &--loading ~ .w-progress {
       height: 2px;
       position: absolute;
@@ -357,7 +437,8 @@ $inactive-color: #777;
     }
 
     .w-input--focused & {border-color: currentColor;}
-    .w-input--focused &--loading {border-bottom-color: transparent;}
+    .w-input--focused &--loading,
+    .w-input--focused &--upload-complete {border-bottom-color: transparent;}
 
     // Underline.
     &--underline:after {
@@ -468,6 +549,8 @@ $inactive-color: #777;
     margin-left: 4px;
     max-height: 2em;
     align-self: flex-end;
+
+    &.w-icon {margin-bottom: 4px;}
   }
 
   // Icons inside.