From 65ee1dbd754bfce7388fca66c3f290f72dcc40a5 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 28 Feb 2019 17:18:50 -0500
Subject: [PATCH] Hide the current text item while the text item editor is
 open.

---
 .../Views/ImageEditor/ImageEditorCanvasView.swift     | 11 ++++++++++-
 .../ImageEditor/ImageEditorTextViewController.swift   |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift
index a755ae9b9..79a1ae986 100644
--- a/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift
+++ b/SignalMessaging/Views/ImageEditor/ImageEditorCanvasView.swift
@@ -27,9 +27,13 @@ public class ImageEditorCanvasView: UIView {
 
     private let model: ImageEditorModel
 
+    private let itemIdsToIgnore: [String]
+
     @objc
-    public required init(model: ImageEditorModel) {
+    public required init(model: ImageEditorModel,
+                         itemIdsToIgnore: [String] = []) {
         self.model = model
+        self.itemIdsToIgnore = itemIdsToIgnore
 
         super.init(frame: .zero)
 
@@ -180,6 +184,11 @@ public class ImageEditorCanvasView: UIView {
             updateImageLayer()
 
             for item in model.items() {
+                guard !itemIdsToIgnore.contains(item.itemId) else {
+                    // Ignore this item.
+                    continue
+                }
+
                 guard let layer = ImageEditorCanvasView.layerForItem(item: item,
                                                                      model: model,
                                                                      transform: transform,
diff --git a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift
index 680f26823..a865aa5e3 100644
--- a/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift
+++ b/SignalMessaging/Views/ImageEditor/ImageEditorTextViewController.swift
@@ -122,7 +122,8 @@ public class ImageEditorTextViewController: OWSViewController, VAlignTextViewDel
         self.model = model
         self.textItem = textItem
         self.maxTextWidthPoints = maxTextWidthPoints
-        self.canvasView = ImageEditorCanvasView(model: model)
+        self.canvasView = ImageEditorCanvasView(model: model,
+                                                itemIdsToIgnore: [textItem.itemId])
         self.paletteView = ImageEditorPaletteView(currentColor: textItem.color)
 
         super.init(nibName: nil, bundle: nil)