Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
fix: link to two calendars in same doc may failed randomly (#5926)
Lucas.Xu3ff47b7e1e2b
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/database_view_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/database_view_block_component.dartindex d780a1260e..f3292226aa 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/database_view_block_component.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/database/database_view_block_component.dart@@ -84,7 +84,7 @@ class _DatabaseBlockComponentWidgetStatechild: FocusScope(skipTraversal: true,onFocusChange: (value) {- if (value) {+ if (value && keepEditorFocusNotifier.value == 0) {context.read<EditorState>().selection = null;}},diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dartindex e9dec98685..a383caa082 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/workspace/_sidebar_workspace_menu.dart@@ -1,5 +1,3 @@-import 'dart:io';-import 'package:appflowy/generated/flowy_svgs.g.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/startup/startup.dart';@@ -253,7 +251,6 @@ class _WorkspaceInfo extends StatelessWidget {overflow: TextOverflow.ellipsis,withTooltip: true,),- if (Platform.isMacOS) const VSpace(2.0),// workspace members countFlowyText.regular(state.isLoadingdiff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text.dartindex 1ffdd425d6..036de080b3 100644--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text.dart+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text.dart@@ -166,10 +166,6 @@ class FlowyText extends StatelessWidget {}}- if (isEmoji && (_useNotoColorEmoji || Platform.isWindows)) {- fontSize = fontSize * 0.8;- }-double? lineHeight;if (this.lineHeight != null) {lineHeight = this.lineHeight!;@@ -177,6 +173,14 @@ class FlowyText extends StatelessWidget {lineHeight = figmaLineHeight! / fontSize;}+ if (isEmoji && (_useNotoColorEmoji || Platform.isWindows)) {+ const scaleFactor = 0.9;+ fontSize *= scaleFactor;+ if (lineHeight != null) {+ lineHeight /= scaleFactor;+ }+ }+final textStyle = Theme.of(context).textTheme.bodyMedium!.copyWith(fontSize: fontSize,fontWeight: fontWeight,@@ -206,8 +210,7 @@ class FlowyText extends StatelessWidget {textAlign: textAlign,overflow: overflow ?? TextOverflow.clip,style: textStyle,- strutStyle: ((Platform.isMacOS || Platform.isLinux) & !isEmoji) ||- (isEmoji && optimizeEmojiAlign)+ strutStyle: (isEmoji && optimizeEmojiAlign)? StrutStyle.fromTextStyle(textStyle,forceStrutHeight: true,diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lockindex 7046e40f67..21b0791d8d 100644--- a/frontend/appflowy_flutter/pubspec.lock+++ b/frontend/appflowy_flutter/pubspec.lock@@ -53,8 +53,8 @@ packages:dependency: "direct main"description:path: "."- ref: "3d6aff0"- resolved-ref: "3d6aff0d21de96411675417ab952f315cc949c7a"+ ref: dc10742+ resolved-ref: dc10742ba559e445e2ba1bd1b295cbf4758ccf3durl: "https://github.com/AppFlowy-IO/appflowy-editor.git"source: gitversion: "3.1.0"diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yamlindex dcb6004982..0389146a42 100644--- a/frontend/appflowy_flutter/pubspec.yaml+++ b/frontend/appflowy_flutter/pubspec.yaml@@ -199,7 +199,7 @@ dependency_overrides:appflowy_editor:git:url: https://github.com/AppFlowy-IO/appflowy-editor.git- ref: "3d6aff0"+ ref: "dc10742"appflowy_editor_plugins:git:diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.jsonindex 1b1142caba..b1a3ebe11a 100644--- a/frontend/resources/translations/en.json+++ b/frontend/resources/translations/en.json@@ -1472,7 +1472,7 @@"numberedList": "Numbered List","checkbox": "Checkbox","doc": "Doc",- "linkedDoc": "Linked Doc",+ "linkedDoc": "Link to page","grid": "Grid","linkedGrid": "Linked Grid","kanban": "Kanban",