diff --git a/package.json b/package.json index ecd03b3a1..050e26273 100644 --- a/package.json +++ b/package.json @@ -39,11 +39,9 @@ "@hookform/resolvers": "3.9.0", "@iconify/tools": "4.0.4", "@mozilla/readability": "^0.5.0", - "@radix-ui/react-accordion": "1.2.0", "@radix-ui/react-alert-dialog": "1.1.1", "@radix-ui/react-avatar": "1.1.0", "@radix-ui/react-checkbox": "1.1.1", - "@radix-ui/react-collapsible": "1.1.0", "@radix-ui/react-context-menu": "2.2.1", "@radix-ui/react-dialog": "1.1.1", "@radix-ui/react-dropdown-menu": "2.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4c4544a29..aae28df9d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -46,9 +46,6 @@ importers: '@mozilla/readability': specifier: ^0.5.0 version: 0.5.0(patch_hash=fgkvsbckled47trggkhdkimzbm) - '@radix-ui/react-accordion': - specifier: 1.2.0 - version: 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-alert-dialog': specifier: 1.1.1 version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -58,9 +55,6 @@ importers: '@radix-ui/react-checkbox': specifier: 1.1.1 version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-collapsible': - specifier: 1.1.0 - version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-context-menu': specifier: 2.2.1 version: 2.2.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1395,19 +1389,6 @@ packages: '@radix-ui/primitive@1.1.0': resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==} - '@radix-ui/react-accordion@1.2.0': - resolution: {integrity: sha512-HJOzSX8dQqtsp/3jVxCU3CXEONF7/2jlGAB28oX8TTw1Dz8JYbEI1UcL8355PuLBE41/IRRMvCw7VkiK/jcUOQ==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc - react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-alert-dialog@1.1.1': resolution: {integrity: sha512-wmCoJwj7byuVuiLKqDLlX7ClSUU0vd9sdCeM+2Ls+uf13+cpSJoMgwysHq1SGVVkJj5Xn0XWi1NoRCdkMpr6Mw==} peerDependencies: @@ -1460,19 +1441,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-collapsible@1.1.0': - resolution: {integrity: sha512-zQY7Epa8sTL0mq4ajSJpjgn2YmCgyrG7RsQgLp3C0LQVkG7+Tf6Pv1CeNWZLyqMjhdPkBa5Lx7wYBeSu7uCSTA==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc - react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-collection@1.1.0': resolution: {integrity: sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==} peerDependencies: @@ -8297,23 +8265,6 @@ snapshots: '@radix-ui/primitive@1.1.0': {} - '@radix-ui/react-accordion@1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-collapsible': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1) - '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@18.3.1) - '@radix-ui/react-direction': 1.1.0(@types/react@18.3.3)(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.3 - '@types/react-dom': 18.3.0 - '@radix-ui/react-alert-dialog@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/primitive': 1.1.0 @@ -8365,22 +8316,6 @@ snapshots: '@types/react': 18.3.3 '@types/react-dom': 18.3.0 - '@radix-ui/react-collapsible@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@radix-ui/primitive': 1.1.0 - '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1) - '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@18.3.1) - '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@18.3.1) - '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@18.3.1) - '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@18.3.1) - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - optionalDependencies: - '@types/react': 18.3.3 - '@types/react-dom': 18.3.0 - '@radix-ui/react-collection@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1) diff --git a/src/renderer/src/components/ui/accordion.tsx b/src/renderer/src/components/ui/accordion.tsx deleted file mode 100644 index aad68fa02..000000000 --- a/src/renderer/src/components/ui/accordion.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import * as AccordionPrimitive from "@radix-ui/react-accordion" -import { cn } from "@renderer/lib/utils" -import * as React from "react" - -/** - * @deprecated please use `src/renderer/src/components/ui/collapse/Collapse.tsx` - */ -const Accordion = AccordionPrimitive.Root - -const AccordionItem = React.forwardRef< - React.ElementRef, - React.ComponentPropsWithoutRef ->(({ className, ...props }, ref) => ( - -)) -AccordionItem.displayName = "AccordionItem" - -const AccordionTrigger = React.forwardRef< - React.ElementRef, - React.ComponentPropsWithoutRef ->(({ className, children, ...props }, ref) => ( - - svg]:rotate-180", - className, - )} - {...props} - > - {children} - {/* */} - - -)) -AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName - -const AccordionContent = React.forwardRef< - React.ElementRef, - React.ComponentPropsWithoutRef ->(({ className, children, ...props }, ref) => ( - -
{children}
- -)) -AccordionContent.displayName = AccordionPrimitive.Content.displayName - -export { Accordion, AccordionContent, AccordionItem, AccordionTrigger } diff --git a/src/renderer/src/components/ui/collapsible.tsx b/src/renderer/src/components/ui/collapsible.tsx deleted file mode 100644 index 853414796..000000000 --- a/src/renderer/src/components/ui/collapsible.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import * as CollapsiblePrimitive from "@radix-ui/react-collapsible" -/** - * @deprecated please use `src/renderer/src/components/ui/collapse/Collapse.tsx` - */ -const Collapsible = CollapsiblePrimitive.Root - -const { CollapsibleTrigger } = CollapsiblePrimitive - -const { CollapsibleContent } = CollapsiblePrimitive - -export { Collapsible, CollapsibleContent, CollapsibleTrigger } diff --git a/src/renderer/src/hooks/common/useBizQuery.ts b/src/renderer/src/hooks/common/useBizQuery.ts index cb6acd386..c2e82144c 100644 --- a/src/renderer/src/hooks/common/useBizQuery.ts +++ b/src/renderer/src/hooks/common/useBizQuery.ts @@ -78,8 +78,3 @@ export function useAuthInfiniteQuery< }, ) } - -/** - * @deprecated use `useAuthQuery` instead - */ -export const useBizQuery = useAuthQuery diff --git a/src/renderer/src/lib/ns.ts b/src/renderer/src/lib/ns.ts index aff77b490..38dd0738e 100644 --- a/src/renderer/src/lib/ns.ts +++ b/src/renderer/src/lib/ns.ts @@ -1,9 +1,5 @@ const ns = "follow" export const getStorageNS = (key: string) => `${ns}:${key}` -/** - * @deprecated Use `getStorageNS` instead. - */ -export const buildStorageKey = getStorageNS export const clearStorage = () => { for (let i = 0; i < localStorage.length; i++) { diff --git a/src/renderer/src/modules/feed-column/category.tsx b/src/renderer/src/modules/feed-column/category.tsx index f412eee4f..b3d910fe8 100644 --- a/src/renderer/src/modules/feed-column/category.tsx +++ b/src/renderer/src/modules/feed-column/category.tsx @@ -1,7 +1,3 @@ -import { - Collapsible, - CollapsibleTrigger, -} from "@renderer/components/ui/collapsible" import { LoadingCircle } from "@renderer/components/ui/loading" import { ROUTE_FEED_IN_FOLDER, views } from "@renderer/constants" import { useNavigateEntry } from "@renderer/hooks/biz/useNavigateEntry" @@ -118,11 +114,7 @@ function FeedCategoryImpl({ }) return ( - setOpen(o)} - onClick={(e) => e.stopPropagation()} - > +
{!!showCollapse && (
- { + e.stopPropagation() + setOpen(!open) + }} + data-state={open ? "open" : "close"} className={cn( "flex h-8 items-center [&_.i-mgc-right-cute-fi]:data-[state=open]:rotate-90", )} @@ -202,10 +199,10 @@ function FeedCategoryImpl({ ) : (
- +
)} - + )} - +
) } diff --git a/src/renderer/src/services/entry.ts b/src/renderer/src/services/entry.ts index db7e7b8c1..f6b22575b 100644 --- a/src/renderer/src/services/entry.ts +++ b/src/renderer/src/services/entry.ts @@ -62,11 +62,6 @@ class EntryServiceStatic extends BaseService { return EntryRelatedService.upsert(EntryRelatedKey.READ, record) } - /** @deprecated */ - bulkStoreFeedId(record: Record) { - return EntryRelatedService.upsert(EntryRelatedKey.FEED_ID, record) - } - async bulkStoreCollection(record: Record) { return EntryRelatedService.upsert(EntryRelatedKey.COLLECTION, record) }