File tree Expand file tree Collapse file tree 4 files changed +6
-8
lines changed
generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe
src/main/kotlin/org/jetbrains/kotlinx/dataframe Expand file tree Collapse file tree 4 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -201,7 +201,7 @@ public fun AnyFrame.toStaticHtml(
201
201
val id = " static_df_${nextTableId()} "
202
202
203
203
// Retrieve all columns, including nested ones
204
- val flattenedCols = getColumnsWithPaths { cols { ! it.isColumnGroup() }.recursively() }
204
+ val flattenedCols = getColumnsWithPaths { colsAtAnyDepth { ! it.isColumnGroup() } }
205
205
206
206
// Get a grid of columns for the header, as well as the side borders for each cell
207
207
val colGrid = getColumnsHeaderGrid()
@@ -389,9 +389,9 @@ private fun AnyFrame.getColumnsHeaderGrid(): List<List<ColumnWithPathWithBorder<
389
389
390
390
fun ColumnWithPath <* >.addChildren (depth : Int = 0, breadth : Int = 0) {
391
391
var breadth = breadth
392
- val children = children ()
392
+ val children = cols ()
393
393
val lastIndex = children.lastIndex
394
- for ((i, child) in children ().withIndex()) {
394
+ for ((i, child) in cols ().withIndex()) {
395
395
matrix[depth][breadth] = matrix[depth][breadth].copy(columnWithPath = child)
396
396
397
397
// draw colGroup side borders unless at start/end of table
Original file line number Diff line number Diff line change @@ -81,7 +81,6 @@ private const val message_0_16 = "Will be removed in 0.16."
81
81
82
82
// endregion
83
83
84
-
85
84
// region keep across releases
86
85
87
86
internal const val IDENTITY_FUNCTION = " This overload is an identity function and can be omitted."
Original file line number Diff line number Diff line change @@ -201,7 +201,7 @@ public fun AnyFrame.toStaticHtml(
201
201
val id = " static_df_${nextTableId()} "
202
202
203
203
// Retrieve all columns, including nested ones
204
- val flattenedCols = getColumnsWithPaths { cols { ! it.isColumnGroup() }.recursively() }
204
+ val flattenedCols = getColumnsWithPaths { colsAtAnyDepth { ! it.isColumnGroup() } }
205
205
206
206
// Get a grid of columns for the header, as well as the side borders for each cell
207
207
val colGrid = getColumnsHeaderGrid()
@@ -389,9 +389,9 @@ private fun AnyFrame.getColumnsHeaderGrid(): List<List<ColumnWithPathWithBorder<
389
389
390
390
fun ColumnWithPath <* >.addChildren (depth : Int = 0, breadth : Int = 0) {
391
391
var breadth = breadth
392
- val children = children ()
392
+ val children = cols ()
393
393
val lastIndex = children.lastIndex
394
- for ((i, child) in children ().withIndex()) {
394
+ for ((i, child) in cols ().withIndex()) {
395
395
matrix[depth][breadth] = matrix[depth][breadth].copy(columnWithPath = child)
396
396
397
397
// draw colGroup side borders unless at start/end of table
Original file line number Diff line number Diff line change @@ -81,7 +81,6 @@ private const val message_0_16 = "Will be removed in 0.16."
81
81
82
82
// endregion
83
83
84
-
85
84
// region keep across releases
86
85
87
86
internal const val IDENTITY_FUNCTION = " This overload is an identity function and can be omitted."
You can’t perform that action at this time.
0 commit comments