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

Various UI enhancements/fixes #8307

Merged
merged 6 commits into from
Dec 5, 2024
Merged

Various UI enhancements/fixes #8307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67fa53d
Add search button
egbertbouman Dec 2, 2024
2434752
Hide suggestions list when empty
egbertbouman Dec 2, 2024
7e0a68f
Show spinner while shutting down
egbertbouman Dec 2, 2024
bd755c4
Navigate directly to a submenu
egbertbouman Dec 3, 2024
f750401
Allow selecting all items in a table using a shortcut
egbertbouman Dec 3, 2024
0c0d55c
Use infohash as rowId
egbertbouman Dec 4, 2024
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
16 changes: 16 additions & 0 deletions src/tribler/ui/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/tribler/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"react-router-dom": "^6.16.0",
"tailwind-merge": "^1.14.0",
"tailwindcss-animate": "^1.0.7",
"use-keyboard-shortcut": "^1.1.6",
"zod": "^3.22.4"
},
"devDependencies": {
Expand Down
5 changes: 3 additions & 2 deletions src/tribler/ui/src/components/layouts/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { useEffect, useRef, useState } from "react";
import toast, { Toaster } from 'react-hot-toast';
import Cookies from "js-cookie";
import { DialogDescription } from "@radix-ui/react-dialog";
import { Ban } from "lucide-react";
import { Ban, Loader } from "lucide-react";
import { useTranslation } from "react-i18next";
import { ScrollArea } from "../ui/scroll-area";

Expand Down Expand Up @@ -84,7 +84,8 @@ export function Header() {
}}
>
<DialogHeader>
<DialogTitle className="flex items-center justify-center mb-3"><Ban className="inline mr-3" />
<DialogTitle className="flex items-center justify-center mb-3">
{online ? <Loader className="inline mr-3 animate-[spin_3s_linear_infinite]" /> : <Ban className="inline mr-3" />}
{online
? "Tribler is shutting down"
: (shutdownLogs.length > 0
Expand Down
31 changes: 23 additions & 8 deletions src/tribler/ui/src/components/layouts/SideLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from "react";
import { NavLink, Outlet, useLocation } from "react-router-dom";
import { NavLink, Outlet, useLocation, useNavigate } from "react-router-dom";
import { Header } from "./Header";
import { Accordion } from "@radix-ui/react-accordion";
import { sideMenu } from "@/config/menu";
Expand All @@ -15,6 +15,8 @@ import { useTranslation } from "react-i18next";
export function SideLayout() {
const { t } = useTranslation();
const location = useLocation();
const navigate = useNavigate();
const [history, setHistory] = useState(new Map());
const [accordionValue, setAccordionValue] = useState(() => {
return "item-" + sideMenu.findIndex(item => item.items !== undefined ? item.items.filter(subitem => subitem.to !== undefined).map(subitem => subitem.to).includes(location.pathname) : false)
});
Expand Down Expand Up @@ -44,12 +46,19 @@ export function SideLayout() {
{sideMenu.filter((item) => !item.hide || item.hide() !== true).map((item, index) => (
item.items !== undefined ? (
<AccordionItem key={index} value={`item-${index}`} className="border-b-0">
<AccordionTrigger className={cn(
buttonVariants({ variant: "ghost" }),
(item.items.filter(subitem => subitem.to !== undefined).map(subitem => subitem.to))
.includes(location.pathname) ? 'bg-accent' : 'hover:bg-accent',
"justify-between hover:no-underline"
)}>
<AccordionTrigger
className={cn(
buttonVariants({ variant: "ghost" }),
(item.items.filter(subitem => subitem.to !== undefined).map(subitem => subitem.to))
.includes(location.pathname) ? 'bg-accent' : 'hover:bg-accent',
"justify-between hover:no-underline"
)}
onClick={() => {
const target = history.get(item.title) || item.items?.at(0)?.to;
if (target) {
navigate(target);
}
}}>
<div className="flex items-center">{item.icon && <item.icon className="mr-2" />} {t(item.title)}</div>
</AccordionTrigger>
<AccordionContent className="pb-2 pl-6">
Expand All @@ -59,7 +68,13 @@ export function SideLayout() {
<NavLink
key={subindex}
to={submenu.to}
onClick={() => setShowNav(false)}
onClick={() => {
setShowNav(false);
if (item.title && submenu.to) {
// Keep track of which submenus we navigated to
setHistory(map => new Map(map.set(item.title, submenu.to)));
}
}}
className={({ isActive }) => cn(
buttonVariants({ variant: "ghost" }),
isActive ? "bg-accent" : "hover:bg-accent",
Expand Down
24 changes: 19 additions & 5 deletions src/tribler/ui/src/components/ui/autocomplete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { useRef, useState } from "react";
import { Button } from "./button";
import { SearchIcon } from "lucide-react";


export function Autocomplete({ placeholder, completions, onChange }: { placeholder: string, completions: (filter: string) => Promise<string[]>, onChange: (query: string) => void }) {
Expand Down Expand Up @@ -61,10 +63,23 @@ export function Autocomplete({ placeholder, completions, onChange }: { placehold
value={inputValue}
ref={inputRef}
/>
<Button
variant="ghost"
className="h-6 py-0 px-0
hover:outline hover:outline-neutral-500 outline-1 outline-offset-1
active:outline active:outline-neutral-900 dark:active:outline-neutral-200"
onClick={() => {
const query = (selectedSuggestion > 0) ? suggestions[selectedSuggestion - 1] : inputValue;
handleSuggestionClick(query);
inputRef.current?.blur();
}}
>
<SearchIcon className="h-5" />
</Button>
</div>
</div>
<div className="relative mt-2">
{focus && (
{focus && suggestions.length > 0 &&(
<div className="relative mt-2">
<div className="max-h-[300px] overflow-y-auto overflow-x-hidden absolute top-0 z-10 w-full rounded-md border bg-popover text-popover-foreground shadow-md outline-none animate-in">
{suggestions.length > 0 && (suggestions.map((suggestion, index) => (
<div className={`p-1 text-foreground h-full overflow-auto ${(selectedSuggestion === index + 1) ? 'bg-accent' : ''}`} key={index + 'a'}>
Expand All @@ -77,10 +92,9 @@ export function Autocomplete({ placeholder, completions, onChange }: { placehold
</div>
)))}
</div>
)}
</div>
</div>
)}
</div>
</div>

);
}
20 changes: 19 additions & 1 deletion src/tribler/ui/src/components/ui/simple-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import * as SelectPrimitive from "@radix-ui/react-select"
import type { Table as ReactTable } from '@tanstack/react-table';
import { useTranslation } from 'react-i18next';
import { useResizeObserver } from '@/hooks/useResizeObserver';
import useKeyboardShortcut from 'use-keyboard-shortcut';


export function getHeader<T>(name: string, translate: boolean = true, addSorting: boolean = true): ColumnDefTemplate<HeaderContext<T, unknown>> | undefined {
Expand Down Expand Up @@ -68,6 +69,7 @@ interface ReactTableProps<T extends object> {
maxHeight?: string | number;
expandable?: boolean;
storeSortingState?: string;
rowId?: (originalRow: T, index: number, parent?: Row<T>) => string,
}

function SimpleTable<T extends object>({
Expand All @@ -86,7 +88,8 @@ function SimpleTable<T extends object>({
filters,
maxHeight,
expandable,
storeSortingState
storeSortingState,
rowId
}: ReactTableProps<T>) {
const [pagination, setPagination] = useState<PaginationState>({
pageIndex: pageIndex ?? 0,
Expand All @@ -97,6 +100,20 @@ function SimpleTable<T extends object>({
const [expanded, setExpanded] = useState<ExpandedState>({});
const [sorting, setSorting] = useState<SortingState>(getStoredSortingState(storeSortingState) || []);

useKeyboardShortcut(
["Control", "A"],
keys => {
if (allowMultiSelect) {
table.toggleAllRowsSelected(true);
}
},
{
overrideSystem: true,
ignoreInputFields: true,
repeatOnHold: false
}
);

const table = useReactTable({
data,
columns,
Expand All @@ -122,6 +139,7 @@ function SimpleTable<T extends object>({
onExpandedChange: setExpanded,
onSortingChange: setSorting,
getSubRows: (row: any) => row?.subRows,
getRowId: rowId,
});

const { t } = useTranslation();
Expand Down
2 changes: 1 addition & 1 deletion src/tribler/ui/src/config/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ interface NavItem {
}

interface NavItemWithChildren extends NavItem {
items?: NavItemWithChildren[]
items?: NavItem[]
}

export const sideMenu: NavItemWithChildren[] = [
Expand Down
1 change: 1 addition & 0 deletions src/tribler/ui/src/pages/Downloads/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ export default function Downloads({ statusFilter }: { statusFilter: number[] })
onSelectedRowsChange={setSelectedDownloads}
maxHeight={Math.max((parentRect?.height ?? 50) - 50, 50)}
storeSortingState="download-sorting"
rowId={(row) => row.infohash}
/>
</Card>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/tribler/ui/src/pages/Popular/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export default function Popular() {
data={torrents}
columns={torrentColumns}
storeSortingState="popular-sorting"
rowId={(row) => row.infohash}
/>
</>
)
Expand Down
1 change: 1 addition & 0 deletions src/tribler/ui/src/pages/Search/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ export default function Search() {
data={torrents}
columns={torrentColumns}
storeSortingState="search-sorting"
rowId={(row) => row.infohash}
/>
</>
)
Expand Down
Loading