Move DSL builder functions out of the companion objects (#93)

2 files changed, 33 insertions, 34 deletions

diff --git a/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/panel/ResponsiveGridPanel.kt b/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/panel/ResponsiveGridPanel.kt
index 4736a27a..ec4cbc29 100644
--- a/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/panel/ResponsiveGridPanel.kt
+++ b/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/panel/ResponsiveGridPanel.kt
@@ -165,21 +165,19 @@ open class ResponsiveGridPanel(
         children.forEach { it.dispose() }
         removeAll()
     }
+}
 
-    companion object {
-        /**
-         * DSL builder extension function.
-         *
-         * It takes the same parameters as the constructor of the built component.
-         */
-        fun Container.responsiveGridPanel(
-            gridSize: GridSize = GridSize.MD,
-            rows: Int = 0, cols: Int = 0, align: Align? = null,
-            classes: Set<String> = setOf(), init: (ResponsiveGridPanel.() -> Unit)? = null
-        ): ResponsiveGridPanel {
-            val responsiveGridPanel = ResponsiveGridPanel(gridSize, rows, cols, align, classes, init)
-            this.add(responsiveGridPanel)
-            return responsiveGridPanel
-        }
-    }
+/**
+ * DSL builder extension function.
+ *
+ * It takes the same parameters as the constructor of the built component.
+ */
+fun Container.responsiveGridPanel(
+    gridSize: GridSize = GridSize.MD,
+    rows: Int = 0, cols: Int = 0, align: Align? = null,
+    classes: Set<String> = setOf(), init: (ResponsiveGridPanel.() -> Unit)? = null
+): ResponsiveGridPanel {
+    val responsiveGridPanel = ResponsiveGridPanel(gridSize, rows, cols, align, classes, init)
+    this.add(responsiveGridPanel)
+    return responsiveGridPanel
 }
diff --git a/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/panel/TabPanel.kt b/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/panel/TabPanel.kt
index 2009e4fc..de8d60e8 100644
--- a/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/panel/TabPanel.kt
+++ b/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/panel/TabPanel.kt
@@ -26,12 +26,12 @@ import pl.treksoft.kvision.core.Container
 import pl.treksoft.kvision.core.ResString
 import pl.treksoft.kvision.core.WidgetWrapper
 import pl.treksoft.kvision.html.Icon
-import pl.treksoft.kvision.html.Link.Companion.link
 import pl.treksoft.kvision.html.TAG
 import pl.treksoft.kvision.html.Tag
+import pl.treksoft.kvision.html.link
 import pl.treksoft.kvision.routing.routing
 import pl.treksoft.kvision.utils.obj
-import pl.treksoft.kvision.html.Icon.Companion.icon as cicon
+import pl.treksoft.kvision.html.icon as cicon
 
 /**
  * Tab position.
@@ -253,21 +253,22 @@ open class TabPanel(
 
     companion object {
         internal var counter = 0
-        /**
-         * DSL builder extension function.
-         *
-         * It takes the same parameters as the constructor of the built component.
-         */
-        fun Container.tabPanel(
-            tabPosition: TabPosition = TabPosition.TOP,
-            sideTabSize: SideTabSize = SideTabSize.SIZE_3,
-            scrollableTabs: Boolean = false,
-            classes: Set<String> = setOf(),
-            init: (TabPanel.() -> Unit)? = null
-        ): TabPanel {
-            val tabPanel = TabPanel(tabPosition, sideTabSize, scrollableTabs, classes, init)
-            this.add(tabPanel)
-            return tabPanel
-        }
     }
 }
+
+/**
+ * DSL builder extension function.
+ *
+ * It takes the same parameters as the constructor of the built component.
+ */
+fun Container.tabPanel(
+    tabPosition: TabPosition = TabPosition.TOP,
+    sideTabSize: SideTabSize = SideTabSize.SIZE_3,
+    scrollableTabs: Boolean = false,
+    classes: Set<String> = setOf(),
+    init: (TabPanel.() -> Unit)? = null
+): TabPanel {
+    val tabPanel = TabPanel(tabPosition, sideTabSize, scrollableTabs, classes, init)
+    this.add(tabPanel)
+    return tabPanel
+}