From 0a79457b94307f14bc4494f617ce09fab3505cdf Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Sun, 17 Mar 2019 00:39:58 +0100 Subject: Refactor Dialog component to the separate module. --- kvision-modules/kvision-dialog/build.gradle | 15 +++++ .../kvision-dialog/package.json.d/project.info | 3 + .../kotlin/pl/treksoft/kvision/modal/Dialog.kt | 76 ++++++++++++++++++++++ .../kotlin/pl/treksoft/kvision/modal/Dialog.kt | 76 ---------------------- 4 files changed, 94 insertions(+), 76 deletions(-) create mode 100644 kvision-modules/kvision-dialog/build.gradle create mode 100644 kvision-modules/kvision-dialog/package.json.d/project.info create mode 100644 kvision-modules/kvision-dialog/src/main/kotlin/pl/treksoft/kvision/modal/Dialog.kt delete mode 100644 src/main/kotlin/pl/treksoft/kvision/modal/Dialog.kt diff --git a/kvision-modules/kvision-dialog/build.gradle b/kvision-modules/kvision-dialog/build.gradle new file mode 100644 index 00000000..16c2720a --- /dev/null +++ b/kvision-modules/kvision-dialog/build.gradle @@ -0,0 +1,15 @@ +apply from: "../shared.gradle" + +dependencies { + compile "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion" +} + +kotlinFrontend { + + npm { + devDependency("karma", "3.1.4") + devDependency("karma-chrome-launcher", "2.2.0") + devDependency("qunit", "2.8.0") + } + +} diff --git a/kvision-modules/kvision-dialog/package.json.d/project.info b/kvision-modules/kvision-dialog/package.json.d/project.info new file mode 100644 index 00000000..416cd4a7 --- /dev/null +++ b/kvision-modules/kvision-dialog/package.json.d/project.info @@ -0,0 +1,3 @@ +{ + "description": "KVision Dialog module" +} diff --git a/kvision-modules/kvision-dialog/src/main/kotlin/pl/treksoft/kvision/modal/Dialog.kt b/kvision-modules/kvision-dialog/src/main/kotlin/pl/treksoft/kvision/modal/Dialog.kt new file mode 100644 index 00000000..e67a6f17 --- /dev/null +++ b/kvision-modules/kvision-dialog/src/main/kotlin/pl/treksoft/kvision/modal/Dialog.kt @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2017-present Robert Jaros + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package pl.treksoft.kvision.modal + +import kotlinx.coroutines.suspendCancellableCoroutine +import pl.treksoft.kvision.core.Widget +import kotlin.coroutines.resume + +/** + * Modal window with a result. + * + * @constructor + * @param caption window title + * @param closeButton determines if Close button is visible + * @param size modal window size + * @param animation determines if animations are used + * @param escape determines if dialog can be closed with Esc key + * @param classes a set of CSS class names + * @param init an initializer extension function + */ +open class Dialog( + caption: String? = null, closeButton: Boolean = true, + size: ModalSize? = null, animation: Boolean = true, escape: Boolean = true, + classes: Set = setOf(), init: (Dialog.() -> Unit)? = null +) : Modal(caption, closeButton, size, animation, escape, classes) { + + internal var resultCallback: ((R?) -> Unit)? = null + + init { + @Suppress("LeakingThis") + init?.invoke(this) + } + + /** + * A suspending function returning result value. + */ + suspend fun getResult(): R? = suspendCancellableCoroutine { cont -> + resultCallback = { result -> + resultCallback = null + hide() + cont.resume(result) + } + show() + } + + /** + * A function to be called with a result value. + */ + open fun setResult(result: R?) { + resultCallback?.invoke(result) + } + + override fun hide(): Widget { + resultCallback?.invoke(null) + return super.hide() + } +} diff --git a/src/main/kotlin/pl/treksoft/kvision/modal/Dialog.kt b/src/main/kotlin/pl/treksoft/kvision/modal/Dialog.kt deleted file mode 100644 index e67a6f17..00000000 --- a/src/main/kotlin/pl/treksoft/kvision/modal/Dialog.kt +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2017-present Robert Jaros - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package pl.treksoft.kvision.modal - -import kotlinx.coroutines.suspendCancellableCoroutine -import pl.treksoft.kvision.core.Widget -import kotlin.coroutines.resume - -/** - * Modal window with a result. - * - * @constructor - * @param caption window title - * @param closeButton determines if Close button is visible - * @param size modal window size - * @param animation determines if animations are used - * @param escape determines if dialog can be closed with Esc key - * @param classes a set of CSS class names - * @param init an initializer extension function - */ -open class Dialog( - caption: String? = null, closeButton: Boolean = true, - size: ModalSize? = null, animation: Boolean = true, escape: Boolean = true, - classes: Set = setOf(), init: (Dialog.() -> Unit)? = null -) : Modal(caption, closeButton, size, animation, escape, classes) { - - internal var resultCallback: ((R?) -> Unit)? = null - - init { - @Suppress("LeakingThis") - init?.invoke(this) - } - - /** - * A suspending function returning result value. - */ - suspend fun getResult(): R? = suspendCancellableCoroutine { cont -> - resultCallback = { result -> - resultCallback = null - hide() - cont.resume(result) - } - show() - } - - /** - * A function to be called with a result value. - */ - open fun setResult(result: R?) { - resultCallback?.invoke(result) - } - - override fun hide(): Widget { - resultCallback?.invoke(null) - return super.hide() - } -} -- cgit