Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-08-19 02:51:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): wrong style of mindmap in dark mode (#9462)

Browse Source 
<div class='graphite__hidden'>
          <div>🎥 Video uploaded on Graphite:</div>
            <a href="https://app.graphite.dev/media/video/8ypiIKZXudF5a0tIgIzf/87aa060a-12c3-46dc-85fd-28980ba5b2bd.mov">
              <img src="https://app.graphite.dev/api/v1/graphite/video/thumbnail/8ypiIKZXudF5a0tIgIzf/87aa060a-12c3-46dc-85fd-28980ba5b2bd.mov">
            </a>
          </div>
<video src="https://graphite-user-uploaded-assets-prod.s3.amazonaws.com/8ypiIKZXudF5a0tIgIzf/87aa060a-12c3-46dc-85fd-28980ba5b2bd.mov">Screen Recording 2024-12-31 at 18.05.36.mov</video>
This commit is contained in:
fundon
2024-12-31 11:54:13 +00:00
parent 36c1b103df
commit d97c4b5632
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocksuite/affine/block-surface/src/renderer/elements/shape/utils.ts
+1 -1
View File
@@ -80,7 +80,7 @@ export function drawGeneralShape(
ctx.shadowOffsetY = offsetY * scale; ctx.shadowOffsetY = offsetY * scale;
} }
ctx.shadowColor = renderer.getPropertyValue(color); ctx.shadowColor = renderer.getColorValue(color, undefined, true);
} }
ctx.stroke(); ctx.stroke();
blocksuite/affine/model/src/elements/mindmap/style.ts
+18 -17
View File
@@ -49,7 +49,7 @@ export type NodeStyle = {
blur: number; blur: number;
offsetX: number; offsetX: number;
offsetY: number; offsetY: number;
color: string; color: Color;
}; };
}; };
@@ -199,7 +199,7 @@ export class StyleTwo extends MindmapStyleGetter {
textResizing: TextResizing.AUTO_WIDTH_AND_HEIGHT, textResizing: TextResizing.AUTO_WIDTH_AND_HEIGHT,
strokeWidth: 3, strokeWidth: 3,
strokeColor: DefaultTheme.pureBlack, strokeColor: DefaultTheme.black,
fontFamily: FontFamily.Poppins, fontFamily: FontFamily.Poppins,
fontSize: 18, fontSize: 18,
@@ -215,7 +215,7 @@ export class StyleTwo extends MindmapStyleGetter {
blur: 0, blur: 0,
offsetX: 3, offsetX: 3,
offsetY: 3, offsetY: 3,
color: DefaultTheme.pureBlack, color: DefaultTheme.black,
}, },
}; };
@@ -231,7 +231,7 @@ export class StyleTwo extends MindmapStyleGetter {
return { return {
connector: { connector: {
strokeStyle: StrokeStyle.Solid, strokeStyle: StrokeStyle.Solid,
stroke: DefaultTheme.pureBlack, stroke: DefaultTheme.black,
strokeWidth: 3, strokeWidth: 3,
mode: ConnectorMode.Orthogonal, mode: ConnectorMode.Orthogonal,
@@ -242,9 +242,9 @@ export class StyleTwo extends MindmapStyleGetter {
radius: 0.5, radius: 0.5,
filled: true, filled: true,
fillColor: DefaultTheme.pureWhite, fillColor: DefaultTheme.white,
strokeColor: DefaultTheme.pureBlack, strokeColor: DefaultTheme.black,
strokeWidth: 3, strokeWidth: 3,
}, },
expandButton: { expandButton: {
@@ -253,14 +253,14 @@ export class StyleTwo extends MindmapStyleGetter {
radius: 2, radius: 2,
filled: true, filled: true,
fillColor: DefaultTheme.pureBlack, fillColor: DefaultTheme.black,
padding: [4, 0], padding: [4, 0],
strokeColor: DefaultTheme.pureBlack, strokeColor: DefaultTheme.black,
strokeWidth: 0, strokeWidth: 0,
color: DefaultTheme.pureWhite, color: DefaultTheme.white,
fontFamily: FontFamily.Inter, fontFamily: FontFamily.Inter,
fontWeight: FontWeight.Bold, fontWeight: FontWeight.Bold,
@@ -272,7 +272,7 @@ export class StyleTwo extends MindmapStyleGetter {
textResizing: TextResizing.AUTO_WIDTH_AND_HEIGHT, textResizing: TextResizing.AUTO_WIDTH_AND_HEIGHT,
strokeWidth: 3, strokeWidth: 3,
strokeColor: DefaultTheme.pureBlack, strokeColor: DefaultTheme.black,
fontFamily: FontFamily.Poppins, fontFamily: FontFamily.Poppins,
fontSize: 16, fontSize: 16,
@@ -288,7 +288,7 @@ export class StyleTwo extends MindmapStyleGetter {
blur: 0, blur: 0,
offsetX: 3, offsetX: 3,
offsetY: 3, offsetY: 3,
color: DefaultTheme.pureBlack, color: DefaultTheme.black,
}, },
}, },
}; };
@@ -300,7 +300,7 @@ export class StyleThree extends MindmapStyleGetter {
private readonly _strokeColor = [ private readonly _strokeColor = [
DefaultTheme.StrokeColorMap.Yellow, DefaultTheme.StrokeColorMap.Yellow,
DefaultTheme.StrokeColorMap.Green, DefaultTheme.StrokeColorMap.Green,
DefaultTheme.StrokeColorMap.Teal, '#5cc7ba',
]; ];
readonly root = { readonly root = {
@@ -335,6 +335,7 @@ export class StyleThree extends MindmapStyleGetter {
override getNodeStyle(_: MindmapNode, path: number[]) { override getNodeStyle(_: MindmapNode, path: number[]) {
const strokeColor = this._getColor(path.length - 2); const strokeColor = this._getColor(path.length - 2);
const dotColor = this._getColor(path.length - 1);
return { return {
node: { node: {
@@ -343,7 +344,7 @@ export class StyleThree extends MindmapStyleGetter {
textResizing: TextResizing.AUTO_WIDTH_AND_HEIGHT, textResizing: TextResizing.AUTO_WIDTH_AND_HEIGHT,
strokeWidth: 2, strokeWidth: 2,
strokeColor: strokeColor, strokeColor,
fontFamily: FontFamily.Poppins, fontFamily: FontFamily.Poppins,
fontSize: 16, fontSize: 16,
@@ -370,7 +371,7 @@ export class StyleThree extends MindmapStyleGetter {
filled: true, filled: true,
fillColor: DefaultTheme.pureWhite, fillColor: DefaultTheme.pureWhite,
strokeColor: '#3cbc36', strokeColor: dotColor,
strokeWidth: 3, strokeWidth: 3,
}, },
expandButton: { expandButton: {
@@ -379,14 +380,14 @@ export class StyleThree extends MindmapStyleGetter {
radius: 8, radius: 8,
filled: true, filled: true,
fillColor: '#3cbc36', fillColor: dotColor,
padding: [4, 0], padding: [4, 0],
strokeColor: '#3cbc36', strokeColor: dotColor,
strokeWidth: 0, strokeWidth: 0,
color: '#fff', color: DefaultTheme.pureWhite,
fontFamily: FontFamily.Inter, fontFamily: FontFamily.Inter,
fontWeight: FontWeight.Bold, fontWeight: FontWeight.Bold,
blocksuite/affine/model/src/elements/shape/shape.ts
+2 -2
View File
@@ -148,7 +148,7 @@ export class ShapeElementModel extends GfxPrimitiveElementModel<ShapeProps> {
blur: number; blur: number;
offsetX: number; offsetX: number;
offsetY: number; offsetY: number;
color: string; color: Color;
} | null = null; } | null = null;
@field() @field()
@@ -234,7 +234,7 @@ export class LocalShapeElementModel extends GfxLocalElementModel {
blur: number; blur: number;
offsetX: number; offsetX: number;
offsetY: number; offsetY: number;
color: string; color: Color;
} | null = null; } | null = null;
@prop() @prop()