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

1 files changed, 26 insertions, 28 deletions

diff --git a/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/progress/ProgressBar.kt b/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/progress/ProgressBar.kt
index 4d0f4b93..45ea316c 100644
--- a/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/progress/ProgressBar.kt
+++ b/kvision-modules/kvision-bootstrap/src/main/kotlin/pl/treksoft/kvision/progress/ProgressBar.kt
@@ -130,33 +130,31 @@ open class ProgressBar(
         @Suppress("LeakingThis")
         init?.invoke(this)
     }
+}
 
-    companion object {
-        /**
-         * DSL builder extension function.
-         *
-         * It takes the same parameters as the constructor of the built component.
-         */
-        fun Container.progressBar(
-            progress: Int, min: Int = DEFAULT_MIN, max: Int = DEFAULT_MAX, style: ProgressBarStyle? = null,
-            striped: Boolean = false, animated: Boolean = false,
-            content: String? = null, rich: Boolean = false, align: Align? = null,
-            classes: Set<String> = setOf(), init: (ProgressBar.() -> Unit)? = null
-        ): ProgressBar {
-            val progressBar = ProgressBar(
-                progress,
-                min,
-                max,
-                style,
-                striped,
-                animated,
-                content,
-                rich,
-                align,
-                classes
-            ).apply { init?.invoke(this) }
-            this.add(progressBar)
-            return progressBar
-        }
-    }
+/**
+ * DSL builder extension function.
+ *
+ * It takes the same parameters as the constructor of the built component.
+ */
+fun Container.progressBar(
+    progress: Int, min: Int = DEFAULT_MIN, max: Int = DEFAULT_MAX, style: ProgressBarStyle? = null,
+    striped: Boolean = false, animated: Boolean = false,
+    content: String? = null, rich: Boolean = false, align: Align? = null,
+    classes: Set<String> = setOf(), init: (ProgressBar.() -> Unit)? = null
+): ProgressBar {
+    val progressBar = ProgressBar(
+        progress,
+        min,
+        max,
+        style,
+        striped,
+        animated,
+        content,
+        rich,
+        align,
+        classes
+    ).apply { init?.invoke(this) }
+    this.add(progressBar)
+    return progressBar
 }