kscience/visionforge
8
1
Fork 1
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Fix markup plugin.

Browse Source
This commit is contained in:
Alexander Nozik 2023-05-30 17:55:35 +03:00
parent d32dc3fa08
commit c4b866f5b5
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
visionforge-core/src/commonMain/kotlin/space/kscience/visionforge/useProperty.kt
View File

@ -13,20 +13,20 @@ import kotlin.reflect.KProperty1
/** /**
* Call [callBack] on initial value of the property and then on all subsequent values after change * Call [callback] on initial value of the property and then on all subsequent values after change
*/ */
public fun Vision.useProperty( public fun Vision.useProperty(
propertyName: Name, propertyName: Name,
inherit: Boolean? = null, inherit: Boolean? = null,
includeStyles: Boolean? = null, includeStyles: Boolean? = null,
scope: CoroutineScope? = manager?.context, scope: CoroutineScope? = manager?.context,
callBack: (Meta) -> Unit, callback: (Meta) -> Unit,
): Job { ): Job {
//Pass initial value. //Pass initial value.
callBack(properties.getProperty(propertyName, inherit, includeStyles)) callback(properties.getProperty(propertyName, inherit, includeStyles))
return properties.changes.onEach { name -> return properties.changes.onEach { name ->
if (name.startsWith(propertyName)) { if (name.startsWith(propertyName)) {
callBack(properties.getProperty(propertyName, inherit, includeStyles)) callback(properties.getProperty(propertyName, inherit, includeStyles))
} }
}.launchIn(scope ?: error("Orphan Vision can't observe properties")) }.launchIn(scope ?: error("Orphan Vision can't observe properties"))
} }
@ -36,19 +36,19 @@ public fun Vision.useProperty(
inherit: Boolean? = null, inherit: Boolean? = null,
includeStyles: Boolean? = null, includeStyles: Boolean? = null,
scope: CoroutineScope? = manager?.context, scope: CoroutineScope? = manager?.context,
callBack: (Meta) -> Unit, callback: (Meta) -> Unit,
): Job = useProperty(propertyName.parseAsName(), inherit, includeStyles, scope, callBack) ): Job = useProperty(propertyName.parseAsName(), inherit, includeStyles, scope, callback)
public fun <V : Vision, T> V.useProperty( public fun <V : Vision, T> V.useProperty(
property: KProperty1<V, T>, property: KProperty1<V, T>,
scope: CoroutineScope? = manager?.context, scope: CoroutineScope? = manager?.context,
callBack: V.(T) -> Unit, callback: V.(T) -> Unit,
): Job { ): Job {
//Pass initial value. //Pass initial value.
callBack(property.get(this)) callback(property.get(this))
return properties.changes.onEach { name -> return properties.changes.onEach { name ->
if (name.startsWith(property.name.asName())) { if (name.startsWith(property.name.asName())) {
callBack(property.get(this@useProperty)) callback(property.get(this@useProperty))
} }
}.launchIn(scope ?: error("Orphan Vision can't observe properties")) }.launchIn(scope ?: error("Orphan Vision can't observe properties"))
} }

8
visionforge-markdown/src/jsMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt
View File

@ -12,6 +12,7 @@ import space.kscience.dataforge.context.PluginFactory
import space.kscience.dataforge.context.PluginTag import space.kscience.dataforge.context.PluginTag
import space.kscience.dataforge.meta.Meta import space.kscience.dataforge.meta.Meta
import space.kscience.dataforge.names.Name import space.kscience.dataforge.names.Name
import space.kscience.dataforge.names.asName
import space.kscience.visionforge.* import space.kscience.visionforge.*
import space.kscience.visionforge.markup.VisionOfMarkup.Companion.COMMONMARK_FORMAT import space.kscience.visionforge.markup.VisionOfMarkup.Companion.COMMONMARK_FORMAT
import space.kscience.visionforge.markup.VisionOfMarkup.Companion.GFM_FORMAT import space.kscience.visionforge.markup.VisionOfMarkup.Companion.GFM_FORMAT
@ -44,8 +45,13 @@ public actual class MarkupPlugin : VisionPlugin(), ElementVisionRenderer {
element.append(div) element.append(div)
} }
override fun content(target: String): Map<Name, Any> = when (target) {
ElementVisionRenderer.TYPE -> mapOf("markup".asName() to this)
else -> super.content(target)
}
public actual companion object : PluginFactory<MarkupPlugin> { public actual companion object : PluginFactory<MarkupPlugin> {
override val tag: PluginTag = PluginTag("vision.markup", PluginTag.DATAFORGE_GROUP) override val tag: PluginTag = PluginTag("vision.markup.js", PluginTag.DATAFORGE_GROUP)
override fun build(context: Context, meta: Meta): MarkupPlugin = MarkupPlugin() override fun build(context: Context, meta: Meta): MarkupPlugin = MarkupPlugin()

2
visionforge-markdown/src/jvmMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt
View File

@ -14,7 +14,7 @@ public actual class MarkupPlugin : VisionPlugin() {
override val tag: PluginTag get() = Companion.tag override val tag: PluginTag get() = Companion.tag
public actual companion object : PluginFactory<MarkupPlugin> { public actual companion object : PluginFactory<MarkupPlugin> {
override val tag: PluginTag = PluginTag("vision.markup", PluginTag.DATAFORGE_GROUP) override val tag: PluginTag = PluginTag("vision.markup.jvm", PluginTag.DATAFORGE_GROUP)
override fun build(context: Context, meta: Meta): MarkupPlugin = MarkupPlugin() override fun build(context: Context, meta: Meta): MarkupPlugin = MarkupPlugin()