From 02630b333b6a53d20f821b9dc5373ada6988f30f Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Wed, 6 May 2020 23:26:15 +0200 Subject: Add root panel container types from Bootstrap 4.4. Deprecate current root panel builder functions and constructors. --- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../kvision/form/time/DateTimeInputSpec.kt | 2 +- .../pl/treksoft/kvision/form/time/DateTimeSpec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../kvision/form/select/SelectInputSpec.kt | 2 +- .../kvision/form/select/SelectOptGroupSpec.kt | 2 +- .../kvision/form/select/SelectOptionSpec.kt | 2 +- .../pl/treksoft/kvision/form/select/SelectSpec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../kvision/form/spinner/SpinnerInputSpec.kt | 6 +- .../treksoft/kvision/form/spinner/SpinnerSpec.kt | 6 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../kvision/form/text/TypeaheadInputSpec.kt | 2 +- .../pl/treksoft/kvision/form/text/TypeaheadSpec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../kvision/form/upload/UploadInputSpec.kt | 2 +- .../pl/treksoft/kvision/form/upload/UploadSpec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../treksoft/kvision/dropdown/ContextMenuSpec.kt | 4 +- .../pl/treksoft/kvision/dropdown/DropDownSpec.kt | 12 +- .../pl/treksoft/kvision/dropdown/HeaderSpec.kt | 2 +- .../pl/treksoft/kvision/dropdown/SeparatorSpec.kt | 2 +- .../test/pl/treksoft/kvision/modal/AlertSpec.kt | 2 +- .../pl/treksoft/kvision/modal/CloseIconSpec.kt | 2 +- .../test/pl/treksoft/kvision/modal/ConfirmSpec.kt | 2 +- .../test/pl/treksoft/kvision/modal/ModalSpec.kt | 4 +- .../test/pl/treksoft/kvision/navbar/NavFormSpec.kt | 2 +- .../test/pl/treksoft/kvision/navbar/NavSpec.kt | 2 +- .../test/pl/treksoft/kvision/navbar/NavbarSpec.kt | 2 +- .../kvision/panel/ResponsiveGridPanelSpec.kt | 2 +- .../test/pl/treksoft/kvision/panel/TabPanelSpec.kt | 8 +- .../treksoft/kvision/progress/ProgressBarSpec.kt | 2 +- .../kvision/progress/ProgressIndicatorSpec.kt | 2 +- .../pl/treksoft/kvision/toolbar/ButtonGroupSpec.kt | 2 +- .../pl/treksoft/kvision/toolbar/ToolbarSpec.kt | 2 +- .../test/pl/treksoft/kvision/window/WindowSpec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../pl/treksoft/kvision/chart/ChartCanvasSpec.kt | 4 +- .../test/pl/treksoft/kvision/chart/ChartSpec.kt | 4 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../pl/treksoft/kvision/data/DataContainerSpec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../pl/treksoft/kvision/redux/StateBindingSpec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../pl/treksoft/kvision/redux/StateBindingSpec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../kvision/form/text/RichTextInputSpec.kt | 2 +- .../pl/treksoft/kvision/form/text/RichTextSpec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../pl/treksoft/kvision/tabulator/TabulatorSpec.kt | 2 +- src/main/kotlin/pl/treksoft/kvision/panel/Root.kt | 158 ++++++++++++++++++--- .../kotlin/test/pl/treksoft/kvision/TestUtil.kt | 2 +- .../test/pl/treksoft/kvision/core/ContainerSpec.kt | 10 +- .../test/pl/treksoft/kvision/core/StyleSpec.kt | 6 +- .../test/pl/treksoft/kvision/core/WidgetSpec.kt | 2 +- .../pl/treksoft/kvision/core/WidgetWrapperSpec.kt | 2 +- .../pl/treksoft/kvision/form/FieldLabelSpec.kt | 2 +- .../test/pl/treksoft/kvision/form/HelpTextSpec.kt | 2 +- .../kvision/form/check/CheckBoxInputSpec.kt | 2 +- .../pl/treksoft/kvision/form/check/CheckBoxSpec.kt | 2 +- .../kvision/form/check/RadioGroupInputSpec.kt | 2 +- .../treksoft/kvision/form/check/RadioGroupSpec.kt | 2 +- .../treksoft/kvision/form/check/RadioInputSpec.kt | 2 +- .../pl/treksoft/kvision/form/check/RadioSpec.kt | 2 +- .../treksoft/kvision/form/range/RangeInputSpec.kt | 2 +- .../pl/treksoft/kvision/form/range/RangeSpec.kt | 2 +- .../kvision/form/select/SimpleSelectInputSpec.kt | 2 +- .../kvision/form/select/SimpleSelectSpec.kt | 2 +- .../pl/treksoft/kvision/form/text/PasswordSpec.kt | 2 +- .../kvision/form/text/TextAreaInputSpec.kt | 2 +- .../pl/treksoft/kvision/form/text/TextAreaSpec.kt | 2 +- .../pl/treksoft/kvision/form/text/TextInputSpec.kt | 2 +- .../test/pl/treksoft/kvision/form/text/TextSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/BoldSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/ButtonSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/CanvasSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/CustomTagSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/DivSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/FooterSpec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/html/H1Spec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/html/H2Spec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/html/H3Spec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/html/H4Spec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/html/H5Spec.kt | 2 +- .../kotlin/test/pl/treksoft/kvision/html/H6Spec.kt | 2 +- .../test/pl/treksoft/kvision/html/HeaderSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/IconSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/IframeSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/ImageSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/LinkSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/ListSpec.kt | 4 +- .../kotlin/test/pl/treksoft/kvision/html/PSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/SectionSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/SpanSpec.kt | 2 +- .../test/pl/treksoft/kvision/html/TagSpec.kt | 8 +- .../pl/treksoft/kvision/panel/DockPanelSpec.kt | 2 +- .../pl/treksoft/kvision/panel/FieldsetPanelSpec.kt | 2 +- .../pl/treksoft/kvision/panel/FlexPanelSpec.kt | 2 +- .../pl/treksoft/kvision/panel/GridPanelSpec.kt | 2 +- .../test/pl/treksoft/kvision/panel/HPanelSpec.kt | 2 +- .../test/pl/treksoft/kvision/panel/RootSpec.kt | 4 +- .../pl/treksoft/kvision/panel/SplitPanelSpec.kt | 2 +- .../pl/treksoft/kvision/panel/StackPanelSpec.kt | 8 +- .../test/pl/treksoft/kvision/panel/VPanelSpec.kt | 2 +- .../pl/treksoft/kvision/state/StateBindingSpec.kt | 6 +- .../test/pl/treksoft/kvision/table/CellSpec.kt | 2 +- .../pl/treksoft/kvision/table/HeaderCellSpec.kt | 2 +- .../test/pl/treksoft/kvision/table/RowSpec.kt | 2 +- .../test/pl/treksoft/kvision/table/TableSpec.kt | 2 +- 109 files changed, 280 insertions(+), 158 deletions(-) diff --git a/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeInputSpec.kt b/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeInputSpec.kt index 5cdb68c9..c6610a59 100644 --- a/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeInputSpec.kt +++ b/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeInputSpec.kt @@ -35,7 +35,7 @@ class DateTimeInputSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val data = Date() val dti = DateTimeInput(value = data).apply { placeholder = "place" diff --git a/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeSpec.kt b/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeSpec.kt index ce5426a9..34d48978 100644 --- a/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeSpec.kt +++ b/kvision-modules/kvision-bootstrap-datetime/src/test/kotlin/test/pl/treksoft/kvision/form/time/DateTimeSpec.kt @@ -34,7 +34,7 @@ class DateTimeSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val data = Date() val ti = DateTime(value = data, label = "Label").apply { placeholder = "place" diff --git a/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectInputSpec.kt b/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectInputSpec.kt index 0e759896..679b1529 100644 --- a/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectInputSpec.kt +++ b/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectInputSpec.kt @@ -34,7 +34,7 @@ class SelectInputSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val selectInput = SelectInput(listOf("test1" to "Test 1", "test2" to "Test 2"), "test1", true).apply { liveSearch = true placeholder = "Choose ..." diff --git a/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptGroupSpec.kt b/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptGroupSpec.kt index 33ccc843..e171eeac 100644 --- a/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptGroupSpec.kt +++ b/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptGroupSpec.kt @@ -33,7 +33,7 @@ class SelectOptGroupSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val selectOptGroup = SelectOptGroup("Group", listOf("test1" to "Test 1", "test2" to "Test 2"), 2) root.add(selectOptGroup) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptionSpec.kt b/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptionSpec.kt index d711301a..1fc90e2d 100644 --- a/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptionSpec.kt +++ b/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectOptionSpec.kt @@ -32,7 +32,7 @@ class SelectOptionSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val selectOption = SelectOption("testValue", "testLabel") root.add(selectOption) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectSpec.kt b/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectSpec.kt index 9ed44f82..fcbf7d62 100644 --- a/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectSpec.kt +++ b/kvision-modules/kvision-bootstrap-select/src/test/kotlin/test/pl/treksoft/kvision/form/select/SelectSpec.kt @@ -34,7 +34,7 @@ class SelectSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val select = Select(listOf("test1" to "Test 1", "test2" to "Test 2"), "test1", null, true, null, "Label").apply { liveSearch = true placeholder = "Choose ..." diff --git a/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerInputSpec.kt b/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerInputSpec.kt index 467e48db..df6cf915 100644 --- a/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerInputSpec.kt +++ b/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerInputSpec.kt @@ -32,7 +32,7 @@ class SpinnerInputSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val si = SpinnerInput(value = 13).apply { placeholder = "place" id = "idti" @@ -46,7 +46,7 @@ class SpinnerInputSpec : DomSpec { @Test fun spinUp() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val si = SpinnerInput(value = 13).apply { placeholder = "place" id = "idti" @@ -61,7 +61,7 @@ class SpinnerInputSpec : DomSpec { @Test fun spinDown() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val si = SpinnerInput(value = 13).apply { placeholder = "place" id = "idti" diff --git a/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerSpec.kt b/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerSpec.kt index bb090b61..a29431d3 100644 --- a/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerSpec.kt +++ b/kvision-modules/kvision-bootstrap-spinner/src/test/kotlin/test/pl/treksoft/kvision/form/spinner/SpinnerSpec.kt @@ -33,7 +33,7 @@ class SpinnerSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val ti = Spinner(value = 13, label = "Label").apply { placeholder = "place" name = "name" @@ -59,7 +59,7 @@ class SpinnerSpec : DomSpec { @Test fun spinUp() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val si = Spinner(value = 13) root.add(si) assertEquals(13, si.value, "Should return initial value before spinUp") @@ -71,7 +71,7 @@ class SpinnerSpec : DomSpec { @Test fun spinDown() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val si = Spinner(value = 13) root.add(si) assertEquals(13, si.value, "Should return initial value before spinDown") diff --git a/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/form/text/TypeaheadInputSpec.kt b/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/form/text/TypeaheadInputSpec.kt index 5690747a..536d088e 100644 --- a/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/form/text/TypeaheadInputSpec.kt +++ b/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/form/text/TypeaheadInputSpec.kt @@ -33,7 +33,7 @@ class TypeaheadInputSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val si = TypeaheadInput(listOf("test1", "test2"), value = "test").apply { placeholder = "place" id = "idti" diff --git a/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/form/text/TypeaheadSpec.kt b/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/form/text/TypeaheadSpec.kt index 2fc9cad5..25f86a91 100644 --- a/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/form/text/TypeaheadSpec.kt +++ b/kvision-modules/kvision-bootstrap-typeahead/src/test/kotlin/test/pl/treksoft/kvision/form/text/TypeaheadSpec.kt @@ -32,7 +32,7 @@ class TypeaheadSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val ti = Typeahead(listOf("test1", "test2"), value = "test", label = "Label").apply { placeholder = "place" name = "name" diff --git a/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt b/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt index de7a9315..4441540f 100644 --- a/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt +++ b/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadInputSpec.kt @@ -33,7 +33,7 @@ class UploadInputSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val upi = UploadInput(multiple = true).apply { id = "idti" } diff --git a/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt b/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt index 92078153..e89a9eb9 100644 --- a/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt +++ b/kvision-modules/kvision-bootstrap-upload/src/test/kotlin/test/pl/treksoft/kvision/form/upload/UploadSpec.kt @@ -33,7 +33,7 @@ class UploadSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val upi = Upload(multiple = true) val id = upi.input.id root.add(upi) diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index d0b05cce..7224a895 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -88,7 +88,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/ContextMenuSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/ContextMenuSpec.kt index 5a2cb31b..17956fa7 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/ContextMenuSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/ContextMenuSpec.kt @@ -35,7 +35,7 @@ class ContextMenuSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val m = ContextMenu { link("a", "b") link("c", "d") @@ -55,7 +55,7 @@ class ContextMenuSpec : DomSpec { @Test fun positionMenu() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val m = ContextMenu { link("a", "b") link("c", "d") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/DropDownSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/DropDownSpec.kt index 5efdeb20..f5dd8c9f 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/DropDownSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/DropDownSpec.kt @@ -35,7 +35,7 @@ class DropDownSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val dd = DropDown("Dropdown", listOf("abc" to "#!/x", "def" to "#!/y"), "flag") root.add(dd) dd.list.getElementJQueryD()?.dropdown("toggle") @@ -52,7 +52,7 @@ class DropDownSpec : DomSpec { @Test fun renderDropUp() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val dd = DropDown("Dropdown", listOf("abc" to "#!/x", "def" to "#!/y"), "flag").apply { direction = Direction.DROPUP } root.add(dd) dd.list.getElementJQueryD()?.dropdown("toggle") @@ -69,7 +69,7 @@ class DropDownSpec : DomSpec { @Test fun renderHeaderElement() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val dd = DropDown("Dropdown", listOf("abc" to DD.HEADER.option), "flag") root.add(dd) dd.list.getElementJQueryD()?.dropdown("toggle") @@ -86,7 +86,7 @@ class DropDownSpec : DomSpec { @Test fun renderSeparatorElement() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val dd = DropDown("Dropdown", listOf("abc" to DD.SEPARATOR.option), "flag") root.add(dd) dd.list.getElementJQueryD()?.dropdown("toggle") @@ -103,7 +103,7 @@ class DropDownSpec : DomSpec { @Test fun renderDisabledElement() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val dd = DropDown("Dropdown", listOf("abc" to DD.DISABLED.option), "flag") root.add(dd) dd.list.getElementJQueryD()?.dropdown("toggle") @@ -120,7 +120,7 @@ class DropDownSpec : DomSpec { @Test fun toggle() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val dd = DropDown("Dropdown", listOf("abc" to "#!/x", "def" to "#!/y"), "flag") root.add(dd) val visible = dd.getElementJQuery()?.hasClass("show") ?: false diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/HeaderSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/HeaderSpec.kt index 25ca7a7d..64a01f64 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/HeaderSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/HeaderSpec.kt @@ -32,7 +32,7 @@ class HeaderSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val h = Header("Test") root.add(h) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/SeparatorSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/SeparatorSpec.kt index 36c22a74..6e568c80 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/SeparatorSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/dropdown/SeparatorSpec.kt @@ -32,7 +32,7 @@ class SeparatorSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val s = Separator() root.add(s) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/AlertSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/AlertSpec.kt index 48a8b5a0..b6e09783 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/AlertSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/AlertSpec.kt @@ -36,7 +36,7 @@ class AlertSpec : DomSpec { @Test fun render() { run { - Root("test", fixed = true) + Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) Alert.show("Alert caption", "Alert content", animation = false) val alert = document.getElementById("test")?.let { jQuery(it).parent().parent().find(".modal")[0] } assertNotNull(alert, "Should show alert window") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/CloseIconSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/CloseIconSpec.kt index 1893ce81..10d11b2d 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/CloseIconSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/CloseIconSpec.kt @@ -32,7 +32,7 @@ class CloseIconSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val ci = CloseIcon() root.add(ci) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/ConfirmSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/ConfirmSpec.kt index 875bf9e2..1459b8b5 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/ConfirmSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/ConfirmSpec.kt @@ -36,7 +36,7 @@ class ConfirmSpec : DomSpec { @Test fun render() { run { - Root("test", fixed = true) + Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) Confirm.show("Confirm caption", "Confirm content") val confirm = document.getElementById("test")?.let { jQuery(it).find(".modal")[0] } assertNotNull(confirm, "Should show confirm window") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/ModalSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/ModalSpec.kt index 7149b163..33d16fb1 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/ModalSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/modal/ModalSpec.kt @@ -35,7 +35,7 @@ class ModalSpec : DomSpec { @Test fun render() { run { - Root("test", fixed = true) + Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val modal = Modal("Modal") modal.show() val content = document.getElementById("test")?.let { jQuery(it).find(".modal-title").html() } @@ -47,7 +47,7 @@ class ModalSpec : DomSpec { @Test fun toggle() { run { - Root("test", fixed = true) + Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val modal = Modal("Modal") modal.toggle() val content = document.getElementById("test")?.let { jQuery(it).find(".modal-title").html() } diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavFormSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavFormSpec.kt index 8eb7bd5b..1330446e 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavFormSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavFormSpec.kt @@ -32,7 +32,7 @@ class NavFormSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val navf = NavForm() root.add(navf) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavSpec.kt index 2e52557f..c6b82ced 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavSpec.kt @@ -32,7 +32,7 @@ class NavSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val nav = Nav() root.add(nav) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavbarSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavbarSpec.kt index e7fd6e40..7ec1b33e 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavbarSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/navbar/NavbarSpec.kt @@ -38,7 +38,7 @@ class NavbarSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val navbar = Navbar("TEST", "#", NavbarType.FIXEDTOP) root.add(navbar) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/panel/ResponsiveGridPanelSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/panel/ResponsiveGridPanelSpec.kt index 1ebac202..b176650d 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/panel/ResponsiveGridPanelSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/panel/ResponsiveGridPanelSpec.kt @@ -33,7 +33,7 @@ class ResponsiveGridPanelSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val rgPanel = ResponsiveGridPanel() root.add(rgPanel) rgPanel.add(Span("abc"), 1, 1) diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/panel/TabPanelSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/panel/TabPanelSpec.kt index 7a76cde9..97dba32e 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/panel/TabPanelSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/panel/TabPanelSpec.kt @@ -34,7 +34,7 @@ class TabPanelSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val tabs = TabPanel() root.add(tabs) val label1 = Span("abc") @@ -53,7 +53,7 @@ class TabPanelSpec : DomSpec { @Test fun setActiveIndex() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val tabs = TabPanel() root.add(tabs) val label1 = Span("abc") @@ -73,7 +73,7 @@ class TabPanelSpec : DomSpec { @Test fun removeTab() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val tabs = TabPanel() root.add(tabs) val label1 = Span("abc") @@ -95,7 +95,7 @@ class TabPanelSpec : DomSpec { @Test fun tabClick() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val tabs = TabPanel() root.add(tabs) val label1 = Span("abc") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/progress/ProgressBarSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/progress/ProgressBarSpec.kt index 2f044987..5f829da2 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/progress/ProgressBarSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/progress/ProgressBarSpec.kt @@ -33,7 +33,7 @@ class ProgressBarSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val progressBar = ProgressBar(50, style = ProgressBarStyle.SUCCESS, striped = true, content = "Processing ...") root.add(progressBar) diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/progress/ProgressIndicatorSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/progress/ProgressIndicatorSpec.kt index 4aa14230..fb0dd6c7 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/progress/ProgressIndicatorSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/progress/ProgressIndicatorSpec.kt @@ -33,7 +33,7 @@ class ProgressIndicatorSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val ind = ProgressIndicator(50, style = ProgressBarStyle.SUCCESS, striped = true) root.add(ind) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/toolbar/ButtonGroupSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/toolbar/ButtonGroupSpec.kt index b3ddbe40..64e0a707 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/toolbar/ButtonGroupSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/toolbar/ButtonGroupSpec.kt @@ -33,7 +33,7 @@ class ButtonGroupSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val group = ButtonGroup() root.add(group) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/toolbar/ToolbarSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/toolbar/ToolbarSpec.kt index d41ef05e..42cc719b 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/toolbar/ToolbarSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/toolbar/ToolbarSpec.kt @@ -32,7 +32,7 @@ class ToolbarSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val toolbar = Toolbar() root.add(toolbar) val element = document.getElementById("test") diff --git a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/window/WindowSpec.kt b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/window/WindowSpec.kt index a65ff7c3..b6e49107 100644 --- a/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/window/WindowSpec.kt +++ b/kvision-modules/kvision-bootstrap/src/test/kotlin/test/pl/treksoft/kvision/window/WindowSpec.kt @@ -32,7 +32,7 @@ class WindowSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val window = Window("Window title", isResizable = false) root.add(window) window.show() diff --git a/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartCanvasSpec.kt b/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartCanvasSpec.kt index da83b989..9990aee2 100644 --- a/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartCanvasSpec.kt +++ b/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartCanvasSpec.kt @@ -36,7 +36,7 @@ class ChartCanvasSpec : DomSpec { @Test fun renderResponsive() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val chart = ChartCanvas( configuration = Configuration( ChartType.SCATTER, @@ -56,7 +56,7 @@ class ChartCanvasSpec : DomSpec { @Test fun renderNotResponsive() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val chart = ChartCanvas( 300, 600, configuration = Configuration( diff --git a/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartSpec.kt b/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartSpec.kt index 1fe73608..ce03fdb2 100644 --- a/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartSpec.kt +++ b/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartSpec.kt @@ -37,7 +37,7 @@ class ChartSpec : DomSpec { @Test fun renderResponsive() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val chart = Chart( Configuration( ChartType.SCATTER, @@ -60,7 +60,7 @@ class ChartSpec : DomSpec { @Test fun renderNotResponsive() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val chart = Chart( Configuration( ChartType.SCATTER, diff --git a/kvision-modules/kvision-datacontainer/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-datacontainer/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-datacontainer/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-datacontainer/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-datacontainer/src/test/kotlin/test/pl/treksoft/kvision/data/DataContainerSpec.kt b/kvision-modules/kvision-datacontainer/src/test/kotlin/test/pl/treksoft/kvision/data/DataContainerSpec.kt index 92661203..e53914fb 100644 --- a/kvision-modules/kvision-datacontainer/src/test/kotlin/test/pl/treksoft/kvision/data/DataContainerSpec.kt +++ b/kvision-modules/kvision-datacontainer/src/test/kotlin/test/pl/treksoft/kvision/data/DataContainerSpec.kt @@ -36,7 +36,7 @@ class DataContainerSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) class Model(value: String) : BaseDataComponent() { var value: String by obs(value) diff --git a/kvision-modules/kvision-redux-kotlin/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-redux-kotlin/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-redux-kotlin/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-redux-kotlin/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-redux-kotlin/src/test/kotlin/test/pl/treksoft/kvision/redux/StateBindingSpec.kt b/kvision-modules/kvision-redux-kotlin/src/test/kotlin/test/pl/treksoft/kvision/redux/StateBindingSpec.kt index cdb8821a..f8b9e87b 100644 --- a/kvision-modules/kvision-redux-kotlin/src/test/kotlin/test/pl/treksoft/kvision/redux/StateBindingSpec.kt +++ b/kvision-modules/kvision-redux-kotlin/src/test/kotlin/test/pl/treksoft/kvision/redux/StateBindingSpec.kt @@ -53,7 +53,7 @@ class StateBindingSpec : DomSpec { @Test fun stateBinding() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val store = createReduxStore(::stateReducer, State(10)) val container = SimplePanel() diff --git a/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/redux/StateBindingSpec.kt b/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/redux/StateBindingSpec.kt index b4415fcb..5106236f 100644 --- a/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/redux/StateBindingSpec.kt +++ b/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/redux/StateBindingSpec.kt @@ -52,7 +52,7 @@ class StateBindingSpec : DomSpec { @Test fun stateBinding() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val store = createReduxStore(::stateReducer, State(10)) val container = SimplePanel() diff --git a/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/form/text/RichTextInputSpec.kt b/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/form/text/RichTextInputSpec.kt index 4ebf7b45..c88a7ab3 100644 --- a/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/form/text/RichTextInputSpec.kt +++ b/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/form/text/RichTextInputSpec.kt @@ -34,7 +34,7 @@ class RichTextInputSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val hai = RichTextInput(value = "abc").apply { placeholder = "place" id = "idti" diff --git a/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/form/text/RichTextSpec.kt b/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/form/text/RichTextSpec.kt index 1ea79790..7afb95a5 100644 --- a/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/form/text/RichTextSpec.kt +++ b/kvision-modules/kvision-richtext/src/test/kotlin/test/pl/treksoft/kvision/form/text/RichTextSpec.kt @@ -34,7 +34,7 @@ class RichTextSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val hai = RichText(value = "abc", label = "Field").apply { placeholder = "place" id = "idti" diff --git a/kvision-modules/kvision-tabulator/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt b/kvision-modules/kvision-tabulator/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt index 9da4dfb4..76c3b6ee 100644 --- a/kvision-modules/kvision-tabulator/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt +++ b/kvision-modules/kvision-tabulator/src/test/kotlin/test/pl/treksoft/kvision/TestUtil.kt @@ -86,7 +86,7 @@ interface WSpec : DomSpec { fun runW(code: (widget: Widget, element: Element?) -> Unit) { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val widget = Widget() widget.id = "test_id" root.add(widget) diff --git a/kvision-modules/kvision-tabulator/src/test/kotlin/test/pl/treksoft/kvision/tabulator/TabulatorSpec.kt b/kvision-modules/kvision-tabulator/src/test/kotlin/test/pl/treksoft/kvision/tabulator/TabulatorSpec.kt index fd1f8ac1..2e86c87f 100644 --- a/kvision-modules/kvision-tabulator/src/test/kotlin/test/pl/treksoft/kvision/tabulator/TabulatorSpec.kt +++ b/kvision-modules/kvision-tabulator/src/test/kotlin/test/pl/treksoft/kvision/tabulator/TabulatorSpec.kt @@ -34,7 +34,7 @@ class TabulatorSpec : DomSpec { @Test fun render() { run { - val root = Root("test", fixed = true) + val root = Root("test", containerType = pl.treksoft.kvision.panel.ContainerType.FIXED) val tabulator = Tabulator(options = TabulatorOptions(data = arrayOf(obj { id = 1 name = "Name" diff --git a/src/main/kotlin/pl/treksoft/kvision/panel/Root.kt b/src/main/kotlin/pl/treksoft/kvision/panel/Root.kt index b1bb36a8..b6f8ad0c 100644 --- a/src/main/kotlin/pl/treksoft/kvision/panel/Root.kt +++ b/src/main/kotlin/pl/treksoft/kvision/panel/Root.kt @@ -33,6 +33,19 @@ import pl.treksoft.kvision.utils.snClasses import pl.treksoft.kvision.utils.snOpt import kotlin.browser.document +/** + * Root container types. + */ +enum class ContainerType(internal val type: String) { + NONE(""), + FIXED("container"), + FLUID("container-fluid"), + SM("container-sm"), + MD("container-md"), + LG("container-lg"), + XL("container-xl") +} + /** * Root container. * @@ -43,7 +56,8 @@ import kotlin.browser.document @Suppress("TooManyFunctions") class Root : SimplePanel { - private val fixed: Boolean + private val containerType: ContainerType + private val addRow: Boolean private val contextMenus: MutableList = mutableListOf() private var rootVnode: VNode? = null @@ -54,12 +68,19 @@ class Root : SimplePanel { /** * @constructor * @param id ID attribute of element in the main HTML file - * @param fixed if false, the container is rendered with Bootstrap "container-fluid" class, - * otherwise it's rendered with "container" class (default is false) + * @param containerType Bootstrap container type + * @param addRow if true, a
element is rendered inside the root + * container (default is based on container type) * @param init an initializer extension function */ - constructor(id: String, fixed: Boolean = false, init: (Root.() -> Unit)? = null) : super() { - this.fixed = fixed + constructor( + id: String, + containerType: ContainerType = ContainerType.FLUID, + addRow: Boolean = containerType != ContainerType.FIXED, + init: (Root.() -> Unit)? = null + ) : super() { + this.containerType = containerType + this.addRow = addRow if (document.getElementById(id) != null) { rootVnode = KVManager.patch(id, this.renderVNode()) } @@ -71,18 +92,61 @@ class Root : SimplePanel { /** * @constructor * @param element HTML element in the DOM tree - * @param fixed if false, the container is rendered with Bootstrap "container-fluid" class, - * otherwise it's rendered with "container" class (default is false) + * @param containerType Bootstrap container type + * @param addRow if true, a
element is rendered inside the root + * container (default is based on container type) * @param init an initializer extension function */ - constructor(element: HTMLElement, fixed: Boolean = false, init: (Root.() -> Unit)? = null) : super() { - this.fixed = fixed + constructor( + element: HTMLElement, + containerType: ContainerType = ContainerType.FLUID, + addRow: Boolean = containerType != ContainerType.FIXED, + init: (Root.() -> Unit)? = null + ) : super() { + this.containerType = containerType + this.addRow = addRow rootVnode = KVManager.patch(element, this.renderVNode()) this.id = "kv_root_${counter++}" @Suppress("LeakingThis") init?.invoke(this) } + /** + * @constructor + * @param id ID attribute of element in the main HTML file + * @param fixed if false, the container is rendered with Bootstrap "container-fluid" class, + * otherwise it's rendered with "container" class (default is false) + * @param containerType Bootstrap container type + * @param addRow if true, a
element is rendered inside the root container + * @param init an initializer extension function + */ + @Deprecated("Use constructor without fixed parameter") + constructor( + id: String, + fixed: Boolean = false, + containerType: ContainerType = if (fixed) ContainerType.FIXED else ContainerType.FLUID, + addRow: Boolean = !fixed, + init: (Root.() -> Unit)? = null + ) : this(id, containerType, addRow, init) + + /** + * @constructor + * @param element HTML element in the DOM tree + * @param fixed if false, the container is rendered with Bootstrap "container-fluid" class, + * otherwise it's rendered with "container" class (default is false) + * @param containerType Bootstrap container type + * @param addRow if true, a
element is rendered inside the root container + * @param init an initializer extension function + */ + @Deprecated("Use constructor without fixed parameter") + constructor( + element: HTMLElement, + fixed: Boolean = false, + containerType: ContainerType = if (fixed) ContainerType.FIXED else ContainerType.FLUID, + addRow: Boolean = !fixed, + init: (Root.() -> Unit)? = null + ) : this(element, containerType, addRow, init) + init { roots.add(this) if (isFirstRoot) { @@ -91,7 +155,7 @@ class Root : SimplePanel { } override fun render(): VNode { - return if (!fixed) { + return if (addRow) { render("div#$id", arrayOf(h("div", snOpt { `class` = snClasses(listOf("row" to true)) }, stylesVNodes() + childrenVNodes() + modalsVNodes() + contextMenusVNodes()))) @@ -138,8 +202,12 @@ class Root : SimplePanel { } override fun getSnClass(): List { - val css = if (!fixed) "container-fluid" else "container" - return super.getSnClass() + (css to true) + return if (containerType == ContainerType.NONE) { + super.getSnClass() + } else { + super.getSnClass() + (containerType.type to true) + } + } internal fun reRender(): Root { @@ -219,17 +287,62 @@ class Root : SimplePanel { } } +/** + * Create new Root container based on ID + * @param id ID attribute of element in the main HTML file + * @param containerType Bootstrap container type + * @param addRow if true, a
element is rendered inside the root + * container (default is based on container type) + * @param init an initializer extension function + * @return the created Root container + */ +fun Application.root( + id: String, + containerType: ContainerType = ContainerType.FLUID, + addRow: Boolean = containerType != ContainerType.FIXED, + init: Root.() -> Unit +): Root { + return Root(id, containerType, addRow, init) +} + +/** + * Create new Root container based on HTML element + * @param element HTML element in the DOM tree + * @param containerType Bootstrap container type + * @param addRow if true, a
element is rendered inside the root + * container (default is based on container type) + * @param init an initializer extension function + * @return the created Root container + */ +fun Application.root( + element: HTMLElement, + containerType: ContainerType = ContainerType.FLUID, + addRow: Boolean = containerType != ContainerType.FIXED, + init: Root.() -> Unit +): Root { + return Root(element, containerType, addRow, init) +} + /** * Create new Root container based on ID * @param id ID attribute of element in the main HTML file * @param fixed if false, the container is rendered with Bootstrap "container-fluid" class, * otherwise it's rendered with "container" class (default is false) + * @param containerType Bootstrap container type + * @param addRow if true, a
element is rendered inside the root container * @param init an initializer extension function * @return the created Root container */ -@Suppress("unused") -fun Application.root(id: String, fixed: Boolean = false, init: Root.() -> Unit): Root { - return Root(id, fixed, init) +@Suppress("DEPRECATION") +@Deprecated("Use builder function without fixed parameter") +fun Application.root( + id: String, + fixed: Boolean = false, + containerType: ContainerType = if (fixed) ContainerType.FIXED else ContainerType.FLUID, + addRow: Boolean = !fixed, + init: Root.() -> Unit +): Root { + return Root(id, fixed, containerType, addRow, init) } /** @@ -237,10 +350,19 @@ fun Application.root(id: String, fixed: Boolean = false, init: Root.() -> Unit): * @param element HTML element in the DOM tree * @param fixed if false, the container is rendered with Bootstrap "container-fluid" class, * otherwise it's rendered with "container" class (default is false) + * @param containerType Bootstrap container type + * @param addRow if true, a
element is rendered inside the root container * @param init an initializer extension function * @return the created Root container */ -@Suppress("unused") -fun Application.root(element: HTMLElement, fixed: Boolean = false, init: Root.() -> Unit): Root { - return Root(element, fixed, init) +@Suppress("DEPRECATION") +@Deprecated("Use builder function without fixed parameter") +fun Application.root( + element: HTMLElement, + fixed: Boolean = false, + containerType: ContainerType = if (fixed) ContainerType.FIXED else ContainerType.FLUID, + addRow: Boolean = !fixed, + init: Root.() -> Unit +): Root { + return Root(element, fixed, containerType, addRow, init) } diff --git a/src/test/kotlin/test/pl/treksoft/kvision/