fix: some UI issues were present in version 0.3.1. (AppFlowy-IO#3401)

LucasXu0 · Sep 14, 2023 · 26a2bff · 26a2bff
1 parent fe55452
commit 26a2bff
Show file tree

Hide file tree

Showing 21 changed files with 292 additions and 83 deletions.
diff --git a/frontend/appflowy_flutter/integration_test/sidebar/sidebar_test.dart b/frontend/appflowy_flutter/integration_test/sidebar/sidebar_test.dart
@@ -1,3 +1,4 @@
+import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/plugins/database_view/board/presentation/board_page.dart';
 import 'package:appflowy/plugins/database_view/calendar/presentation/calendar_page.dart';
 import 'package:appflowy/plugins/database_view/grid/presentation/grid_page.dart';
@@ -7,7 +8,7 @@ import 'package:appflowy/workspace/presentation/home/menu/view/view_item.dart';
 import 'package:appflowy/workspace/presentation/home/menu/view/view_more_action_button.dart';
 import 'package:appflowy_backend/protobuf/flowy-folder2/view.pb.dart';
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:flutter/material.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
@@ -22,14 +23,11 @@ void main() {
       await tester.tapGoButton();
 
       // create a new page
-      const name = 'Hello AppFlowy';
       await tester.tapNewPageButton();
-      await tester.enterText(find.byType(TextFormField), name);
-      await tester.tapOKButton();
 
       // expect to see a new document
       tester.expectToSeePageName(
-        name,
+        LocaleKeys.menuAppHeader_defaultNewPageName.tr(),
       );
       // and with one paragraph block
       expect(find.byType(TextBlockComponentWidget), findsOneWidget);

diff --git a/frontend/appflowy_flutter/integration_test/util/base.dart b/frontend/appflowy_flutter/integration_test/util/base.dart
@@ -1,16 +1,18 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:appflowy/startup/entry_point.dart';
 import 'package:appflowy/startup/startup.dart';
+import 'package:appflowy/user/presentation/presentation.dart';
 import 'package:appflowy/workspace/application/settings/prelude.dart';
 import 'package:flowy_infra/uuid.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
 
 class FlowyTestContext {
   FlowyTestContext({
@@ -39,8 +41,8 @@ extension AppFlowyTestBase on WidgetTester {
       IntegrationMode.integrationTest,
     );
 
-    await wait(3000);
-    await pumpAndSettle(const Duration(seconds: 2));
+    await waitUntilSignInPageShow();
+
     return FlowyTestContext(
       applicationDataDirectory: directory,
     );
@@ -78,6 +80,27 @@ extension AppFlowyTestBase on WidgetTester {
     return directory.path;
   }
 
+  Future<void> waitUntilSignInPageShow() async {
+    final finder = find.byType(GoButton);
+    await pumpUntilFound(finder);
+    expect(finder, findsOneWidget);
+  }
+
+  Future<void> pumpUntilFound(
+    Finder finder, {
+    Duration timeout = const Duration(seconds: 10),
+  }) async {
+    bool timerDone = false;
+    final timer = Timer(timeout, () => timerDone = true);
+    while (timerDone != true) {
+      await pump();
+      if (any(finder)) {
+        timerDone = true;
+      }
+    }
+    timer.cancel();
+  }
+
   Future<void> tapButton(
     Finder finder, {
     int? pointer,

diff --git a/frontend/appflowy_flutter/integration_test/util/common_operations.dart b/frontend/appflowy_flutter/integration_test/util/common_operations.dart
@@ -1,6 +1,9 @@
+import 'package:appflowy/core/config/kv.dart';
+import 'package:appflowy/core/config/kv_keys.dart';
 import 'package:appflowy/generated/flowy_svgs.g.dart';
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/plugins/document/presentation/share/share_button.dart';
+import 'package:appflowy/startup/startup.dart';
 import 'package:appflowy/user/presentation/screens/screens.dart';
 import 'package:appflowy/workspace/presentation/home/menu/sidebar/sidebar_new_page_button.dart';
 import 'package:appflowy/workspace/presentation/home/menu/view/draggable_view_item.dart';
@@ -279,7 +282,14 @@ extension CommonOperations on WidgetTester {
     // create a new page
     await tapAddViewButton(name: parentName ?? gettingStarted);
     await tapButtonWithName(layout.menuName);
-    await tapOKButton();
+    final settingsOrFailure = await getIt<KeyValueStorage>().getWithFormat(
+      KVKeys.showRenameDialogWhenCreatingNewFile,
+      (value) => bool.parse(value),
+    );
+    final showRenameDialog = settingsOrFailure.fold((l) => false, (r) => r);
+    if (showRenameDialog) {
+      await tapOKButton();
+    }
     await pumpAndSettle();
 
     // hover on it and change it's name

diff --git a/frontend/appflowy_flutter/lib/core/config/kv.dart b/frontend/appflowy_flutter/lib/core/config/kv.dart
@@ -7,6 +7,10 @@ import 'package:shared_preferences/shared_preferences.dart';
 abstract class KeyValueStorage {
   Future<void> set(String key, String value);
   Future<Either<FlowyError, String>> get(String key);
+  Future<Either<FlowyError, T>> getWithFormat<T>(
+    String key,
+    T Function(String value) formatter,
+  );
   Future<void> remove(String key);
   Future<void> clear();
 }
@@ -26,6 +30,18 @@ class DartKeyValue implements KeyValueStorage {
     return Left(FlowyError());
   }
 
+  @override
+  Future<Either<FlowyError, T>> getWithFormat<T>(
+    String key,
+    T Function(String value) formatter,
+  ) async {
+    final value = await get(key);
+    return value.fold(
+      (l) => left(l),
+      (r) => right(formatter(r)),
+    );
+  }
+
   @override
   Future<void> remove(String key) async {
     await _initSharedPreferencesIfNeeded();
@@ -71,6 +87,18 @@ class RustKeyValue implements KeyValueStorage {
     return response.swap().map((r) => r.value);
   }
 
+  @override
+  Future<Either<FlowyError, T>> getWithFormat<T>(
+    String key,
+    T Function(String value) formatter,
+  ) async {
+    final value = await get(key);
+    return value.fold(
+      (l) => left(l),
+      (r) => right(formatter(r)),
+    );
+  }
+
   @override
   Future<void> remove(String key) async {
     await ConfigEventRemoveKeyValue(

diff --git a/frontend/appflowy_flutter/lib/core/config/kv_keys.dart b/frontend/appflowy_flutter/lib/core/config/kv_keys.dart
@@ -43,4 +43,10 @@ class KVKeys {
   /// The value is a json string with the following format:
   ///  {'SidebarFolderCategoryType.value': true}
   static const String expandedFolders = 'expandedFolders';
+
+  /// The key for saving if showing the rename dialog when creating a new file
+  ///
+  /// The value is a boolean string.
+  static const String showRenameDialogWhenCreatingNewFile =
+      'showRenameDialogWhenCreatingNewFile';
 }
diff --git a/frontend/appflowy_flutter/lib/plugins/document/application/editor_transaction_adapter.dart b/frontend/appflowy_flutter/lib/plugins/document/application/editor_transaction_adapter.dart
@@ -34,11 +34,13 @@ class TransactionAdapter {
   final DocumentService documentService;
   final String documentId;
 
-  final bool _enableDebug = false;
+  final bool _enableDebug = true;
 
   Future<void> apply(Transaction transaction, EditorState editorState) async {
     final stopwatch = Stopwatch()..start();
-    Log.debug('transaction => ${transaction.toJson()}');
+    if (_enableDebug) {
+      Log.debug('transaction => ${transaction.toJson()}');
+    }
     final actions = transaction.operations
         .map((op) => op.toBlockAction(editorState, documentId))
         .whereNotNull()
@@ -58,14 +60,18 @@ class TransactionAdapter {
           textId: payload.textId,
           delta: payload.delta,
         );
-        Log.debug('create external text: ${payload.delta}');
+        if (_enableDebug) {
+          Log.debug('create external text: ${payload.delta}');
+        }
       } else if (type == TextDeltaType.update) {
         await documentService.updateExternalText(
           documentId: payload.documentId,
           textId: payload.textId,
           delta: payload.delta,
         );
-        Log.debug('update external text: ${payload.delta}');
+        if (_enableDebug) {
+          Log.debug('update external text: ${payload.delta}');
+        }
       }
     }
     final blockActions =

diff --git a/.../lib/plugins/document/presentation/editor_plugins/actions/block_action_option_button.dart b/.../lib/plugins/document/presentation/editor_plugins/actions/block_action_option_button.dart
@@ -40,12 +40,16 @@ class BlockOptionButton extends StatelessWidget {
     return PopoverActionList<PopoverAction>(
       direction: PopoverDirection.leftWithCenterAligned,
       actions: popoverActions,
-      onPopupBuilder: () => blockComponentState.alwaysShowActions = true,
+      onPopupBuilder: () {
+        keepEditorFocusNotifier.value += 1;
+        blockComponentState.alwaysShowActions = true;
+      },
       onClosed: () {
         WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
           editorState.selectionType = null;
           editorState.selection = null;
           blockComponentState.alwaysShowActions = false;
+          keepEditorFocusNotifier.value -= 1;
         });
       },
       onSelected: (action, controller) {

diff --git a/...b/plugins/document/presentation/editor_plugins/align_toolbar_item/align_toolbar_item.dart b/...b/plugins/document/presentation/editor_plugins/align_toolbar_item/align_toolbar_item.dart
@@ -1,6 +1,8 @@
 import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy_editor/appflowy_editor.dart';
 import 'package:appflowy_popover/appflowy_popover.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flutter/material.dart';
 
@@ -31,24 +33,31 @@ final alignToolbarItem = ToolbarItem(
       data = FlowySvgs.toolbar_align_right_s;
     }
 
-    final child = FlowySvg(
-      data,
-      size: const Size.square(16),
-      color: isHighlight ? highlightColor : Colors.white,
+    final child = MouseRegion(
+      cursor: SystemMouseCursors.click,
+      child: FlowySvg(
+        data,
+        size: const Size.square(20),
+        color: isHighlight ? highlightColor : Colors.white,
+      ),
     );
-    return _AlignmentButtons(
-      child: child,
-      onAlignChanged: (align) async {
-        await editorState.updateNode(
-          selection,
-          (node) => node.copyWith(
-            attributes: {
-              ...node.attributes,
-              blockComponentAlign: align,
-            },
-          ),
-        );
-      },
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 4.0),
+      child: _AlignmentButtons(
+        child: child,
+        onAlignChanged: (align) async {
+          await editorState.updateNode(
+            selection,
+            (node) => node.copyWith(
+              attributes: {
+                ...node.attributes,
+                blockComponentAlign: align,
+              },
+            ),
+          );
+        },
+      ),
     );
   },
 );
@@ -71,11 +80,15 @@ class _AlignmentButtonsState extends State<_AlignmentButtons> {
   Widget build(BuildContext context) {
     return AppFlowyPopover(
       windowPadding: const EdgeInsets.all(0),
-      margin: const EdgeInsets.all(0),
+      margin: const EdgeInsets.all(4),
       direction: PopoverDirection.bottomWithCenterAligned,
       offset: const Offset(0, 10),
-      child: widget.child,
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.onTertiary,
+        borderRadius: const BorderRadius.all(Radius.circular(4)),
+      ),
       popupBuilder: (_) => _AlignButtons(onAlignChanged: widget.onAlignChanged),
+      child: widget.child,
     );
   }
 }
@@ -97,16 +110,19 @@ class _AlignButtons extends StatelessWidget {
           const HSpace(4),
           _AlignButton(
             icon: FlowySvgs.toolbar_align_left_s,
+            tooltips: LocaleKeys.document_plugins_optionAction_left.tr(),
             onTap: () => onAlignChanged('left'),
           ),
           const _Divider(),
           _AlignButton(
             icon: FlowySvgs.toolbar_align_center_s,
+            tooltips: LocaleKeys.document_plugins_optionAction_center.tr(),
             onTap: () => onAlignChanged('center'),
           ),
           const _Divider(),
           _AlignButton(
             icon: FlowySvgs.toolbar_align_right_s,
+            tooltips: LocaleKeys.document_plugins_optionAction_right.tr(),
             onTap: () => onAlignChanged('right'),
           ),
           const HSpace(4),
@@ -119,19 +135,25 @@ class _AlignButtons extends StatelessWidget {
 class _AlignButton extends StatelessWidget {
   const _AlignButton({
     required this.icon,
+    required this.tooltips,
     required this.onTap,
   });
 
   final FlowySvgData icon;
+  final String tooltips;
   final VoidCallback onTap;
 
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: onTap,
-      child: FlowySvg(
-        icon,
-        size: const Size.square(16),
+      child: Tooltip(
+        message: tooltips,
+        child: FlowySvg(
+          icon,
+          size: const Size.square(16),
+          color: Colors.white,
+        ),
       ),
     );
   }

diff --git a/...ter/lib/plugins/document/presentation/editor_plugins/outline/outline_block_component.dart b/...ter/lib/plugins/document/presentation/editor_plugins/outline/outline_block_component.dart
@@ -168,7 +168,7 @@ class OutlineItemWidget extends StatelessWidget {
         hoverColor: Theme.of(context).hoverColor,
       ),
       child: GestureDetector(
-        onTap: () => updateBlockSelection(context),
+        onTap: () => scrollToBlock(context),
         child: Container(
           padding: EdgeInsets.only(left: node.leftIndent),
           child: Text(
@@ -180,14 +180,14 @@ class OutlineItemWidget extends StatelessWidget {
     );
   }
 
-  void updateBlockSelection(BuildContext context) async {
+  void scrollToBlock(BuildContext context) {
     final editorState = context.read<EditorState>();
-    editorState.selectionType = SelectionType.block;
-    editorState.selection = Selection.collapsed(
-      Position(path: node.path, offset: node.delta?.length ?? 0),
-    );
+    final editorScrollController = context.read<EditorScrollController>();
+    editorScrollController.itemScrollController.jumpTo(index: node.path.first);
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      editorState.selectionType = null;
+      editorState.selection = Selection.collapsed(
+        Position(path: node.path, offset: node.delta?.length ?? 0),
+      );
     });
   }
 }

diff --git a/...utter/lib/plugins/document/presentation/editor_plugins/toggle/toggle_block_component.dart b/...utter/lib/plugins/document/presentation/editor_plugins/toggle/toggle_block_component.dart
@@ -146,7 +146,10 @@ class _ToggleListBlockComponentWidgetState
   }
 
   @override
-  Widget buildComponent(BuildContext context) {
+  Widget buildComponent(
+    BuildContext context, {
+    bool withBackgroundColor = false,
+  }) {
     final textDirection = calculateTextDirection(
       layoutDirection: Directionality.maybeOf(context),
     );