Skip to content
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

Jump to bottom

fix: Disabled state button transition time #13008

Merged
merged 9 commits into from
Feb 11, 2021
Merged

fix: Disabled state button transition time #13008

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4730fda
button fix
AAfghahi Feb 4, 2021
983eae0
tooltips disabled when it is disabled, border width changed
AAfghahi Feb 5, 2021
c4b00f2
added isDisabled to tooltip
AAfghahi Feb 5, 2021
f9a0b88
worked on transition times
AAfghahi Feb 8, 2021
42318dd
cleaned up transition to be local instead of global
AAfghahi Feb 8, 2021
bb98395
made it local
AAfghahi Feb 8, 2021
40f15cd
linted
AAfghahi Feb 8, 2021
6aa99c3
trying to resolve a conflict
AAfghahi Feb 10, 2021
1321cbb
Merge branch 'master' into disabled-state-button
AAfghahi Feb 10, 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
17 changes: 12 additions & 5 deletions superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,25 +91,32 @@ const RunQueryActionButton = ({
? (DropdownButton as React.FC)
: Button;

const isDisabled = !sql.trim();
Copy link
Member

Choose a reason for hiding this comment

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

Nice, this is way more readable now, and the intent is clear!

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you! Though this was actually Elizabeth's suggestion. So can't take all the credit.


return (
<StyledButton>
<ButtonComponent
onClick={() =>
onClick(shouldShowStopBtn, allowAsync, runQuery, stopQuery)
}
disabled={!sql.trim()}
disabled={isDisabled}
tooltip={
shouldShowStopBtn
? t('Stop running (Ctrl + x)')
: t('Run query (Ctrl + Return)')
(!isDisabled &&
(shouldShowStopBtn
? t('Stop running (Ctrl + x)')
: t('Run query (Ctrl + Return)'))) as string
}
cta
{...(overlayCreateAsMenu
? {
overlay: overlayCreateAsMenu,
icon: (
<Icon
color={supersetTheme.colors.grayscale.light5}
color={
isDisabled
? supersetTheme.colors.grayscale.base
: supersetTheme.colors.grayscale.light5
}
name="caret-down"
/>
),
Expand Down
11 changes: 10 additions & 1 deletion superset-frontend/src/common/components/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,19 @@ const StyledDropdownButton = styled.div`
line-height: 13px;
outline: none;
text-transform: uppercase;
transition: background-color 500ms;
&:first-of-type {
border-radius: ${({ theme }) =>
`${theme.gridUnit}px 0 0 ${theme.gridUnit}px`};
margin: 0;
width: 120px;
}
&:last-of-type {
:disabled {
background-color: ${({ theme }) => theme.colors.grayscale.light2};
color: ${({ theme }) => theme.colors.grayscale.base};
}
&:nth-child(2) {
transition: background-color 0ms;
margin: 0;
border-radius: ${({ theme }) =>
`0 ${theme.gridUnit}px ${theme.gridUnit}px 0`};
Expand All @@ -98,6 +104,9 @@ const StyledDropdownButton = styled.div`
top: ${({ theme }) => theme.gridUnit * 0.75}px;
width: ${({ theme }) => theme.gridUnit * 0.25}px;
}
:disabled:before {
border-left: 1px solid ${({ theme }) => theme.colors.grayscale.base};
}
}
}
}
Expand Down