⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
improved tabs
daniel31x134b958faf7e7b
diff --git a/apps/web/components/ModalContent/LinkModal.tsx b/apps/web/components/ModalContent/LinkModal.tsxindex 037a32f2..49c52d47 100644--- a/apps/web/components/ModalContent/LinkModal.tsx+++ b/apps/web/components/ModalContent/LinkModal.tsx@@ -8,7 +8,6 @@ import Link from "next/link";import usePermissions from "@/hooks/usePermissions";import { useRouter } from "next/router";import toast from "react-hot-toast";-import Tab from "../Tab";import {DropdownMenu,DropdownMenuTrigger,@@ -17,6 +16,7 @@ import {DropdownMenuSeparator,} from "@/components/ui/dropdown-menu";import { Button } from "../ui/button";+import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";type Props = {onClose: Function;@@ -79,21 +79,22 @@ export default function LinkModal({></Button>{(permissions === true || permissions?.canUpdate) && !isPublicRoute && (- <Tab- tabs={[- { name: "View" },- {- name: "Edit",- },- ].map((tab) => ({- name: tab.name,- }))}- activeTabIndex={mode === "view" ? 0 : 1}- setActiveTabIndex={(index: any) =>- setMode(index === 0 ? "view" : "edit")+ <Tabs+ value={(mode === "view" ? "view" : "edit").toString()}+ className="w-fit absolute left-1/2 -translate-x-1/2 rounded-full bg-base-100/50 text-sm shadow-md z-10 opacity-90"+ onValueChange={(index: any) =>+ setMode(index === "view" ? "view" : "edit")}- className="w-fit absolute left-1/2 -translate-x-1/2 rounded-full bg-base-100/50 text-sm shadow-md z-10"- />+ >+ <TabsList className="rounded-full h-8">+ <TabsTrigger value="view" className="rounded-full py-0">+ View+ </TabsTrigger>+ <TabsTrigger value="edit" className="rounded-full py-0">+ Edit+ </TabsTrigger>+ </TabsList>+ </Tabs>)}<div className="flex gap-2">diff --git a/apps/web/components/Preservation/PreservationContent.tsx b/apps/web/components/Preservation/PreservationContent.tsxindex 023a5e26..d132de5e 100644--- a/apps/web/components/Preservation/PreservationContent.tsx+++ b/apps/web/components/Preservation/PreservationContent.tsx@@ -3,7 +3,6 @@ import clsx from "clsx";import { useRouter } from "next/router";import { useTranslation } from "next-i18next";import { BeatLoader } from "react-spinners";-import Tab from "../Tab";import ReadableView from "@/components/Preservation/ReadableView";import { PreservationSkeleton } from "../Skeletons";import {@@ -14,6 +13,13 @@ import {atLeastOneFormatAvailable,formatAvailable,} from "@linkwarden/lib/formatStats";+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@/components/ui/tooltip";+import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";type Props = {link?: LinkIncludingShortenedCollectionAndTags;@@ -221,16 +227,44 @@ export const PreservationContent: React.FC<Props> = ({ link, format }) => {return (<div className="relative bg-base-200">{link.url && potentialTabs.length > 1 && (- <Tab- tabs={potentialTabs.map((tab) => ({- icon: tab.icon,- name: tab.name,- }))}- activeTabIndex={validActiveTabIndex}- setActiveTabIndex={handleTabChange}- className="w-fit absolute left-1/2 -translate-x-1/2 rounded-full bg-base-100 top-2 text-sm shadow-md"- hideName- />+ <Tabs+ value={activeTabIndex.toString()}+ onValueChange={(val) => handleTabChange(Number(val))}+ className={+ "w-fit absolute left-1/2 -translate-x-1/2 bg-base-100 top-2 text-sm shadow-md rounded-full"+ }+ >+ <TabsList className="flex flex-row gap-1 rounded-full h-9">+ {potentialTabs+ .map((tab) => ({+ icon: tab.icon,+ name: tab.name,+ }))+ .map((tab, idx) => (+ <TooltipProvider key={idx}>+ <Tooltip>+ <TooltipTrigger asChild>+ <TabsTrigger+ value={String(idx)}+ className={clsx(+ "flex gap-1 items-center rounded-full px-1 py-0"+ )}+ data-state={+ idx === activeTabIndex ? "active" : "inactive"+ }+ >+ {tab.icon && <i className={`text-lg ${tab.icon}`} />}+ </TabsTrigger>+ </TooltipTrigger>++ {tab.name && (+ <TooltipContent side="bottom">{tab.name}</TooltipContent>+ )}+ </Tooltip>+ </TooltipProvider>+ ))}+ </TabsList>+ </Tabs>)}{!atLeastOneFormatAvailable(link) ? (<div className={`w-full h-full flex flex-col justify-center p-10`}>diff --git a/apps/web/components/Tab.tsx b/apps/web/components/Tab.tsxdeleted file mode 100644index 7fd8ca0b..00000000--- a/apps/web/components/Tab.tsx+++ /dev/null@@ -1,75 +0,0 @@-import clsx from "clsx";-import { useLayoutEffect, useEffect, useRef, useState } from "react";--type Props = {- tabs: { name?: string; icon?: string }[];- activeTabIndex: number;- setActiveTabIndex: (i: number) => void;- className?: string;- hideName?: boolean;-};--const Tab = ({- tabs,- activeTabIndex,- setActiveTabIndex,- className,- hideName,-}: Props) => {- const tabsRef = useRef<Array<HTMLElement | null>>([]);- const [underline, setUnderline] = useState({ left: 0, width: 0 });- const [transitionsOn, setTransitionsOn] = useState(false);-- // 1) Synchronously measure before paint whenever activeTabIndex changes- useLayoutEffect(() => {- const el = tabsRef.current[activeTabIndex];- if (el) {- setUnderline({- left: el.offsetLeft,- width: el.clientWidth,- });- }- }, [activeTabIndex]);-- // 2) After the very first paint, turn transitions on (and never off again)- useEffect(() => {- setTransitionsOn(true);- }, []);-- return (- <div className={clsx("flex flex-row backdrop-blur-sm h-8 px-1", className)}>- <span- className={clsx(- "absolute bottom-0 top-0 -z-10 flex overflow-hidden rounded-3xl py-1",- transitionsOn && "duration-100 ease-out"- )}- style={{ left: underline.left, width: underline.width }}- >- <span className="h-full w-full rounded-3xl bg-primary/50" />- </span>-- {tabs.map((tab, idx) => {- const isActive = idx === activeTabIndex;- return (- <button- key={idx}- ref={(el) => {- tabsRef.current[idx] = el;- }}- className={clsx(- "my-auto cursor-pointer select-none rounded-full px-2 flex gap-1 items-center",- !isActive && "hover:opacity-75 duration-100"- )}- onClick={() => setActiveTabIndex(idx)}- title={tab.name}- >- {tab.icon && <i className={`text-lg ${tab.icon}`} />}- {!hideName && tab.name && <span>{tab.name}</span>}- </button>- );- })}- </div>- );-};--export default Tab;diff --git a/apps/web/components/ui/tabs.tsx b/apps/web/components/ui/tabs.tsxnew file mode 100644index 00000000..580ec771--- /dev/null+++ b/apps/web/components/ui/tabs.tsx@@ -0,0 +1,53 @@+import * as React from "react";+import * as TabsPrimitive from "@radix-ui/react-tabs";++import { cn } from "@/lib/utils";++const Tabs = TabsPrimitive.Root;++const TabsList = React.forwardRef<+ React.ElementRef<typeof TabsPrimitive.List>,+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>+>(({ className, ...props }, ref) => (+ <TabsPrimitive.List+ ref={ref}+ className={cn(+ "inline-flex h-10 items-center border border-border justify-center rounded-md bg-muted p-1 text-muted-foreground",+ className+ )}+ {...props}+ />+));+TabsList.displayName = TabsPrimitive.List.displayName;++const TabsTrigger = React.forwardRef<+ React.ElementRef<typeof TabsPrimitive.Trigger>,+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>+>(({ className, ...props }, ref) => (+ <TabsPrimitive.Trigger+ ref={ref}+ className={cn(+ "inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-primary/50 data-[state=active]:text-foreground data-[state=active]:shadow-sm",+ className+ )}+ {...props}+ />+));+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName;++const TabsContent = React.forwardRef<+ React.ElementRef<typeof TabsPrimitive.Content>,+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>+>(({ className, ...props }, ref) => (+ <TabsPrimitive.Content+ ref={ref}+ className={cn(+ "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",+ className+ )}+ {...props}+ />+));+TabsContent.displayName = TabsPrimitive.Content.displayName;++export { Tabs, TabsList, TabsTrigger, TabsContent };diff --git a/apps/web/components/ui/tooltip.tsx b/apps/web/components/ui/tooltip.tsxindex 5b98034c..57b5eaf1 100644--- a/apps/web/components/ui/tooltip.tsx+++ b/apps/web/components/ui/tooltip.tsx@@ -24,7 +24,7 @@ const TooltipContent = React.forwardRef<ref={ref}sideOffset={sideOffset}className={cn(- "z-50 overflow-hidden pointer-events-none rounded-md border border-border bg-popover px-3 py-1.5 text-sm text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-tooltip-content-transform-origin]",+ "z-50 overflow-hidden pointer-events-none rounded-md bg-white dark:bg-black text-xs px-3 py-1.5 text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-tooltip-content-transform-origin]",className)}{...props}diff --git a/apps/web/package.json b/apps/web/package.jsonindex 26396fa2..49330c7a 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -28,6 +28,7 @@"@phosphor-icons/react": "^2.1.7","@radix-ui/react-dropdown-menu": "^2.1.15","@radix-ui/react-slot": "^1.2.3",+ "@radix-ui/react-tabs": "^1.1.12","@radix-ui/react-tooltip": "^1.2.7","@stripe/stripe-js": "^1.54.1","@tanstack/react-query": "^5.51.15",diff --git a/yarn.lock b/yarn.lockindex 3ad47613..b72908ee 100644--- a/yarn.lock+++ b/yarn.lock@@ -3564,6 +3564,20 @@dependencies:"@radix-ui/react-compose-refs" "1.1.2"+"@radix-ui/react-tabs@^1.1.12":+ version "1.1.12"+ resolved "https://registry.yarnpkg.com/@radix-ui/react-tabs/-/react-tabs-1.1.12.tgz#99b3522c73db9263f429a6d0f5a9acb88df3b129"+ integrity sha512-GTVAlRVrQrSw3cEARM0nAx73ixrWDPNZAruETn3oHCNP6SbZ/hNxdxp+u7VkIEv3/sFoLq1PfcHrl7Pnp0CDpw==+ dependencies:+ "@radix-ui/primitive" "1.1.2"+ "@radix-ui/react-context" "1.1.2"+ "@radix-ui/react-direction" "1.1.1"+ "@radix-ui/react-id" "1.1.1"+ "@radix-ui/react-presence" "1.1.4"+ "@radix-ui/react-primitive" "2.1.3"+ "@radix-ui/react-roving-focus" "1.1.10"+ "@radix-ui/react-use-controllable-state" "1.2.2"+"@radix-ui/react-tooltip@^1.2.7":version "1.2.7"resolved "https://registry.yarnpkg.com/@radix-ui/react-tooltip/-/react-tooltip-1.2.7.tgz#23612ac7a5e8e1f6829e46d0e0ad94afe3976c72"