You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by en...@apache.org on 2025/09/26 13:42:53 UTC
(superset) branch master updated: fix(DateFilterControl): remove modal overlay style to fix z-index issues (#35292)
This is an automated email from the ASF dual-hosted git repository.
enzomartellucci pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 027b25e6b8 fix(DateFilterControl): remove modal overlay style to fix z-index issues (#35292)
027b25e6b8 is described below
commit 027b25e6b807378c9d6167d11f2190029bbb80d4
Author: Mehmet Salih Yavuz <sa...@proton.me>
AuthorDate: Fri Sep 26 16:42:46 2025 +0300
fix(DateFilterControl): remove modal overlay style to fix z-index issues (#35292)
---
.../controls/DateFilterControl/DateFilterLabel.tsx | 41 +---------------------
.../tests/DateFilterLabel.test.tsx | 9 -----
.../components/controls/DateFilterControl/types.ts | 1 -
.../utils/useDatePickerInAdhocFilter.tsx | 1 -
4 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
index e152df43f0..9229c42453 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/DateFilterLabel.tsx
@@ -31,7 +31,6 @@ import {
Button,
Constants,
Divider,
- Modal,
Tooltip,
Select,
} from '@superset-ui/core/components';
@@ -39,7 +38,6 @@ import ControlHeader from 'src/explore/components/ControlHeader';
import { Icons } from '@superset-ui/core/components/Icons';
import { useDebouncedEffect } from 'src/explore/exploreUtils';
import { noOp } from 'src/utils/common';
-import { ModalTitleWithIcon } from 'src/components/ModalTitleWithIcon';
import ControlPopover from '../ControlPopover/ControlPopover';
import { DateFilterControlProps, FrameType } from './types';
@@ -146,7 +144,6 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
onChange,
onOpenPopover = noOp,
onClosePopover = noOp,
- overlayStyle = 'Popover',
isOverflowingFilterBar = false,
} = props;
const defaultTimeFilter = useDefaultTimeFilter();
@@ -384,46 +381,10 @@ export default function DateFilterLabel(props: DateFilterControlProps) {
</ControlPopover>
);
- const modalContent = (
- <>
- <Tooltip placement="top" title={tooltipTitle}>
- <DateLabel
- name={name}
- aria-labelledby={`filter-name-${props.name}`}
- aria-describedby={`date-label-${props.name}`}
- onClick={toggleOverlay}
- label={actualTimeRange}
- isActive={show}
- isPlaceholder={actualTimeRange === NO_TIME_RANGE}
- data-test={DateFilterTestKey.ModalOverlay}
- ref={labelRef}
- />
- </Tooltip>
- {/* the zIndex value is from trying so that the Modal doesn't overlay the AdhocFilter */}
- <Modal
- title={
- <ModalTitleWithIcon
- className="text"
- isEditMode
- title={t('Edit time range')}
- />
- }
- name={t('Edit time range')}
- show={show}
- onHide={toggleOverlay}
- width="600px"
- hideFooter
- zIndex={1030}
- >
- {overlayContent}
- </Modal>
- </>
- );
-
return (
<>
<ControlHeader {...props} />
- {overlayStyle === 'Modal' ? modalContent : popoverContent}
+ {popoverContent}
</>
);
}
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx b/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx
index bfb276b7de..f4c36bfa17 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/tests/DateFilterLabel.test.tsx
@@ -58,15 +58,6 @@ test('DateFilter with default props', () => {
).toBeInTheDocument();
});
-test('DateFilter should be applied the overlayStyle props', () => {
- render(setup({ onChange: () => {}, overlayStyle: 'Modal' }));
- // should be Modal as overlay
- userEvent.click(screen.getByText(NO_TIME_RANGE));
- expect(
- screen.getByTestId(DateFilterTestKey.ModalOverlay),
- ).toBeInTheDocument();
-});
-
test('DateFilter should be applied the global config time_filter from the store', () => {
render(
setup(
diff --git a/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts b/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts
index c1aa843448..e06c5409cc 100644
--- a/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts
+++ b/superset-frontend/src/explore/components/controls/DateFilterControl/types.ts
@@ -112,6 +112,5 @@ export interface DateFilterControlProps {
value?: string;
onOpenPopover?: () => void;
onClosePopover?: () => void;
- overlayStyle?: 'Modal' | 'Popover';
isOverflowingFilterBar?: boolean;
}
diff --git a/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx b/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx
index f42ddf4883..af148bb92d 100644
--- a/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx
+++ b/superset-frontend/src/explore/components/controls/FilterControl/utils/useDatePickerInAdhocFilter.tsx
@@ -52,7 +52,6 @@ export const useDatePickerInAdhocFilter = ({
value={timeRange}
name="time_range"
onChange={onTimeRangeChange}
- overlayStyle="Modal"
/>
</>
) : undefined;