fix: dropdown placement for cascading filters popover (#17046)

* inital fix * remove content wrapper * allow dropdown to overflow in long chart * only pass through filtercontrol * change to auto * add ref and pass to child * fix bug * fix lint * add type * remove code * add currrent param
apache · Oct 22, 2021 · 824e62b · 824e62b
1 parent 80a459f
commit 824e62b
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 9 deletions.
diff --git a/...ashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/index.tsx b/...ashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/index.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { RefObject } from 'react';
 import { styled, DataMask } from '@superset-ui/core';
 import FilterControl from 'src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl';
 import { CascadeFilter } from 'src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/types';
@@ -28,14 +28,14 @@ export interface CascadeFilterControlProps {
   filter: CascadeFilter;
   directPathToChild?: string[];
   onFilterSelectionChange: (filter: Filter, dataMask: DataMask) => void;
+  parentRef?: RefObject<any>;
 }
 
 const StyledDiv = styled.div`
   display: flex;
   width: 100%;
   flex-direction: column;
   align-items: center;
-
   .ant-form-item {
     margin-bottom: ${({ theme }) => theme.gridUnit * 4}px;
   }
@@ -46,12 +46,15 @@ const CascadeFilterControl: React.FC<CascadeFilterControlProps> = ({
   filter,
   directPathToChild,
   onFilterSelectionChange,
+  parentRef,
 }) => (
   <>
     <FilterControl
       dataMaskSelected={dataMaskSelected}
       filter={filter}
       directPathToChild={directPathToChild}
+      parentRef={parentRef}
+      showOverflow
       onFilterSelectionChange={onFilterSelectionChange}
     />
     <StyledDiv>

diff --git a/.../src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadePopover/index.tsx b/.../src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadePopover/index.tsx
@@ -16,7 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+  useRef,
+} from 'react';
 import { styled, t, DataMask, css, SupersetTheme } from '@superset-ui/core';
 import Popover from 'src/components/Popover';
 import Icons from 'src/components/Icons';
@@ -74,9 +80,9 @@ const StyledPill = styled(Pill)`
   background: ${({ theme }) => theme.colors.grayscale.light1};
 `;
 
-const ContentWrapper = styled.div`
+const ContentStyles = styled.div`
   max-height: 700px;
-  overflow-y: auto;
+  overflow: auto;
 `;
 
 const CascadePopover: React.FC<CascadePopoverProps> = ({
@@ -90,6 +96,7 @@ const CascadePopover: React.FC<CascadePopoverProps> = ({
 }) => {
   const [currentPathToChild, setCurrentPathToChild] = useState<string[]>();
   const dataMask = dataMaskSelected[filter.id];
+  const parent = useRef();
 
   useEffect(() => {
     setCurrentPathToChild(directPathToChild);
@@ -178,16 +185,17 @@ const CascadePopover: React.FC<CascadePopoverProps> = ({
   );
 
   const content = (
-    <ContentWrapper>
+    <ContentStyles>
       <CascadeFilterControl
         dataMaskSelected={dataMaskSelected}
         data-test="cascade-filters-control"
         key={filter.id}
         filter={filter}
         directPathToChild={visible ? currentPathToChild : undefined}
         onFilterSelectionChange={onFilterSelectionChange}
+        parentRef={parent}
       />
-    </ContentWrapper>
+    </ContentStyles>
   );
 
   return (
@@ -199,7 +207,12 @@ const CascadePopover: React.FC<CascadePopoverProps> = ({
       onVisibleChange={onVisibleChange}
       placement="rightTop"
       id={filter.id}
-      overlayStyle={{ width: '400px' }}
+      overlayStyle={{
+        width: '400px',
+        position: 'relative',
+        overflow: 'auto',
+      }}
+      ref={parent}
     >
       <div>
         {activeFilters.map(activeFilter => (

diff --git a/...rontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx b/...rontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl.tsx
@@ -59,6 +59,8 @@ const FilterControl: React.FC<FilterProps> = ({
   onFilterSelectionChange,
   directPathToChild,
   inView,
+  showOverflow,
+  parentRef,
 }) => {
   const { name = '<undefined>' } = filter;
 
@@ -89,9 +91,11 @@ const FilterControl: React.FC<FilterProps> = ({
         <FilterValue
           dataMaskSelected={dataMaskSelected}
           filter={filter}
+          showOverflow={showOverflow}
           directPathToChild={directPathToChild}
           onFilterSelectionChange={onFilterSelectionChange}
           inView={inView}
+          parentRef={parentRef}
         />
       </FormItem>
     </StyledFilterControlContainer>

diff --git a/...-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx b/...-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx
@@ -68,6 +68,8 @@ const FilterValue: React.FC<FilterProps> = ({
   directPathToChild,
   onFilterSelectionChange,
   inView = true,
+  showOverflow,
+  parentRef,
 }) => {
   const { id, targets, filterType, adhoc_filters, time_range } = filter;
   const metadata = getChartMetadataRegistry().get(filterType);
@@ -251,7 +253,9 @@ const FilterValue: React.FC<FilterProps> = ({
         <SuperChart
           height={HEIGHT}
           width="100%"
+          showOverflow={showOverflow}
           formData={formData}
+          parentRef={parentRef}
           // For charts that don't have datasource we need workaround for empty placeholder
           queriesData={hasDataSource ? state : queriesDataPlaceholder}
           chartType={filterType}

diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/types.ts b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/types.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { RefObject } from 'react';
 import { DataMask } from '@superset-ui/core';
 import { DataMaskStateWithId } from 'src/dataMask/types';
 import { Filter } from '../../types';
@@ -30,4 +30,6 @@ export interface FilterProps {
   directPathToChild?: string[];
   onFilterSelectionChange: (filter: Filter, dataMask: DataMask) => void;
   inView?: boolean;
+  showOverflow?: boolean;
+  parentRef?: RefObject<any>;
 }
diff --git a/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx b/superset-frontend/src/filters/components/Select/SelectFilterPlugin.tsx
@@ -82,6 +82,8 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
     setFocusedFilter,
     unsetFocusedFilter,
     appSection,
+    showOverflow,
+    parentRef,
   } = props;
   const {
     enableEmptyFilter,
@@ -285,6 +287,9 @@ export default function PluginFilterSelect(props: PluginFilterSelectProps) {
           // @ts-ignore
           value={filterState.value || []}
           disabled={isDisabled}
+          getPopupContainer={
+            showOverflow ? () => parentRef?.current : undefined
+          }
           showSearch={showSearch}
           mode={multiSelect ? 'multiple' : 'single'}
           placeholder={placeholderText}

diff --git a/superset-frontend/src/filters/components/Select/types.ts b/superset-frontend/src/filters/components/Select/types.ts
@@ -59,6 +59,8 @@ export type PluginFilterSelectProps = PluginFilterStylesProps & {
   formData: PluginFilterSelectQueryFormData;
   filterState: FilterState;
   isRefreshing: boolean;
+  showOverflow: boolean;
+  parentRef?: RefObject<any>;
 } & PluginFilterHooks;
 
 export const DEFAULT_FORM_DATA: PluginFilterSelectCustomizeProps = {