Skip to content
This repository was archived by the owner on Mar 1, 2023. It is now read-only.

Commit f973f9d

Browse files
committed
Added implicit conversion of VdomNode to ReactNode
1 parent 7d92ea4 commit f973f9d

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

facade/src/main/scala/react/virtualized/AutoSizer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ object AutoSizer {
5050
p.disableWidth = disableWidth
5151
p.nonce = nonce
5252
p.onResize = (s: Size) => onResize(s).runNow
53-
p.children = (s: Size) => {println(s);toRawNode(children(s))}
53+
p.children = (s: Size) => children(s).toRaw
5454
p
5555
}
5656

facade/src/main/scala/react/virtualized/Column.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,15 @@ object Column {
126126
p.dataKey = dataKey
127127
p.`aria-label` = ariaLabel
128128
p.cellDataGetter = cellDataGetter.orUndefined
129-
p.cellRenderer = Some[RawCellRenderer]((r: CellRendererParameter) => toRawNode(cellRenderer(r))).orUndefined
129+
p.cellRenderer = Some[RawCellRenderer]((r: CellRendererParameter) => cellRenderer(r).toRaw).orUndefined
130130
p.className = className
131131
p.columnData = columnData
132132
p.disableSort = disableSort
133133
p.defaultSortDirection = defaultSortDirection.toRaw
134134
p.flexGrow = flexGrow
135135
p.flexShrink = flexShrink
136136
p.headerClassName = headerClassName
137-
p.headerRenderer = (r: HeaderRendererParameter) => toRawNode(headerRenderer(r))
137+
p.headerRenderer = (r: HeaderRendererParameter) => headerRenderer(r).toRaw
138138
p.id = id
139139
p.label = label.rawNode
140140
p.maxWidth = maxWidth

facade/src/main/scala/react/virtualized/Table.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ object Table {
324324
p.gridStyle = gridStyle.map(Style.toJsObject)
325325
p.headerClassName = headerClassName
326326
p.headerStyle = headerStyle.map(Style.toJsObject)
327-
p.headerRowRenderer = (r: RawHeaderRowRendererParameter) => toRawNode(headerRowRenderer(r.className, r.columns.map(VdomNode.apply).toArray, Style.fromJsObject(r.style)))
327+
p.headerRowRenderer = (r: RawHeaderRowRendererParameter) => headerRowRenderer(r.className, r.columns.map(VdomNode.apply).toArray, Style.fromJsObject(r.style)).toRaw
328328
p.id = id
329329
p.noRowsRenderer = Some[RawNoRowsRenderer](() => noRowsRenderer.apply.rawNode).orUndefined
330330
p.overscanRowCount = overscanRowCount

facade/src/main/scala/react/virtualized/package.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ package virtualized {
9494
}
9595

9696
object defs {
97-
def toRawNode(vdomNode: VdomNode): ReactNode = vdomNode.rawNode
97+
implicit class VdomToRaw(val node: VdomNode) extends AnyVal {
98+
def toRaw: ReactNode = node.rawNode
99+
}
98100

99101
type CellRenderer = js.Function1[CellRendererParameter, VdomNode]
100102
type HeaderRenderer = js.Function1[HeaderRendererParameter, VdomNode]

0 commit comments

Comments
 (0)