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
fix(mobile): doc property styles (#8760)
pengx17fa82842cd7d2
diff --git a/packages/frontend/component/src/ui/date-picker/calendar/calendar.css.ts b/packages/frontend/component/src/ui/date-picker/calendar/calendar.css.tsindex 9b086a4c1f..2387b77e5d 100644--- a/packages/frontend/component/src/ui/date-picker/calendar/calendar.css.ts+++ b/packages/frontend/component/src/ui/date-picker/calendar/calendar.css.ts@@ -162,6 +162,7 @@ export const headerNavToday = style([padding: '0 4px',borderRadius: 4,color: cssVar('iconColor'),+ textTransform: 'uppercase',},]);@@ -192,6 +193,7 @@ export const monthViewBodyCell = style([height: '28px',},]);+export const monthViewBodyCellInner = style([interactive,{diff --git a/packages/frontend/component/src/ui/input/input.tsx b/packages/frontend/component/src/ui/input/input.tsxindex 2877313f0f..57c162aa0c 100644--- a/packages/frontend/component/src/ui/input/input.tsx+++ b/packages/frontend/component/src/ui/input/input.tsx@@ -9,7 +9,7 @@ import type {import { forwardRef } from 'react';import { RowInput } from './row-input';-import { input, inputWrapper } from './style.css';+import { input, inputWrapper, mobileInputWrapper } from './style.css';export type InputProps = {disabled?: boolean;@@ -50,19 +50,23 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(function Input() {return (<div- className={clsx(inputWrapper, className, {- // status- disabled: disabled,- 'no-border': noBorder,- // color- error: status === 'error',- success: status === 'success',- warning: status === 'warning',- default: status === 'default',- // size- large: size === 'large',- 'extra-large': size === 'extraLarge',- })}+ className={clsx(+ BUILD_CONFIG.isMobileEdition ? mobileInputWrapper : inputWrapper,+ className,+ {+ // status+ disabled: disabled,+ 'no-border': noBorder,+ // color+ error: status === 'error',+ success: status === 'success',+ warning: status === 'warning',+ default: status === 'default',+ // size+ large: size === 'large',+ 'extra-large': size === 'extraLarge',+ }+ )}style={{...style,}}diff --git a/packages/frontend/component/src/ui/input/style.css.ts b/packages/frontend/component/src/ui/input/style.css.tsindex 8f0a6342b3..0cc79fc52a 100644--- a/packages/frontend/component/src/ui/input/style.css.ts+++ b/packages/frontend/component/src/ui/input/style.css.ts@@ -51,6 +51,15 @@ export const inputWrapper = style({},},});++export const mobileInputWrapper = style([+ inputWrapper,+ {+ height: 30,+ borderRadius: 4,+ },+]);+export const input = style({height: '100%',width: '0',diff --git a/packages/frontend/component/src/ui/menu/mobile/root.tsx b/packages/frontend/component/src/ui/menu/mobile/root.tsxindex f7772c8a5e..13a6caac53 100644--- a/packages/frontend/component/src/ui/menu/mobile/root.tsx+++ b/packages/frontend/component/src/ui/menu/mobile/root.tsx@@ -131,6 +131,7 @@ export const MobileMenu = ({className={styles.menuContent}><Button+ data-testid="mobile-menu-back-button"variant="plain"className={styles.backButton}prefix={<ArrowLeftSmallIcon />}diff --git a/packages/frontend/component/src/ui/menu/mobile/styles.css.ts b/packages/frontend/component/src/ui/menu/mobile/styles.css.tsindex 93970358d9..0a7998d68f 100644--- a/packages/frontend/component/src/ui/menu/mobile/styles.css.ts+++ b/packages/frontend/component/src/ui/menu/mobile/styles.css.ts@@ -38,6 +38,7 @@ export const menuContent = style({width: '100%',flexShrink: 0,padding: '13px 0px 13px 0px',+ maxHeight: 'calc(100dvh - 32px)',});export const mobileMenuItem = style({diff --git a/packages/frontend/component/src/ui/menu/mobile/sub.tsx b/packages/frontend/component/src/ui/menu/mobile/sub.tsxindex 2a0cca07ed..eea419ada0 100644--- a/packages/frontend/component/src/ui/menu/mobile/sub.tsx+++ b/packages/frontend/component/src/ui/menu/mobile/sub.tsx@@ -30,7 +30,7 @@ export const MobileMenuSub = ({subContentOptions={contentOptions}title={title}>- <div className={className} {...otherTriggerOptions}>+ <div role="menuitem" className={className} {...otherTriggerOptions}>{children}</div></MobileMenuSubRaw>diff --git a/packages/frontend/component/src/ui/modal/styles.css.ts b/packages/frontend/component/src/ui/modal/styles.css.tsindex 740ea78f03..58e962eafc 100644--- a/packages/frontend/component/src/ui/modal/styles.css.ts+++ b/packages/frontend/component/src/ui/modal/styles.css.ts@@ -131,8 +131,8 @@ export const modalContent = style({width: widthVar,height: heightVar,minHeight: minHeightVar,- maxHeight: 'calc(100vh - 32px)',- maxWidth: 'calc(100vw - 20px)',+ maxHeight: 'calc(100dvh - 32px)',+ maxWidth: 'calc(100dvw - 20px)',boxSizing: 'border-box',fontSize: cssVar('fontBase'),fontWeight: '400',diff --git a/packages/frontend/component/src/ui/progress/progress.css.ts b/packages/frontend/component/src/ui/progress/progress.css.tsindex 5084803275..5124601dc0 100644--- a/packages/frontend/component/src/ui/progress/progress.css.ts+++ b/packages/frontend/component/src/ui/progress/progress.css.ts@@ -9,7 +9,7 @@ export const root = style({display: 'flex',alignItems: 'center',justifyContent: 'space-between',- width: 240,+ width: '100%',gap: 12,vars: {[progressHeight]: '10px',diff --git a/packages/frontend/component/src/ui/property/property.css.ts b/packages/frontend/component/src/ui/property/property.css.tsindex 71a4debf7f..428197c253 100644--- a/packages/frontend/component/src/ui/property/property.css.ts+++ b/packages/frontend/component/src/ui/property/property.css.ts@@ -7,6 +7,7 @@ export const propertyRoot = style({minHeight: 32,position: 'relative',padding: '2px 0px 2px 2px',+ flexWrap: 'wrap',selectors: {'&[draggable="true"]': {cursor: 'grab',@@ -170,7 +171,7 @@ export const section = style({export const sectionHeader = style({display: 'flex',alignItems: 'center',- gap: 4,+ gap: 20,padding: '4px 6px',minHeight: 30,});@@ -180,6 +181,7 @@ export const sectionHeaderTrigger = style({alignItems: 'center',gap: 4,flex: 1,+ overflow: 'hidden',});export const sectionHeaderIcon = style({@@ -195,6 +197,7 @@ export const sectionHeaderName = style({fontSize: cssVar('fontSm'),fontWeight: 500,whiteSpace: 'nowrap',+ overflow: 'hidden',selectors: {'&[data-collapsed="true"]': {color: cssVarV2('text/secondary'),diff --git a/packages/frontend/component/src/ui/property/property.tsx b/packages/frontend/component/src/ui/property/property.tsxindex e69c8bc588..622dbe9407 100644--- a/packages/frontend/component/src/ui/property/property.tsx+++ b/packages/frontend/component/src/ui/property/property.tsx@@ -364,7 +364,9 @@ export const PropertyValue = forwardRef<className={clsx(styles.propertyValueContainer, className)}data-readonly={readonly ? 'true' : 'false'}data-empty={isEmpty ? 'true' : 'false'}- data-hoverable={hoverable ? 'true' : 'false'}+ data-hoverable={+ hoverable && !BUILD_CONFIG.isMobileEdition ? 'true' : 'false'+ }data-property-value{...props}>diff --git a/packages/frontend/component/src/ui/tags/tag-edit-menu.tsx b/packages/frontend/component/src/ui/tags/tag-edit-menu.tsxdeleted file mode 100644index 96c650be68..0000000000--- a/packages/frontend/component/src/ui/tags/tag-edit-menu.tsx+++ /dev/null@@ -1,113 +0,0 @@-import { useI18n } from '@affine/i18n';-import { DeleteIcon, TagsIcon } from '@blocksuite/icons/rc';-import type { PropsWithChildren } from 'react';-import { useMemo } from 'react';--import Input from '../input';-import { Menu, MenuItem, type MenuProps, MenuSeparator } from '../menu';-import { Scrollable } from '../scrollbar';-import * as styles from './tag-edit-menu.css';-import type { TagColor, TagLike } from './types';--type TagEditMenuProps = PropsWithChildren<{- onTagDelete: (tagId: string) => void;- colors: TagColor[];- tag: TagLike;- onTagChange: (property: keyof TagLike, value: string) => void;- jumpToTag?: (tagId: string) => void;-}>;--export const TagEditMenu = ({- tag,- onTagDelete,- children,- jumpToTag,- colors,- onTagChange,-}: TagEditMenuProps) => {- const t = useI18n();-- const menuProps = useMemo(() => {- const updateTagName = (name: string) => {- if (name.trim() === '') {- return;- }- onTagChange('value', name);- };-- return {- contentOptions: {- onClick(e) {- e.stopPropagation();- },- },- items: (- <>- <Input- defaultValue={tag.value}- onBlur={e => {- updateTagName(e.currentTarget.value);- }}- onKeyDown={e => {- if (e.key === 'Enter') {- e.preventDefault();- updateTagName(e.currentTarget.value);- }- e.stopPropagation();- }}- placeholder={t['Untitled']()}- />- <MenuSeparator />- <MenuItem- prefixIcon={<DeleteIcon />}- type="danger"- onClick={() => {- tag?.id ? onTagDelete(tag.id) : null;- }}- >- {t['Delete']()}- </MenuItem>- {jumpToTag ? (- <MenuItem- prefixIcon={<TagsIcon />}- onClick={() => {- jumpToTag(tag.id);- }}- >- {t['com.affine.page-properties.tags.open-tags-page']()}- </MenuItem>- ) : null}- <MenuSeparator />- <Scrollable.Root>- <Scrollable.Viewport className={styles.menuItemList}>- {colors.map(({ name, value: color }, i) => (- <MenuItem- key={i}- checked={tag.color === color}- prefixIcon={- <div key={i} className={styles.tagColorIconWrapper}>- <div- className={styles.tagColorIcon}- style={{- backgroundColor: color,- }}- />- </div>- }- onClick={() => {- onTagChange('color', color);- }}- >- {name}- </MenuItem>- ))}- <Scrollable.Scrollbar className={styles.menuItemListScrollbar} />- </Scrollable.Viewport>- </Scrollable.Root>- </>- ),- } satisfies Partial<MenuProps>;- }, [tag, t, jumpToTag, colors, onTagChange, onTagDelete]);-- return <Menu {...menuProps}>{children}</Menu>;-};diff --git a/packages/frontend/component/src/ui/tags/tags.stories.tsx b/packages/frontend/component/src/ui/tags/tags.stories.tsxdeleted file mode 100644index e81a3903fa..0000000000--- a/packages/frontend/component/src/ui/tags/tags.stories.tsx+++ /dev/null@@ -1,120 +0,0 @@-import type { Meta, StoryFn } from '@storybook/react';-import { useState } from 'react';--import { InlineTagList } from './inline-tag-list';-import { TagItem } from './tag';-import { TagEditMenu } from './tag-edit-menu';-import { TagsInlineEditor } from './tags-editor';-import type { TagColor, TagLike } from './types';--export default {- title: 'UI/Tags',-} satisfies Meta;--const tags: TagLike[] = [- { id: '1', value: 'tag', color: 'red' },- { id: '2', value: 'tag2', color: 'blue' },- { id: '3', value: 'tag3', color: 'green' },-];--const tagColors: TagColor[] = [- { id: '1', value: 'red', name: 'Red' },- { id: '2', value: 'blue', name: 'Blue' },- { id: '3', value: 'green', name: 'Green' },-];--export const Tags: StoryFn = () => {- return (- <div style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}>- <TagItem- tag={{ id: '1', value: 'tag', color: 'red' }}- mode="inline-tag"- focused- onRemoved={() => {- console.log('removed');- }}- />- <TagItem- tag={{ id: '2', value: 'tag2', color: 'blue' }}- mode="inline-tag"- />- <TagItem- tag={{ id: '3', value: 'tag3', color: '#DCFDD7' }}- mode="db-label"- />- <TagItem- tag={{ id: '3', value: 'tag5', color: '#DCFDD7' }}- mode="db-label"- focused- onRemoved={() => {- console.log('removed');- }}- />- <TagItem tag={{ id: '1', value: 'tag', color: 'red' }} mode="list-tag" />- </div>- );-};--export const InlineTagListStory: StoryFn = () => {- return <InlineTagList tagMode="inline-tag" tags={tags} />;-};--export const TagEditMenuStory: StoryFn = () => {- return (- <TagEditMenu- tag={tags[0]}- colors={tagColors}- onTagChange={() => {}}- onTagDelete={() => {}}- jumpToTag={() => {}}- >- <div>Trigger Edit Tag Menu</div>- </TagEditMenu>- );-};--export const TagsInlineEditorStory: StoryFn = () => {- const [options, setOptions] = useState<TagLike[]>(tags);- const [selectedTags, setSelectedTags] = useState<string[]>(- options.slice(0, 1).map(item => item.id)- );-- return (- <TagsInlineEditor- tags={options}- tagMode="db-label"- selectedTags={selectedTags}- onCreateTag={(name, color) => {- const newTag = {- id: (options.at(-1)!.id ?? 0) + 1,- value: name,- color,- };- setOptions(prev => [...prev, newTag]);- return newTag;- }}- tagColors={tagColors}- onTagChange={(id, property, value) => {- setOptions(prev => {- const index = prev.findIndex(item => item.id === id);- if (index === -1) {- return prev;- }- return options.toSpliced(index, 1, {- ...options[index],- [property]: value,- });- });- }}- onDeleteTag={tagId => {- setOptions(prev => prev.filter(item => item.id !== tagId));- }}- onSelectTag={tagId => {- setSelectedTags(prev => [...prev, tagId]);- }}- onDeselectTag={tagId => {- setSelectedTags(prev => prev.filter(id => id !== tagId));- }}- />- );-};diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx b/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsxindex 3def42d10f..b852d4b541 100644--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx@@ -280,12 +280,15 @@ export const BlocksuiteDocEditor = forwardRef<<BlocksuiteEditorJournalDocTitle page={page} />)}{!shared && displayDocInfo ? (- <DocPropertiesTable- onDatabasePropertyChange={onDatabasePropertyChange}- onPropertyChange={onPropertyChange}- onPropertyAdded={onPropertyAdded}- defaultOpenProperty={defaultOpenProperty}- />+ <div className={styles.docPropertiesTableContainer}>+ <DocPropertiesTable+ className={styles.docPropertiesTable}+ onDatabasePropertyChange={onDatabasePropertyChange}+ onPropertyChange={onPropertyChange}+ onPropertyAdded={onPropertyAdded}+ defaultOpenProperty={defaultOpenProperty}+ />+ </div>) : null}<adapted.DocEditorclassName={styles.docContainer}diff --git a/packages/frontend/core/src/components/blocksuite/block-suite-editor/styles.css.ts b/packages/frontend/core/src/components/blocksuite/block-suite-editor/styles.css.tsindex 32558b5aae..30d8ecdf64 100644--- a/packages/frontend/core/src/components/blocksuite/block-suite-editor/styles.css.ts+++ b/packages/frontend/core/src/components/blocksuite/block-suite-editor/styles.css.ts@@ -60,3 +60,23 @@ export const pageReferenceIcon = style({fontSize: '1.1em',transform: 'translate(2px, -1px)',});++export const docPropertiesTableContainer = style({+ display: 'flex',+ width: '100%',+ justifyContent: 'center',+});++export const docPropertiesTable = style({+ display: 'flex',+ flexDirection: 'column',+ gap: 8,+ width: '100%',+ maxWidth: cssVar('editorWidth'),+ padding: `0 ${cssVar('editorSidePadding', '24px')}`,+ '@container': {+ [`viewport (width <= 640px)`]: {+ padding: '0 16px',+ },+ },+});diff --git a/packages/frontend/core/src/components/doc-properties/icons/icons-selector.css.ts b/packages/frontend/core/src/components/doc-properties/icons/icons-selector.css.tsindex 189ad976bb..65aa72a8d3 100644--- a/packages/frontend/core/src/components/doc-properties/icons/icons-selector.css.ts+++ b/packages/frontend/core/src/components/doc-properties/icons/icons-selector.css.ts@@ -16,6 +16,7 @@ export const iconsRow = style({fontWeight: 500,padding: '0 6px',gap: '8px',+ justifyContent: 'space-between',});export const iconButton = style({diff --git a/packages/frontend/core/src/components/doc-properties/menu/edit-doc-property.css.ts b/packages/frontend/core/src/components/doc-properties/menu/edit-doc-property.css.tsindex 4cd1593108..dc735ea3ce 100644--- a/packages/frontend/core/src/components/doc-properties/menu/edit-doc-property.css.ts+++ b/packages/frontend/core/src/components/doc-properties/menu/edit-doc-property.css.ts@@ -14,6 +14,13 @@ export const propertyRowNamePopupRow = style({minWidth: 260,});+export const mobilePropertyRowNamePopupRow = style([+ propertyRowNamePopupRow,+ {+ padding: '8px 20px',+ },+]);+export const propertyRowTypeItem = style({display: 'flex',flexDirection: 'row',@@ -25,6 +32,13 @@ export const propertyRowTypeItem = style({minWidth: 260,});+export const mobilePropertyRowTypeItem = style([+ propertyRowTypeItem,+ {+ padding: '8px 20px',+ },+]);+export const propertyTypeName = style({color: cssVarV2('text/secondary'),fontSize: cssVar('fontSm'),@@ -40,3 +54,7 @@ export const propertyName = style({display: 'flex',alignItems: 'center',});++export const mobileRootWrapper = style({+ padding: '10px 16px',+});diff --git a/packages/frontend/core/src/components/doc-properties/menu/edit-doc-property.tsx b/packages/frontend/core/src/components/doc-properties/menu/edit-doc-property.tsxindex f47e78fbff..74650a7670 100644--- a/packages/frontend/core/src/components/doc-properties/menu/edit-doc-property.tsx+++ b/packages/frontend/core/src/components/doc-properties/menu/edit-doc-property.tsx@@ -121,7 +121,11 @@ export const EditDocPropertyMenuItems = ({return (<><div- className={styles.propertyRowNamePopupRow}+ className={+ BUILD_CONFIG.isMobileEdition+ ? styles.mobilePropertyRowNamePopupRow+ : styles.propertyRowNamePopupRow+ }data-testid="edit-property-menu-item"><DocPropertyIconSelector@@ -140,7 +144,13 @@ export const EditDocPropertyMenuItems = ({/>)}</div>- <div className={styles.propertyRowTypeItem}>+ <div+ className={+ BUILD_CONFIG.isMobileEdition+ ? styles.mobilePropertyRowTypeItem+ : styles.propertyRowTypeItem+ }+ >{t['com.affine.page-properties.create-property.menu.header']()}<div className={styles.propertyTypeName}><DocPropertyIcon propertyInfo={propertyInfo} />diff --git a/packages/frontend/core/src/components/doc-properties/table.css.ts b/packages/frontend/core/src/components/doc-properties/table.css.tsindex c5634db2a9..5ab2014ef3 100644--- a/packages/frontend/core/src/components/doc-properties/table.css.ts+++ b/packages/frontend/core/src/components/doc-properties/table.css.ts@@ -6,9 +6,7 @@ const propertyNameCellWidth = createVar();export const fontSize = createVar();export const root = style({- display: 'flex',width: '100%',- justifyContent: 'center',fontFamily: cssVar('fontSansFamily'),paddingBottom: '18px',vars: {@@ -24,20 +22,6 @@ export const root = style({},});-export const rootCentered = style({- display: 'flex',- flexDirection: 'column',- gap: 8,- width: '100%',- maxWidth: cssVar('editorWidth'),- padding: `0 ${cssVar('editorSidePadding', '24px')}`,- '@container': {- [`viewport (width <= 640px)`]: {- padding: '0 16px',- },- },-});-export const tableHeader = style({display: 'flex',height: 30,diff --git a/packages/frontend/core/src/components/doc-properties/table.tsx b/packages/frontend/core/src/components/doc-properties/table.tsxindex ba602d3e4c..dd26353bc5 100644--- a/packages/frontend/core/src/components/doc-properties/table.tsx+++ b/packages/frontend/core/src/components/doc-properties/table.tsx@@ -49,6 +49,7 @@ export type DefaultOpenProperty =};export interface DocPropertiesTableProps {+ className?: string;defaultOpenProperty?: DefaultOpenProperty;onPropertyAdded?: (property: DocCustomPropertyInfo) => void;onPropertyChange?: (property: DocCustomPropertyInfo, value: unknown) => void;@@ -351,16 +352,17 @@ const DocPropertiesTableInner = ({onPropertyAdded,onPropertyChange,onDatabasePropertyChange,+ className,}: DocPropertiesTableProps) => {const [expanded, setExpanded] = useState(!!defaultOpenProperty);return (- <div className={styles.root}>- <Collapsible.Root- open={expanded}- onOpenChange={setExpanded}- className={styles.rootCentered}- >- <DocPropertiesTableHeader open={expanded} onOpenChange={setExpanded} />+ <div className={clsx(styles.root, className)}>+ <Collapsible.Root open={expanded} onOpenChange={setExpanded}>+ <DocPropertiesTableHeader+ style={{ width: '100%' }}+ open={expanded}+ onOpenChange={setExpanded}+ /><Collapsible.Content><DocWorkspacePropertiesTableBodydefaultOpen={diff --git a/packages/frontend/core/src/components/doc-properties/tags-inline-editor.tsx b/packages/frontend/core/src/components/doc-properties/tags-inline-editor.tsxindex 82e901c529..5aeeab1f86 100644--- a/packages/frontend/core/src/components/doc-properties/tags-inline-editor.tsx+++ b/packages/frontend/core/src/components/doc-properties/tags-inline-editor.tsx@@ -1,7 +1,7 @@-import type { TagLike } from '@affine/component/ui/tags';-import { TagsInlineEditor as TagsInlineEditorComponent } from '@affine/component/ui/tags';import { TagService, useDeleteTagConfirmModal } from '@affine/core/modules/tag';+import { useI18n } from '@affine/i18n';import track from '@affine/track';+import { TagsIcon } from '@blocksuite/icons/rc';import {LiveData,useLiveData,@@ -12,6 +12,10 @@ import { useCallback, useMemo } from 'react';import { useAsyncCallback } from '../hooks/affine-async-hooks';import { useNavigateHelper } from '../hooks/use-navigate-helper';+import {+ type TagLike,+ TagsInlineEditor as TagsInlineEditorComponent,+} from '../tags';interface TagsEditorProps {pageId: string;@@ -126,6 +130,8 @@ export const TagsInlineEditor = ({[navigator, workspace.workspace.id]);+ const t = useI18n();+return (<TagsInlineEditorComponenttagMode="inline-tag"@@ -141,6 +147,12 @@ export const TagsInlineEditor = ({tagColors={adaptedTagColors}onTagChange={onTagChange}onDeleteTag={onTagDelete}+ title={+ <>+ <TagsIcon />+ {t['Tags']()}+ </>+ }/>);};diff --git a/packages/frontend/core/src/components/doc-properties/types/journal.css.ts b/packages/frontend/core/src/components/doc-properties/types/journal.css.tsindex 787a65700a..f2b25ef2f5 100644--- a/packages/frontend/core/src/components/doc-properties/types/journal.css.ts+++ b/packages/frontend/core/src/components/doc-properties/types/journal.css.ts@@ -24,6 +24,7 @@ export const date = style({lineHeight: '22px',padding: '0 4px',borderRadius: 4,+ whiteSpace: 'nowrap',':hover': {background: cssVarV2('layer/background/hoverOverlay'),},diff --git a/packages/frontend/core/src/components/doc-properties/types/journal.tsx b/packages/frontend/core/src/components/doc-properties/types/journal.tsxindex 79bdb5f8a0..c11525d55e 100644--- a/packages/frontend/core/src/components/doc-properties/types/journal.tsx+++ b/packages/frontend/core/src/components/doc-properties/types/journal.tsx@@ -10,7 +10,7 @@ import {useServiceOptional,} from '@toeverything/infra';import dayjs from 'dayjs';-import { useCallback, useEffect, useMemo, useState } from 'react';+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';import * as styles from './journal.css';@@ -58,6 +58,7 @@ export const JournalValue = () => {(_: unknown, v: boolean) => {if (!v) {journalService.removeJournalDate(doc.id);+ setShowDatePicker(false);} else {handleDateSelect(selectedDate);}@@ -71,6 +72,10 @@ export const JournalValue = () => {const handleOpenDuplicate = useCallback((e: React.MouseEvent) => {+ // todo: open duplicate dialog for mobile+ if (BUILD_CONFIG.isMobileEdition) {+ return;+ }e.stopPropagation();workbench.openSidebar();view.activeSidebarTab('journal');@@ -78,12 +83,23 @@ export const JournalValue = () => {[view, workbench]);- const toggle = useCallback(() => {- handleCheck(null, !checked);- }, [checked, handleCheck]);+ const propertyRef = useRef<HTMLDivElement>(null);++ const toggle = useCallback(+ (e: React.MouseEvent) => {+ if (propertyRef.current?.contains(e.target as Node)) {+ handleCheck(null, !checked);+ }+ },+ [checked, handleCheck]+ );return (- <PropertyValue className={styles.property} onClick={toggle}>+ <PropertyValue+ ref={propertyRef}+ className={styles.property}+ onClick={toggle}+ ><div className={styles.root}><CheckboxclassName={styles.checkbox}@@ -113,7 +129,13 @@ export const JournalValue = () => {/>}>- <div data-testid="date-selector" className={styles.date}>+ <div+ data-testid="date-selector"+ className={styles.date}+ onClick={e => {+ e.stopPropagation();+ }}+ >{displayDate}</div></Menu>diff --git a/packages/frontend/core/src/components/doc-properties/types/number.css.ts b/packages/frontend/core/src/components/doc-properties/types/number.css.tsindex 6924839cb3..23d6c49883 100644--- a/packages/frontend/core/src/components/doc-properties/types/number.css.ts+++ b/packages/frontend/core/src/components/doc-properties/types/number.css.ts@@ -1,4 +1,5 @@import { cssVar } from '@toeverything/theme';+import { cssVarV2 } from '@toeverything/theme/v2';import { style } from '@vanilla-extract/css';export const numberPropertyValueInput = style({@@ -23,3 +24,18 @@ export const numberPropertyValueInput = style({export const numberPropertyValueContainer = style({padding: '0px',});++export const numberIcon = style({+ color: cssVarV2('icon/primary'),+});++export const mobileNumberPropertyValueInput = style([+ numberPropertyValueInput,+ {+ selectors: {+ 'input&': {+ border: `1px solid ${cssVar('blue700')}`,+ },+ },+ },+]);diff --git a/packages/frontend/core/src/components/doc-properties/types/number.tsx b/packages/frontend/core/src/components/doc-properties/types/number.tsxindex b7ce4d9d41..d4ceee6d93 100644--- a/packages/frontend/core/src/components/doc-properties/types/number.tsx+++ b/packages/frontend/core/src/components/doc-properties/types/number.tsx@@ -1,5 +1,6 @@import { PropertyValue } from '@affine/component';import { useI18n } from '@affine/i18n';+import { NumberIcon } from '@blocksuite/icons/rc';import {type ChangeEventHandler,useCallback,@@ -7,10 +8,11 @@ import {useState,} from 'react';+import { ConfigModal } from '../../mobile';import * as styles from './number.css';import type { PropertyValueProps } from './types';-export const NumberValue = ({ value, onChange }: PropertyValueProps) => {+const DesktopNumberValue = ({ value, onChange }: PropertyValueProps) => {const parsedValue = isNaN(Number(value)) ? null : value;const [tempValue, setTempValue] = useState(parsedValue);const handleBlur = useCallback(@@ -48,3 +50,79 @@ export const NumberValue = ({ value, onChange }: PropertyValueProps) => {</PropertyValue>);};++const MobileNumberValue = ({+ value,+ onChange,+ propertyInfo,+}: PropertyValueProps) => {+ const parsedValue = isNaN(Number(value)) ? null : value;+ const [tempValue, setTempValue] = useState(parsedValue);+ const handleBlur = useCallback(+ (e: React.ChangeEvent<HTMLInputElement>) => {+ onChange(e.target.value.trim());+ },+ [onChange]+ );+ const handleOnChange: ChangeEventHandler<HTMLInputElement> = useCallback(+ e => {+ setTempValue(e.target.value.trim());+ },+ []+ );+ const t = useI18n();+ useEffect(() => {+ setTempValue(parsedValue);+ }, [parsedValue]);++ const [open, setOpen] = useState(false);+ const onClose = useCallback(() => {+ setOpen(false);+ onChange(tempValue);+ }, [onChange, tempValue]);++ return (+ <>+ <PropertyValue+ className={styles.numberPropertyValueContainer}+ isEmpty={!parsedValue}+ onClick={() => {+ setOpen(true);+ }}+ >+ <div className={styles.mobileNumberPropertyValueInput}>+ {value ||+ t['com.affine.page-properties.property-value-placeholder']()}+ </div>+ </PropertyValue>+ <ConfigModal+ open={open}+ variant="popup"+ onDone={onClose}+ onOpenChange={setOpen}+ title={+ <>+ <NumberIcon className={styles.numberIcon} />+ {propertyInfo?.name}+ </>+ }+ >+ <input+ className={styles.mobileNumberPropertyValueInput}+ type={'number'}+ value={tempValue || ''}+ onChange={handleOnChange}+ onBlur={handleBlur}+ data-empty={!tempValue}+ placeholder={t[+ 'com.affine.page-properties.property-value-placeholder'+ ]()}+ />+ </ConfigModal>+ </>+ );+};++export const NumberValue = BUILD_CONFIG.isMobileEdition+ ? MobileNumberValue+ : DesktopNumberValue;diff --git a/packages/frontend/core/src/components/doc-properties/types/text.css.ts b/packages/frontend/core/src/components/doc-properties/types/text.css.tsindex aa0295cfdc..b2f3922cba 100644--- a/packages/frontend/core/src/components/doc-properties/types/text.css.ts+++ b/packages/frontend/core/src/components/doc-properties/types/text.css.ts@@ -25,6 +25,32 @@ export const textarea = style({},});+export const mobileTextareaWrapper = style({+ position: 'relative',+ background: cssVarV2('layer/background/primary'),+ borderRadius: 12,+});++const mobileTextareaBase = {+ fontSize: 17,+ lineHeight: '26px',+ padding: 12,+};++export const mobileTextareaPlain = style([+ textarea,+ mobileTextareaBase,+ {+ position: 'relative',+ fontSize: 14,+ lineHeight: '22px',+ height: 'auto',+ padding: 0,+ },+]);++export const mobileTextarea = style([textarea, mobileTextareaBase]);+export const textPropertyValueContainer = style({outline: `1px solid transparent`,padding: `6px`,@@ -43,4 +69,7 @@ export const textInvisible = style({visibility: 'hidden',fontSize: cssVar('fontSm'),lineHeight: '22px',+ padding: `6px`,});++export const mobileTextInvisible = style([textInvisible, mobileTextareaBase]);diff --git a/packages/frontend/core/src/components/doc-properties/types/text.tsx b/packages/frontend/core/src/components/doc-properties/types/text.tsxindex 1885844a4a..6c11da3f2f 100644--- a/packages/frontend/core/src/components/doc-properties/types/text.tsx+++ b/packages/frontend/core/src/components/doc-properties/types/text.tsx@@ -1,5 +1,6 @@import { PropertyValue } from '@affine/component';import { useI18n } from '@affine/i18n';+import { TextIcon } from '@blocksuite/icons/rc';import {type ChangeEventHandler,useCallback,@@ -8,10 +9,11 @@ import {useState,} from 'react';+import { ConfigModal } from '../../mobile';import * as styles from './text.css';import type { PropertyValueProps } from './types';-export const TextValue = ({ value, onChange }: PropertyValueProps) => {+const DesktopTextValue = ({ value, onChange }: PropertyValueProps) => {const [tempValue, setTempValue] = useState<string>(value);const handleClick = useCallback((e: React.MouseEvent) => {e.stopPropagation();@@ -68,3 +70,94 @@ export const TextValue = ({ value, onChange }: PropertyValueProps) => {</PropertyValue>);};++const MobileTextValue = ({+ value,+ onChange,+ propertyInfo,+}: PropertyValueProps) => {+ const [open, setOpen] = useState(false);++ const [tempValue, setTempValue] = useState<string>(value);+ const handleClick = useCallback((e: React.MouseEvent) => {+ e.stopPropagation();+ setOpen(true);+ }, []);+ const ref = useRef<HTMLTextAreaElement>(null);+ const handleBlur = useCallback(+ (e: FocusEvent) => {+ onChange((e.currentTarget as HTMLTextAreaElement).value.trim());+ },+ [onChange]+ );+ // use native blur event to get event after unmount+ // don't use useLayoutEffect here, cause the cleanup function will be called before unmount+ useEffect(() => {+ ref.current?.addEventListener('blur', handleBlur);+ return () => {+ // eslint-disable-next-line react-hooks/exhaustive-deps+ ref.current?.removeEventListener('blur', handleBlur);+ };+ }, [handleBlur]);+ const handleOnChange: ChangeEventHandler<HTMLTextAreaElement> = useCallback(+ e => {+ setTempValue(e.target.value);+ },+ []+ );+ const onClose = useCallback(() => {+ setOpen(false);+ onChange(tempValue.trim());+ }, [onChange, tempValue]);+ const t = useI18n();+ useEffect(() => {+ setTempValue(value);+ }, [value]);++ return (+ <PropertyValue+ className={styles.textPropertyValueContainer}+ onClick={handleClick}+ isEmpty={!value}+ >+ <div className={styles.mobileTextareaPlain} data-empty={!tempValue}>+ {tempValue ||+ t['com.affine.page-properties.property-value-placeholder']()}+ </div>++ <ConfigModal+ open={open}+ onOpenChange={setOpen}+ onBack={onClose}+ title={+ <>+ <TextIcon />+ {propertyInfo?.name}+ </>+ }+ >+ <div className={styles.mobileTextareaWrapper}>+ <textarea+ ref={ref}+ className={styles.mobileTextarea}+ value={tempValue || ''}+ onChange={handleOnChange}+ data-empty={!tempValue}+ autoFocus+ placeholder={t[+ 'com.affine.page-properties.property-value-placeholder'+ ]()}+ />+ <div className={styles.mobileTextInvisible}>+ {tempValue}+ {tempValue?.endsWith('\n') || !tempValue ? <br /> : null}+ </div>+ </div>+ </ConfigModal>+ </PropertyValue>+ );+};++export const TextValue = BUILD_CONFIG.isMobileWeb+ ? MobileTextValue+ : DesktopTextValue;diff --git a/packages/frontend/core/src/components/mobile/config-modal/index.tsx b/packages/frontend/core/src/components/mobile/config-modal/index.tsxnew file mode 100644index 0000000000..e91edb8db4--- /dev/null+++ b/packages/frontend/core/src/components/mobile/config-modal/index.tsx@@ -0,0 +1,139 @@+import { Button, Modal } from '@affine/component';+import { useI18n } from '@affine/i18n';+import clsx from 'clsx';+import {+ type CSSProperties,+ forwardRef,+ type HTMLProps,+ type ReactNode,+} from 'react';++import { PageHeader } from '../page-header';+import * as styles from './styles.css';++interface ConfigModalProps {+ onBack?: () => void;+ onDone?: () => void;+ open: boolean;+ onOpenChange: (open: boolean) => void;+ title?: ReactNode;+ children: ReactNode;+ variant?: 'popup' | 'page';+}++/**+ * A modal with a page header for configuring something on mobile (preferable to be fullscreen)+ */+export const ConfigModal = ({+ onBack,+ onDone,+ open,+ onOpenChange,+ title,+ children,+ variant = 'page',+}: ConfigModalProps) => {+ const t = useI18n();+ return (+ <Modal+ onOpenChange={onOpenChange}+ open={open}+ fullScreen={variant === 'page'}+ width="100%"+ minHeight={0}+ animation="slideBottom"+ withoutCloseButton+ contentOptions={{+ onClick: e => {+ e.stopPropagation();+ },+ className:+ variant === 'page'+ ? styles.pageModalContent+ : styles.popupModalContent,+ }}+ >+ {variant === 'page' ? (+ <PageHeader+ back={!!onBack}+ backAction={onBack}+ suffix={+ onDone ? (+ <Button+ style={{+ fontSize: 17,+ fontWeight: 600,+ }}+ className={styles.doneButton}+ variant="plain"+ onClick={onDone}+ >+ {t['Done']()}+ </Button>+ ) : undefined+ }+ >+ <div className={styles.pageTitle}>{title}</div>+ </PageHeader>+ ) : null}+ <div+ className={+ variant === 'page' ? styles.pageContent : styles.popupContent+ }+ >+ {variant === 'page' ? null : (+ <div className={styles.popupTitle}>{title}</div>+ )}+ {children}+ {variant === 'popup' && onDone ? (+ <Button+ variant="primary"+ className={styles.bottomDoneButton}+ onClick={onDone}+ >+ {t['Done']()}+ </Button>+ ) : null}+ </div>+ </Modal>+ );+};++export const ConfigRow = forwardRef<HTMLDivElement, HTMLProps<HTMLDivElement>>(+ function ConfigRow({ children, className, ...attrs }, ref) {+ return (+ <div className={clsx(styles.rowItem, className)} ref={ref} {...attrs}>+ {children}+ </div>+ );+ }+);++export interface SettingGroupProps+ extends Omit<HTMLProps<HTMLDivElement>, 'title'> {+ title?: ReactNode;+ contentClassName?: string;+ contentStyle?: CSSProperties;+}++export const ConfigRowGroup = forwardRef<HTMLDivElement, SettingGroupProps>(+ function ConfigRowGroup(+ { children, title, className, contentClassName, contentStyle, ...attrs },+ ref+ ) {+ return (+ <div className={clsx(styles.group, className)} ref={ref} {...attrs}>+ {title ? <div className={styles.groupTitle}>{title}</div> : null}+ <div+ className={clsx(styles.groupContent, contentClassName)}+ style={contentStyle}+ >+ {children}+ </div>+ </div>+ );+ }+);++ConfigModal.RowGroup = ConfigRowGroup;+ConfigModal.Row = ConfigRow;diff --git a/packages/frontend/core/src/components/mobile/config-modal/styles.css.ts b/packages/frontend/core/src/components/mobile/config-modal/styles.css.tsnew file mode 100644index 0000000000..71d8c385ba--- /dev/null+++ b/packages/frontend/core/src/components/mobile/config-modal/styles.css.ts@@ -0,0 +1,89 @@+import {+ bodyEmphasized,+ footnoteRegular,+} from '@toeverything/theme/typography';+import { cssVarV2 } from '@toeverything/theme/v2';+import { style } from '@vanilla-extract/css';++export const pageModalContent = style({+ padding: 0,+ overflowY: 'auto',+ backgroundColor: cssVarV2('layer/background/secondary'),+});++export const popupModalContent = style({});++export const pageTitle = style([+ bodyEmphasized,+ {+ color: cssVarV2('text/primary'),+ display: 'inline-flex',+ alignItems: 'center',+ gap: 8,+ },+]);++export const popupTitle = style([+ bodyEmphasized,+ {+ display: 'flex',+ alignItems: 'center',+ gap: 8,+ color: cssVarV2('text/primary'),+ },+]);++export const pageContent = style({+ padding: '24px 16px',+ display: 'flex',+ flexDirection: 'column',+ gap: 16,+});++export const popupContent = style({+ display: 'flex',+ flexDirection: 'column',+ gap: 16,+});++export const doneButton = style([+ bodyEmphasized,+ {+ color: cssVarV2('button/primary'),+ },+]);++export const bottomDoneButton = style({+ width: '100%',+});++export const group = style({+ display: 'flex',+ flexDirection: 'column',+ gap: 4,+ width: '100%',+});++export const groupTitle = style([+ footnoteRegular,+ {+ color: cssVarV2('text/tertiary'),+ padding: 4,+ },+]);++export const groupContent = style({+ background: cssVarV2('layer/background/primary'),+ borderRadius: 12,+ padding: 4,+ display: 'flex',+ flexDirection: 'column',+ gap: 8,+});++export const rowItem = style({+ display: 'flex',+ alignItems: 'center',+ gap: 8,+ padding: '8px 4px',+});diff --git a/packages/frontend/core/src/components/mobile/index.ts b/packages/frontend/core/src/components/mobile/index.tsnew file mode 100644index 0000000000..d9dfbc4fa2--- /dev/null+++ b/packages/frontend/core/src/components/mobile/index.ts@@ -0,0 +1,2 @@+export * from './config-modal';+export * from './page-header';diff --git a/packages/frontend/core/src/mobile/components/page-header/index.tsx b/packages/frontend/core/src/components/mobile/page-header/index.tsxsimilarity index 100%rename from packages/frontend/core/src/mobile/components/page-header/index.tsxrename to packages/frontend/core/src/components/mobile/page-header/index.tsxdiff --git a/packages/frontend/core/src/mobile/components/page-header/styles.css.ts b/packages/frontend/core/src/components/mobile/page-header/styles.css.tssimilarity index 100%rename from packages/frontend/core/src/mobile/components/page-header/styles.css.tsrename to packages/frontend/core/src/components/mobile/page-header/styles.css.tsdiff --git a/packages/frontend/core/src/components/page-list/docs/page-tags.tsx b/packages/frontend/core/src/components/page-list/docs/page-tags.tsxindex ab5a9ddc1d..2393bf7219 100644--- a/packages/frontend/core/src/components/page-list/docs/page-tags.tsx+++ b/packages/frontend/core/src/components/page-list/docs/page-tags.tsx@@ -1,5 +1,5 @@import { Menu } from '@affine/component';-import { TagItem as TagItemComponent } from '@affine/component/ui/tags';+import { TagItem as TagItemComponent } from '@affine/core/components/tags';import type { Tag } from '@affine/core/modules/tag';import { stopPropagation } from '@affine/core/utils';import { MoreHorizontalIcon } from '@blocksuite/icons/rc';diff --git a/packages/frontend/component/src/ui/tags/index.ts b/packages/frontend/core/src/components/tags/index.tssimilarity index 100%rename from packages/frontend/component/src/ui/tags/index.tsrename to packages/frontend/core/src/components/tags/index.tsdiff --git a/packages/frontend/component/src/ui/tags/inline-tag-list.css.ts b/packages/frontend/core/src/components/tags/inline-tag-list.css.tssimilarity index 100%rename from packages/frontend/component/src/ui/tags/inline-tag-list.css.tsrename to packages/frontend/core/src/components/tags/inline-tag-list.css.tsdiff --git a/packages/frontend/component/src/ui/tags/inline-tag-list.tsx b/packages/frontend/core/src/components/tags/inline-tag-list.tsxsimilarity index 100%rename from packages/frontend/component/src/ui/tags/inline-tag-list.tsxrename to packages/frontend/core/src/components/tags/inline-tag-list.tsxdiff --git a/packages/frontend/component/src/ui/tags/readme.md b/packages/frontend/core/src/components/tags/readme.mdsimilarity index 100%rename from packages/frontend/component/src/ui/tags/readme.mdrename to packages/frontend/core/src/components/tags/readme.mddiff --git a/packages/frontend/component/src/ui/tags/styles.css.ts b/packages/frontend/core/src/components/tags/styles.css.tssimilarity index 70%rename from packages/frontend/component/src/ui/tags/styles.css.tsrename to packages/frontend/core/src/components/tags/styles.css.tsindex 2166a3e68a..332c79495d 100644--- a/packages/frontend/component/src/ui/tags/styles.css.ts+++ b/packages/frontend/core/src/components/tags/styles.css.ts@@ -1,4 +1,5 @@import { cssVar } from '@toeverything/theme';+import { cssVarV2 } from '@toeverything/theme/v2';import { globalStyle, style } from '@vanilla-extract/css';export const tagsInlineEditor = style({@@ -16,6 +17,13 @@ export const tagsEditorRoot = style({gap: '12px',});+export const tagsEditorRootMobile = style([+ tagsEditorRoot,+ {+ gap: 20,+ },+]);+export const inlineTagsContainer = style({display: 'flex',gap: '6px',@@ -39,6 +47,12 @@ export const tagsEditorSelectedTags = style({padding: '10px 12px',backgroundColor: cssVar('hoverColor'),minHeight: 42,+ selectors: {+ [`${tagsEditorRootMobile} &`]: {+ borderRadius: 12,+ backgroundColor: cssVarV2('layer/background/primary'),+ },+ },});export const searchInput = style({@@ -63,6 +77,11 @@ export const tagsEditorTagsSelector = style({padding: '0 8px 8px 8px',maxHeight: '400px',overflow: 'auto',+ selectors: {+ [`${tagsEditorRootMobile} &`]: {+ padding: 0,+ },+ },});export const tagsEditorTagsSelectorHeader = style({@@ -73,6 +92,11 @@ export const tagsEditorTagsSelectorHeader = style({fontSize: cssVar('fontXs'),fontWeight: 500,color: cssVar('textSecondaryColor'),+ selectors: {+ [`${tagsEditorRootMobile} &`]: {+ fontSize: cssVar('fontSm'),+ },+ },});export const tagSelectorTagsScrollContainer = style({@@ -80,6 +104,14 @@ export const tagSelectorTagsScrollContainer = style({position: 'relative',maxHeight: '200px',gap: '8px',+ selectors: {+ [`${tagsEditorRootMobile} &`]: {+ borderRadius: 12,+ backgroundColor: cssVarV2('layer/background/primary'),+ gap: 0,+ padding: 4,+ },+ },});export const tagSelectorItem = style({@@ -95,13 +127,20 @@ export const tagSelectorItem = style({'&[data-focused=true]': {backgroundColor: cssVar('hoverColor'),},+ [`${tagsEditorRootMobile} &`]: {+ height: 44,+ },+ [`${tagsEditorRootMobile} &[data-focused="true"]`]: {+ height: 44,+ backgroundColor: 'transparent',+ },},});export const tagEditIcon = style({opacity: 0,selectors: {- [`${tagSelectorItem}:hover &`]: {+ [`:is(${tagSelectorItem}:hover, ${tagsEditorRootMobile}) &`]: {opacity: 1,},},@@ -115,6 +154,18 @@ export const spacer = style({flexGrow: 1,});+export const tagSelectorEmpty = style({+ padding: '10px 8px',+ fontSize: cssVar('fontSm'),+ color: cssVar('textSecondaryColor'),+ height: '34px',+ selectors: {+ [`${tagsEditorRootMobile} &`]: {+ height: 44,+ },+ },+});+export const menuItemListScrollable = style({});export const menuItemListScrollbar = style({diff --git a/packages/frontend/component/src/ui/tags/tag-edit-menu.css.ts b/packages/frontend/core/src/components/tags/tag-edit-menu.css.tssimilarity index 53%rename from packages/frontend/component/src/ui/tags/tag-edit-menu.css.tsrename to packages/frontend/core/src/components/tags/tag-edit-menu.css.tsindex 5ffe1d1ab4..2692bf491a 100644--- a/packages/frontend/component/src/ui/tags/tag-edit-menu.css.ts+++ b/packages/frontend/core/src/components/tags/tag-edit-menu.css.ts@@ -1,3 +1,4 @@+import { cssVarV2 } from '@toeverything/theme/v2';import { globalStyle, style } from '@vanilla-extract/css';export const menuItemListScrollable = style({});@@ -30,3 +31,34 @@ export const tagColorIcon = style({height: 16,borderRadius: '50%',});++export const mobileTagColorIcon = style({+ width: 20,+ height: 20,+ borderRadius: '50%',+});++export const mobileTagEditInput = style({+ height: 'auto',+ borderRadius: 12,+});++export const mobileTagEditDeleteRow = style({+ color: cssVarV2('button/error'),+});++export const spacer = style({+ flex: 1,+});++export const tagColorIconSelect = style({+ opacity: 0,+ color: cssVarV2('button/primary'),+ width: 20,+ height: 20,+ selectors: {+ '&[data-selected="true"]': {+ opacity: 1,+ },+ },+});diff --git a/packages/frontend/core/src/components/tags/tag-edit-menu.tsx b/packages/frontend/core/src/components/tags/tag-edit-menu.tsxnew file mode 100644index 0000000000..d9165e4318--- /dev/null+++ b/packages/frontend/core/src/components/tags/tag-edit-menu.tsx@@ -0,0 +1,220 @@+import {+ Input,+ Menu,+ MenuItem,+ type MenuProps,+ MenuSeparator,+ Scrollable,+} from '@affine/component';+import { useI18n } from '@affine/i18n';+import { DeleteIcon, DoneIcon, TagsIcon } from '@blocksuite/icons/rc';+import type { MouseEventHandler, PropsWithChildren } from 'react';+import { useCallback, useEffect, useMemo, useState } from 'react';++import { ConfigModal } from '../mobile';+import { TagItem } from './tag';+import * as styles from './tag-edit-menu.css';+import type { TagColor, TagLike } from './types';++type TagEditMenuProps = PropsWithChildren<{+ onTagDelete: (tagId: string) => void;+ colors: TagColor[];+ tag: TagLike;+ onTagChange: (property: keyof TagLike, value: string) => void;+ jumpToTag?: (tagId: string) => void;+}>;++const DesktopTagEditMenu = ({+ tag,+ onTagDelete,+ children,+ jumpToTag,+ colors,+ onTagChange,+}: TagEditMenuProps) => {+ const t = useI18n();++ const menuProps = useMemo(() => {+ const updateTagName = (name: string) => {+ if (name.trim() === '') {+ return;+ }+ onTagChange('value', name);+ };++ return {+ contentOptions: {+ onClick(e) {+ e.stopPropagation();+ },+ },+ items: (+ <>+ <Input+ defaultValue={tag.value}+ onBlur={e => {+ updateTagName(e.currentTarget.value);+ }}+ onKeyDown={e => {+ if (e.key === 'Enter') {+ e.preventDefault();+ updateTagName(e.currentTarget.value);+ }+ e.stopPropagation();+ }}+ placeholder={t['Untitled']()}+ />+ <MenuSeparator />+ <MenuItem+ prefixIcon={<DeleteIcon />}+ type="danger"+ onClick={() => {+ tag?.id ? onTagDelete(tag.id) : null;+ }}+ >+ {t['Delete']()}+ </MenuItem>+ {jumpToTag ? (+ <MenuItem+ prefixIcon={<TagsIcon />}+ onClick={() => {+ jumpToTag(tag.id);+ }}+ >+ {t['com.affine.page-properties.tags.open-tags-page']()}+ </MenuItem>+ ) : null}+ <MenuSeparator />+ <Scrollable.Root>+ <Scrollable.Viewport className={styles.menuItemList}>+ {colors.map(({ name, value: color }, i) => (+ <MenuItem+ key={i}+ checked={tag.color === color}+ prefixIcon={+ <div key={i} className={styles.tagColorIconWrapper}>+ <div+ className={styles.tagColorIcon}+ style={{+ backgroundColor: color,+ }}+ />+ </div>+ }+ onClick={() => {+ onTagChange('color', color);+ }}+ >+ {name}+ </MenuItem>+ ))}+ <Scrollable.Scrollbar className={styles.menuItemListScrollbar} />+ </Scrollable.Viewport>+ </Scrollable.Root>+ </>+ ),+ } satisfies Partial<MenuProps>;+ }, [tag, t, jumpToTag, colors, onTagChange, onTagDelete]);++ return <Menu {...menuProps}>{children}</Menu>;+};++const MobileTagEditMenu = ({+ tag,+ onTagDelete,+ children,+ colors,+ onTagChange,+}: TagEditMenuProps) => {+ const [open, setOpen] = useState(false);+ const t = useI18n();+ const [localTag, setLocalTag] = useState({ ...tag });++ useEffect(() => {+ setLocalTag({ ...tag });+ }, [tag]);++ const handleTriggerClick: MouseEventHandler<HTMLDivElement> = useCallback(+ e => {+ e.stopPropagation();+ setOpen(true);+ },+ []+ );+ const handleOnDone = () => {+ setOpen(false);+ if (localTag.value.trim() !== tag.value) {+ onTagChange('value', localTag.value);+ }+ if (localTag.color !== tag.color) {+ onTagChange('color', localTag.color);+ }+ };+ return (+ <>+ <ConfigModal+ open={open}+ onOpenChange={setOpen}+ title={<TagItem mode="list-tag" tag={tag} />}+ onDone={handleOnDone}+ >+ <Input+ inputStyle={{+ height: 46,+ padding: '12px',+ }}+ autoSelect={false}+ className={styles.mobileTagEditInput}+ value={localTag.value}+ onChange={e => {+ setLocalTag({ ...localTag, value: e });+ }}+ placeholder={t['Untitled']()}+ />++ <ConfigModal.RowGroup title={t['Colors']()}>+ {colors.map(({ name, value: color }, i) => (+ <ConfigModal.Row+ key={i}+ onClick={() => {+ setLocalTag({ ...localTag, color });+ }}+ >+ <div key={i} className={styles.tagColorIconWrapper}>+ <div+ className={styles.tagColorIcon}+ style={{+ backgroundColor: color,+ }}+ />+ </div>+ {name}+ <div className={styles.spacer} />+ <DoneIcon+ className={styles.tagColorIconSelect}+ data-selected={localTag.color === color}+ />+ </ConfigModal.Row>+ ))}+ </ConfigModal.RowGroup>++ <ConfigModal.RowGroup>+ <ConfigModal.Row+ className={styles.mobileTagEditDeleteRow}+ onClick={() => {+ onTagDelete(tag.id);+ }}+ >+ <DeleteIcon />+ {t['Delete']()}+ </ConfigModal.Row>+ </ConfigModal.RowGroup>+ </ConfigModal>+ <div onClick={handleTriggerClick}>{children}</div>+ </>+ );+};++export const TagEditMenu = BUILD_CONFIG.isMobileEdition+ ? MobileTagEditMenu+ : DesktopTagEditMenu;diff --git a/packages/frontend/component/src/ui/tags/tag.css.ts b/packages/frontend/core/src/components/tags/tag.css.tssimilarity index 99%rename from packages/frontend/component/src/ui/tags/tag.css.tsrename to packages/frontend/core/src/components/tags/tag.css.tsindex 1616a71c4d..bc6381a6c0 100644--- a/packages/frontend/component/src/ui/tags/tag.css.ts+++ b/packages/frontend/core/src/components/tags/tag.css.ts@@ -108,7 +108,7 @@ export const tagInlineMode = style([export const tagListItemMode = style([tag,{- fontSize: cssVar('fontSm'),+ fontSize: 'inherit',padding: '4px 12px',columnGap: '8px',textOverflow: 'ellipsis',diff --git a/packages/frontend/component/src/ui/tags/tag.tsx b/packages/frontend/core/src/components/tags/tag.tsxsimilarity index 100%rename from packages/frontend/component/src/ui/tags/tag.tsxrename to packages/frontend/core/src/components/tags/tag.tsxdiff --git a/packages/frontend/component/src/ui/tags/tags-editor.tsx b/packages/frontend/core/src/components/tags/tags-editor.tsxsimilarity index 84%rename from packages/frontend/component/src/ui/tags/tags-editor.tsxrename to packages/frontend/core/src/components/tags/tags-editor.tsxindex 507e17f5be..a472ffe2e3 100644--- a/packages/frontend/component/src/ui/tags/tags-editor.tsx+++ b/packages/frontend/core/src/components/tags/tags-editor.tsx@@ -1,14 +1,12 @@+import { IconButton, Menu, RowInput, Scrollable } from '@affine/component';import { useI18n } from '@affine/i18n';import { MoreHorizontalIcon } from '@blocksuite/icons/rc';import clsx from 'clsx';import { clamp } from 'lodash-es';-import type { KeyboardEvent } from 'react';+import type { KeyboardEvent, ReactNode } from 'react';import { useCallback, useMemo, useReducer, useRef, useState } from 'react';-import { IconButton } from '../button';-import { RowInput } from '../input';-import { Menu } from '../menu';-import { Scrollable } from '../scrollbar';+import { ConfigModal } from '../mobile';import { InlineTagList } from './inline-tag-list';import * as styles from './styles.css';import { TagItem } from './tag';@@ -32,6 +30,7 @@ export interface TagsInlineEditorProps extends TagsEditorProps {placeholder?: string;className?: string;readonly?: boolean;+ title?: ReactNode; // only used for mobile}type TagOption = TagLike | { readonly create: true; readonly value: string };@@ -201,7 +200,14 @@ export const TagsEditor = ({);return (- <div data-testid="tags-editor-popup" className={styles.tagsEditorRoot}>+ <div+ data-testid="tags-editor-popup"+ className={+ BUILD_CONFIG.isMobileEdition+ ? styles.tagsEditorRootMobile+ : styles.tagsEditorRoot+ }+ ><div className={styles.tagsEditorSelectedTags}><InlineTagListtagMode={tagMode}@@ -230,6 +236,10 @@ export const TagsEditor = ({ref={scrollContainerRef}className={styles.tagSelectorTagsScrollContainer}>+ {tagOptions.length === 0 && (+ <div className={styles.tagSelectorEmpty}>Nothing here yet</div>+ )}+{tagOptions.map((tag, idx) => {const commonProps = {...(safeFocusedIndex === idx ? { focused: 'true' } : {}),@@ -288,7 +298,48 @@ export const TagsEditor = ({);};-export const TagsInlineEditor = ({+const MobileInlineEditor = ({+ readonly,+ placeholder,+ className,+ title,+ ...props+}: TagsInlineEditorProps) => {+ const [editing, setEditing] = useState(false);++ const empty = !props.selectedTags || props.selectedTags.length === 0;+ const selectedTags = useMemo(() => {+ return props.selectedTags+ .map(id => props.tags.find(tag => tag.id === id))+ .filter(tag => tag !== undefined);+ }, [props.selectedTags, props.tags]);+ return (+ <>+ <ConfigModal+ title={title}+ open={editing}+ onOpenChange={setEditing}+ onBack={() => setEditing(false)}+ >+ <TagsEditor {...props} />+ </ConfigModal>+ <div+ className={clsx(styles.tagsInlineEditor, className)}+ data-empty={empty}+ data-readonly={readonly}+ onClick={() => setEditing(true)}+ >+ {empty ? (+ placeholder+ ) : (+ <InlineTagList {...props} tags={selectedTags} onRemoved={undefined} />+ )}+ </div>+ </>+ );+};++const DesktopTagsInlineEditor = ({readonly,placeholder,className,@@ -322,9 +373,18 @@ export const TagsInlineEditor = ({{empty ? (placeholder) : (- <InlineTagList {...props} tags={selectedTags} onRemoved={undefined} />+ <InlineTagList+ {...props}+ title=""+ tags={selectedTags}+ onRemoved={undefined}+ />)}</div></Menu>);};++export const TagsInlineEditor = BUILD_CONFIG.isMobileEdition+ ? MobileInlineEditor+ : DesktopTagsInlineEditor;diff --git a/packages/frontend/component/src/ui/tags/types.ts b/packages/frontend/core/src/components/tags/types.tssimilarity index 100%rename from packages/frontend/component/src/ui/tags/types.tsrename to packages/frontend/core/src/components/tags/types.tsdiff --git a/packages/frontend/core/src/mobile/components/index.ts b/packages/frontend/core/src/mobile/components/index.tsindex 86dc58c0ef..696e783591 100644--- a/packages/frontend/core/src/mobile/components/index.ts+++ b/packages/frontend/core/src/mobile/components/index.ts@@ -1,6 +1,5 @@export * from './app-tabs';export * from './doc-card';-export * from './page-header';export * from './rename';export * from './search-input';export * from './search-result';diff --git a/packages/frontend/core/src/mobile/dialogs/selectors/generic-selector.tsx b/packages/frontend/core/src/mobile/dialogs/selectors/generic-selector.tsxindex 82305ba508..24eda1497d 100644--- a/packages/frontend/core/src/mobile/dialogs/selectors/generic-selector.tsx+++ b/packages/frontend/core/src/mobile/dialogs/selectors/generic-selector.tsx@@ -5,6 +5,7 @@ import {Scrollable,useThemeColorMeta,} from '@affine/component';+import { PageHeader } from '@affine/core/components/mobile';import { useI18n } from '@affine/i18n';import { ArrowRightSmallIcon } from '@blocksuite/icons/rc';import { cssVarV2 } from '@toeverything/theme/v2';@@ -18,7 +19,6 @@ import {useState,} from 'react';-import { PageHeader } from '../../components/page-header';import * as styles from './generic.css';export interface GenericSelectorProps {diff --git a/packages/frontend/core/src/mobile/dialogs/setting/group.css.ts b/packages/frontend/core/src/mobile/dialogs/setting/group.css.tsindex e2c8177508..e6e9377969 100644--- a/packages/frontend/core/src/mobile/dialogs/setting/group.css.ts+++ b/packages/frontend/core/src/mobile/dialogs/setting/group.css.ts@@ -1,5 +1,3 @@-import { footnoteRegular } from '@toeverything/theme/typography';-import { cssVarV2 } from '@toeverything/theme/v2';import { style } from '@vanilla-extract/css';export const group = style({@@ -8,20 +6,3 @@ export const group = style({gap: 4,width: '100%',});--export const title = style([- footnoteRegular,- {- padding: '0px 8px',- color: cssVarV2('text/tertiary'),- },-]);--export const content = style({- background: cssVarV2('layer/background/primary'),- borderRadius: 12,- padding: '10px 16px',- display: 'flex',- flexDirection: 'column',- gap: 8,-});diff --git a/packages/frontend/core/src/mobile/dialogs/setting/group.tsx b/packages/frontend/core/src/mobile/dialogs/setting/group.tsxindex fbcdd17db1..c857231301 100644--- a/packages/frontend/core/src/mobile/dialogs/setting/group.tsx+++ b/packages/frontend/core/src/mobile/dialogs/setting/group.tsx@@ -1,3 +1,4 @@+import { ConfigModal } from '@affine/core/components/mobile';import clsx from 'clsx';import {type CSSProperties,@@ -21,15 +22,16 @@ export const SettingGroup = forwardRef<HTMLDivElement, SettingGroupProps>(ref) {return (- <div className={clsx(styles.group, className)} ref={ref} {...attrs}>- {title ? <h6 className={styles.title}>{title}</h6> : null}- <div- className={clsx(styles.content, contentClassName)}- style={contentStyle}- >- {children}- </div>- </div>+ <ConfigModal.RowGroup+ {...attrs}+ ref={ref}+ title={title}+ className={clsx(styles.group, className)}+ contentClassName={contentClassName}+ contentStyle={contentStyle}+ >+ {children}+ </ConfigModal.RowGroup>);});diff --git a/packages/frontend/core/src/mobile/dialogs/setting/index.tsx b/packages/frontend/core/src/mobile/dialogs/setting/index.tsxindex 162860351d..72fa48fcc2 100644--- a/packages/frontend/core/src/mobile/dialogs/setting/index.tsx+++ b/packages/frontend/core/src/mobile/dialogs/setting/index.tsx@@ -1,4 +1,4 @@-import { Modal } from '@affine/component';+import { ConfigModal } from '@affine/core/components/mobile';import { AuthService } from '@affine/core/modules/cloud';import type {DialogComponentProps,@@ -6,10 +6,8 @@ import type {} from '@affine/core/modules/dialogs';import { useI18n } from '@affine/i18n';import { useService } from '@toeverything/infra';-import { cssVarV2 } from '@toeverything/theme/v2';import { useEffect } from 'react';-import { PageHeader } from '../../components';import { AboutGroup } from './about';import { AppearanceGroup } from './appearance';import { OthersGroup } from './others';@@ -17,50 +15,34 @@ import * as styles from './style.css';import { UserProfile } from './user-profile';import { UserUsage } from './user-usage';-const MobileSetting = ({ onClose }: { onClose: () => void }) => {- const t = useI18n();+const MobileSetting = () => {const session = useService(AuthService).session;-useEffect(() => session.revalidate(), [session]);return (- <>- <PageHeader back backAction={onClose}>- <span className={styles.pageTitle}>- {t['com.affine.mobile.setting.header-title']()}- </span>- </PageHeader>-- <div className={styles.root}>- <UserProfile />- <UserUsage />- <AppearanceGroup />- <AboutGroup />- <OthersGroup />- </div>- </>+ <div className={styles.root}>+ <UserProfile />+ <UserUsage />+ <AppearanceGroup />+ <AboutGroup />+ <OthersGroup />+ </div>);};export const SettingDialog = ({close,}: DialogComponentProps<GLOBAL_DIALOG_SCHEMA['setting']>) => {+ const t = useI18n();+return (- <Modal- fullScreen- animation="slideBottom"+ <ConfigModal+ title={t['com.affine.mobile.setting.header-title']()}openonOpenChange={() => close()}- contentOptions={{- style: {- padding: 0,- overflowY: 'auto',- backgroundColor: cssVarV2('layer/background/secondary'),- },- }}- withoutCloseButton+ onBack={close}>- <MobileSetting onClose={close} />- </Modal>+ <MobileSetting />+ </ConfigModal>);};diff --git a/packages/frontend/core/src/mobile/dialogs/setting/row.layout.tsx b/packages/frontend/core/src/mobile/dialogs/setting/row.layout.tsxindex 8640ddc345..a5a82df9e9 100644--- a/packages/frontend/core/src/mobile/dialogs/setting/row.layout.tsx+++ b/packages/frontend/core/src/mobile/dialogs/setting/row.layout.tsx@@ -1,3 +1,4 @@+import { ConfigModal } from '@affine/core/components/mobile';import { DualLinkIcon } from '@blocksuite/icons/rc';import type { PropsWithChildren, ReactNode } from 'react';@@ -9,13 +10,13 @@ export const RowLayout = ({href,}: PropsWithChildren<{ label: ReactNode; href?: string }>) => {const content = (- <div className={styles.baseSettingItem}>+ <ConfigModal.Row className={styles.baseSettingItem}><div className={styles.baseSettingItemName}>{label}</div><div className={styles.baseSettingItemAction}>{children ||(href ? <DualLinkIcon className={styles.linkIcon} /> : null)}</div>- </div>+ </ConfigModal.Row>);return href ? (diff --git a/packages/frontend/core/src/mobile/dialogs/setting/style.css.ts b/packages/frontend/core/src/mobile/dialogs/setting/style.css.tsindex 0b141b6190..8eb5aebcef 100644--- a/packages/frontend/core/src/mobile/dialogs/setting/style.css.ts+++ b/packages/frontend/core/src/mobile/dialogs/setting/style.css.ts@@ -5,7 +5,6 @@ import { style } from '@vanilla-extract/css';export const pageTitle = style([bodyEmphasized]);export const root = style({- padding: '24px 16px',display: 'flex',flexDirection: 'column',gap: 16,@@ -16,8 +15,9 @@ export const baseSettingItem = style({justifyContent: 'space-between',alignItems: 'center',gap: 32,- padding: '8px 0',+ padding: 8,});+export const baseSettingItemName = style([bodyRegular,{@@ -26,6 +26,7 @@ export const baseSettingItemName = style([whiteSpace: 'nowrap',},]);+export const baseSettingItemAction = style([baseSettingItemName,{diff --git a/packages/frontend/core/src/mobile/dialogs/setting/user-usage/index.tsx b/packages/frontend/core/src/mobile/dialogs/setting/user-usage/index.tsxindex 19a660a026..aa3b3c252e 100644--- a/packages/frontend/core/src/mobile/dialogs/setting/user-usage/index.tsx+++ b/packages/frontend/core/src/mobile/dialogs/setting/user-usage/index.tsx@@ -77,7 +77,7 @@ const UsagePanel = () => {);return (- <SettingGroup title="Storage">+ <SettingGroup title="Storage" contentStyle={{ padding: '10px 16px' }}><CloudUsage />{serverFeatures?.copilot ? <AiUsage /> : null}</SettingGroup>diff --git a/packages/frontend/core/src/mobile/dialogs/setting/user-usage/style.css.ts b/packages/frontend/core/src/mobile/dialogs/setting/user-usage/style.css.tsindex aa10e18458..d962ecd454 100644--- a/packages/frontend/core/src/mobile/dialogs/setting/user-usage/style.css.ts+++ b/packages/frontend/core/src/mobile/dialogs/setting/user-usage/style.css.ts@@ -2,9 +2,7 @@ import { bodyRegular, caption1Regular } from '@toeverything/theme/typography';import { cssVarV2 } from '@toeverything/theme/v2';import { style } from '@vanilla-extract/css';-export const progressRoot = style({- paddingBottom: 8,-});+export const progressRoot = style({});export const progressInfoRow = style({display: 'flex',justifyContent: 'space-between',diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsxindex cceb3357c9..01ce08d1a6 100644--- a/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx+++ b/packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx@@ -7,6 +7,7 @@ import { useDocMetaHelper } from '@affine/core/components/hooks/use-block-suite-import { usePageDocumentTitle } from '@affine/core/components/hooks/use-global-state';import { useJournalRouteHelper } from '@affine/core/components/hooks/use-journal';import { useNavigateHelper } from '@affine/core/components/hooks/use-navigate-helper';+import { PageHeader } from '@affine/core/components/mobile';import { PageDetailEditor } from '@affine/core/components/page-detail-editor';import { DetailPageWrapper } from '@affine/core/desktop/pages/workspace/detail-page/detail-page-wrapper';import { EditorService } from '@affine/core/modules/editor';@@ -42,7 +43,7 @@ import dayjs from 'dayjs';import { useCallback, useEffect, useRef } from 'react';import { useParams } from 'react-router-dom';-import { AppTabs, PageHeader } from '../../../components';+import { AppTabs } from '../../../components';import { JournalDatePicker } from './journal-date-picker';import * as styles from './mobile-detail-page.css';import { PageHeaderMenuButton } from './page-header-more-button';@@ -215,12 +216,12 @@ const notFound = (</>);-const JournalDetailPage = ({+const MobileDetailPage = ({pageId,date,}: {pageId: string;- date: string;+ date?: string;}) => {const journalService = useService(JournalService);const { openJournal } = useJournalRouteHelper();@@ -250,40 +251,23 @@ const JournalDetailPage = ({</>}>- <span className={bodyEmphasized}>- {i18nTime(dayjs(date), { absolute: { accuracy: 'month' } })}- </span>+ {date ? (+ <span className={bodyEmphasized}>+ {i18nTime(dayjs(date), { absolute: { accuracy: 'month' } })}+ </span>+ ) : null}</PageHeader>- <JournalDatePicker- date={date}- onChange={handleDateChange}- withDotDates={allJournalDates}- />- <DetailPageImpl />- <AppTabs background={cssVarV2('layer/background/primary')} />- </DetailPageWrapper>- </div>- );-};-const NormalDetailPage = ({ pageId }: { pageId: string }) => {- return (- <div className={styles.root}>- <DetailPageWrapper- skeleton={skeleton}- notFound={notFound}- pageId={pageId}- >- <PageHeader- back- className={styles.header}- suffix={- <>- <PageHeaderShareButton />- <PageHeaderMenuButton />- </>- }- />+ {date ? (+ <JournalDatePicker+ date={date}+ onChange={handleDateChange}+ withDotDates={allJournalDates}+ />+ ) : null}<DetailPageImpl />+ {date ? (+ <AppTabs background={cssVarV2('layer/background/primary')} />+ ) : null}</DetailPageWrapper></div>);@@ -300,9 +284,5 @@ export const Component = () => {return null;}- return journalDate ? (- <JournalDetailPage pageId={pageId} date={journalDate} />- ) : (- <NormalDetailPage pageId={pageId} />- );+ return <MobileDetailPage pageId={pageId} date={journalDate} />;};diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/page-header-more-button.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/page-header-more-button.tsxindex 713c8901d0..423a89cbeb 100644--- a/packages/frontend/core/src/mobile/pages/workspace/detail/page-header-more-button.tsx+++ b/packages/frontend/core/src/mobile/pages/workspace/detail/page-header-more-button.tsx@@ -1,6 +1,7 @@import { IconButton, notify } from '@affine/component';import {MenuSeparator,+ MenuSub,MobileMenu,MobileMenuItem,} from '@affine/component/ui/menu';@@ -42,6 +43,7 @@ export const PageHeaderMenuButton = () => {editorService.editor.doc.meta$.map(meta => meta.trash));const primaryMode = useLiveData(editorService.editor.doc.primaryMode$);+ const title = useLiveData(editorService.editor.doc.title$);const { favorite, toggleFavorite } = useFavorite(docId);@@ -104,14 +106,16 @@ export const PageHeaderMenuButton = () => {: t['com.affine.favoritePageOperation.add']()}</MobileMenuItem><MenuSeparator />- <MobileMenu items={<DocInfoSheet docId={docId} />}>- <MobileMenuItem- prefixIcon={<InformationIcon />}- onClick={preventDefault}- >- <span>{t['com.affine.page-properties.page-info.view']()}</span>- </MobileMenuItem>- </MobileMenu>+ <MenuSub+ triggerOptions={{+ prefixIcon: <InformationIcon />,+ onClick: preventDefault,+ }}+ title={title ?? t['unnamed']()}+ items={<DocInfoSheet docId={docId} />}+ >+ <span>{t['com.affine.page-properties.page-info.view']()}</span>+ </MenuSub><MobileMenuitems={<div className={styles.outlinePanel}>diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/sheets/doc-info.css.ts b/packages/frontend/core/src/mobile/pages/workspace/detail/sheets/doc-info.css.tsindex f851026f2d..0d9c81440f 100644--- a/packages/frontend/core/src/mobile/pages/workspace/detail/sheets/doc-info.css.ts+++ b/packages/frontend/core/src/mobile/pages/workspace/detail/sheets/doc-info.css.ts@@ -1,13 +1,49 @@-import { style } from '@vanilla-extract/css';+import { cssVar } from '@toeverything/theme';+import { cssVarV2 } from '@toeverything/theme/v2';+import { globalStyle, style } from '@vanilla-extract/css';-export const linksRow = style({+export const scrollableRoot = style({padding: '0 16px',+ display: 'flex',+ flexDirection: 'column',});-export const timeRow = style({- padding: '0 16px',-});+export const linksRow = style({});++export const timeRow = style({});export const scrollBar = style({width: 6,transform: 'translateX(-4px)',});++export const tableBodyRoot = style({+ display: 'flex',+ flexDirection: 'column',+ position: 'relative',+});+export const addPropertyButton = style({+ alignSelf: 'flex-start',+ fontSize: cssVar('fontSm'),+ color: `${cssVarV2('text/secondary')}`,+ padding: '0 4px',+ height: 36,+ fontWeight: 400,+ gap: 6,+ '@media': {+ print: {+ display: 'none',+ },+ },+ selectors: {+ [`[data-property-collapsed="true"] &`]: {+ display: 'none',+ },+ },+});+globalStyle(`${addPropertyButton} svg`, {+ fontSize: 16,+ color: cssVarV2('icon/secondary'),+});+globalStyle(`${addPropertyButton}:hover svg`, {+ color: cssVarV2('icon/primary'),+});diff --git a/packages/frontend/core/src/mobile/pages/workspace/detail/sheets/doc-info.tsx b/packages/frontend/core/src/mobile/pages/workspace/detail/sheets/doc-info.tsxindex 8a12e95ba7..29e6d44bdf 100644--- a/packages/frontend/core/src/mobile/pages/workspace/detail/sheets/doc-info.tsx+++ b/packages/frontend/core/src/mobile/pages/workspace/detail/sheets/doc-info.tsx@@ -1,25 +1,43 @@-import { Divider, Scrollable } from '@affine/component';+import {+ Button,+ Divider,+ Menu,+ PropertyCollapsibleContent,+ PropertyCollapsibleSection,+ Scrollable,+} from '@affine/component';import {type DefaultOpenProperty,- DocPropertiesTable,+ DocPropertyRow,} from '@affine/core/components/doc-properties';+import { CreatePropertyMenuItems } from '@affine/core/components/doc-properties/menu/create-doc-property';import { LinksRow } from '@affine/core/desktop/dialogs/doc-info/links-row';import { TimeRow } from '@affine/core/desktop/dialogs/doc-info/time-row';+import { DocDatabaseBacklinkInfo } from '@affine/core/modules/doc-info';import { DocsSearchService } from '@affine/core/modules/docs-search';import { useI18n } from '@affine/i18n';-import { LiveData, useLiveData, useService } from '@toeverything/infra';-import { Suspense, useMemo } from 'react';+import { PlusIcon } from '@blocksuite/icons/rc';+import {+ type DocCustomPropertyInfo,+ DocsService,+ LiveData,+ useLiveData,+ useServices,+} from '@toeverything/infra';+import { Suspense, useCallback, useMemo, useState } from 'react';import * as styles from './doc-info.css';export const DocInfoSheet = ({docId,- defaultOpenProperty,}: {docId: string;defaultOpenProperty?: DefaultOpenProperty;}) => {- const docsSearchService = useService(DocsSearchService);+ const { docsSearchService, docsService } = useServices({+ DocsSearchService,+ DocsService,+ });const t = useI18n();const links = useLiveData(@@ -35,8 +53,16 @@ export const DocInfoSheet = ({));+ const [newPropertyId, setNewPropertyId] = useState<string | null>(null);++ const onPropertyAdded = useCallback((property: DocCustomPropertyInfo) => {+ setNewPropertyId(property.id);+ }, []);++ const properties = useLiveData(docsService.propertyList.sortedProperties$);+return (- <Scrollable.Root>+ <Scrollable.Root className={styles.scrollableRoot}><Scrollable.Viewport data-testid="doc-info-menu"><Suspense><TimeRow docId={docId} className={styles.timeRow} />@@ -61,7 +87,58 @@ export const DocInfoSheet = ({<Divider size="thinner" /></>) : null}- <DocPropertiesTable defaultOpenProperty={defaultOpenProperty} />++ <PropertyCollapsibleSection+ title={t.t('com.affine.workspace.properties')}+ >+ <PropertyCollapsibleContent+ className={styles.tableBodyRoot}+ collapseButtonText={({ hide, isCollapsed }) =>+ isCollapsed+ ? hide === 1+ ? t['com.affine.page-properties.more-property.one']({+ count: hide.toString(),+ })+ : t['com.affine.page-properties.more-property.more']({+ count: hide.toString(),+ })+ : hide === 1+ ? t['com.affine.page-properties.hide-property.one']({+ count: hide.toString(),+ })+ : t['com.affine.page-properties.hide-property.more']({+ count: hide.toString(),+ })+ }+ >+ {properties.map(property => (+ <DocPropertyRow+ key={property.id}+ propertyInfo={property}+ defaultOpenEditMenu={newPropertyId === property.id}+ />+ ))}+ <Menu+ items={<CreatePropertyMenuItems onCreated={onPropertyAdded} />}+ contentOptions={{+ onClick(e) {+ e.stopPropagation();+ },+ }}+ >+ <Button+ variant="plain"+ prefix={<PlusIcon />}+ className={styles.addPropertyButton}+ >+ {t['com.affine.page-properties.add-property']()}+ </Button>+ </Menu>+ </PropertyCollapsibleContent>+ </PropertyCollapsibleSection>+ <Divider size="thinner" />++ <DocDatabaseBacklinkInfo /></Suspense></Scrollable.Viewport><Scrollable.Scrollbar className={styles.scrollBar} />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 66c5bb2d57..95c157f820 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,10 +1,10 @@import { IconButton, MobileMenu } from '@affine/component';import { EmptyCollectionDetail } from '@affine/core/components/affine/empty';+import { PageHeader } from '@affine/core/components/mobile';import { isEmptyCollection } from '@affine/core/desktop/pages/workspace/collection';import type { Collection } from '@affine/env/filter';import { MoreHorizontalIcon, ViewLayersIcon } from '@blocksuite/icons/rc';-import { PageHeader } from '../../../components';import { AllDocList } from '../doc/list';import { AllDocsMenu } from '../doc/menu';import * as styles from './detail.css';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 c4e13d0e28..be56ae9208 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,9 +1,9 @@import { IconButton, MobileMenu } from '@affine/component';+import { PageHeader } from '@affine/core/components/mobile';import type { Tag } from '@affine/core/modules/tag';import { MoreHorizontalIcon } from '@blocksuite/icons/rc';import { useLiveData } from '@toeverything/infra';-import { PageHeader } from '../../../components';import { AllDocsMenu } from '../doc';import * as styles from './detail.css';diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/link.css.ts b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/link.css.tsindex eefa8961d5..6e8d198964 100644--- a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/link.css.ts+++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/link.css.ts@@ -33,6 +33,26 @@ export const textarea = style({},});+const mobileTextareaBase = {+ fontSize: 17,+ lineHeight: '26px',+ padding: 12,+};++export const mobileTextareaPlain = style([+ textarea,+ mobileTextareaBase,+ {+ position: 'relative',+ fontSize: 14,+ lineHeight: '22px',+ height: 'auto',+ padding: 0,+ },+]);++export const mobileTextarea = style([textarea, mobileTextareaBase]);+export const container = style({position: 'relative',outline: `1px solid transparent`,@@ -54,3 +74,11 @@ export const textInvisible = style({fontSize: cssVar('fontSm'),lineHeight: '22px',});++export const mobileTextInvisible = style([textInvisible, mobileTextareaBase]);++export const mobileTextareaWrapper = style({+ position: 'relative',+ background: cssVarV2('layer/background/primary'),+ borderRadius: 12,+});diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/link.tsx b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/link.tsxindex 9db1365c11..7af3d0d7a3 100644--- a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/link.tsx+++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/link.tsx@@ -1,7 +1,9 @@import { PropertyValue } from '@affine/component';import { AffinePageReference } from '@affine/core/components/affine/reference-link';+import { ConfigModal } from '@affine/core/components/mobile';import { resolveLinkToDoc } from '@affine/core/modules/navigation';import { useI18n } from '@affine/i18n';+import { LinkIcon } from '@blocksuite/icons/rc';import type { LiveData } from '@toeverything/infra';import { useLiveData } from '@toeverything/infra';import {@@ -99,49 +101,84 @@ export const LinkCell = ({const t = useI18n();+ const editingElement = (+ <>+ <textarea+ ref={ref}+ onKeyDown={onKeydown}+ className={+ !BUILD_CONFIG.isMobileEdition+ ? styles.textarea+ : styles.mobileTextarea+ }+ onBlur={commitChange}+ value={tempValue || ''}+ onChange={handleOnChange}+ data-empty={!tempValue}+ placeholder={t[+ 'com.affine.page-properties.property-value-placeholder'+ ]()}+ />+ <div+ className={+ !BUILD_CONFIG.isMobileEdition+ ? styles.textInvisible+ : styles.mobileTextInvisible+ }+ >+ {tempValue}+ {tempValue?.endsWith('\n') || !tempValue ? <br /> : null}+ </div>+ </>+ );++ const name = useLiveData(cell.property.name$);+return (- <PropertyValue- className={styles.container}- isEmpty={isEmpty}- onClick={onClick}- >- {!editing ? (- resolvedDocLink ? (- <AffinePageReference- pageId={resolvedDocLink.docId}- params={resolvedDocLink.params}- />- ) : (- <a- href={link}- target="_blank"- rel="noopener noreferrer"- onClick={onLinkClick}- className={styles.link}- >- {link?.replace(/^https?:\/\//, '').trim()}- </a>- )- ) : (- <>- <textarea- ref={ref}- onKeyDown={onKeydown}- className={styles.textarea}- onBlur={commitChange}- value={tempValue || ''}- onChange={handleOnChange}- data-empty={!tempValue}- placeholder={t[- 'com.affine.page-properties.property-value-placeholder'- ]()}- />- <div className={styles.textInvisible}>- {tempValue}- {tempValue?.endsWith('\n') || !tempValue ? <br /> : null}- </div>- </>- )}- </PropertyValue>+ <>+ <PropertyValue+ className={styles.container}+ isEmpty={isEmpty}+ onClick={onClick}+ >+ {!editing ? (+ resolvedDocLink ? (+ <AffinePageReference+ pageId={resolvedDocLink.docId}+ params={resolvedDocLink.params}+ />+ ) : (+ <a+ href={link}+ target="_blank"+ rel="noopener noreferrer"+ onClick={onLinkClick}+ className={styles.link}+ >+ {link?.replace(/^https?:\/\//, '').trim()}+ </a>+ )+ ) : !BUILD_CONFIG.isMobileEdition ? (+ editingElement+ ) : null}+ </PropertyValue>+ {BUILD_CONFIG.isMobileEdition ? (+ <ConfigModal+ open={editing}+ onOpenChange={setEditing}+ onBack={() => {+ setEditing(false);+ }}+ title={+ <>+ <LinkIcon />+ {name}+ </>+ }+ >+ <div className={styles.mobileTextareaWrapper}>{editingElement}</div>+ </ConfigModal>+ ) : null}+ </>);};diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/progress.tsx b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/progress.tsxindex e705f65fbd..3310e59505 100644--- a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/progress.tsx+++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/progress.tsx@@ -1,11 +1,13 @@import { Progress, PropertyValue } from '@affine/component';+import { ConfigModal } from '@affine/core/components/mobile';+import { ProgressIcon } from '@blocksuite/icons/rc';import type { LiveData } from '@toeverything/infra';import { useLiveData } from '@toeverything/infra';import { useEffect, useState } from 'react';import type { DatabaseCellRendererProps } from '../../../types';-export const ProgressCell = ({+const DesktopProgressCell = ({cell,dataSource,rowId,@@ -34,3 +36,62 @@ export const ProgressCell = ({</PropertyValue>);};++const MobileProgressCell = ({+ cell,+ dataSource,+ rowId,+ onChange,+}: DatabaseCellRendererProps) => {+ const value = useLiveData(cell.value$ as LiveData<number>);+ const isEmpty = value === undefined;+ const [localValue, setLocalValue] = useState(value);++ useEffect(() => {+ setLocalValue(value);+ }, [value]);++ const [open, setOpen] = useState(false);+ const name = useLiveData(cell.property.name$);++ const commitChange = () => {+ dataSource.cellValueChange(rowId, cell.id, localValue);+ onChange?.(localValue);+ setOpen(false);+ };++ return (+ <>+ <PropertyValue+ isEmpty={isEmpty}+ hoverable={false}+ onClick={() => setOpen(true)}+ >+ <Progress value={value} />+ </PropertyValue>++ <ConfigModal+ variant="popup"+ open={open}+ onOpenChange={setOpen}+ onDone={commitChange}+ title={+ <>+ <ProgressIcon />+ {name}+ </>+ }+ >+ <Progress+ value={localValue}+ onChange={v => {+ setLocalValue(v);+ }}+ />+ </ConfigModal>+ </>+ );+};+export const ProgressCell = BUILD_CONFIG.isMobileEdition+ ? MobileProgressCell+ : DesktopProgressCell;diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsxindex 63920ebe8b..1f00afa71c 100644--- a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx+++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/rich-text.tsx@@ -1,12 +1,14 @@import { PropertyValue } from '@affine/component';+import { ConfigModal } from '@affine/core/components/mobile';import type { BlockStdScope } from '@blocksuite/affine/block-std';import {DefaultInlineManagerExtension,RichText,} from '@blocksuite/affine/blocks';import type { Doc } from '@blocksuite/affine/store';+import { TextIcon } from '@blocksuite/icons/rc';import { type LiveData, useLiveData } from '@toeverything/infra';-import { useEffect, useRef } from 'react';+import { type CSSProperties, useEffect, useRef, useState } from 'react';import type * as Y from 'yjs';import type { DatabaseCellRendererProps } from '../../../types';@@ -37,11 +39,12 @@ const renderRichText = ({return richText;};-export const RichTextCell = ({+const RichTextInput = ({cell,dataSource,onChange,-}: DatabaseCellRendererProps) => {+ style,+}: DatabaseCellRendererProps & { style?: CSSProperties }) => {const std = useBlockStdScope(dataSource.doc);const text = useLiveData(cell.value$ as LiveData<Y.Text>);const ref = useRef<HTMLDivElement>(null);@@ -64,5 +67,68 @@ export const RichTextCell = ({}return () => {};}, [dataSource.doc, onChange, std, text]);- return <PropertyValue ref={ref}></PropertyValue>;+ return <div ref={ref} style={style} />;+};++const DesktopRichTextCell = ({+ cell,+ dataSource,+ onChange,+ rowId,+}: DatabaseCellRendererProps) => {+ return (+ <PropertyValue>+ <RichTextInput+ cell={cell}+ dataSource={dataSource}+ onChange={onChange}+ rowId={rowId}+ />+ </PropertyValue>+ );};++const MobileRichTextCell = ({+ cell,+ dataSource,+ onChange,+ rowId,+}: DatabaseCellRendererProps) => {+ const [open, setOpen] = useState(false);+ const name = useLiveData(cell.property.name$);+ return (+ <PropertyValue onClick={() => setOpen(true)}>+ <ConfigModal+ onBack={() => setOpen(false)}+ open={open}+ onOpenChange={setOpen}+ title={+ <>+ <TextIcon />+ {name}+ </>+ }+ >+ <ConfigModal.RowGroup>+ <RichTextInput+ cell={cell}+ dataSource={dataSource}+ onChange={onChange}+ rowId={rowId}+ style={{ padding: 12 }}+ />+ </ConfigModal.RowGroup>+ </ConfigModal>+ <RichTextInput+ cell={cell}+ dataSource={dataSource}+ onChange={onChange}+ rowId={rowId}+ />+ </PropertyValue>+ );+};++export const RichTextCell = BUILD_CONFIG.isMobileEdition+ ? MobileRichTextCell+ : DesktopRichTextCell;diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/select.tsx b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/select.tsxindex b8c00fb608..cfe03c4c5a 100644--- a/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/select.tsx+++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/cells/select.tsx@@ -1,7 +1,7 @@/* eslint-disable rxjs/finnish */import { PropertyValue } from '@affine/component';-import { type TagLike, TagsInlineEditor } from '@affine/component/ui/tags';+import { type TagLike, TagsInlineEditor } from '@affine/core/components/tags';import { TagService } from '@affine/core/modules/tag';import {affineLabelToDatabaseTagColor,@@ -9,6 +9,7 @@ import {} from '@affine/core/modules/tag/entities/utils';import type { DatabaseBlockDataSource } from '@blocksuite/affine/blocks';import type { SelectTag } from '@blocksuite/data-view';+import { MultiSelectIcon, SingleSelectIcon } from '@blocksuite/icons/rc';import { LiveData, useLiveData, useService } from '@toeverything/infra';import { nanoid } from 'nanoid';import { useCallback, useMemo } from 'react';@@ -221,6 +222,8 @@ const BlocksuiteDatabaseSelector = ({[dataSource, selectCell]);+ const propertyName = useLiveData(cell.property.name$);+return (<TagsInlineEditortagMode="db-label"@@ -233,6 +236,12 @@ const BlocksuiteDatabaseSelector = ({onSelectTag={onSelectTag}tagColors={tagColors}onTagChange={onTagChange}+ title={+ <>+ {multiple ? <MultiSelectIcon /> : <SingleSelectIcon />}+ {propertyName}+ </>+ }/>);};diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.css.ts b/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.css.tsindex cbddffbaed..91881e62be 100644--- a/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.css.ts+++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.css.ts@@ -34,9 +34,31 @@ export const docRefLink = style({color: cssVarV2('text/tertiary'),});+export const mobileDocRefLink = style([+ docRefLink,+ {+ maxWidth: '110px',+ minWidth: '60px',+ },+]);+export const cellList = style({padding: '0 2px',display: 'flex',flexDirection: 'column',gap: 4,});++export const databaseNameWrapper = style({+ display: 'flex',+ alignItems: 'center',+ gap: 4,+ overflow: 'hidden',+});++export const databaseName = style({+ textOverflow: 'ellipsis',+ whiteSpace: 'nowrap',+ overflow: 'hidden',+ display: 'inline-block',+});diff --git a/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.tsx b/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.tsxindex de4c3a45e4..c2202780e5 100644--- a/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.tsx+++ b/packages/frontend/core/src/modules/doc-info/views/database-properties/doc-database-backlink-info.tsx@@ -122,12 +122,24 @@ const DatabaseBacklinkRow = ({return (<PropertyCollapsibleSection- title={(row.databaseName || t['unnamed']()) + ' ' + t['properties']()}+ // @ts-expect-error fix type+ title={+ <span className={styles.databaseNameWrapper}>+ <span className={styles.databaseName}>+ {row.databaseName || t['unnamed']()}+ </span>+ {t['properties']()}+ </span>+ }defaultCollapsed={!defaultOpen}icon={<DatabaseTableViewIcon />}suffix={<AffinePageReference- className={styles.docRefLink}+ className={+ BUILD_CONFIG.isMobileEdition+ ? styles.mobileDocRefLink+ : styles.docRefLink+ }pageId={row.docId}params={pageRefParams}Icon={PageIcon}diff --git a/packages/frontend/i18n/src/resources/en.json b/packages/frontend/i18n/src/resources/en.jsonindex 6945ed34e9..10fee1ddbd 100644--- a/packages/frontend/i18n/src/resources/en.json+++ b/packages/frontend/i18n/src/resources/en.json@@ -19,6 +19,7 @@"Create": "Create","Created": "Created","Customize": "Customise",+ "Colors": "Colors","DB_FILE_ALREADY_LOADED": "Database file already loaded","DB_FILE_INVALID": "Invalid database file","DB_FILE_MIGRATION_FAILED": "Database file migration failed",diff --git a/tests/affine-mobile/e2e/detail.spec.ts b/tests/affine-mobile/e2e/detail.spec.tsindex 675feeb5c9..4357a0fc69 100644--- a/tests/affine-mobile/e2e/detail.spec.ts+++ b/tests/affine-mobile/e2e/detail.spec.ts@@ -27,7 +27,7 @@ test('doc info', async ({ page }) => {await expect(page.getByRole('dialog')).toBeVisible();await page.getByRole('menuitem', { name: 'view info' }).click();- await expect(page.getByRole('button', { name: 'Back' })).toBeVisible();+ await expect(page.getByTestId('mobile-menu-back-button')).toBeVisible();await expect(page.getByRole('dialog')).toContainText('Created');await expect(page.getByRole('dialog')).toContainText('Updated');