fix: v0.6.2 issues (AppFlowy-IO#5654)

* fix: remove create button in move to menu * fix: add loading indicator when duplicating space * fix: sidebar header expand icon status * fix: text within select tag overflow * fix: callout block icon align issue * feat: sync the space icon when creating a space * fix: duplicated hover views * fix: cover image doesn't update
tantanorange · Jul 1, 2024 · c78f23e · c78f23e
1 parent 50f5be3
commit c78f23e
Show file tree

Hide file tree

Showing 25 changed files with 142 additions and 98 deletions.
diff --git a/...utter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart b/...utter/lib/plugins/database/widgets/cell/desktop_grid/desktop_grid_select_option_cell.dart
@@ -1,8 +1,8 @@
+import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';
 import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
 import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';
-import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';
 import 'package:appflowy/plugins/database/widgets/cell_editor/select_option_cell_editor.dart';
+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
 import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
 import 'package:appflowy_popover/appflowy_popover.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
@@ -56,7 +56,7 @@ class DesktopGridSelectOptionCellSkin extends IEditableSelectOptionCellSkin {
               child: SelectOptionTag(
                 option: option,
                 padding: const EdgeInsets.symmetric(
-                  vertical: 1,
+                  vertical: 4,
                   horizontal: 8,
                 ),
               ),

diff --git a/...ugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart b/...ugins/database/widgets/cell/desktop_row_detail/desktop_row_detail_select_option_cell.dart
@@ -1,8 +1,8 @@
 import 'package:appflowy/generated/locale_keys.g.dart';
-import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
-import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';
 import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_bloc.dart';
+import 'package:appflowy/plugins/database/widgets/cell_editor/extension.dart';
 import 'package:appflowy/plugins/database/widgets/cell_editor/select_option_cell_editor.dart';
+import 'package:appflowy/plugins/database/widgets/row/cells/cell_container.dart';
 import 'package:appflowy_backend/protobuf/flowy-database2/protobuf.dart';
 import 'package:appflowy_popover/appflowy_popover.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -67,7 +67,7 @@ class DesktopRowDetailSelectOptionCellSkin
           return SelectOptionTag(
             option: option,
             padding: const EdgeInsets.symmetric(
-              vertical: 1,
+              vertical: 4,
               horizontal: 8,
             ),
           );

diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/extension.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/extension.dart
@@ -96,7 +96,6 @@ class SelectOptionTag extends StatelessWidget {
     );
 
     return Container(
-      height: 20,
       padding: onRemove == null ? padding : padding.copyWith(right: 2.0),
       decoration: BoxDecoration(
         color: optionColor,

diff --git a/.../appflowy_flutter/lib/plugins/database/widgets/cell_editor/select_option_cell_editor.dart b/.../appflowy_flutter/lib/plugins/database/widgets/cell_editor/select_option_cell_editor.dart
@@ -1,10 +1,6 @@
 import 'dart:collection';
 import 'dart:io';
 
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
 import 'package:appflowy/generated/flowy_svgs.g.dart';
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/plugins/database/application/cell/bloc/select_option_cell_editor_bloc.dart';
@@ -14,12 +10,14 @@ import 'package:appflowy_popover/appflowy_popover.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/theme_extension.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../grid/presentation/layout/sizes.dart';
 import '../../grid/presentation/widgets/common/type_option_separator.dart';
 import '../field/type_option_editor/select/select_option_editor.dart';
-
 import 'extension.dart';
 import 'select_option_text_field.dart';
 
@@ -476,11 +474,11 @@ class SelectOptionTagCell extends StatelessWidget {
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
                     horizontal: 6.0,
-                    vertical: 4.0,
                   ),
                   child: SelectOptionTag(
                     option: option,
-                    padding: const EdgeInsets.symmetric(horizontal: 8),
+                    padding:
+                        const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
                   ),
                 ),
               ),

diff --git a/...d/appflowy_flutter/lib/plugins/database/widgets/cell_editor/select_option_text_field.dart b/...d/appflowy_flutter/lib/plugins/database/widgets/cell_editor/select_option_text_field.dart
@@ -132,7 +132,10 @@ class _SelectOptionTextFieldState extends State<SelectOptionTextField> {
           (option) => SelectOptionTag(
             option: option,
             onRemove: (option) => widget.onRemove(option),
-            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 1),
+            padding: const EdgeInsets.symmetric(
+              horizontal: 8,
+              vertical: 4,
+            ),
           ),
         )
         .toList();

diff --git a/frontend/appflowy_flutter/lib/plugins/document/application/document_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/application/document_bloc.dart
@@ -8,7 +8,6 @@ import 'package:appflowy/plugins/document/application/document_data_pb_extension
 import 'package:appflowy/plugins/document/application/document_listener.dart';
 import 'package:appflowy/plugins/document/application/document_service.dart';
 import 'package:appflowy/plugins/document/application/editor_transaction_adapter.dart';
-import 'package:appflowy/plugins/document/presentation/editor_plugins/migration/editor_migration.dart';
 import 'package:appflowy/plugins/trash/application/trash_service.dart';
 import 'package:appflowy/shared/feature_flags.dart';
 import 'package:appflowy/startup/startup.dart';
@@ -19,7 +18,6 @@ import 'package:appflowy/util/color_to_hex_string.dart';
 import 'package:appflowy/util/debounce.dart';
 import 'package:appflowy/util/throttle.dart';
 import 'package:appflowy/workspace/application/view/view_listener.dart';
-import 'package:appflowy/workspace/application/view/view_service.dart';
 import 'package:appflowy_backend/protobuf/flowy-document/entities.pb.dart';
 import 'package:appflowy_backend/protobuf/flowy-document/protobuf.dart';
 import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
@@ -118,11 +116,6 @@ class DocumentBloc extends Bloc<DocumentEvent, DocumentState> {
         final result = await _fetchDocumentState();
         _onViewChanged();
         _onDocumentChanged();
-        result.onSuccess((s) {
-          if (s != null) {
-            _migrateCover(s);
-          }
-        });
         final newState = await result.fold(
           (s) async {
             final userProfilePB =
@@ -390,14 +383,6 @@ class DocumentBloc extends Bloc<DocumentEvent, DocumentState> {
       metadata: jsonEncode(metadata.toJson()),
     );
   }
-
-  // from version 0.5.5, the cover is stored in the view.ext
-  Future<void> _migrateCover(EditorState editorState) async {
-    final view = await ViewBackendService.getView(documentId);
-    view.onSuccess((s) {
-      return EditorMigration.migrateCoverIfNeeded(s, editorState);
-    });
-  }
 }
 
 @freezed

diff --git a/...ter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart b/...ter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart
@@ -196,6 +196,7 @@ class _CalloutBlockComponentWidgetState
               ), // force to refresh the popover state
               title: '',
               emoji: emoji,
+              emojiSize: 16.0,
               onSubmitted: (emoji, controller) {
                 setEmoji(emoji);
                 controller?.close();
@@ -204,7 +205,7 @@ class _CalloutBlockComponentWidgetState
           ),
           Flexible(
             child: Padding(
-              padding: const EdgeInsets.symmetric(vertical: 8.0),
+              padding: const EdgeInsets.symmetric(vertical: 6.0),
               child: buildCalloutBlockComponent(context, textDirection),
             ),
           ),

diff --git a/.../lib/plugins/document/presentation/editor_plugins/header/document_header_node_widget.dart b/.../lib/plugins/document/presentation/editor_plugins/header/document_header_node_widget.dart
@@ -91,6 +91,7 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
 
   String viewIcon = '';
   PageStyleCover? cover;
+  late ViewPB view;
   late final ViewListener viewListener;
 
   @override
@@ -99,6 +100,7 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
     final value = widget.view.icon.value;
     viewIcon = value.isNotEmpty ? value : icon ?? '';
     cover = widget.view.cover;
+    view = widget.view;
     widget.node.addListener(_reload);
     viewListener = ViewListener(
       viewId: widget.view.id,
@@ -107,6 +109,7 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
           setState(() {
             viewIcon = p0.icon.value;
             cover = p0.cover;
+            view = p0;
           });
         },
       );
@@ -137,7 +140,7 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
         ),
         if (hasCover)
           DocumentCover(
-            view: widget.view,
+            view: view,
             editorState: widget.editorState,
             node: widget.node,
             coverType: coverType,
@@ -204,7 +207,7 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
     // compatible with version > 0.5.5.
     EditorMigration.migrateCoverIfNeeded(
       widget.view,
-      widget.editorState,
+      attributes,
       overwrite: true,
     );
   }

diff --git a/..._flutter/lib/plugins/document/presentation/editor_plugins/migration/editor_migration.dart b/..._flutter/lib/plugins/document/presentation/editor_plugins/migration/editor_migration.dart
@@ -164,18 +164,17 @@ class EditorMigration {
   // Now, the cover is stored in the view.ext.
   static void migrateCoverIfNeeded(
     ViewPB view,
-    EditorState editorState, {
+    Attributes attributes, {
     bool overwrite = false,
   }) async {
     if (view.extra.isNotEmpty && !overwrite) {
       return;
     }
 
-    final root = editorState.document.root;
     final coverType = CoverType.fromString(
-      root.attributes[DocumentHeaderBlockKeys.coverType],
+      attributes[DocumentHeaderBlockKeys.coverType],
     );
-    final coverDetails = root.attributes[DocumentHeaderBlockKeys.coverDetails];
+    final coverDetails = attributes[DocumentHeaderBlockKeys.coverDetails];
 
     Map extra = {};
 

diff --git a/frontend/appflowy_flutter/lib/workspace/application/sidebar/space/space_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/sidebar/space/space_bloc.dart
@@ -297,11 +297,16 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {
             if (currentSpace == null) {
               return;
             }
+            emit(state.copyWith(isDuplicatingSpace: true));
+
             final newSpace = await _duplicateSpace(currentSpace);
             // open the duplicated space
             if (newSpace != null) {
+              add(const SpaceEvent.didReceiveSpaceUpdate());
               add(SpaceEvent.open(newSpace));
             }
+
+            emit(state.copyWith(isDuplicatingSpace: false));
           },
         );
       },
@@ -346,25 +351,22 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {
       SpacePermission.private => ViewSectionPB.Private,
     };
 
+    final extra = {
+      ViewExtKeys.isSpaceKey: true,
+      ViewExtKeys.spaceIconKey: icon,
+      ViewExtKeys.spaceIconColorKey: iconColor,
+      ViewExtKeys.spacePermissionKey: permission.index,
+      ViewExtKeys.spaceCreatedAtKey: DateTime.now().millisecondsSinceEpoch,
+    };
     final result = await _workspaceService.createView(
       name: name,
       viewSection: section,
-      setAsCurrent: false,
+      setAsCurrent: true,
       viewId: viewId,
+      extra: jsonEncode(extra),
     );
     return await result.fold((space) async {
       Log.info('Space created: $space');
-      final extra = {
-        ViewExtKeys.isSpaceKey: true,
-        ViewExtKeys.spaceIconKey: icon,
-        ViewExtKeys.spaceIconColorKey: iconColor,
-        ViewExtKeys.spacePermissionKey: permission.index,
-        ViewExtKeys.spaceCreatedAtKey: DateTime.now().millisecondsSinceEpoch,
-      };
-      await ViewBackendService.updateView(
-        viewId: space.id,
-        extra: jsonEncode(extra),
-      );
       return space;
     }, (error) {
       Log.error('Failed to create space: $error');
@@ -620,19 +622,17 @@ class SpaceBloc extends Bloc<SpaceEvent, SpaceState> {
     }
 
     for (final view in space.childViews) {
-      unawaited(
-        ViewBackendService.duplicate(
-          view: view,
-          openAfterDuplicate: true,
-          includeChildren: true,
-          parentViewId: newSpace.id,
-          suffix: '',
-        ),
+      await ViewBackendService.duplicate(
+        view: view,
+        openAfterDuplicate: true,
+        includeChildren: true,
+        parentViewId: newSpace.id,
+        suffix: '',
       );
     }
 
     Log.info('Space duplicated: $newSpace');
-    add(const SpaceEvent.didReceiveSpaceUpdate());
+
     return newSpace;
   }
 }
@@ -688,6 +688,7 @@ class SpaceState with _$SpaceState {
     @Default(null) ViewPB? lastCreatedPage,
     FlowyResult<void, FlowyError>? createPageResult,
     @Default(false) bool shouldShowUpgradeDialog,
+    @Default(false) bool isDuplicatingSpace,
   }) = _SpaceState;
 
   factory SpaceState.initial() => const SpaceState();

diff --git a/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart b/frontend/appflowy_flutter/lib/workspace/application/view/view_ext.dart
@@ -133,21 +133,21 @@ extension ViewExtension on ViewPB {
     }
   }
 
-  FlowySvg get spaceIconSvg {
+  FlowySvg? get spaceIconSvg {
     try {
       final ext = jsonDecode(extra);
       final icon = ext[ViewExtKeys.spaceIconKey];
       final color = ext[ViewExtKeys.spaceIconColorKey];
       if (icon == null || color == null) {
-        return const FlowySvg(FlowySvgs.space_icon_s, blendMode: null);
+        return null;
       }
       return FlowySvg(
         FlowySvgData('assets/flowy_icons/16x/$icon.svg'),
         color: Color(int.parse(color)),
         blendMode: BlendMode.srcOut,
       );
     } catch (e) {
-      return const FlowySvg(FlowySvgs.space_icon_s, blendMode: null);
+      return null;
     }
   }
 

diff --git a/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart b/frontend/appflowy_flutter/lib/workspace/application/workspace/workspace_service.dart
@@ -19,6 +19,7 @@ class WorkspaceService {
     ViewLayoutPB? layout,
     bool? setAsCurrent,
     String? viewId,
+    String? extra,
   }) {
     final payload = CreateViewPayloadPB.create()
       ..parentViewId = workspaceId
@@ -42,6 +43,10 @@ class WorkspaceService {
       payload.viewId = viewId;
     }
 
+    if (extra != null) {
+      payload.extra = extra;
+    }
+
     return FolderEventCreateView(payload).send();
   }
 

diff --git a/...appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/move_to/move_page_menu.dart b/...appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/move_to/move_page_menu.dart
@@ -117,6 +117,7 @@ class _MovePageMenuState extends State<MovePageMenu> {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         SpacePopup(
+          showCreateButton: false,
           child: CurrentSpace(
             space: space,
           ),