Skip to content

fix: Aligns top level tabs when native filters are enabled #14987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
michael-s-molina wants to merge 1 commit into from
Closed

fix: Aligns top level tabs when native filters are enabled #14987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import DashboardContainer from './DashboardContainer';

const TABS_HEIGHT = 47;
const HEADER_HEIGHT = 67;
const NATIVE_FILTER_BAR_WIDTH = 255;
Copy link
Copy Markdown
Member

@kgabryje kgabryje Jun 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 255 instead of 250?

Copy link
Copy Markdown
Member Author

@michael-s-molina michael-s-molina Jun 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To fix the inner margin-right of the filter values. They have a fixed width.


type DashboardBuilderProps = {};

Expand Down Expand Up @@ -161,6 +162,11 @@ const DashboardBuilder: FC<DashboardBuilderProps> = () => {
(hideDashboardHeader ? 0 : HEADER_HEIGHT) +
(topLevelTabs ? TABS_HEIGHT : 0);

const tabsPaddingLeft =
nativeFiltersEnabled && !editMode && dashboardFiltersOpen
? NATIVE_FILTER_BAR_WIDTH + 20
: 8;
Copy link
Copy Markdown
Member

@kgabryje kgabryje Jun 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use theme variables here? {theme.gridUnit * 2}px


useEffect(() => {
if (
filterValues.length === 0 &&
Expand Down Expand Up @@ -219,6 +225,7 @@ const DashboardBuilder: FC<DashboardBuilderProps> = () => {
renderTabContent={false}
renderHoverMenu={false}
onChangeTab={handleChangeTab}
paddingLeft={tabsPaddingLeft}
/>
</WithPopoverMenu>
)}
Expand All @@ -235,9 +242,11 @@ const DashboardBuilder: FC<DashboardBuilderProps> = () => {
<StickyVerticalBar
filtersOpen={dashboardFiltersOpen}
topOffset={barTopOffset}
openWidth={NATIVE_FILTER_BAR_WIDTH}
>
<ErrorBoundary>
<FilterBar
width={NATIVE_FILTER_BAR_WIDTH}
filtersOpen={dashboardFiltersOpen}
toggleFiltersBar={toggleDashboardFiltersOpen}
directPathToChild={directPathToChild}
Expand Down
10 changes: 6 additions & 4 deletions superset-frontend/src/dashboard/components/StickyVerticalBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { StickyContainer, Sticky } from 'react-sticky';
import { styled } from '@superset-ui/core';
import cx from 'classnames';

const Wrapper = styled.div`
const Wrapper = styled.div<{ openWidth: number }>`
position: relative;
width: ${({ theme }) => theme.gridUnit * 8}px;
flex: 0 0 ${({ theme }) => theme.gridUnit * 8}px;
Expand All @@ -33,7 +33,7 @@ const Wrapper = styled.div`
transition-delay: ${({ theme }) => theme.transitionTiming * 2}s;
} */
&.open {
width: 250px;
width: ${({ openWidth }) => openWidth}px;
flex: 0 0 250px;
/* &.animated {
transition-delay: 0s;
Expand All @@ -50,7 +50,7 @@ const Contents = styled.div`

export interface SVBProps {
topOffset: number;
width?: number;
openWidth: number;
filtersOpen: boolean;
}

Expand All @@ -65,8 +65,9 @@ export const StickyVerticalBar: React.FC<SVBProps> = ({
topOffset,
children,
filtersOpen,
openWidth,
}) => (
<Wrapper className={cx({ open: filtersOpen })}>
<Wrapper className={cx({ open: filtersOpen })} openWidth={openWidth}>
<StickyContainer>
<Sticky topOffset={-topOffset} bottomOffset={Infinity}>
{({
Expand All @@ -79,6 +80,7 @@ export const StickyVerticalBar: React.FC<SVBProps> = ({
distanceFromTop: number;
}) => (
<Contents
id="sticky-vertical-bar"
Copy link
Copy Markdown
Member

@kgabryje kgabryje Jun 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need that id here?

style={
isSticky
? {
Expand Down
8 changes: 8 additions & 0 deletions superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const propTypes = {
editMode: PropTypes.bool.isRequired,
renderHoverMenu: PropTypes.bool,
directPathToChild: PropTypes.arrayOf(PropTypes.string),
paddingLeft: PropTypes.number,

// actions (from DashboardComponent.jsx)
logEvent: PropTypes.func.isRequired,
Expand Down Expand Up @@ -78,12 +79,17 @@ const defaultProps = {
onResizeStart() {},
onResize() {},
onResizeStop() {},
paddingLeft: 8,
};

const StyledTabsContainer = styled.div`
width: 100%;
background-color: ${({ theme }) => theme.colors.grayscale.light5};

&.dashboard-component.dashboard-component-tabs {
padding-left: ${({ paddingLeft }) => paddingLeft}px;
}

.dashboard-component-tabs-content {
min-height: ${({ theme }) => theme.gridUnit * 12}px;
margin-top: ${({ theme }) => theme.gridUnit / 4}px;
Expand Down Expand Up @@ -276,6 +282,7 @@ class Tabs extends React.PureComponent {
dashboardLayout,
lastFocusedTabId,
setLastFocusedTab,
paddingLeft,
} = this.props;

const { children: tabIds } = tabsComponent;
Expand Down Expand Up @@ -311,6 +318,7 @@ class Tabs extends React.PureComponent {
<StyledTabsContainer
className="dashboard-component dashboard-component-tabs"
data-test="dashboard-component-tabs"
paddingLeft={paddingLeft}
>
{editMode && renderHoverMenu && (
<HoverMenu innerRef={tabsDragSourceRef} position="left">
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterBar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ describe('FilterBar', () => {
const renderWrapper = (props = closedBarProps, state?: object) =>
render(
<Provider store={state ? getMockStore(state) : mockStore}>
<FilterBar {...props} />
<FilterBar {...props} width={250} />
</Provider>,
);

Expand Down
20 changes: 12 additions & 8 deletions superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,20 @@ import EditSection from './FilterSets/EditSection';
import Header from './Header';
import FilterControls from './FilterControls/FilterControls';

const BAR_WIDTH = `250px`;

export const FILTER_BAR_TEST_ID = 'filter-bar';
export const getFilterBarTestId = testWithId(FILTER_BAR_TEST_ID);

const BarWrapper = styled.div`
const BarWrapper = styled.div<{ width: number }>`
width: ${({ theme }) => theme.gridUnit * 8}px;
& .ant-tabs-top > .ant-tabs-nav {
margin: 0;
}
&.open {
width: ${BAR_WIDTH}; // arbitrary...
min-width: ${({ width }) => width}px; // arbitrary...
}
`;

const Bar = styled.div`
const Bar = styled.div<{ width: number }>`
& .ant-typography-edit-content {
left: 0;
margin-top: 0;
Expand All @@ -76,7 +74,7 @@ const Bar = styled.div`
left: 0;
flex-direction: column;
flex-grow: 1;
width: ${BAR_WIDTH}; // arbitrary...
min-width: ${({ width }) => width}px; // arbitrary...
background: ${({ theme }) => theme.colors.grayscale.light5};
border-right: 1px solid ${({ theme }) => theme.colors.grayscale.light2};
min-height: 100%;
Expand Down Expand Up @@ -149,12 +147,14 @@ const StyledTabs = styled(Tabs)`
`;

export interface FiltersBarProps {
width: number;
filtersOpen: boolean;
toggleFiltersBar: any;
directPathToChild?: string[];
}

const FilterBar: React.FC<FiltersBarProps> = ({
width,
filtersOpen,
toggleFiltersBar,
directPathToChild,
Expand Down Expand Up @@ -212,7 +212,11 @@ const FilterBar: React.FC<FiltersBarProps> = ({
const isInitialized = useInitialization();

return (
<BarWrapper {...getFilterBarTestId()} className={cx({ open: filtersOpen })}>
<BarWrapper
{...getFilterBarTestId()}
className={cx({ open: filtersOpen })}
width={width}
>
<CollapsedBar
{...getFilterBarTestId('collapsable')}
className={cx({ open: !filtersOpen })}
Expand All @@ -224,7 +228,7 @@ const FilterBar: React.FC<FiltersBarProps> = ({
/>
<Icon name="filter" {...getFilterBarTestId('filter-icon')} />
</CollapsedBar>
<Bar className={cx({ open: filtersOpen })}>
<Bar className={cx({ open: filtersOpen })} width={width}>
<Header
toggleFiltersBar={toggleFiltersBar}
onApply={handleApply}
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/dashboard/containers/DashboardComponent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const propTypes = {
directPathLastUpdated: PropTypes.number,
dashboardId: PropTypes.number.isRequired,
isComponentVisible: PropTypes.bool,
paddingLeft: PropTypes.number,
};

const defaultProps = {
Expand Down