Merge branch 'hotfix/v2.10.4'

talkhabi · Mar 4, 2022 · 5794f06 · 5794f06
2 parents 4b2509b + 4068080
commit 5794f06
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -129,6 +129,10 @@ This project is licensed under the MIT License
 
 ## Change log
 
+### 2.10.4 (2022-03-04)
+ * Fixed [change the time with keyboard in popover mode](https://github.com/talkhabi/vue-persian-datetime-picker/issues/214)
+ * Fixed popover configuration
+
 ### 2.10.3 (2022-01-06)
  * Fixed [popover position in rtl pages](https://github.com/talkhabi/vue-persian-datetime-picker/issues/204)
  * Fixed [keep the selected day in simple mode](https://github.com/talkhabi/vue-persian-datetime-picker/issues/207)

diff --git a/dist/vue-persian-datetime-picker.common.js b/dist/vue-persian-datetime-picker.common.js
diff --git a/dist/vue-persian-datetime-picker.umd.js b/dist/vue-persian-datetime-picker.umd.js
diff --git a/dist/vue-persian-datetime-picker.umd.min.js b/dist/vue-persian-datetime-picker.umd.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue-persian-datetime-picker",
   "description": "A vue plugin to select jalali date and time",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "private": false,
   "author": "Mohammad Talkhabi",
   "license": "MIT",

diff --git a/src/VuePersianDatetimePicker.vue b/src/VuePersianDatetimePicker.vue
@@ -1790,7 +1790,6 @@ export default {
       if (this.isPopover && this.$refs.picker && inputGroup) {
         let isOnPicker = this.$refs.picker.contains(event.target)
         let isOnInput = inputGroup.contains(event.target)
-        if (isOnPicker) event.preventDefault()
         if (!isOnPicker && !isOnInput) {
           // setTimeout because:
           // first read the input value
@@ -1808,7 +1807,7 @@ export default {
         offsetY: 0
       }
       if (typeof this.popover === 'object' && this.popover)
-        positionOptions.placement = this.popover
+        positionOptions = this.popover
       else if (typeof this.popover === 'string')
         positionOptions.placement = this.popover
       popover.setPickerPosition(

diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss
@@ -520,9 +520,10 @@
       height: 100%;
       text-align: center;
       outline: none;
-      font-size: inherit;
       color: inherit;
+      font-size: inherit;
       line-height: inherit;
+      font-family: inherit;
       opacity: 0;
       padding: 5% 0 0 0;
     }