Merge pull request #602 from baaahs/concrete-view

Make View, Icon, and DialogHolder non-MP common interfaces
baaahs · Jul 26, 2024 · 70e0f21 · 70e0f21
2 parents 7d5fe89 + 624bfab
commit 70e0f21
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 64 deletions.
diff --git a/src/commonMain/kotlin/baaahs/ui/View.kt b/src/commonMain/kotlin/baaahs/ui/View.kt
@@ -1,10 +1,10 @@
 package baaahs.ui
 
-expect interface View
+interface View
 
-expect interface Icon
+interface Icon
 
-expect interface DialogHolder {
+interface DialogHolder {
     fun showDialog(view: View)
     fun showMenuDialog(title: String, options: List<DialogMenuItem>)
     fun closeDialog()

diff --git a/src/jsMain/kotlin/baaahs/app/ui/CommonIcons.kt b/src/jsMain/kotlin/baaahs/app/ui/CommonIcons.kt
@@ -42,5 +42,7 @@ actual fun getCommonIcons() = object : PlatformIcons {
 fun jsIcon(materialIcon: SvgIconComponent): Icon = JsIcon(materialIcon)
 
 private class JsIcon(private val icon: SvgIconComponent) : Icon {
-    override fun getReactIcon(): SvgIconComponent = icon
-}
+    fun getReactIcon(): SvgIconComponent = icon
+}
+
+fun Icon.getReactIcon(): SvgIconComponent = (this as JsIcon).getReactIcon()
diff --git a/src/jsMain/kotlin/baaahs/app/ui/controls/ControlWrapperView.kt b/src/jsMain/kotlin/baaahs/app/ui/controls/ControlWrapperView.kt
@@ -3,10 +3,7 @@ package baaahs.app.ui.controls
 import baaahs.app.ui.appContext
 import baaahs.show.live.ControlProps
 import baaahs.show.live.OpenControl
-import baaahs.ui.className
-import baaahs.ui.unaryMinus
-import baaahs.ui.unaryPlus
-import baaahs.ui.xComponent
+import baaahs.ui.*
 import js.objects.jso
 import materialui.icon
 import mui.material.Card
@@ -30,9 +27,8 @@ private val ControlWrapper = xComponent<ControlWrapperProps>("Control") { props
 
     Card {
         attrs.classes = jso { root = props.className?.className ?: -Styles.controlBox }
-        with (props.control.getView(props.controlProps)) {
-            render()
-        }
+        props.control.getView(props.controlProps)
+            .render(this)
 
         problemBadge(control)
 

diff --git a/src/jsMain/kotlin/baaahs/app/ui/controls/ImagePickerView.kt b/src/jsMain/kotlin/baaahs/app/ui/controls/ImagePickerView.kt
@@ -5,6 +5,7 @@ import baaahs.Gadget
 import baaahs.app.ui.CommonIcons
 import baaahs.app.ui.appContext
 import baaahs.app.ui.document.fileUpload
+import baaahs.app.ui.getReactIcon
 import baaahs.doc.FileType
 import baaahs.encodeBase64
 import baaahs.gadgets.ImagePicker

diff --git a/src/jsMain/kotlin/baaahs/app/ui/dialog/DialogPanelsView.kt b/src/jsMain/kotlin/baaahs/app/ui/dialog/DialogPanelsView.kt
@@ -92,7 +92,7 @@ private val DialogPanelsView = xComponent<DialogPanelsProps>("DialogPanels") { p
                 ErrorBoundary {
                     attrs.FallbackComponent = ErrorDisplay
 
-                    with (panelView) { render() }
+                    panelView.render(this)
                 }
             }
         }

diff --git a/src/jsMain/kotlin/baaahs/app/ui/document/DocumentMenuView.kt b/src/jsMain/kotlin/baaahs/app/ui/document/DocumentMenuView.kt
@@ -28,7 +28,7 @@ private val DocumentMenuView = xComponent<DocumentMenuProps>("DocumentMenu") { p
             documentManager.onNew(object : DialogHolder {
                 override fun showDialog(view: View) {
                     renderDialog = {
-                        with(view) { render() }
+                        view.render(this)
                     }
                 }
 

diff --git a/src/jsMain/kotlin/baaahs/app/ui/editor/EditableManagerUiView.kt b/src/jsMain/kotlin/baaahs/app/ui/editor/EditableManagerUiView.kt
@@ -98,7 +98,7 @@ private val EditableManagerUi = xComponent<EditableManagerUiProps>("EditableMana
                             val classes = +styles.singlePanel and
                                     if (dialogPanel.noMargin) styles.singlePanelNoMargin else null
                             div(classes) {
-                                with (dialogPanel.getView()) { render() }
+                                dialogPanel.getView().render(this)
                             }
                         }
                     } else {

diff --git a/src/jsMain/kotlin/baaahs/app/ui/editor/EditorPanels.kt b/src/jsMain/kotlin/baaahs/app/ui/editor/EditorPanels.kt
@@ -9,6 +9,7 @@ import baaahs.model.ModelUnit
 import baaahs.scene.MutableScene
 import baaahs.show.mutable.*
 import baaahs.ui.View
+import baaahs.ui.render
 import baaahs.ui.renderWrapper
 import baaahs.ui.unaryPlus
 import mui.material.Divider
@@ -27,7 +28,7 @@ actual fun getEditorPanelViews(): EditorPanelViews = object : EditorPanelViews {
     ): View = renderWrapper {
         val mutablePatch = mutablePatchHolder.patches[0]
         val editorPanel = mutablePatch.getEditorPanel(editableManager)
-        with (editorPanel.getView()) { render() }
+        editorPanel.getView().render(this)
     }
 
     override fun forGenericPropertiesPanel(
@@ -41,9 +42,8 @@ actual fun getEditorPanelViews(): EditorPanelViews = object : EditorPanelViews {
                 }
             }
 
-            with(editorPanelComponent.getView(editableManager)) {
-                render()
-            }
+            editorPanelComponent.getView(editableManager)
+                .render(this)
         }
     }
 

diff --git a/src/jsMain/kotlin/baaahs/app/ui/layout/GridItemView.kt b/src/jsMain/kotlin/baaahs/app/ui/layout/GridItemView.kt
@@ -6,6 +6,7 @@ import baaahs.show.live.ControlProps
 import baaahs.show.live.OpenControl
 import baaahs.show.mutable.MutableShow
 import baaahs.ui.and
+import baaahs.ui.render
 import baaahs.ui.unaryPlus
 import baaahs.ui.xComponent
 import materialui.icon
@@ -44,9 +45,8 @@ private val GridItemView = xComponent<GridItemProps>("GridItem") { props ->
         event.preventDefault()
     }
 
-    with (control.getView(props.controlProps)) {
-        render()
-    }
+    control.getView(props.controlProps)
+        .render(this)
 
     problemBadge(control)
 

diff --git a/src/jsMain/kotlin/baaahs/app/ui/model/ModelEditorView.kt b/src/jsMain/kotlin/baaahs/app/ui/model/ModelEditorView.kt
@@ -152,7 +152,7 @@ private val ModelEditorView = xComponent<ModelEditorProps>("ModelEditor") { prop
                             attrs.margin = FormControlMargin.dense
 
                             editingEntity.getEditorPanelViews().forEach {
-                                with(it) { render() }
+                                it.render(this)
                             }
 
                             header { +"Actions" }

diff --git a/src/jsMain/kotlin/baaahs/app/ui/patchmod/PatchModView.kt b/src/jsMain/kotlin/baaahs/app/ui/patchmod/PatchModView.kt
@@ -5,10 +5,7 @@ import baaahs.app.ui.controls.Styles
 import baaahs.app.ui.shaderPreview
 import baaahs.show.live.ControlProps
 import baaahs.show.live.OpenPatchHolder
-import baaahs.ui.asTextNode
-import baaahs.ui.unaryMinus
-import baaahs.ui.unaryPlus
-import baaahs.ui.xComponent
+import baaahs.ui.*
 import js.objects.jso
 import mui.material.*
 import react.*
@@ -75,9 +72,8 @@ private val PatchModView = xComponent<PatchModProps>("PatchMod") { props ->
                     attrs.noSharedGlContext = true
                 }
 
-                selectedPatchMod?.let {
-                    with(it.getView(selectedPatch)) { render() }
-                }
+                selectedPatchMod?.getView(selectedPatch)
+                    ?.render(this)
             }
 
             div(+styles.controls) {
@@ -87,9 +83,8 @@ private val PatchModView = xComponent<PatchModProps>("PatchMod") { props ->
                     if (incomingFeeds.intersect(control.controlledFeeds()).isNotEmpty()) {
                         Card {
                             attrs.classes = jso { root = -Styles.controlBox }
-                            with(control.getView(ControlProps(null, null, null))) {
-                                render()
-                            }
+                            control.getView(ControlProps(null, null, null))
+                                .render(this)
                         }
                     }
                 }

diff --git a/src/jsMain/kotlin/baaahs/mapper/ControllerConfigEditorView.kt b/src/jsMain/kotlin/baaahs/mapper/ControllerConfigEditorView.kt
@@ -7,6 +7,7 @@ import baaahs.scene.EditingController
 import baaahs.scene.FixtureMappingData
 import baaahs.scene.MutableFixtureMapping
 import baaahs.scene.MutableScene
+import baaahs.ui.render
 import baaahs.ui.typographyH5
 import baaahs.ui.unaryMinus
 import baaahs.ui.xComponent
@@ -55,7 +56,7 @@ private val ControllerConfigEditorView = xComponent<ControllerConfigEditorProps>
     }
 
     editingController.getEditorPanelViews().forEach {
-        with(it) { render() }
+        it.render(this)
     }
 
     Card {

diff --git a/src/jsMain/kotlin/baaahs/mapper/FixtureConfigPickerView.kt b/src/jsMain/kotlin/baaahs/mapper/FixtureConfigPickerView.kt
@@ -6,6 +6,7 @@ import baaahs.device.FixtureType
 import baaahs.scene.EditingController
 import baaahs.scene.MutableFixtureOptions
 import baaahs.ui.asTextNode
+import baaahs.ui.render
 import baaahs.ui.unaryMinus
 import baaahs.ui.xComponent
 import js.objects.jso
@@ -43,7 +44,8 @@ private val FixtureConfigPickerView = xComponent<FixtureConfigPickerProps>("Fixt
         if (fixtureConfig != null) {
             Card {
                 attrs.classes = jso { this.root = -styles.configCardInner }
-                with(fixtureConfig.getEditorView(props.editingController)) { render() }
+                fixtureConfig.getEditorView(props.editingController)
+                    .render(this)
             }
         }
     }

diff --git a/src/jsMain/kotlin/baaahs/mapper/TransportConfigPickerView.kt b/src/jsMain/kotlin/baaahs/mapper/TransportConfigPickerView.kt
@@ -7,6 +7,7 @@ import baaahs.fixtures.TransportType
 import baaahs.scene.EditingController
 import baaahs.scene.MutableTransportConfig
 import baaahs.ui.asTextNode
+import baaahs.ui.render
 import baaahs.ui.unaryMinus
 import baaahs.ui.xComponent
 import js.objects.jso
@@ -44,7 +45,8 @@ private val TransportConfigPickerView = xComponent<TransportConfigPickerProps>("
         if (transportConfig != null) {
             Card {
                 attrs.classes = jso { this.root = -styles.configCardInner }
-                with(transportConfig.getEditorView(props.editingController)) { render() }
+                transportConfig.getEditorView(props.editingController)
+                    .render(this)
             }
         }
     }

diff --git a/src/jsMain/kotlin/baaahs/ui/DialogHolder.kt b/src/jsMain/kotlin/baaahs/ui/DialogHolder.kt
@@ -2,16 +2,10 @@ package baaahs.ui
 
 import react.RBuilder
 
-actual interface DialogHolder {
-    actual fun showDialog(view: View)
-    actual fun showMenuDialog(title: String, options: List<DialogMenuItem>)
-    actual fun closeDialog()
-
-    fun showDialog(block: RBuilder.() -> Unit) {
-        showDialog(object : View {
-            override fun RBuilder.render() {
-                block()
-            }
-        })
-    }
+fun DialogHolder.showDialog(block: RBuilder.() -> Unit) {
+    showDialog(object : JsView {
+        override fun RBuilder.render() {
+            block()
+        }
+    })
 }
diff --git a/src/jsMain/kotlin/baaahs/ui/View.kt b/src/jsMain/kotlin/baaahs/ui/View.kt
@@ -1,15 +1,13 @@
 package baaahs.ui
 
 import kotlinx.browser.window
-import mui.icons.material.SvgIconComponent
 import react.RBuilder
 
-actual interface View {
+interface JsView : View {
     fun RBuilder.render()
 }
-
-actual interface Icon {
-    fun getReactIcon(): SvgIconComponent
+fun View.render(rBuilder: RBuilder) = with (this as JsView) {
+    rBuilder.render()
 }
 
 actual fun confirm(message: String): Boolean =

diff --git a/src/jsMain/kotlin/baaahs/ui/util.kt b/src/jsMain/kotlin/baaahs/ui/util.kt
@@ -222,7 +222,7 @@ fun LinearDimension.inPixels(): Int {
 }
 
 fun renderWrapper(block: RBuilder.() -> Unit): View {
-    return object : View {
+    return object : JsView {
         override fun RBuilder.render() {
             block()
         }

diff --git a/src/jsMain/kotlin/materialui/types.kt b/src/jsMain/kotlin/materialui/types.kt
@@ -1,5 +1,6 @@
 package materialui
 
+import baaahs.app.ui.getReactIcon
 import baaahs.ui.Icon
 import mui.icons.material.SvgIconComponent
 import mui.material.SvgIconProps

diff --git a/src/jvmMain/kotlin/baaahs/ui/View.kt b/src/jvmMain/kotlin/baaahs/ui/View.kt
@@ -1,13 +1,3 @@
 package baaahs.ui
 
-actual interface View
-
-actual interface Icon
-
-actual interface DialogHolder {
-    actual fun showDialog(view: View)
-    actual fun showMenuDialog(title: String, options: List<DialogMenuItem>)
-    actual fun closeDialog()
-}
-
 actual fun confirm(message: String): Boolean = TODO("confirm not implemented")