From c37682ecf55db1fcdadf024c42bc0d78311db58f Mon Sep 17 00:00:00 2001 From: Roman Vyakhirev Date: Fri, 27 Jun 2025 11:19:17 +0200 Subject: [PATCH 01/25] chore: fix styling separator line margin between tags --- .../themesource/datawidgets/web/_datagrid-dropdown-filter.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid-dropdown-filter.scss b/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid-dropdown-filter.scss index b77663d6cc..b42beddf67 100644 --- a/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid-dropdown-filter.scss +++ b/packages/modules/data-widgets/src/themesource/datawidgets/web/_datagrid-dropdown-filter.scss @@ -138,7 +138,6 @@ $root: ".widget-dropdown-filter"; &-clear { @include btn-with-cross; align-items: center; - align-self: center; display: flex; flex-shrink: 0; justify-self: end; @@ -262,6 +261,7 @@ $root: ".widget-dropdown-filter"; justify-content: center; line-height: 1.334; padding: var(--wdf-tag-padding); + margin: var(--spacing-smallest, 2px); &:focus-visible { outline: var(--brand-primary, #264ae5) auto 1px; } From 03e37b7823fc6ffe7ccd00faaa810fecedc1b16c Mon Sep 17 00:00:00 2001 From: Roman Vyakhirev Date: Fri, 27 Jun 2025 11:24:56 +0200 Subject: [PATCH 02/25] chore: remove unused separator, it is done via css also use clear button again --- .../__tests__/DatagridDropdownFilter.spec.tsx | 3 ++- .../DatagridDropdownFilter.spec.tsx.snap | 20 +++++++------- .../src/controls/base/ClearButton.tsx | 26 ++++++++++++------- .../src/controls/combobox/Combobox.tsx | 1 - .../src/controls/select/Select.tsx | 25 +++++++----------- 5 files changed, 39 insertions(+), 36 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/__tests__/DatagridDropdownFilter.spec.tsx b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/__tests__/DatagridDropdownFilter.spec.tsx index a96f465594..42fc0544a5 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/__tests__/DatagridDropdownFilter.spec.tsx +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/__tests__/DatagridDropdownFilter.spec.tsx @@ -1,7 +1,7 @@ import { EnumFilterStore } from "@mendix/widget-plugin-dropdown-filter/stores/EnumFilterStore"; import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; import { ObservableFilterHost } from "@mendix/widget-plugin-filtering/typings/ObservableFilterHost"; -import { listAttribute } from "@mendix/widget-plugin-test-utils"; +import { listAttribute, dynamicValue } from "@mendix/widget-plugin-test-utils"; import "@testing-library/jest-dom"; import { render, waitFor } from "@testing-library/react"; import { AssociationMetaData, AttributeMetaData } from "mendix"; @@ -23,6 +23,7 @@ const commonProps: DatagridDropdownFilterContainerProps = { filterable: false, multiSelect: false, clearable: false, + emptySelectionCaption: dynamicValue("Select"), selectedItemsStyle: "text", selectionMethod: "checkbox" }; diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/__tests__/__snapshots__/DatagridDropdownFilter.spec.tsx.snap b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/__tests__/__snapshots__/DatagridDropdownFilter.spec.tsx.snap index a0f6df8d4d..f72c98fbe7 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/__tests__/__snapshots__/DatagridDropdownFilter.spec.tsx.snap +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/__tests__/__snapshots__/DatagridDropdownFilter.spec.tsx.snap @@ -3,20 +3,20 @@ exports[`Dropdown Filter with single instance with single attribute renders correctly 1`] = ` - +