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(component, mobile): masonry layout with virtual scroll support, adapted with all docs (#9208)
CatsJuicea53e231bad41
diff --git a/packages/frontend/component/src/index.ts b/packages/frontend/component/src/index.tsindex 083eb6b216..a0abca5a08 100644--- a/packages/frontend/component/src/index.ts+++ b/packages/frontend/component/src/index.ts@@ -17,6 +17,7 @@ export * from './ui/loading';export * from './ui/lottie/collections-icon';export * from './ui/lottie/delete-icon';export * from './ui/lottie/folder-icon';+export * from './ui/masonry';export * from './ui/menu';export * from './ui/modal';export * from './ui/notification';diff --git a/packages/frontend/component/src/ui/masonry/index.ts b/packages/frontend/component/src/ui/masonry/index.tsnew file mode 100644index 0000000000..86389f60f9--- /dev/null+++ b/packages/frontend/component/src/ui/masonry/index.ts@@ -0,0 +1 @@+export * from './masonry';diff --git a/packages/frontend/component/src/ui/masonry/masonry.stories.tsx b/packages/frontend/component/src/ui/masonry/masonry.stories.tsxnew file mode 100644index 0000000000..76cc54267b--- /dev/null+++ b/packages/frontend/component/src/ui/masonry/masonry.stories.tsx@@ -0,0 +1,80 @@+import { ResizePanel } from '../resize-panel/resize-panel';+import { Masonry } from './masonry';++export default {+ title: 'UI/Masonry',+};++const Card = ({ children }: { children: React.ReactNode }) => {+ return (+ <div+ style={{+ width: '100%',+ height: '100%',+ borderRadius: 10,+ border: `1px solid rgba(100, 100, 100, 0.2)`,+ boxShadow: '0 1px 10px rgba(0, 0, 0, 0.1)',+ padding: 10,+ backgroundColor: 'white',+ }}+ >+ {children}+ </div>+ );+};++const basicCards = Array.from({ length: 10000 }, (_, i) => {+ return {+ id: 'card-' + i,+ height: Math.round(100 + Math.random() * 100),+ children: (+ <Card>+ <h1>Hello</h1>+ <p>World</p>+ {i}+ </Card>+ ),+ };+});++export const BasicVirtualScroll = () => {+ return (+ <ResizePanel width={800} height={600}>+ <Masonry+ gapX={10}+ gapY={10}+ style={{ width: '100%', height: '100%' }}+ paddingX={12}+ paddingY={12}+ virtualScroll+ items={basicCards}+ />+ </ResizePanel>+ );+};++const transitionCards = Array.from({ length: 10000 }, (_, i) => {+ return {+ id: 'card-' + i,+ height: Math.round(100 + Math.random() * 100),+ children: <Card>{i}</Card>,+ style: { transition: 'transform 0.2s ease' },+ };+});++export const CustomTransition = () => {+ return (+ <ResizePanel width={800} height={600}>+ <Masonry+ gapX={10}+ gapY={10}+ style={{ width: '100%', height: '100%' }}+ paddingX={12}+ paddingY={12}+ virtualScroll+ items={transitionCards}+ locateMode="transform3d"+ />+ </ResizePanel>+ );+};diff --git a/packages/frontend/component/src/ui/masonry/masonry.tsx b/packages/frontend/component/src/ui/masonry/masonry.tsxnew file mode 100644index 0000000000..17b95ec4de--- /dev/null+++ b/packages/frontend/component/src/ui/masonry/masonry.tsx@@ -0,0 +1,220 @@+import { throttle } from '@blocksuite/affine/global/utils';+import clsx from 'clsx';+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';++import { observeResize } from '../../utils';+import { Scrollable } from '../scrollbar';+import * as styles from './styles.css';+import type { MasonryItem, MasonryItemXYWH } from './type';+import { calcColumns, calcLayout, calcSleep } from './utils';++export interface MasonryProps extends React.HTMLAttributes<HTMLDivElement> {+ items: MasonryItem[];++ gapX?: number;+ gapY?: number;+ paddingX?: number;+ paddingY?: number;+ /**+ * Specify the width of the item.+ * - `number`: The width of the item in pixels.+ * - `'stretch'`: The item will stretch to fill the container.+ * @default 'stretch'+ */+ itemWidth?: number | 'stretch';+ /**+ * The minimum width of the item in pixels.+ * @default 100+ */+ itemWidthMin?: number;+ virtualScroll?: boolean;+ locateMode?: 'transform' | 'leftTop' | 'transform3d';+}++export const Masonry = ({+ items,+ gapX = 12,+ gapY = 12,+ itemWidth = 'stretch',+ itemWidthMin = 100,+ paddingX = 0,+ paddingY = 0,+ className,+ virtualScroll = false,+ locateMode = 'leftTop',+ ...props+}: MasonryProps) => {+ const rootRef = useRef<HTMLDivElement>(null);+ const [height, setHeight] = useState(0);+ const [layoutMap, setLayoutMap] = useState<+ Map<MasonryItem['id'], MasonryItemXYWH>+ >(new Map());+ const [sleepMap, setSleepMap] = useState<Map<MasonryItem['id'], boolean>>(+ new Map()+ );++ const updateSleepMap = useCallback(+ (layoutMap: Map<MasonryItem['id'], MasonryItemXYWH>, _scrollY?: number) => {+ if (!virtualScroll) return;++ const rootEl = rootRef.current;+ if (!rootEl) return;++ requestAnimationFrame(() => {+ const scrollY = _scrollY ?? rootEl.scrollTop;+ const sleepMap = calcSleep({+ viewportHeight: rootEl.clientHeight,+ scrollY,+ layoutMap,+ preloadHeight: 50,+ });+ setSleepMap(sleepMap);+ });+ },+ [virtualScroll]+ );++ const calculateLayout = useCallback(() => {+ const rootEl = rootRef.current;+ if (!rootEl) return;++ const totalWidth = rootEl.clientWidth;+ const { columns, width } = calcColumns(+ totalWidth,+ itemWidth,+ itemWidthMin,+ gapX,+ paddingX+ );++ const { layout, height } = calcLayout(items, {+ columns,+ width,+ gapX,+ gapY,+ paddingX,+ paddingY,+ });+ setLayoutMap(layout);+ setHeight(height);+ updateSleepMap(layout);+ }, [+ gapX,+ gapY,+ itemWidth,+ itemWidthMin,+ items,+ paddingX,+ paddingY,+ updateSleepMap,+ ]);++ // handle resize+ useEffect(() => {+ calculateLayout();+ if (rootRef.current) {+ return observeResize(rootRef.current, calculateLayout);+ }+ return;+ }, [calculateLayout]);++ // handle scroll+ useEffect(() => {+ const rootEl = rootRef.current;+ if (!rootEl) return;++ if (virtualScroll) {+ const handler = throttle((e: Event) => {+ const scrollY = (e.target as HTMLElement).scrollTop;+ updateSleepMap(layoutMap, scrollY);+ }, 50);+ rootEl.addEventListener('scroll', handler);+ return () => {+ rootEl.removeEventListener('scroll', handler);+ };+ }+ return;+ }, [layoutMap, updateSleepMap, virtualScroll]);++ return (+ <Scrollable.Root>+ <Scrollable.Viewport+ ref={rootRef}+ data-masonry-root+ className={clsx('scrollable', styles.root, className)}+ {...props}+ >+ {items.map(item => {+ return (+ <MasonryItem+ key={item.id}+ {...item}+ locateMode={locateMode}+ xywh={layoutMap.get(item.id)}+ sleep={sleepMap.get(item.id)}+ >+ {item.children}+ </MasonryItem>+ );+ })}+ <div data-masonry-placeholder style={{ height }} />+ </Scrollable.Viewport>+ <Scrollable.Scrollbar />+ </Scrollable.Root>+ );+};++interface MasonryItemProps+ extends MasonryItem,+ Omit<React.HTMLAttributes<HTMLDivElement>, 'id' | 'height'> {+ locateMode?: 'transform' | 'leftTop' | 'transform3d';+ sleep?: boolean;+ xywh?: MasonryItemXYWH;+}++const MasonryItem = memo(function MasonryItem({+ id,+ xywh,+ locateMode = 'leftTop',+ sleep = false,+ className,+ children,+ style: styleProp,+ ...props+}: MasonryItemProps) {+ const style = useMemo(() => {+ if (!xywh) return { display: 'none' };++ const { x, y, w, h } = xywh;++ const posStyle =+ locateMode === 'transform'+ ? { transform: `translate(${x}px, ${y}px)` }+ : locateMode === 'leftTop'+ ? { left: `${x}px`, top: `${y}px` }+ : { transform: `translate3d(${x}px, ${y}px, 0)` };++ return {+ left: 0,+ top: 0,+ ...styleProp,+ ...posStyle,+ width: `${w}px`,+ height: `${h}px`,+ };+ }, [locateMode, styleProp, xywh]);++ if (sleep || !xywh) return null;++ return (+ <div+ data-masonry-item+ data-masonry-item-id={id}+ className={clsx(styles.item, className)}+ style={style}+ {...props}+ >+ {children}+ </div>+ );+});diff --git a/packages/frontend/component/src/ui/masonry/styles.css.ts b/packages/frontend/component/src/ui/masonry/styles.css.tsnew file mode 100644index 0000000000..7435237bfa--- /dev/null+++ b/packages/frontend/component/src/ui/masonry/styles.css.ts@@ -0,0 +1,14 @@+import { style } from '@vanilla-extract/css';++export const root = style({+ position: 'relative',+ selectors: {+ '&.scrollable': {+ overflowY: 'auto',+ },+ },+});++export const item = style({+ position: 'absolute',+});diff --git a/packages/frontend/component/src/ui/masonry/type.ts b/packages/frontend/component/src/ui/masonry/type.tsnew file mode 100644index 0000000000..9ef8cb8dda--- /dev/null+++ b/packages/frontend/component/src/ui/masonry/type.ts@@ -0,0 +1,11 @@+export interface MasonryItem extends React.HTMLAttributes<HTMLDivElement> {+ id: string;+ height: number;+}++export interface MasonryItemXYWH {+ x: number;+ y: number;+ w: number;+ h: number;+}diff --git a/packages/frontend/component/src/ui/masonry/utils.ts b/packages/frontend/component/src/ui/masonry/utils.tsnew file mode 100644index 0000000000..de09937667--- /dev/null+++ b/packages/frontend/component/src/ui/masonry/utils.ts@@ -0,0 +1,87 @@+import type { MasonryItem, MasonryItemXYWH } from './type';++export const calcColumns = (+ totalWidth: number,+ itemWidth: number | 'stretch',+ itemWidthMin: number,+ gapX: number,+ paddingX: number+) => {+ const availableWidth = totalWidth - paddingX * 2;++ if (itemWidth === 'stretch') {+ let columns = 1;+ while (columns * itemWidthMin + (columns - 1) * gapX < availableWidth) {+ columns++;+ }+ const finalColumns = columns - 1;+ const finalWidth =+ (availableWidth - (finalColumns - 1) * gapX) / finalColumns;+ return {+ columns: finalColumns,+ width: finalWidth,+ };+ } else {+ let columns = 1;+ while (columns * itemWidth + (columns - 1) * gapX < availableWidth) {+ columns++;+ }+ return {+ columns: columns - 1,+ width: itemWidth,+ };+ }+};++export const calcLayout = (+ items: MasonryItem[],+ options: {+ columns: number;+ width: number;+ gapX: number;+ gapY: number;+ paddingX: number;+ paddingY: number;+ }+) => {+ const { columns, width, gapX, gapY, paddingX, paddingY } = options;++ const layoutMap = new Map<MasonryItem['id'], MasonryItemXYWH>();+ const heightStack = Array.from({ length: columns }, () => paddingY);++ items.forEach(item => {+ const minHeight = Math.min(...heightStack);+ const minHeightIndex = heightStack.indexOf(minHeight);+ const x = minHeightIndex * (width + gapX) + paddingX;+ const y = minHeight + gapY;+ heightStack[minHeightIndex] = y + item.height;+ layoutMap.set(item.id, { x, y, w: width, h: item.height });+ });++ const finalHeight = Math.max(...heightStack) + paddingY;++ return { layout: layoutMap, height: finalHeight };+};++export const calcSleep = (options: {+ viewportHeight: number;+ scrollY: number;+ layoutMap: Map<MasonryItem['id'], MasonryItemXYWH>;+ preloadHeight: number;+}) => {+ const { viewportHeight, scrollY, layoutMap, preloadHeight } = options;++ const sleepMap = new Map<MasonryItem['id'], boolean>();++ layoutMap.forEach((layout, id) => {+ const { y, h } = layout;++ const isInView =+ y + h + preloadHeight > scrollY &&+ y - preloadHeight < scrollY + viewportHeight;++ sleepMap.set(id, !isInView);+ });++ return sleepMap;+};diff --git a/packages/frontend/core/src/mobile/components/app-tabs/index.tsx b/packages/frontend/core/src/mobile/components/app-tabs/index.tsxindex 1a5de84202..b11f935b61 100644--- a/packages/frontend/core/src/mobile/components/app-tabs/index.tsx+++ b/packages/frontend/core/src/mobile/components/app-tabs/index.tsx@@ -10,15 +10,23 @@ import { type AppTabLink, tabs } from './data';import * as styles from './styles.css';import { TabItem } from './tab-item';-export const AppTabs = ({ background }: { background?: string }) => {+export const AppTabs = ({+ background,+ fixed = true,+}: {+ background?: string;+ fixed?: boolean;+}) => {const virtualKeyboardService = useService(VirtualKeyboardService);const virtualKeyboardVisible = useLiveData(virtualKeyboardService.show$);- return createPortal(+ const tab = (<SafeArea+ id="app-tabs"bottomclassName={styles.appTabs}bottomOffset={2}+ data-fixed={fixed}style={{...assignInlineVars({[styles.appTabsBackground]: background,@@ -26,7 +34,7 @@ export const AppTabs = ({ background }: { background?: string }) => {visibility: virtualKeyboardVisible ? 'hidden' : 'visible',}}>- <ul className={styles.appTabsInner} id="app-tabs" role="tablist">+ <ul className={styles.appTabsInner} role="tablist">{tabs.map(tab => {if ('to' in tab) {return <AppTabLink route={tab} key={tab.key} />;@@ -39,9 +47,10 @@ export const AppTabs = ({ background }: { background?: string }) => {}})}</ul>- </SafeArea>,- document.body+ </SafeArea>);++ return fixed ? createPortal(tab, document.body) : tab;};const AppTabLink = ({ route }: { route: AppTabLink }) => {diff --git a/packages/frontend/core/src/mobile/components/app-tabs/styles.css.ts b/packages/frontend/core/src/mobile/components/app-tabs/styles.css.tsindex 96f29015d3..26f676fd7f 100644--- a/packages/frontend/core/src/mobile/components/app-tabs/styles.css.ts+++ b/packages/frontend/core/src/mobile/components/app-tabs/styles.css.ts@@ -14,9 +14,16 @@ export const appTabs = style({width: '100dvw',- position: 'fixed',- bottom: -2,zIndex: 1,++ marginBottom: -2,+ selectors: {+ '&[data-fixed="true"]': {+ position: 'fixed',+ bottom: -2,+ marginBottom: 0,+ },+ },});export const appTabsInner = style({display: 'flex',diff --git a/packages/frontend/core/src/mobile/components/doc-card/index.tsx b/packages/frontend/core/src/mobile/components/doc-card/index.tsxindex f7cf3abd9a..8678be2cc8 100644--- a/packages/frontend/core/src/mobile/components/doc-card/index.tsx+++ b/packages/frontend/core/src/mobile/components/doc-card/index.tsx@@ -1,4 +1,4 @@-import { IconButton, observeIntersection, Skeleton } from '@affine/component';+import { IconButton, Skeleton } from '@affine/component';import { useCatchEventCallback } from '@affine/core/components/hooks/use-catch-event-hook';import { PagePreview } from '@affine/core/components/page-list/page-content-preview';import { IsFavoriteIcon } from '@affine/core/components/pure/icons';@@ -11,14 +11,7 @@ import {import type { DocMeta } from '@blocksuite/affine/store';import { useLiveData, useService } from '@toeverything/infra';import clsx from 'clsx';-import {- forwardRef,- type ReactNode,- useEffect,- useMemo,- useRef,- useState,-} from 'react';+import { forwardRef, type ReactNode, useMemo, useRef } from 'react';import * as styles from './styles.css';import { DocCardTags } from './tag';@@ -66,20 +59,6 @@ export const DocCard = forwardRef<HTMLAnchorElement, DocCardProps>(return { height: `${rows * 18}px` };}, [autoHeightById, meta.id]);- const [visible, setVisible] = useState(false);-- useEffect(() => {- if (!containerRef.current) return;-- const dispose = observeIntersection(containerRef.current, entry => {- setVisible(entry.isIntersecting);- });-- return () => {- dispose();- };- }, []);-return (<WorkbenchLinkto={`/${meta.id}`}@@ -94,38 +73,30 @@ export const DocCard = forwardRef<HTMLAnchorElement, DocCardProps>(className={clsx(styles.card, className)}data-testid="doc-card"data-doc-id={meta.id}- data-visible={visible}{...attrs}>- {visible && (- <>- <header className={styles.head} data-testid="doc-card-header">- <h3 className={styles.title}>{title}</h3>- <IconButton- aria-label="favorite"- icon={- <IsFavoriteIcon- onClick={toggleFavorite}- favorite={favorited}- />- }- />- </header>- <main className={styles.content} style={contentStyle}>- <PagePreview- fallback={- <>- <Skeleton />- <Skeleton width={'60%'} />- </>- }- pageId={meta.id}- emptyFallback={<div className={styles.contentEmpty}>Empty</div>}- />- </main>- {showTags ? <DocCardTags docId={meta.id} rows={2} /> : null}- </>- )}+ <header className={styles.head} data-testid="doc-card-header">+ <h3 className={styles.title}>{title}</h3>+ <IconButton+ aria-label="favorite"+ icon={+ <IsFavoriteIcon onClick={toggleFavorite} favorite={favorited} />+ }+ />+ </header>+ <main className={styles.content} style={contentStyle}>+ <PagePreview+ fallback={+ <>+ <Skeleton />+ <Skeleton width={'60%'} />+ </>+ }+ pageId={meta.id}+ emptyFallback={<div className={styles.contentEmpty}>Empty</div>}+ />+ </main>+ {showTags ? <DocCardTags docId={meta.id} rows={2} /> : null}</WorkbenchLink>);}diff --git a/packages/frontend/core/src/mobile/components/page/index.tsx b/packages/frontend/core/src/mobile/components/page/index.tsxnew file mode 100644index 0000000000..445b37e21a--- /dev/null+++ b/packages/frontend/core/src/mobile/components/page/index.tsx@@ -0,0 +1,31 @@+import { type HTMLAttributes, type ReactNode, useEffect } from 'react';++import { AppTabs } from '../app-tabs';+import * as styles from './styles.css';++interface PageProps extends HTMLAttributes<HTMLDivElement> {+ tab?: boolean;+ header?: ReactNode;+}++/**+ * A Page is a full-screen container that will not scroll on document.+ */+export const Page = ({ children, tab = true, header, ...attrs }: PageProps) => {+ // disable scroll on body+ useEffect(() => {+ const prevOverflowY = document.body.style.overflowY;+ document.body.style.overflowY = 'hidden';+ return () => {+ document.body.style.overflowY = prevOverflowY;+ };+ }, []);++ return (+ <main className={styles.page} {...attrs} data-tab={tab}>+ {header}+ {children}+ {tab ? <AppTabs fixed={false} /> : null}+ </main>+ );+};diff --git a/packages/frontend/core/src/mobile/components/page/styles.css.ts b/packages/frontend/core/src/mobile/components/page/styles.css.tsnew file mode 100644index 0000000000..70bad2f58d--- /dev/null+++ b/packages/frontend/core/src/mobile/components/page/styles.css.ts@@ -0,0 +1,9 @@+import { style } from '@vanilla-extract/css';++export const page = style({+ width: '100dvw',+ height: '100dvh',+ overflow: 'hidden',+ display: 'flex',+ flexDirection: 'column',+});diff --git a/packages/frontend/core/src/mobile/pages/workspace/all.tsx b/packages/frontend/core/src/mobile/pages/workspace/all.tsxindex d2c2f15122..d7ae521e3e 100644--- a/packages/frontend/core/src/mobile/pages/workspace/all.tsx+++ b/packages/frontend/core/src/mobile/pages/workspace/all.tsx@@ -1,18 +1,14 @@-import { SafeArea, useThemeColorV2 } from '@affine/component';+import { useThemeColorV2 } from '@affine/component';-import { AppTabs } from '../../components';-import { AllDocList, AllDocsHeader, AllDocsMenu } from '../../views';+import { Page } from '../../components/page';+import { AllDocList, AllDocsHeader } from '../../views';export const Component = () => {useThemeColorV2('layer/background/mobile/primary');return (- <>- <AllDocsHeader operations={<AllDocsMenu />} />- <SafeArea bottom>- <AllDocList />- </SafeArea>- <AppTabs />- </>+ <Page header={<AllDocsHeader />} tab>+ <AllDocList />+ </Page>);};diff --git a/packages/frontend/core/src/mobile/pages/workspace/collection/detail.tsx b/packages/frontend/core/src/mobile/pages/workspace/collection/detail.tsxindex 6add099d7a..814954ee3c 100644--- a/packages/frontend/core/src/mobile/pages/workspace/collection/detail.tsx+++ b/packages/frontend/core/src/mobile/pages/workspace/collection/detail.tsx@@ -10,7 +10,6 @@ import {import { useCallback, useEffect } from 'react';import { useParams } from 'react-router-dom';-import { AppTabs } from '../../../components';import { CollectionDetail } from '../../../views';export const Component = () => {@@ -68,10 +67,5 @@ export const Component = () => {return null;}- return (- <>- <CollectionDetail collection={collection} />- <AppTabs />- </>- );+ return <CollectionDetail collection={collection} />;};diff --git a/packages/frontend/core/src/mobile/styles/mobile.css.ts b/packages/frontend/core/src/mobile/styles/mobile.css.tsindex 0cb7e5d47e..9bf8ff8300 100644--- a/packages/frontend/core/src/mobile/styles/mobile.css.ts+++ b/packages/frontend/core/src/mobile/styles/mobile.css.ts@@ -3,11 +3,13 @@ import { createVar, globalStyle } from '@vanilla-extract/css';export const globalVars = {appTabHeight: createVar('appTabHeight'),+ appTabSafeArea: createVar('appTabSafeArea'),};globalStyle(':root', {vars: {[globalVars.appTabHeight]: BUILD_CONFIG.isIOS ? '49px' : '62px',+ [globalVars.appTabSafeArea]: `calc(${globalVars.appTabHeight} + env(safe-area-inset-bottom))`,},userSelect: 'none',WebkitUserSelect: 'none',@@ -18,17 +20,17 @@ globalStyle('body', {minHeight: '100dvh',overflowY: 'unset',});-globalStyle('body:has(#app-tabs)', {- paddingBottom: `calc(${globalVars.appTabHeight} + env(safe-area-inset-bottom))`,+globalStyle('body:has(> #app-tabs)', {+ paddingBottom: globalVars.appTabSafeArea,});globalStyle('body:has(#app-tabs) affine-keyboard-toolbar[data-shrink="true"]', {- paddingBottom: `calc(${globalVars.appTabHeight} + env(safe-area-inset-bottom))`,+ paddingBottom: globalVars.appTabSafeArea,});globalStyle('body:has(#app-tabs) affine-keyboard-tool-panel', {paddingBottom: `calc(${globalVars.appTabHeight} + env(safe-area-inset-bottom) + 8px)`,});globalStyle('body:has(#app-tabs) edgeless-toolbar-widget', {- bottom: `calc(${globalVars.appTabHeight} + env(safe-area-inset-bottom))`,+ bottom: globalVars.appTabSafeArea,});globalStyle('html', {height: '100dvh',diff --git a/packages/frontend/core/src/mobile/views/all-docs/collection/detail.tsx b/packages/frontend/core/src/mobile/views/all-docs/collection/detail.tsxindex 1c07feb55a..c782a54188 100644--- a/packages/frontend/core/src/mobile/views/all-docs/collection/detail.tsx+++ b/packages/frontend/core/src/mobile/views/all-docs/collection/detail.tsx@@ -1,29 +1,16 @@-import { IconButton, MobileMenu } from '@affine/component';import { EmptyCollectionDetail } from '@affine/core/components/affine/empty';import { isEmptyCollection } from '@affine/core/desktop/pages/workspace/collection';-import { PageHeader } from '@affine/core/mobile/components';+import { AppTabs, PageHeader } from '@affine/core/mobile/components';+import { Page } from '@affine/core/mobile/components/page';import type { Collection } from '@affine/env/filter';-import { MoreHorizontalIcon, ViewLayersIcon } from '@blocksuite/icons/rc';+import { ViewLayersIcon } from '@blocksuite/icons/rc';import { AllDocList } from '../doc/list';-import { AllDocsMenu } from '../doc/menu';import * as styles from './detail.css';export const DetailHeader = ({ collection }: { collection: Collection }) => {return (- <PageHeader- className={styles.header}- back- suffix={- <MobileMenu items={<AllDocsMenu />}>- <IconButton- size="24"- style={{ padding: 10 }}- icon={<MoreHorizontalIcon />}- />- </MobileMenu>- }- >+ <PageHeader className={styles.header} back><div className={styles.headerContent}><ViewLayersIcon className={styles.headerIcon} />{collection.name}@@ -42,14 +29,14 @@ export const CollectionDetail = ({<><DetailHeader collection={collection} /><EmptyCollectionDetail collection={collection} absoluteCenter />+ <AppTabs /></>);}return (- <>- <DetailHeader collection={collection} />+ <Page header={<DetailHeader collection={collection} />}><AllDocList collection={collection} />- </>+ </Page>);};diff --git a/packages/frontend/core/src/mobile/views/all-docs/doc/list.tsx b/packages/frontend/core/src/mobile/views/all-docs/doc/list.tsxindex 2ff82558bc..f8e37cdccb 100644--- a/packages/frontend/core/src/mobile/views/all-docs/doc/list.tsx+++ b/packages/frontend/core/src/mobile/views/all-docs/doc/list.tsx@@ -1,13 +1,10 @@import { EmptyDocs } from '@affine/core/components/affine/empty';import { useBlockSuiteDocMeta } from '@affine/core/components/hooks/use-block-suite-page-meta';import {- type ItemGroupDefinition,type ItemGroupProps,useAllDocDisplayProperties,useFilteredPageMetas,- usePageItemGroupDefinitions,} from '@affine/core/components/page-list';-import { itemsToItemGroups } from '@affine/core/components/page-list/items-to-item-group';import type { Tag } from '@affine/core/modules/tag';import type { Collection, Filter } from '@affine/env/filter';import type { DocMeta } from '@blocksuite/affine/store';@@ -19,7 +16,7 @@ import { useMemo } from 'react';import * as styles from './list.css';import { MasonryDocs } from './masonry';-const DocGroup = ({ group }: { group: ItemGroupProps<DocMeta> }) => {+export const DocGroup = ({ group }: { group: ItemGroupProps<DocMeta> }) => {const [properties] = useAllDocDisplayProperties();const showTags = properties.displayProperties.tags;@@ -53,6 +50,7 @@ export const AllDocList = ({tag,filters = [],}: AllDocListProps) => {+ const [properties] = useAllDocDisplayProperties();const workspace = useService(WorkspaceService).workspace;const allPageMetas = useBlockSuiteDocMeta(workspace.docCollection);@@ -72,22 +70,29 @@ export const AllDocList = ({return filteredPageMetas;}, [filteredPageMetas, tag, tagPageIds]);- const groupDefs =- usePageItemGroupDefinitions() as ItemGroupDefinition<DocMeta>[];+ // const groupDefs =+ // usePageItemGroupDefinitions() as ItemGroupDefinition<DocMeta>[];- const groups = useMemo(() => {- return itemsToItemGroups(finalPageMetas ?? [], groupDefs);- }, [finalPageMetas, groupDefs]);+ // const groups = useMemo(() => {+ // return itemsToItemGroups(finalPageMetas ?? [], groupDefs);+ // }, [finalPageMetas, groupDefs]);- if (!groups.length) {+ if (!finalPageMetas.length) {return <EmptyDocs absoluteCenter tagId={tag?.id} />;}+ // return (+ // <div className={styles.groups}>+ // {groups.map(group => (+ // <DocGroup key={group.id} group={group} />+ // ))}+ // </div>+ // );+return (- <div className={styles.groups}>- {groups.map(group => (- <DocGroup key={group.id} group={group} />- ))}- </div>+ <MasonryDocs+ items={finalPageMetas}+ showTags={properties.displayProperties.tags}+ />);};diff --git a/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.tsx b/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.tsxindex 4e887a9794..b7fd815a89 100644--- a/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.tsx+++ b/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.tsx@@ -1,31 +1,12 @@-import { useGlobalEvent } from '@affine/core/mobile/hooks/use-global-events';+import { Masonry } from '@affine/component';import type { DocMeta } from '@blocksuite/affine/store';-import { useCallback, useMemo, useState } from 'react';+import { useMemo } from 'react';import { calcRowsById, DocCard } from '../../../components';-import * as styles from './masonry.css';-const calcColumnCount = () => {- const maxCardWidth = 220;- const windowWidth = window.innerWidth;- const newColumnCount = Math.floor(- (windowWidth - styles.paddingX * 2 - styles.columnGap) / maxCardWidth- );- return Math.max(newColumnCount, 2);-};--const calcColumns = (items: DocMeta[], length: number) => {- const columns = Array.from({ length }, () => [] as DocMeta[]);- const heights = Array.from({ length }, () => 0);-- items.forEach(item => {- const itemHeight = calcRowsById(item.id);- const minHeightIndex = heights.indexOf(Math.min(...heights));- heights[minHeightIndex] += itemHeight;- columns[minHeightIndex].push(item);- });-- return columns;+const fullStyle = {+ width: '100%',+ height: '100%',};export const MasonryDocs = ({@@ -35,32 +16,29 @@ export const MasonryDocs = ({items: DocMeta[];showTags?: boolean;}) => {- const [columnCount, setColumnCount] = useState(calcColumnCount);-- const updateColumnCount = useCallback(() => {- setColumnCount(calcColumnCount());- }, []);- useGlobalEvent('resize', updateColumnCount);-- const columns = useMemo(- () => calcColumns(items, columnCount),- [items, columnCount]+ const masonryItems = useMemo(+ () =>+ items.map(item => {+ return {+ id: item.id,+ height: calcRowsById(item.id) * 18 + 95,+ children: (+ <DocCard style={fullStyle} meta={item} showTags={showTags} />+ ),+ };+ }),+ [items, showTags]);-return (- <div className={styles.columns}>- {columns.map((col, index) => (- <div key={`${columnCount}-${index}`} className={styles.column}>- {col.map(item => (- <DocCard- key={item.id}- showTags={showTags}- meta={item}- autoHeightById- />- ))}- </div>- ))}- </div>+ <Masonry+ style={fullStyle}+ itemWidthMin={160}+ gapX={17}+ gapY={10}+ paddingX={16}+ paddingY={16}+ virtualScroll+ items={masonryItems}+ />);};diff --git a/packages/frontend/core/src/mobile/views/all-docs/tag/detail-header.tsx b/packages/frontend/core/src/mobile/views/all-docs/tag/detail-header.tsxindex ec1434ad80..c87efc678e 100644--- a/packages/frontend/core/src/mobile/views/all-docs/tag/detail-header.tsx+++ b/packages/frontend/core/src/mobile/views/all-docs/tag/detail-header.tsx@@ -1,29 +1,14 @@-import { IconButton, MobileMenu } from '@affine/component';import { PageHeader } from '@affine/core/mobile/components';import type { Tag } from '@affine/core/modules/tag';-import { MoreHorizontalIcon } from '@blocksuite/icons/rc';import { useLiveData } from '@toeverything/infra';-import { AllDocsMenu } from '../doc';import * as styles from './detail.css';export const TagDetailHeader = ({ tag }: { tag: Tag }) => {const name = useLiveData(tag.value$);const color = useLiveData(tag.color$);return (- <PageHeader- className={styles.header}- back- suffix={- <MobileMenu items={<AllDocsMenu />}>- <IconButton- size="24"- style={{ padding: 10 }}- icon={<MoreHorizontalIcon />}- />- </MobileMenu>- }- >+ <PageHeader className={styles.header} back><div className={styles.headerContent}><div className={styles.headerIcon} style={{ color }} />{name}diff --git a/packages/frontend/core/src/mobile/views/all-docs/tag/detail.tsx b/packages/frontend/core/src/mobile/views/all-docs/tag/detail.tsxindex 1e040a536f..f11b68292a 100644--- a/packages/frontend/core/src/mobile/views/all-docs/tag/detail.tsx+++ b/packages/frontend/core/src/mobile/views/all-docs/tag/detail.tsx@@ -1,15 +1,13 @@+import { Page } from '@affine/core/mobile/components/page';import type { Tag } from '@affine/core/modules/tag';-import { AppTabs } from '../../../components';import { AllDocList } from '../doc';import { TagDetailHeader } from './detail-header';export const TagDetail = ({ tag }: { tag: Tag }) => {return (- <>- <TagDetailHeader tag={tag} />+ <Page header={<TagDetailHeader tag={tag} />} tab><AllDocList tag={tag} />- <AppTabs />- </>+ </Page>);};