diff --git a/assets/js/src/core/modules/element/dynamic-types/definitions/field-filters/components/dynamic-type-field-filter-boolean-select-component.tsx b/assets/js/src/core/modules/element/dynamic-types/definitions/field-filters/components/dynamic-type-field-filter-boolean-select-component.tsx index 35d3c12326..725b4506cf 100644 --- a/assets/js/src/core/modules/element/dynamic-types/definitions/field-filters/components/dynamic-type-field-filter-boolean-select-component.tsx +++ b/assets/js/src/core/modules/element/dynamic-types/definitions/field-filters/components/dynamic-type-field-filter-boolean-select-component.tsx @@ -12,6 +12,7 @@ import React, { useEffect, useState } from 'react' import { Select } from '@Pimcore/components/select/select' import { useDynamicFilter } from '@Pimcore/components/dynamic-filter/provider/use-dynamic-filter' import { type DefaultOptionType } from 'antd/es/select' +import { useFocusRestore } from '@Pimcore/modules/element/listing/decorators/general-filters/view-layer/components/sidebar/tabs/filters/focus-context' interface IObjectSelectConfig { fieldDefinition: { @@ -41,6 +42,7 @@ const boolToNum = (value: boolean | null): number => { export const DynamicTypeFieldFilterBooleanSelectComponent = (): React.JSX.Element => { const { setData, data, config: rawConfig } = useDynamicFilter() + const { restoreFocus } = useFocusRestore() const config: IAssetSelectConfig | IObjectSelectConfig = rawConfig const [_value, setValue] = useState([]) @@ -75,6 +77,7 @@ export const DynamicTypeFieldFilterBooleanSelectComponent = (): React.JSX.Elemen { if (!open) restoreFocus() } } options={ formattedOptions } showSearch={ rawConfig?.showSearch ?? false } style={ { width: '100%' } } diff --git a/assets/js/src/core/modules/element/dynamic-types/definitions/field-filters/components/dynamic-type-field-filter-text-area-component.tsx b/assets/js/src/core/modules/element/dynamic-types/definitions/field-filters/components/dynamic-type-field-filter-text-area-component.tsx index 9c5922ae9e..e54f6773f8 100644 --- a/assets/js/src/core/modules/element/dynamic-types/definitions/field-filters/components/dynamic-type-field-filter-text-area-component.tsx +++ b/assets/js/src/core/modules/element/dynamic-types/definitions/field-filters/components/dynamic-type-field-filter-text-area-component.tsx @@ -29,13 +29,11 @@ export const DynamicTypeFieldFilterTextAreaComponent = (): React.JSX.Element => return (