Fix header dropdown button style (#9599)
This commit is contained in:
@ -6,7 +6,9 @@ import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
|
|||||||
export const MultipleFiltersButton = () => {
|
export const MultipleFiltersButton = () => {
|
||||||
const { resetFilterDropdown } = useResetFilterDropdown();
|
const { resetFilterDropdown } = useResetFilterDropdown();
|
||||||
|
|
||||||
const { toggleDropdown } = useDropdown(OBJECT_FILTER_DROPDOWN_ID);
|
const { toggleDropdown, isDropdownOpen } = useDropdown(
|
||||||
|
OBJECT_FILTER_DROPDOWN_ID,
|
||||||
|
);
|
||||||
|
|
||||||
const handleClick = () => {
|
const handleClick = () => {
|
||||||
toggleDropdown();
|
toggleDropdown();
|
||||||
@ -14,7 +16,10 @@ export const MultipleFiltersButton = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledHeaderDropdownButton onClick={handleClick}>
|
<StyledHeaderDropdownButton
|
||||||
|
onClick={handleClick}
|
||||||
|
isUnfolded={isDropdownOpen}
|
||||||
|
>
|
||||||
Filter
|
Filter
|
||||||
</StyledHeaderDropdownButton>
|
</StyledHeaderDropdownButton>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import { ObjectOptionsContentId } from '@/object-record/object-options-dropdown/
|
|||||||
import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
|
import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
|
||||||
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
|
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
|
||||||
import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
|
import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
|
||||||
|
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
|
||||||
import { ViewType } from '@/views/types/ViewType';
|
import { ViewType } from '@/views/types/ViewType';
|
||||||
|
|
||||||
type ObjectOptionsDropdownProps = {
|
type ObjectOptionsDropdownProps = {
|
||||||
@ -25,6 +26,8 @@ export const ObjectOptionsDropdown = ({
|
|||||||
const { currentContentId, handleContentChange, handleResetContent } =
|
const { currentContentId, handleContentChange, handleResetContent } =
|
||||||
useCurrentContentId<ObjectOptionsContentId>();
|
useCurrentContentId<ObjectOptionsContentId>();
|
||||||
|
|
||||||
|
const { isDropdownOpen } = useDropdown(OBJECT_OPTIONS_DROPDOWN_ID);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dropdown
|
<Dropdown
|
||||||
dropdownId={OBJECT_OPTIONS_DROPDOWN_ID}
|
dropdownId={OBJECT_OPTIONS_DROPDOWN_ID}
|
||||||
@ -32,7 +35,9 @@ export const ObjectOptionsDropdown = ({
|
|||||||
dropdownMenuWidth={DROPDOWN_WIDTH}
|
dropdownMenuWidth={DROPDOWN_WIDTH}
|
||||||
dropdownOffset={{ y: DROPDOWN_OFFSET_Y }}
|
dropdownOffset={{ y: DROPDOWN_OFFSET_Y }}
|
||||||
clickableComponent={
|
clickableComponent={
|
||||||
<StyledHeaderDropdownButton>Options</StyledHeaderDropdownButton>
|
<StyledHeaderDropdownButton isUnfolded={isDropdownOpen}>
|
||||||
|
Options
|
||||||
|
</StyledHeaderDropdownButton>
|
||||||
}
|
}
|
||||||
onClose={handleResetContent}
|
onClose={handleResetContent}
|
||||||
dropdownComponents={
|
dropdownComponents={
|
||||||
|
|||||||
@ -19,6 +19,7 @@ import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenu
|
|||||||
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
|
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
|
||||||
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
|
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
|
||||||
import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
|
import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
|
||||||
|
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
|
||||||
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
|
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
|
||||||
import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
|
import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
|
||||||
import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
|
import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
|
||||||
@ -169,13 +170,18 @@ export const ObjectSortDropdownButton = ({
|
|||||||
setIsSortDirectionMenuUnfolded(false);
|
setIsSortDirectionMenuUnfolded(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const { isDropdownOpen } = useDropdown(OBJECT_SORT_DROPDOWN_ID);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dropdown
|
<Dropdown
|
||||||
dropdownId={OBJECT_SORT_DROPDOWN_ID}
|
dropdownId={OBJECT_SORT_DROPDOWN_ID}
|
||||||
dropdownHotkeyScope={hotkeyScope}
|
dropdownHotkeyScope={hotkeyScope}
|
||||||
dropdownOffset={{ y: 8 }}
|
dropdownOffset={{ y: 8 }}
|
||||||
clickableComponent={
|
clickableComponent={
|
||||||
<StyledHeaderDropdownButton onClick={handleButtonClick}>
|
<StyledHeaderDropdownButton
|
||||||
|
onClick={handleButtonClick}
|
||||||
|
isUnfolded={isDropdownOpen}
|
||||||
|
>
|
||||||
Sort
|
Sort
|
||||||
</StyledHeaderDropdownButton>
|
</StyledHeaderDropdownButton>
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,7 +10,7 @@ import { useContext, useState } from 'react';
|
|||||||
import { useRecoilValue } from 'recoil';
|
import { useRecoilValue } from 'recoil';
|
||||||
import { IconChevronDown } from 'twenty-ui';
|
import { IconChevronDown } from 'twenty-ui';
|
||||||
|
|
||||||
const StyledCell = styled.div`
|
const StyledCell = styled.div<{ isUnfolded: boolean }>`
|
||||||
align-items: center;
|
align-items: center;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
@ -23,6 +23,16 @@ const StyledCell = styled.div`
|
|||||||
min-width: ${({ theme }) => theme.spacing(7)};
|
min-width: ${({ theme }) => theme.spacing(7)};
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
|
background: ${({ theme, isUnfolded }) =>
|
||||||
|
isUnfolded ? theme.background.transparent.light : theme.background.primary};
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: ${({ theme, isUnfolded }) =>
|
||||||
|
isUnfolded
|
||||||
|
? theme.background.transparent.medium
|
||||||
|
: theme.background.transparent.light};
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const StyledIcon = styled(IconChevronDown)`
|
const StyledIcon = styled(IconChevronDown)`
|
||||||
@ -66,7 +76,7 @@ export const RecordTableColumnAggregateFooterValueCell = ({
|
|||||||
}}
|
}}
|
||||||
onMouseLeave={() => setIsHovered(false)}
|
onMouseLeave={() => setIsHovered(false)}
|
||||||
>
|
>
|
||||||
<StyledCell>
|
<StyledCell isUnfolded={isDropdownOpen}>
|
||||||
{isHovered ||
|
{isHovered ||
|
||||||
isDropdownOpen ||
|
isDropdownOpen ||
|
||||||
hasAggregateOperationForViewField ||
|
hasAggregateOperationForViewField ||
|
||||||
|
|||||||
@ -30,26 +30,6 @@ const StyledDropdownFallbackAnchor = styled.div`
|
|||||||
top: 0;
|
top: 0;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
type StyledHeaderDivProps = {
|
|
||||||
isUnfolded?: boolean;
|
|
||||||
isActive?: boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
const StyledHeaderDiv = styled.div<StyledHeaderDivProps>`
|
|
||||||
& button,
|
|
||||||
& > * {
|
|
||||||
background: ${({ theme, isUnfolded }) =>
|
|
||||||
isUnfolded ? theme.background.transparent.light : 'none'};
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background: ${({ theme, isUnfolded }) =>
|
|
||||||
isUnfolded
|
|
||||||
? theme.background.transparent.medium
|
|
||||||
: theme.background.transparent.light};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
type DropdownProps = {
|
type DropdownProps = {
|
||||||
className?: string;
|
className?: string;
|
||||||
clickableComponent?: ReactNode;
|
clickableComponent?: ReactNode;
|
||||||
@ -151,17 +131,16 @@ export const Dropdown = ({
|
|||||||
<DropdownScope dropdownScopeId={getScopeIdFromComponentId(dropdownId)}>
|
<DropdownScope dropdownScopeId={getScopeIdFromComponentId(dropdownId)}>
|
||||||
<>
|
<>
|
||||||
{isDefined(clickableComponent) ? (
|
{isDefined(clickableComponent) ? (
|
||||||
<StyledHeaderDiv
|
<div
|
||||||
ref={refs.setReference}
|
ref={refs.setReference}
|
||||||
onClick={handleClickableComponentClick}
|
onClick={handleClickableComponentClick}
|
||||||
aria-controls={`${dropdownId}-options`}
|
aria-controls={`${dropdownId}-options`}
|
||||||
aria-expanded={isDropdownOpen}
|
aria-expanded={isDropdownOpen}
|
||||||
aria-haspopup={true}
|
aria-haspopup={true}
|
||||||
role="button"
|
role="button"
|
||||||
isUnfolded={isDropdownOpen}
|
|
||||||
>
|
>
|
||||||
{clickableComponent}
|
{clickableComponent}
|
||||||
</StyledHeaderDiv>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<StyledDropdownFallbackAnchor ref={refs.setReference} />
|
<StyledDropdownFallbackAnchor ref={refs.setReference} />
|
||||||
)}
|
)}
|
||||||
|
|||||||
@ -20,4 +20,14 @@ export const StyledHeaderDropdownButton = styled.button<StyledDropdownButtonProp
|
|||||||
|
|
||||||
padding-right: ${({ theme }) => theme.spacing(2)};
|
padding-right: ${({ theme }) => theme.spacing(2)};
|
||||||
user-select: none;
|
user-select: none;
|
||||||
|
|
||||||
|
background: ${({ theme, isUnfolded }) =>
|
||||||
|
isUnfolded ? theme.background.transparent.light : theme.background.primary};
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: ${({ theme, isUnfolded }) =>
|
||||||
|
isUnfolded
|
||||||
|
? theme.background.transparent.medium
|
||||||
|
: theme.background.transparent.light};
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|||||||
Reference in New Issue
Block a user