Skip to content

[WEB-2466] fix-Date Sorting Dropdown Not Mutating Between Ascending and Descending #5670

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
pushya22 merged 1 commit into from
Sep 23, 2024
Merged

[WEB-2466] fix-Date Sorting Dropdown Not Mutating Between Ascending and Descending #5670

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
6 changes: 3 additions & 3 deletions web/core/components/modules/dropdowns/order-by.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { ArrowDownWideNarrow, Check, ChevronDown } from "lucide-react";
import { ArrowDownWideNarrow, ArrowUpWideNarrow, Check, ChevronDown } from "lucide-react";
import { TModuleOrderByOptions } from "@plane/types";
// ui
import { CustomMenu, getButtonStyling } from "@plane/ui";
Expand All @@ -27,9 +27,9 @@ export const ModuleOrderByDropdown: React.FC<Props> = (props) => {
<CustomMenu
customButton={
<div className={cn(getButtonStyling("neutral-primary", "sm"), "px-2 text-custom-text-300")}>
<ArrowDownWideNarrow className="h-3 w-3" />
{!isDescending ? <ArrowUpWideNarrow className="size-3 " /> : <ArrowDownWideNarrow className="size-3 " />}
{orderByDetails?.label}
<ChevronDown className="h-3 w-3" strokeWidth={2} />
<ChevronDown className="size-3" strokeWidth={2} />
</div>
}
placement="bottom-end"
Expand Down
4 changes: 2 additions & 2 deletions web/core/components/pages/list/order-by.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { ArrowDownWideNarrow, Check, ChevronDown } from "lucide-react";
import { ArrowDownWideNarrow, ArrowUpWideNarrow, Check, ChevronDown } from "lucide-react";
// types
import { TPageFiltersSortBy, TPageFiltersSortKey } from "@plane/types";
// ui
Expand All @@ -26,7 +26,7 @@ export const PageOrderByDropdown: React.FC<Props> = (props) => {
<CustomMenu
customButton={
<div className={cn(getButtonStyling("neutral-primary", "sm"), "px-2 text-custom-text-300")}>
<ArrowDownWideNarrow className="h-3 w-3" />
{!isDescending ? <ArrowUpWideNarrow className="size-3 " /> : <ArrowDownWideNarrow className="size-3 " />}
{orderByDetails?.label}
<ChevronDown className="h-3 w-3" strokeWidth={2} />
</div>
Expand Down
8 changes: 5 additions & 3 deletions web/core/components/views/filters/order-by.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { ArrowDownWideNarrow, Check, ChevronDown } from "lucide-react";
import { ArrowDownWideNarrow, ArrowUpWideNarrow, Check, ChevronDown } from "lucide-react";
// types
import { TViewFiltersSortBy, TViewFiltersSortKey } from "@plane/types";
// ui
Expand Down Expand Up @@ -31,12 +31,14 @@ export const ViewOrderByDropdown: React.FC<Props> = (props) => {
: `${getButtonStyling("neutral-primary", "sm")} px-2 text-custom-text-300`;

const chevronClassName = isMobile ? "h-4 w-4 text-custom-text-200" : "h-3 w-3";

const icon = (
<>{!isDescending ? <ArrowUpWideNarrow className="size-3 " /> : <ArrowDownWideNarrow className="size-3 " />}</>
);
return (
<CustomMenu
customButton={
<span className={buttonClassName}>
{!isMobile && <ArrowDownWideNarrow className="h-3 w-3" />}
{!isMobile && icon}
<span className="flex-shrink-0"> {orderByDetails?.label}</span>
<ChevronDown className={chevronClassName} strokeWidth={2} />
</span>
Expand Down