From ff28ee3232eb621e287e8764f4bc2be239551ddd Mon Sep 17 00:00:00 2001
From: Egor Korshun <120365747+EgorK0rshun@users.noreply.github.com>
Date: Fri, 8 Sep 2023 17:58:33 +0300
Subject: [PATCH] Fix #1394 and #1395 (#1396)

---
 CHANGELOG.md                             |  4 ++++
 lib/src/models/documents/nodes/leaf.dart | 10 ++++------
 lib/src/models/documents/nodes/line.dart |  5 ++---
 pubspec.yaml                             |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19d7ce8b..7ee530cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# [7.4.6]
+- Fix #1394.
+- Fix #1395.
+
 # [7.4.5]
 - Fix #1392.
 
diff --git a/lib/src/models/documents/nodes/leaf.dart b/lib/src/models/documents/nodes/leaf.dart
index eb9cae29..8f8b13a7 100644
--- a/lib/src/models/documents/nodes/leaf.dart
+++ b/lib/src/models/documents/nodes/leaf.dart
@@ -74,9 +74,8 @@ abstract class Leaf extends Node {
     final remain = len - local;
     final node = _isolate(index, local);
 
-    if (remain > 0) {
-      assert(node.next != null);
-      node.next!.retain(0, remain, style);
+    if (remain > 0 && node.next != null) {
+      node.next?.retain(0, remain, style);
     }
     node.format(style);
   }
@@ -92,9 +91,8 @@ abstract class Leaf extends Node {
     target.unlink();
 
     final remain = len - local;
-    if (remain > 0) {
-      assert(next != null);
-      next!.delete(0, remain);
+    if (remain > 0 && next != null) {
+      next.delete(0, remain);
     }
 
     if (prev != null) {
diff --git a/lib/src/models/documents/nodes/line.dart b/lib/src/models/documents/nodes/line.dart
index 09380853..b9e7191d 100644
--- a/lib/src/models/documents/nodes/line.dart
+++ b/lib/src/models/documents/nodes/line.dart
@@ -172,9 +172,8 @@ class Line extends Container<Leaf?> {
     }
 
     final remaining = len - local;
-    if (remaining > 0) {
-      assert(nextLine != null);
-      nextLine!.delete(0, remaining);
+    if (remaining > 0 && nextLine != null) {
+      nextLine?.delete(0, remaining);
     }
 
     if (isLFDeleted && isNotEmpty) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 10a3e647..549e55ff 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_quill
 description: A rich text editor built for the modern Android, iOS, web and desktop platforms. It is the WYSIWYG editor and a Quill component for Flutter.
-version: 7.4.5
+version: 7.4.6
 homepage: https://1o24bbs.com/c/bulletjournal/108
 repository: https://github.com/singerdmx/flutter-quill