From 59917a5942c8eaba458d9486336eab09b3d0bb89 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 9 May 2025 16:49:49 +0100 Subject: [PATCH 1/3] Filter pill buttons are now resizable --- packages/client/manifest.json | 34 +++++++++++++++---- .../src/components/app/filter/Filter.svelte | 4 ++- .../components/app/filter/FilterButton.svelte | 17 ++++++++-- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 46b1251da1..99b9e77100 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5544,12 +5544,26 @@ "wide": true }, { - "label": "", - "type": "filterConfiguration", - "key": "filterConfig", - "nested": true, - "dependsOn": "targetComponent", - "resetOn": "targetComponent" + "type": "select", + "label": "Size", + "showInBar": true, + "key": "size", + "options": [ + { + "label": "Small", + "value": "S" + }, + { + "label": "Medium", + "value": "M" + }, + { + "label": "Large", + "value": "L" + } + ], + "defaultValue": "M", + "wide": true }, { "type": "boolean", @@ -5562,6 +5576,14 @@ "label": "Clear filters", "key": "showClear", "defaultValue": false + }, + { + "label": "", + "type": "filterConfiguration", + "key": "filterConfig", + "nested": true, + "dependsOn": "targetComponent", + "resetOn": "targetComponent" } ] }, diff --git a/packages/client/src/components/app/filter/Filter.svelte b/packages/client/src/components/app/filter/Filter.svelte index 0fce4e7a01..1ab189a58b 100644 --- a/packages/client/src/components/app/filter/Filter.svelte +++ b/packages/client/src/components/app/filter/Filter.svelte @@ -32,6 +32,7 @@ export let showClear: boolean | undefined = false export let filterConfig: FilterConfig[] | undefined = [] export let targetComponent: any + export let size: string | undefined = "M" const memoFilters = memo({} as Record) const component = getContext("component") @@ -405,6 +406,7 @@ {#each visibleFilters || [] as config} {@const filter = $memoFilters[config.field]} {/each} {#if showClear && Object.keys(filters).length} - + {/if} diff --git a/packages/client/src/components/app/filter/FilterButton.svelte b/packages/client/src/components/app/filter/FilterButton.svelte index 02789af923..795fbbc867 100644 --- a/packages/client/src/components/app/filter/FilterButton.svelte +++ b/packages/client/src/components/app/filter/FilterButton.svelte @@ -8,7 +8,7 @@ FieldType, RangeOperator, } from "@budibase/types" - import { type PopoverAPI, Helpers } from "@budibase/bbui" + import { type PopoverAPI, Helpers, Icon } from "@budibase/bbui" import { createEventDispatcher, getContext } from "svelte" import { type Writable } from "svelte/store" import { isArrayOperator } from "@/utils/filtering" @@ -170,7 +170,7 @@ }} >