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
refactor(mobile): impl all-docs masonry with css grid, close AF-1598 (#8731)
CatsJuiced8eda5e42dad
diff --git a/packages/frontend/core/src/mobile/components/doc-card/index.tsx b/packages/frontend/core/src/mobile/components/doc-card/index.tsxindex dfd0509735..d3834dd170 100644--- a/packages/frontend/core/src/mobile/components/doc-card/index.tsx+++ b/packages/frontend/core/src/mobile/components/doc-card/index.tsx@@ -10,21 +10,36 @@ import {import type { DocMeta } from '@blocksuite/affine/store';import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';import clsx from 'clsx';-import { forwardRef, type ReactNode } from 'react';+import { forwardRef, type ReactNode, useMemo } from 'react';import * as styles from './styles.css';import { DocCardTags } from './tag';+const calcRowsById = (id: string) => {+ const [MIN, MAX] = [2, 8];++ const code = id.charCodeAt(0);+ return Math.floor((code % (MAX - MIN)) + MIN);+};+export interface DocCardProps extends Omit<WorkbenchLinkProps, 'to'> {meta: {id: DocMeta['id'];title?: ReactNode;} & { [key: string]: any };showTags?: boolean;++ /**+ * When enabled, preview's height will be calculated based on `meta.id`+ */+ autoHeightById?: boolean;}export const DocCard = forwardRef<HTMLAnchorElement, DocCardProps>(- function DocCard({ showTags = true, meta, className, ...attrs }, ref) {+ function DocCard(+ { showTags = true, meta, className, autoHeightById, ...attrs },+ ref+ ) {const favAdapter = useService(CompatibleFavoriteItemsAdapter);const workspace = useService(WorkspaceService).workspace;@@ -38,6 +53,12 @@ export const DocCard = forwardRef<HTMLAnchorElement, DocCardProps>([favAdapter, meta.id]);+ const contentStyle = useMemo(() => {+ if (!autoHeightById) return { flex: 1 };+ const rows = calcRowsById(meta.id);+ return { height: `${rows * 18}px` };+ }, [autoHeightById, meta.id]);+return (<WorkbenchLinkto={`/${meta.id}`}@@ -57,7 +78,7 @@ export const DocCard = forwardRef<HTMLAnchorElement, DocCardProps>(}/></header>- <main className={styles.content}>+ <main className={styles.content} style={contentStyle}><PagePreviewdocCollection={workspace.docCollection}pageId={meta.id}diff --git a/packages/frontend/core/src/mobile/components/doc-card/styles.css.tsx b/packages/frontend/core/src/mobile/components/doc-card/styles.css.tsxindex d2b562b055..ffca37f3b2 100644--- a/packages/frontend/core/src/mobile/components/doc-card/styles.css.tsx+++ b/packages/frontend/core/src/mobile/components/doc-card/styles.css.tsx@@ -43,7 +43,6 @@ export const untitled = style({export const content = style([footnoteRegular,{- flex: 1,overflow: 'hidden',},]);diff --git a/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.css.ts b/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.css.tsindex 52222b1150..4fe2ac27d6 100644--- a/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.css.ts+++ b/packages/frontend/core/src/mobile/views/all-docs/doc/masonry.css.ts@@ -1,28 +1,13 @@import { style } from '@vanilla-extract/css';-export const invisibleWrapper = style({- position: 'absolute',- padding: 'inherit',- width: '100%',- height: 0,- overflow: 'hidden',- visibility: 'hidden',- pointerEvents: 'none',-});-export const invisibleList = style({- width: `calc(50% - 17px / 2)`,-});-export const stacks = style({- position: 'relative',- width: '100%',- display: 'flex',- gap: 17,- padding: 16,+export const paddingX = 16;+export const columnGap = 17;++export const masonry = style({+ padding: `16px ${paddingX}px`,+ columnGap: columnGap,});-export const stack = style({- width: 0,- flex: 1,- display: 'flex',- flexDirection: 'column',- gap: 10,+export const masonryItem = style({+ breakInside: 'avoid',+ marginBottom: 10,});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 254cfca0bb..57c453cd1a 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,10 +1,19 @@+import { useGlobalEvent } from '@affine/core/mobile/hooks/use-global-events';import type { DocMeta } from '@blocksuite/affine/store';-import { useMemo } from 'react';+import { useCallback, useState } from 'react';import { DocCard } from '../../../components';import * as styles from './masonry.css';-// TODO(@CatsJuice): Large amount docs performance+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);+};+export const MasonryDocs = ({items,showTags,@@ -12,25 +21,23 @@ export const MasonryDocs = ({items: DocMeta[];showTags?: boolean;}) => {- // card preview is loaded lazily, it's meaningless to calculate height- const stacks = useMemo(() => {- return items.reduce(- (acc, item, i) => {- acc[i % 2].push(item);- return acc;- },- [[], []] as [DocMeta[], DocMeta[]]- );- }, [items]);+ const [columnCount, setColumnCount] = useState(calcColumnCount);++ const updateColumnCount = useCallback(() => {+ setColumnCount(calcColumnCount());+ }, []);+ useGlobalEvent('resize', updateColumnCount);return (- <div className={styles.stacks}>- {stacks.map((stack, i) => (- <ul key={i} className={styles.stack}>- {stack.map(item => (- <DocCard showTags={showTags} key={item.id} meta={item} />- ))}- </ul>+ <div className={styles.masonry} style={{ columnCount }}>+ {items.map(item => (+ <DocCard+ key={item.id}+ className={styles.masonryItem}+ showTags={showTags}+ meta={item}+ autoHeightById+ />))}</div>);