Skip to content

fix: fix adhocpopovers tab animate. #14478

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

Merged
pkdotson merged 10 commits into from
May 14, 2021
Merged

fix: fix adhocpopovers tab animate. #14478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5c1e223
fix popover
pkdotson May 5, 2021
5b59def
addd tabs default css
pkdotson May 6, 2021
1cf6702
fix lint
pkdotson May 6, 2021
7a3ddfd
fix tests
pkdotson May 7, 2021
3aa9233
address comments
pkdotson May 7, 2021
0ef09be
lint fix
pkdotson May 7, 2021
8038e0b
Merge branch 'master' of https://github.com/preset-io/superset into f…
pkdotson May 10, 2021
adcd365
fix test
pkdotson May 11, 2021
0516614
lint
pkdotson May 12, 2021
47cfb53
Merge branch 'master' of https://github.com/preset-io/superset into f…
pkdotson May 14, 2021
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
6 changes: 3 additions & 3 deletions superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ describe('DashboardBuilder', () => {
expect(parentSize.find(Tabs.TabPane)).toHaveLength(2);
});

it('should set animated=true on Tabs for perf', () => {
it('should have default animated=true on Tabs for perf', () => {
const wrapper = setup({ dashboardLayout: undoableDashboardLayoutWithTabs });
const tabProps = wrapper.find(ParentSize).find(Tabs).props();
expect(tabProps.animated).toEqual({ inkBar: true, tabPane: false });
expect(tabProps.animated).toEqual(true);
});

it('should render a TabPane and DashboardGrid for first Tab', () => {
Expand Down Expand Up @@ -182,7 +182,7 @@ describe('DashboardBuilder', () => {
dashboardLayout: undoableDashboardLayoutWithTabs,
});

expect(wrapper.find(Tabs).prop('activeKey')).toBe(DASHBOARD_GRID_ID);
expect(wrapper.find(Tabs).at(1).prop('activeKey')).toBe(DASHBOARD_GRID_ID);

wrapper
.find('.dashboard-component-tabs .ant-tabs .ant-tabs-tab')
Expand Down
131 changes: 62 additions & 69 deletions superset-frontend/src/components/Tabs/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,87 +26,80 @@ export interface TabsProps extends AntDTabsProps {
allowOverflow?: boolean;
}

const notForwardedProps = ['fullWidth', 'allowOverflow'];

const StyledTabs = styled(AntDTabs, {
shouldForwardProp: prop => !notForwardedProps.includes(String(prop)),
})<TabsProps>`
overflow: ${({ allowOverflow }) => (allowOverflow ? 'visible' : 'hidden')};

.ant-tabs-content-holder {
overflow: ${({ allowOverflow }) => (allowOverflow ? 'visible' : 'auto')};
}

.ant-tabs-tab {
flex: 1 1 auto;

&.ant-tabs-tab-active .ant-tabs-tab-btn {
color: inherit;
}

&:hover {
.anchor-link-container {
cursor: pointer;

.fa.fa-link {
visibility: visible;
}
const StyledTabs = ({
animated = false,
fullWidth = true,
allowOverflow = true,
...props
}: TabsProps) => (
<AntDTabs
animated={animated}
{...props}
css={theme => css`
overflow: ${allowOverflow ? 'visible' : 'hidden'};

.ant-tabs-content-holder {
overflow: ${allowOverflow ? 'visible' : 'auto'};
}
}

.short-link-trigger.btn {
padding: 0 ${({ theme }) => theme.gridUnit}px;

& > .fa.fa-link {
top: 0;
.ant-tabs-tab {
flex: 1 1 auto;
&.ant-tabs-tab-active .ant-tabs-tab-btn {
color: inherit;
}
&:hover {
.anchor-link-container {
cursor: pointer;
.fa.fa-link {
visibility: visible;
}
}
}
.short-link-trigger.btn {
padding: 0 ${theme.gridUnit}px;
& > .fa.fa-link {
top: 0;
}
}
}
}
}
${fullWidth &&
css`
.ant-tabs-nav-list {
width: 100%;
}

${({ fullWidth }) =>
fullWidth &&
css`
.ant-tabs-nav-list {
width: 100%;
.ant-tabs-tab {
width: 0;
margin-right: 0;
}
`};

.ant-tabs-tab-btn {
display: flex;
flex: 1 1 auto;
align-items: center;
justify-content: center;
font-size: ${theme.typography.sizes.s}px;
text-align: center;
text-transform: uppercase;
user-select: none;
.required {
margin-left: ${theme.gridUnit / 2}px;
color: ${theme.colors.error.base};
}
}

.ant-tabs-tab {
width: 0;
.ant-tabs-ink-bar {
background: ${theme.colors.secondary.base};
}
`};

.ant-tabs-tab-btn {
display: flex;
flex: 1 1 auto;
align-items: center;
justify-content: center;
font-size: ${({ theme }) => theme.typography.sizes.s}px;
text-align: center;
text-transform: uppercase;
user-select: none;

.required {
margin-left: ${({ theme }) => theme.gridUnit / 2}px;
color: ${({ theme }) => theme.colors.error.base};
}
}

.ant-tabs-ink-bar {
background: ${({ theme }) => theme.colors.secondary.base};
}
`;
`}
/>
);

const StyledTabPane = styled(AntDTabs.TabPane)``;

const Tabs = Object.assign(StyledTabs, {
TabPane: StyledTabPane,
});

Tabs.defaultProps = {
fullWidth: true,
animated: { inkBar: true, tabPane: false },
};

const StyledEditableTabs = styled(StyledTabs)`
.ant-tabs-content-holder {
background: white;
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 @@ -72,6 +72,7 @@ const DashboardContainer: FC<DashboardContainerProps> = ({ topLevelTabs }) => {
activeKey={activeKey}
renderTabBar={() => <></>}
fullWidth={false}
animated
allowOverflow
>
{childIds.map((id, index) => (
Expand Down