Remove related views when button is removed from superview (#238)

jjochen · Mar 4, 2020 · f1a126a · f1a126a
1 parent e0dfa2a
commit f1a126a
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 0 deletions.
diff --git a/Example/Tests/JJFloatingActionButtonSpec.swift b/Example/Tests/JJFloatingActionButtonSpec.swift
@@ -345,6 +345,21 @@ class JJFloatingActionButtonSpec: QuickSpec {
                             }
                         }
                     }
+
+                    context("and is removed from superview") {
+                        beforeEach {
+                            actionButton.removeFromSuperview()
+                        }
+
+                        it("removes related views from superview") {
+                            expect(actionButton.overlayView.superview).to(beNil())
+                            expect(actionButton.itemContainerView.superview).to(beNil())
+                        }
+
+                        it("closes") {
+                            expect(actionButton.buttonState).toEventually(equal(.closed))
+                        }
+                    }
                 }
 
                 context("and is opened and closed") {
@@ -430,6 +445,21 @@ class JJFloatingActionButtonSpec: QuickSpec {
                             expect(actionCount).toEventually(equal(1))
                         }
                     }
+
+                    context("and is removed from superview") {
+                        beforeEach {
+                            actionButton.removeFromSuperview()
+                        }
+
+                        it("removes related views from superview") {
+                            expect(actionButton.overlayView.superview).to(beNil())
+                            expect(actionButton.itemContainerView.superview).to(beNil())
+                        }
+
+                        it("closes") {
+                            expect(actionButton.buttonState).toEventually(equal(.closed))
+                        }
+                    }
                 }
 
                 context("and is closed animated") {
@@ -445,6 +475,21 @@ class JJFloatingActionButtonSpec: QuickSpec {
                     it("has eventually state closed") {
                         expect(actionButton.buttonState).toEventually(equal(.closed))
                     }
+
+                    context("and is removed from superview") {
+                        beforeEach {
+                            actionButton.removeFromSuperview()
+                        }
+
+                        it("removes related views from superview") {
+                            expect(actionButton.overlayView.superview).to(beNil())
+                            expect(actionButton.itemContainerView.superview).to(beNil())
+                        }
+
+                        it("closes") {
+                            expect(actionButton.buttonState).toEventually(equal(.closed))
+                        }
+                    }
                 }
 
                 context("and is opened animated with open image") {

diff --git a/Sources/JJFloatingActionButton+Animation.swift b/Sources/JJFloatingActionButton+Animation.swift
@@ -116,6 +116,18 @@ import UIKit
     }
 }
 
+internal extension JJFloatingActionButton {
+    func removeRelatedViewsFromSuperview() {
+        if overlayView.superview != nil {
+            overlayView.removeFromSuperview()
+        }
+
+        if itemContainerView.superview != nil {
+            itemContainerView.removeFromSuperview()
+        }
+    }
+}
+
 // MARK: - Animation State
 
 fileprivate extension JJFloatingActionButton {

diff --git a/Sources/JJFloatingActionButton.swift b/Sources/JJFloatingActionButton.swift
@@ -399,6 +399,16 @@ extension JJFloatingActionButton {
         updateDynamicConstraints()
         super.updateConstraints()
     }
+
+    /// Tells the view that its superview changed.
+    ///
+    public override func didMoveToSuperview() {
+        super.didMoveToSuperview()
+        if superview == nil {
+            close(animated: false)
+            removeRelatedViewsFromSuperview()
+        }
+    }
 }
 
 // MARK: - Setup