There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat(core): add color picker ui to editor settings (#8053)
JimmFlybea3d42f4078
diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/connector.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/connector.tsxindex b127f658c1..c6edd4e805 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/connector.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/connector.tsx@@ -1,5 +1,4 @@import {- Menu,MenuItem,MenuTrigger,RadioGroup,@@ -18,7 +17,9 @@ import {import { useFramework, useLiveData } from '@toeverything/infra';import { useCallback, useMemo } from 'react';+import { DropdownMenu } from '../menu';import { menuTrigger, settingWrapper } from '../style.css';+import { Point } from './point';import { EdgelessSnapshot } from './snapshot';enum ConnecterStyle {@@ -130,6 +131,11 @@ export const ConnectorSettings = () => {[editorSetting]);+ const currentColor = useMemo(() => {+ const color = settings.connector.stroke;+ return Object.entries(LineColor).find(([, value]) => value === color);+ }, [settings]);+const colorItems = useMemo(() => {const { stroke } = settings.connector;return Object.entries(LineColor).map(([name, value]) => {@@ -138,7 +144,12 @@ export const ConnectorSettings = () => {};const isSelected = stroke === value;return (- <MenuItem key={name} onSelect={handler} selected={isSelected}>+ <MenuItem+ key={name}+ onSelect={handler}+ selected={isSelected}+ prefix={<Point color={value} />}+ >{name}</MenuItem>);@@ -188,11 +199,19 @@ export const ConnectorSettings = () => {]()}desc={''}>- <Menu items={colorItems}>- <MenuTrigger className={menuTrigger}>- {String(settings.connector.stroke)}- </MenuTrigger>- </Menu>+ {currentColor ? (+ <DropdownMenu+ items={colorItems}+ trigger={+ <MenuTrigger+ className={menuTrigger}+ prefix={<Point color={currentColor[1]} />}+ >+ {currentColor[0]}+ </MenuTrigger>+ }+ />+ ) : null}</SettingRow><SettingRowname={t['com.affine.settings.editorSettings.edgeless.style']()}@@ -255,11 +274,14 @@ export const ConnectorSettings = () => {]()}desc={''}>- <Menu items={startEndPointItems}>- <MenuTrigger className={menuTrigger}>- {String(settings.connector.frontEndpointStyle)}- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={startEndPointItems}+ trigger={+ <MenuTrigger className={menuTrigger}>+ {String(settings.connector.frontEndpointStyle)}+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t[@@ -267,11 +289,14 @@ export const ConnectorSettings = () => {]()}desc={''}>- <Menu items={endEndPointItems}>- <MenuTrigger className={menuTrigger}>- {String(settings.connector.rearEndpointStyle)}- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={endEndPointItems}+ trigger={+ <MenuTrigger className={menuTrigger}>+ {String(settings.connector.rearEndpointStyle)}+ </MenuTrigger>+ }+ /></SettingRow></>);diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/mind-map.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/mind-map.tsxindex 33d4a5c584..0972863d32 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/mind-map.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/mind-map.tsx@@ -1,5 +1,4 @@import {- Menu,MenuItem,MenuTrigger,RadioGroup,@@ -9,6 +8,7 @@ import { SettingRow } from '@affine/component/setting-components';import { useI18n } from '@affine/i18n';import { useMemo, useState } from 'react';+import { DropdownMenu } from '../menu';import { menuTrigger, settingWrapper } from '../style.css';import { EdgelessSnapshot } from './snapshot';@@ -54,11 +54,14 @@ export const MindMapSettings = () => {name={t['com.affine.settings.editorSettings.edgeless.style']()}desc={''}>- <Menu items={<MenuItem>Style 1</MenuItem>}>- <MenuTrigger className={menuTrigger} disabled>- Style 1- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={<MenuItem>Style 1</MenuItem>}+ trigger={+ <MenuTrigger className={menuTrigger} disabled>+ Style 1+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t[diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/note.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/note.tsxindex 5dd04915e9..e0106ad861 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/note.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/note.tsx@@ -1,5 +1,4 @@import {- Menu,MenuItem,MenuTrigger,RadioGroup,@@ -17,7 +16,9 @@ import {import { useFramework, useLiveData } from '@toeverything/infra';import { useCallback, useMemo } from 'react';+import { DropdownMenu } from '../menu';import { menuTrigger, settingWrapper } from '../style.css';+import { Point } from './point';import { EdgelessSnapshot } from './snapshot';const CORNER_SIZE = [@@ -91,7 +92,12 @@ export const NoteSettings = () => {};const isSelected = background === value;return (- <MenuItem key={name} onSelect={handler} selected={isSelected}>+ <MenuItem+ key={name}+ onSelect={handler}+ selected={isSelected}+ prefix={<Point color={value} />}+ >{name}</MenuItem>);@@ -140,6 +146,13 @@ export const NoteSettings = () => {});}, [editorSetting, settings]);+ const currentColor = useMemo(() => {+ const { background } = settings['affine:note'];+ return Object.entries(NoteBackgroundColor).find(+ ([, value]) => value === background+ );+ }, [settings]);+return (<><EdgelessSnapshot@@ -153,31 +166,45 @@ export const NoteSettings = () => {]()}desc={''}>- <Menu items={backgroundItems}>- <MenuTrigger className={menuTrigger}>- {String(settings['affine:note'].background)}- </MenuTrigger>- </Menu>+ {currentColor ? (+ <DropdownMenu+ items={backgroundItems}+ trigger={+ <MenuTrigger+ className={menuTrigger}+ prefix={<Point color={currentColor[1]} />}+ >+ {currentColor[0]}+ </MenuTrigger>+ }+ />+ ) : null}</SettingRow><SettingRowname={t['com.affine.settings.editorSettings.edgeless.note.corners']()}desc={''}>- <Menu items={cornerItems}>- <MenuTrigger className={menuTrigger}>- {String(settings['affine:note'].edgeless.style.borderRadius)}- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={cornerItems}+ trigger={+ <MenuTrigger className={menuTrigger}>+ {String(settings['affine:note'].edgeless.style.borderRadius)}+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t['com.affine.settings.editorSettings.edgeless.note.shadow']()}desc={''}>- <Menu items={shadowItems}>- <MenuTrigger className={menuTrigger}>- {String(settings['affine:note'].edgeless.style.shadowType)}- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={shadowItems}+ trigger={+ <MenuTrigger className={menuTrigger}>+ {String(settings['affine:note'].edgeless.style.shadowType)}+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t['com.affine.settings.editorSettings.edgeless.note.border']()}diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/pen.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/pen.tsxindex 5e844adfee..eb7751270a 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/pen.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/pen.tsx@@ -1,4 +1,4 @@-import { Menu, MenuItem, MenuTrigger, Slider } from '@affine/component';+import { MenuItem, MenuTrigger, Slider } from '@affine/component';import { SettingRow } from '@affine/component/setting-components';import { EditorSettingService } from '@affine/core/modules/editor-settting';import { useI18n } from '@affine/i18n';@@ -6,6 +6,7 @@ import { LineColor } from '@blocksuite/blocks';import { useFramework, useLiveData } from '@toeverything/infra';import { useCallback, useMemo } from 'react';+import { DropdownMenu } from '../menu';import { menuTrigger } from '../style.css';import { EdgelessSnapshot } from './snapshot';@@ -39,7 +40,6 @@ export const PenSettings = () => {},[editorSetting]);-return (<><EdgelessSnapshot@@ -51,11 +51,14 @@ export const PenSettings = () => {name={t['com.affine.settings.editorSettings.edgeless.pen.color']()}desc={''}>- <Menu items={colorItems}>- <MenuTrigger className={menuTrigger}>- {String(settings.brush.color)}- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={colorItems}+ trigger={+ <MenuTrigger className={menuTrigger}>+ {String(settings.brush.color)}+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t['com.affine.settings.editorSettings.edgeless.pen.thickness']()}diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/point.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/point.tsxnew file mode 100644index 0000000000..0bfa573e1d--- /dev/null+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/point.tsx@@ -0,0 +1,21 @@+import { cssVarV2 } from '@toeverything/theme/v2';++export const Point = ({+ color,+ size = 8,+}: {+ color: string;+ size?: number;+}) => {+ return (+ <div+ style={{+ width: size,+ height: size,+ borderRadius: '50%',+ backgroundColor: `var(${color})`,+ border: `1px solid ${cssVarV2('layer/insideBorder/border')}`,+ }}+ ></div>+ );+};diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/shape.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/shape.tsxindex fdde2abc48..fccc763552 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/shape.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/shape.tsx@@ -1,5 +1,4 @@import {- Menu,MenuItem,MenuTrigger,RadioGroup,@@ -10,6 +9,7 @@ import { SettingRow } from '@affine/component/setting-components';import { useI18n } from '@affine/i18n';import { useMemo, useState } from 'react';+import { DropdownMenu } from '../menu';import { menuTrigger, settingWrapper, shapeIndicator } from '../style.css';import { EdgelessSnapshot } from './snapshot';@@ -164,11 +164,14 @@ export const ShapeSettings = () => {]()}desc={''}>- <Menu items={<MenuItem>Yellow</MenuItem>}>- <MenuTrigger className={menuTrigger} disabled>- Yellow- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={<MenuItem>Yellow</MenuItem>}+ trigger={+ <MenuTrigger className={menuTrigger} disabled>+ Yellow+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t[@@ -176,11 +179,14 @@ export const ShapeSettings = () => {]()}desc={''}>- <Menu items={<MenuItem>Yellow</MenuItem>}>- <MenuTrigger className={menuTrigger} disabled>- Yellow- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={<MenuItem>Yellow</MenuItem>}+ trigger={+ <MenuTrigger className={menuTrigger} disabled>+ Yellow+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t[@@ -217,21 +223,28 @@ export const ShapeSettings = () => {]()}desc={''}>- <Menu items={<MenuItem>Yellow</MenuItem>}>- <MenuTrigger className={menuTrigger} disabled>- Yellow- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={<MenuItem>Yellow</MenuItem>}+ trigger={+ <MenuTrigger className={menuTrigger} disabled>+ Yellow+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t['com.affine.settings.editorSettings.edgeless.shape.font']()}desc={''}>- <Menu items={<MenuItem>Inter</MenuItem>}>- <MenuTrigger className={menuTrigger} disabled>- Inter- </MenuTrigger>- </Menu>+ {' '}+ <DropdownMenu+ items={<MenuItem>Inter</MenuItem>}+ trigger={+ <MenuTrigger className={menuTrigger} disabled>+ Inter+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t[@@ -239,11 +252,14 @@ export const ShapeSettings = () => {]()}desc={''}>- <Menu items={<MenuItem>15px</MenuItem>}>- <MenuTrigger className={menuTrigger} disabled>- 15px- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={<MenuItem>15px</MenuItem>}+ trigger={+ <MenuTrigger className={menuTrigger} disabled>+ 15px+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t[@@ -251,11 +267,14 @@ export const ShapeSettings = () => {]()}desc={''}>- <Menu items={<MenuItem>Regular</MenuItem>}>- <MenuTrigger className={menuTrigger} disabled>- Regular- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={<MenuItem>Regular</MenuItem>}+ trigger={+ <MenuTrigger className={menuTrigger} disabled>+ Regular+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t[diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/text.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/text.tsxindex 7b267c3cd7..25c66886d4 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/text.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/edgeless/text.tsx@@ -1,5 +1,4 @@import {- Menu,MenuItem,MenuTrigger,RadioGroup,@@ -19,7 +18,9 @@ import {import { useFramework, useLiveData } from '@toeverything/infra';import { useCallback, useMemo } from 'react';+import { DropdownMenu } from '../menu';import { menuTrigger, settingWrapper } from '../style.css';+import { Point } from './point';import { EdgelessSnapshot } from './snapshot';export const TextSettings = () => {@@ -73,7 +74,12 @@ export const TextSettings = () => {};const isSelected = color === value;return (- <MenuItem key={name} onSelect={handler} selected={isSelected}>+ <MenuItem+ key={name}+ onSelect={handler}+ selected={isSelected}+ prefix={<Point color={value} />}+ >{name}</MenuItem>);@@ -125,6 +131,10 @@ export const TextSettings = () => {});}, [editorSetting, settings]);+ const currentColor = useMemo(() => {+ const { color } = settings['affine:edgeless-text'];+ return Object.entries(LineColor).find(([, value]) => value === color);+ }, [settings]);return (<><EdgelessSnapshot@@ -136,11 +146,19 @@ export const TextSettings = () => {name={t['com.affine.settings.editorSettings.edgeless.text.color']()}desc={''}>- <Menu items={colorItems}>- <MenuTrigger className={menuTrigger}>- {String(settings['affine:edgeless-text'].color)}- </MenuTrigger>- </Menu>+ {currentColor ? (+ <DropdownMenu+ items={colorItems}+ trigger={+ <MenuTrigger+ className={menuTrigger}+ prefix={<Point color={currentColor[1]} />}+ >+ {currentColor[0]}+ </MenuTrigger>+ }+ />+ ) : null}</SettingRow><SettingRowname={t[@@ -148,11 +166,14 @@ export const TextSettings = () => {]()}desc={''}>- <Menu items={fontFamilyItems}>- <MenuTrigger className={menuTrigger}>- {FontFamilyMap[settings['affine:edgeless-text'].fontFamily]}- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={fontFamilyItems}+ trigger={+ <MenuTrigger className={menuTrigger}>+ {FontFamilyMap[settings['affine:edgeless-text'].fontFamily]}+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t[@@ -160,11 +181,14 @@ export const TextSettings = () => {]()}desc={''}>- <Menu items={fontStyleItems}>- <MenuTrigger className={menuTrigger}>- {String(settings['affine:edgeless-text'].fontStyle)}- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={fontStyleItems}+ trigger={+ <MenuTrigger className={menuTrigger}>+ {String(settings['affine:edgeless-text'].fontStyle)}+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t[@@ -172,11 +196,14 @@ export const TextSettings = () => {]()}desc={''}>- <Menu items={fontWeightItems}>- <MenuTrigger className={menuTrigger}>- {settings['affine:edgeless-text'].fontWeight}- </MenuTrigger>- </Menu>+ <DropdownMenu+ items={fontWeightItems}+ trigger={+ <MenuTrigger className={menuTrigger}>+ {settings['affine:edgeless-text'].fontWeight}+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t['com.affine.settings.editorSettings.edgeless.text.alignment']()}diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/general.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/general.tsxindex 0e7ecf68a0..6288e28b27 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/general.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/general.tsx@@ -38,6 +38,7 @@ import {} from 'react';import { Virtuoso } from 'react-virtuoso';+import { DropdownMenu } from './menu';import * as styles from './style.css';const FontFamilySettings = () => {@@ -94,13 +95,18 @@ const FontFamilySettings = () => {);return (- <RadioGroup- items={radioItems}- value={settings.fontFamily}- width={250}- className={styles.settingWrapper}- onChange={handleFontFamilyChange}- />+ <SettingRow+ name={t['com.affine.appearanceSettings.font.title']()}+ desc={t['com.affine.appearanceSettings.font.description']()}+ >+ <RadioGroup+ items={radioItems}+ value={settings.fontFamily}+ width={250}+ className={styles.settingWrapper}+ onChange={handleFontFamilyChange}+ />+ </SettingRow>);};@@ -303,43 +309,29 @@ const NewDocDefaultModeSettings = () => {[editorSettingService.editorSetting]);return (- <RadioGroup- items={radioItems}- value={settings.newDocDefaultMode}- width={250}- className={styles.settingWrapper}- onChange={updateNewDocDefaultMode}- />+ <SettingRow+ name={t[+ 'com.affine.settings.editorSettings.general.default-new-doc.title'+ ]()}+ desc={t[+ 'com.affine.settings.editorSettings.general.default-new-doc.description'+ ]()}+ >+ <RadioGroup+ items={radioItems}+ value={settings.newDocDefaultMode}+ width={250}+ className={styles.settingWrapper}+ onChange={updateNewDocDefaultMode}+ />+ </SettingRow>);};-export const General = () => {+export const DeFaultCodeBlockSettings = () => {const t = useI18n();return (- <SettingWrapper title={t['com.affine.settings.editorSettings.general']()}>- <SettingRow- name={t['com.affine.settings.editorSettings.general.ai.title']()}- desc={t['com.affine.settings.editorSettings.general.ai.description']()}- >- <Switch />- </SettingRow>- <SettingRow- name={t['com.affine.appearanceSettings.font.title']()}- desc={t['com.affine.appearanceSettings.font.description']()}- >- <FontFamilySettings />- </SettingRow>- <CustomFontFamilySettings />- <SettingRow- name={t[- 'com.affine.settings.editorSettings.general.default-new-doc.title'- ]()}- desc={t[- 'com.affine.settings.editorSettings.general.default-new-doc.description'- ]()}- >- <NewDocDefaultModeSettings />- </SettingRow>+ <><SettingRowname={t['com.affine.settings.editorSettings.general.default-code-block.language.title'@@ -348,16 +340,14 @@ export const General = () => {'com.affine.settings.editorSettings.general.default-code-block.language.description']()}>- <Menu- contentOptions={{- className: styles.menu,- }}+ <DropdownMenuitems={<MenuItem>Plain Text</MenuItem>}- >- <MenuTrigger className={styles.menuTrigger} disabled>- Plain Text- </MenuTrigger>- </Menu>+ trigger={+ <MenuTrigger className={styles.menuTrigger} disabled>+ Plain Text+ </MenuTrigger>+ }+ /></SettingRow><SettingRowname={t[@@ -369,16 +359,39 @@ export const General = () => {><Switch /></SettingRow>+ </>+ );+};++export const SpellCheckSettings = () => {+ const t = useI18n();+ return (+ <SettingRow+ name={t['com.affine.settings.editorSettings.general.spell-check.title']()}+ desc={t[+ 'com.affine.settings.editorSettings.general.spell-check.description'+ ]()}+ >+ <Switch />+ </SettingRow>+ );+};++export const General = () => {+ const t = useI18n();+ return (+ <SettingWrapper title={t['com.affine.settings.editorSettings.general']()}><SettingRow- name={t[- 'com.affine.settings.editorSettings.general.spell-check.title'- ]()}- desc={t[- 'com.affine.settings.editorSettings.general.spell-check.description'- ]()}+ name={t['com.affine.settings.editorSettings.general.ai.title']()}+ desc={t['com.affine.settings.editorSettings.general.ai.description']()}><Switch /></SettingRow>+ <FontFamilySettings />+ <CustomFontFamilySettings />+ <NewDocDefaultModeSettings />+ <DeFaultCodeBlockSettings />+ <SpellCheckSettings /></SettingWrapper>);};diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/menu.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/menu.tsxnew file mode 100644index 0000000000..987b3a22fc--- /dev/null+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/menu.tsx@@ -0,0 +1,23 @@+import { Menu } from '@affine/component';+import { type ReactNode } from 'react';++export const DropdownMenu = ({+ items,+ trigger,+}: {+ items: ReactNode;+ trigger: ReactNode;+}) => {+ return (+ <Menu+ items={items}+ contentOptions={{+ style: {+ width: '250px',+ },+ }}+ >+ {trigger}+ </Menu>+ );+};