This is an automated email from the ASF dual-hosted git repository. lyndsi pushed a commit to branch lyndsi/sql-lab-new-explore-button-functionality-and-move-save-dataset-to-split-save-button in repository https://gitbox.apache.org/repos/asf/superset.git
commit 66106de9b095e6da92a22c205a5fbe2f6d7395df Author: lyndsiWilliams <[email protected]> AuthorDate: Tue Jul 5 15:39:49 2022 -0500 Move styles back into styled component --- .../components/SaveDatasetActionButton/index.tsx | 49 +++++++++++----------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx index 307f872895..8a6e7a41ec 100644 --- a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx +++ b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx @@ -17,7 +17,7 @@ * under the License. */ import React from 'react'; -import { t, useTheme } from '@superset-ui/core'; +import { t, useTheme, styled } from '@superset-ui/core'; import Icons from 'src/components/Icons'; import { DropdownButton } from 'src/components/DropdownButton'; import Button from 'src/components/Button'; @@ -34,27 +34,27 @@ export default function SaveDatasetActionButton({ }: Props) { const theme = useTheme(); - const FCdropdownButton = DropdownButton as React.FC<DropdownButtonProps>; - - const buttonStyles = { - '&.ant-dropdown-button button.ant-btn.ant-btn-default': { - '&:first-of-type': { - width: `${theme.gridUnit * 16}px`, - }, - fontWeight: 600, - backgroundColor: theme.colors.primary.light4, - color: theme.colors.primary.dark1, - '&:nth-child(2)': { - '&:before, &:hover:before': { - borderLeft: `1px solid ${theme.colors.primary.dark2}`, - }, - }, - }, - 'span[name="caret-down"]': { - marginLeft: `${theme.gridUnit * 1}px`, - color: `${theme.colors.primary.dark2}`, - }, - }; + const StyledDropdownButton = styled( + DropdownButton as React.FC<DropdownButtonProps>, + )` + &.ant-dropdown-button button.ant-btn.ant-btn-default { + &:first-of-type { + width: ${theme.gridUnit * 16}px; + } + background-color: ${theme.colors.primary.light4}; + color: ${theme.colors.primary.dark1}; + &:nth-child(2) { + &:before, + &:hover:before { + border-left: 1px solid ${theme.colors.primary.dark2}; + } + } + } + span[name='caret-down'] { + margin-left: ${theme.gridUnit * 1}px; + color: ${theme.colors.primary.dark2}; + } + `; return !overlayMenu ? ( <Button @@ -65,7 +65,7 @@ export default function SaveDatasetActionButton({ {t('Save')} </Button> ) : ( - <FCdropdownButton + <StyledDropdownButton onClick={toggleSave} overlay={overlayMenu} icon={ @@ -75,9 +75,8 @@ export default function SaveDatasetActionButton({ /> } trigger={['click']} - css={buttonStyles} > {t('Save')} - </FCdropdownButton> + </StyledDropdownButton> ); }
