mirror of
https://github.com/AppFlowy-IO/AppFlowy.git
synced 2024-08-30 18:12:39 +00:00
fix: link to two calendars in same doc may failed randomly (#5926)
* chore: udpate translation * fix: editor loses focus randomly when interacting with certain databases * fix: text align issues on Windows * chore: update editor version
This commit is contained in:
parent
d33af70a5c
commit
3ff47b7e1e
@ -84,7 +84,7 @@ class _DatabaseBlockComponentWidgetState
|
||||
child: FocusScope(
|
||||
skipTraversal: true,
|
||||
onFocusChange: (value) {
|
||||
if (value) {
|
||||
if (value && keepEditorFocusNotifier.value == 0) {
|
||||
context.read<EditorState>().selection = null;
|
||||
}
|
||||
},
|
||||
|
@ -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 count
|
||||
FlowyText.regular(
|
||||
state.isLoading
|
||||
|
@ -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,
|
||||
|
@ -53,8 +53,8 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
path: "."
|
||||
ref: "3d6aff0"
|
||||
resolved-ref: "3d6aff0d21de96411675417ab952f315cc949c7a"
|
||||
ref: dc10742
|
||||
resolved-ref: dc10742ba559e445e2ba1bd1b295cbf4758ccf3d
|
||||
url: "https://github.com/AppFlowy-IO/appflowy-editor.git"
|
||||
source: git
|
||||
version: "3.1.0"
|
||||
|
@ -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:
|
||||
|
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user