@eturnity/eturnity_reusable_components 8.16.2--EPDM-14330.11 → 8.16.2--EPDM-14330.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eturnity/eturnity_reusable_components",
3
- "version": "8.16.2--EPDM-14330.11",
3
+ "version": "8.16.2--EPDM-14330.13",
4
4
  "files": [
5
5
  "dist",
6
6
  "src"
@@ -628,7 +628,7 @@
628
628
  return selectedDate >= currentDate
629
629
  },
630
630
  getDatePickerLanguage() {
631
- return datePickerLang(this.activeLanguage)
631
+ return this.activeLanguage
632
632
  },
633
633
  onDragChange({ data }) {
634
634
  this.$emit('on-drag-change', data)
@@ -26,7 +26,6 @@
26
26
  class="sort-dropdown"
27
27
  :dropdown-auto-close="false"
28
28
  select-height="40px"
29
- @click.stop
30
29
  @input-change="
31
30
  onSelectFilter({
32
31
  type: 'column',
@@ -61,7 +60,6 @@
61
60
  :disabled="!item.column"
62
61
  :dropdown-auto-close="false"
63
62
  select-height="40px"
64
- @click.stop
65
63
  @input-change="
66
64
  onSelectFilter({
67
65
  type: 'constraint',
@@ -92,6 +90,7 @@
92
90
  <template v-if="item.column === 'updated'">
93
91
  <DatePickerContainer>
94
92
  <VueDatePicker
93
+ ref="datePicker"
95
94
  :auto-apply="true"
96
95
  :clearable="true"
97
96
  :disabled="!item.constraint"
@@ -105,6 +104,8 @@
105
104
  :range="false"
106
105
  :single-picker="true"
107
106
  text-input
107
+ @click="handleDatePickerClick"
108
+ @open="handleDatePickerClick"
108
109
  @update:model-value="
109
110
  onSelectFilter({
110
111
  type: 'selectedDate',
@@ -126,7 +127,6 @@
126
127
  :is-searchable="false"
127
128
  option-width="max-content"
128
129
  select-height="40px"
129
- @click.stop
130
130
  @input-change="
131
131
  onSelectFilter({
132
132
  type: 'selectedOptions',
@@ -198,7 +198,6 @@
198
198
  class="sort-dropdown"
199
199
  :dropdown-auto-close="false"
200
200
  select-height="40px"
201
- @click.stop
202
201
  @input-change="
203
202
  onSelectFilter({
204
203
  type: 'column',
@@ -227,7 +226,6 @@
227
226
  :disabled="true"
228
227
  :dropdown-auto-close="false"
229
228
  select-height="40px"
230
- @click.stop
231
229
  >
232
230
  <template #selector>
233
231
  <SelectedText>{{ $gettext('constraint') }}</SelectedText>
@@ -240,7 +238,6 @@
240
238
  :disabled="true"
241
239
  :dropdown-auto-close="false"
242
240
  select-height="40px"
243
- @click.stop
244
241
  >
245
242
  <template #selector>
246
243
  <SelectedText>{{ $gettext('Options') }}</SelectedText>
@@ -405,7 +402,7 @@
405
402
  return theme
406
403
  },
407
404
  datePickerLocale() {
408
- return datePickerLang(this.activeLanguage)
405
+ return this.activeLanguage
409
406
  },
410
407
  datePickerFormat() {
411
408
  return getDateFormat(this.activeLanguage)
@@ -420,7 +417,13 @@
420
417
  event.target.closest('.sort-dropdown') ||
421
418
  event.target.closest('.rc-select-dropdown') ||
422
419
  event.target.closest('.select-button') ||
423
- event.target.closest('.caret_dropdown')
420
+ event.target.closest('.caret_dropdown') ||
421
+ event.target.closest('.rc-select') ||
422
+ event.target.closest('.select-option') ||
423
+ event.target.closest('.icon') ||
424
+ event.target.closest('svg') ||
425
+ event.target.closest('.dp-input') ||
426
+ event.target.closest('.dp__menu')
424
427
 
425
428
  if (
426
429
  !this.$refs.buttonIcon.$el.contains(event.target) &&
@@ -497,6 +500,12 @@
497
500
 
498
501
  return generalOptions
499
502
  },
503
+ handleDatePickerClick() {
504
+ // Close all Select dropdowns. This is a workaround to close the dropdown when the date picker is clicked
505
+ this.$refs.selectSortDropdown.forEach((select) => {
506
+ select.closeDropdown()
507
+ })
508
+ },
500
509
  getSelectedLabel({ type, value, index }) {
501
510
  if (!value) return
502
511
  if (type === 'column') {
@@ -23,7 +23,6 @@
23
23
  class="sort-dropdown"
24
24
  :dropdown-auto-close="false"
25
25
  select-height="40px"
26
- @click.stop
27
26
  @input-change="
28
27
  onSelectSort({
29
28
  type: 'column',
@@ -54,7 +53,6 @@
54
53
  class="sort-dropdown"
55
54
  :dropdown-auto-close="false"
56
55
  select-height="40px"
57
- @click.stop
58
56
  @input-change="
59
57
  onSelectSort({
60
58
  type: 'direction',
@@ -100,7 +98,6 @@
100
98
  class="sort-dropdown"
101
99
  :dropdown-auto-close="false"
102
100
  select-height="40px"
103
- @click.stop
104
101
  @input-change="
105
102
  onSelectSort({
106
103
  type: 'column',
@@ -128,7 +125,6 @@
128
125
  class="sort-dropdown"
129
126
  :dropdown-auto-close="false"
130
127
  select-height="40px"
131
- @click.stop
132
128
  @input-change="
133
129
  onSelectSort({
134
130
  type: 'direction',
@@ -276,7 +272,11 @@
276
272
  event.target.closest('.sort-dropdown') ||
277
273
  event.target.closest('.rc-select-dropdown') ||
278
274
  event.target.closest('.select-button') ||
279
- event.target.closest('.caret_dropdown')
275
+ event.target.closest('.caret_dropdown') ||
276
+ event.target.closest('.rc-select') ||
277
+ event.target.closest('.select-option') ||
278
+ event.target.closest('.icon') ||
279
+ event.target.closest('svg')
280
280
 
281
281
  if (
282
282
  !buttonIcon.contains(event.target) &&
@@ -898,8 +898,6 @@
898
898
  },
899
899
  clickOutside(event) {
900
900
  const dropdownRef = this.$refs.dropdown
901
- // we need to prevent closing on selecting an option, because in the case of
902
- // a disabled option, we don't want to close the dropdown
903
901
  if (!this.isClickOutsideActive) return
904
902
  if (
905
903
  this.$refs.select.$el == event.target ||