From 9bc569cc7aae8caab0efcf246a8036a9d280d4d0 Mon Sep 17 00:00:00 2001 From: Roman Vyakhirev Date: Thu, 26 Mar 2026 16:17:33 +0100 Subject: [PATCH 1/2] fix: stil try best placement if overflown --- .../pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md | 4 ++++ .../datagrid-dropdown-filter-web/CHANGELOG.md | 4 ++++ .../pluggableWidgets/datagrid-number-filter-web/CHANGELOG.md | 4 ++++ .../pluggableWidgets/datagrid-text-filter-web/CHANGELOG.md | 4 ++++ .../src/controls/filter-selector/useSelect.tsx | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md b/packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md index a24c77ec0f..6092f558e6 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md +++ b/packages/pluggableWidgets/datagrid-date-filter-web/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Fixed + +- We fixed an issue with filter selector dropdown not choosing the best placement on small viewports. + ## [3.8.1] - 2026-02-19 ### Changed diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/CHANGELOG.md b/packages/pluggableWidgets/datagrid-dropdown-filter-web/CHANGELOG.md index 41062312ef..838990a6fb 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/CHANGELOG.md +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Fixed + +- We fixed an issue with filter selector dropdown not choosing the best placement on small viewports. + ## [3.9.0] - 2026-03-23 ### Fixed diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/CHANGELOG.md b/packages/pluggableWidgets/datagrid-number-filter-web/CHANGELOG.md index a3e0105b1d..28c4810ba2 100644 --- a/packages/pluggableWidgets/datagrid-number-filter-web/CHANGELOG.md +++ b/packages/pluggableWidgets/datagrid-number-filter-web/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Fixed + +- We fixed an issue with filter selector dropdown not choosing the best placement on small viewports. + ## [3.9.0] - 2026-03-23 ### Fixed diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/CHANGELOG.md b/packages/pluggableWidgets/datagrid-text-filter-web/CHANGELOG.md index 6d1235e19c..3855586f78 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/CHANGELOG.md +++ b/packages/pluggableWidgets/datagrid-text-filter-web/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Fixed + +- We fixed an issue with filter selector dropdown not choosing the best placement on small viewports. + ## [3.8.1] - 2026-02-19 ### Changed diff --git a/packages/shared/widget-plugin-filtering/src/controls/filter-selector/useSelect.tsx b/packages/shared/widget-plugin-filtering/src/controls/filter-selector/useSelect.tsx index a3c44450b6..fdfd8dd6c2 100644 --- a/packages/shared/widget-plugin-filtering/src/controls/filter-selector/useSelect.tsx +++ b/packages/shared/widget-plugin-filtering/src/controls/filter-selector/useSelect.tsx @@ -42,7 +42,7 @@ export function useSelect(props: useSelectProps): ViewProps { const floatingMiddleware = useMemo( () => [ flip({ - fallbackStrategy: "initialPlacement" + fallbackStrategy: "bestFit" }) ], [] From acec1eafc07f20f32c1ff31d9d97434c59a16aff Mon Sep 17 00:00:00 2001 From: Roman Vyakhirev Date: Thu, 26 Mar 2026 16:51:17 +0100 Subject: [PATCH 2/2] chore: reformat imports --- .../src/DatagridDateFilter.tsx | 2 +- .../src/components/DateFilterContainer.tsx | 6 ++-- .../src/components/FilterComponent.tsx | 4 +-- .../src/helpers/DatePickerController.ts | 4 +-- .../src/helpers/useActionEvents.ts | 2 +- .../src/helpers/useSetup.ts | 6 ++-- .../src/hocs/withLinkedDateStore.tsx | 4 +-- .../src/hocs/withParentProvidedDateStore.tsx | 2 +- .../src/hocs/withPreviewAdapter.tsx | 2 +- .../DatagridDropdownFilter.editorPreview.tsx | 4 +-- .../src/components/AttrFilter.tsx | 4 +-- .../src/components/RefFilter.tsx | 4 +-- .../src/hocs/withAttrGuard.tsx | 2 +- .../src/hocs/withLinkedEnumStore.tsx | 4 +-- .../src/hocs/withLinkedRefStore.tsx | 4 +-- .../src/hocs/withParentProvidedEnumStore.tsx | 2 +- .../DatagridNumberFilter.editorPreview.tsx | 4 +-- .../src/DatagridNumberFilter.tsx | 2 +- .../src/components/NumberFilterContainer.tsx | 4 +-- .../src/hocs/withLinkedNumberStore.tsx | 6 ++-- .../hocs/withParentProvidedNumberStore.tsx | 2 +- .../src/DatagridTextFilter.editorPreview.tsx | 4 +-- .../src/DatagridTextFilter.tsx | 2 +- .../src/components/TextFilterContainer.tsx | 4 +-- .../__tests__/DatagridTextFilter.spec.tsx | 10 +++--- .../src/hocs/withLinkedStringStore.tsx | 4 +-- .../hocs/withParentProvidedStringStore.tsx | 2 +- .../__tests__/DateInputFilterStore.spec.ts | 2 +- .../widget-plugin-filtering/src/context.ts | 2 +- .../input/NumberInputController.ts | 4 +-- .../input/StringInputController.ts | 4 +-- .../src/controls/input/InputWithFilters.tsx | 4 +-- .../src/controls/input/typings.ts | 2 +- .../custom-filter-api/DateStoreProvider.ts | 4 +-- .../custom-filter-api/NumberStoreProvider.ts | 4 +-- .../custom-filter-api/StringStoreProvider.ts | 4 +-- .../src/helpers/useDateSync.ts | 6 ++-- .../src/helpers/withAttributeGuard.tsx | 2 +- .../src/helpers/withFilterAPI.tsx | 2 +- .../src/stores/generic/CombinedFilter.ts | 4 +-- .../src/stores/generic/CustomFilterHost.ts | 4 +-- .../src/stores/input/BaseInputFilterStore.ts | 4 +-- .../src/stores/input/DateInputFilterStore.ts | 32 +++++++++---------- .../stores/input/NumberInputFilterStore.ts | 10 +++--- .../stores/input/StringInputFilterStore.ts | 8 ++--- .../src/stores/input/store-utils.ts | 2 +- .../src/typings/ObservableFilterHost.ts | 2 +- 47 files changed, 103 insertions(+), 103 deletions(-) diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/DatagridDateFilter.tsx b/packages/pluggableWidgets/datagrid-date-filter-web/src/DatagridDateFilter.tsx index b6325c0bdb..8c4f50e940 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/DatagridDateFilter.tsx +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/DatagridDateFilter.tsx @@ -1,7 +1,7 @@ +import { ReactElement } from "react"; import { withAttributeGuard } from "@mendix/widget-plugin-filtering/helpers/withAttributeGuard"; import { withFilterAPI } from "@mendix/widget-plugin-filtering/helpers/withFilterAPI"; import { withPreloader } from "@mendix/widget-plugin-platform/hoc/withPreloader"; -import { ReactElement } from "react"; import { DatagridDateFilterContainerProps } from "../typings/DatagridDateFilterProps"; import { DateFilterContainer } from "./components/DateFilterContainer"; import { withLinkedDateStore } from "./hocs/withLinkedDateStore"; diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/DateFilterContainer.tsx b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/DateFilterContainer.tsx index b4b4928c16..6311d0d42a 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/DateFilterContainer.tsx +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/DateFilterContainer.tsx @@ -1,11 +1,11 @@ -import { useDateSync } from "@mendix/widget-plugin-filtering/helpers/useDateSync"; -import { Date_InputFilterInterface } from "@mendix/widget-plugin-filtering/typings/InputFilterInterface"; import { observer } from "mobx-react-lite"; import { ReactElement } from "react"; +import { useDateSync } from "@mendix/widget-plugin-filtering/helpers/useDateSync"; +import { Date_InputFilterInterface } from "@mendix/widget-plugin-filtering/typings/InputFilterInterface"; +import { FilterComponent } from "./FilterComponent"; import { DatagridDateFilterContainerProps } from "../../typings/DatagridDateFilterProps"; import { useActionEvents } from "../helpers/useActionEvents"; import { useSetup } from "../helpers/useSetup"; -import { FilterComponent } from "./FilterComponent"; interface ContainerProps extends DatagridDateFilterContainerProps { filterStore: Date_InputFilterInterface; diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/FilterComponent.tsx b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/FilterComponent.tsx index 9d6206b84f..c970b9cd27 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/components/FilterComponent.tsx +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/components/FilterComponent.tsx @@ -1,8 +1,8 @@ -import { FilterSelector } from "@mendix/widget-plugin-filtering/controls"; import classNames from "classnames"; import { CSSProperties, ReactElement } from "react"; -import { FilterTypeEnum } from "../helpers/base-types"; +import { FilterSelector } from "@mendix/widget-plugin-filtering/controls"; import { DatePicker, DatePickerProps } from "./DatePicker"; +import { FilterTypeEnum } from "../helpers/base-types"; export interface FilterComponentProps extends DatePickerProps { id?: string; diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/DatePickerController.ts b/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/DatePickerController.ts index 9eec996cf2..02f2847b21 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/DatePickerController.ts +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/DatePickerController.ts @@ -1,9 +1,9 @@ +import { isDate } from "date-fns/isDate"; import { action, computed, makeObservable, observable, runInAction } from "mobx"; import { BaseSyntheticEvent, ClassAttributes, createRef, KeyboardEventHandler, MouseEventHandler } from "react"; -import { isDate } from "date-fns/isDate"; import ReactDatePicker, { ReactDatePickerProps } from "react-datepicker"; -import { Date_InputFilterInterface, FilterFn } from "@mendix/widget-plugin-filtering/typings/InputFilterInterface"; import { SetFilterValueArgs } from "@mendix/widget-plugin-external-events/typings"; +import { Date_InputFilterInterface, FilterFn } from "@mendix/widget-plugin-filtering/typings/InputFilterInterface"; interface DatePickerBackendProps extends ReactDatePickerProps, ClassAttributes {} diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/useActionEvents.ts b/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/useActionEvents.ts index 7c25ec0de8..e0195821f0 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/useActionEvents.ts +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/useActionEvents.ts @@ -1,5 +1,5 @@ -import { useOnResetValueEvent, useOnSetValueEvent } from "@mendix/widget-plugin-external-events/hooks"; import { useState } from "react"; +import { useOnResetValueEvent, useOnSetValueEvent } from "@mendix/widget-plugin-external-events/hooks"; import { DatePickerController } from "./DatePickerController"; type HookParams = [Parameters[0], Parameters[0]]; diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/useSetup.ts b/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/useSetup.ts index 8230ae236e..f74e30bfc1 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/useSetup.ts +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/helpers/useSetup.ts @@ -1,10 +1,10 @@ +import { Locale } from "date-fns"; import { useEffect, useMemo, useState } from "react"; import { Date_InputFilterInterface } from "@mendix/widget-plugin-filtering/typings/InputFilterInterface"; -import { DatePickerController } from "../helpers/DatePickerController"; import { generateUUID } from "@mendix/widget-plugin-platform/framework/generate-uuid"; -import { Locale } from "date-fns"; -import { getLocale, pickerDateFormat, setupLocales } from "../utils/date-utils"; import { FilterTypeEnum } from "./base-types"; +import { DatePickerController } from "../helpers/DatePickerController"; +import { getLocale, pickerDateFormat, setupLocales } from "../utils/date-utils"; interface SetupProps { filterStore: Date_InputFilterInterface; diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withLinkedDateStore.tsx b/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withLinkedDateStore.tsx index c2b12b391f..f4d58a513c 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withLinkedDateStore.tsx +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withLinkedDateStore.tsx @@ -1,8 +1,8 @@ +import { AttributeMetaData } from "mendix"; +import { FC } from "react"; import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; import { DateStoreProvider } from "@mendix/widget-plugin-filtering/custom-filter-api/DateStoreProvider"; import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup"; -import { AttributeMetaData } from "mendix"; -import { FC } from "react"; import { DateFilterProps } from "../components/typings"; interface RequiredProps { diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withParentProvidedDateStore.tsx b/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withParentProvidedDateStore.tsx index bc03108624..30e0a829f1 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withParentProvidedDateStore.tsx +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withParentProvidedDateStore.tsx @@ -1,9 +1,9 @@ +import { ReactElement, useRef } from "react"; import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; import { useFilterAPI } from "@mendix/widget-plugin-filtering/context"; import { APIError, EMISSINGSTORE, EStoreTypeMisMatch } from "@mendix/widget-plugin-filtering/errors"; import { error, Result, value } from "@mendix/widget-plugin-filtering/result-meta"; import { isDateFilter } from "@mendix/widget-plugin-filtering/stores/input/store-utils"; -import { ReactElement, useRef } from "react"; import { DateFilterProps } from "../components/typings"; export function withParentProvidedDateStore

( diff --git a/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withPreviewAdapter.tsx b/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withPreviewAdapter.tsx index 79de074131..d08e7d82f6 100644 --- a/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withPreviewAdapter.tsx +++ b/packages/pluggableWidgets/datagrid-date-filter-web/src/hocs/withPreviewAdapter.tsx @@ -1,6 +1,6 @@ import { ReactElement, useMemo } from "react"; -import { FilterComponent } from "../components/FilterComponent"; import { DatagridDateFilterPreviewProps } from "../../typings/DatagridDateFilterProps"; +import { FilterComponent } from "../components/FilterComponent"; type PreviewAdapter = (props: DatagridDateFilterPreviewProps) => ReactElement; diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/DatagridDropdownFilter.editorPreview.tsx b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/DatagridDropdownFilter.editorPreview.tsx index f91be2ac56..84bcd4a3e1 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/DatagridDropdownFilter.editorPreview.tsx +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/DatagridDropdownFilter.editorPreview.tsx @@ -1,8 +1,8 @@ import { enableStaticRendering } from "mobx-react-lite"; import { ReactElement } from "react"; -import { DatagridDropdownFilterPreviewProps } from "../typings/DatagridDropdownFilterProps"; -import { parseStyle } from "@mendix/widget-plugin-platform/preview/parse-style"; import { Select } from "@mendix/widget-plugin-dropdown-filter/controls/select/Select"; +import { parseStyle } from "@mendix/widget-plugin-platform/preview/parse-style"; +import { DatagridDropdownFilterPreviewProps } from "../typings/DatagridDropdownFilterProps"; enableStaticRendering(true); diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/AttrFilter.tsx b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/AttrFilter.tsx index 53010045d7..d2903b4409 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/AttrFilter.tsx +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/AttrFilter.tsx @@ -1,11 +1,11 @@ +import { ReactElement } from "react"; import { EnumFilterContainer } from "@mendix/widget-plugin-dropdown-filter/containers/EnumFilterContainer"; import { withFilterAPI } from "@mendix/widget-plugin-filtering/helpers/withFilterAPI"; -import { ReactElement } from "react"; +import { EnumFilterProps } from "./typings"; import { DatagridDropdownFilterContainerProps } from "../../typings/DatagridDropdownFilterProps"; import { withAttrGuard } from "../hocs/withAttrGuard"; import { withLinkedEnumStore } from "../hocs/withLinkedEnumStore"; import { withParentProvidedEnumStore } from "../hocs/withParentProvidedEnumStore"; -import { EnumFilterProps } from "./typings"; export function AttrFilter(props: DatagridDropdownFilterContainerProps): ReactElement { if (props.attrChoice === "auto") { diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/RefFilter.tsx b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/RefFilter.tsx index d20adb7b88..56cdd77720 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/RefFilter.tsx +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/RefFilter.tsx @@ -1,9 +1,9 @@ -import { RefFilterContainer } from "@mendix/widget-plugin-dropdown-filter/containers/RefFilterContainer"; import { ReactElement } from "react"; +import { RefFilterContainer } from "@mendix/widget-plugin-dropdown-filter/containers/RefFilterContainer"; +import { RefFilterProps } from "./typings"; import { DatagridDropdownFilterContainerProps } from "../../typings/DatagridDropdownFilterProps"; import { withAttrGuard } from "../hocs/withAttrGuard"; import { withLinkedRefStore } from "../hocs/withLinkedRefStore"; -import { RefFilterProps } from "./typings"; function Connector(props: DatagridDropdownFilterContainerProps & RefFilterProps): ReactElement { return ( diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withAttrGuard.tsx b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withAttrGuard.tsx index 2563720096..62caf96d8a 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withAttrGuard.tsx +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withAttrGuard.tsx @@ -1,5 +1,5 @@ -import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; import { FC } from "react"; +import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; /** * @remark Any changes made in this hoc should be reflected in diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withLinkedEnumStore.tsx b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withLinkedEnumStore.tsx index 367c1155b3..122d714ee8 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withLinkedEnumStore.tsx +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withLinkedEnumStore.tsx @@ -1,8 +1,8 @@ -import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; +import { AttributeMetaData } from "mendix"; import { FC } from "react"; +import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; import { EnumStoreProvider } from "@mendix/widget-plugin-filtering/custom-filter-api/EnumStoreProvider"; import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup"; -import { AttributeMetaData } from "mendix"; import { EnumFilterProps } from "../components/typings"; interface RequiredProps { diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withLinkedRefStore.tsx b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withLinkedRefStore.tsx index 965e3d5d26..0f2931817a 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withLinkedRefStore.tsx +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withLinkedRefStore.tsx @@ -1,3 +1,5 @@ +import { AssociationMetaData, ListAttributeValue, ListExpressionValue, ListValue } from "mendix"; +import { ReactElement, useEffect } from "react"; import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; import { RefFilterStore } from "@mendix/widget-plugin-dropdown-filter/stores/RefFilterStore"; import { FilterAPI, useFilterAPI } from "@mendix/widget-plugin-filtering/context"; @@ -6,8 +8,6 @@ import { GateProvider } from "@mendix/widget-plugin-mobx-kit/GateProvider"; import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/main"; import { useConst } from "@mendix/widget-plugin-mobx-kit/react/useConst"; import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup"; -import { AssociationMetaData, ListAttributeValue, ListExpressionValue, ListValue } from "mendix"; -import { ReactElement, useEffect } from "react"; import { DatagridDropdownFilterContainerProps } from "../../typings/DatagridDropdownFilterProps"; import { RefFilterProps } from "../components/typings"; diff --git a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withParentProvidedEnumStore.tsx b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withParentProvidedEnumStore.tsx index f54fe4aaae..3c4dc59d11 100644 --- a/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withParentProvidedEnumStore.tsx +++ b/packages/pluggableWidgets/datagrid-dropdown-filter-web/src/hocs/withParentProvidedEnumStore.tsx @@ -1,5 +1,5 @@ -import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; import { ReactElement, useRef } from "react"; +import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; import { useFilterAPI } from "@mendix/widget-plugin-filtering/context"; import { APIError, EMISSINGSTORE, EStoreTypeMisMatch } from "@mendix/widget-plugin-filtering/errors"; import { error, Result, value } from "@mendix/widget-plugin-filtering/result-meta"; diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/src/DatagridNumberFilter.editorPreview.tsx b/packages/pluggableWidgets/datagrid-number-filter-web/src/DatagridNumberFilter.editorPreview.tsx index 6ec06af9ea..23b4c95da7 100644 --- a/packages/pluggableWidgets/datagrid-number-filter-web/src/DatagridNumberFilter.editorPreview.tsx +++ b/packages/pluggableWidgets/datagrid-number-filter-web/src/DatagridNumberFilter.editorPreview.tsx @@ -2,10 +2,10 @@ import { enableStaticRendering } from "mobx-react-lite"; enableStaticRendering(true); import { ReactElement, useMemo, useRef } from "react"; -import { parseStyle } from "@mendix/widget-plugin-platform/preview/parse-style"; import { InputWithFiltersComponent } from "@mendix/widget-plugin-filtering/controls"; -import { DatagridNumberFilterPreviewProps } from "../typings/DatagridNumberFilterProps"; import { InputStore } from "@mendix/widget-plugin-filtering/stores/input/InputStore"; +import { parseStyle } from "@mendix/widget-plugin-platform/preview/parse-style"; +import { DatagridNumberFilterPreviewProps } from "../typings/DatagridNumberFilterProps"; function Preview(props: DatagridNumberFilterPreviewProps): ReactElement { const inputStores = useMemo<[InputStore, InputStore]>( diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/src/DatagridNumberFilter.tsx b/packages/pluggableWidgets/datagrid-number-filter-web/src/DatagridNumberFilter.tsx index 906cdaefb6..dd05de8501 100644 --- a/packages/pluggableWidgets/datagrid-number-filter-web/src/DatagridNumberFilter.tsx +++ b/packages/pluggableWidgets/datagrid-number-filter-web/src/DatagridNumberFilter.tsx @@ -1,7 +1,7 @@ +import { ReactElement } from "react"; import { withAttributeGuard } from "@mendix/widget-plugin-filtering/helpers/withAttributeGuard"; import { withFilterAPI } from "@mendix/widget-plugin-filtering/helpers/withFilterAPI"; import { withPreloader } from "@mendix/widget-plugin-platform/hoc/withPreloader"; -import { ReactElement } from "react"; import { DatagridNumberFilterContainerProps } from "../typings/DatagridNumberFilterProps"; import { NumberFilterContainer } from "./components/NumberFilterContainer"; import { withLinkedNumberStore } from "./hocs/withLinkedNumberStore"; diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/src/components/NumberFilterContainer.tsx b/packages/pluggableWidgets/datagrid-number-filter-web/src/components/NumberFilterContainer.tsx index 76081cf086..392aa980ed 100644 --- a/packages/pluggableWidgets/datagrid-number-filter-web/src/components/NumberFilterContainer.tsx +++ b/packages/pluggableWidgets/datagrid-number-filter-web/src/components/NumberFilterContainer.tsx @@ -1,3 +1,5 @@ +import { observer } from "mobx-react-lite"; +import { ReactElement, useRef } from "react"; import { useOnResetValueEvent, useOnSetValueEvent } from "@mendix/widget-plugin-external-events/hooks"; import { NumberFilterController } from "@mendix/widget-plugin-filtering/controllers/input/NumberInputController"; import { FilterFnList, InputWithFilters } from "@mendix/widget-plugin-filtering/controls"; @@ -5,8 +7,6 @@ import { useBasicSync } from "@mendix/widget-plugin-filtering/helpers/useBasicSy import { Number_InputFilterInterface } from "@mendix/widget-plugin-filtering/typings/InputFilterInterface"; import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup"; import { generateUUID } from "@mendix/widget-plugin-platform/framework/generate-uuid"; -import { observer } from "mobx-react-lite"; -import { ReactElement, useRef } from "react"; import { DatagridNumberFilterContainerProps, DefaultFilterEnum } from "../../typings/DatagridNumberFilterProps"; const filterDefs: Record = { diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withLinkedNumberStore.tsx b/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withLinkedNumberStore.tsx index fc241fd58e..3a1dbc2c31 100644 --- a/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withLinkedNumberStore.tsx +++ b/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withLinkedNumberStore.tsx @@ -1,9 +1,9 @@ -import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; -import { NumberStoreProvider } from "@mendix/widget-plugin-filtering/custom-filter-api/NumberStoreProvider"; -import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup"; import { Big } from "big.js"; import { AttributeMetaData } from "mendix"; import { FC } from "react"; +import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; +import { NumberStoreProvider } from "@mendix/widget-plugin-filtering/custom-filter-api/NumberStoreProvider"; +import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup"; import { NumberFilterProps } from "../components/typings"; interface RequiredProps { diff --git a/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withParentProvidedNumberStore.tsx b/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withParentProvidedNumberStore.tsx index 547f9fccbf..b0a22e8666 100644 --- a/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withParentProvidedNumberStore.tsx +++ b/packages/pluggableWidgets/datagrid-number-filter-web/src/hocs/withParentProvidedNumberStore.tsx @@ -1,9 +1,9 @@ +import { ReactElement, useRef } from "react"; import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; import { useFilterAPI } from "@mendix/widget-plugin-filtering/context"; import { APIError, EMISSINGSTORE, EStoreTypeMisMatch } from "@mendix/widget-plugin-filtering/errors"; import { error, Result, value } from "@mendix/widget-plugin-filtering/result-meta"; import { isNumberFilter } from "@mendix/widget-plugin-filtering/stores/input/store-utils"; -import { ReactElement, useRef } from "react"; import { NumberFilterProps } from "../components/typings"; export function withParentProvidedNumberStore

( diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorPreview.tsx b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorPreview.tsx index 1b23600e5a..a80295c783 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorPreview.tsx +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.editorPreview.tsx @@ -2,10 +2,10 @@ import { enableStaticRendering } from "mobx-react-lite"; enableStaticRendering(true); import { ReactElement, useMemo, useRef } from "react"; -import { DatagridTextFilterPreviewProps } from "../typings/DatagridTextFilterProps"; -import { parseStyle } from "@mendix/widget-plugin-platform/preview/parse-style"; import { InputWithFiltersComponent } from "@mendix/widget-plugin-filtering/controls"; import { InputStore } from "@mendix/widget-plugin-filtering/stores/input/InputStore"; +import { parseStyle } from "@mendix/widget-plugin-platform/preview/parse-style"; +import { DatagridTextFilterPreviewProps } from "../typings/DatagridTextFilterProps"; function Preview(props: DatagridTextFilterPreviewProps): ReactElement { const inputStores = useMemo<[InputStore, InputStore]>( diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.tsx b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.tsx index 88691e1d6b..c1ef5f9115 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.tsx +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/DatagridTextFilter.tsx @@ -1,7 +1,7 @@ +import { ReactElement } from "react"; import { withAttributeGuard } from "@mendix/widget-plugin-filtering/helpers/withAttributeGuard"; import { withFilterAPI } from "@mendix/widget-plugin-filtering/helpers/withFilterAPI"; import { withPreloader } from "@mendix/widget-plugin-platform/hoc/withPreloader"; -import { ReactElement } from "react"; import { DatagridTextFilterContainerProps } from "../typings/DatagridTextFilterProps"; import { TextFilterContainer } from "./components/TextFilterContainer"; import { withLinkedStringStore } from "./hocs/withLinkedStringStore"; diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/components/TextFilterContainer.tsx b/packages/pluggableWidgets/datagrid-text-filter-web/src/components/TextFilterContainer.tsx index 57f6612bcb..461fdee9de 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/components/TextFilterContainer.tsx +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/components/TextFilterContainer.tsx @@ -1,3 +1,5 @@ +import { observer } from "mobx-react-lite"; +import { ReactElement, useRef } from "react"; import { useOnResetValueEvent, useOnSetValueEvent } from "@mendix/widget-plugin-external-events/hooks"; import { StringFilterController } from "@mendix/widget-plugin-filtering/controllers/input/StringInputController"; import { FilterFnList, InputWithFilters } from "@mendix/widget-plugin-filtering/controls"; @@ -5,8 +7,6 @@ import { useBasicSync } from "@mendix/widget-plugin-filtering/helpers/useBasicSy import { String_InputFilterInterface } from "@mendix/widget-plugin-filtering/typings/InputFilterInterface"; import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup"; import { generateUUID } from "@mendix/widget-plugin-platform/framework/generate-uuid"; -import { observer } from "mobx-react-lite"; -import { ReactElement, useRef } from "react"; import { DatagridTextFilterContainerProps, DefaultFilterEnum } from "../../typings/DatagridTextFilterProps"; const filterDefs: Record = { diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/components/__tests__/DatagridTextFilter.spec.tsx b/packages/pluggableWidgets/datagrid-text-filter-web/src/components/__tests__/DatagridTextFilter.spec.tsx index ecd5a4d46f..07e9eda2eb 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/components/__tests__/DatagridTextFilter.spec.tsx +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/components/__tests__/DatagridTextFilter.spec.tsx @@ -1,8 +1,12 @@ import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; import { ObservableFilterHost } from "@mendix/widget-plugin-filtering/typings/ObservableFilterHost"; import "@testing-library/jest-dom"; -import { AttributeMetaData } from "mendix"; +import { act, render, screen } from "@testing-library/react"; +import userEvent from "@testing-library/user-event"; +import { resetIdCounter } from "downshift"; +import { AttributeMetaData } from "mendix"; +import { createContext } from "react"; import { requirePlugin } from "@mendix/widget-plugin-external-events/plugin"; import { StringInputFilterStore } from "@mendix/widget-plugin-filtering/stores/input/StringInputFilterStore"; import { @@ -11,10 +15,6 @@ import { EditableValueBuilder, ListAttributeValueBuilder } from "@mendix/widget-plugin-test-utils"; -import { act, render, screen } from "@testing-library/react"; -import userEvent from "@testing-library/user-event"; -import { resetIdCounter } from "downshift"; -import { createContext } from "react"; import { DatagridTextFilterContainerProps } from "../../../typings/DatagridTextFilterProps"; import DatagridTextFilter from "../../DatagridTextFilter"; diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withLinkedStringStore.tsx b/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withLinkedStringStore.tsx index f5a0e0934d..1a3e265ab1 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withLinkedStringStore.tsx +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withLinkedStringStore.tsx @@ -1,8 +1,8 @@ +import { AttributeMetaData } from "mendix"; +import { FC } from "react"; import { FilterAPI } from "@mendix/widget-plugin-filtering/context"; import { StringStoreProvider } from "@mendix/widget-plugin-filtering/custom-filter-api/StringStoreProvider"; import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup"; -import { AttributeMetaData } from "mendix"; -import { FC } from "react"; import { StringFilterProps } from "../components/typings"; interface RequiredProps { diff --git a/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withParentProvidedStringStore.tsx b/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withParentProvidedStringStore.tsx index 73c914f3c3..650fbabf5a 100644 --- a/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withParentProvidedStringStore.tsx +++ b/packages/pluggableWidgets/datagrid-text-filter-web/src/hocs/withParentProvidedStringStore.tsx @@ -1,9 +1,9 @@ +import { ReactElement, useRef } from "react"; import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; import { useFilterAPI } from "@mendix/widget-plugin-filtering/context"; import { APIError, EMISSINGSTORE, EStoreTypeMisMatch } from "@mendix/widget-plugin-filtering/errors"; import { error, Result, value } from "@mendix/widget-plugin-filtering/result-meta"; import { isStringFilter } from "@mendix/widget-plugin-filtering/stores/input/store-utils"; -import { ReactElement, useRef } from "react"; import { StringFilterProps } from "../components/typings"; export function withParentProvidedStringStore

( diff --git a/packages/shared/widget-plugin-filtering/src/__tests__/DateInputFilterStore.spec.ts b/packages/shared/widget-plugin-filtering/src/__tests__/DateInputFilterStore.spec.ts index b54f27e74a..1690ba84da 100644 --- a/packages/shared/widget-plugin-filtering/src/__tests__/DateInputFilterStore.spec.ts +++ b/packages/shared/widget-plugin-filtering/src/__tests__/DateInputFilterStore.spec.ts @@ -1,5 +1,4 @@ jest.mock("mendix/filters/builders"); -import { attrId, listAttribute } from "@mendix/widget-plugin-test-utils"; import { ListAttributeValue } from "mendix"; import { and, @@ -16,6 +15,7 @@ import { or } from "mendix/filters/builders"; import { configure } from "mobx"; +import { attrId, listAttribute } from "@mendix/widget-plugin-test-utils"; import { DateInputFilterStore } from "../stores/input/DateInputFilterStore"; configure({ diff --git a/packages/shared/widget-plugin-filtering/src/context.ts b/packages/shared/widget-plugin-filtering/src/context.ts index bddce00367..a10c7555d5 100644 --- a/packages/shared/widget-plugin-filtering/src/context.ts +++ b/packages/shared/widget-plugin-filtering/src/context.ts @@ -1,5 +1,5 @@ -import { EnumFilterStore } from "@mendix/widget-plugin-dropdown-filter/stores/EnumFilterStore"; import { Context, createContext, useContext } from "react"; +import { EnumFilterStore } from "@mendix/widget-plugin-dropdown-filter/stores/EnumFilterStore"; import { APIError, ENOCONTEXT } from "./errors"; import { error, Result, value } from "./result-meta"; import { InputFilterInterface } from "./typings/InputFilterInterface"; diff --git a/packages/shared/widget-plugin-filtering/src/controllers/input/NumberInputController.ts b/packages/shared/widget-plugin-filtering/src/controllers/input/NumberInputController.ts index f46a8abafc..f57a3d14b4 100644 --- a/packages/shared/widget-plugin-filtering/src/controllers/input/NumberInputController.ts +++ b/packages/shared/widget-plugin-filtering/src/controllers/input/NumberInputController.ts @@ -1,11 +1,11 @@ +import { action, autorun, computed, makeObservable, reaction, runInAction } from "mobx"; +import { createRef } from "react"; import { FilterFunctionBinary, FilterFunctionGeneric, FilterFunctionNonValue } from "@mendix/filter-commons/typings/FilterFunctions"; import { debounce } from "@mendix/widget-plugin-platform/utils/debounce"; -import { action, autorun, computed, makeObservable, reaction, runInAction } from "mobx"; -import { createRef } from "react"; import { InputStore } from "../../stores/input/InputStore"; import { FilterV, Number_InputFilterInterface } from "../../typings/InputFilterInterface"; diff --git a/packages/shared/widget-plugin-filtering/src/controllers/input/StringInputController.ts b/packages/shared/widget-plugin-filtering/src/controllers/input/StringInputController.ts index 6f58b6730b..135dc5bf6b 100644 --- a/packages/shared/widget-plugin-filtering/src/controllers/input/StringInputController.ts +++ b/packages/shared/widget-plugin-filtering/src/controllers/input/StringInputController.ts @@ -1,3 +1,5 @@ +import { action, autorun, computed, makeObservable, reaction, runInAction } from "mobx"; +import { createRef } from "react"; import { FilterFunctionBinary, FilterFunctionGeneric, @@ -5,8 +7,6 @@ import { FilterFunctionString } from "@mendix/filter-commons/typings/FilterFunctions"; import { debounce } from "@mendix/widget-plugin-platform/utils/debounce"; -import { action, autorun, computed, makeObservable, reaction, runInAction } from "mobx"; -import { createRef } from "react"; import { InputStore } from "../../stores/input/InputStore"; import { FilterV, String_InputFilterInterface } from "../../typings/InputFilterInterface"; diff --git a/packages/shared/widget-plugin-filtering/src/controls/input/InputWithFilters.tsx b/packages/shared/widget-plugin-filtering/src/controls/input/InputWithFilters.tsx index 146a20dc3f..ee83fd06ef 100644 --- a/packages/shared/widget-plugin-filtering/src/controls/input/InputWithFilters.tsx +++ b/packages/shared/widget-plugin-filtering/src/controls/input/InputWithFilters.tsx @@ -1,9 +1,9 @@ -import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions"; import classNames from "classnames"; import { observer } from "mobx-react-lite"; import { ReactElement } from "react"; -import { FilterSelector } from "../filter-selector/FilterSelector"; +import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions"; import { InputComponentProps } from "./typings"; +import { FilterSelector } from "../filter-selector/FilterSelector"; export function InputWithFiltersComponent(props: InputComponentProps): ReactElement { const { diff --git a/packages/shared/widget-plugin-filtering/src/controls/input/typings.ts b/packages/shared/widget-plugin-filtering/src/controls/input/typings.ts index f440080ef5..ade73918a4 100644 --- a/packages/shared/widget-plugin-filtering/src/controls/input/typings.ts +++ b/packages/shared/widget-plugin-filtering/src/controls/input/typings.ts @@ -1,5 +1,5 @@ -import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions"; import { CSSProperties, RefAttributes } from "react"; +import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions"; import { InputStore } from "../../stores/input/InputStore"; import { InputFilterInterface } from "../../typings/InputFilterInterface"; diff --git a/packages/shared/widget-plugin-filtering/src/custom-filter-api/DateStoreProvider.ts b/packages/shared/widget-plugin-filtering/src/custom-filter-api/DateStoreProvider.ts index fedbb94dd2..64905d90f8 100644 --- a/packages/shared/widget-plugin-filtering/src/custom-filter-api/DateStoreProvider.ts +++ b/packages/shared/widget-plugin-filtering/src/custom-filter-api/DateStoreProvider.ts @@ -1,8 +1,8 @@ import { FilterAPI } from "../context"; -import { DateInputFilterStore } from "../stores/input/DateInputFilterStore"; -import { Date_InputFilterInterface } from "../typings/InputFilterInterface"; import { BaseStoreProvider } from "./BaseStoreProvider"; import { FilterSpec } from "./typings"; +import { DateInputFilterStore } from "../stores/input/DateInputFilterStore"; +import { Date_InputFilterInterface } from "../typings/InputFilterInterface"; export class DateStoreProvider extends BaseStoreProvider { protected _store: DateInputFilterStore; diff --git a/packages/shared/widget-plugin-filtering/src/custom-filter-api/NumberStoreProvider.ts b/packages/shared/widget-plugin-filtering/src/custom-filter-api/NumberStoreProvider.ts index 5b3639f346..7133c01657 100644 --- a/packages/shared/widget-plugin-filtering/src/custom-filter-api/NumberStoreProvider.ts +++ b/packages/shared/widget-plugin-filtering/src/custom-filter-api/NumberStoreProvider.ts @@ -1,8 +1,8 @@ import { FilterAPI } from "../context"; -import { NumberInputFilterStore } from "../stores/input/NumberInputFilterStore"; -import { Number_InputFilterInterface } from "../typings/InputFilterInterface"; import { BaseStoreProvider } from "./BaseStoreProvider"; import { FilterSpec } from "./typings"; +import { NumberInputFilterStore } from "../stores/input/NumberInputFilterStore"; +import { Number_InputFilterInterface } from "../typings/InputFilterInterface"; export class NumberStoreProvider extends BaseStoreProvider { protected _store: NumberInputFilterStore; diff --git a/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts b/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts index 0504573103..1c93ef197e 100644 --- a/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts +++ b/packages/shared/widget-plugin-filtering/src/custom-filter-api/StringStoreProvider.ts @@ -1,8 +1,8 @@ import { FilterAPI } from "../context"; -import { StringInputFilterStore } from "../stores/input/StringInputFilterStore"; -import { String_InputFilterInterface } from "../typings/InputFilterInterface"; import { BaseStoreProvider } from "./BaseStoreProvider"; import { FilterSpec } from "./typings"; +import { StringInputFilterStore } from "../stores/input/StringInputFilterStore"; +import { String_InputFilterInterface } from "../typings/InputFilterInterface"; export class StringStoreProvider extends BaseStoreProvider { protected _store: StringInputFilterStore; diff --git a/packages/shared/widget-plugin-filtering/src/helpers/useDateSync.ts b/packages/shared/widget-plugin-filtering/src/helpers/useDateSync.ts index b1363eb67a..c66bc048b6 100644 --- a/packages/shared/widget-plugin-filtering/src/helpers/useDateSync.ts +++ b/packages/shared/widget-plugin-filtering/src/helpers/useDateSync.ts @@ -1,11 +1,11 @@ +import { ActionValue, EditableValue } from "mendix"; +import { reaction } from "mobx"; +import { useEffect, useRef } from "react"; import { FilterFunctionBinary, FilterFunctionGeneric, FilterFunctionNonValue } from "@mendix/filter-commons/typings/FilterFunctions"; -import { ActionValue, EditableValue } from "mendix"; -import { reaction } from "mobx"; -import { useEffect, useRef } from "react"; import { InputFilterInterface } from "../typings/InputFilterInterface"; interface Props { diff --git a/packages/shared/widget-plugin-filtering/src/helpers/withAttributeGuard.tsx b/packages/shared/widget-plugin-filtering/src/helpers/withAttributeGuard.tsx index 87524aceed..1ead1974d4 100644 --- a/packages/shared/widget-plugin-filtering/src/helpers/withAttributeGuard.tsx +++ b/packages/shared/widget-plugin-filtering/src/helpers/withAttributeGuard.tsx @@ -1,5 +1,5 @@ -import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; import { FC, useMemo } from "react"; +import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; interface RequiredProps { attributes: Array<{ diff --git a/packages/shared/widget-plugin-filtering/src/helpers/withFilterAPI.tsx b/packages/shared/widget-plugin-filtering/src/helpers/withFilterAPI.tsx index 43ac884f8a..8f4143a43a 100644 --- a/packages/shared/widget-plugin-filtering/src/helpers/withFilterAPI.tsx +++ b/packages/shared/widget-plugin-filtering/src/helpers/withFilterAPI.tsx @@ -1,6 +1,6 @@ import { FC } from "react"; -import { FilterAPI, useFilterAPI } from "../context"; import { Alert } from "@mendix/widget-plugin-component-kit/Alert"; +import { FilterAPI, useFilterAPI } from "../context"; export function withFilterAPI

(Component: FC

): FC

{ return function FilterAPIProvider(props) { diff --git a/packages/shared/widget-plugin-filtering/src/stores/generic/CombinedFilter.ts b/packages/shared/widget-plugin-filtering/src/stores/generic/CombinedFilter.ts index 7afd9504c6..09c3ae3258 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/generic/CombinedFilter.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/generic/CombinedFilter.ts @@ -1,8 +1,8 @@ +import { FilterCondition } from "mendix/filters"; +import { action, computed, makeObservable, reaction } from "mobx"; import { reduceArray, restoreArray } from "@mendix/filter-commons/condition-utils"; import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch"; import { SetupComponent, SetupComponentHost } from "@mendix/widget-plugin-mobx-kit/main"; -import { FilterCondition } from "mendix/filters"; -import { action, computed, makeObservable, reaction } from "mobx"; import { ConditionWithMeta } from "../../typings/ConditionWithMeta"; import { fnv1aHash } from "../../utils/fnv-1a-hash"; diff --git a/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts index 3e850e869d..cba605da6b 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/generic/CustomFilterHost.ts @@ -1,7 +1,7 @@ -import { reduceMap, restoreMap } from "@mendix/filter-commons/condition-utils"; -import { FilterData, FiltersSettingsMap, PlainJs, Serializable } from "@mendix/filter-commons/typings/settings"; import { FilterCondition } from "mendix/filters"; import { action, autorun, makeAutoObservable } from "mobx"; +import { reduceMap, restoreMap } from "@mendix/filter-commons/condition-utils"; +import { FilterData, FiltersSettingsMap, PlainJs, Serializable } from "@mendix/filter-commons/typings/settings"; import { ConditionWithMeta } from "../../typings/ConditionWithMeta"; import { Filter, ObservableFilterHost } from "../../typings/ObservableFilterHost"; diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/BaseInputFilterStore.ts b/packages/shared/widget-plugin-filtering/src/stores/input/BaseInputFilterStore.ts index f599e940cf..e6fa451a85 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/input/BaseInputFilterStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/input/BaseInputFilterStore.ts @@ -1,5 +1,3 @@ -import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions"; -import { FilterData, InputData } from "@mendix/filter-commons/typings/settings"; import { Big } from "big.js"; import { AttributeMetaData } from "mendix"; import { FilterCondition } from "mendix/filters"; @@ -19,6 +17,8 @@ import { startsWith } from "mendix/filters/builders"; import { action, computed, makeObservable, observable } from "mobx"; +import { AllFunctions } from "@mendix/filter-commons/typings/FilterFunctions"; +import { FilterData, InputData } from "@mendix/filter-commons/typings/settings"; import { Argument } from "./Argument"; type StateTuple = [Fn] | [Fn, V] | [Fn, V, V]; diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/DateInputFilterStore.ts b/packages/shared/widget-plugin-filtering/src/stores/input/DateInputFilterStore.ts index b7fbcfcbf5..74e6317ec0 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/input/DateInputFilterStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/input/DateInputFilterStore.ts @@ -1,18 +1,3 @@ -import { - betweenToState, - isAnd, - isEmptyExp, - isNotEmptyExp, - isOr, - singularToState -} from "@mendix/filter-commons/condition-utils"; -import { - FilterFunctionBinary, - FilterFunctionGeneric, - FilterFunctionNonValue -} from "@mendix/filter-commons/typings/FilterFunctions"; -import { FilterName } from "@mendix/filter-commons/typings/mendix"; -import { FilterData, InputData } from "@mendix/filter-commons/typings/settings"; import { AttributeMetaData, DateTimeFormatter, ListAttributeValue, SimpleFormatter } from "mendix"; import { AndCondition, FilterCondition, LiteralExpression } from "mendix/filters"; import { @@ -30,9 +15,24 @@ import { or } from "mendix/filters/builders"; import { action, comparer, IReactionDisposer, makeObservable, observable, reaction } from "mobx"; -import { Date_InputFilterInterface } from "../../typings/InputFilterInterface"; +import { + betweenToState, + isAnd, + isEmptyExp, + isNotEmptyExp, + isOr, + singularToState +} from "@mendix/filter-commons/condition-utils"; +import { + FilterFunctionBinary, + FilterFunctionGeneric, + FilterFunctionNonValue +} from "@mendix/filter-commons/typings/FilterFunctions"; +import { FilterName } from "@mendix/filter-commons/typings/mendix"; +import { FilterData, InputData } from "@mendix/filter-commons/typings/settings"; import { DateArgument } from "./Argument"; import { BaseInputFilterStore } from "./BaseInputFilterStore"; +import { Date_InputFilterInterface } from "../../typings/InputFilterInterface"; type DateFns = FilterFunctionGeneric | FilterFunctionNonValue | FilterFunctionBinary; type StateTuple = [DateFns, Date | undefined, Date | undefined]; diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/NumberInputFilterStore.ts b/packages/shared/widget-plugin-filtering/src/stores/input/NumberInputFilterStore.ts index 7985c66ba9..69bdad290f 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/input/NumberInputFilterStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/input/NumberInputFilterStore.ts @@ -1,3 +1,7 @@ +import { Big } from "big.js"; +import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix"; +import { FilterCondition } from "mendix/filters"; +import { action, comparer, makeObservable } from "mobx"; import { inputStateFromCond } from "@mendix/filter-commons/condition-utils"; import { FilterFunctionBinary, @@ -5,14 +9,10 @@ import { FilterFunctionNonValue } from "@mendix/filter-commons/typings/FilterFunctions"; import { FilterData, InputData } from "@mendix/filter-commons/typings/settings"; -import { Big } from "big.js"; -import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix"; -import { FilterCondition } from "mendix/filters"; -import { action, comparer, makeObservable } from "mobx"; -import { Number_InputFilterInterface } from "../../typings/InputFilterInterface"; import { NumberArgument } from "./Argument"; import { BaseInputFilterStore } from "./BaseInputFilterStore"; import { baseNames } from "./fn-mappers"; +import { Number_InputFilterInterface } from "../../typings/InputFilterInterface"; type NumFns = FilterFunctionGeneric | FilterFunctionNonValue | FilterFunctionBinary; type Formatter = SimpleFormatter; diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts b/packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts index fbb2836b6c..40431862ee 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/input/StringInputFilterStore.ts @@ -1,3 +1,6 @@ +import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix"; +import { FilterCondition } from "mendix/filters"; +import { action, comparer, makeObservable } from "mobx"; import { inputStateFromCond } from "@mendix/filter-commons/condition-utils"; import { FilterFunctionBinary, @@ -6,13 +9,10 @@ import { FilterFunctionString } from "@mendix/filter-commons/typings/FilterFunctions"; import { FilterData, InputData } from "@mendix/filter-commons/typings/settings"; -import { AttributeMetaData, ListAttributeValue, SimpleFormatter } from "mendix"; -import { FilterCondition } from "mendix/filters"; -import { action, comparer, makeObservable } from "mobx"; -import { String_InputFilterInterface } from "../../typings/InputFilterInterface"; import { StringArgument } from "./Argument"; import { BaseInputFilterStore } from "./BaseInputFilterStore"; import { baseNames } from "./fn-mappers"; +import { String_InputFilterInterface } from "../../typings/InputFilterInterface"; type StrFns = FilterFunctionString | FilterFunctionGeneric | FilterFunctionNonValue | FilterFunctionBinary; type AttrMeta = AttributeMetaData & { formatter?: SimpleFormatter }; diff --git a/packages/shared/widget-plugin-filtering/src/stores/input/store-utils.ts b/packages/shared/widget-plugin-filtering/src/stores/input/store-utils.ts index a9fa479af8..9f881999c2 100644 --- a/packages/shared/widget-plugin-filtering/src/stores/input/store-utils.ts +++ b/packages/shared/widget-plugin-filtering/src/stores/input/store-utils.ts @@ -1,6 +1,6 @@ -import { EnumFilterStore } from "@mendix/widget-plugin-dropdown-filter/stores/EnumFilterStore"; import { ListAttributeValue } from "mendix"; import { FilterCondition } from "mendix/filters"; +import { EnumFilterStore } from "@mendix/widget-plugin-dropdown-filter/stores/EnumFilterStore"; import { APIError, NOT_FILTERABLE, UNSUPPORTED_ATTRIBUTE_TYPE } from "../../errors"; import { error, Result, value } from "../../result-meta"; import { diff --git a/packages/shared/widget-plugin-filtering/src/typings/ObservableFilterHost.ts b/packages/shared/widget-plugin-filtering/src/typings/ObservableFilterHost.ts index 66a8a70c6d..bab21fb66a 100644 --- a/packages/shared/widget-plugin-filtering/src/typings/ObservableFilterHost.ts +++ b/packages/shared/widget-plugin-filtering/src/typings/ObservableFilterHost.ts @@ -1,5 +1,5 @@ -import { FilterData, FiltersSettingsMap } from "@mendix/filter-commons/typings/settings"; import { FilterCondition } from "mendix/filters"; +import { FilterData, FiltersSettingsMap } from "@mendix/filter-commons/typings/settings"; export interface Filter { toJSON(): FilterData;