Skip to content

fix(dashboard): prevent tab content cutoff and excessive whitespace in empty tabs #35834

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(dashboard): prevent tab content cutoff and excessive whitespace in empty tabs #35834

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
10 changes: 10 additions & 0 deletions superset-frontend/packages/superset-ui-core/src/components/Tabs/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ import { Icons } from '@superset-ui/core/components/Icons';

export interface TabsProps extends AntdTabsProps {
allowOverflow?: boolean;
fullHeight?: boolean;
}

const StyledTabs = ({
animated = false,
allowOverflow = true,
fullHeight = false,
tabBarStyle,
...props
}: TabsProps) => {
Expand All @@ -43,9 +45,17 @@ const StyledTabs = ({
tabBarStyle={mergedStyle}
css={theme => css`
overflow: ${allowOverflow ? 'visible' : 'hidden'};
${fullHeight && 'height: 100%;'}

.ant-tabs-content-holder {
overflow: ${allowOverflow ? 'visible' : 'auto'};
${fullHeight && 'height: 100%;'}
}
.ant-tabs-content {
${fullHeight && 'height: 100%;'}
}
.ant-tabs-tabpane {
${fullHeight && 'height: 100%;'}
}
.ant-tabs-tab {
flex: 1 1 auto;
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -305,7 +305,7 @@ const StyledDashboardContent = styled.div<{

/* this is the ParentSize wrapper */
& > div:first-child {
height: inherit !important;
height: 100% !important;
}
}

Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ const DashboardContainer: FC<DashboardContainerProps> = ({ topLevelTabs }) => {
renderTabBar={renderTabBar}
animated={false}
allowOverflow
fullHeight
onFocus={handleFocus}
items={tabItems}
tabBarStyle={{ paddingLeft: 0 }}
Expand Down
3 changes: 3 additions & 0 deletions superset-frontend/src/dashboard/components/DashboardGrid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ const DashboardEmptyStateContainer = styled.div`
bottom: 0;
left: 0;
right: 0;
display: flex;
align-items: center;
justify-content: center;
`;

const GridContent = styled.div`
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/dashboard/components/gridComponents/TabsRenderer/TabsRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ const TabsRenderer = memo<TabsRendererProps>(
type={editMode ? 'editable-card' : 'card'}
items={tabItems}
tabBarStyle={{ paddingLeft: tabBarPaddingLeft }}
fullHeight
/>
</StyledTabsContainer>
),
Expand Down
Loading