Merge branch 'main' into fix/desktop/link

Author: asjqkkkk

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();

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,

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),
-                ],
+                ),
               );
             },
           ),

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);

frontend/appflowy_flutter/lib/plugins/database/application/cell/bloc/date_cell_editor_bloc.dart

@@ -55,10 +55,11 @@ class DateCellEditorBloc
           didReceiveCellUpdate: (DateCellDataPB? cellData) {
             final dateCellData = DateCellData.fromPB(cellData);
 
-            ReminderOption reminderOption = ReminderOption.none;
+            ReminderOption reminderOption = state.reminderOption;
 
             if (dateCellData.reminderId.isNotEmpty &&
-                dateCellData.dateTime != null) {
+                dateCellData.dateTime != null &&
+                reminderOption != ReminderOption.none) {
               final reminder = _reminderBloc.state.reminders
                   .firstWhereOrNull((r) => r.id == dateCellData.reminderId);
               if (reminder != null) {
@@ -119,6 +120,7 @@ class DateCellEditorBloc
             await _clearDate();
           },
           setReminderOption: (ReminderOption option) async {
+            emit(state.copyWith(reminderOption: option));
             await _setReminderOption(option);
           },
         );
@@ -246,9 +248,7 @@ class DateCellEditorBloc
   void _updateReminderIfNecessary(
     DateTime? dateTime,
   ) {
-    if (state.reminderId.isEmpty ||
-        state.reminderOption == ReminderOption.none ||
-        dateTime == null) {
+    if (state.reminderId.isEmpty || dateTime == null) {
       return;
     }
 
@@ -400,7 +400,7 @@ class DateCellEditorState with _$DateCellEditorState {
     ReminderOption reminderOption = ReminderOption.none;
 
     if (dateCellData.reminderId.isNotEmpty && dateCellData.dateTime != null) {
-      final reminder = reminderBloc.state.reminders
+      final reminder = reminderBloc.state.allReminders
           .firstWhereOrNull((r) => r.id == dateCellData.reminderId);
       if (reminder != null) {
         final eventDate = dateCellData.includeTime

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) {

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,

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(

frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/desktop_toolbar/link/link_search_text_field.dart

@@ -78,11 +78,12 @@ class LinkSearchTextField {
       focusNode: focusNode,
       textAlign: TextAlign.left,
       controller: textEditingController,
-      style: textStyle ?? TextStyle(
-        fontSize: 14,
-        height: 20 / 14,
-        fontWeight: FontWeight.w400,
-      ),
+      style: textStyle ??
+          TextStyle(
+            fontSize: 14,
+            height: 20 / 14,
+            fontWeight: FontWeight.w400,
+          ),
       onChanged: (text) {
         if (text.isEmpty) {
           searchedViews.clear();

frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart

@@ -63,11 +63,12 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
   late bool _includeTime = widget.includeTime;
   late DateTime? parsedDate = DateTime.tryParse(widget.date);
   late String? _reminderId = widget.reminderId;
+  late ReminderOption _reminderOption = widget.reminderOption;
 
   ReminderPB? getReminder(BuildContext context) {
-    if (!context.mounted) return null;
+    if (!context.mounted || _reminderId == null) return null;
     final reminderBloc = context.read<ReminderBloc?>();
-    return reminderBloc?.state.serverReminders
+    return reminderBloc?.state.allReminders
         .firstWhereOrNull((r) => r.id == _reminderId);
   }
 
@@ -115,11 +116,11 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
             includeTime: _includeTime,
             dateFormat: appearance.dateFormat,
             timeFormat: appearance.timeFormat,
-            selectedReminderOption: widget.reminderOption,
+            selectedReminderOption: _reminderOption,
             onIncludeTimeChanged: (includeTime, dateTime, _) {
               _includeTime = includeTime;
 
-              if (widget.reminderOption != ReminderOption.none) {
+              if (_reminderOption != ReminderOption.none) {
                 _updateReminder(
                   widget.reminderOption,
                   context,
@@ -136,18 +137,26 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
             onDaySelected: (selectedDay) {
               parsedDate = selectedDay;
 
-              if (widget.reminderOption != ReminderOption.none) {
+              if (_reminderOption != ReminderOption.none) {
                 _updateReminder(
-                  widget.reminderOption,
+                  _reminderOption,
                   context,
                   _includeTime,
                 );
               } else {
+                final rootContext = widget.editorState.document.root.context;
+                if (rootContext != null && _reminderId != null) {
+                  rootContext
+                      .read<ReminderBloc?>()
+                      ?.add(ReminderEvent.remove(reminderId: _reminderId!));
+                }
                 _updateBlock(selectedDay, includeTime: _includeTime);
               }
             },
-            onReminderSelected: (reminderOption) =>
-                _updateReminder(reminderOption, context, _includeTime),
+            onReminderSelected: (reminderOption) {
+              _reminderOption = reminderOption;
+              _updateReminder(reminderOption, context, _includeTime);
+            },
           );
 
           Color? color;
@@ -245,7 +254,7 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
     if (parsedDate == null || rootContext == null) {
       return;
     }
-    final reminder = getReminder(context);
+    final reminder = getReminder(rootContext);
     if (reminder != null) {
       _updateBlock(
         parsedDate!,
@@ -273,8 +282,8 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
           );
     }
 
-    final reminderId = nanoid();
-    _reminderId = reminderId;
+    _reminderId ??= nanoid();
+    final reminderId = _reminderId;
     _updateBlock(
       parsedDate!,
       includeTime: includeTime,