Skip to content

[PAY-2731] Web FilterButton transparent when disabled#8213

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
dharit-tan merged 1 commit into from
Apr 24, 2024
Merged

[PAY-2731] Web FilterButton transparent when disabled #8213

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
5 changes: 3 additions & 2 deletions packages/harmony/src/components/button/FilterButton/FilterButton.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ export const FilterButton = forwardRef<HTMLButtonElement, FilterButtonProps>(
label,
options,
onSelect,
isDisabled,
disabled,
variant = 'fillContainer',
size = 'default',
iconRight = IconCaretDown,
Expand DownExpand Up@@ -90,6 +90,7 @@ export const FilterButton = forwardRef<HTMLButtonElement, FilterButtonProps>(
fontSize: typography.size.s,
fontWeight: typography.weight.demiBold,
lineHeight: typography.lineHeight.s,
opacity: disabled ? 0.6 : 1,

'&:hover': {
border: `1px solid ${color.neutral.n800}`,
Expand DownExpand Up@@ -173,7 +174,7 @@ export const FilterButton = forwardRef<HTMLButtonElement, FilterButtonProps>(
? IconCloseAlt
: iconRight
}
disabled={isDisabled}
disabled={disabled}
aria-haspopup='listbox'
aria-expanded={isOpen}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/harmony/src/components/button/FilterButton/types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ export type FilterButtonProps = {
/**
* Whether interaction is disabled
*/
isDisabled?: boolean
disabled?: boolean

/**
* Popup anchor origin
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/components/upload/TrackPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -161,7 +161,7 @@ export const TrackPreview = (props: TrackPreviewProps) => {
onSelect={(label) => onEditStemCategory(label as StemCategory)}
selection={stemCategory?.toString() ?? null}
popupZIndex={zIndex.STEMS_AND_DOWNLOADS_FILTER_BUTTON_POPUP}
isDisabled={!allowCategorySwitch}
disabled={!allowCategorySwitch}
/>
</Box>
) : null}
Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/pages/dashboard-page/components/ArtistContentSection.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ export const ArtistContentSection = () => {
options={filterButtonOptions}
popupAnchorOrigin={{ vertical: 'bottom', horizontal: 'left' }}
popupTransformOrigin={{ vertical: 'top', horizontal: 'left' }}
isDisabled={isFilterButtonDisabled}
disabled={isFilterButtonDisabled}
/>
</Flex>
<Flex>
Expand Down