Fixed issue related to hang encountered when editing some lists

rajdeep · Oct 1, 2024 · d93e034 · d93e034
1 parent 4a25206
commit d93e034
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 24 deletions.
diff --git a/Proton/Sources/Swift/Core/LayoutManager.swift b/Proton/Sources/Swift/Core/LayoutManager.swift
@@ -88,26 +88,6 @@ class LayoutManager: NSLayoutManager {
             counters = [:]
         }
 
-        var levelToSet = 0
-//        textStorage.enumerateAttribute(.paragraphStyle, in: listRange, options: []) { value, range, _ in
-//            levelToSet = 0
-//            if let paraStyle = (value as? NSParagraphStyle)?.mutableParagraphStyle {
-//                let previousLevel = Int(prevStyle?.firstLineHeadIndent ?? 0)/Int(listIndent)
-//                let currentLevel = Int(paraStyle.firstLineHeadIndent)/Int(listIndent)
-//
-//                if currentLevel - previousLevel > 1 {
-//                    levelToSet = previousLevel + 1
-//                    let indentation = CGFloat(levelToSet) * listIndent
-//                    paraStyle.firstLineHeadIndent = indentation
-//                    paraStyle.headIndent = indentation
-//                    textStorage.addAttribute(.paragraphStyle, value: paraStyle, range: range)
-//                    prevStyle = paraStyle
-//                } else {
-//                    prevStyle = value as? NSParagraphStyle
-//                }
-//            }
-//        }
-
         let listGlyphRange = glyphRange(forCharacterRange: listRange, actualCharacterRange: nil)
         previousLevel = 0
         enumerateLineFragments(forGlyphRange: listGlyphRange) { [weak self] (rect, usedRect, textContainer, glyphRange, stop) in

diff --git a/Proton/Sources/Swift/EditorCommand/Commands/List/ListCommand.swift b/Proton/Sources/Swift/EditorCommand/Commands/List/ListCommand.swift
@@ -104,6 +104,7 @@ public class ListCommand: EditorCommand {
             ], at: selectedRange)
             editor.removeAttribute(.listItem, at: selectedRange)
             editor.typingAttributes[.listItem] = nil
+            cleanupIfNeeded(editor: editor)
             return
         }
 
@@ -132,4 +133,34 @@ public class ListCommand: EditorCommand {
         self.attributeValue = attributeValue
         execute(on: editor)
     }
+
+    private func cleanupIfNeeded(editor: EditorView) {
+        guard let nextContentLine = editor.nextContentLine(from: editor.selectedRange.endLocation),
+              nextContentLine.text.attributeOrNil(.listItem, at: 0) != nil,
+              let paragraphStyle = nextContentLine.text.attributeOrNil(.paragraphStyle, at: 0) as? NSParagraphStyle,
+              let listToUpdateRange = editor.attributedText.rangeOf(attribute: .listItem, startingLocation: editor.selectedRange.endLocation) else { return }
+
+        let listIndent = editor.listLineFormatting.indentation
+
+        var levelToSet = 0
+        var prevStyle: NSParagraphStyle?
+        editor.attributedText.enumerateAttribute(.paragraphStyle, in: listToUpdateRange) { value, range, stop in
+            levelToSet = 0
+            if let paraStyle = (value as? NSParagraphStyle)?.mutableParagraphStyle {
+                let previousLevel = Int(prevStyle?.firstLineHeadIndent ?? 0)/Int(listIndent)
+                let currentLevel = Int(paraStyle.firstLineHeadIndent)/Int(listIndent)
+
+                if currentLevel - previousLevel > 1 {
+                    levelToSet = previousLevel + 1
+                    let indentation = CGFloat(levelToSet) * listIndent
+                    paraStyle.firstLineHeadIndent = indentation
+                    paraStyle.headIndent = indentation
+                    editor.addAttribute(.paragraphStyle, value: paraStyle, at: range)
+                    prevStyle = paraStyle
+                } else {
+                    prevStyle = value as? NSParagraphStyle
+                }
+            }
+        }
+    }
 }
diff --git a/Proton/Tests/Editor/EditorListsSnapshotTests.swift b/Proton/Tests/Editor/EditorListsSnapshotTests.swift
@@ -594,10 +594,6 @@ class EditorListsSnapshotTests: SnapshotTestCase {
 
         viewController.render(size: CGSize(width: 300, height: 225))
         assertSnapshot(matching: viewController.view, as: .image, record: recordMode)
-
-        // For some reason, a re-render is required in tests
-        viewController.render(size: CGSize(width: 300, height: 225))
-        assertSnapshot(matching: viewController.view, as: .image, record: recordMode)
     }
 
     func testRendersListWithDifferentAttributeValues() {

diff --git a/...r/__Snapshots__/EditorListsSnapshotTests/testRemoveListAttributeFromRange.2.png b/...r/__Snapshots__/EditorListsSnapshotTests/testRemoveListAttributeFromRange.2.png
diff --git a/...r/__Snapshots__/EditorListsSnapshotTests/testRemoveListAttributeFromRange.3.png b/...r/__Snapshots__/EditorListsSnapshotTests/testRemoveListAttributeFromRange.3.png