add search

packages/notus/lib/src/document.dart

@@ -12,6 +12,7 @@ import 'document/line.dart';
 import 'document/node.dart';
 import 'heuristics.dart';
 import 'history.dart';
+import 'search.dart';
 
 /// Source of a [NotusChange].
 enum ChangeSource {
@@ -44,6 +45,7 @@ class NotusDocument {
         // _delta = Delta()..insert('\n') {
       _history = NotusHistory(),
         _delta = Delta()..insert('\n') {
+      _searchController = NotusSearch(_delta);
     _loadDocument(_delta);
   }
 
@@ -51,6 +53,7 @@ class NotusDocument {
       : _heuristics = NotusHeuristics.fallback,
       _history = NotusHistory(),
         _delta = Delta.fromJson(data) {
+          _searchController = NotusSearch(_delta);
     _loadDocument(_delta);
   }
 
@@ -58,6 +61,7 @@ class NotusDocument {
       : assert(delta != null),
         _heuristics = NotusHeuristics.fallback,
         _history = NotusHistory(),
+        _searchController = NotusSearch(delta),
         _delta = delta {
     _loadDocument(_delta);
   }
@@ -73,6 +77,13 @@ class NotusDocument {
 
   NotusHistory get history => _history;
 
+  NotusSearch _searchController;
+
+  set searchController(NotusSearch value) {
+    _searchController = value;
+  }
+  NotusSearch get searchController => _searchController;
+
   /// The root node of this document tree.
   RootNode get root => _root;
   final RootNode _root = RootNode();
@@ -172,7 +183,7 @@ class NotusDocument {
   /// Returns an instance of [Delta] actually composed into this document.
   /// The returned [Delta] may be empty in which case this document remains
   /// unchanged and no [NotusChange] is published to [changes] stream.
-  Delta format(int index, int length, NotusAttribute attribute) {
+  Delta  format(int index, int length, NotusAttribute attribute, {bool search = false}) {
     assert(index >= 0 && length >= 0 && attribute != null);
 
     var change = Delta();
@@ -188,7 +199,7 @@ class NotusDocument {
     final formatChange =
         _heuristics.applyFormatRules(this, index, length, attribute);
     if (formatChange.isNotEmpty) {
-      compose(formatChange, ChangeSource.local);
+      compose(formatChange, ChangeSource.local, search: search);
       change = change.compose(formatChange);
     }
 
@@ -230,7 +241,7 @@ class NotusDocument {
   /// of this document.
   ///
   /// In case the [change] is invalid, behavior of this method is unspecified.
-  void compose(Delta change, ChangeSource source, {bool history}) {
+  void compose(Delta change, ChangeSource source, {bool history, bool search}) {
     _checkMutable();
     change.trim();
     assert(change.isNotEmpty);
@@ -258,7 +269,8 @@ class NotusDocument {
     // _controller.add(NotusChange(before, change, source));
     final notusChange = NotusChange(before, change, source);
     _controller.add(notusChange);
-    if (history != true) _history?.handleDocChange(notusChange);
+    if (history != true && search != true) _history?.handleDocChange(notusChange);
+    if (search != true) _searchController = NotusSearch(_delta);
   }
 
   //
@@ -311,6 +323,10 @@ class NotusDocument {
     }
   }
 
+  void search(String text) {
+    _searchController.search(this, text);
+  }
+
   Delta undo() {
     return _history?.undo(this);
   }

packages/notus/lib/src/search.dart

@@ -0,0 +1,22 @@
+import 'package:notus/notus.dart';
+import 'package:notus/src/document.dart';
+import 'package:quill_delta/quill_delta.dart';
+
+///
+/// record users operation or api change(Collaborative editing)
+/// used for redo or undo function
+///
+class NotusSearch {
+  const NotusSearch(this.delta);
+  final Delta delta;
+
+  void search(NotusDocument doc, String text) {
+    doc.compose(delta, ChangeSource.remote, search: true);
+    if (text.isNotEmpty) {
+      var result = RegExp(r''+ text + '', caseSensitive: false, multiLine: true).allMatches(NotusDocument.fromDelta(delta).toPlainText()).toList();
+      for (var item in result) {
+        doc.format(item.start, item.end - item.start, NotusAttribute.highlight, search: true);
+      }
+    }
+  }
+}

packages/zefyr/example/lib/src/full_page.dart

@@ -33,7 +33,7 @@ class FullPageEditorScreen extends StatefulWidget {
 
 Delta getDelta() {
   final doc =
-    r'[{"insert":"Zefyr", "attributes": {"color": "#595959", "highlight": true}},{"insert":"\n","attributes":{"heading":1}},{"insert":"Soft and gentle rich text editing for Flutter applications.","attributes":{"i":true}},{"insert":"\n"},{"insert":"​","attributes":{"embed":{"type":"image","source":"asset://images/breeze.jpg"}}},{"insert":"\n"},{"insert":"Photo by Hiroyuki Takeda.","attributes":{"i":true}},{"insert":"\nZefyr is currently in "},{"insert":"early preview","attributes":{"b":true}},{"insert":". If you have a feature request or found a bug, please file it at the "},{"insert":"issue tracker","attributes":{"a":"https://github.com/memspace/zefyr/issues"}},{"insert":'
+    r'[{"insert":"Zefyr", "attributes": {"color": "#595959"}},{"insert":"\n","attributes":{"heading":1}},{"insert":"Soft and gentle rich text editing for Flutter applications.","attributes":{"i":true}},{"insert":"\n"},{"insert":"​","attributes":{"embed":{"type":"image","source":"asset://images/breeze.jpg"}}},{"insert":"\n"},{"insert":"Photo by Hiroyuki Takeda.","attributes":{"i":true}},{"insert":"\nZefyr is currently in "},{"insert":"early preview","attributes":{"b":true}},{"insert":". If you have a feature request or found a bug, please file it at the "},{"insert":"issue tracker","attributes":{"a":"https://github.com/memspace/zefyr/issues"}},{"insert":'
     r'".\nDocumentation"},{"insert":"\n","attributes":{"heading":3}},{"insert":"Quick Start","attributes":{"a":"https://github.com/memspace/zefyr/blob/master/doc/quick_start.md"}},{"insert":"\n","attributes":{"block":"ul"}},{"insert":"Data Format and Document Model","attributes":{"a":"https://github.com/memspace/zefyr/blob/master/doc/data_and_document.md"}},{"insert":"\n","attributes":{"block":"ul"}},{"insert":"Style Attributes","attributes":{"a":"https://github.com/memspace/zefyr/blob/master/doc/attr'
     r'ibutes.md"}},{"insert":"\n","attributes":{"block":"ul"}},{"insert":"Heuristic Rules","attributes":{"a":"https://github.com/memspace/zefyr/blob/master/doc/heuristics.md"}},{"insert":"\n","attributes":{"block":"ul"}},{"insert":"FAQ","attributes":{"a":"https://github.com/memspace/zefyr/blob/master/doc/faq.md"}},{"insert":"\n","attributes":{"block":"ul"}},{"insert":"Clean and modern look"},{"insert":"\n","attributes":{"heading":2}},{"insert":"Zefyr’s rich text editor is built with simplicity and fle'
     r'xibility in mind. It provides clean interface for distraction-free editing. Think Medium.com-like experience.\nMarkdown inspired semantics"},{"insert":"\n","attributes":{"heading":2}},{"insert":"Ever needed to have a heading line inside of a quote block, like this:\nI’m a Markdown heading"},{"insert":"\n","attributes":{"block":"quote","heading":3}},{"insert":"And I’m a regular paragraph"},{"insert":"\n","attributes":{"block":"quote"}},{"insert":"Code blocks"},{"insert":"\n","attributes":{"headin'
@@ -88,17 +88,11 @@ class _FullPageEditorScreenState extends State<FullPageEditorScreen> {
         children: <Widget>[
           Container(
             height: 50,
-            child: RichText(
-              text: TextSpan(
-                text: '123',
-                style: TextStyle(
-                  color: Colors.black
-                ),
-                recognizer: TapGestureRecognizer()..onTap = () {
-                  print('object');
-                }
-              ),
-            ),
+            child: TextField(
+              onChanged: (text) {
+                _controller.search(text);
+              },
+            )
           ),
           Expanded(
                       child: ZefyrScaffold(

packages/zefyr/lib/src/widgets/controller.dart

@@ -162,8 +162,8 @@ class ZefyrController extends ChangeNotifier {
     notifyListeners();
   }
 
-  void formatText(int index, int length, NotusAttribute attribute) {
-    final change = document.format(index, length, attribute);
+  void formatText(int index, int length, NotusAttribute attribute, {bool search = false}) {
+    final change = document.format(index, length, attribute, search: search);
     _lastChangeSource = ChangeSource.local;
 
     if (length == 0 &&
@@ -209,12 +209,28 @@ class ZefyrController extends ChangeNotifier {
 
   void undo() {
     Delta change = document.undo();
-    updateSelection(TextSelection.collapsed(offset: change.transformPosition(_selection.extentOffset, force: false)));
+    if (change != null) {
+      var offset = change.transformPosition(_selection.extentOffset, force: true);
+      updateSelection(TextSelection.collapsed(offset: offset), source: ChangeSource.local);
+    }
   }
 
   void redo() {
     Delta change = document.redo();
-    updateSelection(TextSelection.collapsed(offset: change.transformPosition(_selection.extentOffset, force: true)));
+    if (change != null) {
+      var offset = change.transformPosition(_selection.extentOffset, force: true);
+      updateSelection(TextSelection.collapsed(offset: offset), source: ChangeSource.local);
+    }
+  }
+
+  void search(String text) {
+    document.search(text);
+    _lastChangeSource = ChangeSource.remote;
+    notifyListeners();
+    // var result = RegExp(r''+ text + '', caseSensitive: false, multiLine: true).allMatches(plainTextEditingValue.text).toList();
+    // for (var item in result) {
+    //   formatText(item.start, item.end - item.start, NotusAttribute.highlight, ignoreChange: true);
+    // }
   }
   
   /// Returns style of specified text range.