Move initialization of spTextView text storage out of setupTextContainer

Automattic · Dec 28, 2024 · 2fde51e · 2fde51e
1 parent fa0f31b
commit 2fde51e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Simplenote/Classes/SPTextView.m b/Simplenote/Classes/SPTextView.m
@@ -20,11 +20,12 @@
 @implementation SPTextView
 
 - (instancetype)init {
-    NSTextContainer *container = [self setupTextContainer];
+    SPInteractiveTextStorage *textStorage = [[SPInteractiveTextStorage alloc] init];
+    NSTextContainer *container = [self setupTextContainerWith:textStorage];
 
     self = [super initWithFrame:CGRectZero textContainer:container];
     if (self) {
-
+        self.interactiveTextStorage = textStorage;
     /*
         Issue #188:
         ===========

diff --git a/Simplenote/SPTextView.swift b/Simplenote/SPTextView.swift
@@ -8,14 +8,11 @@
 
 extension SPTextView {
     @objc
-    func setupTextContainer() -> NSTextContainer {
+    func setupTextContainer(with textStorage: SPInteractiveTextStorage) -> NSTextContainer {
         let container = NSTextContainer(size: .zero)
         container.widthTracksTextView = true
         container.heightTracksTextView = true
 
-        let textStorage = SPInteractiveTextStorage()
-        interactiveTextStorage = textStorage
-
         if #available(iOS 16.0, *) {
             let textLayoutManager = NSTextLayoutManager()
             let contentStorage = NSTextContentStorage()