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
chore: sort font weight options (#8151)
JimmFly817306ea2a79
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 2aa008f033..f961968fbc 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@@ -19,7 +19,6 @@ import {FontFamily,FontFamilyMap,FontStyle,- FontWeight,FontWeightMap,getShapeName,LineColor,@@ -41,7 +40,7 @@ import {settingWrapper,shapeIndicator,} from '../style.css';-import { useColor } from '../utils';+import { sortedFontWeightEntries, useColor } from '../utils';import type { DocName } from './docs';import { Point } from './point';import { EdgelessSnapshot } from './snapshot';@@ -285,7 +284,7 @@ export const ShapeSettings = () => {const fontWeightItems = useMemo(() => {const { fontWeight } = settings[`shape:${currentShape}`];- return Object.entries(FontWeight).map(([name, value]) => {+ return sortedFontWeightEntries.map(([name, value]) => {const handler = () => {editorSetting.set(`shape:${currentShape}`, { fontWeight: value });};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 9a8a1a16db..723533505c 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@@ -11,7 +11,6 @@ import {FontFamily,FontFamilyMap,FontStyle,- FontWeight,FontWeightMap,LineColor,LineColorMap,@@ -23,7 +22,7 @@ import { useCallback, useMemo } from 'react';import { DropdownMenu } from '../menu';import { menuTrigger, settingWrapper } from '../style.css';-import { useColor } from '../utils';+import { sortedFontWeightEntries, useColor } from '../utils';import { Point } from './point';import { EdgelessSnapshot } from './snapshot';@@ -123,7 +122,7 @@ export const TextSettings = () => {const fontWeightItems = useMemo(() => {const { fontWeight } = settings['affine:edgeless-text'];- return Object.entries(FontWeight).map(([name, value]) => {+ return sortedFontWeightEntries.map(([name, value]) => {const handler = () => {editorSetting.set('affine:edgeless-text', { fontWeight: value });};diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/utils.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/utils.tsindex 25a9f93cb8..66431d2814 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/utils.ts+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/utils.ts@@ -1,3 +1,4 @@+import { FontWeight } from '@blocksuite/blocks';import { useTheme } from 'next-themes';function getColorFromMap(@@ -43,3 +44,7 @@ export const useColor = () => {resolvedTheme as 'light' | 'dark' | undefined);};++export const sortedFontWeightEntries = Object.entries(FontWeight).sort(+ (a, b) => Number(a[1]) - Number(b[1])+);