wave-ui 3.5.1 → 3.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-ui",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "description": "An emerging UI framework for Vue.js (2 & 3) with only the bright side. :sunny:",
   "author": "Antoni Andre <antoniandre.web@gmail.com>",
   "homepage": "https://antoniandre.github.io/wave-ui",

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

@@ -61,6 +61,7 @@ component(
           @change="onFileChange"
           :multiple="multiple || null"
           v-bind="attrs"
+          :disabled="isDisabled || null"
           :data-progress="overallFilesProgress /* Needed to emit the overallProgress. */")
         transition-group.w-input__input.w-input__input--file(
           tag="label"

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

@@ -67,7 +67,7 @@ export default {
 .w-toolbar {
   position: relative;
   display: flex;
-  flex: 1 1 auto;
+  flex: 0 1 auto; // No grow, so it doesn't stretch vertically in flex column.
   align-items: center;
   padding: (2 * $base-increment) (3 * $base-increment);
   background-color: $toolbar-bg-color;
@@ -94,7 +94,6 @@ export default {
   &--vertical {
     padding: (2 * $base-increment);
     flex-direction: column;
-    flex-grow: 0;
     flex-shrink: 0;
   }
 

package/src/wave-ui/core.js

@@ -1,8 +1,9 @@
 import { reactive, inject } from 'vue'
 import { mergeConfig } from './utils/config'
-import { injectNotifManagerInDOM, NotificationManager } from './utils/notification-manager'
+import { consoleWarn } from './utils/console'
 import { colorPalette, generateColorShades, flattenColors } from './utils/colors'
 import { injectColorsCSSInDOM, injectCSSInDOM } from './utils/dynamic-css'
+import { injectNotifManagerInDOM, NotificationManager } from './utils/notification-manager'
 import './scss/index.scss'
 
 let mounted = false
@@ -19,13 +20,36 @@ const detectOSDarkMode = $waveui => {
 
 /**
  * Inject presets into a Vue component props defaults before its registration into the app.
+ * If a preset is not found in the given component props, try to find it in its mixins, if any.
  *
+ * @todo remove mixins-related code when stopping support for Vue 2.
  * @param {Object} component the Vue component to inject presets into.
  * @param {Object} presets the presets to inject. E.g. `{ bgColor: 'green' }`.
  */
 const injectPresets = (component, presets) => {
   for (const preset in presets) {
-    component.props[preset].default = presets[preset]
+    // If we don't have the prop output a warning and continue.
+    if (!component.props?.[preset]) {
+      let foundProp = false
+      // Check to see if the prop exists on a mixin when it doesn't exist on the component.
+      // @todo: remove this check when there is no more Vue 2 and mixins: mixins are now deprecated.
+      if (Array.isArray(component.mixins) && component.mixins.length) {
+        // Loop through the array of mixin, and if we find the prop in one, update its default value.
+        for (const mixin of component.mixins) {
+          if (mixin?.props?.[preset]) {
+            mixin.props[preset].default = presets[preset]
+            foundProp = true
+            break
+          }
+        }
+
+        // If the given prop (= preset) is still not found in the mixins props raise warning.
+        if (!foundProp) consoleWarn(`Attempting to set a preset on a prop that doesn't exist: \`${component.name}.${preset}\`.`)
+        continue // Continue to the next preset.
+      }
+    }
+
+    else component.props[preset].default = presets[preset]
   }
 }
 

package/src/wave-ui/scss/index.scss

@@ -1,4 +1,3 @@
-@import './variables';
 @import './base';
 @import './typography';
 @import './layout';