From 075280076d373dad01666397f7b857aad8450b7c Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Fri, 21 Jun 2019 15:37:03 +0200
Subject: Simplification of the Redux module.

---
 .../kotlin/pl/treksoft/kvision/redux/ReduxStore.kt | 30 ++++++++--------------
 .../pl/treksoft/kvision/redux/ReduxStoreSpec.kt    | 19 +++++++-------
 .../pl/treksoft/kvision/redux/StateBindingSpec.kt  |  2 --
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/kvision-modules/kvision-redux/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt b/kvision-modules/kvision-redux/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt
index 246ccef5..bfe7bc50 100644
--- a/kvision-modules/kvision-redux/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt
+++ b/kvision-modules/kvision-redux/src/main/kotlin/pl/treksoft/kvision/redux/ReduxStore.kt
@@ -21,11 +21,7 @@
  */
 package pl.treksoft.kvision.redux
 
-import kotlinx.serialization.ImplicitReflectionSerializer
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.serializer
 import pl.treksoft.kvision.KVManagerRedux
-import pl.treksoft.kvision.utils.JSON
 import redux.RAction
 import redux.Reducer
 import redux.Store
@@ -43,49 +39,45 @@ typealias ActionCreator<A, S> = (Dispatch<A>, GetState<S>) -> Unit
  * @param initialState an initial state
  * @param middlewares a list of optional Redux JS middlewares
  */
-@UseExperimental(ImplicitReflectionSerializer::class)
-inline fun <reified S : Any, A : RAction> createReduxStore(
-    noinline reducer: Reducer<S, A>,
+fun <S : Any, A : RAction> createReduxStore(
+    reducer: Reducer<S, A>,
     initialState: S,
     vararg middlewares: dynamic
 ): ReduxStore<S, A> {
     @Suppress("SpreadOperator")
-    return ReduxStore(reducer, initialState, S::class.serializer(), *middlewares)
+    return ReduxStore(reducer, initialState, *middlewares)
 }
 
 /**
  * A class implementing redux pattern backed by the original Redux JS library.
- * It requires @Serializable state.
  *
  * @constructor Creates a Redux store with given reducer function and initial state.
- * @param S redux state type (@Serializable)
+ * @param S redux state type
  * @param A redux action type
  * @param reducer a reducer function
  * @param initialState an initial state
- * @param stateSerializer a serializer for the state type
  * @param middlewares a list of optional Redux JS middlewares
  */
 class ReduxStore<S : Any, A : RAction>(
     reducer: Reducer<S, A>,
     initialState: S,
-    val stateSerializer: KSerializer<S>,
     vararg middlewares: dynamic
 ) {
-    private val store: Store<String, dynamic, WrapperAction>
+    private val store: Store<S, dynamic, WrapperAction>
 
     init {
         @Suppress("UnsafeCastFromDynamic")
         store = KVManagerRedux.createStore(
-            { s: String, a: RAction ->
+            { s: S, a: RAction ->
                 @Suppress("UnsafeCastFromDynamic")
                 if (a == undefined || (a.asDynamic().type is String && a.asDynamic().type.startsWith("@@"))) {
                     s
                 } else {
                     @Suppress("UNCHECKED_CAST")
-                    JSON.plain.stringify(stateSerializer, reducer(JSON.plain.parse(stateSerializer, s), a as A))
+                    reducer(s, a as A)
                 }
             },
-            JSON.plain.stringify(stateSerializer, initialState),
+            initialState,
             @Suppress("SpreadOperator")
             KVManagerRedux.compose(KVManagerRedux.applyMiddleware(KVManagerRedux.reduxThunk, *middlewares), rEnhancer())
         )
@@ -95,7 +87,7 @@ class ReduxStore<S : Any, A : RAction>(
      * Returns the current state.
      */
     fun getState(): S {
-        return JSON.plain.parse(stateSerializer, store.getState())
+        return store.getState()
     }
 
     /**
@@ -109,7 +101,7 @@ class ReduxStore<S : Any, A : RAction>(
      * Dispatches an asynchronous action function.
      */
     fun dispatch(actionCreator: ActionCreator<dynamic, S>): WrapperAction {
-        return store.dispatch({ reduxDispatch: Dispatch<dynamic>, reduxGetState: GetState<String> ->
+        return store.dispatch({ reduxDispatch: Dispatch<dynamic>, reduxGetState: GetState<S> ->
             val newDispatch: Dispatch<dynamic> = { elem ->
                 @Suppress("UnsafeCastFromDynamic")
                 if (js("typeof elem === 'function'")) {
@@ -118,7 +110,7 @@ class ReduxStore<S : Any, A : RAction>(
                     reduxDispatch(elem)
                 }
             }
-            actionCreator(newDispatch) { JSON.plain.parse(stateSerializer, reduxGetState()) }
+            actionCreator(newDispatch) { reduxGetState() }
         })
     }
 
diff --git a/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/redux/ReduxStoreSpec.kt b/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/redux/ReduxStoreSpec.kt
index 3be83556..b45eb9dd 100644
--- a/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/redux/ReduxStoreSpec.kt
+++ b/kvision-modules/kvision-redux/src/test/kotlin/test/pl/treksoft/kvision/redux/ReduxStoreSpec.kt
@@ -21,15 +21,13 @@
  */
 package test.pl.treksoft.kvision.redux
 
-import kotlinx.serialization.Serializable
 import pl.treksoft.kvision.redux.createReduxStore
 import redux.RAction
 import test.pl.treksoft.kvision.SimpleSpec
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-@Serializable
-data class TestState(val counter: Int)
+data class TestState(val counter: Int, val values: List<Int>)
 
 sealed class TestAction : RAction {
     object Inc : TestAction()
@@ -38,10 +36,10 @@ sealed class TestAction : RAction {
 
 fun testReducer(state: TestState, action: TestAction): TestState = when (action) {
     is TestAction.Inc -> {
-        state.copy(counter = state.counter + 1)
+        state.copy(counter = state.counter + 1, values = state.values + state.counter)
     }
     is TestAction.Dec -> {
-        state.copy(counter = state.counter - 1)
+        state.copy(counter = state.counter - 1, values = state.values + state.counter)
     }
 }
 
@@ -50,20 +48,21 @@ class ReduxStoreSpec : SimpleSpec {
     @Test
     fun getState() {
         run {
-            val store = createReduxStore(::testReducer, TestState(10))
-            assertEquals(TestState(10), store.getState())
+            val store = createReduxStore(::testReducer, TestState(10, listOf()))
+            assertEquals(TestState(10, listOf()), store.getState())
         }
     }
 
     @Test
     fun dispatch() {
         run {
-            val store = createReduxStore(::testReducer, TestState(10))
+            val store = createReduxStore(::testReducer, TestState(10, listOf()))
             store.dispatch(TestAction.Inc)
             store.dispatch(TestAction.Inc)
             store.dispatch(TestAction.Inc)
             store.dispatch(TestAction.Dec)
-            assertEquals(TestState(12), store.getState())
+            store.dispatch(TestAction.Dec)
+            assertEquals(TestState(11, listOf(10, 11, 12, 13, 12)), store.getState())
         }
     }
 
@@ -71,7 +70,7 @@ class ReduxStoreSpec : SimpleSpec {
     fun subscribe() {
         run {
             var counter = 0
-            val store = createReduxStore(::testReducer, TestState(10))
+            val store = createReduxStore(::testReducer, TestState(10, listOf()))
             store.subscribe {
                 counter++
             }
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 5204402d..ec32d0d6 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
@@ -21,7 +21,6 @@
  */
 package test.pl.treksoft.kvision.redux
 
-import kotlinx.serialization.Serializable
 import pl.treksoft.kvision.html.Div.Companion.div
 import pl.treksoft.kvision.panel.Root
 import pl.treksoft.kvision.panel.SimplePanel
@@ -33,7 +32,6 @@ import test.pl.treksoft.kvision.DomSpec
 import kotlin.browser.document
 import kotlin.test.Test
 
-@Serializable
 data class State(val counter: Int)
 
 sealed class StateAction : RAction {
-- 
cgit 


From 231dd9f27ded19123cfa341596850ffd5471d177 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Fri, 21 Jun 2019 20:35:07 +0200
Subject: Upgrade tabulator to 4.2.7. Fix for table refresh crash with active
 custom editor.

---
 kvision-modules/kvision-tabulator/build.gradle                    | 2 +-
 .../src/main/kotlin/pl/treksoft/kvision/tabulator/Options.kt      | 3 +++
 .../src/main/kotlin/pl/treksoft/kvision/tabulator/Tabulator.kt    | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/kvision-modules/kvision-tabulator/build.gradle b/kvision-modules/kvision-tabulator/build.gradle
index 5ea97e50..b74ef2d4 100644
--- a/kvision-modules/kvision-tabulator/build.gradle
+++ b/kvision-modules/kvision-tabulator/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 kotlinFrontend {
 
     npm {
-        dependency("tabulator-tables", "4.2.5")
+        dependency("tabulator-tables", "4.2.7")
         devDependency("karma", "3.1.4")
         devDependency("karma-chrome-launcher", "2.2.0")
         devDependency("karma-webpack", "3.0.5")
diff --git a/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Options.kt b/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Options.kt
index 08f2603b..53f958e5 100644
--- a/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Options.kt
+++ b/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Options.kt
@@ -356,6 +356,7 @@ data class ColumnDefinition<T : Any>(
 
 internal object EditorRoot {
     internal var root: Root? = null
+    internal var cancel: ((value: dynamic) -> Unit)? = null
     internal var disposeTimer: Int? = null
 }
 
@@ -384,6 +385,7 @@ fun <T : Any> ColumnDefinition<T>.toJs(
                     root?.dispose()
                     disposeTimer = null
                     root = null
+                    EditorRoot.cancel = null
                 }, 500)
             }, cancel, data)
             val rootElement = document.createElement("div") as HTMLElement
@@ -393,6 +395,7 @@ fun <T : Any> ColumnDefinition<T>.toJs(
                     root?.dispose()
                 }
                 root = Root(element = rootElement)
+                EditorRoot.cancel = cancel
                 @Suppress("UnsafeCastFromDynamic")
                 root?.add(component)
                 (component as? FormControl)?.focus()
diff --git a/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Tabulator.kt b/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Tabulator.kt
index 72a2809a..01af46c6 100644
--- a/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Tabulator.kt
+++ b/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Tabulator.kt
@@ -40,6 +40,7 @@ import pl.treksoft.kvision.utils.createInstance
 import pl.treksoft.kvision.utils.obj
 import pl.treksoft.kvision.utils.syncWithList
 import redux.RAction
+import kotlin.browser.window
 import pl.treksoft.kvision.tabulator.js.Tabulator as JsTabulator
 
 /**
@@ -558,6 +559,13 @@ open class Tabulator<T : Any>(
         jsTabulator?.navigateDown()
     }
 
+    internal fun removeCustomEditors() {
+        EditorRoot.cancel?.invoke(null)
+        EditorRoot.disposeTimer?.let { window.clearTimeout(it) }
+        EditorRoot.root?.dispose()
+        EditorRoot.root = null
+    }
+
     companion object {
         internal var counter = 0
 
-- 
cgit 


From 701ba56f6f69d84249a0afb52464ef405961033f Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Fri, 21 Jun 2019 22:38:07 +0200
Subject: Additional fixes to allow non-serializable classes inside Tabulator
 data model.

---
 .../pl/treksoft/kvision/tabulator/Options.kt       | 530 +++++++++++----------
 .../pl/treksoft/kvision/tabulator/Tabulator.kt     | 128 +++--
 2 files changed, 335 insertions(+), 323 deletions(-)

diff --git a/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Options.kt b/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Options.kt
index 7a9ef0ed..f5f58010 100644
--- a/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Options.kt
+++ b/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Options.kt
@@ -30,7 +30,6 @@ import pl.treksoft.kvision.panel.Root
 import pl.treksoft.kvision.tabulator.EditorRoot.disposeTimer
 import pl.treksoft.kvision.tabulator.EditorRoot.root
 import pl.treksoft.kvision.tabulator.js.Tabulator
-import pl.treksoft.kvision.utils.JSON
 import pl.treksoft.kvision.utils.obj
 import kotlin.browser.document
 import kotlin.browser.window
@@ -238,9 +237,9 @@ enum class AddRowMode(internal val mode: String) {
  * Download config options.
  */
 data class DownloadConfig(
-        val columnGroups: Boolean? = null,
-        val rowGroups: Boolean? = null,
-        val columnCalcs: Boolean? = null
+    val columnGroups: Boolean? = null,
+    val rowGroups: Boolean? = null,
+    val columnCalcs: Boolean? = null
 )
 
 /**
@@ -259,98 +258,98 @@ fun DownloadConfig.toJs(): Tabulator.DownloadConfig {
  * Column definition options.
  */
 data class ColumnDefinition<T : Any>(
-        val title: String,
-        val field: String? = null,
-        val visible: Boolean? = null,
-        val align: Align? = null,
-        val width: String? = null,
-        val minWidth: Int? = null,
-        val widthGrow: Int? = null,
-        val widthShrink: Int? = null,
-        val resizable: Boolean? = null,
-        val frozen: Boolean? = null,
-        val responsive: Int? = null,
-        val tooltip: ((cell: Tabulator.CellComponent) -> String)? = null,
-        val cssClass: String? = null,
-        val rowHandle: Boolean? = null,
-        val hideInHtml: Boolean? = null,
-        val sorter: Sorter? = null,
-        val sorterFunction: ((
-                a: dynamic, b: dynamic, aRow: Tabulator.RowComponent, bRow: Tabulator.RowComponent,
-                column: Tabulator.ColumnComponent, dir: SortingDir, sorterParams: dynamic
-        ) -> Number)? = null,
-        val sorterParams: dynamic = null,
-        val formatter: Formatter? = null,
-        val formatterFunction: ((
-                cell: Tabulator.CellComponent, formatterParams: dynamic,
-                onRendered: (callback: () -> Unit) -> Unit
-        ) -> dynamic)? = null,
-        val formatterComponentFunction: ((
-                cell: Tabulator.CellComponent, onRendered: (callback: () -> Unit) -> Unit, data: T
-        ) -> Component)? = null,
-        val formatterParams: dynamic = null,
-        val variableHeight: Boolean? = null,
-        val editable: ((cell: Tabulator.CellComponent) -> Boolean)? = null,
-        val editor: Editor? = null,
-        val editorFunction: ((
-                cell: Tabulator.CellComponent,
-                onRendered: (callback: () -> Unit) -> Unit,
-                success: (value: dynamic) -> Unit, cancel: (value: dynamic) -> Unit, editorParams: dynamic
-        ) -> dynamic)? = null,
-        val editorComponentFunction: ((
-                cell: Tabulator.CellComponent,
-                onRendered: (callback: () -> Unit) -> Unit,
-                success: (value: dynamic) -> Unit, cancel: (value: dynamic) -> Unit, data: T
-        ) -> Component)? = null,
-        val editorParams: dynamic = null,
-        val validator: Validator? = null,
-        val validatorFunction: dynamic = null,
-        val validatorParams: String? = null,
-        val download: Boolean? = null,
-        val downloadTitle: String? = null,
-        val topCalc: Calc? = null,
-        val topCalcParams: dynamic = null,
-        val topCalcFormatter: Formatter? = null,
-        val topCalcFormatterParams: dynamic = null,
-        val bottomCalc: Calc? = null,
-        val bottomCalcParams: dynamic = null,
-        val bottomCalcFormatter: Formatter? = null,
-        val bottomCalcFormatterParams: dynamic = null,
-        val headerSort: Boolean? = null,
-        val headerSortStartingDir: SortingDir? = null,
-        val headerSortTristate: Boolean? = null,
-        val headerClick: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
-        val headerDblClick: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
-        val headerContext: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
-        val headerTap: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
-        val headerDblTap: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
-        val headerTapHold: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
-        val headerTooltip: ((column: Tabulator.ColumnComponent) -> String)? = null,
-        val headerVertical: Boolean? = null,
-        val editableTitle: Boolean? = null,
-        val titleFormatter: Formatter? = null,
-        val titleFormatterParams: dynamic = null,
-        val headerFilter: Editor? = null,
-        val headerFilterParams: dynamic = null,
-        val headerFilterPlaceholder: String? = null,
-        val headerFilterEmptyCheck: ((value: Any) -> Boolean)? = null,
-        val headerFilterFunc: Filter? = null,
-        val headerFilterFuncParams: dynamic = null,
-        val headerFilterLiveFilter: Boolean? = null,
-        val cellClick: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellDblClick: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellContext: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellTap: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellDblTap: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellTapHold: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellMouseEnter: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellMouseLeave: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellMouseOver: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellMouseOut: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellMouseMove: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellEditing: ((cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellEdited: ((cell: Tabulator.CellComponent) -> Unit)? = null,
-        val cellEditCancelled: ((cell: Tabulator.CellComponent) -> Unit)? = null
+    val title: String,
+    val field: String? = null,
+    val visible: Boolean? = null,
+    val align: Align? = null,
+    val width: String? = null,
+    val minWidth: Int? = null,
+    val widthGrow: Int? = null,
+    val widthShrink: Int? = null,
+    val resizable: Boolean? = null,
+    val frozen: Boolean? = null,
+    val responsive: Int? = null,
+    val tooltip: ((cell: Tabulator.CellComponent) -> String)? = null,
+    val cssClass: String? = null,
+    val rowHandle: Boolean? = null,
+    val hideInHtml: Boolean? = null,
+    val sorter: Sorter? = null,
+    val sorterFunction: ((
+        a: dynamic, b: dynamic, aRow: Tabulator.RowComponent, bRow: Tabulator.RowComponent,
+        column: Tabulator.ColumnComponent, dir: SortingDir, sorterParams: dynamic
+    ) -> Number)? = null,
+    val sorterParams: dynamic = null,
+    val formatter: Formatter? = null,
+    val formatterFunction: ((
+        cell: Tabulator.CellComponent, formatterParams: dynamic,
+        onRendered: (callback: () -> Unit) -> Unit
+    ) -> dynamic)? = null,
+    val formatterComponentFunction: ((
+        cell: Tabulator.CellComponent, onRendered: (callback: () -> Unit) -> Unit, data: T
+    ) -> Component)? = null,
+    val formatterParams: dynamic = null,
+    val variableHeight: Boolean? = null,
+    val editable: ((cell: Tabulator.CellComponent) -> Boolean)? = null,
+    val editor: Editor? = null,
+    val editorFunction: ((
+        cell: Tabulator.CellComponent,
+        onRendered: (callback: () -> Unit) -> Unit,
+        success: (value: dynamic) -> Unit, cancel: (value: dynamic) -> Unit, editorParams: dynamic
+    ) -> dynamic)? = null,
+    val editorComponentFunction: ((
+        cell: Tabulator.CellComponent,
+        onRendered: (callback: () -> Unit) -> Unit,
+        success: (value: dynamic) -> Unit, cancel: (value: dynamic) -> Unit, data: T
+    ) -> Component)? = null,
+    val editorParams: dynamic = null,
+    val validator: Validator? = null,
+    val validatorFunction: dynamic = null,
+    val validatorParams: String? = null,
+    val download: Boolean? = null,
+    val downloadTitle: String? = null,
+    val topCalc: Calc? = null,
+    val topCalcParams: dynamic = null,
+    val topCalcFormatter: Formatter? = null,
+    val topCalcFormatterParams: dynamic = null,
+    val bottomCalc: Calc? = null,
+    val bottomCalcParams: dynamic = null,
+    val bottomCalcFormatter: Formatter? = null,
+    val bottomCalcFormatterParams: dynamic = null,
+    val headerSort: Boolean? = null,
+    val headerSortStartingDir: SortingDir? = null,
+    val headerSortTristate: Boolean? = null,
+    val headerClick: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
+    val headerDblClick: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
+    val headerContext: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
+    val headerTap: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
+    val headerDblTap: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
+    val headerTapHold: ((e: dynamic, column: Tabulator.ColumnComponent) -> Unit)? = null,
+    val headerTooltip: ((column: Tabulator.ColumnComponent) -> String)? = null,
+    val headerVertical: Boolean? = null,
+    val editableTitle: Boolean? = null,
+    val titleFormatter: Formatter? = null,
+    val titleFormatterParams: dynamic = null,
+    val headerFilter: Editor? = null,
+    val headerFilterParams: dynamic = null,
+    val headerFilterPlaceholder: String? = null,
+    val headerFilterEmptyCheck: ((value: Any) -> Boolean)? = null,
+    val headerFilterFunc: Filter? = null,
+    val headerFilterFuncParams: dynamic = null,
+    val headerFilterLiveFilter: Boolean? = null,
+    val cellClick: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellDblClick: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellContext: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellTap: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellDblTap: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellTapHold: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellMouseEnter: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellMouseLeave: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellMouseOver: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellMouseOut: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellMouseMove: ((e: dynamic, cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellEditing: ((cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellEdited: ((cell: Tabulator.CellComponent) -> Unit)? = null,
+    val cellEditCancelled: ((cell: Tabulator.CellComponent) -> Unit)? = null
 )
 
 internal object EditorRoot {
@@ -364,7 +363,7 @@ internal object EditorRoot {
  */
 @Suppress("UNCHECKED_CAST_TO_EXTERNAL_INTERFACE", "ComplexMethod", "MagicNumber")
 fun <T : Any> ColumnDefinition<T>.toJs(
-        i18nTranslator: (String) -> (String)
+    i18nTranslator: (String) -> (String)
 ): Tabulator.ColumnDefinition {
     val tmpEditorFunction = editorComponentFunction?.let {
         { cell: Tabulator.CellComponent,
@@ -518,160 +517,160 @@ fun <T : Any> ColumnDefinition<T>.toJs(
  * Tabulator options.
  */
 data class TabulatorOptions<T : Any>(
-        val height: String? = null,
-        val virtualDom: Boolean? = null,
-        val virtualDomBuffer: Int? = null,
-        val placeholder: String? = null,
-        val footerElement: String? = null,
-        val tooltips: ((cell: Tabulator.CellComponent) -> String)? = null,
-        val tooltipGenerationMode: TooltipGenerationMode? = null,
-        val history: Boolean? = null,
-        val keybindings: dynamic = null,
-        val downloadDataFormatter: dynamic = null,
-        val downloadConfig: DownloadConfig? = null,
-        val reactiveData: Boolean? = null,
-        val autoResize: Boolean? = null,
-        val columns: List<ColumnDefinition<T>>? = null,
-        val autoColumns: Boolean? = null,
-        val layout: Layout? = null,
-        val layoutColumnsOnNewData: Boolean? = null,
-        val responsiveLayout: ResponsiveLayout? = null,
-        val responsiveLayoutCollapseStartOpen: Boolean? = null,
-        val responsiveLayoutCollapseUseFormatters: Boolean? = null,
-        val columnMinWidth: Int? = null,
-        val resizableColumns: Boolean? = null,
-        val movableColumns: Boolean? = null,
-        val tooltipsHeader: Boolean? = null,
-        val headerFilterPlaceholder: String? = null,
-        val scrollToColumnPosition: ColumnPosition? = null,
-        val scrollToColumnIfVisible: Boolean? = null,
-        val rowFormatter: ((row: Tabulator.RowComponent) -> Unit)? = null,
-        val addRowPos: RowPos? = null,
-        val selectable: dynamic = null,
-        val selectableRangeMode: RangeMode? = null,
-        val selectableRollingSelection: Boolean? = null,
-        val selectablePersistence: Boolean? = null,
-        val selectableCheck: ((row: Tabulator.RowComponent) -> Boolean)? = null,
-        val movableRows: Boolean? = null,
-        val movableRowsConnectedTables: dynamic = null,
-        val movableRowsSender: dynamic = null,
-        val movableRowsReceiver: dynamic = null,
-        val resizableRows: Boolean? = null,
-        val scrollToRowPosition: RowPosition? = null,
-        val scrollToRowIfVisible: Boolean? = null,
-        val index: String? = null,
-        @Suppress("ArrayInDataClass") var data: Array<T>? = null,
-        val ajaxURL: String? = null,
-        val ajaxParams: dynamic = null,
-        val ajaxConfig: dynamic = null,
-        val ajaxContentType: dynamic = null,
-        val ajaxURLGenerator: ((url: String, config: dynamic, params: dynamic) -> String)? = null,
-        val ajaxRequestFunc: ((url: String, config: dynamic, params: dynamic) -> Promise<Any>)? = null,
-        val ajaxFiltering: Boolean? = null,
-        val ajaxSorting: Boolean? = null,
-        val ajaxProgressiveLoad: ProgressiveMode? = null,
-        val ajaxProgressiveLoadDelay: Int? = null,
-        val ajaxProgressiveLoadScrollMargin: Int? = null,
-        val ajaxLoader: Boolean? = null,
-        val ajaxLoaderLoading: String? = null,
-        val ajaxLoaderError: String? = null,
-        val initialSort: List<Tabulator.Sorter>? = null,
-        val sortOrderReverse: Boolean? = null,
-        val initialFilter: List<Tabulator.Filter>? = null,
-        val initialHeaderFilter: List<Any?>? = null,
-        val pagination: PaginationMode? = null,
-        val paginationSize: Int? = null,
-        val paginationSizeSelector: Boolean? = null,
-        val paginationElement: dynamic = null,
-        val paginationDataReceived: dynamic = null,
-        val paginationDataSent: dynamic = null,
-        val paginationAddRow: AddRowMode? = null,
-        val paginationButtonCount: Int? = null,
-        var persistenceID: String? = null,
-        var persistenceMode: Boolean? = null,
-        var persistentLayout: Boolean? = null,
-        var persistentSort: Boolean? = null,
-        var persistentFilter: Boolean? = null,
-        val locale: String? = null,
-        var langs: dynamic = null,
-        val localized: ((locale: String, lang: dynamic) -> Unit)? = null,
-        val dataTreeRowExpanded: ((row: Tabulator.RowComponent, level: Number) -> Unit)? = null,
-        val dataTreeRowCollapsed: ((row: Tabulator.RowComponent, level: Number) -> Unit)? = null,
-        val movableRowsSendingStart: ((toTables: Array<Any>) -> Unit)? = null,
-        val movableRowsSent: ((
-                fromRow: Tabulator.RowComponent,
-                toRow: Tabulator.RowComponent, toTable: Tabulator
-        ) -> Unit)? = null,
-        val movableRowsSentFailed: ((
-                fromRow: Tabulator.RowComponent,
-                toRow: Tabulator.RowComponent, toTable: Tabulator
-        ) -> Unit)? = null,
-        val movableRowsSendingStop: ((toTables: Array<Any>) -> Unit)? = null,
-        val movableRowsReceivingStart: ((fromRow: Tabulator.RowComponent, toTable: Tabulator) -> Unit)? = null,
-        val movableRowsReceived: ((
-                fromRow: Tabulator.RowComponent,
-                toRow: Tabulator.RowComponent, fromTable: Tabulator
-        ) -> Unit)? = null,
-        val movableRowsReceivedFailed: ((
-                fromRow: Tabulator.RowComponent,
-                toRow: Tabulator.RowComponent, fromTable: Tabulator
-        ) -> Unit)? = null,
-        val movableRowsReceivingStop: ((fromTable: Tabulator) -> Unit)? = null,
-        var rowClick: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowDblClick: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowContext: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowTap: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowDblTap: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowTapHold: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowMouseEnter: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowMouseLeave: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowMouseOver: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowMouseOut: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowMouseMove: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowAdded: ((row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowUpdated: ((row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowDeleted: ((row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowMoved: ((row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowResized: ((row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowSelectionChanged: ((data: Array<Any>, rows: Array<Tabulator.RowComponent>) -> Unit)? = null,
-        var rowSelected: ((row: Tabulator.RowComponent) -> Unit)? = null,
-        var rowDeselected: ((row: Tabulator.RowComponent) -> Unit)? = null,
-        var cellClick: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellDblClick: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellContext: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellTap: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellDblTap: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellTapHold: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellMouseEnter: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellMouseLeave: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellMouseOver: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellMouseOut: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellMouseMove: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellEditing: ((cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellEdited: ((cell: Tabulator.CellComponent) -> Unit)? = null,
-        var cellEditCancelled: ((cell: Tabulator.CellComponent) -> Unit)? = null,
-        var columnMoved: ((column: Tabulator.ColumnComponent, columns: Array<dynamic>) -> Unit)? = null,
-        var columnResized: ((column: Tabulator.ColumnComponent) -> Unit)? = null,
-        var columnVisibilityChanged: ((column: Tabulator.ColumnComponent, visible: Boolean) -> Unit)? = null,
-        var columnTitleChanged: ((column: Tabulator.ColumnComponent) -> Unit)? = null,
-        var tableBuilding: (() -> Unit)? = null,
-        var tableBuilt: (() -> Unit)? = null,
-        var renderStarted: (() -> Unit)? = null,
-        var renderComplete: (() -> Unit)? = null,
-        var htmlImporting: (() -> Unit)? = null,
-        var htmlImported: (() -> Unit)? = null,
-        var dataLoading: ((data: List<T>) -> Unit)? = null,
-        var dataLoaded: ((data: List<T>) -> Unit)? = null,
-        var dataEdited: ((data: List<T>) -> Unit)? = null,
-        var pageLoaded: ((pageno: Int) -> Unit)? = null,
-        var dataSorting: ((sorters: Array<Tabulator.Sorter>) -> Unit)? = null,
-        var dataSorted: ((sorters: Array<Tabulator.Sorter>, rows: Array<Tabulator.RowComponent>) -> Unit)? = null,
-        var dataFiltering: ((filters: Array<Tabulator.Filter>) -> Unit)? = null,
-        var dataFiltered: ((filters: Array<Tabulator.Filter>, rows: Array<Tabulator.RowComponent>) -> Unit)? = null,
-        var validationFailed: ((cell: Tabulator.CellComponent, value: Any, validators: dynamic) -> Unit)? = null,
-        var ajaxRequesting: ((url: String, params: dynamic) -> Boolean)? = null,
-        var ajaxResponse: ((url: String, params: dynamic, response: dynamic) -> Any)? = null,
-        var ajaxError: ((xhr: dynamic, textStatus: String, errorThrown: dynamic) -> Unit)? = null
+    val height: String? = null,
+    val virtualDom: Boolean? = null,
+    val virtualDomBuffer: Int? = null,
+    val placeholder: String? = null,
+    val footerElement: String? = null,
+    val tooltips: ((cell: Tabulator.CellComponent) -> String)? = null,
+    val tooltipGenerationMode: TooltipGenerationMode? = null,
+    val history: Boolean? = null,
+    val keybindings: dynamic = null,
+    val downloadDataFormatter: dynamic = null,
+    val downloadConfig: DownloadConfig? = null,
+    val reactiveData: Boolean? = null,
+    val autoResize: Boolean? = null,
+    val columns: List<ColumnDefinition<T>>? = null,
+    val autoColumns: Boolean? = null,
+    val layout: Layout? = null,
+    val layoutColumnsOnNewData: Boolean? = null,
+    val responsiveLayout: ResponsiveLayout? = null,
+    val responsiveLayoutCollapseStartOpen: Boolean? = null,
+    val responsiveLayoutCollapseUseFormatters: Boolean? = null,
+    val columnMinWidth: Int? = null,
+    val resizableColumns: Boolean? = null,
+    val movableColumns: Boolean? = null,
+    val tooltipsHeader: Boolean? = null,
+    val headerFilterPlaceholder: String? = null,
+    val scrollToColumnPosition: ColumnPosition? = null,
+    val scrollToColumnIfVisible: Boolean? = null,
+    val rowFormatter: ((row: Tabulator.RowComponent) -> Unit)? = null,
+    val addRowPos: RowPos? = null,
+    val selectable: dynamic = null,
+    val selectableRangeMode: RangeMode? = null,
+    val selectableRollingSelection: Boolean? = null,
+    val selectablePersistence: Boolean? = null,
+    val selectableCheck: ((row: Tabulator.RowComponent) -> Boolean)? = null,
+    val movableRows: Boolean? = null,
+    val movableRowsConnectedTables: dynamic = null,
+    val movableRowsSender: dynamic = null,
+    val movableRowsReceiver: dynamic = null,
+    val resizableRows: Boolean? = null,
+    val scrollToRowPosition: RowPosition? = null,
+    val scrollToRowIfVisible: Boolean? = null,
+    val index: String? = null,
+    @Suppress("ArrayInDataClass") var data: Array<T>? = null,
+    val ajaxURL: String? = null,
+    val ajaxParams: dynamic = null,
+    val ajaxConfig: dynamic = null,
+    val ajaxContentType: dynamic = null,
+    val ajaxURLGenerator: ((url: String, config: dynamic, params: dynamic) -> String)? = null,
+    val ajaxRequestFunc: ((url: String, config: dynamic, params: dynamic) -> Promise<Any>)? = null,
+    val ajaxFiltering: Boolean? = null,
+    val ajaxSorting: Boolean? = null,
+    val ajaxProgressiveLoad: ProgressiveMode? = null,
+    val ajaxProgressiveLoadDelay: Int? = null,
+    val ajaxProgressiveLoadScrollMargin: Int? = null,
+    val ajaxLoader: Boolean? = null,
+    val ajaxLoaderLoading: String? = null,
+    val ajaxLoaderError: String? = null,
+    val initialSort: List<Tabulator.Sorter>? = null,
+    val sortOrderReverse: Boolean? = null,
+    val initialFilter: List<Tabulator.Filter>? = null,
+    val initialHeaderFilter: List<Any?>? = null,
+    val pagination: PaginationMode? = null,
+    val paginationSize: Int? = null,
+    val paginationSizeSelector: Boolean? = null,
+    val paginationElement: dynamic = null,
+    val paginationDataReceived: dynamic = null,
+    val paginationDataSent: dynamic = null,
+    val paginationAddRow: AddRowMode? = null,
+    val paginationButtonCount: Int? = null,
+    var persistenceID: String? = null,
+    var persistenceMode: Boolean? = null,
+    var persistentLayout: Boolean? = null,
+    var persistentSort: Boolean? = null,
+    var persistentFilter: Boolean? = null,
+    val locale: String? = null,
+    var langs: dynamic = null,
+    val localized: ((locale: String, lang: dynamic) -> Unit)? = null,
+    val dataTreeRowExpanded: ((row: Tabulator.RowComponent, level: Number) -> Unit)? = null,
+    val dataTreeRowCollapsed: ((row: Tabulator.RowComponent, level: Number) -> Unit)? = null,
+    val movableRowsSendingStart: ((toTables: Array<Any>) -> Unit)? = null,
+    val movableRowsSent: ((
+        fromRow: Tabulator.RowComponent,
+        toRow: Tabulator.RowComponent, toTable: Tabulator
+    ) -> Unit)? = null,
+    val movableRowsSentFailed: ((
+        fromRow: Tabulator.RowComponent,
+        toRow: Tabulator.RowComponent, toTable: Tabulator
+    ) -> Unit)? = null,
+    val movableRowsSendingStop: ((toTables: Array<Any>) -> Unit)? = null,
+    val movableRowsReceivingStart: ((fromRow: Tabulator.RowComponent, toTable: Tabulator) -> Unit)? = null,
+    val movableRowsReceived: ((
+        fromRow: Tabulator.RowComponent,
+        toRow: Tabulator.RowComponent, fromTable: Tabulator
+    ) -> Unit)? = null,
+    val movableRowsReceivedFailed: ((
+        fromRow: Tabulator.RowComponent,
+        toRow: Tabulator.RowComponent, fromTable: Tabulator
+    ) -> Unit)? = null,
+    val movableRowsReceivingStop: ((fromTable: Tabulator) -> Unit)? = null,
+    var rowClick: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowDblClick: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowContext: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowTap: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowDblTap: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowTapHold: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowMouseEnter: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowMouseLeave: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowMouseOver: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowMouseOut: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowMouseMove: ((e: dynamic, row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowAdded: ((row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowUpdated: ((row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowDeleted: ((row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowMoved: ((row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowResized: ((row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowSelectionChanged: ((data: Array<Any>, rows: Array<Tabulator.RowComponent>) -> Unit)? = null,
+    var rowSelected: ((row: Tabulator.RowComponent) -> Unit)? = null,
+    var rowDeselected: ((row: Tabulator.RowComponent) -> Unit)? = null,
+    var cellClick: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellDblClick: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellContext: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellTap: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellDblTap: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellTapHold: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellMouseEnter: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellMouseLeave: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellMouseOver: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellMouseOut: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellMouseMove: ((e: Any, cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellEditing: ((cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellEdited: ((cell: Tabulator.CellComponent) -> Unit)? = null,
+    var cellEditCancelled: ((cell: Tabulator.CellComponent) -> Unit)? = null,
+    var columnMoved: ((column: Tabulator.ColumnComponent, columns: Array<dynamic>) -> Unit)? = null,
+    var columnResized: ((column: Tabulator.ColumnComponent) -> Unit)? = null,
+    var columnVisibilityChanged: ((column: Tabulator.ColumnComponent, visible: Boolean) -> Unit)? = null,
+    var columnTitleChanged: ((column: Tabulator.ColumnComponent) -> Unit)? = null,
+    var tableBuilding: (() -> Unit)? = null,
+    var tableBuilt: (() -> Unit)? = null,
+    var renderStarted: (() -> Unit)? = null,
+    var renderComplete: (() -> Unit)? = null,
+    var htmlImporting: (() -> Unit)? = null,
+    var htmlImported: (() -> Unit)? = null,
+    var dataLoading: ((data: List<T>) -> Unit)? = null,
+    var dataLoaded: ((data: List<T>) -> Unit)? = null,
+    var dataEdited: ((data: List<T>) -> Unit)? = null,
+    var pageLoaded: ((pageno: Int) -> Unit)? = null,
+    var dataSorting: ((sorters: Array<Tabulator.Sorter>) -> Unit)? = null,
+    var dataSorted: ((sorters: Array<Tabulator.Sorter>, rows: Array<Tabulator.RowComponent>) -> Unit)? = null,
+    var dataFiltering: ((filters: Array<Tabulator.Filter>) -> Unit)? = null,
+    var dataFiltered: ((filters: Array<Tabulator.Filter>, rows: Array<Tabulator.RowComponent>) -> Unit)? = null,
+    var validationFailed: ((cell: Tabulator.CellComponent, value: Any, validators: dynamic) -> Unit)? = null,
+    var ajaxRequesting: ((url: String, params: dynamic) -> Boolean)? = null,
+    var ajaxResponse: ((url: String, params: dynamic, response: dynamic) -> Any)? = null,
+    var ajaxError: ((xhr: dynamic, textStatus: String, errorThrown: dynamic) -> Unit)? = null
 )
 
 /**
@@ -679,7 +678,7 @@ data class TabulatorOptions<T : Any>(
  */
 @Suppress("UNCHECKED_CAST_TO_EXTERNAL_INTERFACE", "ComplexMethod")
 fun <T : Any> TabulatorOptions<T>.toJs(
-        i18nTranslator: (String) -> (String)
+    i18nTranslator: (String) -> (String)
 ): Tabulator.Options {
     val tmpCellEditCancelled = this.columns?.find { it.editorComponentFunction != null }?.let {
         { cell: Tabulator.CellComponent ->
@@ -712,9 +711,9 @@ fun <T : Any> TabulatorOptions<T>.toJs(
         if (layoutColumnsOnNewData != null) this.layoutColumnsOnNewData = layoutColumnsOnNewData
         if (responsiveLayout != null) this.responsiveLayout = responsiveLayout.layout
         if (responsiveLayoutCollapseStartOpen != null) this.responsiveLayoutCollapseStartOpen =
-                responsiveLayoutCollapseStartOpen
+            responsiveLayoutCollapseStartOpen
         if (responsiveLayoutCollapseUseFormatters != null) this.responsiveLayoutCollapseUseFormatters =
-                responsiveLayoutCollapseUseFormatters
+            responsiveLayoutCollapseUseFormatters
         if (columnMinWidth != null) this.columnMinWidth = columnMinWidth
         if (resizableColumns != null) this.resizableColumns = resizableColumns
         if (movableColumns != null) this.movableColumns = movableColumns
@@ -749,7 +748,7 @@ fun <T : Any> TabulatorOptions<T>.toJs(
         if (ajaxProgressiveLoad != null) this.ajaxProgressiveLoad = ajaxProgressiveLoad.mode
         if (ajaxProgressiveLoadDelay != null) this.ajaxProgressiveLoadDelay = ajaxProgressiveLoadDelay
         if (ajaxProgressiveLoadScrollMargin != null) this.ajaxProgressiveLoadScrollMargin =
-                ajaxProgressiveLoadScrollMargin
+            ajaxProgressiveLoadScrollMargin
         if (ajaxLoader != null) this.ajaxLoader = ajaxLoader
         if (ajaxLoaderLoading != null) this.ajaxLoaderLoading = i18nTranslator(ajaxLoaderLoading)
         if (ajaxLoaderError != null) this.ajaxLoaderError = i18nTranslator(ajaxLoaderError)
@@ -828,9 +827,24 @@ fun <T : Any> TabulatorOptions<T>.toJs(
         if (renderComplete != null) this.renderComplete = renderComplete
         if (htmlImporting != null) this.htmlImporting = htmlImporting
         if (htmlImported != null) this.htmlImported = htmlImported
-        if (dataLoading != null) this.dataLoading = dataLoading
-        if (dataLoaded != null) this.dataLoaded = dataLoaded
-        if (dataEdited != null) this.dataEdited = dataEdited
+        val dataLoadingFun = dataLoading?.let {
+            { data: Array<T> ->
+                it(data.toList())
+            }
+        }
+        if (dataLoadingFun != null) this.dataLoading = dataLoadingFun
+        val dataLoadedFun = dataLoaded?.let {
+            { data: Array<T> ->
+                it(data.toList())
+            }
+        }
+        if (dataLoadedFun != null) this.dataLoaded = dataLoadedFun
+        val dataEditedFun = dataEdited?.let {
+            { data: Array<T> ->
+                it(data.toList())
+            }
+        }
+        if (dataEditedFun != null) this.dataEdited = dataEditedFun
         if (pageLoaded != null) this.pageLoaded = pageLoaded
         if (dataSorting != null) this.dataSorting = dataSorting
         if (dataSorted != null) this.dataSorted = dataSorted
diff --git a/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Tabulator.kt b/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Tabulator.kt
index c609a400..bd17d7bf 100644
--- a/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Tabulator.kt
+++ b/kvision-modules/kvision-tabulator/src/main/kotlin/pl/treksoft/kvision/tabulator/Tabulator.kt
@@ -23,25 +23,20 @@ package pl.treksoft.kvision.tabulator
 
 import com.github.snabbdom.VNode
 import com.lightningkite.kotlin.observable.list.ObservableList
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.list
-import kotlinx.serialization.serializer
 import org.w3c.dom.HTMLElement
 import pl.treksoft.kvision.KVManagerTabulator
 import pl.treksoft.kvision.core.Container
 import pl.treksoft.kvision.core.StringBoolPair
 import pl.treksoft.kvision.core.Widget
 import pl.treksoft.kvision.i18n.I18n
+import pl.treksoft.kvision.redux.ReduxStore
 import pl.treksoft.kvision.table.TableType
-import pl.treksoft.kvision.utils.JSON
 import pl.treksoft.kvision.utils.createInstance
 import pl.treksoft.kvision.utils.obj
 import pl.treksoft.kvision.utils.syncWithList
 import redux.RAction
 import kotlin.browser.window
 import pl.treksoft.kvision.tabulator.js.Tabulator as JsTabulator
-import redux.RAction
-import pl.treksoft.kvision.redux.*
 
 /**
  * Tabulator component.
@@ -56,13 +51,13 @@ import pl.treksoft.kvision.redux.*
  */
 @Suppress("LargeClass", "TooManyFunctions")
 open class Tabulator<T : Any>(
-        protected val data: List<T>? = null,
-        protected val dataUpdateOnEdit: Boolean = true,
-        val options: TabulatorOptions<T> = TabulatorOptions(),
-        types: Set<TableType> = setOf(),
-        classes: Set<String> = setOf()
+    protected val data: List<T>? = null,
+    protected val dataUpdateOnEdit: Boolean = true,
+    val options: TabulatorOptions<T> = TabulatorOptions(),
+    types: Set<TableType> = setOf(),
+    classes: Set<String> = setOf()
 ) :
-        Widget(classes) {
+    Widget(classes) {
 
     /**
      * Table types.
@@ -213,8 +208,8 @@ open class Tabulator<T : Any>(
     protected fun createJsTabulator() {
         (this.getElement() as? HTMLElement)?.let {
             jsTabulator =
-                    KVManagerTabulator.getConstructor()
-                            .createInstance(it, options.toJs(this::translate))
+                KVManagerTabulator.getConstructor()
+                    .createInstance(it, options.toJs(this::translate))
             if (currentPage != null) {
                 jsTabulator?.setPageSize(pageSize ?: 0)
                 jsTabulator?.setPage(currentPage)
@@ -251,6 +246,9 @@ open class Tabulator<T : Any>(
     open fun replaceData(data: Array<T>) {
         @Suppress("UnsafeCastFromDynamic")
         options.data = data
+        if ((getElementJQuery()?.find(".tabulator-editing")?.length?.toInt() ?: 0) > 0) {
+            this.removeCustomEditors()
+        }
         jsTabulator?.replaceData(data, null, null)
     }
 
@@ -269,10 +267,10 @@ open class Tabulator<T : Any>(
      * @param active return only visible data
      * @return current data
      */
+    @Suppress("UNCHECKED_CAST")
     open fun getData(active: Boolean): List<T>? {
         return if (jsTabulator != null) {
-            val native = jsTabulator?.getData(active) as? List<T>
-            native
+            jsTabulator?.getData(active)?.toList() as? List<T>
         } else {
             data
         }
@@ -282,10 +280,10 @@ open class Tabulator<T : Any>(
      * Returns the selected data in the table.
      * @return selected data
      */
+    @Suppress("UNCHECKED_CAST")
     open fun getSelectedData(): List<T> {
         return if (jsTabulator != null) {
-            val native = jsTabulator?.getSelectedData() as List<T>
-            native
+            jsTabulator?.getSelectedData()?.toList() as List<T>
         } else {
             listOf()
         }
@@ -339,9 +337,9 @@ open class Tabulator<T : Any>(
      * @param ifVisible scroll to already visible row
      */
     open fun scrollToRow(
-            row: Int,
-            position: RowPosition? = null,
-            ifVisible: Boolean? = null
+        row: Int,
+        position: RowPosition? = null,
+        ifVisible: Boolean? = null
     ) {
         jsTabulator?.scrollToRow(row, position, ifVisible)
     }
@@ -545,13 +543,13 @@ open class Tabulator<T : Any>(
          *
          * It takes the same parameters as the constructor of the built component.
          */
-        inline fun <reified T : Any> Container.tabulator(
-                data: List<T>? = null,
-                dataUpdateOnEdit: Boolean = true,
-                options: TabulatorOptions<T> = TabulatorOptions(),
-                types: Set<TableType> = setOf(),
-                classes: Set<String> = setOf(),
-                noinline init: (Tabulator<T>.() -> Unit)? = null
+        fun <T : Any> Container.tabulator(
+            data: List<T>? = null,
+            dataUpdateOnEdit: Boolean = true,
+            options: TabulatorOptions<T> = TabulatorOptions(),
+            types: Set<TableType> = setOf(),
+            classes: Set<String> = setOf(),
+            init: (Tabulator<T>.() -> Unit)? = null
         ): Tabulator<T> {
             val tabulator = create(data, dataUpdateOnEdit, options, types, classes)
             init?.invoke(tabulator)
@@ -562,13 +560,13 @@ open class Tabulator<T : Any>(
         /**
          * DSL builder extension function for general redux store.
          */
-        inline fun <reified T : Any, S : Any, A: RAction> Container.tabulator(
-                store: ReduxStore<S, A>,
-                noinline dataFactory: (S) -> List<T>,
-                options: TabulatorOptions<T> = TabulatorOptions(),
-                types: Set<TableType> = setOf(),
-                classes: Set<String> = setOf(),
-                noinline init: (Tabulator<T>.() -> Unit)? = null
+        fun <T : Any, S : Any, A : RAction> Container.tabulator(
+            store: ReduxStore<S, A>,
+            dataFactory: (S) -> List<T>,
+            options: TabulatorOptions<T> = TabulatorOptions(),
+            types: Set<TableType> = setOf(),
+            classes: Set<String> = setOf(),
+            init: (Tabulator<T>.() -> Unit)? = null
         ): Tabulator<T> {
             val tabulator = create(store, dataFactory, options, types, classes)
             init?.invoke(tabulator)
@@ -579,12 +577,12 @@ open class Tabulator<T : Any>(
         /**
          * DSL builder extension function for dedicated redux store (backed with a list).
          */
-        inline fun <reified T : Any, A: RAction> Container.tabulator(
-                store: ReduxStore<List<T>, A>,
-                options: TabulatorOptions<T> = TabulatorOptions(),
-                types: Set<TableType> = setOf(),
-                classes: Set<String> = setOf(),
-                noinline init: (Tabulator<T>.() -> Unit)? = null
+        fun <T : Any, A : RAction> Container.tabulator(
+            store: ReduxStore<List<T>, A>,
+            options: TabulatorOptions<T> = TabulatorOptions(),
+            types: Set<TableType> = setOf(),
+            classes: Set<String> = setOf(),
+            init: (Tabulator<T>.() -> Unit)? = null
         ): Tabulator<T> {
             val tabulator = create(store, options, types, classes)
             init?.invoke(tabulator)
@@ -596,10 +594,10 @@ open class Tabulator<T : Any>(
          * DSL builder extension function for dynamic data (send within options parameter).
          */
         fun <T : Any> Container.tabulator(
-                options: TabulatorOptions<T> = TabulatorOptions(),
-                types: Set<TableType> = setOf(),
-                classes: Set<String> = setOf(),
-                init: (Tabulator<T>.() -> Unit)? = null
+            options: TabulatorOptions<T> = TabulatorOptions(),
+            types: Set<TableType> = setOf(),
+            classes: Set<String> = setOf(),
+            init: (Tabulator<T>.() -> Unit)? = null
         ): Tabulator<T> {
             val tabulator = Tabulator(dataUpdateOnEdit = false, options = options, types = types, classes = classes)
             init?.invoke(tabulator)
@@ -610,13 +608,13 @@ open class Tabulator<T : Any>(
         /**
          * A helper function to create a Tabulator object with correct serializer.
          */
-        inline fun <reified T : Any> create(
-                data: List<T>? = null,
-                dataUpdateOnEdit: Boolean = true,
-                options: TabulatorOptions<T> = TabulatorOptions(),
-                types: Set<TableType> = setOf(),
-                classes: Set<String> = setOf(),
-                noinline init: (Tabulator<T>.() -> Unit)? = null
+        fun <T : Any> create(
+            data: List<T>? = null,
+            dataUpdateOnEdit: Boolean = true,
+            options: TabulatorOptions<T> = TabulatorOptions(),
+            types: Set<TableType> = setOf(),
+            classes: Set<String> = setOf(),
+            init: (Tabulator<T>.() -> Unit)? = null
         ): Tabulator<T> {
             val tabulator = Tabulator(data, dataUpdateOnEdit, options, types, classes)
             init?.invoke(tabulator)
@@ -626,13 +624,13 @@ open class Tabulator<T : Any>(
         /**
          * A helper function to create a Tabulator object with correct serializer and general redux store.
          */
-        inline fun <reified T : Any, S : Any, A : RAction> create(
-                store: ReduxStore<S, A>,
-                noinline dataFactory: (S) -> List<T>,
-                options: TabulatorOptions<T> = TabulatorOptions(),
-                types: Set<TableType> = setOf(),
-                classes: Set<String> = setOf(),
-                noinline init: (Tabulator<T>.() -> Unit)? = null
+        fun <T : Any, S : Any, A : RAction> create(
+            store: ReduxStore<S, A>,
+            dataFactory: (S) -> List<T>,
+            options: TabulatorOptions<T> = TabulatorOptions(),
+            types: Set<TableType> = setOf(),
+            classes: Set<String> = setOf(),
+            init: (Tabulator<T>.() -> Unit)? = null
         ): Tabulator<T> {
             val data = dataFactory(store.getState())
             val tabulator = Tabulator(data, false, options, types, classes)
@@ -646,12 +644,12 @@ open class Tabulator<T : Any>(
         /**
          * A helper function to create a Tabulator object with correct serializer and dedicated redux store.
          */
-        inline fun <reified T : Any, A : RAction> create(
-                store: ReduxStore<List<T>, A>,
-                options: TabulatorOptions<T> = TabulatorOptions(),
-                types: Set<TableType> = setOf(),
-                classes: Set<String> = setOf(),
-                noinline init: (Tabulator<T>.() -> Unit)? = null
+        fun <T : Any, A : RAction> create(
+            store: ReduxStore<List<T>, A>,
+            options: TabulatorOptions<T> = TabulatorOptions(),
+            types: Set<TableType> = setOf(),
+            classes: Set<String> = setOf(),
+            init: (Tabulator<T>.() -> Unit)? = null
         ): Tabulator<T> {
             val data = store.getState()
             val tabulator = Tabulator(data, false, options, types, classes)
-- 
cgit 


From 03b0a40a8a25c2979b91bc3a5c5d2e9f7014192f Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Fri, 21 Jun 2019 23:23:22 +0200
Subject: Style fixes.

---
 detekt.yml                                         | 241 +++++++++++++++++----
 .../kotlin/pl/treksoft/kvision/KVManagerPace.kt    |   4 +-
 .../main/kotlin/pl/treksoft/kvision/pace/Pace.kt   | 139 ++++++++----
 3 files changed, 297 insertions(+), 87 deletions(-)

diff --git a/detekt.yml b/detekt.yml
index 889dba9c..14960490 100644
--- a/detekt.yml
+++ b/detekt.yml
@@ -1,24 +1,3 @@
-autoCorrect: true
-failFast: false
-
-test-pattern: # Configure exclusions for test sources
-  active: true
-  patterns: # Test file regexes
-    - '.*/test/.*'
-    - '.*Test.kt'
-    - '.*Spec.kt'
-  exclude-rule-sets:
-    - 'comments'
-  exclude-rules:
-    - 'NamingRules'
-    - 'WildcardImport'
-    - 'MagicNumber'
-    - 'MaxLineLength'
-    - 'LateinitUsage'
-    - 'StringLiteralDuplication'
-    - 'SpreadOperator'
-    - 'TooManyFunctions'
-
 build:
   maxIssues: 10
   weights:
@@ -45,22 +24,16 @@ console-reports:
   #  - 'FindingsReport'
   #  - 'BuildFailureReport'
 
-output-reports:
-  active: true
-  exclude:
-  #  - 'HtmlOutputReport'
-  #  - 'PlainOutputReport'
-  #  - 'XmlOutputReport'
-
 comments:
   active: true
+  excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
   CommentOverPrivateFunction:
     active: false
   CommentOverPrivateProperty:
     active: false
   EndOfSentenceFormat:
     active: false
-    endOfSentenceFormat: ([.?!][ \t\n\r\f<])|([.?!]$)
+    endOfSentenceFormat: ([.?!][ \t\n\r\f<])|([.?!:]$)
   UndocumentedPublicClass:
     active: false
     searchInNestedClass: true
@@ -83,18 +56,20 @@ complexity:
     active: true
     threshold: 10
     ignoreSingleWhenExpression: false
+    ignoreSimpleWhenEntries: false
   LabeledExpression:
     active: false
+    ignoredLabels: ""
   LargeClass:
     active: true
-    threshold: 150
+    threshold: 600
   LongMethod:
-    active: true
-    threshold: 20
+    active: false
+    threshold: 60
   LongParameterList:
-    active: true
+    active: false
     threshold: 6
-    ignoreDefaultParameters: true
+    ignoreDefaultParameters: false
   MethodOverloading:
     active: false
     threshold: 6
@@ -103,23 +78,28 @@ complexity:
     threshold: 4
   StringLiteralDuplication:
     active: false
+    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     threshold: 3
     ignoreAnnotation: true
     excludeStringsWithLessThan5Characters: true
     ignoreStringsRegex: '$^'
   TooManyFunctions:
     active: true
+    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     thresholdInFiles: 11
     thresholdInClasses: 11
     thresholdInInterfaces: 11
     thresholdInObjects: 11
     thresholdInEnums: 11
+    ignoreDeprecated: false
+    ignorePrivate: false
+    ignoreOverridden: false
 
 empty-blocks:
   active: true
   EmptyCatchBlock:
     active: true
-    allowedExceptionNameRegex: "^(ignore|expected).*"
+    allowedExceptionNameRegex: "^(_|(ignore|expected).*)"
   EmptyClassBlock:
     active: true
   EmptyDefaultConstructor:
@@ -134,6 +114,7 @@ empty-blocks:
     active: true
   EmptyFunctionBlock:
     active: true
+    ignoreOverriddenFunctions: false
   EmptyIfBlock:
     active: true
   EmptyInitBlock:
@@ -154,6 +135,7 @@ exceptions:
     methodNames: 'toString,hashCode,equals,finalize'
   InstanceOfCheckForException:
     active: false
+    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
   NotImplementedDeclaration:
     active: false
   PrintStackTrace:
@@ -164,6 +146,7 @@ exceptions:
     active: false
   SwallowedException:
     active: false
+    ignoredExceptionTypes: 'InterruptedException,NumberFormatException,ParseException,MalformedURLException'
   ThrowingExceptionFromFinally:
     active: false
   ThrowingExceptionInMain:
@@ -175,6 +158,7 @@ exceptions:
     active: false
   TooGenericExceptionCaught:
     active: true
+    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     exceptionNames:
      - ArrayIndexOutOfBoundsException
      - Error
@@ -184,6 +168,7 @@ exceptions:
      - IndexOutOfBoundsException
      - RuntimeException
      - Throwable
+    allowedExceptionNameRegex: "^(_|(ignore|expected).*)"
   TooGenericExceptionThrown:
     active: true
     exceptionNames:
@@ -192,27 +177,144 @@ exceptions:
      - Throwable
      - RuntimeException
 
+formatting:
+  active: true
+  android: false
+  autoCorrect: true
+  ChainWrapping:
+    active: true
+    autoCorrect: true
+  CommentSpacing:
+    active: true
+    autoCorrect: true
+  Filename:
+    active: true
+  FinalNewline:
+    active: true
+    autoCorrect: true
+  ImportOrdering:
+    active: false
+  Indentation:
+    active: true
+    autoCorrect: true
+    indentSize: 4
+    continuationIndentSize: 4
+  MaximumLineLength:
+    active: true
+    maxLineLength: 120
+  ModifierOrdering:
+    active: true
+    autoCorrect: true
+  NoBlankLineBeforeRbrace:
+    active: true
+    autoCorrect: true
+  NoConsecutiveBlankLines:
+    active: true
+    autoCorrect: true
+  NoEmptyClassBody:
+    active: true
+    autoCorrect: true
+  NoItParamInMultilineLambda:
+    active: false
+  NoLineBreakAfterElse:
+    active: true
+    autoCorrect: true
+  NoLineBreakBeforeAssignment:
+    active: true
+    autoCorrect: true
+  NoMultipleSpaces:
+    active: true
+    autoCorrect: true
+  NoSemicolons:
+    active: true
+    autoCorrect: true
+  NoTrailingSpaces:
+    active: true
+    autoCorrect: true
+  NoUnitReturn:
+    active: true
+    autoCorrect: true
+  NoUnusedImports:
+    active: true
+    autoCorrect: true
+  NoWildcardImports:
+    active: true
+    autoCorrect: true
+  PackageName:
+    active: true
+    autoCorrect: true
+  ParameterListWrapping:
+    active: true
+    autoCorrect: true
+    indentSize: 4
+  SpacingAroundColon:
+    active: true
+    autoCorrect: true
+  SpacingAroundComma:
+    active: true
+    autoCorrect: true
+  SpacingAroundCurly:
+    active: true
+    autoCorrect: true
+  SpacingAroundKeyword:
+    active: true
+    autoCorrect: true
+  SpacingAroundOperators:
+    active: true
+    autoCorrect: true
+  SpacingAroundParens:
+    active: true
+    autoCorrect: true
+  SpacingAroundRangeOperator:
+    active: true
+    autoCorrect: true
+  StringTemplate:
+    active: true
+    autoCorrect: true
+
 naming:
   active: true
   ClassNaming:
     active: true
+    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     classPattern: '[A-Z$][a-zA-Z0-9$]*'
+  ConstructorParameterNaming:
+    active: true
+    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    privateParameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
   EnumNaming:
     active: true
+    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt"
     enumEntryPattern: '^[A-Z][_a-zA-Z0-9]*'
   ForbiddenClassName:
     active: false
+    excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,*