Added heuristic rule to preserve block styles on paste

packages/notus/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.3
+
+- Fixed handling of user input around embeds.
+- Added new heuristic rule to preserve block style on paste
+
 ## 0.1.2
 
 * Upgraded dependency on quiver_hashcode to 2.0.0.

packages/notus/lib/src/heuristics.dart

@@ -23,6 +23,7 @@ class NotusHeuristics {
       // attributes.
     ],
     insertRules: [
+      PreserveBlockStyleOnPasteRule(),
       ForceNewlineForInsertsAroundEmbedRule(),
       PreserveLineStyleOnSplitRule(),
       AutoExitBlockRule(),

packages/notus/lib/src/heuristics/insert_rules.dart

@@ -72,8 +72,9 @@ class PreserveLineStyleOnSplitRule extends InsertRule {
   }
 }
 
-/// Resets format for a newly inserted line when insert occurred at the end
 /// of a line (right before a line-break).
+
+/// Resets format for a newly inserted line when insert occurred at the end
 class ResetLineFormatOnNewLineRule extends InsertRule {
   const ResetLineFormatOnNewLineRule();
 
@@ -256,3 +257,69 @@ class ForceNewlineForInsertsAroundEmbedRule extends InsertRule {
     return null;
   }
 }
+
+/// Preserves block style when user pastes text containing line-breaks.
+/// This rule may also be activated for changes triggered by auto-correct.
+class PreserveBlockStyleOnPasteRule extends InsertRule {
+  const PreserveBlockStyleOnPasteRule();
+
+  bool isEdgeLineSplit(Operation before, Operation after) {
+    if (before == null) return true; // split at the beginning of a doc
+    return before.data.endsWith('\n') || after.data.startsWith('\n');
+  }
+
+  @override
+  Delta apply(Delta document, int index, String text) {
+    if (!text.contains('\n') || text.length == 1) {
+      // Only interested in text containing at least one line-break and at least
+      // one more character.
+      return null;
+    }
+
+    DeltaIterator iter = new DeltaIterator(document);
+    iter.skip(index);
+
+    // Look for next line-break.
+    Map<String, dynamic> lineStyle;
+    while (iter.hasNext) {
+      final op = iter.next();
+      int lf = op.data.indexOf('\n');
+      if (lf >= 0) {
+        lineStyle = op.attributes;
+        break;
+      }
+    }
+
+    Map<String, dynamic> resetStyle = null;
+    Map<String, dynamic> blockStyle = null;
+    if (lineStyle != null) {
+      if (lineStyle.containsKey(NotusAttribute.heading.key)) {
+        resetStyle = NotusAttribute.heading.unset.toJson();
+      }
+
+      if (lineStyle.containsKey(NotusAttribute.block.key)) {
+        blockStyle = <String, dynamic>{
+          NotusAttribute.block.key: lineStyle[NotusAttribute.block.key]
+        };
+      }
+    }
+
+    final lines = text.split('\n');
+    Delta result = new Delta()..retain(index);
+    for (int i = 0; i < lines.length; i++) {
+      final line = lines[i];
+      if (line.isNotEmpty) {
+        result.insert(line);
+      }
+      if (i == 0) {
+        result.insert('\n', lineStyle);
+      } else if (i == lines.length - 1) {
+        if (resetStyle != null) result.retain(1, resetStyle);
+      } else {
+        result.insert('\n', blockStyle);
+      }
+    }
+
+    return result;
+  }
+}

packages/notus/pubspec.yaml

@@ -1,6 +1,6 @@
 name: notus
 description: Platform-agnostic rich text document model based on Delta format and used in Zefyr editor.
-version: 0.1.2
+version: 0.1.3
 author: Anatoly Pulyaevskiy <anatoly.pulyaevskiy@gmail.com>
 homepage: https://github.com/memspace/zefyr
 

packages/notus/test/heuristics/insert_rules_test.dart

@@ -73,8 +73,7 @@ void main() {
     });
 
     test('applies at the beginning of a document', () {
-      final doc = new Delta()
-        ..insert('\n', NotusAttribute.h1.toJson());
+      final doc = new Delta()..insert('\n', NotusAttribute.h1.toJson());
       final actual = rule.apply(doc, 0, '\n');
       expect(actual, isNotNull);
       final expected = new Delta()
@@ -212,4 +211,23 @@ void main() {
       expect(actual, isNull);
     });
   });
+
+  group('$PreserveBlockStyleOnPasteRule', () {
+    final rule = new PreserveBlockStyleOnPasteRule();
+
+    test('applies in a block', () {
+      final doc = new Delta()
+        ..insert('One and two')
+        ..insert('\n', ul)
+        ..insert('Three')
+        ..insert('\n', ul);
+      final actual = rule.apply(doc, 8, 'also \n');
+      final expected = new Delta()
+        ..retain(8)
+        ..insert('also ')
+        ..insert('\n', ul);
+      expect(actual, isNotNull);
+      expect(actual, expected);
+    });
+  });
 }

packages/zefyr/CHANGELOG.md

@@ -2,7 +2,8 @@
 
 * Breaking change: `ZefyrImageDelegate.createImageProvider` replaced with
   `ZefyrImageDelegate.buildImage`.
-* Fixed: Prevent redundant updates on composing range for Android.
+* Fixed redundant updates on composing range for Android.
+* Added TextCapitalization.sentences
 
 ## 0.1.2
 

packages/zefyr/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

packages/zefyr/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

packages/zefyr/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>