From 53b020ab8d5d4ca6a5b948bcae31c6d2fa55bdf8 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Thu, 19 May 2022 18:56:52 +0600
Subject: [PATCH] improve AttrsWithContentBuilder functions

---
 .../jsuikit/utils/AttrsWithContentBuilder.kt    | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttrsWithContentBuilder.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttrsWithContentBuilder.kt
index 77603ea..f96a0b4 100644
--- a/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttrsWithContentBuilder.kt
+++ b/src/jsMain/kotlin/dev/inmo/jsuikit/utils/AttrsWithContentBuilder.kt
@@ -8,8 +8,12 @@ import org.w3c.dom.Element
 typealias AttrsWithContentBuilder<T> = Pair<Attrs<T>, ContentBuilder<T>>
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <T : Element> AttrsWithContentBuilder(noinline builder: ContentBuilder<T>) = AttrsWithContentBuilder(
-    Attrs.empty(),
+inline fun <T : Element> AttrsWithContentBuilder(
+    vararg modifiers: UIKitModifier?,
+    noinline attrs: AttrsScope<T>.() -> Unit = {},
+    noinline builder: ContentBuilder<T>
+) = AttrsWithContentBuilder(
+    Attrs(*modifiers, attrs = attrs),
     builder
 )
 
@@ -18,15 +22,6 @@ inline fun <T : Element> AttrsWithContentBuilder(attrs: Attrs<T>) = AttrsWithCon
     attrs
 ) {}
 
-@Suppress("NOTHING_TO_INLINE")
-inline fun <T : Element> AttrsWithContentBuilder(
-    modifier: UIKitModifier?,
-    vararg modifiers: UIKitModifier?,
-    noinline attrs: AttrsScope<T>.() -> Unit = {}
-) = AttrsWithContentBuilder(
-    Attrs(modifier, *modifiers, attrs = attrs)
-)
-
 inline val <T : Element> AttrsWithContentBuilder<T>.attrs
     get() = first