a11cedf · reflex-dom · git.iko.soy

reflex-dom-core/reflex-dom-core.cabal+3−1

compare with develop

unifiedsplit

@@ -176,7 +176,9 @@ library

176 Reflex.Dom.Builder.Class.TH

177

178test-suite hlint

179− build-depends: base, hlint

179+ build-depends:

180+ base,

181+ hlint >= 3.0 && < 4.0

180 hs-source-dirs: test

182 hs-source-dirs: test

181 main-is: hlint.hs

183 main-is: hlint.hs

182 type: exitcode-stdio-1.0

184 type: exitcode-stdio-1.0

reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+2−1

@@ -9,11 +9,12 @@

9{-# LANGUAGE GeneralizedNewtypeDeriving #-}

10#if !MIN_VERSION_base(4,9,0)

11{-# LANGUAGE ImpredicativeTypes #-}

12+#else

13+{-# LANGUAGE Rank2Types #-} -- Implied by ImpredicativeTypes

12#endif

14#endif

13{-# LANGUAGE LambdaCase #-}

15{-# LANGUAGE LambdaCase #-}

14{-# LANGUAGE OverloadedStrings #-}

16{-# LANGUAGE OverloadedStrings #-}

15{-# LANGUAGE PolyKinds #-}

17{-# LANGUAGE PolyKinds #-}

16−{-# LANGUAGE Rank2Types #-}

17{-# LANGUAGE RecursiveDo #-}

18{-# LANGUAGE RecursiveDo #-}

18{-# LANGUAGE ScopedTypeVariables #-}

19{-# LANGUAGE ScopedTypeVariables #-}

19{-# LANGUAGE StandaloneDeriving #-}

20{-# LANGUAGE StandaloneDeriving #-}

reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+2−3

@@ -2,7 +2,6 @@

2{-# LANGUAGE CPP #-}

3{-# LANGUAGE ConstraintKinds #-}

4{-# LANGUAGE DataKinds #-}

5−{-# LANGUAGE DeriveFunctor #-}

6{-# LANGUAGE DeriveTraversable #-}

5{-# LANGUAGE DeriveTraversable #-}

7{-# LANGUAGE EmptyDataDecls #-}

6{-# LANGUAGE EmptyDataDecls #-}

8{-# LANGUAGE FlexibleContexts #-}

7{-# LANGUAGE FlexibleContexts #-}

@@ -1877,14 +1876,14 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda

1877 getHydrationMode >>= \case

1876 getHydrationMode >>= \case

1878 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do

1877 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do

1879 dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children

1878 dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children

1880− phs <- traverse id $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm

1879+ phs <- sequenceA $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm

1881 liftIO $ writeIORef placeholders $! phs

1880 liftIO $ writeIORef placeholders $! phs

1882 insertAfterPreviousNode lastPlaceholder

1881 insertAfterPreviousNode lastPlaceholder

1883 HydrationMode_Immediate -> do

1882 HydrationMode_Immediate -> do

1884 let activate i = do

1883 let activate i = do

1885 append $ toNode $ _traverseChildImmediate_fragment i

1884 append $ toNode $ _traverseChildImmediate_fragment i

1886 pure $ _traverseChildImmediate_placeholder i

1885 pure $ _traverseChildImmediate_placeholder i

1887− phs <- traverse id $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0

1886+ phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0

1888 liftIO $ writeIORef placeholders $! phs

1887 liftIO $ writeIORef placeholders $! phs

1889 append $ toNode lastPlaceholder

1888 append $ toNode lastPlaceholder

1890 requestDomAction_ $ ffor children' $ \p -> do

1889 requestDomAction_ $ ffor children' $ \p -> do

reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+1−1

@@ -274,7 +274,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh

274 --TODO: Do not escape quotation marks; see https://stackoverflow.com/questions/25612166/what-characters-must-be-escaped-in-html-5

275 shouldEscape <- asks _staticDomBuilderEnv_shouldEscape

276 let escape = if shouldEscape then fromHtmlEscapedText else byteString . encodeUtf8

277− modify . (:) =<< (\c -> "") <$> case mSetContents of

277+ (modify . (:)) . (\c -> "") =<< case mSetContents of

278 Nothing -> return (pure (escape initialContents))

279 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on

280 return $ CommentNode ()

reflex-dom-core/src/Reflex/Dom/Main.hs−1

@@ -5,7 +5,6 @@

5{-# LANGUAGE GADTs #-}

6{-# LANGUAGE MultiParamTypeClasses #-}

7{-# LANGUAGE NoMonomorphismRestriction #-}

8−{-# LANGUAGE PatternSynonyms #-}

9{-# LANGUAGE RankNTypes #-}

8{-# LANGUAGE RankNTypes #-}

10{-# LANGUAGE RecursiveDo #-}

9{-# LANGUAGE RecursiveDo #-}

11{-# LANGUAGE ScopedTypeVariables #-}

10{-# LANGUAGE ScopedTypeVariables #-}

reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+1−1

@@ -117,7 +117,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu

117 "overflow" =: "hidden" <>

118 "position" =: "relative"

119 mkRow k = toStyleAttr $ "height" =: (T.pack (show rowPx) <> "px") <>

120− "top" =: ((<>"px") $ T.pack $ show $ keyToIndex k * rowPx) <>

120+ "top" =: (<> "px") (T.pack $ show $ keyToIndex k * rowPx) <>

121 "position" =: "absolute" <>

122 "width" =: "100%"

123 findWindow sizeIncrement windowSize startingPosition =

reflex-dom-core/test/hlint.hs+1−1

@@ -1,4 +1,4 @@

1−import Language.Haskell.HLint3 (hlint)

1+import Language.Haskell.HLint (hlint)

2import System.Exit (exitFailure, exitSuccess)

3

4main :: IO ()