Skip to content

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.

chore: update appflowy_editor version (#6655)

Lucas557ce7e00643
diff --git a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart
index da59e30a04..9a3af8ff15 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/document/document_with_date_reminder_test.dart
@@ -51,12 +51,13 @@ void main() {
await tester.tap(find.byType(MentionDateBlock));
await tester.pumpAndSettle();
+ final currentTime = DateFormat('HH:mm').format(DateTime.now());
+
// tap the toggle of include time
await tester.tap(find.byType(Toggle));
await tester.pumpAndSettle();
// add time 11:12
- final currentTime = DateFormat('HH:mm').format(DateTime.now());
final textField = find.byWidgetPredicate(
(widget) =>
widget is TextField && widget.controller!.text == currentTime,
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart
index 10af411073..73fc3bcc25 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart
@@ -446,6 +446,8 @@ class _MentionPageBlockContent extends StatelessWidget {
content,
);
final isBlockContentEmpty = content == null || content.isEmpty;
+ final emojiSize = textStyle?.fontSize ?? 12.0;
+ final iconSize = textStyle?.fontSize ?? 16.0;
// if the block is from the same doc, display the paragraph mark icon '¶'
if (isSameDocument && !isBlockContentEmpty) {
@@ -453,14 +455,11 @@ class _MentionPageBlockContent extends StatelessWidget {
const HSpace(2),
FlowySvg(
FlowySvgs.paragraph_mark_s,
- size: const Size.square(14.0),
+ size: Size.square(iconSize - 2.0),
color: Theme.of(context).hintColor,
),
];
} else if (shouldDisplayViewName) {
- final emojiSize = textStyle?.fontSize ?? 12.0;
- final iconSize = textStyle?.fontSize ?? 16.0;
-
return [
const HSpace(4),
view.icon.value.isNotEmpty
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
index fb8b611f9e..151382b445 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_item.dart
@@ -31,6 +31,7 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:universal_platform/universal_platform.dart';
typedef ViewItemOnSelected = void Function(BuildContext context, ViewPB view);
typedef ViewItemLeftIconBuilder = Widget Function(
@@ -606,11 +607,13 @@ class _SingleInnerViewItemState extends State<SingleInnerViewItem> {
}
Widget _buildViewIconButton() {
+ // using same line height on macos will result the emoji not aligned vertically with the text
+ final height = UniversalPlatform.isMacOS ? 20.0 : 18.0;
final icon = widget.view.icon.value.isNotEmpty
? FlowyText.emoji(
widget.view.icon.value,
fontSize: 16.0,
- figmaLineHeight: 21.0,
+ figmaLineHeight: height,
)
: Opacity(opacity: 0.6, child: widget.view.defaultIcon());
diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lock
index c6e9279c62..cde972b2af 100644
--- a/frontend/appflowy_flutter/pubspec.lock
+++ b/frontend/appflowy_flutter/pubspec.lock
@@ -61,8 +61,8 @@ packages:
dependency: "direct main"
description:
path: "."
- ref: e7d9560
- resolved-ref: e7d956099aea85727973e5518c50bc4da9fc92bc
+ ref: cca5c41
+ resolved-ref: cca5c413480048fbb7dbd4e58f9251e5cf3088e0
url: "https://github.com/AppFlowy-IO/appflowy-editor.git"
source: git
version: "4.0.0"
diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yaml
index dc1cf8a80b..2007d16581 100644
--- a/frontend/appflowy_flutter/pubspec.yaml
+++ b/frontend/appflowy_flutter/pubspec.yaml
@@ -172,7 +172,7 @@ dependency_overrides:
appflowy_editor:
git:
url: https://github.com/AppFlowy-IO/appflowy-editor.git
- ref: "e7d9560"
+ ref: "cca5c41"
appflowy_editor_plugins:
git: