Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

fix: undo not working in database row full page (#7749)

Richard Shiue69b5452af5ad
diff --git a/frontend/appflowy_flutter/lib/plugins/database_document/database_document_page.dart b/frontend/appflowy_flutter/lib/plugins/database_document/database_document_page.dart
index 9568784464..ee52be8c26 100644
--- a/frontend/appflowy_flutter/lib/plugins/database_document/database_document_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/database_document/database_document_page.dart
@@ -1,3 +1,4 @@
+import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/database/application/row/related_row_detail_bloc.dart';
import 'package:appflowy/plugins/database/grid/application/row/row_detail_bloc.dart';
import 'package:appflowy/plugins/database/grid/presentation/widgets/common/type_option_separator.dart';
@@ -7,9 +8,10 @@ import 'package:appflowy/plugins/database/widgets/row/row_property.dart';
import 'package:appflowy/plugins/document/application/document_bloc.dart';
import 'package:appflowy/plugins/document/presentation/banner.dart';
import 'package:appflowy/plugins/document/presentation/editor_drop_handler.dart';
-import 'package:appflowy/plugins/document/presentation/editor_notification.dart';
import 'package:appflowy/plugins/document/presentation/editor_page.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/ai/widgets/ai_writer_scroll_wrapper.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';
+import 'package:appflowy/plugins/document/presentation/editor_plugins/shared_context/shared_context.dart';
import 'package:appflowy/plugins/document/presentation/editor_plugins/transaction_handler/editor_transaction_service.dart';
import 'package:appflowy/plugins/document/presentation/editor_style.dart';
import 'package:appflowy/shared/flowy_error_page.dart';
@@ -19,8 +21,10 @@ import 'package:appflowy/workspace/application/action_navigation/navigation_acti
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart';
import 'package:appflowy_editor/appflowy_editor.dart';
+import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:provider/provider.dart';
import '../../workspace/application/view/view_bloc.dart';
@@ -49,18 +53,6 @@ class DatabaseDocumentPage extends StatefulWidget {
class _DatabaseDocumentPageState extends State<DatabaseDocumentPage> {
EditorState? editorState;
- @override
- void initState() {
- super.initState();
- EditorNotification.addListener(_onEditorNotification);
- }
-
- @override
- void dispose() {
- EditorNotification.removeListener(_onEditorNotification);
- super.dispose();
- }
-
@override
Widget build(BuildContext context) {
return MultiBlocProvider(
@@ -126,21 +118,34 @@ class _DatabaseDocumentPageState extends State<DatabaseDocumentPage> {
styleCustomizer: EditorStyleCustomizer(
context: context,
padding: EditorStyleCustomizer.documentPadding,
+ editorState: state.editorState!,
),
header: _buildDatabaseDataContent(context, state.editorState!),
initialSelection: widget.initialSelection,
useViewInfoBloc: false,
+ placeholderText: (node) =>
+ node.type == ParagraphBlockKeys.type && !node.isInTable
+ ? LocaleKeys.editor_slashPlaceHolder.tr()
+ : '',
),
);
- return EditorTransactionService(
- viewId: widget.view.id,
- editorState: state.editorState!,
- child: Column(
- children: [
- if (state.isDeleted) _buildBanner(context),
- Expanded(child: appflowyEditorPage),
- ],
+ return Provider(
+ create: (_) {
+ final context = SharedEditorContext();
+ context.isInDatabaseRowPage = true;
+ return context;
+ },
+ dispose: (_, editorContext) => editorContext.dispose(),
+ child: EditorTransactionService(
+ viewId: widget.view.id,
+ editorState: state.editorState!,
+ child: Column(
+ children: [
+ if (state.isDeleted) _buildBanner(context),
+ Expanded(child: appflowyEditorPage),
+ ],
+ ),
),
);
}
@@ -213,20 +218,6 @@ class _DatabaseDocumentPageState extends State<DatabaseDocumentPage> {
);
}
- void _onEditorNotification(EditorNotificationType type) {
- final editorState = this.editorState;
- if (editorState == null) {
- return;
- }
- if (type == EditorNotificationType.undo) {
- undoCommand.execute(editorState);
- } else if (type == EditorNotificationType.redo) {
- redoCommand.execute(editorState);
- } else if (type == EditorNotificationType.exitEditing) {
- editorState.selection = null;
- }
- }
-
void _onNotificationAction(
BuildContext context,
ActionNavigationState state,