Merge pull request #338 from clappr/feature/render_mediacontrol_order

Render plugins order
clappr · Aug 20, 2019 · 7f515d3 · 7f515d3
2 parents c0852d5 + d39fbdd
commit 7f515d3
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/Sources/Clappr/Classes/Base/Core.swift b/Sources/Clappr/Classes/Base/Core.swift
@@ -162,12 +162,14 @@ open class Core: UIObject, UIGestureRecognizerDelegate {
 
     fileprivate func addToContainer() {
         #if os(iOS)
-        renderCorePlugins()
-        renderMediaControlElements()
         if shouldEnterInFullScreen {
+            renderCorePlugins()
+            renderMediaControlElements()
             fullscreenHandler?.enterInFullscreen()
         } else {
             renderInContainerView()
+            renderCorePlugins()
+            renderMediaControlElements()
         }
         #else
         renderInContainerView()

diff --git a/Tests/Clappr_Tests/Classes/Plugins/Core/MediaControl/MediaControlTests.swift b/Tests/Clappr_Tests/Classes/Plugins/Core/MediaControl/MediaControlTests.swift
@@ -520,6 +520,8 @@ class MediaControlElementMock: MediaControl.Element {
         if MediaControlElementMock.crashOnRender {
             codeThatCrashes()
         }
+
+        trigger("render")
     }
 
     static func reset() {

diff --git a/Tests/Clappr_Tests/CoreTests.swift b/Tests/Clappr_Tests/CoreTests.swift
@@ -693,7 +693,7 @@ class CoreTests: QuickSpec {
                 }
 
                 #if os(iOS)
-                it("doesnt add plugin as subview if it is a MediaControlPlugin") {
+                it("doesnt add plugin as subview if it is a MediaControlElement") {
                     let core = Core()
                     let plugin = MediaControlElementMock(context: core)
 
@@ -702,8 +702,31 @@ class CoreTests: QuickSpec {
 
                     expect(plugin.view.superview).to(beNil())
                 }
+
+                it("renders MediaControlElements after CorePlugins") {
+                    let core = Core()
+                    let mediaControl = MediaControl(context: core)
+                    let element = MediaControlElementMock(context: core)
+                    let plugin = UICorePluginMock(context: core)
+
+                    var renderingOrder: [String] = []
+                    element.on("render") { _ in
+                        renderingOrder.append("element")
+                    }
+
+                    plugin.on("render") { _ in
+                        renderingOrder.append("plugin")
+                    }
+
+                    core.addPlugin(mediaControl)
+                    core.addPlugin(element)
+                    core.addPlugin(plugin)
+                    core.render()
+
+                    expect(renderingOrder).toEventually(equal(["plugin", "element"]))
+                }
 
-                it("calls the mediacontrol to add the plugins into the panels") {
+                it("calls the mediacontrol to add the elements into the panels") {
                     let core = CoreFactory.create(with: [:])
                     let mediaControlMock = MediaControlMock(context: core)
                     let mediaControlPluginMock = MediaControlElementMock(context: core)
@@ -773,13 +796,16 @@ class UICorePluginMock: UICorePlugin {
     override class var name: String {
         return "UICorePluginMock"
     }
+
 
     override func render() {
         UICorePluginMock.didCallRender = true
 
         if UICorePluginMock.crashOnRender {
             codeThatCrashes()
         }
+
+        trigger("render")
     }
 
     override func bindEvents() {  }
@@ -805,7 +831,6 @@ class CorePluginMock: CorePlugin {
     override class var name: String {
         return "CorePluginMock"
     }
-
 }
 
 #if os(iOS)