@eturnity/eturnity_reusable_components 8.16.2--EPDM-14330.10 → 8.16.2--EPDM-14330.12

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.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/filter/filterSettings.vue +1 -1
  3. package/src/components/filterComponent/viewFilter.vue +9 -11
  4. package/src/components/filterComponent/viewSort.vue +5 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eturnity/eturnity_reusable_components",
3
- "version": "8.16.2--EPDM-14330.10",
3
+ "version": "8.16.2--EPDM-14330.12",
4
4
  "files": [
5
5
  "dist",
6
6
  "src"
package/src/components/filter/filterSettings.vue CHANGED
@@ -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)
package/src/components/filterComponent/viewFilter.vue CHANGED
@@ -19,14 +19,13 @@
19
19
  v-for="(item, index) in selectedSort"
20
20
  :key="index"
21
21
  >
22
- <LeadingText>{{ $gettext('where') }}</LeadingText>
22
+ <LeadingText>{{ $gettext('if') }}</LeadingText>
23
23
  <SelectComponent
24
24
  ref="selectSortDropdown"
25
25
  align-items="vertical"
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',
@@ -126,7 +124,6 @@
126
124
  :is-searchable="false"
127
125
  option-width="max-content"
128
126
  select-height="40px"
129
- @click.stop
130
127
  @input-change="
131
128
  onSelectFilter({
132
129
  type: 'selectedOptions',
@@ -191,14 +188,13 @@
191
188
  </template>
192
189
  <template v-else>
193
190
  <SortDropdownContainer>
194
- <LeadingText>{{ $gettext('where') }}</LeadingText>
191
+ <LeadingText>{{ $gettext('if') }}</LeadingText>
195
192
  <SelectComponent
196
193
  ref="selectSortDropdown"
197
194
  align-items="vertical"
198
195
  class="sort-dropdown"
199
196
  :dropdown-auto-close="false"
200
197
  select-height="40px"
201
- @click.stop
202
198
  @input-change="
203
199
  onSelectFilter({
204
200
  type: 'column',
@@ -227,7 +223,6 @@
227
223
  :disabled="true"
228
224
  :dropdown-auto-close="false"
229
225
  select-height="40px"
230
- @click.stop
231
226
  >
232
227
  <template #selector>
233
228
  <SelectedText>{{ $gettext('constraint') }}</SelectedText>
@@ -240,7 +235,6 @@
240
235
  :disabled="true"
241
236
  :dropdown-auto-close="false"
242
237
  select-height="40px"
243
- @click.stop
244
238
  >
245
239
  <template #selector>
246
240
  <SelectedText>{{ $gettext('Options') }}</SelectedText>
@@ -250,7 +244,7 @@
250
244
  </template>
251
245
  </SortOptionsContainer>
252
246
  <BottomContainer>
253
- <PlaceholderText>{{ $gettext('where') }}</PlaceholderText>
247
+ <PlaceholderText>{{ $gettext('if') }}</PlaceholderText>
254
248
  <ButtonIcon
255
249
  icon-name="plus_button"
256
250
  :text="$gettext('add_filter')"
@@ -405,7 +399,7 @@
405
399
  return theme
406
400
  },
407
401
  datePickerLocale() {
408
- return datePickerLang(this.activeLanguage)
402
+ return this.activeLanguage
409
403
  },
410
404
  datePickerFormat() {
411
405
  return getDateFormat(this.activeLanguage)
@@ -420,7 +414,11 @@
420
414
  event.target.closest('.sort-dropdown') ||
421
415
  event.target.closest('.rc-select-dropdown') ||
422
416
  event.target.closest('.select-button') ||
423
- event.target.closest('.caret_dropdown')
417
+ event.target.closest('.caret_dropdown') ||
418
+ event.target.closest('.rc-select') ||
419
+ event.target.closest('.select-option') ||
420
+ event.target.closest('.icon') ||
421
+ event.target.closest('svg')
424
422
 
425
423
  if (
426
424
  !this.$refs.buttonIcon.$el.contains(event.target) &&
package/src/components/filterComponent/viewSort.vue CHANGED
@@ -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) &&