Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #763 from AppFlowy-IO/refactor/use-node-iterator-for-selection

Browse Source 
Refactor: use node iterator for selection
This commit is contained in:
Nathan.fooo 2022-08-04 21:00:08 +08:00 committed by GitHub
commit 60072c5ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/app_flowy/packages/flowy_editor/lib/document/node_iterator.dart
View File

@ -61,4 +61,14 @@ class NodeIterator implements Iterator<Node> {
Node get current { Node get current {
return _currentNode!; return _currentNode!;
} }
List<Node> toList() {
final result = <Node>[];
while (moveNext()) {
result.add(current);
}
return result;
}
} }

23
frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dart
View File

@ -1,5 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'package:flowy_editor/document/node_iterator.dart';
import 'package:flowy_editor/document/state_tree.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -212,7 +214,7 @@ class _FlowySelectionState extends State<FlowySelection>
@override @override
List<Node> getNodesInSelection(Selection selection) => List<Node> getNodesInSelection(Selection selection) =>
_selectedNodesInSelection(editorState.document.root, selection); _selectedNodesInSelection(editorState.document, selection);
@override @override
void initState() { void initState() {
@ -462,8 +464,7 @@ class _FlowySelectionState extends State<FlowySelection>
} }
void _updateSelection(Selection selection) { void _updateSelection(Selection selection) {
final nodes = final nodes = _selectedNodesInSelection(editorState.document, selection);
_selectedNodesInSelection(editorState.document.root, selection);
currentSelection = selection; currentSelection = selection;
currentSelectedNodes.value = nodes; currentSelectedNodes.value = nodes;
@ -572,16 +573,10 @@ class _FlowySelectionState extends State<FlowySelection>
currentState?.show(); currentState?.show();
} }
List<Node> _selectedNodesInSelection(Node node, Selection selection) { List<Node> _selectedNodesInSelection(
List<Node> result = []; StateTree stateTree, Selection selection) {
if (node.parent != null) { final startNode = stateTree.nodeAtPath(selection.start.path)!;
if (node.inSelection(selection)) { final endNode = stateTree.nodeAtPath(selection.end.path)!;
result.add(node); return NodeIterator(stateTree, startNode, endNode).toList();
}
}
for (final child in node.children) {
result.addAll(_selectedNodesInSelection(child, selection));
}
return result;
} }
} }