Merge branch 'main' into retry_load_image

AppFlowy-IO · Jan 9, 2025 · 5b4b2c4 · 5b4b2c4
2 parents 8ab1464 + a49acd9
commit 5b4b2c4
Show file tree

Hide file tree

Showing 39 changed files with 1,632 additions and 192 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,20 @@
 # Release Notes
+## Version 0.8.0 - 06/01/2025
+### Bug Fixes
+- Fixed error displaying in the page style menu
+- Fixed filter logic in the icon picker
+- Fixed error displaying in the Favorite/Recent page
+- Fixed the color picker displaying when tapping down
+- Fixed icons not being supported in subpage blocks
+- Fixed recent icon functionality in the space icon menu
+- Fixed "Insert Below" not auto-scrolling the table
+- Fixed a to-do item with an emoji automatically creating a soft break
+- Fixed header row/column tap areas being too small
+- Fixed simple table alignment not working for items that wrap
+- Fixed web content reverting after removing the inline code format on desktop
+- Fixed inability to make changes to a row or column in the table when opening a new tab
+- Fixed changing the language to CKB-KU causing a gray screen on mobile
+
 ## Version 0.7.9 - 30/12/2024
 ### New Features
 - Meet AppFlowy Web (Lite): Use AppFlowy directly in your browser.

diff --git a/frontend/Makefile.toml b/frontend/Makefile.toml
@@ -26,7 +26,7 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CARGO_MAKE_CRATE_FS_NAME = "dart_ffi"
 CARGO_MAKE_CRATE_NAME = "dart-ffi"
 LIB_NAME = "dart_ffi"
-APPFLOWY_VERSION = "0.7.9"
+APPFLOWY_VERSION = "0.8.1"
 FLUTTER_DESKTOP_FEATURES = "dart"
 PRODUCT_NAME = "AppFlowy"
 MACOSX_DEPLOYMENT_TARGET = "11.0"

diff --git a/frontend/appflowy_flutter/android/app/build.gradle b/frontend/appflowy_flutter/android/app/build.gradle
@@ -53,7 +53,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.appflowy.appflowy"
         minSdkVersion 29
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true

diff --git a/...nd/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_settings_test.dart b/...nd/appflowy_flutter/integration_test/desktop/cloud/workspace/workspace_settings_test.dart
@@ -249,7 +249,7 @@ More actions for published page:
       await tester.openSettings();
       await tester.openSettingsPage(SettingsPage.sites);
       // wait the backend return the sites data
-      await tester.wait(1000);
+      await tester.wait(2000);
 
       // check if the page is published in sites page
       final pageItem = find.byWidgetPredicate(

diff --git a/frontend/appflowy_flutter/integration_test/desktop/document/document_sub_page_test.dart b/frontend/appflowy_flutter/integration_test/desktop/document/document_sub_page_test.dart
@@ -58,11 +58,6 @@ void main() {
 
       await tester.insertSubPageFromSlashMenu();
 
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-
       expect(
         find.text(LocaleKeys.menuAppHeader_defaultNewPageName.tr()),
         findsNWidgets(3),
@@ -77,12 +72,6 @@ void main() {
 
       await tester.insertSubPageFromSlashMenu();
 
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-      await tester.pumpAndSettle();
-
       await tester.renamePageWithSecondary(_defaultPageName, 'Child page');
       expect(find.text('Child page'), findsNWidgets(2));
 
@@ -101,11 +90,6 @@ void main() {
 
       await tester.insertSubPageFromSlashMenu();
 
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-
       await tester.renamePageWithSecondary(_defaultPageName, 'Child page');
       expect(find.text('Child page'), findsNWidgets(2));
 
@@ -154,11 +138,6 @@ void main() {
 
       await tester.insertSubPageFromSlashMenu();
 
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-
       await tester.renamePageWithSecondary(_defaultPageName, 'Child page');
       expect(find.text('Child page'), findsNWidgets(2));
 
@@ -212,11 +191,6 @@ void main() {
 
       await tester.insertSubPageFromSlashMenu();
 
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-
       await tester.renamePageWithSecondary(_defaultPageName, 'Child page');
       expect(find.text('Child page'), findsNWidgets(2));
 
@@ -253,11 +227,6 @@ void main() {
 
       await tester.insertSubPageFromSlashMenu();
 
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-
       await tester.renamePageWithSecondary(_defaultPageName, 'Child page');
       expect(find.text('Child page'), findsNWidgets(2));
 
@@ -303,11 +272,6 @@ void main() {
 
       await tester.insertSubPageFromSlashMenu();
 
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-
       await tester.renamePageWithSecondary(_defaultPageName, 'Child page');
       expect(find.text('Child page'), findsNWidgets(2));
 
@@ -346,11 +310,6 @@ void main() {
 
       await tester.insertSubPageFromSlashMenu(true);
 
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-
       await tester.renamePageWithSecondary(_defaultPageName, 'Child page');
       expect(find.text('Child page'), findsNWidgets(2));
 
@@ -394,11 +353,6 @@ void main() {
 
       await tester.insertSubPageFromSlashMenu();
 
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-
       await tester.renamePageWithSecondary(_defaultPageName, 'Child page');
       expect(find.text('Child page'), findsNWidgets(2));
       expect(find.byType(SubPageBlockComponent), findsOneWidget);
@@ -421,12 +375,6 @@ void main() {
       await tester.createNewPageWithNameUnderParent(name: 'SubPageBlock');
 
       await tester.insertSubPageFromSlashMenu();
-
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-
       await tester.renamePageWithSecondary(_defaultPageName, 'Child page');
       expect(find.text('Child page'), findsNWidgets(2));
 
@@ -447,11 +395,6 @@ void main() {
 
       await tester.insertSubPageFromSlashMenu(true);
 
-      await tester.expandOrCollapsePage(
-        pageName: 'SubPageBlock',
-        layout: ViewLayoutPB.Document,
-      );
-
       expect(find.byType(SubPageBlockComponent), findsOneWidget);
 
       final beforeNode = tester.editor.getNodeAtPath([1]);
@@ -532,6 +475,11 @@ void main() {
       await tester.pumpAndSettle();
       await tester.openPage(firstPage);
 
+      await tester.expandOrCollapsePage(
+        pageName: firstPage,
+        layout: ViewLayoutPB.Document,
+      );
+
       /// check if there is a icon in document
       final iconWidget = find.byWidgetPredicate((w) {
         if (w is! RawEmojiIconWidget) return false;

diff --git a/frontend/appflowy_flutter/integration_test/desktop/settings/shortcuts_settings_test.dart b/frontend/appflowy_flutter/integration_test/desktop/settings/shortcuts_settings_test.dart
@@ -35,10 +35,12 @@ void main() {
       await tester.pumpAndSettle();
 
       await tester.hoverOnWidget(
-        find.descendant(
-          of: find.byType(ShortcutSettingTile),
-          matching: find.text(backspaceCmd),
-        ),
+        find
+            .descendant(
+              of: find.byType(ShortcutSettingTile),
+              matching: find.text(backspaceCmd),
+            )
+            .first,
         onHover: () async {
           await tester.tap(find.byFlowySvg(FlowySvgs.edit_s));
           await tester.pumpAndSettle();
@@ -85,7 +87,7 @@ void main() {
           as ShortcutSettingTile;
       expect(
         second.command.command,
-        '',
+        'backspace, shift+backspace',
       );
     });
   });

diff --git a/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_expand_test.dart b/frontend/appflowy_flutter/integration_test/desktop/sidebar/sidebar_expand_test.dart
@@ -1,8 +1,12 @@
 import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:appflowy/plugins/inline_actions/widgets/inline_actions_handler.dart';
 import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
 import 'package:appflowy/workspace/presentation/home/menu/sidebar/shared/sidebar_folder.dart';
 import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';
+import 'package:appflowy_backend/protobuf/flowy-folder/view.pbenum.dart';
+import 'package:appflowy_editor/appflowy_editor.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
@@ -44,5 +48,82 @@ void main() {
       );
       expect(isExpanded(type: FolderSpaceType.private), true);
     });
+
+    testWidgets('Expanding with subpage', (tester) async {
+      await tester.initializeAppFlowy();
+      await tester.tapAnonymousSignInButton();
+      const page1 = 'SubPageBloc', page2 = '$page1 2';
+      await tester.createNewPageWithNameUnderParent(name: page1);
+      await tester.createNewPageWithNameUnderParent(
+        name: page2,
+        parentName: page1,
+      );
+
+      await tester.expandOrCollapsePage(
+        pageName: gettingStarted,
+        layout: ViewLayoutPB.Document,
+      );
+
+      await tester.tapNewPageButton();
+
+      await tester.editor.tapLineOfEditorAt(0);
+      await tester.pumpAndSettle();
+      await tester.editor.showSlashMenu();
+      await tester.pumpAndSettle();
+
+      final slashMenu = find
+          .ancestor(
+            of: find.byType(SelectionMenuItemWidget),
+            matching: find.byWidgetPredicate(
+              (widget) => widget is Scrollable,
+            ),
+          )
+          .first;
+      final slashMenuItem = find.text(
+        LocaleKeys.document_slashMenu_name_linkedDoc.tr(),
+      );
+      await tester.scrollUntilVisible(
+        slashMenuItem,
+        100,
+        scrollable: slashMenu,
+        duration: const Duration(milliseconds: 250),
+      );
+
+      final menuItemFinder = find.byWidgetPredicate(
+        (w) =>
+            w is SelectionMenuItemWidget &&
+            w.item.name == LocaleKeys.document_slashMenu_name_linkedDoc.tr(),
+      );
+
+      final menuItem =
+          menuItemFinder.evaluate().first.widget as SelectionMenuItemWidget;
+
+      /// tapSlashMenuItemWithName is not working, so invoke this function directly
+      menuItem.item.handler(
+        menuItem.editorState,
+        menuItem.menuService,
+        menuItemFinder.evaluate().first,
+      );
+
+      await tester.pumpAndSettle();
+      final actionHandler = find.byType(InlineActionsHandler);
+      final subPage = find.descendant(
+        of: actionHandler,
+        matching: find.text(page2, findRichText: true),
+      );
+      await tester.tapButton(subPage);
+
+      final subpageBlock = find.descendant(
+        of: find.byType(AppFlowyEditor),
+        matching: find.text(page2, findRichText: true),
+      );
+
+      expect(find.text(page2, findRichText: true), findsOneWidget);
+      await tester.tapButton(subpageBlock);
+
+      /// one is in SectionFolder, another one is in CoverTitle
+      /// the last one is in FlowyNavigation
+      expect(find.text(page2, findRichText: true), findsNWidgets(3));
+    });
   });
 }
diff --git a/frontend/appflowy_flutter/integration_test/mobile/document/simple_table_test.dart b/frontend/appflowy_flutter/integration_test/mobile/document/simple_table_test.dart
@@ -494,5 +494,61 @@ void main() {
         expect(heading.level, equals(1));
       }
     });
+
+    testWidgets('''
+1. insert a simple table via + menu
+2. resize column
+''', (tester) async {
+      await tester.launchInAnonymousMode();
+      await tester.createNewDocumentOnMobile('simple table');
+
+      final editorState = tester.editor.getCurrentEditorState();
+      // focus on the editor
+      unawaited(
+        editorState.updateSelectionWithReason(
+          Selection.collapsed(Position(path: [0])),
+          reason: SelectionUpdateReason.uiEvent,
+        ),
+      );
+      await tester.pumpAndSettle();
+
+      final beforeWidth = editorState.getNodeAtPath([0, 0, 0])!.columnWidth;
+
+      // find the first cell
+      {
+        final resizeHandle = find.byType(SimpleTableColumnResizeHandle).first;
+        final offset = tester.getCenter(resizeHandle);
+        final gesture = await tester.startGesture(offset, pointer: 7);
+        await tester.pumpAndSettle();
+
+        await gesture.moveBy(const Offset(100, 0));
+        await tester.pumpAndSettle();
+
+        await gesture.up();
+        await tester.pumpAndSettle();
+      }
+
+      // check the table is updated
+      final afterWidth1 = editorState.getNodeAtPath([0, 0, 0])!.columnWidth;
+      expect(afterWidth1, greaterThan(beforeWidth));
+
+      // resize back to the original width
+      {
+        final resizeHandle = find.byType(SimpleTableColumnResizeHandle).first;
+        final offset = tester.getCenter(resizeHandle);
+        final gesture = await tester.startGesture(offset, pointer: 7);
+        await tester.pumpAndSettle();
+
+        await gesture.moveBy(const Offset(-100, 0));
+        await tester.pumpAndSettle();
+
+        await gesture.up();
+        await tester.pumpAndSettle();
+      }
+
+      // check the table is updated
+      final afterWidth2 = editorState.getNodeAtPath([0, 0, 0])!.columnWidth;
+      expect(afterWidth2, equals(beforeWidth));
+    });
   });
 }