From c4d5fcfc220d97b943ca785450180747ed86b4be Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 27 May 2022 02:37:14 +0600 Subject: [PATCH 1/5] start 0.10.6 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c1a5c44c16..0c7fab0e763 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.10.6 + ## 0.10.5 * `Versions` diff --git a/gradle.properties b/gradle.properties index 78315d96420..4f3849b811c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,5 +14,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.10.5 -android_code_version=120 +version=0.10.6 +android_code_version=121 From 65bdab4f7e167bcd8337ddcdf4e056ef57511448 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 27 May 2022 02:37:58 +0600 Subject: [PATCH 2/5] ResizeObserver --- CHANGELOG.md | 4 ++ .../inmo/micro_utils/common/ResizeObserver.kt | 56 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ResizeObserver.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c7fab0e763..4f93341a450 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 0.10.6 +* `Common` + * `JS`: + * Add `ResizeObserver` functionality + ## 0.10.5 * `Versions` diff --git a/common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ResizeObserver.kt b/common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ResizeObserver.kt new file mode 100644 index 00000000000..f35eb20ff58 --- /dev/null +++ b/common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ResizeObserver.kt @@ -0,0 +1,56 @@ +package dev.inmo.micro_utils.common + +import org.w3c.dom.* +import kotlin.js.Json +import kotlin.js.json + +external class ResizeObserver( + callback: (Array, ResizeObserver) -> Unit +) { + fun observe(target: Element, options: Json = definedExternally) + + fun unobserve(target: Element) + + fun disconnect() +} + +external class ResizeObserverEntry { + val borderBoxSize: Int? + val contentBoxSize: Int? + val devicePixelContentBoxSize: Int? + val contentRect: DOMRectReadOnly +} + +fun ResizeObserverEntry.sizeOrThrow(): Int { + return contentBoxSize ?: borderBoxSize ?: devicePixelContentBoxSize ?: error("Unable to find default size in entry $this") +} + +fun ResizeObserver.observe(target: Element, options: ResizeObserverObserveOptions) = observe( + target, + json( + "box" to options.box ?.name + ) +) + +class ResizeObserverObserveOptions( + val box: Box? = null +) { + sealed interface Box { + val name: String + + object Content : Box { + override val name: String + get() = "content-box" + } + + object Border : Box { + override val name: String + get() = "border-box" + } + + object DevicePixelContent : Box { + override val name: String + get() = "device-pixel-content-box" + } + } +} From 6f9c19bbf638f9720cdcb08d6b2164b0990bd143 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 27 May 2022 11:39:09 +0600 Subject: [PATCH 3/5] fixes in ResizeObserver --- .../inmo/micro_utils/common/ResizeObserver.kt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ResizeObserver.kt b/common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ResizeObserver.kt index f35eb20ff58..ec1086aee67 100644 --- a/common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ResizeObserver.kt +++ b/common/src/jsMain/kotlin/dev/inmo/micro_utils/common/ResizeObserver.kt @@ -14,15 +14,17 @@ external class ResizeObserver( fun disconnect() } -external class ResizeObserverEntry { - val borderBoxSize: Int? - val contentBoxSize: Int? - val devicePixelContentBoxSize: Int? - val contentRect: DOMRectReadOnly +external interface ResizeObserverSize { + val blockSize: Float + val inlineSize: Float } -fun ResizeObserverEntry.sizeOrThrow(): Int { - return contentBoxSize ?: borderBoxSize ?: devicePixelContentBoxSize ?: error("Unable to find default size in entry $this") +external interface ResizeObserverEntry { + val borderBoxSize: Array + val contentBoxSize: Array + val devicePixelContentBoxSize: Array + val contentRect: DOMRectReadOnly + val target: Element } fun ResizeObserver.observe(target: Element, options: ResizeObserverObserveOptions) = observe( From 195fe221c4b0aae2c8cc60e4371f315308c58016 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 28 May 2022 00:25:59 +0600 Subject: [PATCH 4/5] Update libs.versions.toml --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 665ff4cc98c..0d9b4e0780a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kt = "1.6.21" kt-serialization = "1.3.3" -kt-coroutines = "1.6.1" +kt-coroutines = "1.6.2" jb-compose = "1.2.0-alpha01-dev686" jb-exposed = "0.38.2" @@ -11,7 +11,7 @@ jb-dokka = "1.6.21" klock = "2.7.0" uuid = "0.4.0" -ktor = "2.0.1" +ktor = "2.0.2" gh-release = "2.3.7" From 187e84ad653f92bb6af6a3679b5b8361231565e8 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 28 May 2022 09:45:18 +0600 Subject: [PATCH 5/5] fill changelog and downgrade coroutines --- CHANGELOG.md | 2 ++ gradle/libs.versions.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f93341a450..e3d29fa5c48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.10.6 +* `Versions` + * `Ktor`: `2.0.1` -> `2.0.2` * `Common` * `JS`: * Add `ResizeObserver` functionality diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0d9b4e0780a..145cf936447 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kt = "1.6.21" kt-serialization = "1.3.3" -kt-coroutines = "1.6.2" +kt-coroutines = "1.6.1" jb-compose = "1.2.0-alpha01-dev686" jb-exposed = "0.38.2"