The open-source CapCut alternative
refactor: make stickers use panel base view
Maze Wintherc5480d307cd6
diff --git a/apps/web/src/components/editor/media-panel/views/stickers.tsx b/apps/web/src/components/editor/media-panel/views/stickers.tsxindex c30acee0..b6c64bd0 100644--- a/apps/web/src/components/editor/media-panel/views/stickers.tsx+++ b/apps/web/src/components/editor/media-panel/views/stickers.tsx@@ -20,8 +20,7 @@ import {import { toast } from "sonner";import { Button } from "@/components/ui/button";import { ScrollArea } from "@/components/ui/scroll-area";-import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";-import { Separator } from "@/components/ui/separator";+import { PanelBaseView as BaseView } from "@/components/editor/panel-base-view";import {Tooltip,TooltipContent,@@ -48,63 +47,41 @@ export function StickersView() {const { selectedCategory, setSelectedCategory } = useStickersStore();return (- <div className="h-full flex flex-col">- <Tabs- value={selectedCategory}- onValueChange={(v) => {- if (["all", "general", "brands", "emoji"].includes(v)) {- setSelectedCategory(v as StickerCategory);- }- }}- className="flex flex-col h-full"- >- <div className="px-3 pt-4 pb-0">- <TabsList>- <TabsTrigger value="all" className="gap-1">- <Grid3X3 className="h-3 w-3" />- All- </TabsTrigger>- <TabsTrigger value="general" className="gap-1">- <Sparkles className="h-3 w-3" />- Icons- </TabsTrigger>- <TabsTrigger value="brands" className="gap-1">- <Hash className="h-3 w-3" />- Brands- </TabsTrigger>- <TabsTrigger value="emoji" className="gap-1">- <Smile className="h-3 w-3" />- Emoji- </TabsTrigger>- </TabsList>- </div>- <Separator className="my-4" />- <TabsContent- value="all"- className="px-3 pt-0 mt-0 flex-1 flex flex-col min-h-0"- >- <StickersContentView category="all" />- </TabsContent>- <TabsContent- value="general"- className="px-3 pt-0 mt-0 flex-1 flex flex-col min-h-0"- >- <StickersContentView category="general" />- </TabsContent>- <TabsContent- value="brands"- className="px-3 pt-0 mt-0 flex-1 flex flex-col min-h-0"- >- <StickersContentView category="brands" />- </TabsContent>- <TabsContent- value="emoji"- className="px-3 pt-0 mt-0 flex-1 flex flex-col min-h-0"- >- <StickersContentView category="emoji" />- </TabsContent>- </Tabs>- </div>+ <BaseView+ value={selectedCategory}+ onValueChange={(v) => {+ if (["all", "general", "brands", "emoji"].includes(v)) {+ setSelectedCategory(v as StickerCategory);+ }+ }}+ tabs={[+ {+ value: "all",+ label: "All",+ icon: <Grid3X3 className="h-3 w-3" />,+ content: <StickersContentView category="all" />,+ },+ {+ value: "general",+ label: "Icons",+ icon: <Sparkles className="h-3 w-3" />,+ content: <StickersContentView category="general" />,+ },+ {+ value: "brands",+ label: "Brands",+ icon: <Hash className="h-3 w-3" />,+ content: <StickersContentView category="brands" />,+ },+ {+ value: "emoji",+ label: "Emoji",+ icon: <Smile className="h-3 w-3" />,+ content: <StickersContentView category="emoji" />,+ },+ ]}+ className="flex flex-col h-full p-0 overflow-hidden"+ />);}@@ -361,7 +338,7 @@ function StickersContentView({ category }: { category: StickerCategory }) {}, [isInCollection]);return (- <div className="flex flex-col gap-5 mt-1 h-full">+ <div className="flex flex-col gap-5 mt-1 h-full p-4"><div className="space-y-3"><InputWithBackisExpanded={isInCollection}diff --git a/apps/web/src/components/editor/panel-base-view.tsx b/apps/web/src/components/editor/panel-base-view.tsxindex 4acadafb..6e92c616 100644--- a/apps/web/src/components/editor/panel-base-view.tsx+++ b/apps/web/src/components/editor/panel-base-view.tsx@@ -11,6 +11,7 @@ interface PanelBaseViewProps {tabs?: {value: string;label: string;+ icon?: React.ReactNode;content: React.ReactNode;}[];className?: string;@@ -56,6 +57,11 @@ export function PanelBaseView({<TabsList>{tabs.map((tab) => (<TabsTrigger key={tab.value} value={tab.value}>+ {tab.icon ? (+ <span className="inline-flex items-center mr-1">+ {tab.icon}+ </span>+ ) : null}{tab.label}</TabsTrigger>))}