fix: paste issue with the nested image (#7857)

LucasXu0 · web-flow · commit 63244e0b3cb3 · 2025-04-30T11:45:48.000+08:00
* chore: replace delete button style

* chore: replace textfield in settings page

* fix: icon text align issue in database

* fix: member count is 0

* fix: invite member issue on mobile

* fix: checklist item align issue on Windows

* fix: integration test

* fix: support converting paragraph to markdown

* chore: update editor version

* fix: delete command in simple table cell

* feat: use new password error code
diff --git a/frontend/appflowy_flutter/integration_test/shared/settings.dart b/frontend/appflowy_flutter/integration_test/shared/settings.dart
@@ -9,7 +9,6 @@ import 'package:appflowy/workspace/presentation/settings/settings_dialog.dart';
 import 'package:appflowy/workspace/presentation/settings/widgets/settings_menu_element.dart';
 import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flowy_infra_ui/style_widget/text_field.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
@@ -86,7 +85,7 @@ extension AppFlowySettings on WidgetTester {
 
     final userNameFinder = find.descendant(
       of: find.byType(AccountUserProfile),
-      matching: find.byType(FlowyTextField),
+      matching: find.byType(TextField),
     );
     await enterText(userNameFinder, name);
     await pumpAndSettle();
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/shared/mobile_page_card.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/shared/mobile_page_card.dart
@@ -200,7 +200,9 @@ class MobileViewPage extends StatelessWidget {
             const WidgetSpan(child: HSpace(8.0)),
           ],
           TextSpan(
-            text: name,
+            text: name.orDefault(
+              LocaleKeys.menuAppHeader_defaultNewPageName.tr(),
+            ),
             style: Theme.of(context).textTheme.bodyMedium!.copyWith(
                   fontSize: 16.0,
                   fontWeight: FontWeight.w600,
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/setting/workspace/invite_members_screen.dart b/frontend/appflowy_flutter/lib/mobile/presentation/setting/workspace/invite_members_screen.dart
@@ -108,31 +108,33 @@ class _InviteMemberPageState extends State<_InviteMemberPage> {
           child: BlocConsumer<WorkspaceMemberBloc, WorkspaceMemberState>(
             listener: _onListener,
             builder: (context, state) {
-              return Column(
-                children: [
-                  if (state.myRole.isOwner) ...[
-                    Container(
-                      width: double.infinity,
-                      padding: EdgeInsets.all(theme.spacing.xl),
-                      child: const MInviteMemberByLink(),
-                    ),
-                    VSpace(theme.spacing.m),
+              return SingleChildScrollView(
+                child: Column(
+                  children: [
+                    if (state.myRole.isOwner) ...[
+                      Container(
+                        width: double.infinity,
+                        padding: EdgeInsets.all(theme.spacing.xl),
+                        child: const MInviteMemberByLink(),
+                      ),
+                      VSpace(theme.spacing.m),
+                    ],
+                    if (state.members.isNotEmpty) ...[
+                      const AFDivider(),
+                      VSpace(theme.spacing.xl),
+                      MobileMemberList(
+                        members: state.members,
+                        userProfile: userProfile,
+                        myRole: state.myRole,
+                      ),
+                    ],
+                    if (state.myRole.isMember) ...[
+                      Spacer(),
+                      const _LeaveWorkspaceButton(),
+                    ],
+                    const VSpace(48),
                   ],
-                  if (state.members.isNotEmpty) ...[
-                    const AFDivider(),
-                    VSpace(theme.spacing.xl),
-                    MobileMemberList(
-                      members: state.members,
-                      userProfile: userProfile,
-                      myRole: state.myRole,
-                    ),
-                  ],
-                  if (state.myRole.isMember) ...[
-                    Spacer(),
-                    const _LeaveWorkspaceButton(),
-                  ],
-                  const VSpace(48),
-                ],
+                ),
               );
             },
           ),
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/setting/workspace/workspace_setting_group.dart b/frontend/appflowy_flutter/lib/mobile/presentation/setting/workspace/workspace_setting_group.dart
@@ -1,6 +1,7 @@
 import 'package:appflowy/generated/locale_keys.g.dart';
 import 'package:appflowy/mobile/presentation/setting/widgets/mobile_setting_trailing.dart';
 import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
+import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -18,14 +19,22 @@ class WorkspaceSettingGroup extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocBuilder<UserWorkspaceBloc, UserWorkspaceState>(
       builder: (context, state) {
-        final currentWorkspace = state.currentWorkspace;
+        final currentWorkspace = state.workspaces.firstWhereOrNull(
+          (e) => e.workspaceId == state.currentWorkspace?.workspaceId,
+        );
+        final memberCount = currentWorkspace?.memberCount;
+        String memberCountText = '';
+        // if the member count is greater than 0, show the member count
+        if (memberCount != null && memberCount > 0) {
+          memberCountText = memberCount.toString();
+        }
         return MobileSettingGroup(
           groupTitle: LocaleKeys.settings_appearance_members_label.tr(),
           settingItemList: [
             MobileSettingItem(
               name: LocaleKeys.settings_appearance_members_label.tr(),
               trailing: MobileSettingTrailing(
-                text: currentWorkspace?.memberCount.toString() ?? '',
+                text: memberCountText,
               ),
               onTap: () {
                 context.push(InviteMembersScreen.routeName);
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/checklist_cell_editor.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/checklist_cell_editor.dart
@@ -280,6 +280,7 @@ class _ChecklistItemState extends State<ChecklistItem> {
           child: ChecklistCellTextfield(
             textController: textController,
             focusNode: textFieldFocusNode,
+            lineHeight: Platform.isWindows ? 1.2 : 1.1,
             onChanged: () {
               _debounceOnChanged.call(() {
                 if (!isComposing) {
diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/checklist_cell_textfield.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/cell_editor/checklist_cell_textfield.dart
@@ -46,20 +46,25 @@ class ChecklistCellTextfield extends StatelessWidget {
       horizontal: 2,
     ),
     this.onSubmitted,
+    this.lineHeight,
   });
 
   final TextEditingController textController;
   final FocusNode focusNode;
   final EdgeInsetsGeometry contentPadding;
   final VoidCallback? onSubmitted;
   final VoidCallback? onChanged;
+  final double? lineHeight;
 
   @override
   Widget build(BuildContext context) {
+    final textStyle = Theme.of(context).textTheme.bodyMedium;
     return TextField(
       controller: textController,
       focusNode: focusNode,
-      style: Theme.of(context).textTheme.bodyMedium,
+      style: textStyle?.copyWith(
+        height: lineHeight,
+      ),
       maxLines: null,
       decoration: InputDecoration(
         border: InputBorder.none,
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/backtick_character_command.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/base/backtick_character_command.dart
@@ -31,15 +31,22 @@ Future<bool> _convertBacktickToCodeBlock({
   }
 
   // only active when the backtick is at the beginning of the line
+  final keyword = '``';
   final plainText = delta.toPlainText();
-  if (plainText != '``') {
+  if (!plainText.startsWith(keyword)) {
     return false;
   }
 
   final transaction = editorState.transaction;
-  transaction.insertNode(
+  final deltaWithoutKeyword = delta.compose(Delta()..delete(keyword.length));
+  transaction.insertNodes(
     selection.end.path,
-    codeBlockNode(),
+    [
+      codeBlockNode(
+        delta: deltaWithoutKeyword,
+      ),
+      if (node.children.isNotEmpty) ...node.children.map((e) => e.copyWith()),
+    ],
   );
   transaction.deleteNode(node);
   transaction.afterSelection = Selection.collapsed(
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/shortcuts/custom_delete_command.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/shortcuts/custom_delete_command.dart
@@ -1,4 +1,5 @@
 import 'package:appflowy/plugins/document/presentation/editor_plugins/simple_table/simple_table_block_component.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/simple_table/simple_table_cell_block_component.dart';
 import 'package:appflowy_editor/appflowy_editor.dart';
 import 'package:flutter/material.dart';
 
@@ -96,7 +97,13 @@ CommandShortcutEventHandler _deleteInNotCollapsedSelection = (editorState) {
   if (selection == null || selection.isCollapsed) {
     return KeyEventResult.ignored;
   }
-  editorState.deleteSelection(selection);
+  editorState.deleteSelection(
+    selection,
+    ignoreNodeTypes: [
+      SimpleTableCellBlockKeys.type,
+      TableCellBlockKeys.type,
+    ],
+  );
   return KeyEventResult.handled;
 };
 
diff --git a/frontend/appflowy_flutter/lib/user/application/password/password_http_service.dart b/frontend/appflowy_flutter/lib/user/application/password/password_http_service.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:appflowy_backend/log.dart';
+import 'package:appflowy_backend/protobuf/flowy-error/code.pbenum.dart';
 import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';
 import 'package:appflowy_result/appflowy_result.dart';
 import 'package:http/http.dart' as http;
@@ -207,8 +208,15 @@ class PasswordHttpService {
           '${endpoint.name} request failed: ${response.statusCode}, $errorBody ',
         );
 
+        ErrorCode errorCode = ErrorCode.Internal;
+
+        if (response.statusCode == 422) {
+          errorCode = ErrorCode.NewPasswordTooWeak;
+        }
+
         return FlowyResult.failure(
           FlowyError(
+            code: errorCode,
             msg: errorBody['msg'] ?? errorMessage,
           ),
         );
diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/continue_with/set_new_password.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/widgets/continue_with/set_new_password.dart
@@ -5,6 +5,7 @@ import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/contin
 import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/continue_with/title_logo.dart';
 import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/continue_with/verifying_button.dart';
 import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/protobuf/flowy-error/code.pbenum.dart';
 import 'package:appflowy_ui/appflowy_ui.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
@@ -60,9 +61,15 @@ class _SetNewPasswordWidgetState extends State<SetNewPasswordWidget> {
               });
             },
             (error) {
-              newPasswordKey.currentState?.syncError(
-                errorText: error.msg,
-              );
+              if (error.code == ErrorCode.NewPasswordTooWeak) {
+                newPasswordKey.currentState?.syncError(
+                  errorText: LocaleKeys.signIn_passwordMustContain.tr(),
+                );
+              } else {
+                newPasswordKey.currentState?.syncError(
+                  errorText: error.msg,
+                );
+              }
             },
           );
         }
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/space/shared_widget.dart
@@ -208,16 +208,8 @@ class SpaceCancelOrConfirmButton extends StatelessWidget {
                 borderRadius: BorderRadius.circular(8),
               ),
             ),
-            child: FlowyButton(
-              useIntrinsicWidth: true,
-              margin:
-                  const EdgeInsets.symmetric(horizontal: 16.0, vertical: 9.0),
-              radius: BorderRadius.circular(8),
-              text: FlowyText.regular(
-                confirmButtonName,
-                lineHeight: 1.0,
-                color: Theme.of(context).colorScheme.onPrimary,
-              ),
+            child: AFFilledTextButton.destructive(
+              text: confirmButtonName,
               onTap: onConfirm,
             ),
           ),
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/password/change_password.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/password/change_password.dart
@@ -4,6 +4,7 @@ import 'package:appflowy/user/application/password/password_bloc.dart';
 import 'package:appflowy/workspace/presentation/settings/pages/account/password/error_extensions.dart';
 import 'package:appflowy/workspace/presentation/settings/pages/account/password/password_suffix_icon.dart';
 import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/protobuf/flowy-error/code.pbenum.dart';
 import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';
 import 'package:appflowy_ui/appflowy_ui.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -359,6 +360,10 @@ class _ChangePasswordDialogContentState
             newPasswordTextFieldKey.currentState?.syncError(
               errorText: AFPasswordErrorExtension.getErrorMessage(error),
             );
+          } else if (error.code == ErrorCode.NewPasswordTooWeak) {
+            newPasswordTextFieldKey.currentState?.syncError(
+              errorText: LocaleKeys.signIn_passwordMustContain.tr(),
+            );
           } else {
             newPasswordTextFieldKey.currentState?.syncError(
               errorText: error.msg,
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/password/setup_password.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/password/setup_password.dart
@@ -4,6 +4,7 @@ import 'package:appflowy/user/application/password/password_bloc.dart';
 import 'package:appflowy/workspace/presentation/settings/pages/account/password/error_extensions.dart';
 import 'package:appflowy/workspace/presentation/settings/pages/account/password/password_suffix_icon.dart';
 import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
+import 'package:appflowy_backend/protobuf/flowy-error/code.pbenum.dart';
 import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';
 import 'package:appflowy_ui/appflowy_ui.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -291,6 +292,10 @@ class _SetupPasswordDialogContentState
             passwordTextFieldKey.currentState?.syncError(
               errorText: AFPasswordErrorExtension.getErrorMessage(error),
             );
+          } else if (error.code == ErrorCode.NewPasswordTooWeak) {
+            passwordTextFieldKey.currentState?.syncError(
+              errorText: LocaleKeys.signIn_passwordMustContain.tr(),
+            );
           } else {
             passwordTextFieldKey.currentState?.syncError(
               errorText: error.msg,
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_shortcuts_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_shortcuts_view.dart
@@ -17,6 +17,7 @@ import 'package:appflowy/workspace/presentation/settings/widgets/emoji_picker/em
 import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
 import 'package:appflowy_editor/appflowy_editor.dart';
 import 'package:appflowy_editor_plugins/appflowy_editor_plugins.dart';
+import 'package:appflowy_ui/appflowy_ui.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flowy_infra/size.dart';
 import 'package:flowy_infra/theme_extension.dart';
@@ -134,47 +135,9 @@ class _SearchBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return SizedBox(
-      height: 36,
-      child: FlowyTextField(
-        onChanged: onSearchChanged,
-        textStyle: const TextStyle(
-          fontSize: 12,
-          fontWeight: FontWeight.w400,
-        ),
-        decoration: InputDecoration(
-          hintText: LocaleKeys.settings_shortcutsPage_searchHint.tr(),
-          counterText: '',
-          contentPadding: const EdgeInsets.symmetric(
-            vertical: 9,
-            horizontal: 16,
-          ),
-          enabledBorder: OutlineInputBorder(
-            borderSide: BorderSide(
-              color: Theme.of(context).colorScheme.outline,
-            ),
-            borderRadius: Corners.s12Border,
-          ),
-          focusedBorder: OutlineInputBorder(
-            borderSide: BorderSide(
-              color: Theme.of(context).colorScheme.primary,
-            ),
-            borderRadius: Corners.s12Border,
-          ),
-          errorBorder: OutlineInputBorder(
-            borderSide: BorderSide(
-              color: Theme.of(context).colorScheme.error,
-            ),
-            borderRadius: Corners.s12Border,
-          ),
-          focusedErrorBorder: OutlineInputBorder(
-            borderSide: BorderSide(
-              color: Theme.of(context).colorScheme.error,
-            ),
-            borderRadius: Corners.s12Border,
-          ),
-        ),
-      ),
+    return AFTextField(
+      onChanged: onSearchChanged,
+      hintText: LocaleKeys.settings_shortcutsPage_searchHint.tr(),
     );
   }
 }
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_input_field.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/shared/settings_input_field.dart
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/inivitation/m_invite_member_by_link.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/members/inivitation/m_invite_member_by_link.dart
diff --git a/frontend/appflowy_flutter/packages/appflowy_ui/lib/src/component/textfield/textfield.dart b/frontend/appflowy_flutter/packages/appflowy_ui/lib/src/component/textfield/textfield.dart
diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lock
diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yaml
diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json
diff --git a/frontend/rust-lib/flowy-error/src/code.rs b/frontend/rust-lib/flowy-error/src/code.rs
