Commit 23f52455 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch 'origin/399-dev-multiple-trees-rc0.x' into dev

parents 32f6d3fd b20772b2
...@@ -61,12 +61,15 @@ forestLayoutCpt = here.component "forest" cpt where ...@@ -61,12 +61,15 @@ forestLayoutCpt = here.component "forest" cpt where
H.div H.div
{ className: "forest-layout__tree" } { className: "forest-layout__tree" }
[ [
treeLoader { boxes treeLoader
, frontends { boxes
, handed: handed' , frontends
, reload: reloadForest , handed: handed'
, root: treeId , reload: reloadForest
, session: s } [] , root: treeId
, session: s
, key: "tree-" <> (show treeId)
}
] ]
type Plus = ( boxes :: Boxes ) type Plus = ( boxes :: Boxes )
......
...@@ -106,9 +106,10 @@ type PerformActionProps = ...@@ -106,9 +106,10 @@ type PerformActionProps =
| PACommon ) | PACommon )
-- | Loads and renders the tree starting at the given root node id. -- | Loads and renders the tree starting at the given root node id.
treeLoader :: R2.Component LoaderProps treeLoader :: R2.Leaf ( key :: String | LoaderProps )
treeLoader = R.createElement treeLoaderCpt treeLoader = R2.leaf treeLoaderCpt
treeLoaderCpt :: R.Component LoaderProps
treeLoaderCpt :: R.Component ( key :: String | LoaderProps )
treeLoaderCpt = here.component "treeLoader" cpt where treeLoaderCpt = here.component "treeLoader" cpt where
-- treeLoaderCpt :: R.Memo LoaderProps -- treeLoaderCpt :: R.Memo LoaderProps
-- treeLoaderCpt = R.memo (here.component "treeLoader" cpt) memoCmp where -- treeLoaderCpt = R.memo (here.component "treeLoader" cpt) memoCmp where
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment