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.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
refactor: use node iterator for selection
Vincent Chan8b60cd7abdf2
diff --git a/frontend/app_flowy/packages/flowy_editor/lib/document/node_iterator.dart b/frontend/app_flowy/packages/flowy_editor/lib/document/node_iterator.dartindex 8603c043e4..1f321e937a 100644--- a/frontend/app_flowy/packages/flowy_editor/lib/document/node_iterator.dart+++ b/frontend/app_flowy/packages/flowy_editor/lib/document/node_iterator.dart@@ -61,4 +61,14 @@ class NodeIterator implements Iterator<Node> {Node get current {return _currentNode!;}++ List<Node> toList() {+ final result = <Node>[];++ while (moveNext()) {+ result.add(current);+ }++ return result;+ }}diff --git a/frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dart b/frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dartindex a304272846..55b08f9279 100644--- a/frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dart+++ b/frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dart@@ -1,5 +1,7 @@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/material.dart';@@ -212,7 +214,7 @@ class _FlowySelectionState extends State<FlowySelection>@overrideList<Node> getNodesInSelection(Selection selection) =>- _selectedNodesInSelection(editorState.document.root, selection);+ _selectedNodesInSelection(editorState.document, selection);@overridevoid initState() {@@ -462,8 +464,7 @@ class _FlowySelectionState extends State<FlowySelection>}void _updateSelection(Selection selection) {- final nodes =- _selectedNodesInSelection(editorState.document.root, selection);+ final nodes = _selectedNodesInSelection(editorState.document, selection);currentSelection = selection;currentSelectedNodes.value = nodes;@@ -572,16 +573,10 @@ class _FlowySelectionState extends State<FlowySelection>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();}}