From 8553059dff2574ad4b6f1ab75f626c6207054b6c Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Fri, 26 Feb 2021 00:27:20 +0100
Subject: [PATCH] Return always the main component from the main default frame

---
 src/dom_components/index.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/dom_components/index.js b/src/dom_components/index.js
index b29e395f2..1fe2818c2 100644
--- a/src/dom_components/index.js
+++ b/src/dom_components/index.js
@@ -228,8 +228,6 @@ export default () => {
         c.components = em.config.components || c.components;
       }
 
-      if (em.get('hasPages')) c.components = '';
-
       for (var name in defaults) {
         if (!(name in c)) c[name] = defaults[name];
       }
@@ -253,6 +251,11 @@ export default () => {
         );
       }
 
+      if (em.get('hasPages')) {
+        c.components = '';
+        return this;
+      }
+
       // Build wrapper
       let components = c.components;
       let wrapper = { ...c.wrapper };
@@ -298,7 +301,7 @@ export default () => {
      * @private
      */
     onLoad() {
-      this.setComponents(c.components);
+      c.components && this.setComponents(c.components);
     },
 
     /**
@@ -450,7 +453,11 @@ export default () => {
      * @private
      */
     getComponent() {
-      return component;
+      return this.em
+        .get('PageManager')
+        .getSelected()
+        .getMainFrame()
+        .getComponents();
     },
 
     /**