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.

Merge remote-tracking branch 'origin/main' into feat/toolbar_service

Lucas.Xu70853b918e17
diff --cc frontend/app_flowy/packages/flowy_editor/lib/service/editor_service.dart
index d68db05adc,39382d3a9c..d1fb4aac9c
--- a/frontend/app_flowy/packages/flowy_editor/lib/service/editor_service.dart
+++ b/frontend/app_flowy/packages/flowy_editor/lib/service/editor_service.dart
@@@ -1,4 -1,5 +1,3 @@@
- import 'package:flutter/gestures.dart';
-import 'package:flowy_editor/service/internal_key_event_handlers/delete_text_handler.dart';
-import 'package:flowy_editor/service/internal_key_event_handlers/update_text_style_by_command_x_handler.dart';
import 'package:flutter/material.dart';
import 'package:flowy_editor/editor_state.dart';
@@@ -6,20 -7,18 +5,21 @@@ import 'package:flowy_editor/render/edi
import 'package:flowy_editor/render/rich_text/bulleted_list_text.dart';
import 'package:flowy_editor/render/rich_text/checkbox_text.dart';
import 'package:flowy_editor/render/rich_text/flowy_rich_text.dart';
+import 'package:flowy_editor/render/rich_text/heading_text.dart';
+import 'package:flowy_editor/render/rich_text/number_list_text.dart';
+import 'package:flowy_editor/render/rich_text/quoted_text.dart';
import 'package:flowy_editor/service/input_service.dart';
-import 'package:flowy_editor/service/internal_key_event_handlers/enter_in_edge_of_text_node_handler.dart';
-import 'package:flowy_editor/service/render_plugin_service.dart';
import 'package:flowy_editor/service/internal_key_event_handlers/arrow_keys_handler.dart';
+ import 'package:flowy_editor/service/internal_key_event_handlers/copy_paste_handler.dart';
import 'package:flowy_editor/service/internal_key_event_handlers/delete_nodes_handler.dart';
-import 'package:flowy_editor/service/internal_key_event_handlers/shortcut_handler.dart';
+import 'package:flowy_editor/service/internal_key_event_handlers/delete_text_handler.dart';
+import 'package:flowy_editor/service/internal_key_event_handlers/enter_in_edge_of_text_node_handler.dart';
+import 'package:flowy_editor/service/internal_key_event_handlers/slash_handler.dart';
+import 'package:flowy_editor/service/internal_key_event_handlers/update_text_style_by_command_x_handler.dart';
import 'package:flowy_editor/service/keyboard_service.dart';
+import 'package:flowy_editor/service/render_plugin_service.dart';
+import 'package:flowy_editor/service/scroll_service.dart';
import 'package:flowy_editor/service/selection_service.dart';
-import 'package:flowy_editor/render/rich_text/heading_text.dart';
-import 'package:flowy_editor/render/rich_text/number_list_text.dart';
-import 'package:flowy_editor/render/rich_text/quoted_text.dart';
import 'package:flowy_editor/service/toolbar_service.dart';
NodeWidgetBuilders defaultBuilders = {
diff --cc frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dart
index b879ea419a,55b08f9279..c54ef90f9f
--- a/frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dart
+++ b/frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dart
@@@ -5,8 -6,8 +5,10 @@@ import 'package:flutter/gestures.dart'
import 'package:flutter/material.dart';
import 'package:flowy_editor/document/node.dart';
++import 'package:flowy_editor/document/node_iterator.dart';
import 'package:flowy_editor/document/position.dart';
import 'package:flowy_editor/document/selection.dart';
++import 'package:flowy_editor/document/state_tree.dart';
import 'package:flowy_editor/editor_state.dart';
import 'package:flowy_editor/extensions/node_extensions.dart';
import 'package:flowy_editor/render/selection/cursor_widget.dart';
@@@ -381,20 -439,32 +383,19 @@@ class _FlowySelectionState extends Stat
final selection = Selection(
start: isDownward ? start : end, end: isDownward ? end : start);
debugPrint('[_onPanUpdate] isDownward = $isDownward, $selection');
- editorState.service.selectionService.updateSelection(selection);
+ editorState.updateCursorSelection(selection);
}
+
+ _scrollUpOrDownIfNeeded(panEndOffset!);
+ _showDebugLayerIfNeeded();
}
void _onPanEnd(DragEndDetails details) {
// do nothing
}
- void _clearSelection() {
- currentSelection = null;
- currentSelectedNodes.value = [];
-
- // clear selection
- _selectionOverlays
- ..forEach((overlay) => overlay.remove())
- ..clear();
- // clear cursors
- _cursorOverlays
- ..forEach((overlay) => overlay.remove())
- ..clear();
- // clear toolbar
- editorState.service.toolbarService?.hide();
- }
-
void _updateSelection(Selection selection) {
- final nodes =
- _selectedNodesInSelection(editorState.document.root, selection);
+ final nodes = _selectedNodesInSelection(editorState.document, selection);
currentSelection = selection;
currentSelectedNodes.value = nodes;
@@@ -503,151 -573,10 +504,145 @@@
currentState?.show();
}
- List<Node> _selectedNodesInSelection(Node node, Selection selection) {
- List<Node> result = [];
- if (node.parent != null) {
- if (node.inSelection(selection)) {
- result.add(node);
- }
- }
- for (final child in node.children) {
- result.addAll(_selectedNodesInSelection(child, selection));
- }
- return result;
+ List<Node> _selectedNodesInSelection(
+ StateTree stateTree, Selection selection) {
+ final startNode = stateTree.nodeAtPath(selection.start.path)!;
+ final endNode = stateTree.nodeAtPath(selection.end.path)!;
+ return NodeIterator(stateTree, startNode, endNode).toList();
}
+
+ void _scrollUpOrDownIfNeeded(Offset offset) {
+ final dy = editorState.service.scrollService?.dy;
+ if (dy == null) {
+ assert(false, 'Dy could not be null');
+ return;
+ }
+ final topLimit = MediaQuery.of(context).size.height * 0.2;
+ final bottomLimit = MediaQuery.of(context).size.height * 0.8;
+
+ /// TODO: It is necessary to calculate the relative speed
+ /// according to the gap and move forward more gently.
+ final distance = 10.0;
+ if (offset.dy <= topLimit) {
+ // up
+ editorState.service.scrollService?.scrollTo(dy - distance);
+ } else if (offset.dy >= bottomLimit) {
+ //down
+ editorState.service.scrollService?.scrollTo(dy + distance);
+ }
+ }
+
+ void _showDebugLayerIfNeeded() {
+ // remove false to show debug overlay.
+ if (kDebugMode && false) {
+ _debugOverlay?.remove();
+ if (panStartOffset != null) {
+ _debugOverlay = OverlayEntry(
+ builder: (context) => Positioned.fromRect(
+ rect: Rect.fromPoints(
+ panStartOffset?.translate(
+ 0,
+ -(editorState.service.scrollService!.dy -
+ panStartScrollDy!),
+ ) ??
+ Offset.zero,
+ panEndOffset ?? Offset.zero)
+ .translate(0, 0),
+ child: Container(
+ color: Colors.red.withOpacity(0.2),
+ ),
+ ),
+ );
+ Overlay.of(context)?.insert(_debugOverlay!);
+ } else {
+ _debugOverlay = null;
+ }
+ }
+ }
+}
+
+/// Because the flutter's [DoubleTapGestureRecognizer] will block the [TapGestureRecognizer]
+/// for a while. So we need to implement our own GestureDetector.
+@immutable
+class _SelectionGestureDetector extends StatefulWidget {
+ const _SelectionGestureDetector(
+ {Key? key,
+ this.child,
+ this.onTapDown,
+ this.onDoubleTapDown,
+ this.onPanStart,
+ this.onPanUpdate,
+ this.onPanEnd})
+ : super(key: key);
+
+ @override
+ State<_SelectionGestureDetector> createState() =>
+ _SelectionGestureDetectorState();
+
+ final Widget? child;
+
+ final GestureTapDownCallback? onTapDown;
+ final GestureTapDownCallback? onDoubleTapDown;
+ final GestureDragStartCallback? onPanStart;
+ final GestureDragUpdateCallback? onPanUpdate;
+ final GestureDragEndCallback? onPanEnd;
+}
+
+class _SelectionGestureDetectorState extends State<_SelectionGestureDetector> {
+ bool _isDoubleTap = false;
+ Timer? _doubleTapTimer;
+ @override
+ Widget build(BuildContext context) {
+ return RawGestureDetector(
+ behavior: HitTestBehavior.translucent,
+ gestures: {
+ PanGestureRecognizer:
+ GestureRecognizerFactoryWithHandlers<PanGestureRecognizer>(
+ () => PanGestureRecognizer(),
+ (recognizer) {
+ recognizer
+ ..onStart = widget.onPanStart
+ ..onUpdate = widget.onPanUpdate
+ ..onEnd = widget.onPanEnd;
+ },
+ ),
+ TapGestureRecognizer:
+ GestureRecognizerFactoryWithHandlers<TapGestureRecognizer>(
+ () => TapGestureRecognizer(),
+ (recognizer) {
+ recognizer.onTapDown = _tapDownDelegate;
+ },
+ ),
+ },
+ child: widget.child,
+ );
+ }
+
+ _tapDownDelegate(TapDownDetails tapDownDetails) {
+ if (_isDoubleTap) {
+ _isDoubleTap = false;
+ _doubleTapTimer?.cancel();
+ _doubleTapTimer = null;
+ if (widget.onDoubleTapDown != null) {
+ widget.onDoubleTapDown!(tapDownDetails);
+ }
+ } else {
+ if (widget.onTapDown != null) {
+ widget.onTapDown!(tapDownDetails);
+ }
+
+ _isDoubleTap = true;
+ _doubleTapTimer?.cancel();
+ _doubleTapTimer = Timer(kDoubleTapTimeout, () {
+ _isDoubleTap = false;
+ _doubleTapTimer = null;
+ });
+ }
+ }
+
+ @override
+ void dispose() {
+ _doubleTapTimer?.cancel();
+ super.dispose();
+ }
}