haskell/colonnade
1
0
Fork 1
mirror of https://github.com/byteverse/colonnade.git synced 2026-04-19 14:44:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix problem with cells not being hidden

Browse Source
This commit is contained in:
Andrew Martin 2017-10-05 15:28:25 -04:00
parent eeaa05d2a2
commit 0427fd82e2
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix/reflex-platform.json
View File

@ -1,7 +1,7 @@
{ {
"url": "https://github.com/reflex-frp/reflex-platform", "url": "https://github.com/reflex-frp/reflex-platform",
"rev": "1670c5b899658babeda58329d3df6b943cf6aeca", "rev": "0446e9df3adfc7271015c278a2ec5b7e7a6a46f3",
"date": "2017-05-05T11:40:26-04:00", "date": "2017-05-05T11:40:26-04:00",
"sha256": "0ry3fcxiqr43c5fghsiqn0iarj4gfvk77jkc4na7j7r3k8vjdjh2", "sha256": "0v0d53xqrmh0i01iiq1flq66gw3cb6g9894j94cflsavmhih8y1d",
"fetchSubmodules": true "fetchSubmodules": true
} }

2
reflex-dom-colonnade/reflex-dom-colonnade.cabal
View File

@ -20,7 +20,7 @@ library
base >= 4.7 && < 5.0 base >= 4.7 && < 5.0
, colonnade >= 1.1 && < 1.2 , colonnade >= 1.1 && < 1.2
, contravariant >= 1.2 && < 1.5 , contravariant >= 1.2 && < 1.5
, vector >= 0.10 && < 0.12 , vector >= 0.10 && < 0.13
, text >= 1.0 && < 1.3 , text >= 1.0 && < 1.3
, reflex == 0.5.* , reflex == 0.5.*
, reflex-dom == 0.4.* , reflex-dom == 0.4.*

14
reflex-dom-colonnade/src/Reflex/Dom/Colonnade.hs
View File

@ -600,9 +600,9 @@ paginated (Bureau tableAttrs theadAttrs bodyAttrs trAttrs) (Pagination pageSize
colLifted = PF.lmap (fmap (\(Visible _ a) -> a)) col colLifted = PF.lmap (fmap (\(Visible _ a) -> a)) col
makeVals :: Dynamic t Int -> Vector (Dynamic t (Visible a)) makeVals :: Dynamic t Int -> Vector (Dynamic t (Visible a))
makeVals page = V.generate pageSize $ \ix -> do makeVals page = V.generate pageSize $ \ix -> do
p <- page p <- page
v <- vecD v <- vecD
return (maybe (Visible False aDef) (Visible True) (v V.!? (p * pageSize + ix))) return (maybe (Visible False aDef) (Visible True) (v V.!? (p * pageSize + ix)))
totalPages :: Dynamic t Int totalPages :: Dynamic t Int
totalPages = fmap ((`divRoundUp` pageSize) . V.length) vecD totalPages = fmap ((`divRoundUp` pageSize) . V.length) vecD
hideWhenUnipage :: Dynamic t (Map Text Text) -> Dynamic t (Map Text Text) hideWhenUnipage :: Dynamic t (Map Text Text) -> Dynamic t (Map Text Text)
@ -767,7 +767,9 @@ rowSizableReified :: (Sizable t b h, Cellular t m c)
-> m e -> m e
rowSizableReified theEmpty theAppend (E.Colonnade v) a = V.foldM (\m oc -> do rowSizableReified theEmpty theAppend (E.Colonnade v) a = V.foldM (\m oc -> do
let c = E.oneColonnadeEncode oc a let c = E.oneColonnadeEncode oc a
e <- elDynAttr "td" (cellularAttrs c) $ do sz = sizableSize (E.oneColonnadeHead oc)
attrs = zipDynWith insertSizeAttr sz (cellularAttrs c)
e <- elDynAttr "td" attrs $ do
cellularContents c cellularContents c
return (theAppend m e) return (theAppend m e)
) theEmpty v ) theEmpty v
@ -778,7 +780,9 @@ rowSizable :: (Sizable t b h, Cellular t m c, Monoid e)
-> m e -> m e
rowSizable (E.Colonnade v) a = V.foldM (\m oc -> do rowSizable (E.Colonnade v) a = V.foldM (\m oc -> do
let c = E.oneColonnadeEncode oc a let c = E.oneColonnadeEncode oc a
e <- elDynAttr "td" (cellularAttrs c) $ do sz = sizableSize (E.oneColonnadeHead oc)
attrs = zipDynWith insertSizeAttr sz (cellularAttrs c)
e <- elDynAttr "td" attrs $ do
cellularContents c cellularContents c
return (mappend m e) return (mappend m e)
) mempty v ) mempty v