@itfin/components 2.0.17 → 2.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itfin/components",
-  "version": "2.0.17",
+  "version": "2.0.18",
   "author": "Vitalii Savchuk <esvit666@gmail.com>",
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/datepicker/DateGranularityPicker.vue

@@ -129,7 +129,7 @@ class itfDateGranularityPicker extends Vue {
   @Prop({ type: [String, Date], default: ''}) maxDate;
   @Prop(Boolean) disabled;
 
-  granularity = 'yearly';
+  granularity = 'monthly';
 
   get granularities() {
     return [
@@ -137,6 +137,7 @@ class itfDateGranularityPicker extends Vue {
       { title: 'Quarterly', value: 'quarterly' },
       { title: 'Monthly', value: 'monthly' },
       { title: 'Weekly', value: 'weekly' },
+      { title: 'Daily', value: 'daily' },
       { title: 'Custom', value: 'manual' },
     ];
   }

package/src/components/datepicker/PeriodPicker.vue

@@ -11,85 +11,27 @@
       :placeholder="placeholder"
     />
     <div style="display: none">
-      <div ref="dropdown" class="itf-periodpicker__dropdown">
-        <div class="row mb-3">
-          <div class="col">
-            <itf-button @click="setYear(prevYear)">
-              <itf-icon name="chevron_left" />
-            </itf-button>
-          </div>
-          <div class="col">
-            <itf-button block @click="setYear(prevYear)">
-              {{prevYear}}
-            </itf-button>
-          </div>
-          <div class="col">
-            <itf-button color="outline-primary" block>
-              {{year}}
-            </itf-button>
-          </div>
-          <div class="col">
-            <itf-button block @click="setYear(nextYear)">
-              {{nextYear}}
-            </itf-button>
-          </div>
-          <div class="col text-end">
-            <itf-button @click="setYear(nextYear)">
-              <itf-icon name="chevron_right" />
-            </itf-button>
-          </div>
-        </div>
-
-        <itf-button block class="mb-3" :class="{'btn-whole': !isCurrentYear()}" :primary="isCurrentYear()" @click="onYearSelect(year)">
-          {{ $t('components.wholeYear') }}
-        </itf-button>
-
-        <div class="itf-periodpicker__quarters">
-          <div
-            v-for="quarter of quarters"
-            :key="quarter.Number"
-            class="itf-periodpicker__quarter"
-            :class="{ 'active': isOnlyQuarter(quarter.Number), 'active-inside': isCurrentQuarter(quarter.Number) }">
-            <div class="px-3 pt-2" @click="onQuarterSelect([quarter.Months[0], quarter.Months[2]])">
-              <small><b>QUARTER</b></small><br>
-              <span class="quarter-number">{{ quarter.Number }}</span>
-            </div>
-
-            <div class="itf-periodpicker__months">
-              <itf-button
-                class="itf-periodpicker__month px-1"
-                v-for="month of quarter.Months"
-                :key="month"
-                :primary="isCurrentMonth(month)"
-                @click="onMonthSelect(month)"
-              >
-                {{ month | formatMonth }}
-              </itf-button>
-            </div>
-          </div>
-        </div>
-      </div>
+      <itf-period-picker-inline
+        ref="dropdown"
+        class="itf-periodpicker__dropdown"
+        v-model="value"
+        :value-format="valueFormat"
+        @input="onInput"
+      />
     </div>
   </div>
 </template>
 <script>
 import { Vue, Component, Prop, Inject } from 'vue-property-decorator';
-import { DateTime } from 'luxon';
 import tippy from 'tippy.js';
-import itfIcon from '../icon/Icon';
-import itfButton from '../button/Button';
+import itfPeriodPickerInline from "./PeriodPickerInline.vue";
+import {DateTime} from "luxon";
 import ITFSettings from '../../ITFSettings';
 
 export default @Component({
   name: 'itfPeriodPicker',
   components: {
-    itfIcon,
-    itfButton
-  },
-  filters: {
-    formatMonth(month) {
-      return DateTime.local().set({ month }).toFormat('MMM');
-    }
+    itfPeriodPickerInline
   }
 })
 class itfPeriodPicker extends Vue {
@@ -97,51 +39,12 @@ class itfPeriodPicker extends Vue {
 
   @Prop({ type: Array }) value;
   @Prop({ type: String, default: 'ISO' }) valueFormat;
-  @Prop({ type: String }) displayFormat;
   @Prop({ type: String, default: 'bottom-start' }) placement;
-  @Prop({ type: String, default: 'days', validator: (value) => ['days', 'months', 'years'].includes(value) }) startView;
-  @Prop({ type: Boolean, default: false }) onlyCalendar;
   @Prop({ type: String, default: '' }) placeholder;
-
-  year = null;
+  @Prop({ type: String }) displayFormat;
 
   focused = false;
 
-  tooltip = null;
-
-  get quarters() {
-    return [
-      { Name: `${this.$t('components.quarter')} 1`, Months: [1, 2, 3], Number: 1 },
-      { Name: `${this.$t('components.quarter')} 2`, Months: [4, 5, 6], Number: 2 },
-      { Name: `${this.$t('components.quarter')} 3`, Months: [7, 8, 9], Number: 3 },
-      { Name: `${this.$t('components.quarter')} 4`, Months: [10, 11, 12], Number: 4 },
-    ];
-  }
-
-  get dateFormat() {
-    return this.displayFormat || ITFSettings.defaultDisplayDateFormat;
-  }
-
-  get nextYear() {
-    return this.year + 1;
-  }
-
-  get prevYear() {
-    return this.year - 1;
-  }
-
-  setYear(year) {
-    this.year = year;
-  }
-
-  isInvalid() {
-    return this.itemLabel && this.itemLabel.isHasError();
-  }
-
-  isSuccess() {
-    return this.itemLabel && this.itemLabel.isHasSuccess();
-  }
-
   mounted() {
     const context = this.$el.closest('.itf-append-context') || document.body;
     this.tooltip = tippy(this.$refs.input, {
@@ -149,30 +52,17 @@ class itfPeriodPicker extends Vue {
       interactiveDebounce: 75,
       animation: 'scale',
       arrow: true,
-      content: this.$refs.dropdown,
+      content: this.$refs.dropdown.$el,
       allowHTML: true,
       trigger: 'click',
       interactive: true,
       placement: this.placement,
       appendTo: context,
     });
-    this.year = (this.value && this.value[0]) ? this.valueAsLuxon[0].year : DateTime.local().year;
   }
 
-  get valueAsLuxon() {
-    if (!this.value || this.value.length < 2) {
-      return null;
-    }
-    if (this.valueFormat === 'ISO') {
-      return [
-        DateTime.fromISO(this.value[0]),
-        DateTime.fromISO(this.value[1]),
-      ];
-    }
-    return [
-      DateTime.fromFormat(this.value[0], this.valueFormat),
-      DateTime.fromFormat(this.value[1], this.valueFormat),
-    ];
+  get dateFormat() {
+    return this.displayFormat || ITFSettings.defaultDisplayDateFormat;
   }
 
   get displayText() {
@@ -183,12 +73,29 @@ class itfPeriodPicker extends Vue {
     if (!this.valueAsLuxon || this.valueAsLuxon.length < 2) {
       return [];
     }
+    console.info(this.valueAsLuxon);
     return [
       this.valueAsLuxon[0].toFormat(this.dateFormat),
       this.valueAsLuxon[1].toFormat(this.dateFormat)
     ];
   }
 
+  get valueAsLuxon() {
+    if (!this.value || this.value.length < 2) {
+      return null;
+    }
+    if (this.valueFormat === 'ISO') {
+      return [
+        DateTime.fromISO(this.value[0]),
+        DateTime.fromISO(this.value[1]),
+      ];
+    }
+    return [
+      DateTime.fromFormat(this.value[0], this.valueFormat),
+      DateTime.fromFormat(this.value[1], this.valueFormat),
+    ];
+  }
+
   onFocus() {
     this.focused = true;
   }
@@ -197,71 +104,21 @@ class itfPeriodPicker extends Vue {
     this.focused = false;
   }
 
-  selectInlineDate(date) {
-    this.$emit('input', date);
-    this.tooltip.hide();
-  }
-
-  isCurrentMonth(month) {
-    if (!this.valueAsLuxon) {
-      return false;
-    }
-    return Number(this.valueAsLuxon[0].toFormat('M')) === month && Number(this.valueAsLuxon[1].toFormat('M')) === month;
-  }
-
-  isOnlyQuarter(quarter) {
-    if (!this.valueAsLuxon) {
-      return false;
-    }
-    return this.isCurrentQuarter(quarter) && this.valueAsLuxon[0].month !== this.valueAsLuxon[1].month;
+  isInvalid() {
+    return this.itemLabel && this.itemLabel.isHasError();
   }
 
-  isCurrentQuarter(quarter) {
-    if (!this.valueAsLuxon) {
-      return false;
-    }
-    return this.valueAsLuxon[0].quarter === quarter && this.valueAsLuxon[1].quarter === quarter;
+  isSuccess() {
+    return this.itemLabel && this.itemLabel.isHasSuccess();
   }
 
-  isCurrentYear() {
-    if (!this.valueAsLuxon) {
-      return false;
-    }
-    return this.valueAsLuxon[0].hasSame(this.valueAsLuxon[0].startOf('year'), 'day')
-      && this.valueAsLuxon[1].hasSame(this.valueAsLuxon[0].endOf('year'), 'day');
+  selectInlineDate(date) {
+    this.$emit('input', date);
   }
 
-  updateValue(start, end) {
-    if (!start) {
-      this.$emit('input', []);
-      return;
-    }
-    this.$emit('input', [
-      (this.valueFormat === 'ISO') ? start.toISO() : start.toFormat(this.valueFormat),
-      (this.valueFormat === 'ISO') ? end.toISO() : end.toFormat(this.valueFormat),
-    ]);
+  onInput(val) {
+    this.$emit('input', val);
     this.tooltip.hide();
   }
-
-  onYearSelect(year) {
-    this.updateValue(
-      DateTime.local().set({ year }).startOf('year'),
-      DateTime.local().set({ year }).endOf('year'),
-    );
-  }
-
-  onMonthSelect(month) {
-    this.updateValue(
-      DateTime.local().set({ month, year: this.year }).startOf('month'),
-      DateTime.local().set({ month, year: this.year }).endOf('month'),
-    );
-  }
-
-  onQuarterSelect([startMonth, endMonth]) {
-    this.updateValue(
-      DateTime.local().set({ month: startMonth, year: this.year }).startOf('quarter'),
-      DateTime.local().set({ month: endMonth, year: this.year }).endOf('quarter'),
-    );
-  }
 }
 </script>

package/src/components/datepicker/PeriodPickerInline.vue

@@ -0,0 +1,187 @@
+<template>
+  <div>
+    <div class="row mb-3">
+      <div class="col">
+        <itf-button icon @click="setYear(prevYear)">
+          <itf-icon name="chevron_left" />
+        </itf-button>
+      </div>
+      <div class="col">
+        <itf-button block @click="setYear(prevYear)">
+          {{prevYear}}
+        </itf-button>
+      </div>
+      <div class="col">
+        <itf-button color="outline-primary" block>
+          {{year}}
+        </itf-button>
+      </div>
+      <div class="col">
+        <itf-button block @click="setYear(nextYear)">
+          {{nextYear}}
+        </itf-button>
+      </div>
+      <div class="col text-end">
+        <itf-button icon @click="setYear(nextYear)">
+          <itf-icon name="chevron_right" />
+        </itf-button>
+      </div>
+    </div>
+
+    <itf-button block class="mb-3" :class="{'btn-whole': !isCurrentYear()}" :primary="isCurrentYear()" @click="onYearSelect(year)">
+      {{ $t('components.wholeYear') }}
+    </itf-button>
+
+    <div class="itf-periodpicker__quarters">
+      <div
+        v-for="quarter of quarters"
+        :key="quarter.Number"
+        class="itf-periodpicker__quarter"
+        :class="{ 'active': isOnlyQuarter(quarter.Number), 'active-inside': isCurrentQuarter(quarter.Number) }">
+        <div class="px-3 pt-2" @click="onQuarterSelect([quarter.Months[0], quarter.Months[2]])">
+          <small><b>{{ $t('components.quarter') }}</b></small><br>
+          <span class="quarter-number">{{ quarter.Number }}</span>
+        </div>
+
+        <div class="itf-periodpicker__months">
+          <itf-button
+            class="itf-periodpicker__month px-1"
+            v-for="month of quarter.Months"
+            :key="month"
+            :primary="isCurrentMonth(month)"
+            @click="onMonthSelect(month)"
+          >
+            {{ month | formatMonth }}
+          </itf-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { Vue, Component, Prop } from 'vue-property-decorator';
+import { DateTime } from 'luxon';
+import itfIcon from '../icon/Icon';
+import itfButton from '../button/Button';
+
+export default @Component({
+  name: 'itfPeriodPickerInline',
+  components: {
+    itfIcon,
+    itfButton
+  },
+  filters: {
+    formatMonth(month) {
+      return DateTime.local().set({ month }).toFormat('MMM');
+    }
+  }
+})
+class itfPeriodPickerInline extends Vue {
+  @Prop({ type: Array }) value;
+  @Prop({ type: String, default: 'ISO' }) valueFormat;
+
+  year = null;
+
+  get quarters() {
+    return [
+      { Name: `${this.$t('components.quarter')} 1`, Months: [1, 2, 3], Number: 1 },
+      { Name: `${this.$t('components.quarter')} 2`, Months: [4, 5, 6], Number: 2 },
+      { Name: `${this.$t('components.quarter')} 3`, Months: [7, 8, 9], Number: 3 },
+      { Name: `${this.$t('components.quarter')} 4`, Months: [10, 11, 12], Number: 4 },
+    ];
+  }
+
+  get nextYear() {
+    return this.year + 1;
+  }
+
+  get prevYear() {
+    return this.year - 1;
+  }
+
+  setYear(year) {
+    this.year = year;
+  }
+
+  mounted() {
+    this.year = (this.value && this.value[0]) ? this.valueAsLuxon[0].year : DateTime.local().year;
+  }
+
+  get valueAsLuxon() {
+    if (!this.value || this.value.length < 2) {
+      return null;
+    }
+    if (this.valueFormat === 'ISO') {
+      return [
+        DateTime.fromISO(this.value[0]),
+        DateTime.fromISO(this.value[1]),
+      ];
+    }
+    return [
+      DateTime.fromFormat(this.value[0], this.valueFormat),
+      DateTime.fromFormat(this.value[1], this.valueFormat),
+    ];
+  }
+
+  isCurrentMonth(month) {
+    if (!this.valueAsLuxon) {
+      return false;
+    }
+    return Number(this.valueAsLuxon[0].toFormat('M')) === month && Number(this.valueAsLuxon[1].toFormat('M')) === month;
+  }
+
+  isOnlyQuarter(quarter) {
+    if (!this.valueAsLuxon) {
+      return false;
+    }
+    return this.isCurrentQuarter(quarter) && this.valueAsLuxon[0].month !== this.valueAsLuxon[1].month;
+  }
+
+  isCurrentQuarter(quarter) {
+    if (!this.valueAsLuxon) {
+      return false;
+    }
+    return this.valueAsLuxon[0].quarter === quarter && this.valueAsLuxon[1].quarter === quarter;
+  }
+
+  isCurrentYear() {
+    if (!this.valueAsLuxon) {
+      return false;
+    }
+    return this.valueAsLuxon[0].hasSame(this.valueAsLuxon[0].startOf('year'), 'day')
+      && this.valueAsLuxon[1].hasSame(this.valueAsLuxon[0].endOf('year'), 'day');
+  }
+
+  updateValue(start, end) {
+    if (!start) {
+      this.$emit('input', []);
+      return;
+    }
+    this.$emit('input', [
+      (this.valueFormat === 'ISO') ? start.toISO() : start.toFormat(this.valueFormat),
+      (this.valueFormat === 'ISO') ? end.toISO() : end.toFormat(this.valueFormat),
+    ]);
+  }
+
+  onYearSelect(year) {
+    this.updateValue(
+      DateTime.local().set({ year }).startOf('year'),
+      DateTime.local().set({ year }).endOf('year'),
+    );
+  }
+
+  onMonthSelect(month) {
+    this.updateValue(
+      DateTime.local().set({ month, year: this.year }).startOf('month'),
+      DateTime.local().set({ month, year: this.year }).endOf('month'),
+    );
+  }
+
+  onQuarterSelect([startMonth, endMonth]) {
+    this.updateValue(
+      DateTime.local().set({ month: startMonth, year: this.year }).startOf('quarter'),
+      DateTime.local().set({ month: endMonth, year: this.year }).endOf('quarter'),
+    );
+  }
+}
+</script>

package/src/components/datepicker/index.stories.js

@@ -2,6 +2,7 @@ import { storiesOf } from '@storybook/vue';
 import itfDatePicker from './DatePicker.vue';
 import itfMonthPicker from './MonthPicker.vue';
 import itfPeriodPicker from './PeriodPicker';
+import itfPeriodPickerInline from './PeriodPickerInline';
 import itfDatePickerInline from './DatePickerInline.vue';
 import itfDateRangePicker from './DateRangePicker.vue';
 import itfDateRangePickerInline from './DateRangePickerInline.vue';
@@ -13,6 +14,7 @@ storiesOf('Common', module)
       itfApp,
       itfDatePicker,
       itfPeriodPicker,
+      itfPeriodPickerInline,
       itfMonthPicker,
       itfDateRangePicker,
       itfDatePickerInline,
@@ -86,6 +88,8 @@ storiesOf('Common', module)
         <h2>Period</h2>
 
         <itf-period-picker :value="dateRange" v-model.lazy="dateRange"></itf-period-picker>
+
+        <itf-period-picker-inline :value="dateRange" v-model.lazy="dateRange"></itf-period-picker-inline>
       </itf-app>
     </div>`,
   }));

package/src/components/filter/FilterBadge.vue

@@ -12,7 +12,7 @@
       </div>
     </template>
 
-    <div>
+    <div class="px-2">
       <template v-if="type === 'list'">
         <a
           v-for="(item, n) in options.items"
@@ -29,6 +29,13 @@
           @input="onFilterChange({ value: $event })"
         />
       </template>
+      <template v-else-if="type === 'timeframe'">
+        <itf-period-picker-inline
+          :value="value.value"
+          value-format="yyyy-MM-dd"
+          @input="onFilterChange({ value: $event })"
+        />
+      </template>
       <template v-else-if="type === 'date'">
         <itf-date-picker-inline
           style="margin: -.5rem"
@@ -61,6 +68,7 @@
 <style lang="scss">
 :root {
   --filter-badge__default-color: #475266;
+  --filter-badge__icon-color: #A7AFBB;
   --filter-badge__default-border-color: #0000001A;
   --filter-badge__default-bg-color: transparent;
   --filter-badge__default-bg-color-hover: #1A4A970D;
@@ -75,6 +83,10 @@
   --filter-badge__padding-y: .5rem;
   --filter-badge__padding-x: .75rem;
 }
+body[data-theme="dark"] {
+  --filter-badge__default-border-color: #FFFFFF1A;
+  --filter-badge__selected-color: #efd877;
+}
 .filter-pill {
   align-items: center;
   font-size: 14px;
@@ -87,6 +99,7 @@
 
   .icon {
     margin: -2px;
+    color: var(--filter-badge__icon-color);
   }
   &:hover {
     background-color: var(--filter-badge__default-bg-color-hover);
@@ -95,16 +108,20 @@
   &.filter-not-default-pill {
     background-color: var(--filter-badge__selected-bg-color);
     outline: 1px solid var(--filter-badge__selected-color);
+
+    .icon { color: var(--filter-badge__selected-color) }
   }
   &.filter-invalid-pill {
     background-color: var(--filter-badge__invalid-bg-color);
+
+    .icon { color: var(--filter-badge__invalid-color) }
   }
   &.filter-pill__default-value {
     padding: var(--filter-badge__padding-y) var(--filter-badge__padding-x);
   }
 }
 .filter-pill__label {
-  color: var(--filter-badge__default-color);
+  //color: var(--filter-badge__default-color);
   padding: var(--filter-badge__padding-y) 0 var(--filter-badge__padding-y) var(--filter-badge__padding-x);
   max-width: 330px;
   text-overflow: ellipsis;
@@ -129,7 +146,7 @@
   padding: 0 calc(var(--filter-badge__padding-x) / 2) 0 calc(var(--filter-badge__padding-x) / 4);
 
   svg {
-    color: var(--filter-badge__default-color);
+    //color: var(--filter-badge__default-color);
   }
   &.filter-pill__icon-invalid svg {
     color: var(--filter-badge__invalid-color);
@@ -146,6 +163,7 @@ import itfButton from '../button/Button';
 import itfDropdown from '../dropdown/Dropdown.vue';
 import itfDatePickerInline from '../datepicker/DatePickerInline.vue';
 import itfDateRangePickerInline from '../datepicker/DateRangePickerInline.vue';
+import itfPeriodPickerInline from '../datepicker/PeriodPickerInline.vue'
 import itfTextField from '../text-field/TextField.vue';
 import FilterFacetsList from './FilterFacetsList';
 import FilterAmountRange from './FilterAmountRange.vue';
@@ -157,6 +175,7 @@ export default @Component({
     itfDropdown,
     itfDatePickerInline,
     itfDateRangePickerInline,
+    itfPeriodPickerInline,
     itfTextField,
     FilterFacetsList,
     FilterAmountRange

package/src/components/filter/FilterFacetsList.vue

@@ -19,16 +19,18 @@
         <div class="text-muted text-center py-4">{{ $t('components.filter.noResults') }}</div>
       </div>
     </div>
-    <div v-for="(val, n) of mappedValues" :key="n" class="dropdown-item" :class="{'active': val.isSelected}" @click="onFilterClick(val)">
+    <div class="facets-list">
+    <div v-for="(val, n) of mappedValues" :key="n" class="dropdown-item px-2" :class="{'active': val.isSelected}" @click="onFilterClick(val)">
       <span class="facet-name text-dark d-flex align-items-center">
         <itf-checkbox ungrouped :value="val.isSelected" class="m-0" />
-        <div class="w-100 text-truncate">{{ val.label }}</div>
+        <div class="w-100 text-truncate">{{ val.label }} <span v-if="val.description" class="small"><br/>{{ val.description }}</span></div>
       </span>
-      <span class="facet-stat text-muted">
+      <span v-if="val.count" class="facet-stat">
         {{ val.count }}
         <span class="facet-bar"><span :style="{'--bar-width': `${getPercent(val)}%`}" class="facet-bar-progress" /></span>
       </span>
     </div>
+    </div>
 
     <itf-button default class="mt-1" v-if="hasMore" small block @click="toggleMore">
       <span v-if="showMore">{{ $t('components.filter.hideMore', { count: visibleList.length }) }}</span>
@@ -43,7 +45,13 @@
   padding: 0 0.75rem .5rem;
   margin: 0 -.75rem .75rem;
 }
+.facets-list {
+  max-height: 50vh;
+  overflow: auto;
+}
 .dropdown-item {
+  --bs-dropdown-link-active-bg: rgba(var(--bs-primary-rgb), .25);
+
   cursor: pointer;
   display: inline-flex;
   -webkit-box-align: center;
@@ -52,7 +60,7 @@
   justify-content: space-between;
   position: relative;
   box-sizing: border-box;
-  height: 1.75rem;
+  min-height: 1.75rem;
   width: 100%;
   font-size: 0.875rem;
   line-height: 1.25rem;
@@ -74,10 +82,11 @@
   .facet-name {
     min-width: 0;
     text-align: left;
+    line-height: 100%;
     white-space: nowrap;
 
     .itf-checkbox {
-      min-height: auto;
+      min-height: 1.25rem;
     }
   }
   .facet-stat {

package/src/components/filter/FilterPanel.vue

@@ -1,41 +1,56 @@
 <template>
   <div class="itf-filter-panel d-flex flex-column gap-3 align-items-start">
-    <div v-if="search" class="d-flex gap-2 justify-content-between w-100">
+    <div v-if="!filtersOnly" class="d-flex gap-2 justify-content-between w-100">
       <slot name="search">
-        <itf-text-field
-          style="width: 300px"
-          small
-          :placeholder="searchPlaceholder"
-          prepend-icon="search"
-          :delay-input="250"
-          clearable
-          :value="filterValue.query"
-          @input="(e) => onFilterChange({ type: 'text', name: 'query' }, { value: e })"
-        />
+        <div>
+          <itf-text-field
+            v-if="search"
+            style="width: 300px"
+            small
+            :placeholder="searchPlaceholder"
+            prepend-icon="search"
+            :delay-input="250"
+            clearable
+            :value="filterValueQuery"
+            @input="(e) => onFilterChange({ type: 'text', name: 'query' }, { value: e })"
+          />
+        </div>
       </slot>
       <div class="d-flex gap-2">
-        <itf-button default icon class="position-relative" @click="toggleFilters">
+        <!--itf-button v-if="showFilter" default icon class="position-relative" @click="toggleFilters" :class="{'active': showFilters}">
           <itf-icon new name="filter" />
           <span v-if="activeFiltersCount" class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-primary">
             {{activeFiltersCount}}
             <span class="visually-hidden">active filters</span>
           </span>
-        </itf-button>
+        </itf-button-->
         <slot name="after-filter-btn"></slot>
       </div>
     </div>
-    <div v-if="showFilters" class="d-flex gap-2 flex-nowrap filters-row">
-      <filter-badge
-        v-for="(facet, n) in visibleFilters"
-        :key="n"
-        v-model="filter[facet.name]"
-        :is-default="filter[facet.name].isDefault"
-        :text="filter[facet.name].label"
-        :type="facet.type"
-        :icon="facet.icon"
-        :options="facet.options"
-        @change="onFilterChange(facet, $event)"
-      />
+    <div class="d-flex align-items-start justify-content-between w-100">
+      <div v-show="showFilters && showFilter" class="gap-2 filters-row" ref="container" :class="{'expanded': isFilterExpanded}">
+        <filter-badge
+          v-for="(facet, n) in visibleFilters"
+          :key="n"
+          class="itf-filter-panel__badge"
+          :ref="'item-' + n"
+          v-model="filter[facet.name]"
+          :is-default="filter[facet.name].isDefault"
+          :text="filter[facet.name].label"
+          :type="facet.type"
+          :icon="facet.icon"
+          :options="facet.options"
+          :class="{ hidden: !visibleItems.has(n) && !isFilterExpanded }"
+          @change="onFilterChange(facet, $event)"
+        />
+      </div>
+      <div v-if="showFilters && showFilter && (visibleItems.size < visibleFilters.length || (isFilterExpanded && visibleItems.size === visibleFilters.length))">
+        <itf-button icon default small class="itf-filter-panel__filters" @click="toggleExpandFilter">
+          <itf-icon v-if="isFilterExpanded" name="minus" />
+          <itf-icon v-else name="plus" />
+        </itf-button>
+      </div>
+      <slot name="after-filters"></slot>
     </div>
     <div v-if="loading">
       <span class="itf-spinner"></span>
@@ -45,6 +60,18 @@
 </template>
 <style lang="scss">
 .itf-filter-panel {
+  &__badge {
+    transition: opacity 0.3s ease-in-out;
+
+    &.hidden {
+      opacity: 0;
+      pointer-events: none;
+      visibility: hidden;
+    }
+  }
+  &__filters {
+    outline: 1px solid var(--filter-badge__default-border-color);
+  }
   .itf-text-field:not(.is-valid):not(.is-invalid) .itf-icon {
     color: #8E97A5;
   }
@@ -63,18 +90,28 @@
   }
 
   .filters-row {
-    @media (max-width: 768px) {
-      overflow: auto;
-      width: 100%;
-      padding: 2px;
-      margin: -2px;
+    display: flex;
+    overflow: hidden;
+    width: 100%;
+    padding: 2px;
+    margin: -2px;
+    flex-wrap: nowrap;
+
+    &.expanded {
+      flex-wrap: wrap;
+
+      .itf-filter-panel__badge.hidden {
+        opacity: 1;
+        visibility: visible;
+        pointer-events: all;
+      }
     }
   }
 }
 </style>
 <script>
 import { DateTime } from 'luxon';
-import { Vue, Model, Prop, Component } from 'vue-property-decorator';
+import { Vue, Watch, Model, Prop, Component } from 'vue-property-decorator';
 import tooltip from '../../directives/tooltip';
 import itfIcon from '../icon/Icon';
 import itfButton from '../button/Button';
@@ -103,18 +140,75 @@ class FilterPanel extends Vue {
   @Prop() panel;
   @Prop(String) stateName;
   @Prop(Boolean) search;
+  @Prop({ type: Boolean, default: true }) showFilter;
+  @Prop({ type: Boolean, default: false }) filtersOnly;
   @Prop(Boolean) mini;
   @Prop({ type: String, default: function() { return this.$t('components.filter.search'); } }) searchPlaceholder;
 
   filter = {};
-  filterValue = {};
+  filterValue = null;
   filters = [];
   loading = false;
   showFilters = true;
+  isFilterExpanded = false;
+  observer = null;
+
+  periodFilters = ['period', 'timeframe'];
+  visibleItems = new Set();
+
+  toggleExpandFilter() {
+    this.isFilterExpanded = !this.isFilterExpanded;
+  }
+
+  beforeDestroy() {
+    if (this.observer) {
+      this.observer.disconnect();
+    }
+  }
+
+  initObserver() {
+    if (this.observer) {
+      this.observer.disconnect();
+    }
+    if (!this.$refs.container) {
+      return;
+    }
+    this.observer = new IntersectionObserver(
+      (entries) => {
+        entries.forEach(entry => {
+          const index = parseInt(entry.target.dataset.index);
+          const filter = this.filters[index];
+          const value = this.filter[filter.name];
+          if (entry.isIntersecting) {
+            this.visibleItems.add(index); // Додаємо, якщо елемент у полі зору
+          } else {
+            this.visibleItems.delete(index); // Видаляємо, якщо вийшов за межі
+          }
+          this.$forceUpdate(); // Оновлюємо Vue, бо Set не є реактивним
+        });
+      },
+      { root: this.$refs.container, threshold: 1.0 }
+    );
+
+    // Спостерігаємо за кожним елементом
+    this.$nextTick(() => {
+      for (const index in this.visibleFilters) {
+        const item = this.$refs[`item-${index}`][0];
+        if (item) {
+          item.$el.dataset.index = index; // Зберігаємо індекс у dataset
+          this.observer.observe(item.$el);
+        }
+      }
+    });
+  }
+
+  get filterValueQuery() {
+    return this.filterValue?.query ?? '';
+  }
 
   get visibleFilters() {
     if (this.mini) {
-      return sortBy(this.filters, (f) => this.filter[f.name].isDefault).filter(f => !f.options?.hidden).slice(0, 2);
+      return sortBy(this.filters, (f) => this.filter[f.name].isDefault).filter(f => !f.options?.hidden);
     }
     return this.filters.filter(f => !f.options?.hidden);
   }
@@ -127,6 +221,12 @@ class FilterPanel extends Vue {
     return `filter-panel-${this.stateName}-filters`;
   }
 
+  @Watch('staticFilters', { deep: true })
+  onStaticFiltersUpdate() {
+    this.filters = this.staticFilters ?? [];
+    this.loadFiltersValue();
+  }
+
   async mounted() {
     if (this.stateName) {
       const item = localStorage.getItem(this.localstorageKey);
@@ -137,8 +237,10 @@ class FilterPanel extends Vue {
     if (this.endpoint) {
       this.loading = true;
       await this.$try(async () => {
-        const {filters} = await this.$axios.$get(this.endpoint);
+        const payload = this.panel ? this.panel.getPayload() : {};
+        const {filters, tableSchema} = await this.$axios.$get(this.endpoint, { params: payload });
         this.filters = filters;
+        this.$emit('set-table-schema', tableSchema);
         this.loadFiltersValue();
       });
       this.loading = false;
@@ -163,7 +265,7 @@ class FilterPanel extends Vue {
     const filterValue = {};
     if (this.filters) {
       for (const item of this.filters) {
-        if (item.type === 'period') {
+        if (this.periodFilters.includes(item.type)) {
           filter[item.name] = payload.from ? this.formatValue(item, { value: [payload.from, payload.to] }) : { isDefault: true, ...item.options.defaultValue };
           filterValue.from = payload.from;
           filterValue.to = payload.to;
@@ -176,13 +278,25 @@ class FilterPanel extends Vue {
     if (this.search) {
       filterValue.query = payload.query;
     }
-    const prevFilter = JSON.stringify(this.filter).concat(JSON.stringify(this.filterValue));
-    const newFilter = JSON.stringify(filter).concat(JSON.stringify(filterValue));
-    if (prevFilter !== newFilter) {
+    const prevFilter = JSON.stringify(this.getVisibleFilters(this.filterValue));//.concat(JSON.stringify(this.filterValue));
+    const newFilter = JSON.stringify(this.getVisibleFilters(filterValue));//.concat(JSON.stringify(filterValue));
+    if (prevFilter !== newFilter || !this.filterValue) {
       this.filter = filter;
       this.filterValue = filterValue;
       this.$emit('input', this.filterValue);
+      this.initObserver();
+    }
+  }
+
+  getVisibleFilters(filter) {
+    const result = [];
+    const facets = Object.values(this.filter);
+    for (const facet of facets) {
+      if (!facet.isDefault && !facet.hidden) {
+        result.push(filter[facet.name]);
+      }
     }
+    return result.filter(Boolean);
   }
 
   setFilter(field, value) {
@@ -195,7 +309,7 @@ class FilterPanel extends Vue {
 
   onFilterChange(facet, value) {
     this.filter[facet.name] = this.formatValue(facet, value);
-    if (facet.type === 'period') {
+    if (this.periodFilters.includes(facet.type)) {
       this.filterValue.from = this.filter[facet.name].isDefault ? undefined : value.value[0];
       this.filterValue.to = this.filter[facet.name].isDefault ? undefined : value.value[1];
     } else {
@@ -226,7 +340,7 @@ class FilterPanel extends Vue {
   }
 
   formatValue(facet, value) {
-    if (facet.type === 'period') {
+    if (this.periodFilters.includes(facet.type)) {
       if (value.value) {
         let from = DateTime.fromFormat(value.value[0], 'yyyy-MM-dd');
         let to = DateTime.fromFormat(value.value[1], 'yyyy-MM-dd');
@@ -285,7 +399,7 @@ class FilterPanel extends Vue {
       value.isDefault = facet.options.defaultValue ? JSON.stringify(value.value) === JSON.stringify(facet.options.defaultValue.value) : false;
       value.label = item ? item.label : facet.options.defaultValue.label;
     } else if (facet.type === 'text') {
-      value.value = value.value.length ? value.value : undefined;
+      value.value = value.value.length ? value.value : (facet.options?.defaultValue ?? undefined);
       value.isDefault = !value.value;
     }
     value.hidden = facet.options?.hidden ?? false;