quasar 2.11.6 → 2.11.7

package/dist/types/index.d.ts

@@ -83,6 +83,10 @@ export interface BottomSheet {
        * CSS classes for this action
        */
       classes?: VueClassProp;
+      /**
+       * Style definitions to be attributed to this action element
+       */
+      style?: VueStyleProp;
       /**
        * Icon name following Quasar convention; Make sure you have the icon library installed unless you are using 'img:' prefix; If 'none' (String) is used as value then no icon is rendered (but screen real estate will still be used for it)
        */
@@ -13725,6 +13729,10 @@ declare module "./globals" {
          * CSS classes for this action
          */
         classes?: VueClassProp;
+        /**
+         * Style definitions to be attributed to this action element
+         */
+        style?: VueStyleProp;
         /**
          * Icon name following Quasar convention; Make sure you have the icon library installed unless you are using 'img:' prefix; If 'none' (String) is used as value then no icon is rendered (but screen real estate will still be used for it)
          */

package/dist/web-types/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "",
   "framework": "vue",
   "name": "quasar",
-  "version": "2.11.6",
+  "version": "2.11.7",
   "contributions": {
     "html": {
       "types-syntax": "typescript",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar",
-  "version": "2.11.6",
+  "version": "2.11.7",
   "description": "Build high-performance VueJS user interfaces (SPA, PWA, SSR, Mobile and Desktop) in record time",
   "main": "dist/quasar.cjs.prod.js",
   "module": "dist/quasar.esm.prod.js",

package/src/components/date/QDate.js

@@ -702,8 +702,8 @@ export default createComponent({
         lastEmitValue = 0
       }
       else {
-        const { year, month } = getViewModel(innerMask.value, innerLocale.value)
-        updateViewModel(year, month)
+        const model = getViewModel(innerMask.value, innerLocale.value)
+        updateViewModel(model.year, model.month, model)
       }
     })
 
@@ -713,12 +713,8 @@ export default createComponent({
       }
     })
 
-    watch(() => viewModel.value.year, year => {
-      emit('navigation', { year, month: viewModel.value.month })
-    })
-
-    watch(() => viewModel.value.month, month => {
-      emit('navigation', { year: viewModel.value.year, month })
+    watch(() => viewModel.value.year + '|' + viewModel.value.month, () => {
+      emit('navigation', { year: viewModel.value.year, month: viewModel.value.month })
     })
 
     watch(mask, val => {
@@ -900,7 +896,7 @@ export default createComponent({
       return { year: date.year, month: date.month, day: date.day }
     }
 
-    function updateViewModel (year, month) {
+    function updateViewModel (year, month, time) {
       if (minNav.value !== null && year <= minNav.value.year) {
         year = minNav.value.year
         if (month < minNav.value.month) {
@@ -915,6 +911,11 @@ export default createComponent({
         }
       }
 
+      if (time !== void 0) {
+        const { hour, minute, second, millisecond, timezoneOffset, timeHash } = time
+        Object.assign(viewModel.value, { hour, minute, second, millisecond, timezoneOffset, timeHash })
+      }
+
       const newHash = year + '/' + pad(month) + '/01'
 
       if (newHash !== viewModel.value.dateHash) {

package/src/components/dialog-bottom-sheet/BottomSheet.js

@@ -69,6 +69,7 @@ export default createComponent({
               'q-bottom-sheet__item q-hoverable q-focusable cursor-pointer relative-position',
               action.class
             ],
+            style: action.style,
             tabindex: 0,
             role: 'listitem',
             onClick () { onOk(action) },
@@ -100,6 +101,7 @@ export default createComponent({
           ? h(QSeparator, { spaced: true, dark: isDark.value })
           : h(QItem, {
             class: [ 'q-bottom-sheet__item', action.classes ],
+            style: action.style,
             tabindex: 0,
             clickable: true,
             dark: isDark.value,

package/src/components/tree/QTree.js

@@ -626,7 +626,7 @@ export default createComponent({
     }
 
     function onClick (node, meta, e, keyboard) {
-      keyboard !== true && blur(meta.key)
+      keyboard !== true && meta.selectable !== false && blur(meta.key)
 
       if (hasSelection.value && meta.selectable) {
         if (props.noSelectionUnset === false) {
@@ -649,7 +649,7 @@ export default createComponent({
       if (e !== void 0) {
         stopAndPrevent(e)
       }
-      keyboard !== true && blur(meta.key)
+      keyboard !== true && meta.selectable !== false && blur(meta.key)
       setExpanded(meta.key, !meta.expanded, node, meta)
     }
 

package/src/plugins/BottomSheet.json

@@ -38,6 +38,14 @@
                   "examples": [ "my-class" ]
                 },
 
+                "style": {
+                  "type": [ "String", "Array", "Object" ],
+                  "tsType": "VueStyleProp",
+                  "desc": "Style definitions to be attributed to this action element",
+                  "examples": [ "{ padding: '2px' }" ],
+                  "addedIn": "v2.11.7"
+                },
+
                 "icon": {
                   "extends": "icon"
                 },