fix(core): fix color palette types

toeverything · Dec 18, 2024 · 2f50643 · 2f50643
1 parent 2ceb6e9
commit 2f50643
Show file tree

Hide file tree

Showing 14 changed files with 194 additions and 193 deletions.
diff --git a/packages/common/env/package.json b/packages/common/env/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "type": "module",
   "devDependencies": {
-    "@blocksuite/affine": "0.19.2",
+    "@blocksuite/affine": "0.0.0-canary-20241218024138",
     "vitest": "2.1.8"
   },
   "exports": {

diff --git a/packages/common/infra/package.json b/packages/common/infra/package.json
@@ -15,7 +15,7 @@
     "@affine/debug": "workspace:*",
     "@affine/env": "workspace:*",
     "@affine/templates": "workspace:*",
-    "@blocksuite/affine": "0.19.2",
+    "@blocksuite/affine": "0.0.0-canary-20241218024138",
     "@datastructures-js/binary-search-tree": "^5.3.2",
     "eventemitter2": "^6.4.9",
     "foxact": "^0.2.43",

diff --git a/packages/frontend/apps/android/package.json b/packages/frontend/apps/android/package.json
@@ -13,7 +13,7 @@
     "@affine/component": "workspace:*",
     "@affine/core": "workspace:*",
     "@affine/i18n": "workspace:*",
-    "@blocksuite/affine": "0.19.2",
+    "@blocksuite/affine": "0.0.0-canary-20241218024138",
     "@blocksuite/icons": "2.1.75",
     "@capacitor/android": "^6.2.0",
     "@capacitor/core": "^6.2.0",

diff --git a/packages/frontend/apps/electron/package.json b/packages/frontend/apps/electron/package.json
@@ -30,7 +30,7 @@
     "@affine/i18n": "workspace:*",
     "@affine/native": "workspace:*",
     "@affine/nbstore": "workspace:*",
-    "@blocksuite/affine": "0.19.2",
+    "@blocksuite/affine": "0.0.0-canary-20241218024138",
     "@electron-forge/cli": "^7.6.0",
     "@electron-forge/core": "^7.6.0",
     "@electron-forge/core-utils": "^7.6.0",

diff --git a/packages/frontend/apps/ios/package.json b/packages/frontend/apps/ios/package.json
@@ -15,7 +15,7 @@
     "@affine/component": "workspace:*",
     "@affine/core": "workspace:*",
     "@affine/i18n": "workspace:*",
-    "@blocksuite/affine": "0.19.2",
+    "@blocksuite/affine": "0.0.0-canary-20241218024138",
     "@blocksuite/icons": "2.1.75",
     "@capacitor/app": "^6.0.2",
     "@capacitor/browser": "^6.0.4",

diff --git a/packages/frontend/apps/mobile/package.json b/packages/frontend/apps/mobile/package.json
@@ -13,7 +13,7 @@
     "@affine/component": "workspace:*",
     "@affine/core": "workspace:*",
     "@affine/i18n": "workspace:*",
-    "@blocksuite/affine": "0.19.2",
+    "@blocksuite/affine": "0.0.0-canary-20241218024138",
     "@blocksuite/icons": "2.1.75",
     "@sentry/react": "^8.44.0",
     "react": "^19.0.0",

diff --git a/packages/frontend/component/package.json b/packages/frontend/component/package.json
@@ -66,7 +66,7 @@
     "zod": "^3.24.1"
   },
   "devDependencies": {
-    "@blocksuite/affine": "0.19.2",
+    "@blocksuite/affine": "0.0.0-canary-20241218024138",
     "@blocksuite/icons": "2.1.75",
     "@chromatic-com/storybook": "^3.2.2",
     "@storybook/addon-essentials": "^8.4.7",

diff --git a/packages/frontend/core/package.json b/packages/frontend/core/package.json
@@ -16,7 +16,7 @@
     "@affine/i18n": "workspace:*",
     "@affine/templates": "workspace:*",
     "@affine/track": "workspace:*",
-    "@blocksuite/affine": "0.19.2",
+    "@blocksuite/affine": "0.0.0-canary-20241218024138",
     "@blocksuite/icons": "2.1.75",
     "@capacitor/app": "^6.0.2",
     "@capacitor/browser": "^6.0.4",

diff --git a/...s/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/connector.tsx b/...s/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/connector.tsx
@@ -14,9 +14,9 @@ import {
   FontFamilyMap,
   FontStyle,
   FontWeightMap,
-  LineColor,
-  LineColorMap,
   PointStyle,
+  StrokeColor,
+  StrokeColorMap,
   StrokeStyle,
   TextAlign,
 } from '@blocksuite/affine/blocks';
@@ -152,12 +152,12 @@ export const ConnectorSettings = () => {
 
   const currentColor = useMemo(() => {
     const color = settings.connector.stroke;
-    return getColorFromMap(color, LineColorMap);
+    return getColorFromMap(color, StrokeColorMap);
   }, [getColorFromMap, settings.connector.stroke]);
 
   const colorItems = useMemo(() => {
     const { stroke } = settings.connector;
-    return Object.entries(LineColor).map(([name, value]) => {
+    return Object.entries(StrokeColor).map(([name, value]) => {
       const handler = () => {
         editorSetting.set('connector', { stroke: value });
       };
@@ -322,7 +322,7 @@ export const ConnectorSettings = () => {
 
   const textColorItems = useMemo(() => {
     const { color } = settings.connector.labelStyle;
-    return Object.entries(LineColor).map(([name, value]) => {
+    return Object.entries(StrokeColor).map(([name, value]) => {
       const handler = () => {
         editorSetting.set('connector', {
           labelStyle: {
@@ -346,7 +346,7 @@ export const ConnectorSettings = () => {
 
   const textColor = useMemo(() => {
     const { color } = settings.connector.labelStyle;
-    return getColorFromMap(color, LineColorMap);
+    return getColorFromMap(color, StrokeColorMap);
   }, [getColorFromMap, settings]);
 
   const getElements = useCallback((doc: Doc) => {

diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/pen.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/pen.tsx
@@ -2,7 +2,7 @@ import { MenuItem, MenuTrigger, Slider } from '@affine/component';
 import { SettingRow } from '@affine/component/setting-components';
 import { EditorSettingService } from '@affine/core/modules/editor-setting';
 import { useI18n } from '@affine/i18n';
-import { LineColor, LineColorMap } from '@blocksuite/affine/blocks';
+import { StrokeColor, StrokeColorMap } from '@blocksuite/affine/blocks';
 import type { Doc } from '@blocksuite/affine/store';
 import { useFramework, useLiveData } from '@toeverything/infra';
 import { useCallback, useMemo } from 'react';
@@ -22,12 +22,12 @@ export const PenSettings = () => {
   const getColorFromMap = useColor();
 
   const currentColor = useMemo(() => {
-    return getColorFromMap(settings.brush.color, LineColorMap);
+    return getColorFromMap(settings.brush.color, StrokeColorMap);
   }, [getColorFromMap, settings.brush.color]);
 
   const colorItems = useMemo(() => {
     const { color } = settings.brush;
-    return Object.entries(LineColor).map(([name, value]) => {
+    return Object.entries(StrokeColor).map(([name, value]) => {
       const handler = () => {
         editorSetting.set('brush', { color: value });
       };

diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/shape.tsx
@@ -21,11 +21,11 @@ import {
   FontStyle,
   FontWeightMap,
   getShapeName,
-  LineColor,
-  LineColorMap,
   ShapeFillColor,
   ShapeStyle,
   ShapeType,
+  StrokeColor,
+  StrokeColorMap,
   StrokeStyle,
   TextAlign,
 } from '@blocksuite/affine/blocks';
@@ -226,7 +226,7 @@ export const ShapeSettings = () => {
 
   const borderColorItems = useMemo(() => {
     const { strokeColor } = settings[`shape:${currentShape}`];
-    return Object.entries(LineColor).map(([name, value]) => {
+    return Object.entries(StrokeColor).map(([name, value]) => {
       const handler = () => {
         editorSetting.set(`shape:${currentShape}`, { strokeColor: value });
       };
@@ -316,7 +316,7 @@ export const ShapeSettings = () => {
 
   const textColorItems = useMemo(() => {
     const { color } = settings[`shape:${currentShape}`];
-    return Object.entries(LineColor).map(([name, value]) => {
+    return Object.entries(StrokeColor).map(([name, value]) => {
       const handler = () => {
         editorSetting.set(`shape:${currentShape}`, { color: value });
       };
@@ -375,12 +375,12 @@ export const ShapeSettings = () => {
 
   const borderColor = useMemo(() => {
     const color = settings[`shape:${currentShape}`].strokeColor;
-    return getColorFromMap(color, LineColorMap);
+    return getColorFromMap(color, StrokeColorMap);
   }, [currentShape, getColorFromMap, settings]);
 
   const textColor = useMemo(() => {
     const color = settings[`shape:${currentShape}`].color;
-    return getColorFromMap(color, LineColorMap);
+    return getColorFromMap(color, StrokeColorMap);
   }, [currentShape, getColorFromMap, settings]);
 
   const height = currentDoc === 'flow' ? 456 : 180;

diff --git a/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/text.tsx b/packages/frontend/core/src/desktop/dialogs/setting/general-setting/editor/edgeless/text.tsx
@@ -12,8 +12,8 @@ import {
   FontFamilyMap,
   FontStyle,
   FontWeightMap,
-  LineColor,
-  LineColorMap,
+  StrokeColor,
+  StrokeColorMap,
   TextAlign,
 } from '@blocksuite/affine/blocks';
 import type { Doc } from '@blocksuite/affine/store';
@@ -72,7 +72,7 @@ export const TextSettings = () => {
 
   const colorItems = useMemo(() => {
     const { color } = settings['affine:edgeless-text'];
-    return Object.entries(LineColor).map(([name, value]) => {
+    return Object.entries(StrokeColor).map(([name, value]) => {
       const handler = () => {
         editorSetting.set('affine:edgeless-text', { color: value });
       };
@@ -137,7 +137,7 @@ export const TextSettings = () => {
 
   const currentColor = useMemo(() => {
     const { color } = settings['affine:edgeless-text'];
-    return getColorFromMap(color, LineColorMap);
+    return getColorFromMap(color, StrokeColorMap);
   }, [getColorFromMap, settings]);
 
   const getElements = useCallback((doc: Doc) => {

diff --git a/tools/cli/package.json b/tools/cli/package.json
@@ -6,7 +6,7 @@
     "@affine/env": "workspace:*",
     "@affine/templates": "workspace:*",
     "@aws-sdk/client-s3": "^3.709.0",
-    "@blocksuite/affine": "0.19.2",
+    "@blocksuite/affine": "0.0.0-canary-20241218024138",
     "@clack/core": "^0.3.5",
     "@clack/prompts": "^0.8.2",
     "@magic-works/i18n-codegen": "^0.6.1",