There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat(core): tag groups sorted alphabetically (#6865)
JimmFlyf94306703abb
diff --git a/packages/frontend/core/src/components/page-list/group-definitions.tsx b/packages/frontend/core/src/components/page-list/group-definitions.tsxindex d33e2d56c6..6d30fdb698 100644--- a/packages/frontend/core/src/components/page-list/group-definitions.tsx+++ b/packages/frontend/core/src/components/page-list/group-definitions.tsx@@ -4,7 +4,7 @@ import { TagService } from '@affine/core/modules/tag';import { useAFFiNEI18N } from '@affine/i18n/hooks';import { FavoritedIcon, FavoriteIcon } from '@blocksuite/icons';import type { DocMeta } from '@blocksuite/store';-import { useLiveData, useService } from '@toeverything/infra';+import { LiveData, useLiveData, useService } from '@toeverything/infra';import { type ReactNode, useMemo } from 'react';import * as styles from './group-definitions.css';@@ -128,7 +128,17 @@ const GroupTagLabel = ({ tag, count }: { tag: Tag; count: number }) => {};export const useTagGroupDefinitions = (): ItemGroupDefinition<ListItem>[] => {const tagList = useService(TagService).tagList;- const tags = useLiveData(tagList.tags$);+ const sortedTagsLiveData$ = useMemo(+ () =>+ LiveData.computed(get =>+ get(tagList.tags$).sort((a, b) =>+ get(a.value$).localeCompare(get(b.value$))+ )+ ),+ [tagList.tags$]+ );+ const tags = useLiveData(sortedTagsLiveData$);+const t = useAFFiNEI18N();const untagged = useMemo(diff --git a/packages/frontend/core/src/pages/workspace/collection/header.tsx b/packages/frontend/core/src/pages/workspace/collection/header.tsxindex f462f9a056..01f6cfc36c 100644--- a/packages/frontend/core/src/pages/workspace/collection/header.tsx+++ b/packages/frontend/core/src/pages/workspace/collection/header.tsx@@ -1,4 +1,5 @@import { IconButton } from '@affine/component';+import { PageDisplayMenu } from '@affine/core/components/page-list';import { Header } from '@affine/core/components/pure/header';import { WorkspaceModeFilterTab } from '@affine/core/components/pure/workspace-mode-filter-tab';import { PlusIcon } from '@blocksuite/icons';@@ -16,16 +17,19 @@ export const CollectionDetailHeader = ({return (<Headerright={- <IconButton- type="default"- icon={<PlusIcon fontSize={16} />}- onClick={onCreate}- className={clsx(- styles.headerCreateNewButton,- styles.headerCreateNewCollectionIconButton,- !showCreateNew && styles.headerCreateNewButtonHidden- )}- />+ <>+ <IconButton+ type="default"+ icon={<PlusIcon fontSize={16} />}+ onClick={onCreate}+ className={clsx(+ styles.headerCreateNewButton,+ styles.headerCreateNewCollectionIconButton,+ !showCreateNew && styles.headerCreateNewButtonHidden+ )}+ />+ <PageDisplayMenu />+ </>}center={<WorkspaceModeFilterTab activeFilter={'collections'} />}/>diff --git a/packages/frontend/core/src/pages/workspace/tag/header.tsx b/packages/frontend/core/src/pages/workspace/tag/header.tsxindex d46818a636..a1c6212dd7 100644--- a/packages/frontend/core/src/pages/workspace/tag/header.tsx+++ b/packages/frontend/core/src/pages/workspace/tag/header.tsx@@ -1,6 +1,12 @@+import { PageDisplayMenu } from '@affine/core/components/page-list';import { Header } from '@affine/core/components/pure/header';import { WorkspaceModeFilterTab } from '@affine/core/components/pure/workspace-mode-filter-tab';export const TagDetailHeader = () => {- return <Header center={<WorkspaceModeFilterTab activeFilter={'tags'} />} />;+ return (+ <Header+ center={<WorkspaceModeFilterTab activeFilter={'tags'} />}+ right={<PageDisplayMenu />}+ />+ );};