jyapayne/karax
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
Andreas Rumpf 2017-04-27 13:47:00 +02:00
commit 1ad978804c
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
uibench/nim_uibench.nim
View file

@ -1,25 +1,25 @@
import dom, vdom, karax, karaxdsl, jdict, jstrutils, kajax import dom, vdom, karax, karaxdsl, jdict, jstrutils, kajax
type type
HomeState = object HomeState {.importc.} = ref object
TableItemState = object TableItemState {.importc.} = ref object
id: int id: int
active: bool active: bool
props: seq[cstring] props: seq[cstring]
TableState = object TableState {.importc.} = ref object
items: seq[TableItemState] items: seq[TableItemState]
AnimBoxState = object AnimBoxState {.importc.} = ref object
id: int id: int
time: int time: int
AnimState = object AnimState {.importc.} = ref object
items: seq[AnimBoxState] items: seq[AnimBoxState]
TreeNodeState = object TreeNodeState {.importc.} = ref object
id: int id: int
container: bool container: bool
children: seq[TreeNodeState] children: seq[TreeNodeState]
TreeState = object TreeState {.importc.} = ref object
root: TreeNodeState root: TreeNodeState
AppState = object AppState {.importc.} = ref object
location: cstring location: cstring
home: HomeState home: HomeState
table: TableState table: TableState
@ -27,7 +27,7 @@ type
tree: TreeState tree: TreeState
proc init*(a: cstring, b: cstring) {.importc: "uibench.init", nodecl.} proc init*(a: cstring, b: cstring) {.importc: "uibench.init", nodecl.}
proc run*(a: proc(state: AppState), b: proc(samples: any)) {.importc: "uibench.run", nodecl.} proc run*(a: proc(state: AppState), b: proc(samples: RootRef)) {.importc: "uibench.run", nodecl.}
init(cstring"Nim-karax", cstring"0.6.1") init(cstring"Nim-karax", cstring"0.6.1")
@ -44,7 +44,7 @@ proc createTableCell(id: cstring): VNode =
proc createTableRow(item: TableItemState): VNode = proc createTableRow(item: TableItemState): VNode =
var children = createTableCell("#" & &item.id) var children = createTableCell("#" & &item.id)
for i in 0..len(item.props): for i in 0..<len(item.props):
children.add(createTableCell(item.props[i])) children.add(createTableCell(item.props[i]))
var dataId = cstring($item.id) var dataId = cstring($item.id)
@ -59,7 +59,7 @@ proc createTableRow(item: TableItemState): VNode =
proc tableCreateVNode(data: TableState): VNode = proc tableCreateVNode(data: TableState): VNode =
var childrens: seq[VNode] = @[] var childrens: seq[VNode] = @[]
for i in 0..len(data.items): for i in 0..<len(data.items):
childrens.add createTableRow(data.items[i]) childrens.add createTableRow(data.items[i])
proc createTable(): VNode = proc createTable(): VNode =
@ -80,7 +80,7 @@ proc createAnimBox(item: AnimBoxState): VNode =
proc animCreateVNode(data: AnimState): VNode = proc animCreateVNode(data: AnimState): VNode =
var items = data.items var items = data.items
var children: seq[VNode] = @[] var children: seq[VNode] = @[]
for i in 0..len(children): for i in 0..<len(children):
var item = items[i] var item = items[i]
children.add createAnimBox(item) children.add createAnimBox(item)
result = buildHtml(tdiv(className="Anim")): result = buildHtml(tdiv(className="Anim")):
@ -93,7 +93,7 @@ proc createTreeLeaf(data: TreeNodeState): VNode =
proc createTreeNode(data: TreeNodeState): VNode = proc createTreeNode(data: TreeNodeState): VNode =
var children: seq[VNode] = @[] var children: seq[VNode] = @[]
for i in 0..len(data.children): for i in 0..<len(data.children):
var n = data.children[i] var n = data.children[i]
if n.container: if n.container:
children.add(createTreeNode(n)) children.add(createTreeNode(n))
@ -106,6 +106,7 @@ proc treeCreateVNode(data: TreeState): VNode =
proc update(): VNode = proc update(): VNode =
if appState == nil: return newVNode(VNodeKind.tdiv)
let location = appState.location let location = appState.location
var children: VNode = nil var children: VNode = nil
if location == cstring"table": if location == cstring"table":
@ -126,5 +127,7 @@ proc b(samples: RootRef) =
document.body.innerHTML = cstring"<pre>" & toJson(samples) & cstring"</pre>" document.body.innerHTML = cstring"<pre>" & toJson(samples) & cstring"</pre>"
redraw() redraw()
kout cstring"updating"
setRenderer update setRenderer update
kout cstring"running"
run(a, b) run(a, b)