on develop help sign in
76 files changed+8094−1815
since splitsnapshots
unifiedsplit
.github/workflows/haskell.yml+47 CONTRIBUTING.md+65 FAQ.md+31 LICENSE+12 Quickref.md+10−55 README.md+15−9 cabal.project+10 cabal.project-nogtk+14 chrome-test-utils/LICENSE+12 chrome-test-utils/chrome-test-utils.cabal+30 chrome-test-utils/src/Test/Util/ChromeFlags.hs+17 chrome-test-utils/src/Test/Util/UnshareNetwork.hs+12 default.nix−6 dep/reflex-platform/default.nix+2 dep/reflex-platform/github.json+8 dep/reflex-platform/thunk.nix+9 reflex-dom-core/ChangeLog.md+94 reflex-dom-core/LICENSE+1−1 reflex-dom-core/default.nix−31 reflex-dom-core/reflex-dom-core.cabal+137−57 reflex-dom-core/src-ghc/Foreign/JavaScript/Internal/Utils.hs+17 reflex-dom-core/src-ghcjs/Foreign/JavaScript/Internal/Utils.hs+18 reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+15−10 reflex-dom-core/src/Foreign/JavaScript/TH.hs+45−31 reflex-dom-core/src/Foreign/JavaScript/Utils.hs+58 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+209−147 reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs+63−69 reflex-dom-core/src/Reflex/Dom/Builder/Class/TH.hs+1−1 reflex-dom-core/src/Reflex/Dom/Builder/Hydratable.hs+116 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+2137−548 reflex-dom-core/src/Reflex/Dom/Builder/InputDisabled.hs+26−4 reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+169−37 reflex-dom-core/src/Reflex/Dom/Class.hs+4−7 reflex-dom-core/src/Reflex/Dom/Core.hs+8−1 reflex-dom-core/src/Reflex/Dom/Location.hs+194−7 reflex-dom-core/src/Reflex/Dom/Main.hs+247−50 reflex-dom-core/src/Reflex/Dom/Modals/Class.hs+7 reflex-dom-core/src/Reflex/Dom/Old.hs+22−26 reflex-dom-core/src/Reflex/Dom/Prerender.hs+326 reflex-dom-core/src/Reflex/Dom/Time.hs+2−217 reflex-dom-core/src/Reflex/Dom/WebSocket.hs+59−17 reflex-dom-core/src/Reflex/Dom/WebSocket/Foreign.hs+55−50 reflex-dom-core/src/Reflex/Dom/WebSocket/Query.hs+37 reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs+93−230 reflex-dom-core/src/Reflex/Dom/Widget/Input.hs+41−72 reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+10−8 reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+25−17 reflex-dom-core/src/Reflex/Dom/Xhr.hs+10−8 reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs+20−24 reflex-dom-core/src/Reflex/Dom/Xhr/FormData.hs+47 reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs+11−11 reflex-dom-core/test/gc.hs+51−12 reflex-dom-core/test/hlint.hs+6−1 reflex-dom-core/test/hydration.hs+1828 reflex-dom-test-selenium/CHANGELOG.md+5 reflex-dom-test-selenium/LICENSE+12 reflex-dom-test-selenium/Setup.hs+2 reflex-dom-test-selenium/add-overrides.nix+20 reflex-dom-test-selenium/reflex-dom-test-selenium.cabal+41 reflex-dom-test-selenium/src/Reflex/Dom/Test/Selenium.hs+249 reflex-dom/ChangeLog.md+42 reflex-dom/LICENSE+1−1 reflex-dom/benchmark.hs+190 reflex-dom/benchmarks/krausest.hs+222 reflex-dom/cbits/MainWidget.c+89 reflex-dom/cbits/include/MainWidget.h+13 reflex-dom/default.nix−18 examples/sortableList.hs → reflex-dom/examples/sortableList.hs+1−1 reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java+195 reflex-dom/reflex-dom.cabal+160−20 reflex-dom/src-android/Reflex/Dom/Android/MainWidget.hsc+117 reflex-dom/src/Reflex/Dom.hs+8−4 reflex-dom/src/Reflex/Dom/Internal.hs+79−7 release.nix+63 test/default.nix+10 test/reflex-dom-reexports.hs+72
.github/workflows/haskell.ymlnew file+47
@@ -0,0 +1,47 @@
1+name: github-action
2+
3+on: [push, pull_request]
4+
5+jobs:
6+ build:
7+ strategy:
8+ matrix:
9+ ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.2']
10+ os: ['ubuntu-latest', 'macos-latest']
11+ exclude:
12+ # There are some linker warnings in 802 on darwin that
13+ # cause compilation to fail
14+ # See https://github.com/NixOS/nixpkgs/issues/25139
15+ - ghc: '8.0.2'
16+ os: 'macos-latest'
17+ runs-on: ${{ matrix.os }}
18+
19+ name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
20+ steps:
21+ - uses: actions/checkout@v2
22+ - uses: actions/setup-haskell@v1
23+ with:
24+ ghc-version: ${{ matrix.ghc }}
25+ - name: Cache
26+ uses: actions/cache@v1
27+ env:
28+ cache-name: cache-cabal
29+ with:
30+ path: ~/.cabal
31+ key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
32+ restore-keys: |
33+ ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
34+ ${{ runner.os }}-${{ matrix.ghc }}-build-
35+ ${{ runner.os }}-${{ matrix.ghc }}-
36+ ${{ runner.os }}
37+
38+ - name: Set up cabal project file to avoid webkit2gtk
39+ run: cp cabal.project-nogtk cabal.project
40+ - name: Install dependencies
41+ run: |
42+ cabal update
43+ cabal build --only-dependencies --enable-tests --enable-benchmarks all
44+ - name: Build
45+ run: cabal build --enable-tests --enable-benchmarks all
46+ - name: Run tests
47+ run: cabal test all
CONTRIBUTING.mdnew file+65
@@ -0,0 +1,65 @@
1+# Contribution Guide
2+
3+Contributions and issue reports are encouraged and appreciated!
4+
5+- [Opening Issues](#opening-issues)
6+- [Submitting Changes](#submitting-changes)
7+ - [Guidelines for Commit Messages](#guidelines-for-commit-messages)
8+ - [Guidelines for Pull Requests](#guidelines-for-pull-requests)
9+ - [Code Quality](#code-quality)
10+ - [Documentation](#documentation)
11+
12+## Opening Issues
13+
14+Before opening an issue, please check whether your issue has already been reported. Assuming it has not:
15+
16+* Describe the issue you're encountering or the suggestion you're making
17+* Include any relevant steps to reproduce or code samples you can. It's always easier for us to debug if we have something that demonstrates the error.
18+* Let us know what version of this project you were using. If you're using a github checkout, provide the git hash.
19+* Describe how you're building this project (i.e., via reflex-platform, cabal install, stack, obelisk, etc.). If you're using reflex-platform or obelisk, provide the git hash of your checkout.
20+
21+## Submitting Changes
22+
23+### Guidelines for Commit Messages
24+
25+#### Summary Line
26+The summary line of your commit message should summarize the changes being made. Commit messages should be written in the imperative mood and should describe what happens when the commit is applied.
27+
28+One way to think about it is that your commit message should be able to complete the sentence:
29+"When applied, this commit will..."
30+
31+#### Body
32+For breaking changes, new features, refactors, or other major changes, the body of the commit message should describe the motivation behind the change in greater detail and may include references to the issue tracker. The body shouldn't repeat code/comments from the diff.
33+
34+### Guidelines for Pull Requests
35+
36+Wherever possible, pull requests should add a single feature or fix a single bug. Pull requests should not bundle several unrelated changes.
37+
38+### Code Quality
39+
40+#### Warnings
41+
42+Your pull request should add no new warnings to the project. It should also generally not disable any warnings.
43+
44+#### Build and Test
45+
46+Make sure the project builds and that the tests pass! This will generally also be checked by CI before merge, but trying it yourself first means you'll catch problems earlier and your contribution can be merged that much sooner!
47+
48+### Documentation
49+
50+#### In the code
51+We're always striving to improve documentation. Please include [haddock](https://haskell-haddock.readthedocs.io/en/latest/index.html) documentation for any added code, and update the documentation for any code you modify.
52+
53+#### In the Changelog
54+Add an entry to the changelog when your PR:
55+* Adds a feature
56+* Deprecates something
57+* Includes a breaking change
58+* Makes any other change that will impact users
59+
60+You may need to add changelog entries to one or both of the changelogs in this repository:
61+* [reflex-dom-core's changelog](reflex-dom-core/ChangeLog.md)
62+* [reflex-dom's changelog](reflex-dom/ChangeLog.md)
63+
64+#### In the [Readme](README.md)
65+The readme is the first place a lot of people look for information about the repository. Update any parts of the readme that are affected by your PR.
FAQ.mdnew file+31
@@ -0,0 +1,31 @@
1+# Frequently Asked Questions
2+
3+### How do I configure DOM events with flags like `preventDefault` and `stopPropagation`?
4+
5+Using `element`, a low-level DOM builder function. Its second argument, `ElementConfig`, has a `_elementConfig_eventSpec` field that can be modified using `addEventSpecFlags`. It takes a `Proxy` that specifies the `DomSpace`, an event name, and a callback which takes the event result and returns an event flag, which can enable behavior like `preventDefault` and `stopPropagation`.
6+
7+The type signature on `def` is needed because the fields of the `ElementConfig` can change the type of the `ElementConfig`. GHC can probably figure out the type of the resulting `ElementConfig`, but it doesn't know what the type of `def` was before the modifications, since it never gets used with that configuration.
8+
9+For example:
10+
11+```haskell
12+{-# LANGUAGE OverloadedStrings #-}
13+{-# LANGUAGE ScopedTypeVariables #-}
14+
15+import Control.Lens ((&), (%~), (.~))
16+import Data.Proxy
17+import Reflex.Dom
18+
19+main :: IO ()
20+main = mainWidget $ do
21+ (click, ()) <- linkPreventDefault $ text "reflex-frp"
22+ display =<< count click
23+
24+linkPreventDefault :: forall t m a. DomBuilder t m => m a -> m (Event t (), a)
25+linkPreventDefault c = do
26+ let cfg = (def :: ElementConfig EventResult t (DomBuilderSpace m))
27+ & elementConfig_initialAttributes .~ ("href" =: "https://reflex-frp.org")
28+ & elementConfig_eventSpec %~ addEventSpecFlags (Proxy :: Proxy (DomBuilderSpace m)) Click (const preventDefault)
29+ (link, a) <- element "a" cfg c
30+ return (domEvent Click link, a)
31+```
LICENSEnew file+12
@@ -0,0 +1,12 @@
1+Copyright (c) 2020, Obsidian Systems LLC
2+All rights reserved.
3+
4+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
5+
6+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
7+
8+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
9+
10+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
11+
12+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Quickref.md+10−55
@@ -28,7 +28,7 @@ Widgets may return any type (this is 'a' in many of the functions below). Often
2828-- This version returns the 'El' as well.
2929[W] el' :: Text -> m a -> m (El, a)
3030
31−-- These two additionally apply attributes to the element, such as ("class" =: "blah")
31+-- These two additionally apply attributes to the element, such as ("class" =: "blah"). (=:) is 'Map.singleton'
3232[W] elAttr :: Text -> Map Text Text -> m a -> m a
3333[W] elAttr' :: Text -> Map Text Text -> m a -> m (El, a)
3434
@@ -36,13 +36,16 @@ Widgets may return any type (this is 'a' in many of the functions below). Often
3636[W] elDynAttr :: Text -> Dynamic (Map Text Text) -> m a -> m a
3737[W] elDynAttr' :: Text -> Dynamic (Map Text Text) -> m a -> m (El, a)
3838
39+-- As above, but with an optional XML namespace for the tag. Note that this does *not* set the 'xmlns' attribute. See https://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-DocCrElNS
40+[W] elDynAttrNS' :: Maybe Text -> Text -> Dynamic (Map Text Text) -> m a -> m (El, a)
41+
3942-- Shortcut for elAttr when you only want to set the "class" attribute.
4043[W] elClass :: Text -> Text -> m a -> m a
4144
4245-- Even shorter-cut for above when element type is "div". Create a div of given class.
4346[W] divClass :: Text -> m a -> m a
4447
45−-- Create a widget of given type with arbitrary, Dymamic HTML inside.
48+-- Create a widget of given type with arbitrary, Dynamic HTML inside.
4649[W] elDynHtml' :: Text -> Dynamic Text -> m El
4750[W] elDynHtmlAttr' :: Text -> Map Text Text -> Dynamic Text -> m El
4851
@@ -72,32 +75,10 @@ Note the "list" functions do not imply particular HTML tags (ul, li, etc), thoug
7275
7376-- Same as dyn, but takes initial value and an update Event instead of a Dynamic.
7477[W] widgetHold :: m a -> Event (m a) -> m (Dynamic a)
75−
76−-- Turn a Dynamic key/value map into a set of dynamically-changing widgets.
77−[W] listWithKey :: Ord k =>
78− Dynamic (Map k v) -> (k -> Dynamic v -> m a ) -> m (Dynamic (Map k a))
79−
80−-- Same as above where the widget constructor doesn't care about the key.
81−[W] list :: Ord k =>
82− Dynamic (Map k v) -> ( Dynamic v -> m a ) -> m (Dynamic (Map k a))
83−
84−-- Even simpler version where there are no keys and we just use a list.
85−[W] simpleList ::
86− Dynamic [v] -> ( Dynamic v -> m a ) -> m (Dynamic [a])
87−
88−-- Like listWithKey specialized for widgets returning (Event a).
89−[W] listViewWithKey :: Ord k =>
90− Dynamic (Map k v) -> (k -> Dynamic v -> m (Event a)) -> m (Event (Map k a))
91−
92−-- Create a dynamically-changing set of widgets, one of which is selected at any time.
93−[W] selectViewListWithKey_ :: Ord k => Dynamic k ->
94− Dynamic (Map k v) -> (k -> Dynamic v -> Dynamic Bool -> m (Event a)) -> m (Event k)
95−
96−-- Same as listWithKey, but takes initial values and an updates Event instead of a Dynamic.
97−[W] listWithKey' :: Ord k =>
98− Map k v -> Event (Map k (Maybe v)) -> (k -> v -> Event v -> m a) -> m (Dynamic (Map k a))
9978```
10079
80+Also see the "Collection management functions" section in the `reflex` Quick Reference.
81+
10182### Utility widgets
10283
10384These are useful widgets that are implemented (or could be implemented) in terms of the low-level widgets above.
@@ -132,27 +113,12 @@ Some of these widget builders take a configuration record and return a record co
132113
133114## Connecting to the real world (I/O)
134115
135−### Connecting to DOM events
136−
137116```haskell
138117-- Extract the specified Event from an 'El'. See Reflex.Dom.Widget.Basic
139118[ ] domEvent :: EventName en -> El -> Event (EventResultType en)
140119```
141120
142−### Performing arbitrary I/O in response to Events
143−
144−```haskell
145−-- Run side-effecting actions in Event when it occurs; returned Event contains
146−-- results. Side effects run in (WidgetHost m) monad, which includes [S] and [H]
147−-- and can also do I/O via liftIO
148−[W] performEvent :: Event ( WidgetHost m a) -> m (Event a)
149−
150−-- Just run side-effects; no return Event
151−[W] performEvent_ :: Event ( WidgetHost m ()) -> m ()
152−
153−-- Actions run asynchronously; actions are given a callback to send return values
154−[W] performEventAsync :: Event ((a -> IO ()) -> WidgetHost m ()) -> m (Event a)
155−```
121+Also see the "Connection to the real world" and "Time" sections in the `reflex` Quick Reference.
156122
157123### XMLHttpRequest
158124
@@ -175,16 +141,6 @@ Convenience functions for XMLHttpRequest. see Reflex.Dom.Xhr
175141[W] getAndDecode :: FromJSON a => Event Text -> m (Event (Maybe a))
176142```
177143
178−### Time
179−
180−```haskell
181−-- Create Event at given interval with given basis time.
182−[W] tickLossy :: NominalDiffTime -> UTCTime -> m (Event t TickInfo)
183−
184−-- Delay an Event's occurrences by a given amount in seconds.
185−[W] delay :: NominalDiffTime -> Event t a -> m (Event t a)
186−```
187−
188144## Startup
189145
190146```haskell
@@ -198,7 +154,6 @@ Convenience functions for XMLHttpRequest. see Reflex.Dom.Xhr
198154[I] mainWidgetWithCss ::
199155 ByteString ->
200156 Widget Spider (Gui Spider (WithWebView SpiderHost) (HostFrame Spider)) () -> IO ()
201−
202−-- One-shot Event that is triggered once all initial widgets are built
203−[W] getPostBuild :: m (Event ())
204157```
158+
159+Also see the corresponding section in the `reflex` Quick Reference.
README.md+15−9
@@ -1,17 +1,23 @@
1−## Reflex-DOM
2−### A Framework for Functional Reactive Web Apps in Haskell
1+## [Reflex-DOM](https://reflex-frp.org)
32
4−Reflex-DOM is a framework for building web applications in Haskell, based on the [Functional Reactive Programming](https://wiki.haskell.org/Functional_Reactive_Programming) library [Reflex](https://github.com/reflex-frp/reflex).
3+[![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/reflex-dom.svg)](https://hackage.haskell.org/package/reflex-dom) [![Hackage CI](https://matrix.hackage.haskell.org/api/v2/packages/reflex-dom/badge)](https://matrix.hackage.haskell.org/#/package/reflex-dom) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/reflex-frp/reflex-dom/blob/master/LICENSE)
54
6−Comprehensive documentation is still a work in progress, but a [demo](https://github.com/reflex-frp/reflex-platform) is available and an introductory talk is available at [Part 1](https://www.youtube.com/watch?v=mYvkcskJbc4) / [Part 2](https://www.youtube.com/watch?v=3qfc9XFVo2c) ([Slides](https://obsidian.systems/reflex-nyhug/)).
5+Web applications without callbacks or side-effects. Reflex-DOM brings the power of [Functional Reactive Programming (FRP)](https://wiki.haskell.org/Functional_Reactive_Programming) to the web. Build [HTML](https://developer.mozilla.org/en-US/docs/Web/HTML) and other [Document Object Model (DOM)](https://developer.mozilla.org/en-US/docs/Web/API/Document_Object_Model) data with a pure functional interface.
76
8−A summary of Reflex-DOM functions is available in the [quick reference](Quickref.md).
7+Reflex-DOM is a framework for building web applications in [Haskell](https://www.haskell.org/), based on the [Functional Reactive Programming](https://wiki.haskell.org/Functional_Reactive_Programming) library [Reflex](https://github.com/reflex-frp/reflex).
8+
9+**Visit https://reflex-frp.org/ for more information, tutorials, documentation and [examples](https://examples.reflex-frp.org/).**
910
1011### Additional resources
11−[Get started with Reflex](https://github.com/reflex-frp/reflex-platform)
1212
13−[/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
13+* [Official Website](https://reflex-frp.org/)
14+* [Quick Reference](Quickref.md)
15+* [Obelisk](https://github.com/obsidiansystems/obelisk#obelisk): A framework built on Reflex and Reflex-DOM for functional reactive web and mobile applications, with batteries included.
16+* [Get started with Reflex](https://github.com/reflex-frp/reflex-platform)
17+* [/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
18+* [irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
1419
15−[hackage](https://hackage.haskell.org/package/reflex)
20+### Hacking
1621
17−[irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
22+Use the `./scripts/hack-on haskell-overlays/reflex-packages/dep/reflex-dom` script in [Reflex Platform](https://github.com/reflex-frp/reflex-platform) to checkout the source code of `reflex-dom` locally in `./dep/reflex-dom` directory.
23+Then do modifications to the source in place, and use the `./try-reflex` or `./scripts/work-on` scripts to create the shell to test your changes.
cabal.projectnew file+10
@@ -0,0 +1,10 @@
1+packages:
2+ reflex-dom-core/
3+ reflex-dom/
4+ chrome-test-utils/
5+ reflex-dom-test-selenium/
6+
7+source-repository-package
8+ type: git
9+ location: https://github.com/dfordivam/hspec-webdriver-clone
10+ tag: 0d748b7bb7cd74dce0a55a1ec86b01dbb8a71cd8
cabal.project-nogtknew file+14
@@ -0,0 +1,14 @@
1+packages:
2+ reflex-dom-core/
3+ reflex-dom/
4+
5+package reflex-dom-core
6+ flags: -hydration-tests -gc-tests
7+
8+package reflex-dom
9+ flags: +use-warp -webkit2gtk
10+
11+source-repository-package
12+ type: git
13+ location: https://github.com/dfordivam/hspec-webdriver-clone
14+ tag: 0d748b7bb7cd74dce0a55a1ec86b01dbb8a71cd8
chrome-test-utils/LICENSEnew file+12
@@ -0,0 +1,12 @@
1+Copyright (c) 2020, Obsidian Systems LLC
2+All rights reserved.
3+
4+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
5+
6+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
7+
8+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
9+
10+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
11+
12+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
chrome-test-utils/chrome-test-utils.cabalnew file+30
@@ -0,0 +1,30 @@
1+Name: chrome-test-utils
2+Version: 0.5
3+Synopsis: Utilities to write headless Chromium tests
4+License: BSD3
5+License-file: LICENSE
6+Author: Obsidian Systems LLC
7+Maintainer: maintainer@obsidian.systems
8+Stability: Experimental
9+Build-type: Simple
10+Cabal-version: >=1.9.2
11+
12+library
13+ hs-source-dirs: src
14+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
15+ build-depends: base
16+ , linux-namespaces
17+ , process
18+ , temporary
19+ , text
20+ , unix
21+ exposed-modules:
22+ Test.Util.UnshareNetwork
23+ Test.Util.ChromeFlags
24+ if !os(linux) || !arch(x86_64)
25+ buildable: False
26+
27+source-repository head
28+ type: git
29+ location: https://github.com/reflex-frp/reflex-dom
30+ subdir: chrome-test-utils
chrome-test-utils/src/Test/Util/ChromeFlags.hsnew file+17
@@ -0,0 +1,17 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+module Test.Util.ChromeFlags where
3+
4+import Data.Semigroup
5+import Data.Text
6+import System.IO.Temp
7+
8+withSandboxedChromeFlags :: Bool -> ([Text] -> IO a) -> IO a
9+withSandboxedChromeFlags headless action =
10+ withSystemTempDirectory "reflex-dom-core_test" $ \tmp ->
11+ action
12+ [ if headless then "--headless" else "--auto-open-devtools-for-tabs"
13+ , "--disable-gpu"
14+ , "--no-sandbox"
15+ , "--remote-debugging-port=9222"
16+ , "--user-data-dir=" <> pack tmp
17+ ]
chrome-test-utils/src/Test/Util/UnshareNetwork.hsnew file+12
@@ -0,0 +1,12 @@
1+module Test.Util.UnshareNetwork where
2+
3+import System.Linux.Namespaces
4+import System.Posix
5+import System.Process
6+
7+unshareNetwork :: IO ()
8+unshareNetwork = do
9+ uid <- getEffectiveUserID
10+ unshare [User, Network]
11+ writeUserMappings Nothing [UserMapping 0 uid 1]
12+ callCommand "ip link set lo up ; ip addr"
default.nixdeleted−6
@@ -1,6 +0,0 @@
1−haskellPackages: nixpkgs: {
2− reflex-dom = haskellPackages.callPackage ./reflex-dom {};
3− reflex-dom-core = haskellPackages.callPackage ./reflex-dom-core {
4− inherit (nixpkgs) xvfb_run chromium;
5− };
6−}
dep/reflex-platform/default.nixnew file+2
@@ -0,0 +1,2 @@
1+# DO NOT HAND-EDIT THIS FILE
2+import (import ./thunk.nix)
dep/reflex-platform/github.jsonnew file+8
@@ -0,0 +1,8 @@
1+{
2+ "owner": "reflex-frp",
3+ "repo": "reflex-platform",
4+ "branch": "aa-bump-some",
5+ "private": false,
6+ "rev": "fd5acecb50474f795734db9fb924cc3b2fd2b508",
7+ "sha256": "0wsdd67g42klsf9n3pxb3pndjdz36nzf8gp7pfm8j6nyyy2qribk"
8+}
dep/reflex-platform/thunk.nixnew file+9
@@ -0,0 +1,9 @@
1+# DO NOT HAND-EDIT THIS FILE
2+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+ if !fetchSubmodules && !private then builtins.fetchTarball {
4+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+ } else (import <nixpkgs> {}).fetchFromGitHub {
6+ inherit owner repo rev sha256 fetchSubmodules private;
7+ };
8+ json = builtins.fromJSON (builtins.readFile ./github.json);
9+in fetch json
reflex-dom-core/ChangeLog.mdnew file+94
@@ -0,0 +1,94 @@
1+# Revision history for reflex-dom-core
2+
3+## 0.6.2.1
4+
5+* Fix hlint complaints with newer GHC.
6+
7+## 0.6.2.0
8+
9+* ([#400](https://github.com/reflex-frp/reflex-dom/pull/400/files)) Set value of input elements in static renderer
10+
11+## 0.6.1.0
12+
13+* Bump version bounds
14+* Update for new dependent-map and dependent-sum version (after the "some" package split)
15+* Add `MonadAtomicRef` instance for `UnrunnableT`
16+* Fix ([#467](https://github.com/reflex-frp/reflex-dom/issues/467)): Prevent multiple firings of XHR response event
17+* Updates for GHC 8.10
18+* Move `HasSetValue` from Reflex.Dom.Widget.Input to Reflex.Dom.Builder.Class and add an instance for `TextAreaElementConfig`
19+* Add `now` to the `MonadHold` instance for `UnrunnableT`
20+
21+
22+## 0.6.0.0
23+
24+* ([#375](https://github.com/reflex-frp/reflex-dom/pull/375)) **(Breaking change)** Expose resized dimensions from `resizeDetector`, `resizeDetectorWithStyle`, and `resizeDetectorWithAttrs` from `Reflex.Dom.Widget.Resize`.
25+* ([#374](https://github.com/reflex-frp/reflex-dom/pull/374)) **(Breaking change)** Provide text clipboard data as value of `Paste` event.
26+* ([#348](https://github.com/reflex-frp/reflex-dom/pull/348)) **(Breaking change)** Make XHR response headers case insensitive by changing `_xhrResponse_headers :: Map Text Text` to `_xhrResponse_headers :: Map (CI Text) Text`.
27+* ([#225](https://github.com/reflex-frp/reflex-dom/pull/225)) **(Breaking change)** Add a functional dependency to `HasDomEvent`.
28+* ([#342](https://github.com/reflex-frp/reflex-dom/issues/342)) **(Breaking change)** The mouse wheel event is now a `WheelEventResult` rather than `()`. This provides information about the wheel's motion beyond the fact that it merely moved.
29+* ([#353](https://github.com/reflex-frp/reflex-dom/pull/353)) Support GHC 8.8.
30+* ([#358](https://github.com/reflex-frp/reflex-dom/pull/358)) Fix attribute support for explicitly namespaced elements.
31+* ([#363](https://github.com/reflex-frp/reflex-dom/pull/363)) Remove deprecation warnings for the following widgets in
32+ `Reflex.Dom.Widget.Basic`:
33+ * `Link`
34+ * `button`
35+ * `dtdd`
36+ * `linkClass`
37+ * `link`
38+ * `tabDisplay`
39+ * `tableDynAttr`
40+* ([#361](https://github.com/reflex-frp/reflex-dom/pull/361)) Fix bug in hydration causing the JavaScript to crash when dealing with unexpected HTML.
41+* ([#310](https://github.com/reflex-frp/reflex-dom/issues/310)) Fix the static rendering of which dropdown value is selected.
42+* ([#364](https://github.com/reflex-frp/reflex-dom/pull/364)) Export attributes used for controlling hydration at the element level:
43+ * "data-ssr" is now available as `Reflex.Dom.Builder.Immediate.hydratableAttribute`.
44+ * "data-hydration-skip" is now available as `Reflex.Dom.Builder.Immediate.skipHydrationAttribute`.
45+* ([#366](https://github.com/reflex-frp/reflex-dom/pull/366)) Bump bounds for `reflex` to include 0.7.
46+
47+## 0.5.3
48+
49+* Deprecate a number of old inflexible widget helpers in `Reflex.Dom.Widget.Basic`:
50+ * `Link`
51+ * `button`
52+ * `dtdd`
53+ * `linkClass`
54+ * `link`
55+ * `tabDisplay`
56+ * `tableDynAttr`
57+
58+ And in `Reflex.Dom.Widget.Input`:
59+ * `TextInput`
60+ * `TextAreaConfig`
61+ * `CheckboxConfig`
62+ * `FileInput`
63+* Add `< 0.7` upper bound for `reflex`.
64+
65+## 0.5.2
66+
67+* Update to use new dependent-sum/map packages and drop dependency on `*Tag` classes (e.g., `ShowTag`).
68+
69+* Update version bounds of base, containers, and stm
70+
71+* Update to use the newly split `these`/`semialign` packages. To use the pre-split `these` package, set the `split-these` flag to false.
72+
73+* Reintroduce "data-ssr": elements without this attribute are skipped during
74+ hydration.
75+
76+* Fix an issue in the hydration tests that prevented the test from finding the chromium executable
77+
78+* Relax constraints on `dyn` and `widgetHold` to match the ones in `networkView` and `networkHold` respectively
79+
80+* Fix prerender for RequesterT so that it doesn't accidentally discard a request that is made at the same moment as getPostBuild's Event fires
81+
82+## 0.5.1
83+
84+* Added support for marking elements with a "data-skip-hydration" attribute, which will cause hydration to ignore and skip over them.
85+
86+* Removed "data-ssr" attributes from statically rendered output.
87+
88+## 0.5
89+
90+* Add HydrationDomBuilderT to support hydration of statically rendered DOM nodes. See the note at the top of Reflex.Dom.Builder.Immediate.
91+
92+* As a result of the hydration changes, the Prerender class has changed, the type of `prerender` has changed and it is now a class method.
93+
94+* Add the Reflex.Dom.Xhr.FormData module to make posting formdata over xhr more convenient.
reflex-dom-core/LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2015, Obsidian Systems LLC
1+Copyright (c) 2020, Obsidian Systems LLC
22All rights reserved.
33
44Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
reflex-dom-core/default.nixdeleted−31
@@ -1,31 +0,0 @@
1−{ mkDerivation, ghc, aeson, base, bifunctors, bimap, blaze-builder
2−, bytestring, containers, contravariant, data-default
3−, dependent-map, dependent-sum, dependent-sum-template, directory
4−, exception-transformers, ghcjs-dom, hlint, jsaddle, keycode, lens
5−, monad-control, mtl, primitive, random, ref-tf, reflex, semigroups
6−, stdenv, stm, template-haskell, temporary, text, these, time
7−, transformers, unbounded-delays, unix, zenc, hashable, xvfb_run
8−, chromium, process, jsaddle-warp
9−}:
10−let addGcTestDepends = drv: if stdenv.system != "x86_64-linux" then drv else drv // {
11− testHaskellDepends = (drv.testHaskellDepends or []) ++ [ temporary jsaddle-warp process ];
12− testSystemDepends = (drv.testSystemDepends or []) ++ [ xvfb_run chromium ];
13− };
14−in mkDerivation (addGcTestDepends {
15− pname = "reflex-dom-core";
16− version = "0.4";
17− src = ./.;
18− libraryHaskellDepends = [
19− aeson base bifunctors bimap blaze-builder bytestring containers
20− contravariant data-default dependent-map dependent-sum
21− dependent-sum-template directory exception-transformers ghcjs-dom
22− jsaddle keycode lens monad-control mtl primitive random ref-tf
23− reflex semigroups stm template-haskell text these time transformers
24− unbounded-delays unix zenc
25− ] ++ (if ghc.isGhcjs or false then [
26− hashable
27− ] else []);
28− testHaskellDepends = [ base hlint ];
29− description = "Functional Reactive Web Apps with Reflex";
30− license = stdenv.lib.licenses.bsd3;
31−})
reflex-dom-core/reflex-dom-core.cabal+137−57
@@ -1,7 +1,18 @@
1+cabal-version: 1.24
12Name: reflex-dom-core
2−Version: 0.4
3+Version: 0.6.2.1
34Synopsis: Functional Reactive Web Apps with Reflex
4−Description: Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine
5+Description:
6+ Web applications without callbacks or side-effects.
7+ Reflex-DOM brings the power of functional reactive programming (FRP) to the web.
8+ Build HTML and other Document Object Model (DOM) data with a pure functional interface.
9+ .
10+ Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine: <https://reflex-frp.org/>.
11+ .
12+ The @reflex-dom@ package is a small wrapper around the @reflex-dom-core@ package. It pulls in the
13+ correct set of dependencies for each target platform (GHCJS, WebKitGTK, WASM, mobile, etc.).
14+ Libraries should depend on @reflex-dom-core@ and executables will usually depend on @reflex-dom@.
15+ All of @reflex-dom-core@'s modules are re-exported by @reflex-dom@.
516License: BSD3
617License-file: LICENSE
718Author: Ryan Trinkle
@@ -9,12 +20,14 @@ Maintainer: ryan.trinkle@gmail.com
920Stability: Experimental
1021Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
1122Build-type: Simple
12−Cabal-version: >=1.9.2
1323-- Deal with https://github.com/haskell/cabal/issues/2544 / https://github.com/haskell/cabal/issues/367
14−extra-source-files: src/Reflex/Dom/Xhr/Foreign.hs
24+extra-source-files: src-ghc/Foreign/JavaScript/Internal/Utils.hs
25+ src-ghcjs/Foreign/JavaScript/Internal/Utils.hs
26+ src/Reflex/Dom/Xhr/Foreign.hs
1527 src/Reflex/Dom/WebSocket/Foreign.hs
1628 src/Reflex/Dom/Xhr/ResponseType.hs
1729 src/Reflex/Dom/Xhr/Exception.hs
30+ ChangeLog.md
1831
1932flag use-template-haskell
2033 description: Use template haskell to generate lenses
@@ -31,84 +44,117 @@ flag expose-all-unfoldings
3144 default: False
3245 manual: True
3346
34−flag build-examples
35− description: Build the executables in ./examples
47+flag profile-reflex
48+ description: Add a layer of profiling to all Reflex events in the system
3649 default: False
3750 manual: True
3851
52+flag split-these
53+ description: Use split these/semialign packages
54+ manual: False
55+ default: True
56+
57+flag hydration-tests
58+ description: Whether to run the hydration tests (currently only available on linux)
59+ default: True
60+ manual: True
61+
62+flag gc-tests
63+ description: Whether to run the gc tests (currently only available on linux)
64+ default: True
65+ manual: True
66+
3967library
4068 hs-source-dirs: src
4169 build-depends:
42− aeson >= 0.8 && < 1.1,
43− base >= 4.7 && < 4.11,
70+ aeson >= 0.8 && < 1.6,
71+ base >= 4.7 && < 4.15,
4472 bifunctors >= 4.2 && < 6,
45− bimap >= 0.3 && < 0.4,
46− blaze-builder,
73+ bimap >= 0.3 && < 0.5,
74+ blaze-builder >= 0.4.1 && < 0.5,
4775 bytestring == 0.10.*,
48− containers == 0.5.*,
49− contravariant >= 1.4 && < 1.5,
76+ case-insensitive < 1.3,
77+ containers >= 0.6 && < 0.7,
78+ constraints >= 0.9 && < 0.13,
79+ contravariant >= 1.4 && < 1.6,
5080 data-default >= 0.5 && < 0.8,
51− dependent-map == 0.2.*,
52− dependent-sum >= 0.3 && < 0.5,
53− dependent-sum-template >= 0.0.0.4 && < 0.1,
81+ dependent-map >= 0.3 && < 0.5,
82+ dependent-sum >= 0.6 && < 0.8,
83+ dependent-sum-template >= 0.1 && < 0.2,
5484 directory >= 1.2 && < 1.4,
5585 exception-transformers == 0.4.*,
56− ghcjs-dom >= 0.7.0.4 && < 0.8,
57− jsaddle >=0.8.0.1 && <0.9,
86+ ghcjs-dom >= 0.9.1.0 && < 0.10,
87+ jsaddle >= 0.9.0.0 && < 0.10,
5888 -- keycode-0.2 has a bug on firefox
5989 keycode >= 0.2.1 && < 0.3,
6090 lens >= 4.7 && < 5,
6191 monad-control >= 1.0.1 && < 1.1,
6292 mtl >= 2.1 && < 2.3,
63− primitive >= 0.5 && < 0.7,
64− random == 1.1.*,
93+ primitive >= 0.5 && < 0.8,
94+ random >= 1.1 && < 1.2,
6595 ref-tf == 0.4.*,
66− reflex == 0.5.*,
67− semigroups >= 0.16 && < 0.19,
68− stm == 2.4.*,
96+ reflex >= 0.8 && < 0.9,
97+ semigroups >= 0.16 && < 0.20,
98+ stm >= 2.4 && < 2.6,
6999 text == 1.2.*,
70− these >= 0.4 && < 0.8,
71− time >= 1.4 && < 1.8,
72100 transformers >= 0.3 && < 0.6,
73− unbounded-delays >= 0.1.0.9 && < 0.2,
101+ network-uri >= 2.6.1 && < 2.7,
74102 zenc == 0.1.*
75103
76104 if impl(ghcjs)
105+ hs-source-dirs: src-ghcjs
77106 build-depends:
78107 ghcjs-base,
79− hashable == 1.2.*
108+ hashable >= 1.2 && < 1.4
80109 else
110+ hs-source-dirs: src-ghc
81111 if !os(windows)
82112 build-depends: unix == 2.7.*
83113
114+ if flag(split-these)
115+ build-depends:
116+ semialign >= 1 && < 1.2,
117+ these >= 1 && < 1.2
118+ else
119+ build-depends:
120+ these >= 0.4 && < 0.9
121+
84122 exposed-modules:
85123 Foreign.JavaScript.TH
86124 Foreign.JavaScript.Orphans
125+ Foreign.JavaScript.Utils
87126 Reflex.Dom.Builder.Class
88127 Reflex.Dom.Builder.Class.Events
89128 Reflex.Dom.Builder.Immediate
90129 Reflex.Dom.Builder.InputDisabled
130+ Reflex.Dom.Builder.Hydratable
91131 Reflex.Dom.Builder.Static
92132 Reflex.Dom.Class
93133 Reflex.Dom.Core
94134 Reflex.Dom.Location
95135 Reflex.Dom.Main
136+ Reflex.Dom.Modals.Class
96137 Reflex.Dom.Old
138+ Reflex.Dom.Prerender
97139 Reflex.Dom.Time
98140 Reflex.Dom.WebSocket
141+ Reflex.Dom.WebSocket.Query
99142 Reflex.Dom.Widget
100143 Reflex.Dom.Widget.Basic
101144 Reflex.Dom.Widget.Input
102145 Reflex.Dom.Widget.Lazy
103146 Reflex.Dom.Widget.Resize
104147 Reflex.Dom.Xhr
148+ Reflex.Dom.Xhr.FormData
105149 other-modules:
150+ Foreign.JavaScript.Internal.Utils
106151 Reflex.Dom.WebSocket.Foreign
107152 Reflex.Dom.Xhr.Foreign
108153 Reflex.Dom.Xhr.ResponseType
109154 Reflex.Dom.Xhr.Exception
110155
111− ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
156+ default-language: Haskell98
157+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
112158 ghc-prof-options: -fprof-auto
113159
114160 if flag(expose-all-unfoldings)
@@ -117,61 +163,95 @@ library
117163 if flag(use-reflex-optimizer)
118164 ghc-options: -fplugin=Reflex.Optimizer
119165
166+ if flag(profile-reflex)
167+ cpp-options: -DPROFILE_REFLEX
168+
120169 if flag(use-template-haskell)
121170 build-depends:
122− dependent-sum >= 0.3 && < 0.5,
123− dependent-sum-template >= 0.0.0.5 && < 0.1,
124− template-haskell
171+ dependent-sum-template >= 0.1 && < 0.2,
172+ template-haskell >= 2.12.0 && < 2.17
125173 other-extensions: TemplateHaskell
126174 cpp-options: -DUSE_TEMPLATE_HASKELL
127175 other-modules:
128176 Reflex.Dom.Builder.Class.TH
129− else
130− build-depends:
131− dependent-sum == 0.4.*
132177
133178test-suite hlint
134− build-depends: base, hlint == 1.9.*
179+ build-depends:
180+ base,
181+ hlint >= 2.0 && < 4.0
135182 hs-source-dirs: test
136183 main-is: hlint.hs
137184 type: exitcode-stdio-1.0
185+ default-language: Haskell98
138186
139−test-suite gc
187+test-suite hydration
140188 build-depends: base
141− , reflex-dom-core
189+ , aeson
190+ , async
191+ , bytestring
192+ , chrome-test-utils
193+ , constraints
194+ , constraints-extras
195+ , containers
196+ , dependent-map
197+ , dependent-sum
198+ , dependent-sum-template
199+ , directory
200+ , exceptions
201+ , filepath
202+ , ghcjs-dom
203+ , hspec
204+ , hspec-core
205+ , hspec-webdriver
206+ , http-types
207+ , HUnit
208+ , jsaddle
142209 , jsaddle-warp
210+ , lens
211+ , lifted-base
212+ , network
213+ , random
214+ , ref-tf
215+ , reflex
216+ , reflex-dom-core
143217 , process
218+ , silently
144219 , temporary
220+ , text
221+ , wai
222+ , wai-websockets
223+ , warp
224+ , webdriver
225+ , websockets
226+ , which
145227 hs-source-dirs: test
146228 ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
147− ghc-prof-options: -fprof-auto
148− main-is: gc.hs
229+ ghc-prof-options: -fprof-auto -optP-DPROFILING
230+ main-is: hydration.hs
149231 type: exitcode-stdio-1.0
150− if !os(linux) || !arch(x86_64)
232+ default-language: Haskell98
233+ if !os(linux) || !arch(x86_64) || flag(profile-reflex) || !flag(hydration-tests)
151234 buildable: False
152235
153−executable sortableList
236+-- broken test on base 4.11 & ghc 8.4.3
237+-- needs to be updated for changes in GHC.Stats
238+test-suite gc
154239 build-depends: base
155− , containers
156− , dependent-map
157− , lens
158− , mtl
159− , random
240+ , chrome-test-utils
241+ , jsaddle
242+ , jsaddle-warp
243+ , process
160244 , reflex
161− , reflex-dom
245+ , reflex-dom-core
162246 , text
163− , time
164− , transformers
165− hs-source-dirs: examples
166− main-is: sortableList.hs
167− ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
168− ghc-prof-options: -fprof-auto
169− if !flag(build-examples)
247+ hs-source-dirs: test
248+ ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
249+ ghc-prof-options: -fprof-auto -optP-DPROFILING
250+ main-is: gc.hs
251+ type: exitcode-stdio-1.0
252+ default-language: Haskell98
253+ if !os(linux) || !arch(x86_64) || !flag(gc-tests)
170254 buildable: False
171− if flag(expose-all-unfoldings)
172− ghc-options: -fexpose-all-unfoldings
173− if flag(use-reflex-optimizer)
174− ghc-options: -fplugin=Reflex.Optimizer
175255
176256source-repository head
177257 type: git
reflex-dom-core/src-ghc/Foreign/JavaScript/Internal/Utils.hsnew file+17
@@ -0,0 +1,17 @@
1+module Foreign.JavaScript.Internal.Utils
2+ ( synchronously
3+ , freeRequestAnimationFrameCallback
4+ , js_dataView
5+ ) where
6+
7+import GHCJS.DOM.Types (Callback (..), JSM, JSVal, RequestAnimationFrameCallback (..))
8+import Language.Javascript.JSaddle.Object (freeFunction, jsg, new)
9+
10+synchronously :: JSM a -> JSM a
11+synchronously = id
12+
13+freeRequestAnimationFrameCallback :: RequestAnimationFrameCallback -> JSM ()
14+freeRequestAnimationFrameCallback (RequestAnimationFrameCallback (Callback cb)) = freeFunction cb
15+
16+js_dataView :: Int -> Int -> JSVal -> JSM JSVal
17+js_dataView off len ref = new (jsg "DataView") (ref, off, len)
reflex-dom-core/src-ghcjs/Foreign/JavaScript/Internal/Utils.hsnew file+18
@@ -0,0 +1,18 @@
1+{-# LANGUAGE ForeignFunctionInterface #-}
2+{-# LANGUAGE JavaScriptFFI #-}
3+
4+module Foreign.JavaScript.Internal.Utils
5+ ( synchronously
6+ , freeRequestAnimationFrameCallback
7+ , js_dataView
8+ ) where
9+
10+import GHCJS.Concurrent
11+import GHCJS.DOM.Types (JSM, JSVal, RequestAnimationFrameCallback (..))
12+import GHCJS.Foreign.Callback (releaseCallback)
13+
14+freeRequestAnimationFrameCallback :: RequestAnimationFrameCallback -> JSM ()
15+freeRequestAnimationFrameCallback (RequestAnimationFrameCallback cb) = releaseCallback cb
16+
17+foreign import javascript safe "new DataView($3,$1,$2)"
18+ js_dataView :: Int -> Int -> JSVal -> IO JSVal
reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+15−10
@@ -1,32 +1,37 @@
1+{-# OPTIONS_HADDOCK hide #-}
12{-# LANGUAGE CPP #-}
23{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE UndecidableInstances #-}
5+
36{-# OPTIONS_GHC -fno-warn-orphans #-}
47module Foreign.JavaScript.Orphans where
58
6−#ifndef __GHCJS__
9+#ifndef ghcjs_HOST_OS
710
811import Control.Monad.Trans.Class (lift)
9−import GHCJS.DOM.Types (MonadJSM(..))
10−import Reflex.DynamicWriter (DynamicWriterT)
11−import Reflex.Host.Class (ReflexHost, HostFrame)
12−import Reflex.PerformEvent.Base (PerformEventT(..))
12+import GHCJS.DOM.Types (MonadJSM (..))
13+import Reflex.DynamicWriter.Base (DynamicWriterT)
14+import Reflex.EventWriter.Base (EventWriterT)
15+import Reflex.Host.Class (HostFrame, ReflexHost)
16+import Reflex.PerformEvent.Base (PerformEventT (..))
1317import Reflex.PostBuild.Base (PostBuildT)
1418import Reflex.Requester.Base (RequesterT)
1519import Reflex.TriggerEvent.Base
20+import Reflex.Query.Base (QueryT)
1621
17−instance (MonadJSM m, ReflexHost t) => MonadJSM (PostBuildT t m) where
22+instance MonadJSM m => MonadJSM (PostBuildT t m) where
1823 liftJSM' = lift . liftJSM'
19−
2024instance (MonadJSM (HostFrame t), ReflexHost t) => MonadJSM (PerformEventT t m) where
2125 liftJSM' = PerformEventT . lift . liftJSM'
22−
2326instance MonadJSM m => MonadJSM (DynamicWriterT t w m) where
2427 liftJSM' = lift . liftJSM'
25−
28+instance MonadJSM m => MonadJSM (EventWriterT t w m) where
29+ liftJSM' = lift . liftJSM'
2630instance MonadJSM m => MonadJSM (RequesterT t request response m) where
2731 liftJSM' = lift . liftJSM'
28−
2932instance MonadJSM m => MonadJSM (TriggerEventT t m) where
3033 liftJSM' = lift . liftJSM'
34+instance MonadJSM m => MonadJSM (QueryT t q m) where
35+ liftJSM' = lift . liftJSM'
3136
3237#endif
reflex-dom-core/src/Foreign/JavaScript/TH.hs+45−31
@@ -1,21 +1,19 @@
11{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
23{-# LANGUAGE EmptyDataDecls #-}
34{-# LANGUAGE ExistentialQuantification #-}
45{-# LANGUAGE FlexibleContexts #-}
56{-# LANGUAGE FlexibleInstances #-}
67{-# LANGUAGE FunctionalDependencies #-}
78{-# LANGUAGE GeneralizedNewtypeDeriving #-}
8−{-# LANGUAGE MultiParamTypeClasses #-}
99{-# LANGUAGE RankNTypes #-}
1010{-# LANGUAGE StandaloneDeriving #-}
11+{-# LANGUAGE TypeFamilies #-}
12+{-# LANGUAGE UndecidableInstances #-}
1113#ifdef USE_TEMPLATE_HASKELL
1214{-# LANGUAGE TemplateHaskell #-}
1315#endif
14−{-# LANGUAGE TypeFamilies #-}
15−{-# LANGUAGE TypeSynonymInstances #-}
16−{-# LANGUAGE UndecidableInstances #-}
17−{-# LANGUAGE ConstraintKinds #-}
18−#ifdef __GHCJS__
16+#ifdef ghcjs_HOST_OS
1917{-# LANGUAGE ForeignFunctionInterface #-}
2018{-# LANGUAGE JavaScriptFFI #-}
2119#endif
@@ -25,33 +23,31 @@ module Foreign.JavaScript.TH ( module Foreign.JavaScript.TH
2523#endif
2624 ) where
2725
28−import Prelude hiding((!!))
26+import Foreign.JavaScript.Orphans ()
27+import Prelude hiding ((!!))
2928import Reflex.Class
30−import Reflex.DynamicWriter
31−import Reflex.EventWriter
29+import Reflex.Adjustable.Class
30+import Reflex.DynamicWriter.Base
31+import Reflex.EventWriter.Base
3232import Reflex.Host.Class
3333import Reflex.PerformEvent.Base
3434import Reflex.PerformEvent.Class
3535import Reflex.PostBuild.Base
3636import Reflex.Requester.Base
37−import Foreign.JavaScript.Orphans ()
37+import Reflex.Query.Base (QueryT (..))
3838
3939#ifdef USE_TEMPLATE_HASKELL
4040import Language.Haskell.TH
4141#endif
4242
43−import GHCJS.DOM.Types
44− (toJSString, liftJSM, askJSM, runJSM, JSContextRef,
45− Node(..), MonadJSM(..), toJSVal, JSVal)
46−#ifdef __GHCJS__
43+import GHCJS.DOM.Types (JSContextRef, Node (..), askJSM)
44+#ifdef ghcjs_HOST_OS
4745import qualified GHCJS.Buffer as JS
46+import GHCJS.DOM.Types (MonadJSM)
4847import qualified GHCJS.DOM.Types as JS
4948import qualified GHCJS.Foreign as JS
5049import qualified GHCJS.Foreign.Callback as JS
5150import qualified GHCJS.Foreign.Callback.Internal (Callback (..))
52−import qualified GHCJS.Marshal as JS
53−import qualified GHCJS.Marshal.Pure as JS
54−import qualified GHCJS.Types as JS
5551import qualified JavaScript.Array as JS
5652import qualified JavaScript.Array.Internal (SomeJSArray (..))
5753import qualified JavaScript.Object as JS
@@ -64,13 +60,12 @@ import Foreign.C.Types
6460import Foreign.Ptr
6561import Text.Encoding.Z
6662#else
67−import Data.Word (Word8)
6863import Control.Lens.Operators ((^.))
69−import Language.Javascript.JSaddle
70− (eval, valMakeString, valToNumber, function,
71− valMakeNumber, valBool, valToText, valToBool, valIsUndefined,
72− valUndefined, valIsNull, Function(..), (!!),
73− js, js1, jss, array, freeFunction)
64+import Data.Word (Word8)
65+import GHCJS.DOM.Types (JSVal, MonadJSM (..), liftJSM, runJSM, toJSString, toJSVal)
66+import Language.Javascript.JSaddle (Function (..), array, eval, freeFunction, function, js, js1, jss, valBool,
67+ valIsNull, valIsUndefined, valMakeNumber, valMakeString, valToBool,
68+ valToNumber, valToText, valUndefined, (!!))
7469#endif
7570
7671import Control.Concurrent
@@ -130,14 +125,19 @@ instance HasJSContext m => HasJSContext (RequesterT t request response m) where
130125 type JSContextPhantom (RequesterT t request response m) = JSContextPhantom m
131126 askJSContext = lift askJSContext
132127
128+instance HasJSContext m => HasJSContext (QueryT t q m) where
129+ type JSContextPhantom (QueryT t q m) = JSContextPhantom m
130+ askJSContext = QueryT askJSContext
131+
133132newtype WithJSContextSingleton x m a = WithJSContextSingleton { unWithJSContextSingleton :: ReaderT (JSContextSingleton x) m a } deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadTrans, MonadException, MonadAsyncException)
134133
135134instance PrimMonad m => PrimMonad (WithJSContextSingleton x m) where
136135 type PrimState (WithJSContextSingleton x m) = PrimState m
137136 primitive = lift . primitive
138137
139−instance MonadAdjust t m => MonadAdjust t (WithJSContextSingleton x m) where
138+instance Adjustable t m => Adjustable t (WithJSContextSingleton x m) where
140139 runWithReplace a0 a' = WithJSContextSingleton $ runWithReplace (coerce a0) (coerceEvent a')
140+ traverseIntMapWithKeyWithAdjust f dm0 dm' = WithJSContextSingleton $ traverseIntMapWithKeyWithAdjust (\k v -> unWithJSContextSingleton $ f k v) (coerce dm0) (coerceEvent dm')
141141 traverseDMapWithKeyWithAdjust f dm0 dm' = WithJSContextSingleton $ traverseDMapWithKeyWithAdjust (\k v -> unWithJSContextSingleton $ f k v) (coerce dm0) (coerceEvent dm')
142142 traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = WithJSContextSingleton $ traverseDMapWithKeyWithAdjustWithMove (\k v -> unWithJSContextSingleton $ f k v) (coerce dm0) (coerceEvent dm')
143143
@@ -169,6 +169,10 @@ instance MonadHold t m => MonadHold t (WithJSContextSingleton x m) where
169169 holdDyn v0 = lift . holdDyn v0
170170 {-# INLINABLE holdIncremental #-}
171171 holdIncremental v0 = lift . holdIncremental v0
172+ {-# INLINABLE buildDynamic #-}
173+ buildDynamic a0 = lift . buildDynamic a0
174+ {-# INLINABLE headE #-}
175+ headE = lift . headE
172176
173177instance MonadTransControl (WithJSContextSingleton x) where
174178 type StT (WithJSContextSingleton x) a = StT (ReaderT (JSContextSingleton x)) a
@@ -178,7 +182,7 @@ instance MonadTransControl (WithJSContextSingleton x) where
178182 restoreT = defaultRestoreT WithJSContextSingleton
179183
180184instance PerformEvent t m => PerformEvent t (WithJSContextSingleton x m) where
181− type Performable (WithJSContextSingleton x m) = WithJSContextSingleton x (Performable m)
185+ type Performable (WithJSContextSingleton x m) = WithJSContextSingleton x (Performable m) --TODO: Can we eliminate this wrapper?
182186 {-# INLINABLE performEvent_ #-}
183187 performEvent_ e = liftWith $ \run -> performEvent_ $ fmap run e
184188 {-# INLINABLE performEvent #-}
@@ -210,7 +214,7 @@ withJSContextSingletonMono f = askJSM >>= f . JSContextSingleton
210214-- | A singleton type for a given JSContext; we use this to statically guarantee that different JSContexts don't get mixed up
211215newtype JSContextSingleton x = JSContextSingleton { unJSContextSingleton :: JSContextRef }
212216
213−#ifdef __GHCJS__
217+#ifdef ghcjs_HOST_OS
214218type JSFFI_Internal = JS.MutableJSArray -> IO JS.JSVal
215219newtype JSFFI = JSFFI JSFFI_Internal
216220#else
@@ -218,7 +222,7 @@ newtype JSFFI = JSFFI String
218222#endif
219223
220224data JSFun x = JSFun { unJSFun :: JSRef x
221−#ifndef __GHCJS__
225+#ifndef ghcjs_HOST_OS
222226 , unJSFunction :: Function
223227#endif
224228 }
@@ -237,7 +241,7 @@ instance HasJS x m => HasJS x (ReaderT r m) where
237241 type JSX (ReaderT r m) = JSX m
238242 liftJS = lift . liftJS
239243
240−instance (HasJS x m, ReflexHost t) => HasJS x (PostBuildT t m) where
244+instance HasJS x m => HasJS x (PostBuildT t m) where
241245 type JSX (PostBuildT t m) = JSX m
242246 liftJS = lift . liftJS
243247
@@ -249,10 +253,18 @@ instance HasJS x m => HasJS x (DynamicWriterT t w m) where
249253 type JSX (DynamicWriterT t w m) = JSX m
250254 liftJS = lift . liftJS
251255
256+instance HasJS x m => HasJS x (EventWriterT t w m) where
257+ type JSX (EventWriterT t w m) = JSX m
258+ liftJS = lift . liftJS
259+
252260instance HasJS x m => HasJS x (RequesterT t request response m) where
253261 type JSX (RequesterT t request response m) = JSX m
254262 liftJS = lift . liftJS
255263
264+instance HasJS x m => HasJS x (QueryT t q m) where
265+ type JSX (QueryT t q m) = JSX m
266+ liftJS = lift . liftJS
267+
256268-- | A Monad that is capable of executing JavaScript
257269class Monad m => MonadJS x m | m -> x where
258270 runJS :: JSFFI -> [JSRef x] -> m (JSRef x)
@@ -277,9 +289,10 @@ class Monad m => MonadJS x m | m -> x where
277289 getJSProp :: String -> JSRef x -> m (JSRef x)
278290 withJSNode :: Node -> (JSRef x -> m r) -> m r
279291
280−#ifdef __GHCJS__
292+#ifdef ghcjs_HOST_OS
281293
282294data JSCtx_IO
295+type JS' = JSCtx_IO
283296
284297instance MonadIO m => HasJS JSCtx_IO (WithJSContextSingleton x m) where
285298 type JSX (WithJSContextSingleton x m) = IO
@@ -330,6 +343,7 @@ foreign import javascript unsafe "function(){ return $1(arguments); }" funWithAr
330343#else
331344
332345data JSCtx_JavaScriptCore x
346+type JS' = JSCtx_JavaScriptCore ()
333347
334348instance IsJSContext (JSCtx_JavaScriptCore x) where
335349 newtype JSRef (JSCtx_JavaScriptCore x) = JSRef_JavaScriptCore { unJSRef_JavaScriptCore :: JSVal }
@@ -416,7 +430,7 @@ instance MonadJS (JSCtx_JavaScriptCore x) (WithJSContext x IO) where
416430 f $ JSUint8Array payloadRef
417431 fromJSArray (JSRef_JavaScriptCore a) = liftJSM $ do
418432 len <- round <$> (valToNumber =<< (a ^. js "length"))
419− forM [0..len-1] $ \i -> JSRef_JavaScriptCore <$> a !! i
433+ forM [0..len-1] $ fmap JSRef_JavaScriptCore . (a !!)
420434 fromJSUint8Array a = do
421435 vals <- fromJSArray a
422436 doubles <- mapM fromJSNumber vals
@@ -536,7 +550,7 @@ importJS safety body name qt = do
536550 ]
537551
538552mkJSFFI :: Safety -> String -> Q ([Dec], Exp)
539−#ifdef __GHCJS__
553+#ifdef ghcjs_HOST_OS
540554mkJSFFI safety body = do
541555 -- n <- newName "jsffi" --TODO: Should use newName, but that doesn't seem to work with ghcjs
542556 l <- location
reflex-dom-core/src/Foreign/JavaScript/Utils.hsnew file+58
@@ -0,0 +1,58 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
3+module Foreign.JavaScript.Utils
4+ ( bsFromMutableArrayBuffer
5+ , bsToArrayBuffer
6+ , jsonDecode
7+ , js_jsonParse
8+ ) where
9+
10+import Control.Lens
11+import Data.Aeson
12+import Data.ByteString (ByteString)
13+import qualified Data.ByteString as BS
14+import Foreign.JavaScript.Internal.Utils (js_dataView)
15+import qualified GHCJS.Buffer as JS
16+import GHCJS.DOM.Types (ArrayBuffer (..))
17+import GHCJS.Marshal ()
18+import Language.Javascript.JSaddle (jsg, js1)
19+import qualified JavaScript.TypedArray.ArrayBuffer as JS
20+import Language.Javascript.JSaddle.Types (JSString, JSM, JSVal, MonadJSM, ghcjsPure, jsval, liftJSM)
21+#ifdef ghcjs_HOST_OS
22+import Control.Exception (SomeException)
23+import Language.Javascript.JSaddle (fromJSVal, catch)
24+import System.IO.Unsafe
25+#else
26+import qualified Data.ByteString.Lazy as LBS
27+import Data.Text.Encoding
28+import Language.Javascript.JSaddle (textFromJSString)
29+#endif
30+
31+{-# INLINABLE bsFromMutableArrayBuffer #-}
32+bsFromMutableArrayBuffer :: MonadJSM m => JS.MutableArrayBuffer -> m ByteString
33+bsFromMutableArrayBuffer ab = liftJSM $ JS.unsafeFreeze ab >>=
34+ ghcjsPure . JS.createFromArrayBuffer >>= ghcjsPure . JS.toByteString 0 Nothing
35+
36+{-# INLINABLE bsToArrayBuffer #-}
37+bsToArrayBuffer :: MonadJSM m => ByteString -> m ArrayBuffer
38+bsToArrayBuffer bs = liftJSM $ do
39+ (b, off, len) <- ghcjsPure $ JS.fromByteString bs
40+ ArrayBuffer <$> if BS.length bs == 0 --TODO: remove this logic when https://github.com/ghcjs/ghcjs-base/issues/49 is fixed
41+ then JS.create 0 >>= ghcjsPure . JS.getArrayBuffer >>= ghcjsPure . jsval
42+ else do
43+ ref <- ghcjsPure (JS.getArrayBuffer b) >>= ghcjsPure . jsval
44+ js_dataView off len ref
45+
46+jsonDecode :: FromJSON a => JSString -> Maybe a
47+#ifdef ghcjs_HOST_OS
48+jsonDecode t = do
49+ result <- unsafePerformIO $ (fromJSVal =<< js_jsonParse t) `catch` (\(_ :: SomeException) -> pure Nothing)
50+ case fromJSON result of
51+ Success a -> Just a
52+ Error _ -> Nothing
53+#else
54+jsonDecode = decode . LBS.fromStrict . encodeUtf8 . textFromJSString
55+#endif
56+
57+js_jsonParse :: JSString -> JSM JSVal
58+js_jsonParse a = jsg "JSON" ^. js1 "parse" a
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+209−147
@@ -7,11 +7,14 @@
77{-# LANGUAGE FlexibleInstances #-}
88{-# LANGUAGE FunctionalDependencies #-}
99{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10+#if !MIN_VERSION_base(4,9,0)
11+{-# LANGUAGE ImpredicativeTypes #-}
12+#else
13+{-# LANGUAGE Rank2Types #-} -- Implied by ImpredicativeTypes
14+#endif
1015{-# LANGUAGE LambdaCase #-}
11−{-# LANGUAGE MultiParamTypeClasses #-}
1216{-# LANGUAGE OverloadedStrings #-}
1317{-# LANGUAGE PolyKinds #-}
14−{-# LANGUAGE RankNTypes #-}
1518{-# LANGUAGE RecursiveDo #-}
1619{-# LANGUAGE ScopedTypeVariables #-}
1720{-# LANGUAGE StandaloneDeriving #-}
@@ -23,22 +26,29 @@
2326module Reflex.Dom.Builder.Class
2427 ( module Reflex.Dom.Builder.Class
2528 , module Reflex.Dom.Builder.Class.Events
29+ , module Reflex.NotReady.Class
2630 ) where
2731
32+import Reflex.Adjustable.Class
2833import Reflex.Class as Reflex
2934import Reflex.Dom.Builder.Class.Events
3035#ifdef USE_TEMPLATE_HASKELL
3136import Reflex.Dom.Builder.Class.TH
3237#endif
33−import Reflex.DynamicWriter
34−import Reflex.EventWriter
38+import Reflex.BehaviorWriter.Base
39+import Reflex.DynamicWriter.Base
40+import Reflex.EventWriter.Base
41+import Reflex.NotReady.Class
3542import Reflex.PerformEvent.Class
3643import Reflex.PostBuild.Base
44+import Reflex.Query.Base
45+import Reflex.Query.Class
3746import Reflex.Requester.Base
3847
3948import qualified Control.Category
4049import Control.Lens hiding (element)
4150import Control.Monad.Reader
51+import qualified Control.Monad.State as Lazy
4252import Control.Monad.State.Strict
4353import Control.Monad.Trans.Control
4454import Data.Default
@@ -51,28 +61,23 @@ import Data.Semigroup
5161import Data.String
5262import Data.Text (Text)
5363import Data.Type.Coercion
54−import GHC.Exts (Constraint)
5564import GHCJS.DOM.Types (JSM)
65+import qualified GHCJS.DOM.Types as DOM
5666
5767class Default (EventSpec d EventResult) => DomSpace d where
5868 type EventSpec d :: (EventTag -> *) -> *
69+ type RawDocument d :: *
5970 type RawTextNode d :: *
71+ type RawCommentNode d :: *
6072 type RawElement d :: *
61− type RawFile d :: *
6273 type RawInputElement d :: *
6374 type RawTextAreaElement d :: *
6475 type RawSelectElement d :: *
6576 addEventSpecFlags :: proxy d -> EventName en -> (Maybe (er en) -> EventFlags) -> EventSpec d er -> EventSpec d er
6677
67−{-# INLINABLE liftElementConfig #-}
68−liftElementConfig :: (DomBuilderSpace (f m) ~ DomBuilderSpace m) => ElementConfig er t (f m) -> ElementConfig er t m
69−liftElementConfig cfg = cfg
70− { _elementConfig_eventSpec = _elementConfig_eventSpec cfg
71− }
72−
7378-- | @'DomBuilder' t m@ indicates that @m@ is a 'Monad' capable of building
7479-- dynamic DOM in the 'Reflex' timeline @t@
75−class (Monad m, Reflex t, DomSpace (DomBuilderSpace m), MonadAdjust t m) => DomBuilder t m | m -> t where
80+class (Monad m, Reflex t, DomSpace (DomBuilderSpace m), NotReady t m, Adjustable t m) => DomBuilder t m | m -> t where
7681 type DomBuilderSpace m :: *
7782 textNode :: TextNodeConfig t -> m (TextNode (DomBuilderSpace m) t)
7883 default textNode :: ( MonadTrans f
@@ -83,51 +88,53 @@ class (Monad m, Reflex t, DomSpace (DomBuilderSpace m), MonadAdjust t m) => DomB
8388 => TextNodeConfig t -> m (TextNode (DomBuilderSpace m) t)
8489 textNode = lift . textNode
8590 {-# INLINABLE textNode #-}
86− element :: Text -> ElementConfig er t m -> m a -> m (Element er (DomBuilderSpace m) t, a)
91+ commentNode :: CommentNodeConfig t -> m (CommentNode (DomBuilderSpace m) t)
92+ default commentNode :: ( MonadTrans f
93+ , m ~ f m'
94+ , DomBuilderSpace m' ~ DomBuilderSpace m
95+ , DomBuilder t m'
96+ )
97+ => CommentNodeConfig t -> m (CommentNode (DomBuilderSpace m) t)
98+ commentNode = lift . commentNode
99+ {-# INLINABLE commentNode #-}
100+ element :: Text -> ElementConfig er t (DomBuilderSpace m) -> m a -> m (Element er (DomBuilderSpace m) t, a)
87101 default element :: ( MonadTransControl f
88102 , StT f a ~ a
89103 , m ~ f m'
90104 , DomBuilderSpace m' ~ DomBuilderSpace m
91105 , DomBuilder t m'
92106 )
93− => Text -> ElementConfig er t m -> m a -> m (Element er (DomBuilderSpace m) t, a)
94− element t cfg child = liftWith $ \run -> element t (liftElementConfig cfg) $ run child
107+ => Text -> ElementConfig er t (DomBuilderSpace m) -> m a -> m (Element er (DomBuilderSpace m) t, a)
108+ element t cfg child = liftWith $ \run -> element t cfg $ run child
95109 {-# INLINABLE element #-}
96− inputElement :: InputElementConfig er t m -> m (InputElement er (DomBuilderSpace m) t)
110+ inputElement :: InputElementConfig er t (DomBuilderSpace m) -> m (InputElement er (DomBuilderSpace m) t)
97111 default inputElement :: ( MonadTransControl f
98112 , m ~ f m'
99113 , DomBuilderSpace m' ~ DomBuilderSpace m
100114 , DomBuilder t m'
101115 )
102− => InputElementConfig er t m -> m (InputElement er (DomBuilderSpace m) t)
103− inputElement cfg = lift $ inputElement $ cfg
104− { _inputElementConfig_elementConfig = liftElementConfig $ _inputElementConfig_elementConfig cfg
105− }
116+ => InputElementConfig er t (DomBuilderSpace m) -> m (InputElement er (DomBuilderSpace m) t)
117+ inputElement = lift . inputElement
106118 {-# INLINABLE inputElement #-}
107− textAreaElement :: TextAreaElementConfig er t m -> m (TextAreaElement er (DomBuilderSpace m) t)
119+ textAreaElement :: TextAreaElementConfig er t (DomBuilderSpace m) -> m (TextAreaElement er (DomBuilderSpace m) t)
108120 default textAreaElement :: ( MonadTransControl f
109121 , m ~ f m'
110122 , DomBuilderSpace m' ~ DomBuilderSpace m
111123 , DomBuilder t m'
112124 )
113− => TextAreaElementConfig er t m -> m (TextAreaElement er (DomBuilderSpace m) t)
114− textAreaElement cfg = lift $ textAreaElement $ cfg
115− { _textAreaElementConfig_elementConfig = liftElementConfig $ _textAreaElementConfig_elementConfig cfg
116− }
125+ => TextAreaElementConfig er t (DomBuilderSpace m) -> m (TextAreaElement er (DomBuilderSpace m) t)
126+ textAreaElement = lift . textAreaElement
117127 {-# INLINABLE textAreaElement #-}
118− selectElement :: SelectElementConfig er t m -> m a -> m (SelectElement er (DomBuilderSpace m) t, a)
128+ selectElement :: SelectElementConfig er t (DomBuilderSpace m) -> m a -> m (SelectElement er (DomBuilderSpace m) t, a)
119129 default selectElement :: ( MonadTransControl f
120130 , StT f a ~ a
121131 , m ~ f m'
122132 , DomBuilderSpace m' ~ DomBuilderSpace m
123133 , DomBuilder t m'
124134 )
125− => SelectElementConfig er t m -> m a -> m (SelectElement er (DomBuilderSpace m) t, a)
135+ => SelectElementConfig er t (DomBuilderSpace m) -> m a -> m (SelectElement er (DomBuilderSpace m) t, a)
126136 selectElement cfg child = do
127− let cfg' = cfg
128− { _selectElementConfig_elementConfig = liftElementConfig $ _selectElementConfig_elementConfig cfg
129− }
130− liftWith $ \run -> selectElement cfg' $ run child
137+ liftWith $ \run -> selectElement cfg $ run child
131138 {-# INLINABLE selectElement #-}
132139 placeRawElement :: RawElement (DomBuilderSpace m) -> m ()
133140 default placeRawElement :: ( MonadTrans f
@@ -138,23 +145,28 @@ class (Monad m, Reflex t, DomSpace (DomBuilderSpace m), MonadAdjust t m) => DomB
138145 => RawElement (DomBuilderSpace m) -> m ()
139146 placeRawElement = lift . placeRawElement
140147 {-# INLINABLE placeRawElement #-}
141− wrapRawElement :: RawElement (DomBuilderSpace m) -> RawElementConfig er t m -> m (Element er (DomBuilderSpace m) t)
148+ wrapRawElement :: RawElement (DomBuilderSpace m) -> RawElementConfig er t (DomBuilderSpace m) -> m (Element er (DomBuilderSpace m) t)
142149 default wrapRawElement :: ( MonadTrans f
143150 , m ~ f m'
144151 , DomBuilderSpace m' ~ DomBuilderSpace m
145152 , DomBuilder t m'
146153 )
147− => RawElement (DomBuilderSpace m) -> RawElementConfig er t m -> m (Element er (DomBuilderSpace m) t)
154+ => RawElement (DomBuilderSpace m) -> RawElementConfig er t (DomBuilderSpace m) -> m (Element er (DomBuilderSpace m) t)
148155 wrapRawElement e cfg = lift $ wrapRawElement e $ cfg
149156 { _rawElementConfig_eventSpec = _rawElementConfig_eventSpec cfg
150157 }
151158 {-# INLINABLE wrapRawElement #-}
152159
160+class DomBuilder t m => MountableDomBuilder t m where
161+ type DomFragment m :: *
162+ buildDomFragment :: m a -> m (DomFragment m, a)
163+ mountDomFragment :: DomFragment m -> Event t (DomFragment m) -> m ()
164+
153165type Namespace = Text
154166
155167data TextNodeConfig t
156− = TextNodeConfig { _textNodeConfig_initialContents :: Text
157− , _textNodeConfig_setContents :: Maybe (Event t Text)
168+ = TextNodeConfig { _textNodeConfig_initialContents :: {-# UNPACK #-} !Text
169+ , _textNodeConfig_setContents :: !(Maybe (Event t Text))
158170 }
159171
160172#ifndef USE_TEMPLATE_HASKELL
@@ -170,10 +182,32 @@ instance (Reflex t) => Default (TextNodeConfig t) where
170182 , _textNodeConfig_setContents = Nothing
171183 }
172184
173−data TextNode d t = TextNode
185+newtype TextNode d t = TextNode
174186 { _textNode_raw :: RawTextNode d
175187 }
176188
189+data CommentNodeConfig t
190+ = CommentNodeConfig { _commentNodeConfig_initialContents :: {-# UNPACK #-} !Text
191+ , _commentNodeConfig_setContents :: !(Maybe (Event t Text))
192+ }
193+
194+#ifndef USE_TEMPLATE_HASKELL
195+commentNodeConfig_initialContents :: Lens' (CommentNodeConfig t) Text
196+commentNodeConfig_initialContents f (CommentNodeConfig a b) = (\a' -> CommentNodeConfig a' b) <$> f a
197+{-# INLINE commentNodeConfig_initialContents #-}
198+#endif
199+
200+instance (Reflex t) => Default (CommentNodeConfig t) where
201+ {-# INLINABLE def #-}
202+ def = CommentNodeConfig
203+ { _commentNodeConfig_initialContents = mempty
204+ , _commentNodeConfig_setContents = Nothing
205+ }
206+
207+newtype CommentNode d t = CommentNode
208+ { _commentNode_raw :: RawCommentNode d
209+ }
210+
177211data AttributeName = AttributeName !(Maybe Namespace) !Text deriving (Show, Read, Eq, Ord)
178212
179213mapKeysToAttributeName :: Map Text v -> Map AttributeName v
@@ -220,25 +254,25 @@ preventDefault = mempty { _eventFlags_preventDefault = True }
220254stopPropagation :: EventFlags
221255stopPropagation = mempty { _eventFlags_propagation = Propagation_Stop }
222256
223−data ElementConfig er t m
257+data ElementConfig er t s
224258 = ElementConfig { _elementConfig_namespace :: Maybe Namespace
225259 , _elementConfig_initialAttributes :: Map AttributeName Text
226260 , _elementConfig_modifyAttributes :: Maybe (Event t (Map AttributeName (Maybe Text)))
227− , _elementConfig_eventSpec :: EventSpec (DomBuilderSpace m) er
261+ , _elementConfig_eventSpec :: EventSpec s er
228262 }
229263
230264#ifndef USE_TEMPLATE_HASKELL
231−elementConfig_namespace :: Lens' (ElementConfig er t m) (Maybe Namespace)
265+elementConfig_namespace :: Lens' (ElementConfig er t s) (Maybe Namespace)
232266elementConfig_namespace f (ElementConfig a b c d) = (\a' -> ElementConfig a' b c d) <$> f a
233267{-# INLINE elementConfig_namespace #-}
234−elementConfig_initialAttributes :: Lens' (ElementConfig er t m) (Map AttributeName Text)
268+elementConfig_initialAttributes :: Lens' (ElementConfig er t s) (Map AttributeName Text)
235269elementConfig_initialAttributes f (ElementConfig a b c d) = (\b' -> ElementConfig a b' c d) <$> f b
236270{-# INLINE elementConfig_initialAttributes #-}
237271elementConfig_eventSpec :: Lens
238− (ElementConfig er1 t m1)
239− (ElementConfig er2 t m2)
240− (EventSpec (DomBuilderSpace m1) er1)
241− (EventSpec (DomBuilderSpace m2) er2)
272+ (ElementConfig er1 t s1)
273+ (ElementConfig er2 t s2)
274+ (EventSpec s1 er1)
275+ (EventSpec s2 er2)
242276elementConfig_eventSpec f (ElementConfig a b c d) = (\d' -> ElementConfig a b c d') <$> f d
243277{-# INLINE elementConfig_eventSpec #-}
244278#endif
@@ -248,12 +282,12 @@ data Element er d t
248282 , _element_raw :: RawElement d
249283 }
250284
251−data InputElementConfig er t m
285+data InputElementConfig er t s
252286 = InputElementConfig { _inputElementConfig_initialValue :: Text
253287 , _inputElementConfig_setValue :: Maybe (Event t Text)
254288 , _inputElementConfig_initialChecked :: Bool
255289 , _inputElementConfig_setChecked :: Maybe (Event t Bool)
256− , _inputElementConfig_elementConfig :: ElementConfig er t m
290+ , _inputElementConfig_elementConfig :: ElementConfig er t s
257291 }
258292
259293#ifndef USE_TEMPLATE_HASKELL
@@ -272,7 +306,7 @@ inputElementConfig_elementConfig f (InputElementConfig a b c d e) = (\e' -> Inpu
272306{-# INLINE inputElementConfig_elementConfig #-}
273307#endif
274308
275−instance (Reflex t, er ~ EventResult, DomBuilder t m) => Default (InputElementConfig er t m) where
309+instance (Reflex t, er ~ EventResult, DomSpace s) => Default (InputElementConfig er t s) where
276310 {-# INLINABLE def #-}
277311 def = InputElementConfig
278312 { _inputElementConfig_initialValue = ""
@@ -290,7 +324,7 @@ data InputElement er d t
290324 , _inputElement_hasFocus :: Dynamic t Bool
291325 , _inputElement_element :: Element er d t
292326 , _inputElement_raw :: RawInputElement d
293− , _inputElement_files :: Dynamic t [RawFile d]
327+ , _inputElement_files :: Dynamic t [DOM.File]
294328 }
295329
296330data TextAreaElementConfig er t m
@@ -312,7 +346,7 @@ textAreaElementConfig_elementConfig f (TextAreaElementConfig a b c) = (\c' -> Te
312346{-# INLINE textAreaElementConfig_elementConfig #-}
313347#endif
314348
315−instance (Reflex t, er ~ EventResult, DomBuilder t m) => Default (TextAreaElementConfig er t m) where
349+instance (Reflex t, er ~ EventResult, DomSpace s) => Default (TextAreaElementConfig er t s) where
316350 {-# INLINABLE def #-}
317351 def = TextAreaElementConfig
318352 { _textAreaElementConfig_initialValue = ""
@@ -334,22 +368,22 @@ extractRawElementConfig cfg = RawElementConfig
334368 , _rawElementConfig_eventSpec = _elementConfig_eventSpec cfg
335369 }
336370
337−data RawElementConfig er t m = RawElementConfig
371+data RawElementConfig er t s = RawElementConfig
338372 { _rawElementConfig_modifyAttributes :: Maybe (Event t (Map AttributeName (Maybe Text)))
339− , _rawElementConfig_eventSpec :: EventSpec (DomBuilderSpace m) er
373+ , _rawElementConfig_eventSpec :: EventSpec s er
340374 }
341375
342376#ifndef USE_TEMPLATE_HASKELL
343377rawElementConfig_eventSpec :: Lens
344− (RawElementConfig er1 t m1)
345− (RawElementConfig er2 t m2)
346− (EventSpec (DomBuilderSpace m1) er1)
347− (EventSpec (DomBuilderSpace m2) er2)
378+ (RawElementConfig er1 t s1)
379+ (RawElementConfig er2 t s2)
380+ (EventSpec s1 er1)
381+ (EventSpec s2 er2)
348382rawElementConfig_eventSpec f (RawElementConfig a b) = (\b' -> RawElementConfig a b') <$> f b
349383{-# INLINE rawElementConfig_eventSpec #-}
350384#endif
351385
352−instance (Reflex t, DomSpace (DomBuilderSpace m)) => Default (RawElementConfig EventResult t m) where
386+instance (Reflex t, er ~ EventResult, DomSpace s) => Default (RawElementConfig er t s) where
353387 def = RawElementConfig
354388 { _rawElementConfig_modifyAttributes = Nothing
355389 , _rawElementConfig_eventSpec = def
@@ -374,7 +408,7 @@ selectElementConfig_elementConfig f (SelectElementConfig a b c) = (\c' -> Select
374408{-# INLINE selectElementConfig_elementConfig #-}
375409#endif
376410
377−instance (Reflex t, er ~ EventResult, DomBuilder t m) => Default (SelectElementConfig er t m) where
411+instance (Reflex t, er ~ EventResult, DomSpace s) => Default (SelectElementConfig er t s) where
378412 def = SelectElementConfig
379413 { _selectElementConfig_initialValue = ""
380414 , _selectElementConfig_setValue = Nothing
@@ -392,6 +426,7 @@ data SelectElement er d t = SelectElement
392426#ifdef USE_TEMPLATE_HASKELL
393427concat <$> mapM (uncurry makeLensesWithoutField)
394428 [ (["_textNodeConfig_setContents"], ''TextNodeConfig)
429+ , (["_commentNodeConfig_setContents"], ''CommentNodeConfig)
395430 , ([ "_inputElementConfig_setValue"
396431 , "_inputElementConfig_setChecked" ], ''InputElementConfig)
397432 , (["_rawElementConfig_modifyAttributes"], ''RawElementConfig)
@@ -402,49 +437,56 @@ concat <$> mapM (uncurry makeLensesWithoutField)
402437#endif
403438
404439-- | This lens is technically illegal. The implementation of 'TextNodeConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'TextNodeConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
405−textNodeConfig_setContents :: Reflex t => Lens (TextNodeConfig t) (TextNodeConfig t) (Event t Text) (Event t Text)
440+textNodeConfig_setContents :: Reflex t => Lens' (TextNodeConfig t) (Event t Text)
406441textNodeConfig_setContents =
407442 let getter = fromMaybe never . _textNodeConfig_setContents
408443 setter t e = t { _textNodeConfig_setContents = Just e }
409444 in lens getter setter
410445
446+-- | This lens is technically illegal. The implementation of 'CommentNodeConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'CommentNodeConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
447+commentNodeConfig_setContents :: Reflex t => Lens (CommentNodeConfig t) (CommentNodeConfig t) (Event t Text) (Event t Text)
448+commentNodeConfig_setContents =
449+ let getter = fromMaybe never . _commentNodeConfig_setContents
450+ setter t e = t { _commentNodeConfig_setContents = Just e }
451+ in lens getter setter
452+
411453-- | This lens is technically illegal. The implementation of 'InputElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'InputElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
412−inputElementConfig_setValue :: Reflex t => Lens (InputElementConfig er t m) (InputElementConfig er t m) (Event t Text) (Event t Text)
454+inputElementConfig_setValue :: Reflex t => Lens' (InputElementConfig er t m) (Event t Text)
413455inputElementConfig_setValue =
414456 let getter = fromMaybe never . _inputElementConfig_setValue
415457 setter t e = t { _inputElementConfig_setValue = Just e }
416458 in lens getter setter
417459
418460-- | This lens is technically illegal. The implementation of 'InputElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'InputElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
419−inputElementConfig_setChecked :: Reflex t => Lens (InputElementConfig er t m) (InputElementConfig er t m) (Event t Bool) (Event t Bool)
461+inputElementConfig_setChecked :: Reflex t => Lens' (InputElementConfig er t m) (Event t Bool)
420462inputElementConfig_setChecked =
421463 let getter = fromMaybe never . _inputElementConfig_setChecked
422464 setter t e = t { _inputElementConfig_setChecked = Just e }
423465 in lens getter setter
424466
425467-- | This lens is technically illegal. The implementation of 'RawElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'RawElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
426−rawElementConfig_modifyAttributes :: Reflex t => Lens (RawElementConfig er t m) (RawElementConfig er t m) (Event t (Map AttributeName (Maybe Text))) (Event t (Map AttributeName (Maybe Text)))
468+rawElementConfig_modifyAttributes :: Reflex t => Lens' (RawElementConfig er t m) (Event t (Map AttributeName (Maybe Text)))
427469rawElementConfig_modifyAttributes =
428470 let getter = fromMaybe never . _rawElementConfig_modifyAttributes
429471 setter t e = t { _rawElementConfig_modifyAttributes = Just e }
430472 in lens getter setter
431473
432474-- | This lens is technically illegal. The implementation of 'RawElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'RawElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
433−elementConfig_modifyAttributes :: Reflex t => Lens (ElementConfig er t m) (ElementConfig er t m) (Event t (Map AttributeName (Maybe Text))) (Event t (Map AttributeName (Maybe Text)))
475+elementConfig_modifyAttributes :: Reflex t => Lens' (ElementConfig er t m) (Event t (Map AttributeName (Maybe Text)))
434476elementConfig_modifyAttributes =
435477 let getter = fromMaybe never . _elementConfig_modifyAttributes
436478 setter t e = t { _elementConfig_modifyAttributes = Just e }
437479 in lens getter setter
438480
439481-- | This lens is technically illegal. The implementation of 'TextAreaElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'TextAreaElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
440−textAreaElementConfig_setValue :: Reflex t => Lens (TextAreaElementConfig er t m) (TextAreaElementConfig er t m) (Event t Text) (Event t Text)
482+textAreaElementConfig_setValue :: Reflex t => Lens' (TextAreaElementConfig er t m) (Event t Text)
441483textAreaElementConfig_setValue =
442484 let getter = fromMaybe never . _textAreaElementConfig_setValue
443485 setter t e = t { _textAreaElementConfig_setValue = Just e }
444486 in lens getter setter
445487
446488-- | This lens is technically illegal. The implementation of 'SelectElementConfig' uses a 'Maybe' under the hood for efficiency reasons. However, always interacting with 'SelectElementConfig' via lenses will always behave correctly, and if you pattern match on it, you should always treat 'Nothing' as 'never'.
447−selectElementConfig_setValue :: Reflex t => Lens (SelectElementConfig er t m) (SelectElementConfig er t m) (Event t Text) (Event t Text)
489+selectElementConfig_setValue :: Reflex t => Lens' (SelectElementConfig er t m) (Event t Text)
448490selectElementConfig_setValue =
449491 let getter = fromMaybe never . _selectElementConfig_setValue
450492 setter t e = t { _selectElementConfig_setValue = Just e }
@@ -499,7 +541,7 @@ instance HasNamespace (ElementConfig er t m) where
499541 {-# INLINABLE namespace #-}
500542 namespace = elementConfig_namespace
501543
502−instance (Reflex t, er ~ EventResult, DomBuilder t m) => Default (ElementConfig er t m) where
544+instance (Reflex t, er ~ EventResult, DomSpace s) => Default (ElementConfig er t s) where
503545 {-# INLINABLE def #-}
504546 def = ElementConfig
505547 { _elementConfig_namespace = Nothing
@@ -510,114 +552,101 @@ instance (Reflex t, er ~ EventResult, DomBuilder t m) => Default (ElementConfig
510552
511553instance (DomBuilder t m, PerformEvent t m, MonadFix m, MonadHold t m) => DomBuilder t (PostBuildT t m) where
512554 type DomBuilderSpace (PostBuildT t m) = DomBuilderSpace m
513− wrapRawElement e cfg = liftWith $ \run -> wrapRawElement e $ fmap1 run cfg
555+ wrapRawElement e = lift . wrapRawElement e
556+
557+instance (MountableDomBuilder t m, PerformEvent t m, MonadFix m, MonadHold t m) => MountableDomBuilder t (PostBuildT t m) where
558+ type DomFragment (PostBuildT t m) = DomFragment m
559+ buildDomFragment = liftThrough buildDomFragment
560+ mountDomFragment f0 f' = lift $ mountDomFragment f0 f'
514561
515562instance (DomBuilder t m, Monoid w, MonadHold t m, MonadFix m) => DomBuilder t (DynamicWriterT t w m) where
516563 type DomBuilderSpace (DynamicWriterT t w m) = DomBuilderSpace m
517564 textNode = liftTextNode
565+ commentNode = liftCommentNode
518566 element elementTag cfg (DynamicWriterT child) = DynamicWriterT $ do
519567 s <- get
520− let cfg' = liftElementConfig cfg
521− (el, (a, newS)) <- lift $ element elementTag cfg' $ runStateT child s
568+ (el, (a, newS)) <- lift $ element elementTag cfg $ runStateT child s
522569 put newS
523570 return (el, a)
524− inputElement cfg = lift $ inputElement $ cfg & inputElementConfig_elementConfig %~ liftElementConfig
525− textAreaElement cfg = lift $ textAreaElement $ cfg & textAreaElementConfig_elementConfig %~ liftElementConfig
571+ inputElement = lift . inputElement
572+ textAreaElement = lift . textAreaElement
526573 selectElement cfg (DynamicWriterT child) = DynamicWriterT $ do
527574 s <- get
528− let cfg' = cfg & selectElementConfig_elementConfig %~ liftElementConfig
529− (el, (a, newS)) <- lift $ selectElement cfg' $ runStateT child s
575+ (el, (a, newS)) <- lift $ selectElement cfg $ runStateT child s
530576 put newS
531577 return (el, a)
532578 placeRawElement = lift . placeRawElement
533− wrapRawElement e cfg = lift $ wrapRawElement e $ cfg
534− { _rawElementConfig_eventSpec = _rawElementConfig_eventSpec cfg
535− }
579+ wrapRawElement e = lift . wrapRawElement e
536580
537581instance (DomBuilder t m, MonadHold t m, MonadFix m) => DomBuilder t (RequesterT t request response m) where
538582 type DomBuilderSpace (RequesterT t request response m) = DomBuilderSpace m
539583 textNode = liftTextNode
584+ commentNode = liftCommentNode
540585 element elementTag cfg (RequesterT child) = RequesterT $ do
541586 r <- ask
542− let cfg' = liftElementConfig cfg
543− (el, (a, e)) <- lift $ lift $ element elementTag cfg' $ runReaderT (runEventWriterT child) r
544− tellEvent e
587+ old <- get
588+ (el, (a, new)) <- lift $ lift $ element elementTag cfg $ runReaderT (runStateT child old) r
589+ put new
545590 return (el, a)
546− inputElement cfg = lift $ inputElement $ cfg & inputElementConfig_elementConfig %~ liftElementConfig
547− textAreaElement cfg = lift $ textAreaElement $ cfg & textAreaElementConfig_elementConfig %~ liftElementConfig
591+ inputElement = lift . inputElement
592+ textAreaElement = lift . textAreaElement
548593 selectElement cfg (RequesterT child) = RequesterT $ do
549594 r <- ask
550− let cfg' = cfg & selectElementConfig_elementConfig %~ liftElementConfig
551− (el, (a, e)) <- lift $ lift $ selectElement cfg' $ runReaderT (runEventWriterT child) r
552− tellEvent e
595+ old <- get
596+ (el, (a, new)) <- lift $ lift $ selectElement cfg $ runReaderT (runStateT child old) r
597+ put new
553598 return (el, a)
554599 placeRawElement = lift . placeRawElement
555− wrapRawElement e cfg = lift $ wrapRawElement e $ cfg
556− { _rawElementConfig_eventSpec = _rawElementConfig_eventSpec cfg
557− }
600+ wrapRawElement e = lift . wrapRawElement e
558601
559−instance (DomBuilder t m, MonadHold t m, MonadFix m, Semigroup w, Monoid w) => DomBuilder t (EventWriterT t w m) where
602+instance (DomBuilder t m, MonadHold t m, MonadFix m, Semigroup w) => DomBuilder t (EventWriterT t w m) where
560603 type DomBuilderSpace (EventWriterT t w m) = DomBuilderSpace m
561604 textNode = liftTextNode
562− element elementTag cfg child = do
563− let cfg' = liftElementConfig cfg
564− (el, (a, e)) <- lift $ element elementTag cfg' $ runEventWriterT child
565− tellEvent e
605+ commentNode = liftCommentNode
606+ element elementTag cfg (EventWriterT child) = EventWriterT $ do
607+ old <- get
608+ (el, (a, new)) <- lift $ element elementTag cfg $ runStateT child old
609+ put new
566610 return (el, a)
567− inputElement cfg = lift $ inputElement $ cfg & inputElementConfig_elementConfig %~ liftElementConfig
568− textAreaElement cfg = lift $ textAreaElement $ cfg & textAreaElementConfig_elementConfig %~ liftElementConfig
569− selectElement cfg child = do
570− let cfg' = cfg & selectElementConfig_elementConfig %~ liftElementConfig
571− (el, (a, e)) <- lift $ selectElement cfg' $ runEventWriterT child
572− tellEvent e
611+ inputElement = lift . inputElement
612+ textAreaElement = lift . textAreaElement
613+ selectElement cfg (EventWriterT child) = EventWriterT $ do
614+ old <- get
615+ (el, (a, new)) <- lift $ selectElement cfg $ runStateT child old
616+ put new
573617 return (el, a)
574618 placeRawElement = lift . placeRawElement
575− wrapRawElement e cfg = lift $ wrapRawElement e $ cfg
576− { _rawElementConfig_eventSpec = _rawElementConfig_eventSpec cfg
577− }
619+ wrapRawElement e = lift . wrapRawElement e
578620
579−-- * Convenience functions
580−
581−--TODO: Move/replace
582−class Functor1 (f :: (k -> *) -> *) where
583− type Functor1Constraint f (a :: k -> *) (b :: k -> *) :: Constraint
584− type Functor1Constraint f a b = ()
585− fmap1 :: Functor1Constraint f a b => (forall x. a x -> b x) -> f a -> f b
586−
587−instance Functor1 (ElementConfig er t) where
588− type Functor1Constraint (ElementConfig er t) a b = DomBuilderSpace a ~ DomBuilderSpace b
589− {-# INLINABLE fmap1 #-}
590− fmap1 _ cfg = cfg
591− { _elementConfig_eventSpec = _elementConfig_eventSpec cfg
592− }
593−
594−instance Functor1 (InputElementConfig er t) where
595− type Functor1Constraint (InputElementConfig er t) a b = Functor1Constraint (ElementConfig er t) a b
596− fmap1 f cfg = cfg & inputElementConfig_elementConfig %~ fmap1 f
597−
598−instance Functor1 (TextAreaElementConfig er t) where
599− type Functor1Constraint (TextAreaElementConfig er t) a b = Functor1Constraint (ElementConfig er t) a b
600− fmap1 f cfg = cfg & textAreaElementConfig_elementConfig %~ fmap1 f
601−
602−instance Functor1 (SelectElementConfig er t) where
603− type Functor1Constraint (SelectElementConfig er t) a b = Functor1Constraint (ElementConfig er t) a b
604− fmap1 f cfg = cfg & selectElementConfig_elementConfig %~ fmap1 f
621+instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive q, Eq q) => DomBuilder t (QueryT t q m) where
622+ type DomBuilderSpace (QueryT t q m) = DomBuilderSpace m
623+ textNode = liftTextNode
624+ commentNode = liftCommentNode
625+ element elementTag cfg (QueryT child) = QueryT $ do
626+ s <- get
627+ (e, (a, newS)) <- lift $ element elementTag cfg $ runStateT child s
628+ put newS
629+ return (e, a)
630+ inputElement = lift . inputElement
631+ textAreaElement = lift . textAreaElement
632+ selectElement cfg (QueryT child) = QueryT $ do
633+ s <- get
634+ (e, (a, newS)) <- lift $ selectElement cfg $ runStateT child s
635+ put newS
636+ return (e, a)
637+ placeRawElement = lift . placeRawElement
638+ wrapRawElement e = lift . wrapRawElement e
605639
606−instance Functor1 (RawElementConfig er t) where
607− type Functor1Constraint (RawElementConfig er t) a b = DomBuilderSpace a ~ DomBuilderSpace b
608− {-# INLINABLE fmap1 #-}
609− fmap1 _ cfg = cfg
610− { _rawElementConfig_eventSpec = _rawElementConfig_eventSpec cfg
611− }
640+-- * Convenience functions
612641
613−class HasDomEvent t target eventName where
642+class HasDomEvent t target eventName | target -> t where
614643 type DomEventType target eventName :: *
615644 domEvent :: EventName eventName -> target -> Event t (DomEventType target eventName)
616645
617646instance Reflex t => HasDomEvent t (Element EventResult d t) en where
618647 type DomEventType (Element EventResult d t) en = EventResultType en
619648 {-# INLINABLE domEvent #-}
620− domEvent en e = unEventResult <$> Reflex.select (_element_events e) (WrapArg en)
649+ domEvent en e = coerceEvent $ Reflex.select (_element_events e) (WrapArg en)
621650
622651instance Reflex t => HasDomEvent t (InputElement EventResult d t) en where
623652 type DomEventType (InputElement EventResult d t) en = EventResultType en
@@ -642,7 +671,7 @@ type LiftDomBuilder t f m =
642671
643672class MonadTransControl t => MonadTransControlStateless t where
644673 stTCoercion :: proxy t -> Coercion (StT t a) a
645− default stTCoercion :: proxy t -> Coercion a a
674+ default stTCoercion :: (a ~ StT t a) => proxy t -> Coercion (StT t a) a
646675 stTCoercion _ = Control.Category.id
647676
648677toStT :: MonadTransControlStateless t => proxy t -> a -> StT t a
@@ -656,22 +685,16 @@ instance MonadTransControlStateless (ReaderT r)
656685type RunStateless t = forall n b. Monad n => t n b -> n b
657686
658687liftWithStateless :: forall m t a. (Monad m, MonadTransControlStateless t) => (RunStateless t -> m a) -> t m a
659−liftWithStateless a = liftWith $ \run -> a $ \x -> fromStT (Proxy :: Proxy t) <$> run x
688+liftWithStateless a = liftWith $ \run -> a $ fmap (fromStT (Proxy :: Proxy t)) . run
660689
661690liftTextNode :: (MonadTrans f, DomBuilder t m) => TextNodeConfig t -> f m (TextNode (DomBuilderSpace m) t)
662691liftTextNode = lift . textNode
663692
664−liftElement :: LiftDomBuilder t f m => Text -> ElementConfig er t (f m) -> f m a -> f m (Element er (DomBuilderSpace m) t, a)
665−liftElement elementTag cfg child = liftWithStateless $ \run -> element elementTag (fmap1 run cfg) $ run child
666−
667−liftInputElement :: LiftDomBuilder t f m => InputElementConfig er t (f m) -> f m (InputElement er (DomBuilderSpace m) t)
668−liftInputElement cfg = liftWithStateless $ \run -> inputElement $ fmap1 run cfg
669−
670−liftTextAreaElement :: LiftDomBuilder t f m => TextAreaElementConfig er t (f m) -> f m (TextAreaElement er (DomBuilderSpace m) t)
671−liftTextAreaElement cfg = liftWithStateless $ \run -> textAreaElement $ fmap1 run cfg
693+liftCommentNode :: (MonadTrans f, DomBuilder t m) => CommentNodeConfig t -> f m (CommentNode (DomBuilderSpace m) t)
694+liftCommentNode = lift . commentNode
672695
673−liftWrapRawElement :: LiftDomBuilder t f m => RawElement (DomBuilderSpace m) -> RawElementConfig er t (f m) -> f m (Element er (DomBuilderSpace m) t)
674−liftWrapRawElement e es = liftWithStateless $ \run -> wrapRawElement e $ fmap1 run es
696+liftElement :: LiftDomBuilder t f m => Text -> ElementConfig er t (DomBuilderSpace m) -> f m a -> f m (Element er (DomBuilderSpace m) t, a)
697+liftElement elementTag cfg child = liftWithStateless $ \run -> element elementTag cfg $ run child
675698
676699class (Reflex t, Monad m) => DomRenderHook t m | m -> t where
677700 withRenderHook :: (forall x. JSM x -> JSM x) -> m a -> m a
@@ -688,6 +711,45 @@ instance DomRenderHook t m => DomRenderHook t (StateT e m) where
688711 requestDomAction = lift . requestDomAction
689712 requestDomAction_ = lift . requestDomAction_
690713
714+instance DomRenderHook t m => DomRenderHook t (Lazy.StateT e m) where
715+ withRenderHook hook (Lazy.StateT a) = Lazy.StateT $ \s -> withRenderHook hook $ a s
716+ requestDomAction = lift . requestDomAction
717+ requestDomAction_ = lift . requestDomAction_
718+
719+deriving instance DomRenderHook t m => DomRenderHook t (BehaviorWriterT t w m)
691720deriving instance DomRenderHook t m => DomRenderHook t (EventWriterT t w m)
721+deriving instance DomRenderHook t m => DomRenderHook t (DynamicWriterT t w m)
692722deriving instance DomRenderHook t m => DomRenderHook t (RequesterT t req rsp m)
693723deriving instance DomRenderHook t m => DomRenderHook t (PostBuildT t m)
724+deriving instance DomRenderHook t m => DomRenderHook t (QueryT t q m)
725+
726+{-# DEPRECATED liftElementConfig "Use 'id' instead; this function is no longer necessary" #-}
727+liftElementConfig :: ElementConfig er t s -> ElementConfig er t s
728+liftElementConfig = id
729+
730+class Monad m => HasDocument m where
731+ askDocument :: m (RawDocument (DomBuilderSpace m))
732+ default askDocument
733+ :: ( m ~ f m'
734+ , RawDocument (DomBuilderSpace m) ~ RawDocument (DomBuilderSpace m')
735+ , MonadTrans f
736+ , Monad m'
737+ , HasDocument m'
738+ )
739+ => m (RawDocument (DomBuilderSpace m))
740+ askDocument = lift askDocument
741+
742+instance HasDocument m => HasDocument (ReaderT r m)
743+instance HasDocument m => HasDocument (EventWriterT t w m)
744+instance HasDocument m => HasDocument (DynamicWriterT t w m)
745+instance HasDocument m => HasDocument (PostBuildT t m)
746+instance HasDocument m => HasDocument (RequesterT t request response m)
747+instance HasDocument m => HasDocument (QueryT t q m)
748+
749+class HasSetValue a where
750+ type SetValue a :: *
751+ setValue :: Lens' a (SetValue a)
752+
753+instance Reflex t => HasSetValue (TextAreaElementConfig er t m) where
754+ type SetValue (TextAreaElementConfig er t m) = Event t Text
755+ setValue = textAreaElementConfig_setValue
reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs+63−69
@@ -1,7 +1,6 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE DataKinds #-}
33{-# LANGUAGE GADTs #-}
4−{-# LANGUAGE KindSignatures #-}
54{-# LANGUAGE PolyKinds #-}
65#ifdef USE_TEMPLATE_HASKELL
76{-# LANGUAGE TemplateHaskell #-}
@@ -14,8 +13,8 @@ import Data.GADT.Compare.TH
1413#else
1514import Data.GADT.Compare
1615 (GOrdering(..), (:~:)(..), GEq(..), GCompare(..))
17−import Control.Monad (ap)
1816#endif
17+import Data.Text (Text)
1918
2019data EventTag
2120 = AbortTag
@@ -118,10 +117,10 @@ newtype EventResult en = EventResult { unEventResult :: EventResultType en }
118117type family EventResultType (en :: EventTag) :: * where
119118 EventResultType 'ClickTag = ()
120119 EventResultType 'DblclickTag = (Int, Int)
121− EventResultType 'KeypressTag = Int
122− EventResultType 'KeydownTag = Int
123− EventResultType 'KeyupTag = Int
124− EventResultType 'ScrollTag = Int
120+ EventResultType 'KeypressTag = Word
121+ EventResultType 'KeydownTag = Word
122+ EventResultType 'KeyupTag = Word
123+ EventResultType 'ScrollTag = Double
125124 EventResultType 'MousemoveTag = (Int, Int)
126125 EventResultType 'MousedownTag = (Int, Int)
127126 EventResultType 'MouseupTag = (Int, Int)
@@ -153,7 +152,7 @@ type family EventResultType (en :: EventTag) :: * where
153152 EventResultType 'BeforecopyTag = ()
154153 EventResultType 'CopyTag = ()
155154 EventResultType 'BeforepasteTag = ()
156− EventResultType 'PasteTag = ()
155+ EventResultType 'PasteTag = Maybe Text
157156 EventResultType 'ResetTag = ()
158157 EventResultType 'SearchTag = ()
159158 EventResultType 'SelectstartTag = ()
@@ -161,7 +160,17 @@ type family EventResultType (en :: EventTag) :: * where
161160 EventResultType 'TouchmoveTag = TouchEventResult
162161 EventResultType 'TouchendTag = TouchEventResult
163162 EventResultType 'TouchcancelTag = TouchEventResult
164− EventResultType 'WheelTag = ()
163+ EventResultType 'WheelTag = WheelEventResult
164+
165+data DeltaMode = DeltaPixel | DeltaLine | DeltaPage
166+ deriving (Show, Read, Eq, Ord, Bounded, Enum)
167+
168+data WheelEventResult = WheelEventResult
169+ { _wheelEventResult_deltaX :: Double
170+ , _wheelEventResult_deltaY :: Double
171+ , _wheelEventResult_deltaZ :: Double
172+ , _wheelEventResult_deltaMode :: DeltaMode
173+ } deriving (Show, Read, Eq, Ord)
165174
166175data TouchEventResult = TouchEventResult
167176 { _touchEventResult_altKey :: Bool
@@ -238,156 +247,141 @@ instance GEq EventName
238247 geq Touchcancel Touchcancel = return Refl
239248 geq _ _ = Nothing
240249
241−newtype GComparing a b t = GComparing (Either (GOrdering a b) t)
242−
243−instance Functor (GComparing a b) where fmap f (GComparing x) = GComparing (either Left (Right . f) x)
244−instance Monad (GComparing a b) where
245− return = GComparing . Right
246− GComparing (Left x) >>= f = GComparing (Left x)
247− GComparing (Right x) >>= f = f x
248−instance Applicative (GComparing a b) where
249− pure = return
250− (<*>) = ap
251−
252−runGComparing (GComparing x) = either id id x
253−
254250instance GCompare EventName
255− where gcompare Abort Abort = runGComparing $ return GEQ
251+ where gcompare Abort Abort = GEQ
256252 gcompare Abort _ = GLT
257253 gcompare _ Abort = GGT
258− gcompare Blur Blur = runGComparing $ return GEQ
254+ gcompare Blur Blur = GEQ
259255 gcompare Blur _ = GLT
260256 gcompare _ Blur = GGT
261− gcompare Change Change = runGComparing $ return GEQ
257+ gcompare Change Change = GEQ
262258 gcompare Change _ = GLT
263259 gcompare _ Change = GGT
264− gcompare Click Click = runGComparing $ return GEQ
260+ gcompare Click Click = GEQ
265261 gcompare Click _ = GLT
266262 gcompare _ Click = GGT
267− gcompare Contextmenu Contextmenu = runGComparing $ return GEQ
263+ gcompare Contextmenu Contextmenu = GEQ
268264 gcompare Contextmenu _ = GLT
269265 gcompare _ Contextmenu = GGT
270− gcompare Dblclick Dblclick = runGComparing $ return GEQ
266+ gcompare Dblclick Dblclick = GEQ
271267 gcompare Dblclick _ = GLT
272268 gcompare _ Dblclick = GGT
273− gcompare Drag Drag = runGComparing $ return GEQ
269+ gcompare Drag Drag = GEQ
274270 gcompare Drag _ = GLT
275271 gcompare _ Drag = GGT
276− gcompare Dragend Dragend = runGComparing $ return GEQ
272+ gcompare Dragend Dragend = GEQ
277273 gcompare Dragend _ = GLT
278274 gcompare _ Dragend = GGT
279− gcompare Dragenter Dragenter = runGComparing $ return GEQ
275+ gcompare Dragenter Dragenter = GEQ
280276 gcompare Dragenter _ = GLT
281277 gcompare _ Dragenter = GGT
282− gcompare Dragleave Dragleave = runGComparing $ return GEQ
278+ gcompare Dragleave Dragleave = GEQ
283279 gcompare Dragleave _ = GLT
284280 gcompare _ Dragleave = GGT
285− gcompare Dragover Dragover = runGComparing $ return GEQ
281+ gcompare Dragover Dragover = GEQ
286282 gcompare Dragover _ = GLT
287283 gcompare _ Dragover = GGT
288− gcompare Dragstart Dragstart = runGComparing $ return GEQ
284+ gcompare Dragstart Dragstart = GEQ
289285 gcompare Dragstart _ = GLT
290286 gcompare _ Dragstart = GGT
291− gcompare Drop Drop = runGComparing $ return GEQ
287+ gcompare Drop Drop = GEQ
292288 gcompare Drop _ = GLT
293289 gcompare _ Drop = GGT
294− gcompare Error Error = runGComparing $ return GEQ
290+ gcompare Error Error = GEQ
295291 gcompare Error _ = GLT
296292 gcompare _ Error = GGT
297− gcompare Focus Focus = runGComparing $ return GEQ
293+ gcompare Focus Focus = GEQ
298294 gcompare Focus _ = GLT
299295 gcompare _ Focus = GGT
300− gcompare Input Input = runGComparing $ return GEQ
296+ gcompare Input Input = GEQ
301297 gcompare Input _ = GLT
302298 gcompare _ Input = GGT
303− gcompare Invalid Invalid = runGComparing $ return GEQ
299+ gcompare Invalid Invalid = GEQ
304300 gcompare Invalid _ = GLT
305301 gcompare _ Invalid = GGT
306− gcompare Keydown Keydown = runGComparing $ return GEQ
302+ gcompare Keydown Keydown = GEQ
307303 gcompare Keydown _ = GLT
308304 gcompare _ Keydown = GGT
309− gcompare Keypress Keypress = runGComparing $ return GEQ
305+ gcompare Keypress Keypress = GEQ
310306 gcompare Keypress _ = GLT
311307 gcompare _ Keypress = GGT
312− gcompare Keyup Keyup = runGComparing $ return GEQ
308+ gcompare Keyup Keyup = GEQ
313309 gcompare Keyup _ = GLT
314310 gcompare _ Keyup = GGT
315− gcompare Load Load = runGComparing $ return GEQ
311+ gcompare Load Load = GEQ
316312 gcompare Load _ = GLT
317313 gcompare _ Load = GGT
318− gcompare Mousedown Mousedown = runGComparing $ return GEQ
314+ gcompare Mousedown Mousedown = GEQ
319315 gcompare Mousedown _ = GLT
320316 gcompare _ Mousedown = GGT
321− gcompare Mouseenter Mouseenter = runGComparing $ return GEQ
317+ gcompare Mouseenter Mouseenter = GEQ
322318 gcompare Mouseenter _ = GLT
323319 gcompare _ Mouseenter = GGT
324− gcompare Mouseleave Mouseleave = runGComparing $ return GEQ
320+ gcompare Mouseleave Mouseleave = GEQ
325321 gcompare Mouseleave _ = GLT
326322 gcompare _ Mouseleave = GGT
327− gcompare Mousemove Mousemove = runGComparing $ return GEQ
323+ gcompare Mousemove Mousemove = GEQ
328324 gcompare Mousemove _ = GLT
329325 gcompare _ Mousemove = GGT
330− gcompare Mouseout Mouseout = runGComparing $ return GEQ
326+ gcompare Mouseout Mouseout = GEQ
331327 gcompare Mouseout _ = GLT
332328 gcompare _ Mouseout = GGT
333− gcompare Mouseover Mouseover = runGComparing $ return GEQ
329+ gcompare Mouseover Mouseover = GEQ
334330 gcompare Mouseover _ = GLT
335331 gcompare _ Mouseover = GGT
336− gcompare Mouseup Mouseup = runGComparing $ return GEQ
332+ gcompare Mouseup Mouseup = GEQ
337333 gcompare Mouseup _ = GLT
338334 gcompare _ Mouseup = GGT
339− gcompare Mousewheel Mousewheel = runGComparing $ return GEQ
335+ gcompare Mousewheel Mousewheel = GEQ
340336 gcompare Mousewheel _ = GLT
341337 gcompare _ Mousewheel = GGT
342− gcompare Scroll Scroll = runGComparing $ return GEQ
338+ gcompare Scroll Scroll = GEQ
343339 gcompare Scroll _ = GLT
344340 gcompare _ Scroll = GGT
345− gcompare Select Select = runGComparing $ return GEQ
341+ gcompare Select Select = GEQ
346342 gcompare Select _ = GLT
347343 gcompare _ Select = GGT
348− gcompare Submit Submit = runGComparing $ return GEQ
344+ gcompare Submit Submit = GEQ
349345 gcompare Submit _ = GLT
350346 gcompare _ Submit = GGT
351− gcompare Wheel Wheel = runGComparing $ return GEQ
347+ gcompare Wheel Wheel = GEQ
352348 gcompare Wheel _ = GLT
353349 gcompare _ Wheel = GGT
354− gcompare Beforecut Beforecut = runGComparing $ return GEQ
350+ gcompare Beforecut Beforecut = GEQ
355351 gcompare Beforecut _ = GLT
356352 gcompare _ Beforecut = GGT
357− gcompare Cut Cut = runGComparing $ return GEQ
353+ gcompare Cut Cut = GEQ
358354 gcompare Cut _ = GLT
359355 gcompare _ Cut = GGT
360− gcompare Beforecopy Beforecopy = runGComparing $ return GEQ
356+ gcompare Beforecopy Beforecopy = GEQ
361357 gcompare Beforecopy _ = GLT
362358 gcompare _ Beforecopy = GGT
363− gcompare Copy Copy = runGComparing $ return GEQ
359+ gcompare Copy Copy = GEQ
364360 gcompare Copy _ = GLT
365361 gcompare _ Copy = GGT
366− gcompare Beforepaste Beforepaste = runGComparing $ return GEQ
362+ gcompare Beforepaste Beforepaste = GEQ
367363 gcompare Beforepaste _ = GLT
368364 gcompare _ Beforepaste = GGT
369− gcompare Paste Paste = runGComparing $ return GEQ
365+ gcompare Paste Paste = GEQ
370366 gcompare Paste _ = GLT
371367 gcompare _ Paste = GGT
372− gcompare Reset Reset = runGComparing $ return GEQ
368+ gcompare Reset Reset = GEQ
373369 gcompare Reset _ = GLT
374370 gcompare _ Reset = GGT
375− gcompare Search Search = runGComparing $ return GEQ
371+ gcompare Search Search = GEQ
376372 gcompare Search _ = GLT
377373 gcompare _ Search = GGT
378− gcompare Selectstart Selectstart = runGComparing $ return GEQ
374+ gcompare Selectstart Selectstart = GEQ
379375 gcompare Selectstart _ = GLT
380376 gcompare _ Selectstart = GGT
381− gcompare Touchstart Touchstart = runGComparing $ return GEQ
377+ gcompare Touchstart Touchstart = GEQ
382378 gcompare Touchstart _ = GLT
383379 gcompare _ Touchstart = GGT
384− gcompare Touchmove Touchmove = runGComparing $ return GEQ
380+ gcompare Touchmove Touchmove = GEQ
385381 gcompare Touchmove _ = GLT
386382 gcompare _ Touchmove = GGT
387− gcompare Touchend Touchend = runGComparing $ return GEQ
383+ gcompare Touchend Touchend = GEQ
388384 gcompare Touchend _ = GLT
389385 gcompare _ Touchend = GGT
390− gcompare Touchcancel Touchcancel = runGComparing $ return GEQ
391− gcompare Touchcancel _ = GLT
392− gcompare _ Touchcancel = GGT
386+ gcompare Touchcancel Touchcancel = GEQ
393387#endif
reflex-dom-core/src/Reflex/Dom/Builder/Class/TH.hs+1−1
@@ -1,8 +1,8 @@
11module Reflex.Dom.Builder.Class.TH where
22
33import Control.Lens
4−import Language.Haskell.TH.Syntax (Name, nameBase)
54import Language.Haskell.TH.Lib (DecsQ)
5+import Language.Haskell.TH.Syntax (Name, nameBase)
66
77namer :: [String] -> Name -> [Name] -> Name -> [DefName]
88namer s n ks t | nameBase t `elem` s = []
reflex-dom-core/src/Reflex/Dom/Builder/Hydratable.hsnew file+116
@@ -0,0 +1,116 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4+{-# LANGUAGE MultiParamTypeClasses #-}
5+{-# LANGUAGE OverloadedStrings #-}
6+{-# LANGUAGE StandaloneDeriving #-}
7+{-# LANGUAGE TypeFamilies #-}
8+{-# LANGUAGE UndecidableInstances #-}
9+module Reflex.Dom.Builder.Hydratable where
10+
11+import Control.Monad.Fix
12+import Control.Monad.Primitive
13+import Control.Monad.Ref
14+import Control.Monad.Trans
15+import Control.Monad.Trans.Control
16+import Data.Coerce
17+import qualified Data.Map as Map
18+import Foreign.JavaScript.TH
19+#ifndef ghcjs_HOST_OS
20+import GHCJS.DOM.Types (MonadJSM (..))
21+#endif
22+import Reflex
23+import Reflex.Dom.Builder.Class
24+import Reflex.Dom.Builder.Immediate (HasDocument (..), hydratableAttribute)
25+import Reflex.Host.Class
26+
27+-- | A DomBuilder transformer that adds an attribute to all elements such that the
28+-- hydration builder knows which bits of DOM were added by us, and which were
29+-- added by external scripts.
30+newtype HydratableT m a = HydratableT { runHydratableT :: m a } deriving (Functor, Applicative, Monad, MonadAtomicRef, MonadFix, MonadIO)
31+
32+#ifndef ghcjs_HOST_OS
33+instance MonadJSM m => MonadJSM (HydratableT m) where
34+ liftJSM' = HydratableT . liftJSM'
35+#endif
36+
37+deriving instance MonadSample t m => MonadSample t (HydratableT m)
38+deriving instance MonadHold t m => MonadHold t (HydratableT m)
39+
40+instance MonadTrans HydratableT where
41+ lift = HydratableT
42+
43+instance MonadTransControl HydratableT where
44+ type StT HydratableT a = a
45+ liftWith f = HydratableT $ f runHydratableT
46+ restoreT = HydratableT
47+
48+instance MonadRef m => MonadRef (HydratableT m) where
49+ type Ref (HydratableT m) = Ref m
50+ newRef = lift . newRef
51+ readRef = lift . readRef
52+ writeRef ref = lift . writeRef ref
53+
54+instance PerformEvent t m => PerformEvent t (HydratableT m) where
55+ type Performable (HydratableT m) = Performable m
56+ performEvent_ = lift . performEvent_
57+ performEvent = lift . performEvent
58+
59+instance PrimMonad m => PrimMonad (HydratableT m) where
60+ type PrimState (HydratableT m) = PrimState m
61+ primitive = lift . primitive
62+
63+makeHydratable :: Reflex t => ElementConfig er t m -> ElementConfig er t m
64+makeHydratable cfg = cfg
65+ { _elementConfig_initialAttributes = Map.insert hydratableAttribute "" $ _elementConfig_initialAttributes cfg
66+ , _elementConfig_modifyAttributes = fmap (Map.delete hydratableAttribute) <$> _elementConfig_modifyAttributes cfg
67+ }
68+
69+instance PostBuild t m => PostBuild t (HydratableT m) where
70+ getPostBuild = lift getPostBuild
71+
72+deriving instance TriggerEvent t m => TriggerEvent t (HydratableT m)
73+
74+instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydratableT m) where
75+ newEventWithTrigger = lift . newEventWithTrigger
76+ newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
77+
78+instance Adjustable t m => Adjustable t (HydratableT m) where
79+ runWithReplace a0 a' = HydratableT $ runWithReplace (coerce a0) (coerceEvent a')
80+ traverseDMapWithKeyWithAdjust f dm0 dm' = HydratableT $ traverseDMapWithKeyWithAdjust (\k v -> runHydratableT $ f k v) (coerce dm0) (coerceEvent dm')
81+ traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = HydratableT $ traverseDMapWithKeyWithAdjustWithMove (\k v -> runHydratableT $ f k v) (coerce dm0) (coerceEvent dm')
82+ traverseIntMapWithKeyWithAdjust f m0 m' = HydratableT $ traverseIntMapWithKeyWithAdjust (\k v -> runHydratableT $ f k v) (coerce m0) (coerceEvent m')
83+
84+instance NotReady t m => NotReady t (HydratableT m) where
85+ notReadyUntil = lift . notReadyUntil
86+ notReady = lift notReady
87+
88+instance DomBuilder t m => DomBuilder t (HydratableT m) where
89+ type DomBuilderSpace (HydratableT m) = DomBuilderSpace m
90+ element t cfg = lift . element t (makeHydratable cfg) . runHydratableT
91+ inputElement cfg = lift $ inputElement $ cfg
92+ { _inputElementConfig_elementConfig = makeHydratable $ _inputElementConfig_elementConfig cfg
93+ }
94+ textAreaElement cfg = lift $ textAreaElement $ cfg
95+ { _textAreaElementConfig_elementConfig = makeHydratable $ _textAreaElementConfig_elementConfig cfg
96+ }
97+ selectElement cfg child = do
98+ let cfg' = cfg
99+ { _selectElementConfig_elementConfig = makeHydratable $ _selectElementConfig_elementConfig cfg
100+ }
101+ lift $ selectElement cfg' $ runHydratableT child
102+
103+instance HasDocument m => HasDocument (HydratableT m)
104+
105+instance HasJSContext m => HasJSContext (HydratableT m) where
106+ type JSContextPhantom (HydratableT m) = JSContextPhantom m
107+ askJSContext = lift askJSContext
108+
109+instance HasJS js m => HasJS js (HydratableT m) where
110+ type JSX (HydratableT m) = JSX m
111+ liftJS = lift . liftJS
112+
113+instance DomRenderHook t m => DomRenderHook t (HydratableT m) where
114+ withRenderHook f = HydratableT . withRenderHook f . runHydratableT
115+ requestDomAction = HydratableT . requestDomAction
116+ requestDomAction_ = HydratableT . requestDomAction_
reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+2137−548
@@ -2,217 +2,473 @@
22{-# LANGUAGE CPP #-}
33{-# LANGUAGE ConstraintKinds #-}
44{-# LANGUAGE DataKinds #-}
5+{-# LANGUAGE DeriveTraversable #-}
56{-# LANGUAGE EmptyDataDecls #-}
67{-# LANGUAGE FlexibleContexts #-}
78{-# LANGUAGE FlexibleInstances #-}
9+{-# LANGUAGE GADTs #-}
810{-# LANGUAGE GeneralizedNewtypeDeriving #-}
911{-# LANGUAGE LambdaCase #-}
1012{-# LANGUAGE MultiParamTypeClasses #-}
1113{-# LANGUAGE OverloadedStrings #-}
14+{-# LANGUAGE PatternGuards #-}
1215{-# LANGUAGE PolyKinds #-}
1316{-# LANGUAGE RankNTypes #-}
1417{-# LANGUAGE RecursiveDo #-}
1518{-# LANGUAGE ScopedTypeVariables #-}
16−{-# LANGUAGE StandaloneDeriving #-}
1719#ifdef USE_TEMPLATE_HASKELL
1820{-# LANGUAGE TemplateHaskell #-}
1921#endif
22+{-# LANGUAGE TupleSections #-}
2023{-# LANGUAGE TypeFamilies #-}
2124{-# LANGUAGE TypeOperators #-}
2225{-# LANGUAGE UndecidableInstances #-}
23−module Reflex.Dom.Builder.Immediate
24− ( EventTriggerRef (..)
25− , ImmediateDomBuilderEnv (..)
26− , ImmediateDomBuilderT (..)
27− , runImmediateDomBuilderT
28− , askDocument
29− , askParent
30− , askEvents
31− , append
32− , textNodeInternal
33− , deleteBetweenExclusive
34− , extractBetweenExclusive
35− , deleteUpTo
36− , extractUpTo
37− , SupportsImmediateDomBuilder
38− , collectUpTo
39− , collectUpToGivenParent
40− , EventFilterTriggerRef (..)
41− , wrap
42− , makeElement
43− , GhcjsDomHandler (..)
44− , GhcjsDomHandler1 (..)
45− , GhcjsDomEvent (..)
46− , GhcjsDomSpace
47− , GhcjsEventFilter (..)
48− , Pair1 (..)
49− , Maybe1 (..)
50− , GhcjsEventSpec (..)
51− , GhcjsEventHandler (..)
52−#ifndef USE_TEMPLATE_HASKELL
53− , phantom2
54− , ghcjsEventSpec_filters
55− , ghcjsEventSpec_handler
26+#ifdef ghcjs_HOST_OS
27+{-# LANGUAGE ForeignFunctionInterface #-}
28+{-# LANGUAGE JavaScriptFFI #-}
5629#endif
57− , drawChildUpdate
58− , mkHasFocus
59− , insertBefore
60− , EventType
61− , defaultDomEventHandler
62− , defaultDomWindowEventHandler
63− , withIsEvent
64− , showEventName
65− , elementOnEventName
66− , windowOnEventName
67− , wrapDomEvent
68− , subscribeDomEvent
69− , wrapDomEventMaybe
70− , wrapDomEventsMaybe
71− , getKeyEvent
72− , getMouseEventCoords
73− , getTouchEvent
74− , WindowConfig (..)
75− , Window (..)
76− , wrapWindow
77− , ghcjsEventSpec_filters
78− , ghcjsEventSpec_handler
79− ) where
80−
81−import Foreign.JavaScript.TH
82−import Reflex.Class as Reflex
83−import Reflex.Dom.Builder.Class
84−import Reflex.Dynamic
85−import Reflex.Host.Class
86−import Reflex.PerformEvent.Class
87−import Reflex.PostBuild.Class
88−import Reflex.TriggerEvent.Base hiding (askEvents)
89−import Reflex.TriggerEvent.Class
90−
91−import Control.Concurrent.Chan
92−import Control.Lens hiding (element, ix)
30+-- | This is a builder to be used on the client side. It can be run in two modes:
31+--
32+-- 1. in "hydration mode", reusing DOM nodes already in the page (as produced
33+-- by 'Reflex.Dom.Builder.Static.renderStatic')
34+-- 2. in "immediate mode", creating and appending DOM nodes as required
35+--
36+-- In "hydration mode", the preexisting DOM __must contain__ what the builder
37+-- will expect at switchover time (the time at which parity with the static
38+-- renderer is reached, and the time after which the page is "live").
39+--
40+-- For example, displaying the current time as text should be done inside
41+-- 'Reflex.Dom.Prerender.prerender' to ensure that we don't attempt to hydrate the incorrect text.
42+-- The server will prerender a text node with time A, and the client will expect
43+-- a text node with time B. Barring a miracle, time A and time B will not match,
44+-- and hydration will fail.
45+module Reflex.Dom.Builder.Immediate
46+ ( HydrationDomBuilderT (..)
47+ , HydrationDomBuilderEnv (..)
48+ , HydrationMode (..)
49+ , HydrationRunnerT (..)
50+ , runHydrationRunnerT
51+ , runHydrationRunnerTWithFailure
52+ , ImmediateDomBuilderT
53+ , runHydrationDomBuilderT
54+ , getHydrationMode
55+ , addHydrationStep
56+ , addHydrationStepWithSetup
57+ , setPreviousNode
58+ , insertAfterPreviousNode
59+ , hydrateComment
60+ , askParent
61+ , askEvents
62+ , append
63+ , textNodeInternal
64+ , removeSubsequentNodes
65+ , deleteBetweenExclusive
66+ , extractBetweenExclusive
67+ , deleteUpTo
68+ , extractUpTo
69+ , SupportsHydrationDomBuilder
70+ , collectUpTo
71+ , collectUpToGivenParent
72+ , EventTriggerRef (..)
73+ , EventFilterTriggerRef (..)
74+ , wrap
75+ , elementInternal
76+ , HydrationDomSpace
77+ , GhcjsDomSpace
78+ , GhcjsDomHandler (..)
79+ , GhcjsDomHandler1 (..)
80+ , GhcjsDomEvent (..)
81+ , GhcjsEventFilter (..)
82+ , Pair1 (..)
83+ , Maybe1 (..)
84+ , GhcjsEventSpec (..)
85+ , HasDocument (..)
86+ , ghcjsEventSpec_filters
87+ , ghcjsEventSpec_handler
88+ , GhcjsEventHandler (..)
89+ , drawChildUpdate
90+ , ChildReadyState (..)
91+ , mkHasFocus
92+ , insertBefore
93+ , EventType
94+ , defaultDomEventHandler
95+ , defaultDomWindowEventHandler
96+ , withIsEvent
97+ , showEventName
98+ , elementOnEventName
99+ , windowOnEventName
100+ , wrapDomEvent
101+ , subscribeDomEvent
102+ , wrapDomEventMaybe
103+ , wrapDomEventsMaybe
104+ , getKeyEvent
105+ , getMouseEventCoords
106+ , getTouchEvent
107+ , WindowConfig (..)
108+ , Window (..)
109+ , wrapWindow
110+ -- * Attributes for controlling hydration
111+ , hydratableAttribute
112+ , skipHydrationAttribute
113+ -- * Internal
114+ , traverseDMapWithKeyWithAdjust'
115+ , hoistTraverseWithKeyWithAdjust
116+ , traverseIntMapWithKeyWithAdjust'
117+ , hoistTraverseIntMapWithKeyWithAdjust
118+ ) where
119+
120+import Control.Concurrent
121+import Control.Exception (bracketOnError)
122+import Control.Lens (Identity(..), imapM_, iforM_, (^.), makeLenses)
93123import Control.Monad.Exception
94124import Control.Monad.Primitive
95125import Control.Monad.Reader
96126import Control.Monad.Ref
97−#ifndef USE_TEMPLATE_HASKELL
98−import Data.Functor.Contravariant (phantom)
99−#endif
127+import Control.Monad.State.Strict (StateT, mapStateT, get, modify', gets, runStateT)
100128import Data.Bitraversable
101129import Data.Default
102130import Data.Dependent.Map (DMap)
103−import qualified Data.Dependent.Map as DMap
104131import Data.Dependent.Sum
132+import Data.FastMutableIntMap (PatchIntMap (..))
133+import Data.Foldable (for_, traverse_)
105134import Data.Functor.Compose
106135import Data.Functor.Constant
107136import Data.Functor.Misc
137+import Data.Functor.Product
138+import Data.GADT.Compare (GCompare)
108139import Data.IORef
109−import qualified Data.Map as Map
140+import Data.IntMap.Strict (IntMap)
110141import Data.Maybe
111−import Data.Monoid
112−import qualified Data.Some as Some
142+import Data.Monoid ((<>))
143+import Data.Some (Some(..))
144+import Data.GADT.Compare (GCompare)
145+import Data.String (IsString)
113146import Data.Text (Text)
147+import Foreign.JavaScript.Internal.Utils
148+import Foreign.JavaScript.TH
149+import GHCJS.DOM.ClipboardEvent as ClipboardEvent
150+import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode, createComment)
151+import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute)
152+import GHCJS.DOM.EventM (EventM, event, on)
153+import GHCJS.DOM.KeyboardEvent as KeyboardEvent
154+import GHCJS.DOM.MouseEvent
155+import GHCJS.DOM.Node (appendChild_, getOwnerDocumentUnchecked, getParentNodeUnchecked, setNodeValue, toNode)
156+import GHCJS.DOM.Types (liftJSM, askJSM, runJSM, JSM, MonadJSM, FocusEvent, IsElement, IsEvent, IsNode, KeyboardEvent, Node, TouchEvent, WheelEvent, uncheckedCastTo, ClipboardEvent)
157+import GHCJS.DOM.UIEvent
158+import Language.Javascript.JSaddle (call, eval)
159+import Reflex.Adjustable.Class
160+import Reflex.Class as Reflex
161+import Reflex.Dom.Builder.Class
162+import Reflex.Dynamic
163+import Reflex.Host.Class
164+import Reflex.Patch.DMapWithMove (PatchDMapWithMove(..))
165+import Reflex.Patch.MapWithMove (PatchMapWithMove(..))
166+import Reflex.PerformEvent.Base (PerformEventT)
167+import Reflex.PerformEvent.Class
168+import Reflex.PostBuild.Base (PostBuildT)
169+import Reflex.PostBuild.Class
170+#ifdef PROFILE_REFLEX
171+import Reflex.Profiled
172+#endif
173+import Reflex.Requester.Base
174+import Reflex.Requester.Class
175+import Reflex.Spider (Spider, SpiderHost, Global)
176+import Reflex.TriggerEvent.Base hiding (askEvents)
177+import Reflex.TriggerEvent.Class
178+
179+import qualified Data.Dependent.Map as DMap
180+import qualified Data.FastMutableIntMap as FastMutableIntMap
181+import qualified Data.IntMap.Strict as IntMap
182+import qualified Data.Map as Map
114183import qualified Data.Text as T
115−import GHCJS.DOM.Document (Document, createDocumentFragmentUnchecked, createElementUnchecked, createElementNSUnchecked, createTextNodeUnchecked)
116−import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS)
184+import qualified GHCJS.DOM as DOM
185+import qualified GHCJS.DOM.DataTransfer as DataTransfer
186+import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
187+import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
117188import qualified GHCJS.DOM.Element as Element
118189import qualified GHCJS.DOM.Event as Event
119−import GHCJS.DOM.EventM (EventM, event, on)
120190import qualified GHCJS.DOM.EventM as DOM
121191import qualified GHCJS.DOM.FileList as FileList
192+import qualified GHCJS.DOM.GlobalEventHandlers as Events
122193import qualified GHCJS.DOM.HTMLInputElement as Input
123194import qualified GHCJS.DOM.HTMLSelectElement as Select
124195import qualified GHCJS.DOM.HTMLTextAreaElement as TextArea
125−import GHCJS.DOM.MouseEvent
196+import qualified GHCJS.DOM.Node as Node
197+import qualified GHCJS.DOM.Text as DOM
126198import qualified GHCJS.DOM.Touch as Touch
127199import qualified GHCJS.DOM.TouchEvent as TouchEvent
128200import qualified GHCJS.DOM.TouchList as TouchList
129−import GHCJS.DOM.Node (appendChild_, getOwnerDocumentUnchecked, getParentNodeUnchecked, setNodeValue, toNode)
130−import qualified GHCJS.DOM.Node as DOM (insertBefore_)
131−import GHCJS.DOM.Types
132− (liftJSM, askJSM, runJSM, JSM, MonadJSM(..),
133− FocusEvent, IsElement, IsEvent, IsNode, KeyboardEvent, Node,
134− ToDOMString, TouchEvent, WheelEvent, uncheckedCastTo)
135201import qualified GHCJS.DOM.Types as DOM
136−import GHCJS.DOM.UIEvent
137202import qualified GHCJS.DOM.Window as Window
138−import Language.Javascript.JSaddle (call, eval)
203+import qualified GHCJS.DOM.WheelEvent as WheelEvent
204+import qualified Reflex.Patch.DMap as PatchDMap
205+import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
206+import qualified Reflex.Patch.MapWithMove as PatchMapWithMove
207+import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
139208
140−import Reflex.Requester.Base
141−import Reflex.Requester.Class
209+#ifndef USE_TEMPLATE_HASKELL
210+import Data.Functor.Contravariant (phantom)
211+import Control.Lens (Lens', Getter)
212+#endif
142213
143−data ImmediateDomBuilderEnv t m
144− = ImmediateDomBuilderEnv { _immediateDomBuilderEnv_document :: Document
145− , _immediateDomBuilderEnv_parent :: Node
146− , _immediateDomBuilderEnv_events :: Chan [DSum (EventTriggerRef t) TriggerInvocation] -- TODO: The same chan needs to be passed to 'TriggerEventT'; this should be factored out.
147− }
214+#ifndef ghcjs_HOST_OS
215+import GHCJS.DOM.Types (MonadJSM (..))
148216
149−newtype ImmediateDomBuilderT t m a = ImmediateDomBuilderT { unImmediateDomBuilderT :: ReaderT (ImmediateDomBuilderEnv t m) (RequesterT t JSM Identity (TriggerEventT t m)) a }
150− deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException, MonadAsyncException)
217+instance MonadJSM m => MonadJSM (HydrationRunnerT t m) where
218+ {-# INLINABLE liftJSM' #-}
219+ liftJSM' = lift . liftJSM'
151220
152−#ifndef __GHCJS__
153−instance MonadJSM m => MonadJSM (ImmediateDomBuilderT t m) where
154− liftJSM' = ImmediateDomBuilderT . liftJSM'
221+instance MonadJSM m => MonadJSM (HydrationDomBuilderT s t m) where
222+ {-# INLINABLE liftJSM' #-}
223+ liftJSM' = lift . liftJSM'
224+
225+instance MonadJSM m => MonadJSM (DomRenderHookT t m) where
226+ {-# INLINABLE liftJSM' #-}
227+ liftJSM' = lift . liftJSM'
228+#endif
229+
230+data HydrationDomBuilderEnv t m = HydrationDomBuilderEnv
231+ { _hydrationDomBuilderEnv_document :: {-# UNPACK #-} !Document
232+ -- ^ Reference to the document
233+ , _hydrationDomBuilderEnv_parent :: !(Either Node (IORef Node))
234+ -- ^ This is in an IORef because in the time up to hydration we can't actually know what the
235+ -- parent is - we populate this reference during the DOM traversal at hydration time
236+ , _hydrationDomBuilderEnv_unreadyChildren :: {-# UNPACK #-} !(IORef Word)
237+ -- ^ Number of children who still aren't fully rendered
238+ , _hydrationDomBuilderEnv_commitAction :: !(JSM ())
239+ -- ^ Action to take when all children are ready --TODO: we should probably get rid of this once we invoke it
240+ , _hydrationDomBuilderEnv_hydrationMode :: {-# UNPACK #-} !(IORef HydrationMode)
241+ -- ^ In hydration mode? Should be switched to `HydrationMode_Immediate` after hydration is finished
242+ , _hydrationDomBuilderEnv_switchover :: !(Event t ())
243+ , _hydrationDomBuilderEnv_delayed :: {-# UNPACK #-} !(IORef (HydrationRunnerT t m ()))
244+ }
245+
246+-- | A monad for DomBuilder which just gets the results of children and pushes
247+-- work into an action that is delayed until after postBuild (to match the
248+-- static builder). The action runs in 'HydrationRunnerT', which performs the
249+-- DOM takeover and sets up the events, after which point this monad will
250+-- continue in the vein of 'ImmediateDomBuilderT'.
251+newtype HydrationDomBuilderT s t m a = HydrationDomBuilderT { unHydrationDomBuilderT :: ReaderT (HydrationDomBuilderEnv t m) (DomRenderHookT t m) a }
252+ deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
253+#if MIN_VERSION_base(4,9,1)
254+ , MonadAsyncException
155255#endif
256+ )
156257
157−instance PrimMonad m => PrimMonad (ImmediateDomBuilderT x m) where
158− type PrimState (ImmediateDomBuilderT x m) = PrimState m
258+instance PrimMonad m => PrimMonad (HydrationDomBuilderT s t m) where
259+ type PrimState (HydrationDomBuilderT s t m) = PrimState m
159260 primitive = lift . primitive
160261
161−instance MonadTrans (ImmediateDomBuilderT t) where
162− lift = ImmediateDomBuilderT . lift . lift . lift
163−
164−instance (PerformEvent t m, PrimMonad m) => DomRenderHook t (ImmediateDomBuilderT t m) where
165− withRenderHook hook (ImmediateDomBuilderT a) = do
166− e <- ImmediateDomBuilderT ask
167− ImmediateDomBuilderT $ lift $ withRequesting $ \rsp -> do
168− (x, req) <- lift $ runRequesterT (runReaderT a e) $ runIdentity <$> rsp
169− return (ffor req $ \rm -> hook $ DMap.traverseWithKey (\_ r -> Identity <$> r) rm, x)
170− requestDomAction = ImmediateDomBuilderT . lift . requestingIdentity
171− requestDomAction_ = ImmediateDomBuilderT . lift . requesting_
172−
173−{-# INLINABLE runImmediateDomBuilderT #-}
174−runImmediateDomBuilderT
175− :: (Reflex t, MonadFix m, PerformEvent t m, MonadJSM m, MonadJSM (Performable m))
176− => ImmediateDomBuilderT t m a
177− -> ImmediateDomBuilderEnv t m
262+instance MonadTrans (HydrationDomBuilderT s t) where
263+ lift = HydrationDomBuilderT . lift . lift
264+
265+instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationDomBuilderT s t m) where
266+ withRenderHook hook = HydrationDomBuilderT . mapReaderT (withRenderHook hook) . unHydrationDomBuilderT
267+ requestDomAction = HydrationDomBuilderT . lift . requestDomAction
268+ requestDomAction_ = HydrationDomBuilderT . lift . requestDomAction_
269+
270+-- | The monad which performs the delayed actions to reuse prerendered nodes and set up events.
271+-- State contains reference to the previous node sibling, if any, and the reader contains reference to the parent node.
272+newtype HydrationRunnerT t m a = HydrationRunnerT { unHydrationRunnerT :: StateT HydrationState (ReaderT Node (DomRenderHookT t m)) a }
273+ deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
274+#if MIN_VERSION_base(4,9,1)
275+ , MonadAsyncException
276+#endif
277+ )
278+
279+data HydrationState = HydrationState
280+ { _hydrationState_previousNode :: !(Maybe Node)
281+ , _hydrationState_failed :: !Bool
282+ }
283+
284+{-# INLINABLE localRunner #-}
285+localRunner :: (MonadJSM m, Monad m) => HydrationRunnerT t m a -> Maybe Node -> Node -> HydrationRunnerT t m a
286+localRunner (HydrationRunnerT m) s parent = do
287+ s0 <- HydrationRunnerT get
288+ (a, s') <- HydrationRunnerT $ lift $ local (\_ -> parent) $ runStateT m (s0 { _hydrationState_previousNode = s })
289+ traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
290+ HydrationRunnerT $ modify' $ \hs -> hs { _hydrationState_failed = _hydrationState_failed s' }
291+ pure a
292+
293+{-# INLINABLE runHydrationRunnerT #-}
294+runHydrationRunnerT
295+ :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
296+ => HydrationRunnerT t m a -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
297+runHydrationRunnerT m = runHydrationRunnerTWithFailure m (pure ())
298+
299+{-# INLINABLE runHydrationRunnerTWithFailure #-}
300+runHydrationRunnerTWithFailure
301+ :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
302+ => HydrationRunnerT t m a -> IO () -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
303+runHydrationRunnerTWithFailure (HydrationRunnerT m) onFailure s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do
304+ (a, s') <- runStateT m (HydrationState s False)
305+ traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
306+ when (_hydrationState_failed s') $ liftIO $ putStrLn "reflex-dom warning: hydration failed: the DOM was not as expected at switchover time. This may be due to invalid HTML which the browser has altered upon parsing, some external JS altering the DOM, or the page being served from an outdated cache."
307+ when (_hydrationState_failed s') $ liftIO onFailure
308+ pure a
309+
310+
311+
312+instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where
313+ {-# INLINABLE newEventWithTrigger #-}
314+ newEventWithTrigger = lift . newEventWithTrigger
315+ {-# INLINABLE newFanEventWithTrigger #-}
316+ newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
317+
318+instance MonadTrans (HydrationRunnerT t) where
319+ {-# INLINABLE lift #-}
320+ lift = HydrationRunnerT . lift . lift . lift
321+
322+instance MonadSample t m => MonadSample t (HydrationRunnerT t m) where
323+ {-# INLINABLE sample #-}
324+ sample = lift . sample
325+
326+instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationRunnerT t m) where
327+ withRenderHook hook = HydrationRunnerT . mapStateT (mapReaderT (withRenderHook hook)) . unHydrationRunnerT
328+ requestDomAction = HydrationRunnerT . lift . lift . requestDomAction
329+ requestDomAction_ = HydrationRunnerT . lift . lift . requestDomAction_
330+
331+-- | Add a hydration step which depends on some computation that should only be
332+-- done *before* the switchover to immediate mode - this is most likely some
333+-- form of 'hold' which we want to remove after hydration is done
334+{-# INLINABLE addHydrationStepWithSetup #-}
335+addHydrationStepWithSetup :: MonadIO m => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
336+addHydrationStepWithSetup setup f = getHydrationMode >>= \case
337+ HydrationMode_Immediate -> pure ()
338+ HydrationMode_Hydrating -> do
339+ s <- lift setup
340+ addHydrationStep (f s)
341+
342+-- | Add a hydration step
343+{-# INLINABLE addHydrationStep #-}
344+addHydrationStep :: MonadIO m => HydrationRunnerT t m () -> HydrationDomBuilderT s t m ()
345+addHydrationStep m = do
346+ delayedRef <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_delayed
347+ liftIO $ modifyIORef' delayedRef (>> m)
348+
349+-- | Shared behavior for HydrationDomBuilderT and HydrationRunnerT
350+newtype DomRenderHookT t m a = DomRenderHookT { unDomRenderHookT :: RequesterT t JSM Identity (TriggerEventT t m) a }
351+ deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException
352+#if MIN_VERSION_base(4,9,1)
353+ , MonadAsyncException
354+#endif
355+ )
356+
357+{-# INLINABLE runDomRenderHookT #-}
358+runDomRenderHookT
359+ :: (MonadFix m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m), MonadRef m, Ref m ~ IORef)
360+ => DomRenderHookT t m a
361+ -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
362+ -> m a
363+runDomRenderHookT (DomRenderHookT a) events = do
364+ flip runTriggerEventT events $ do
365+ rec (result, req) <- runRequesterT a rsp
366+ rsp <- performEventAsync $ ffor req $ \rm f -> liftJSM $ runInAnimationFrame f $
367+ traverseRequesterData (fmap Identity) rm
368+ return result
369+ where
370+ runInAnimationFrame f x = void . DOM.inAnimationFrame' $ \_ -> do
371+ v <- synchronously x
372+ void . liftIO $ f v
373+
374+instance MonadTrans (DomRenderHookT t) where
375+ {-# INLINABLE lift #-}
376+ lift = DomRenderHookT . lift . lift
377+
378+instance (Reflex t, MonadFix m) => DomRenderHook t (DomRenderHookT t m) where
379+ withRenderHook hook (DomRenderHookT a) = do
380+ DomRenderHookT $ withRequesting $ \rsp -> do
381+ (x, req) <- lift $ runRequesterT a $ runIdentity <$> rsp
382+ return (ffor req $ \rm -> hook $ traverseRequesterData (fmap Identity) rm, x)
383+ requestDomAction = DomRenderHookT . requestingIdentity
384+ requestDomAction_ = DomRenderHookT . requesting_
385+
386+{-# INLINABLE runHydrationDomBuilderT #-}
387+runHydrationDomBuilderT
388+ :: ( MonadFix m
389+ , PerformEvent t m
390+ , MonadReflexCreateTrigger t m
391+ , MonadJSM m
392+ , MonadJSM (Performable m)
393+ , MonadRef m
394+ , Ref m ~ IORef
395+ )
396+ => HydrationDomBuilderT s t m a
397+ -> HydrationDomBuilderEnv t m
398+ -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
178399 -> m a
179−runImmediateDomBuilderT (ImmediateDomBuilderT a) env = flip runTriggerEventT (_immediateDomBuilderEnv_events env) $ do
180− rec (x, req) <- runRequesterT (runReaderT a env) rsp
181− rsp <- performEvent $ ffor req $ \rm -> liftJSM $ DMap.traverseWithKey (\_ r -> Identity <$> r) rm
182− return x
400+runHydrationDomBuilderT (HydrationDomBuilderT a) env = runDomRenderHookT (runReaderT a env)
183401
184−{-# INLINABLE askDocument #-}
185−askDocument :: Monad m => ImmediateDomBuilderT t m Document
186−askDocument = ImmediateDomBuilderT $ asks _immediateDomBuilderEnv_document
402+instance (RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, Monad m) => HasDocument (HydrationDomBuilderT s t m) where
403+ {-# INLINABLE askDocument #-}
404+ askDocument = HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_document
187405
188406{-# INLINABLE askParent #-}
189−askParent :: Monad m => ImmediateDomBuilderT t m Node
190−askParent = ImmediateDomBuilderT $ asks _immediateDomBuilderEnv_parent
407+askParent :: Monad m => HydrationRunnerT t m DOM.Node
408+askParent = HydrationRunnerT ask
409+
410+{-# INLINABLE getParent #-}
411+getParent :: MonadIO m => HydrationDomBuilderT s t m DOM.Node
412+getParent = either pure (liftIO . readIORef) =<< HydrationDomBuilderT (asks _hydrationDomBuilderEnv_parent)
191413
192414{-# INLINABLE askEvents #-}
193−askEvents :: Monad m => ImmediateDomBuilderT t m (Chan [DSum (EventTriggerRef t) TriggerInvocation])
194−askEvents = ImmediateDomBuilderT $ asks _immediateDomBuilderEnv_events
415+askEvents :: Monad m => HydrationDomBuilderT s t m (Chan [DSum (EventTriggerRef t) TriggerInvocation])
416+askEvents = HydrationDomBuilderT . lift . DomRenderHookT . lift $ TriggerEventT.askEvents
417+
418+{-# INLINABLE localEnv #-}
419+localEnv :: Monad m => (HydrationDomBuilderEnv t m -> HydrationDomBuilderEnv t m) -> HydrationDomBuilderT s t m a -> HydrationDomBuilderT s t m a
420+localEnv f = HydrationDomBuilderT . local (f $!) . unHydrationDomBuilderT
195421
196422{-# INLINABLE append #-}
197−append :: (IsNode n, MonadJSM m) => n -> ImmediateDomBuilderT t m ()
423+append :: MonadJSM m => DOM.Node -> HydrationDomBuilderT s t m ()
198424append n = do
199− p <- askParent
200− liftJSM $ appendChild_ p $ Just n
425+ p <- getParent
426+ liftJSM $ appendChild_ p n
201427 return ()
202428
203−{-# INLINABLE textNodeInternal #-}
204−textNodeInternal :: (MonadJSM m, ToDOMString contents) => contents -> ImmediateDomBuilderT t m DOM.Text
205−textNodeInternal t = do
206− doc <- askDocument
207− n <- liftJSM $ createTextNodeUnchecked doc t
208− append n
209− return n
429+{-# SPECIALIZE append
430+ :: DOM.Node
431+ -> HydrationDomBuilderT s Spider HydrationM ()
432+ #-}
433+
434+data HydrationMode
435+ = HydrationMode_Hydrating
436+ -- ^ The time from initial load to parity with static builder
437+ | HydrationMode_Immediate
438+ -- ^ After hydration
439+ deriving (Eq, Ord, Show)
440+
441+{-# INLINABLE getPreviousNode #-}
442+getPreviousNode :: Monad m => HydrationRunnerT t m (Maybe DOM.Node)
443+getPreviousNode = HydrationRunnerT $ gets _hydrationState_previousNode
444+
445+{-# INLINABLE setPreviousNode #-}
446+setPreviousNode :: Monad m => Maybe DOM.Node -> HydrationRunnerT t m ()
447+setPreviousNode n = HydrationRunnerT $ modify' (\hs -> hs { _hydrationState_previousNode = n })
448+
449+{-# INLINABLE askUnreadyChildren #-}
450+askUnreadyChildren :: Monad m => HydrationDomBuilderT s t m (IORef Word)
451+askUnreadyChildren = HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_unreadyChildren
452+
453+{-# INLINABLE askCommitAction #-}
454+askCommitAction :: Monad m => HydrationDomBuilderT s t m (JSM ())
455+askCommitAction = HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_commitAction
456+
457+{-# INLINABLE getHydrationMode #-}
458+getHydrationMode :: MonadIO m => HydrationDomBuilderT s t m HydrationMode
459+getHydrationMode = liftIO . readIORef =<< HydrationDomBuilderT (asks _hydrationDomBuilderEnv_hydrationMode)
460+
461+-- | Remove all nodes after given node
462+removeSubsequentNodes :: (MonadJSM m, IsNode n) => n -> m ()
463+removeSubsequentNodes n = liftJSM $ do
464+ f <- eval ("(function(n) { while (n.nextSibling) { (n.parentNode).removeChild(n.nextSibling); }; })" :: Text)
465+ void $ call f f [n]
210466
211467-- | s and e must both be children of the same node and s must precede e;
212468-- all nodes between s and e will be removed, but s and e will not be removed
213469deleteBetweenExclusive :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m ()
214470deleteBetweenExclusive s e = liftJSM $ do
215− df <- createDocumentFragmentUnchecked =<< getOwnerDocumentUnchecked s
471+ df <- createDocumentFragment =<< getOwnerDocumentUnchecked s
216472 extractBetweenExclusive df s e -- In many places in ImmediateDomBuilderT, we assume that things always have a parent; by adding them to this DocumentFragment, we maintain that invariant
217473
218474-- | s and e must both be children of the same node and s must precede e; all
@@ -220,16 +476,7 @@ deleteBetweenExclusive s e = liftJSM $ do
220476-- and e will not be moved
221477extractBetweenExclusive :: (MonadJSM m, IsNode start, IsNode end) => DOM.DocumentFragment -> start -> end -> m ()
222478extractBetweenExclusive df s e = liftJSM $ do
223− f <- eval $ T.unlines
224− [ "(function(df,s,e){"
225− , " var x;"
226− , " for(;;){"
227− , " x = s.nextSibling;"
228− , " if(e===x) break;"
229− , " df.appendChild(x);"
230− , " }"
231− , "})"
232− ]
479+ f <- eval ("(function(df,s,e) { var x; for(;;) { x = s['nextSibling']; if(e===x) { break; }; df['appendChild'](x); } })" :: Text)
233480 void $ call f f (df, s, e)
234481
235482-- | s and e must both be children of the same node and s must precede e;
@@ -237,26 +484,23 @@ extractBetweenExclusive df s e = liftJSM $ do
237484{-# INLINABLE deleteUpTo #-}
238485deleteUpTo :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m ()
239486deleteUpTo s e = do
240− df <- createDocumentFragmentUnchecked =<< getOwnerDocumentUnchecked s
487+ df <- createDocumentFragment =<< getOwnerDocumentUnchecked s
241488 extractUpTo df s e -- In many places in ImmediateDomBuilderT, we assume that things always have a parent; by adding them to this DocumentFragment, we maintain that invariant
242489
243490extractUpTo :: (MonadJSM m, IsNode start, IsNode end) => DOM.DocumentFragment -> start -> end -> m ()
491+#ifdef ghcjs_HOST_OS
492+--NOTE: Although wrapping this javascript in a function seems unnecessary, GHCJS's optimizer will break it if it is entered without that wrapping (as of 2017-09-04)
493+foreign import javascript unsafe
494+ "(function() { var x = $2; while(x !== $3) { var y = x['nextSibling']; $1['appendChild'](x); x = y; } })()"
495+ extractUpTo_ :: DOM.DocumentFragment -> DOM.Node -> DOM.Node -> IO ()
496+extractUpTo df s e = liftJSM $ extractUpTo_ df (toNode s) (toNode e)
497+#else
244498extractUpTo df s e = liftJSM $ do
245− f <- eval $ T.unlines
246− [ "(function(df,s,e){"
247− , " var x = s;"
248− , " var y;"
249− , " for(;;) {"
250− , " y = x.nextSibling;"
251− , " df.appendChild(x);"
252− , " if(e===y) break;"
253− , " x = y;"
254− , " }"
255− , "})"
256− ]
499+ f <- eval ("(function(df,s,e){ var x = s; var y; for(;;) { y = x['nextSibling']; df['appendChild'](x); if(e===y) { break; } x = y; } })" :: Text)
257500 void $ call f f (df, s, e)
501+#endif
258502
259−type SupportsImmediateDomBuilder t m = (Reflex t, MonadJSM m, MonadJSM (Performable m), MonadHold t m, MonadFix m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadRef m, Ref m ~ Ref JSM, MonadAdjust t m, PrimMonad m)
503+type SupportsHydrationDomBuilder t m = (Reflex t, MonadJSM m, MonadHold t m, MonadFix m, MonadReflexCreateTrigger t m, MonadRef m, Ref m ~ Ref JSM, Adjustable t m, PrimMonad m, PerformEvent t m, MonadJSM (Performable m))
260504
261505{-# INLINABLE collectUpTo #-}
262506collectUpTo :: (MonadJSM m, IsNode start, IsNode end) => start -> end -> m DOM.DocumentFragment
@@ -268,21 +512,27 @@ collectUpTo s e = do
268512collectUpToGivenParent :: (MonadJSM m, IsNode parent, IsNode start, IsNode end) => parent -> start -> end -> m DOM.DocumentFragment
269513collectUpToGivenParent currentParent s e = do
270514 doc <- getOwnerDocumentUnchecked currentParent
271− df <- createDocumentFragmentUnchecked doc
515+ df <- createDocumentFragment doc
272516 extractUpTo df s e
273517 return df
274518
275519newtype EventFilterTriggerRef t er (en :: EventTag) = EventFilterTriggerRef (IORef (Maybe (EventTrigger t (er en))))
276520
277−wrap :: forall m er t. SupportsImmediateDomBuilder t m => RawElement GhcjsDomSpace -> RawElementConfig er t (ImmediateDomBuilderT t m) -> ImmediateDomBuilderT t m (Element er GhcjsDomSpace t)
278−wrap e cfg = do
279− events <- askEvents
280− mapM_ (requestDomAction_ . fmap (imapM_ $ \(AttributeName mAttrNamespace n) mv -> case mAttrNamespace of
521+-- | This 'wrap' is only partial: it doesn't create the 'EventSelector' itself
522+{-# INLINE wrap #-}
523+wrap
524+ :: forall s m er t. (Reflex t, MonadJSM m, MonadReflexCreateTrigger t m, DomRenderHook t m, EventSpec s ~ GhcjsEventSpec)
525+ => Chan [DSum (EventTriggerRef t) TriggerInvocation]
526+ -> DOM.Element
527+ -> RawElementConfig er t s
528+ -> m (DMap EventName (EventFilterTriggerRef t er))
529+wrap events e cfg = do
530+ forM_ (_rawElementConfig_modifyAttributes cfg) $ \modifyAttrs -> requestDomAction_ $ ffor modifyAttrs $ imapM_ $ \(AttributeName mAttrNamespace n) mv -> case mAttrNamespace of
281531 Nothing -> maybe (removeAttribute e n) (setAttribute e n) mv
282− Just ns -> maybe (removeAttributeNS e (Just ns) n) (setAttributeNS e (Just ns) n) mv)) (_rawElementConfig_modifyAttributes cfg)
532+ Just ns -> maybe (removeAttributeNS e (Just ns) n) (setAttributeNS e (Just ns) n) mv
283533 eventTriggerRefs :: DMap EventName (EventFilterTriggerRef t er) <- liftJSM $ fmap DMap.fromList $ forM (DMap.toList $ _ghcjsEventSpec_filters $ _rawElementConfig_eventSpec cfg) $ \(en :=> GhcjsEventFilter f) -> do
284534 triggerRef <- liftIO $ newIORef Nothing
285− _ <- elementOnEventName en e $ do
535+ _ <- elementOnEventName en e $ do --TODO: Something safer than this cast
286536 evt <- DOM.event
287537 (flags, k) <- liftJSM $ f $ GhcjsDomEvent evt
288538 when (_eventFlags_preventDefault flags) $ withIsEvent en DOM.preventDefault
@@ -293,44 +543,74 @@ wrap e cfg = do
293543 mv <- liftJSM k --TODO: Only do this when the event is subscribed
294544 liftIO $ forM_ mv $ \v -> writeChan events [EventTriggerRef triggerRef :=> TriggerInvocation v (return ())]
295545 return $ en :=> EventFilterTriggerRef triggerRef
296− es <- do
297− let h :: GhcjsEventHandler er
298− !h = _ghcjsEventSpec_handler $ _rawElementConfig_eventSpec cfg -- Note: this needs to be done strictly and outside of the newFanEventWithTrigger, so that the newFanEventWithTrigger doesn't retain the entire cfg, which can cause a cyclic dependency that the GC won't be able to clean up
299− ctx <- askJSM
300− newFanEventWithTrigger $ \(WrapArg en) t ->
301− case DMap.lookup en eventTriggerRefs of
302− Just (EventFilterTriggerRef r) -> do
303− writeIORef r $ Just t
304− return $ do
305− writeIORef r Nothing
306− Nothing -> (`runJSM` ctx) <$> (`runJSM` ctx) (elementOnEventName en e $ do
307− evt <- DOM.event
308− mv <- lift $ unGhcjsEventHandler h (en, GhcjsDomEvent evt)
309− case mv of
310− Nothing -> return ()
311− Just v -> liftIO $ do
312− --TODO: I don't think this is quite right: if a new trigger is created between when this is enqueued and when it fires, this may not work quite right
313− ref <- newIORef $ Just t
314− writeChan events [EventTriggerRef ref :=> TriggerInvocation v (return ())])
315− return $ Element es e
316−
317−{-# INLINABLE makeElement #-}
318−makeElement :: forall er t m a. SupportsImmediateDomBuilder t m => Text -> ElementConfig er t (ImmediateDomBuilderT t m) -> ImmediateDomBuilderT t m a -> ImmediateDomBuilderT t m ((Element er GhcjsDomSpace t, a), DOM.Element)
319−makeElement elementTag cfg child = do
320− doc <- askDocument
321− env <- ImmediateDomBuilderT ask
322− e <- liftJSM $ case cfg ^. namespace of
323− Nothing -> createElementUnchecked doc (Just elementTag)
324− Just ens -> createElementNSUnchecked doc (Just ens) (Just elementTag)
325− ImmediateDomBuilderT $ iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of
326− Nothing -> lift $ setAttribute e n v
327− Just ans -> lift $ setAttributeNS e (Just ans) n v
328− result <- ImmediateDomBuilderT $ lift $ runReaderT (unImmediateDomBuilderT child) $ env
329− { _immediateDomBuilderEnv_parent = toNode e
330− }
331− append e
332− wrapped <- wrap e $ extractRawElementConfig cfg
333− return ((wrapped, result), e)
546+ return eventTriggerRefs
547+
548+{-# SPECIALIZE wrap
549+ :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
550+ -> DOM.Element
551+ -> RawElementConfig er DomTimeline HydrationDomSpace
552+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
553+ #-}
554+
555+{-# SPECIALIZE wrap
556+ :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
557+ -> DOM.Element
558+ -> RawElementConfig er DomTimeline GhcjsDomSpace
559+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
560+ #-}
561+
562+{-# INLINE triggerBody #-}
563+triggerBody
564+ :: forall s er t x. EventSpec s ~ GhcjsEventSpec
565+ => DOM.JSContextRef
566+ -> RawElementConfig er t s
567+ -> Chan [DSum (EventTriggerRef t) TriggerInvocation]
568+ -> DMap EventName (EventFilterTriggerRef t er)
569+ -> DOM.Element
570+ -> WrapArg er EventName x
571+ -> EventTrigger t x
572+ -> IO (IO ())
573+triggerBody ctx cfg events eventTriggerRefs e (WrapArg en) t = case DMap.lookup en eventTriggerRefs of
574+ Just (EventFilterTriggerRef r) -> do
575+ writeIORef r $ Just t
576+ return $ do
577+ writeIORef r Nothing
578+ Nothing -> (`runJSM` ctx) <$> (`runJSM` ctx) (elementOnEventName en e $ do
579+ evt <- DOM.event
580+ mv <- lift $ unGhcjsEventHandler handler (en, GhcjsDomEvent evt)
581+ case mv of
582+ Nothing -> return ()
583+ Just v -> liftIO $ do
584+ --TODO: I don't think this is quite right: if a new trigger is created between when this is enqueued and when it fires, this may not work quite right
585+ ref <- newIORef $ Just t
586+ writeChan events [EventTriggerRef ref :=> TriggerInvocation v (return ())])
587+ where
588+ -- Note: this needs to be done strictly and outside of the newFanEventWithTrigger, so that the newFanEventWithTrigger doesn't
589+ -- retain the entire cfg, which can cause a cyclic dependency that the GC won't be able to clean up
590+ handler :: GhcjsEventHandler er
591+ !handler = _ghcjsEventSpec_handler $ _rawElementConfig_eventSpec cfg
592+
593+{-# SPECIALIZE triggerBody
594+ :: DOM.JSContextRef
595+ -> RawElementConfig er DomTimeline HydrationDomSpace
596+ -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
597+ -> DMap EventName (EventFilterTriggerRef DomTimeline er)
598+ -> DOM.Element
599+ -> WrapArg er EventName x
600+ -> EventTrigger DomTimeline x
601+ -> IO (IO ())
602+ #-}
603+
604+{-# SPECIALIZE triggerBody
605+ :: DOM.JSContextRef
606+ -> RawElementConfig er DomTimeline GhcjsDomSpace
607+ -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
608+ -> DMap EventName (EventFilterTriggerRef DomTimeline er)
609+ -> DOM.Element
610+ -> WrapArg er EventName x
611+ -> EventTrigger DomTimeline x
612+ -> IO (IO ())
613+ #-}
334614
335615newtype GhcjsDomHandler a b = GhcjsDomHandler { unGhcjsDomHandler :: a -> JSM b }
336616
@@ -342,9 +622,10 @@ data GhcjsDomSpace
342622
343623instance DomSpace GhcjsDomSpace where
344624 type EventSpec GhcjsDomSpace = GhcjsEventSpec
625+ type RawDocument GhcjsDomSpace = DOM.Document
345626 type RawTextNode GhcjsDomSpace = DOM.Text
627+ type RawCommentNode GhcjsDomSpace = DOM.Comment
346628 type RawElement GhcjsDomSpace = DOM.Element
347− type RawFile GhcjsDomSpace = DOM.File
348629 type RawInputElement GhcjsDomSpace = DOM.HTMLInputElement
349630 type RawTextAreaElement GhcjsDomSpace = DOM.HTMLTextAreaElement
350631 type RawSelectElement GhcjsDomSpace = DOM.HTMLSelectElement
@@ -376,15 +657,11 @@ data GhcjsEventSpec er = GhcjsEventSpec
376657newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
377658
378659#ifndef USE_TEMPLATE_HASKELL
379−phantom2 :: (Functor f, Contravariant f) => f a -> f b
380−phantom2 = phantom
381−{-# INLINE phantom2 #-}
382−
383660ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
384661ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
385662{-# INLINE ghcjsEventSpec_filters #-}
386663ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
387−ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom2 (f b)
664+ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom (f b)
388665{-# INLINE ghcjsEventSpec_handler #-}
389666#endif
390667
@@ -397,213 +674,1476 @@ instance er ~ EventResult => Default (GhcjsEventSpec er) where
397674 runReaderT (defaultDomEventHandler e en) evt
398675 }
399676
400−instance SupportsImmediateDomBuilder t m => DomBuilder t (ImmediateDomBuilderT t m) where
401− type DomBuilderSpace (ImmediateDomBuilderT t m) = GhcjsDomSpace
402− {-# INLINABLE textNode #-}
403− textNode (TextNodeConfig initialContents mSetContents) = do
404− n <- textNodeInternal initialContents
405− mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
406− return $ TextNode n
407− {-# INLINABLE element #-}
408− element elementTag cfg child = fst <$> makeElement elementTag cfg child
409− {-# INLINABLE inputElement #-}
410− inputElement cfg = do
411− ((e, _), domElement) <- makeElement "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
677+{-# INLINE makeElement #-}
678+makeElement :: MonadJSM m => Document -> Text -> ElementConfig er t s -> m DOM.Element
679+makeElement doc elementTag cfg = do
680+ e <- uncheckedCastTo DOM.Element <$> case cfg ^. namespace of
681+ Nothing -> createElement doc elementTag
682+ Just ens -> createElementNS doc (Just ens) elementTag
683+ iforM_ (cfg ^. initialAttributes) $ \(AttributeName mAttrNamespace n) v -> case mAttrNamespace of
684+ Nothing -> setAttribute e n v
685+ Just ans -> setAttributeNS e (Just ans) n v
686+ pure e
687+
688+{-# INLINE elementImmediate #-}
689+elementImmediate
690+ :: ( RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, EventSpec s ~ GhcjsEventSpec
691+ , MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m )
692+ => Text
693+ -> ElementConfig er t s
694+ -> HydrationDomBuilderT s t m a
695+ -> HydrationDomBuilderT s t m (Element er GhcjsDomSpace t, a)
696+elementImmediate elementTag cfg child = do
697+ doc <- askDocument
698+ ctx <- askJSM
699+ events <- askEvents
700+ parent <- getParent
701+ e <- makeElement doc elementTag cfg
702+ appendChild_ parent e
703+ -- Run the child builder with updated parent and previous sibling references
704+ result <- localEnv (\env -> env { _hydrationDomBuilderEnv_parent = Left $ toNode e }) child
705+ let rawCfg = extractRawElementConfig cfg
706+ eventTriggerRefs <- wrap events e rawCfg
707+ es <- newFanEventWithTrigger $ triggerBody ctx rawCfg events eventTriggerRefs e
708+ return (Element es e, result)
709+
710+{-# SPECIALIZE elementImmediate
711+ :: Text
712+ -> ElementConfig er DomTimeline HydrationDomSpace
713+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
714+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
715+ #-}
716+
717+{-# SPECIALIZE elementImmediate
718+ :: Text
719+ -> ElementConfig er DomTimeline GhcjsDomSpace
720+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM a
721+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
722+ #-}
723+
724+-- For specialisation
725+
726+-- | The Reflex timeline for interacting with the DOM
727+type DomTimeline =
728+#ifdef PROFILE_REFLEX
729+ ProfiledTimeline
730+#endif
731+ Spider
732+
733+-- | The ReflexHost the DOM lives in
734+type DomHost =
735+#ifdef PROFILE_REFLEX
736+ ProfiledM
737+#endif
738+ (SpiderHost Global)
739+
740+type DomCoreWidget x = PostBuildT DomTimeline (WithJSContextSingleton x (PerformEventT DomTimeline DomHost))
741+type HydrationM = DomCoreWidget ()
742+
743+{-# INLINE elementInternal #-}
744+elementInternal
745+ :: (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
746+ => Text
747+ -> ElementConfig er t HydrationDomSpace
748+ -> HydrationDomBuilderT HydrationDomSpace t m a
749+ -> HydrationDomBuilderT HydrationDomSpace t m (Element er HydrationDomSpace t, a)
750+elementInternal elementTag cfg child = getHydrationMode >>= \case
751+ HydrationMode_Immediate -> do
752+ (Element es _, result) <- elementImmediate elementTag cfg child
753+ return (Element es (), result)
754+ HydrationMode_Hydrating -> fst <$> hydrateElement elementTag cfg child
755+
756+{-# SPECIALIZE elementInternal
757+ :: Text
758+ -> ElementConfig er DomTimeline HydrationDomSpace
759+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
760+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er HydrationDomSpace DomTimeline, a)
761+ #-}
762+
763+-- | An attribute which causes hydration to skip over an element completely.
764+skipHydrationAttribute :: IsString s => s
765+skipHydrationAttribute = "data-hydration-skip"
766+
767+-- | An attribute which signals that an element should be hydrated.
768+hydratableAttribute :: IsString s => s
769+hydratableAttribute = "data-ssr"
770+
771+{-# INLINE hydrateElement #-}
772+hydrateElement
773+ :: forall er t m a. (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
774+ => Text
775+ -> ElementConfig er t HydrationDomSpace
776+ -> HydrationDomBuilderT HydrationDomSpace t m a
777+ -> HydrationDomBuilderT HydrationDomSpace t m ((Element er HydrationDomSpace t, a), IORef DOM.Element)
778+hydrateElement elementTag cfg child = do
779+ ctx <- askJSM
780+ events <- askEvents
781+ -- Schedule everything for after postBuild, except for getting the result itself
782+ parentRef <- liftIO $ newIORef $ error "Parent not yet initialized"
783+ e' <- liftIO $ newIORef $ error "hydrateElement: Element not yet initialized"
784+ env <- HydrationDomBuilderT ask
785+ childDelayedRef <- liftIO $ newIORef $ pure ()
786+ let env' = env
787+ { _hydrationDomBuilderEnv_parent = Right parentRef
788+ , _hydrationDomBuilderEnv_delayed = childDelayedRef
789+ }
790+ result <- HydrationDomBuilderT $ lift $ runReaderT (unHydrationDomBuilderT child) env'
791+ wrapResult <- liftIO newEmptyMVar
792+ let -- Determine if we should skip an element. We currently skip elements for
793+ -- two reasons:
794+ -- 1) it was not produced by a static builder which supports hydration
795+ -- 2) it is explicitly marked to be skipped
796+ shouldSkip :: DOM.Element -> HydrationRunnerT t m Bool
797+ shouldSkip e = do
798+ skip <- hasAttribute e (skipHydrationAttribute :: DOM.JSString)
799+ hydratable <- hasAttribute e (hydratableAttribute :: DOM.JSString)
800+ pure $ skip || not hydratable
801+ childDom <- liftIO $ readIORef childDelayedRef
802+ let rawCfg = extractRawElementConfig cfg
803+ doc <- askDocument
804+ addHydrationStep $ do
805+ parent <- askParent
806+ lastHydrationNode <- getPreviousNode
807+ let go mLastNode = maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
808+ Nothing -> do -- ran out of nodes, create the element
809+ HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
810+ e <- makeElement doc elementTag cfg
811+ insertAfterPreviousNode e
812+ pure e
813+ Just node -> DOM.castTo DOM.Element node >>= \case
814+ Nothing -> go (Just node) -- this node is not an element, skip
815+ Just e -> shouldSkip e >>= \case
816+ True -> go (Just node) -- this element should be skipped by hydration
817+ False -> do
818+ t <- Element.getTagName e
819+ -- TODO: check attributes?
820+ if T.toCaseFold elementTag == T.toCaseFold t
821+ then pure e
822+ -- we came to some other statically rendered element, so something has gone wrong
823+ else do
824+ HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
825+ n <- makeElement doc elementTag cfg
826+ insertAfterPreviousNode n
827+ pure n
828+ e <- go lastHydrationNode
829+ setPreviousNode $ Just $ toNode e
830+ -- Update the parent node used by the children
831+ liftIO $ writeIORef parentRef $ toNode e
832+ liftIO $ writeIORef e' e
833+ -- Setup events, store the result so we can wait on it later
834+ refs <- wrap events e rawCfg
835+ liftIO $ putMVar wrapResult (e, refs)
836+ localRunner childDom Nothing $ toNode e
837+ -- We need the EventSelector to switch to the real event handler after activation
838+ es <- newFanEventWithTrigger $ \(WrapArg en) t -> do
839+ cleanup <- newEmptyMVar
840+ threadId <- forkIO $ do
841+ -- Wait on the data we need from the delayed action
842+ (e, eventTriggerRefs) <- readMVar wrapResult
843+ bracketOnError
844+ -- Run the setup, acquiring the cleanup action
845+ (triggerBody ctx rawCfg events eventTriggerRefs e (WrapArg en) t)
846+ -- Run the cleanup, if we have it - but only when an exception is
847+ -- raised (we might get killed between acquiring the cleanup action
848+ -- from 'triggerBody' and putting it in the MVar)
849+ id
850+ -- Try to put this action into the cleanup MVar
851+ (putMVar cleanup)
852+ pure $ do
853+ tryReadMVar cleanup >>= \case
854+ Nothing -> killThread threadId
855+ Just c -> c
856+ return ((Element es (), result), e')
857+
858+{-# SPECIALIZE hydrateElement
859+ :: Text
860+ -> ElementConfig er DomTimeline HydrationDomSpace
861+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
862+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM ((Element er HydrationDomSpace DomTimeline, a), IORef DOM.Element)
863+ #-}
864+
865+{-# INLINE inputElementImmediate #-}
866+inputElementImmediate
867+ :: ( RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, EventSpec s ~ GhcjsEventSpec
868+ , MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m
869+ , MonadRef m, Ref m ~ IORef )
870+ => InputElementConfig er t s -> HydrationDomBuilderT s t m (InputElement er GhcjsDomSpace t)
871+inputElementImmediate cfg = do
872+ (e@(Element eventSelector domElement), ()) <- elementImmediate "input" (_inputElementConfig_elementConfig cfg) $ return ()
873+ let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
874+ Input.setValue domInputElement $ cfg ^. inputElementConfig_initialValue
875+ v0 <- Input.getValue domInputElement
876+ let getMyValue = Input.getValue domInputElement
877+ valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select eventSelector (WrapArg Input)
878+ valueChangedBySetValue <- case _inputElementConfig_setValue cfg of
879+ Nothing -> return never
880+ Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
881+ Input.setValue domInputElement v'
882+ getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
883+ v <- holdDyn v0 $ leftmost
884+ [ valueChangedBySetValue
885+ , valueChangedByUI
886+ ]
887+ Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
888+ checkedChangedByUI <- wrapDomEvent domInputElement (`on` Events.click) $ do
889+ Input.getChecked domInputElement
890+ checkedChangedBySetChecked <- case _inputElementConfig_setChecked cfg of
891+ Nothing -> return never
892+ Just eNewchecked -> requestDomAction $ ffor eNewchecked $ \newChecked -> do
893+ oldChecked <- Input.getChecked domInputElement
894+ Input.setChecked domInputElement newChecked
895+ return $ if newChecked /= oldChecked
896+ then Just newChecked
897+ else Nothing
898+ c <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
899+ [ fmapMaybe id checkedChangedBySetChecked
900+ , checkedChangedByUI
901+ ]
902+ hasFocus <- mkHasFocus e
903+ files <- holdDyn mempty <=< wrapDomEvent domInputElement (`on` Events.change) $ do
904+ mfiles <- Input.getFiles domInputElement
905+ let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
906+ maybe (return []) getMyFiles mfiles
907+ checked <- holdUniqDyn c
908+ return $ InputElement
909+ { _inputElement_value = v
910+ , _inputElement_checked = checked
911+ , _inputElement_checkedChange = checkedChangedByUI
912+ , _inputElement_input = valueChangedByUI
913+ , _inputElement_hasFocus = hasFocus
914+ , _inputElement_element = e
915+ , _inputElement_raw = domInputElement
916+ , _inputElement_files = files
917+ }
918+
919+{-# INLINE inputElementInternal #-}
920+inputElementInternal
921+ :: ( MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m
922+ , MonadRef m, Ref m ~ IORef )
923+ => InputElementConfig er t HydrationDomSpace -> HydrationDomBuilderT HydrationDomSpace t m (InputElement er HydrationDomSpace t)
924+inputElementInternal cfg = getHydrationMode >>= \case
925+ HydrationMode_Immediate -> ffor (inputElementImmediate cfg) $ \result -> result
926+ { _inputElement_element = Element (_element_events $ _inputElement_element result) ()
927+ , _inputElement_raw = ()
928+ }
929+ HydrationMode_Hydrating -> do
930+ ((e, _), domElementRef) <- hydrateElement "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
931+ (valueChangedByUI, triggerChangeByUI) <- newTriggerEvent
932+ (valueChangedBySetValue, triggerChangeBySetValue) <- newTriggerEvent
933+ (focusChange, triggerFocusChange) <- newTriggerEvent
934+ (checkedChangedByUI, triggerCheckedChangedByUI) <- newTriggerEvent
935+ (checkedChangedBySetChecked, triggerCheckedChangedBySetChecked) <- newTriggerEvent
936+ (fileChange, triggerFileChange) <- newTriggerEvent
937+ doc <- askDocument
938+ -- Expected initial value from config
939+ let v0 = _inputElementConfig_initialValue cfg
940+ c0 = _inputElementConfig_initialChecked cfg
941+ valuesAtSwitchover = do
942+ v <- maybe (pure $ pure v0) (hold v0) (_inputElementConfig_setValue cfg)
943+ c <- maybe (pure $ pure c0) (hold c0) (_inputElementConfig_setChecked cfg)
944+ pure (v, c)
945+ addHydrationStepWithSetup valuesAtSwitchover $ \(switchoverValue', switchoverChecked') -> do
946+ switchoverValue <- sample switchoverValue'
947+ switchoverChecked <- sample switchoverChecked'
948+ domElement <- liftIO $ readIORef domElementRef
412949 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
413− Input.setValue domInputElement $ Just (cfg ^. inputElementConfig_initialValue)
414− v0 <- Input.getValueUnchecked domInputElement
415− let getMyValue = fromMaybe "" <$> Input.getValue domInputElement
416− valueChangedByUI <- performEvent $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
417− valueChangedBySetValue <- case _inputElementConfig_setValue cfg of
418− Nothing -> return never
419− Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
420− Input.setValue domInputElement $ Just v'
421− getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
422− v <- holdDyn v0 $ leftmost
423− [ valueChangedBySetValue
424− , valueChangedByUI
425− ]
426− Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
427− checkedChangedByUI <- wrapDomEvent domInputElement (`on` Element.click) $ do
428− Input.getChecked domInputElement
429− checkedChangedBySetChecked <- case _inputElementConfig_setChecked cfg of
430− Nothing -> return never
431− Just eNewchecked -> requestDomAction $ ffor eNewchecked $ \newChecked -> do
950+ getValue = Input.getValue domInputElement
951+ -- When the value has been updated by setValue before switchover, we must
952+ -- send an update here to remain in sync. This is because the later
953+ -- requestDomAction based on the setValue event will not capture events
954+ -- happening before postBuild, because this code runs after switchover.
955+ when (v0 /= switchoverValue) $ liftIO $ triggerChangeBySetValue switchoverValue
956+ -- The user could have altered the value before switchover. This must be
957+ -- triggered after the setValue one in order for the events to be in the
958+ -- correct order.
959+ liftJSM getValue >>= \realValue -> when (realValue /= switchoverValue) $ liftIO $ triggerChangeByUI realValue
960+ -- Watch for user interaction and trigger event accordingly
961+ requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
962+ for_ (_inputElementConfig_setValue cfg) $ \eSetValue ->
963+ requestDomAction_ $ ffor eSetValue $ \v' -> do
964+ Input.setValue domInputElement v'
965+ v <- getValue -- We get the value after setting it in case the browser has mucked with it somehow
966+ liftIO $ triggerChangeBySetValue v
967+ let focusChange' = leftmost
968+ [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
969+ , True <$ Reflex.select (_element_events e) (WrapArg Focus)
970+ ]
971+ liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
972+ requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
973+ -- When the checked state has been updated by setChecked before
974+ -- switchover, we must send an update here to remain in sync. This is
975+ -- because the later requestDomAction based on the setChecked event will not
976+ -- capture events happening before postBuild, because this code runs after
977+ -- switchover.
978+ when (c0 /= switchoverChecked) $ liftIO $ triggerCheckedChangedBySetChecked switchoverChecked
979+ -- The user could have clicked the checkbox before switchover, we only
980+ -- detect cases where they flipped the state. This must be triggered after
981+ -- the setValue one in order for the events to be in the correct order.
982+ liftJSM (Input.getChecked domInputElement) >>= \realChecked -> when (realChecked /= switchoverChecked) $
983+ liftIO $ triggerCheckedChangedByUI realChecked
984+ _ <- liftJSM $ domInputElement `on` Events.click $ do
985+ liftIO . triggerCheckedChangedByUI =<< Input.getChecked domInputElement
986+ for_ (_inputElementConfig_setChecked cfg) $ \eNewchecked ->
987+ requestDomAction $ ffor eNewchecked $ \newChecked -> do
432988 oldChecked <- Input.getChecked domInputElement
433989 Input.setChecked domInputElement newChecked
434− return $ if newChecked /= oldChecked
435− then Just newChecked
436− else Nothing
437− c <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
438− [ fmapMaybe id checkedChangedBySetChecked
439− , checkedChangedByUI
440− ]
441− let initialFocus = False --TODO: Is this correct?
442− hasFocus <- holdDyn initialFocus $ leftmost
443− [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
444− , True <$ Reflex.select (_element_events e) (WrapArg Focus)
445− ]
446− files <- holdDyn mempty <=< wrapDomEvent domInputElement (`on` Element.change) $ do
990+ when (newChecked /= oldChecked) $ liftIO $ triggerCheckedChangedBySetChecked newChecked
991+ _ <- liftJSM $ domInputElement `on` Events.change $ do
447992 mfiles <- Input.getFiles domInputElement
448993 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
449− maybe (return []) getMyFiles mfiles
450− return $ InputElement
451− { _inputElement_value = v
452− , _inputElement_checked = uniqDyn c
453− , _inputElement_checkedChange = checkedChangedByUI
454− , _inputElement_input = valueChangedByUI
455− , _inputElement_hasFocus = hasFocus
456− , _inputElement_element = e
457− , _inputElement_raw = domInputElement
458− , _inputElement_files = files
459− }
460− {-# INLINABLE textAreaElement #-}
461− textAreaElement cfg = do --TODO
462− ((e, _), domElement) <- makeElement "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
994+ liftIO . triggerFileChange =<< maybe (return []) getMyFiles mfiles
995+ return ()
996+ checked' <- holdDyn c0 $ leftmost
997+ [ checkedChangedBySetChecked
998+ , checkedChangedByUI
999+ ]
1000+ checked <- holdUniqDyn checked'
1001+ let initialFocus = False -- Assume it isn't focused, but we update the actual focus state at switchover
1002+ hasFocus <- holdUniqDyn =<< holdDyn initialFocus focusChange
1003+ v <- holdDyn v0 $ leftmost
1004+ [ valueChangedBySetValue
1005+ , valueChangedByUI
1006+ ]
1007+ files <- holdDyn mempty fileChange
1008+ return $ InputElement
1009+ { _inputElement_value = v
1010+ , _inputElement_checked = checked
1011+ , _inputElement_checkedChange = checkedChangedByUI
1012+ , _inputElement_input = valueChangedByUI
1013+ , _inputElement_hasFocus = hasFocus
1014+ , _inputElement_element = e
1015+ , _inputElement_raw = ()
1016+ , _inputElement_files = files
1017+ }
1018+
1019+{-# INLINE textAreaElementImmediate #-}
1020+textAreaElementImmediate
1021+ :: ( RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, EventSpec s ~ GhcjsEventSpec
1022+ , MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m
1023+ , MonadRef m, Ref m ~ IORef )
1024+ => TextAreaElementConfig er t s -> HydrationDomBuilderT s t m (TextAreaElement er GhcjsDomSpace t)
1025+textAreaElementImmediate cfg = do
1026+ (e@(Element eventSelector domElement), _) <- elementImmediate "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
1027+ let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
1028+ TextArea.setValue domTextAreaElement $ cfg ^. textAreaElementConfig_initialValue
1029+ v0 <- TextArea.getValue domTextAreaElement
1030+ let getMyValue = TextArea.getValue domTextAreaElement
1031+ valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select eventSelector (WrapArg Input)
1032+ valueChangedBySetValue <- case _textAreaElementConfig_setValue cfg of
1033+ Nothing -> return never
1034+ Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
1035+ TextArea.setValue domTextAreaElement v'
1036+ getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
1037+ v <- holdDyn v0 $ leftmost
1038+ [ valueChangedBySetValue
1039+ , valueChangedByUI
1040+ ]
1041+ hasFocus <- mkHasFocus e
1042+ return $ TextAreaElement
1043+ { _textAreaElement_value = v
1044+ , _textAreaElement_input = valueChangedByUI
1045+ , _textAreaElement_hasFocus = hasFocus
1046+ , _textAreaElement_element = e
1047+ , _textAreaElement_raw = domTextAreaElement
1048+ }
1049+
1050+{-# INLINE textAreaElementInternal #-}
1051+textAreaElementInternal
1052+ :: ( MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m
1053+ , MonadRef m, Ref m ~ IORef )
1054+ => TextAreaElementConfig er t HydrationDomSpace -> HydrationDomBuilderT HydrationDomSpace t m (TextAreaElement er HydrationDomSpace t)
1055+textAreaElementInternal cfg = getHydrationMode >>= \case
1056+ HydrationMode_Immediate -> ffor (textAreaElementImmediate cfg) $ \result -> result
1057+ { _textAreaElement_element = Element (_element_events $ _textAreaElement_element result) ()
1058+ , _textAreaElement_raw = ()
1059+ }
1060+ HydrationMode_Hydrating -> do
1061+ ((e, _), domElementRef) <- hydrateElement "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
1062+ (valueChangedByUI, triggerChangeByUI) <- newTriggerEvent
1063+ (valueChangedBySetValue, triggerChangeBySetValue) <- newTriggerEvent
1064+ (focusChange, triggerFocusChange) <- newTriggerEvent
1065+ doc <- askDocument
1066+ -- Expected initial value from config
1067+ let v0 = _textAreaElementConfig_initialValue cfg
1068+ valueAtSwitchover = maybe (pure $ pure v0) (hold v0) (_textAreaElementConfig_setValue cfg)
1069+ addHydrationStepWithSetup valueAtSwitchover $ \switchoverValue' -> do
1070+ switchoverValue <- sample switchoverValue'
1071+ domElement <- liftIO $ readIORef domElementRef
4631072 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
464− TextArea.setValue domTextAreaElement $ Just (cfg ^. textAreaElementConfig_initialValue)
465− v0 <- TextArea.getValueUnchecked domTextAreaElement
466− let getMyValue = fromMaybe "" <$> TextArea.getValue domTextAreaElement
467− valueChangedByUI <- performEvent $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Input)
468− valueChangedBySetValue <- case _textAreaElementConfig_setValue cfg of
469− Nothing -> return never
470− Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
471− TextArea.setValue domTextAreaElement $ Just v'
472− getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
473− v <- holdDyn v0 $ leftmost
474− [ valueChangedBySetValue
475− , valueChangedByUI
476− ]
477− hasFocus <- mkHasFocus e
478− return $ TextAreaElement
479− { _textAreaElement_value = v
480− , _textAreaElement_input = valueChangedByUI
481− , _textAreaElement_hasFocus = hasFocus
482− , _textAreaElement_element = e
483− , _textAreaElement_raw = domTextAreaElement
484− }
485− {-# INLINABLE selectElement #-}
486− selectElement cfg child = do
487− ((e, result), domElement) <- makeElement "select" (cfg ^. selectElementConfig_elementConfig) child
1073+ getValue = TextArea.getValue domTextAreaElement
1074+ -- When the value has been updated by setValue before switchover, we must
1075+ -- send an update here to remain in sync. This is because the later
1076+ -- requestDomAction based on the setValue event will not capture events
1077+ -- happening before postBuild, because this code runs after switchover.
1078+ when (v0 /= switchoverValue) $ liftIO $ triggerChangeBySetValue switchoverValue
1079+ -- The user could have altered the value before switchover. This must be
1080+ -- triggered after the setValue one in order for the events to be in the
1081+ -- correct order.
1082+ liftJSM getValue >>= \realValue -> when (realValue /= switchoverValue) $ liftIO $ triggerChangeByUI realValue
1083+ -- Watch for user interaction and trigger event accordingly
1084+ requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
1085+ for_ (_textAreaElementConfig_setValue cfg) $ \eSetValue ->
1086+ requestDomAction_ $ ffor eSetValue $ \v' -> do
1087+ TextArea.setValue domTextAreaElement v'
1088+ v <- getValue -- We get the value after setting it in case the browser has mucked with it somehow
1089+ liftIO $ triggerChangeBySetValue v
1090+ let focusChange' = leftmost
1091+ [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
1092+ , True <$ Reflex.select (_element_events e) (WrapArg Focus)
1093+ ]
1094+ liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
1095+ requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
1096+ let initialFocus = False -- Assume it isn't focused, but we update the actual focus state at switchover
1097+ hasFocus <- holdUniqDyn =<< holdDyn initialFocus focusChange
1098+ v <- holdDyn v0 $ leftmost
1099+ [ valueChangedBySetValue
1100+ , valueChangedByUI
1101+ ]
1102+ return $ TextAreaElement
1103+ { _textAreaElement_value = v
1104+ , _textAreaElement_input = valueChangedByUI
1105+ , _textAreaElement_hasFocus = hasFocus
1106+ , _textAreaElement_element = e
1107+ , _textAreaElement_raw = ()
1108+ }
1109+
1110+{-# INLINE selectElementImmediate #-}
1111+selectElementImmediate
1112+ :: ( EventSpec s ~ GhcjsEventSpec, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document
1113+ , MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m )
1114+ => SelectElementConfig er t s
1115+ -> HydrationDomBuilderT s t m a
1116+ -> HydrationDomBuilderT s t m (SelectElement er GhcjsDomSpace t, a)
1117+selectElementImmediate cfg child = do
1118+ (e@(Element eventSelector domElement), result) <- elementImmediate "select" (cfg ^. selectElementConfig_elementConfig) child
1119+ let domSelectElement = uncheckedCastTo DOM.HTMLSelectElement domElement
1120+ Select.setValue domSelectElement $ cfg ^. selectElementConfig_initialValue
1121+ v0 <- Select.getValue domSelectElement
1122+ let getMyValue = Select.getValue domSelectElement
1123+ valueChangedByUI <- requestDomAction $ liftJSM getMyValue <$ Reflex.select eventSelector (WrapArg Change)
1124+ valueChangedBySetValue <- case _selectElementConfig_setValue cfg of
1125+ Nothing -> return never
1126+ Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
1127+ Select.setValue domSelectElement v'
1128+ getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
1129+ v <- holdDyn v0 $ leftmost
1130+ [ valueChangedBySetValue
1131+ , valueChangedByUI
1132+ ]
1133+ hasFocus <- mkHasFocus e
1134+ let wrapped = SelectElement
1135+ { _selectElement_value = v
1136+ , _selectElement_change = valueChangedByUI
1137+ , _selectElement_hasFocus = hasFocus
1138+ , _selectElement_element = e
1139+ , _selectElement_raw = domSelectElement
1140+ }
1141+ return (wrapped, result)
1142+
1143+{-# INLINE selectElementInternal #-}
1144+selectElementInternal
1145+ :: ( MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m, MonadHold t m
1146+ , MonadRef m, Ref m ~ IORef )
1147+ => SelectElementConfig er t HydrationDomSpace
1148+ -> HydrationDomBuilderT HydrationDomSpace t m a
1149+ -> HydrationDomBuilderT HydrationDomSpace t m (SelectElement er HydrationDomSpace t, a)
1150+selectElementInternal cfg child = getHydrationMode >>= \case
1151+ HydrationMode_Immediate -> ffor (selectElementImmediate cfg child) $ \(e, result) -> (e
1152+ { _selectElement_element = Element (_element_events $ _selectElement_element e) ()
1153+ , _selectElement_raw = ()
1154+ }, result)
1155+ HydrationMode_Hydrating -> do
1156+ ((e, result), domElementRef) <- hydrateElement "select" (cfg ^. selectElementConfig_elementConfig) child
1157+ (valueChangedByUI, triggerChangeByUI) <- newTriggerEvent
1158+ (valueChangedBySetValue, triggerChangeBySetValue) <- newTriggerEvent
1159+ (focusChange, triggerFocusChange) <- newTriggerEvent
1160+ doc <- askDocument
1161+ -- Expected initial value from config
1162+ let v0 = _selectElementConfig_initialValue cfg
1163+ addHydrationStep $ do
1164+ domElement <- liftIO $ readIORef domElementRef
4881165 let domSelectElement = uncheckedCastTo DOM.HTMLSelectElement domElement
489− Select.setValue domSelectElement $ Just (cfg ^. selectElementConfig_initialValue)
490− Just v0 <- Select.getValue domSelectElement
491− let getMyValue = fromMaybe "" <$> Select.getValue domSelectElement
492− valueChangedByUI <- performEvent $ liftJSM getMyValue <$ Reflex.select (_element_events e) (WrapArg Change)
493− valueChangedBySetValue <- case _selectElementConfig_setValue cfg of
494− Nothing -> return never
495− Just eSetValue -> requestDomAction $ ffor eSetValue $ \v' -> do
496− Select.setValue domSelectElement $ Just v'
497− getMyValue -- We get the value after setting it in case the browser has mucked with it somehow
498− v <- holdDyn v0 $ leftmost
499− [ valueChangedBySetValue
500− , valueChangedByUI
501− ]
502− hasFocus <- mkHasFocus e
503− let wrapped = SelectElement
504− { _selectElement_value = v
505− , _selectElement_change = valueChangedByUI
506− , _selectElement_hasFocus = hasFocus
507− , _selectElement_element = e
508− , _selectElement_raw = domSelectElement
509− }
510− return (wrapped, result)
511− placeRawElement = append
512− wrapRawElement = wrap
1166+ getValue = Select.getValue domSelectElement
1167+ -- The browser might have messed with the value, or the user could have
1168+ -- altered it before activation, so we set it if it isn't what we expect
1169+ liftJSM getValue >>= \v0' -> do
1170+ when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
1171+ -- Watch for user interaction and trigger event accordingly
1172+ requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Change)
1173+ for_ (_selectElementConfig_setValue cfg) $ \eSetValue ->
1174+ requestDomAction_ $ ffor eSetValue $ \v' -> do
1175+ Select.setValue domSelectElement v'
1176+ v <- getValue -- We get the value after setting it in case the browser has mucked with it somehow
1177+ liftIO $ triggerChangeBySetValue v
1178+ let focusChange' = leftmost
1179+ [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
1180+ , True <$ Reflex.select (_element_events e) (WrapArg Focus)
1181+ ]
1182+ liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
1183+ requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
1184+ let initialFocus = False -- Assume it isn't focused, but we update the actual focus state at switchover
1185+ hasFocus <- holdUniqDyn =<< holdDyn initialFocus focusChange
1186+ v <- holdDyn v0 $ leftmost
1187+ [ valueChangedBySetValue
1188+ , valueChangedByUI
1189+ ]
1190+ return $ (,result) $ SelectElement
1191+ { _selectElement_value = v
1192+ , _selectElement_change = valueChangedByUI
1193+ , _selectElement_hasFocus = hasFocus
1194+ , _selectElement_element = e
1195+ , _selectElement_raw = ()
1196+ }
5131197
514−instance (Reflex t, MonadAdjust t m, MonadJSM m, MonadHold t m, PerformEvent t m, MonadJSM (Performable m), MonadFix m, PrimMonad m) => MonadAdjust t (ImmediateDomBuilderT t m) where
1198+{-# INLINE textNodeImmediate #-}
1199+textNodeImmediate
1200+ :: (RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, MonadJSM m, Reflex t, MonadFix m)
1201+ => TextNodeConfig t -> HydrationDomBuilderT s t m DOM.Text
1202+textNodeImmediate (TextNodeConfig !t mSetContents) = do
1203+ p <- getParent
1204+ doc <- askDocument
1205+ n <- createTextNode doc t
1206+ appendChild_ p n
1207+ mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1208+ pure n
1209+
1210+{-# SPECIALIZE textNodeImmediate
1211+ :: TextNodeConfig DomTimeline
1212+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM DOM.Text
1213+ #-}
1214+
1215+{-# SPECIALIZE textNodeImmediate
1216+ :: TextNodeConfig DomTimeline
1217+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM DOM.Text
1218+ #-}
1219+
1220+{-# INLINE textNodeInternal #-}
1221+textNodeInternal
1222+ :: (Adjustable t m, MonadHold t m, MonadJSM m, MonadFix m, Reflex t)
1223+ => TextNodeConfig t -> HydrationDomBuilderT HydrationDomSpace t m (TextNode HydrationDomSpace t)
1224+textNodeInternal tc@(TextNodeConfig !t mSetContents) = do
1225+ doc <- askDocument
1226+ getHydrationMode >>= \case
1227+ HydrationMode_Immediate -> void $ textNodeImmediate tc
1228+ HydrationMode_Hydrating -> addHydrationStepWithSetup (maybe (pure $ pure t) (hold t) mSetContents) $ \currentText -> do
1229+ n <- hydrateTextNode doc =<< sample currentText
1230+ mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1231+ pure $ TextNode ()
1232+
1233+{-# SPECIALIZE textNodeInternal
1234+ :: TextNodeConfig DomTimeline
1235+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (TextNode HydrationDomSpace DomTimeline)
1236+ #-}
1237+
1238+-- | The static builder mashes adjacent text nodes into one node: we check the
1239+-- text content of each node we come to, comparing it to the content we
1240+-- expect. We also have a special case for empty text nodes - we always create
1241+-- the and add them after the previous node reference.
1242+{-# INLINE hydrateTextNode #-}
1243+hydrateTextNode :: MonadJSM m => Document -> Text -> HydrationRunnerT t m DOM.Text
1244+hydrateTextNode doc t@"" = do
1245+ tn <- createTextNode doc t
1246+ insertAfterPreviousNode tn
1247+ pure tn
1248+hydrateTextNode doc t = do
1249+ n <- join $ go <$> askParent <*> getPreviousNode
1250+ setPreviousNode $ Just $ toNode n
1251+ return n
1252+ where
1253+ go parent mLastNode = maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
1254+ Nothing -> do
1255+ HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1256+ n <- createTextNode doc t
1257+ insertAfterPreviousNode n
1258+ pure n
1259+ Just node -> DOM.castTo DOM.Text node >>= \case
1260+ Nothing -> go parent $ Just node
1261+ Just originalNode -> do
1262+ originalText <- Node.getTextContentUnchecked originalNode
1263+ case T.stripPrefix t originalText of
1264+ Just "" -> return originalNode
1265+ Just _ -> do
1266+ -- If we have the right prefix, we split the text node into a node containing the
1267+ -- required text and a subsequent sibling node containing the rest of the text.
1268+ DOM.splitText_ originalNode $ fromIntegral $ T.length t
1269+ return originalNode
1270+ Nothing -> do
1271+ HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1272+ n <- createTextNode doc t
1273+ insertAfterPreviousNode n
1274+ pure n
1275+
1276+{-# INLINE commentNodeImmediate #-}
1277+commentNodeImmediate
1278+ :: (RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document, MonadJSM m, Reflex t, MonadFix m)
1279+ => CommentNodeConfig t -> HydrationDomBuilderT s t m DOM.Comment
1280+commentNodeImmediate (CommentNodeConfig !t mSetContents) = do
1281+ p <- getParent
1282+ doc <- askDocument
1283+ n <- createComment doc t
1284+ appendChild_ p n
1285+ mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1286+ pure n
1287+
1288+{-# INLINE commentNodeInternal #-}
1289+commentNodeInternal
1290+ :: (Ref m ~ IORef, MonadRef m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadJSM (Performable m), MonadJSM m, MonadFix m, Reflex t, Adjustable t m, MonadHold t m, MonadSample t m)
1291+ => CommentNodeConfig t -> HydrationDomBuilderT HydrationDomSpace t m (CommentNode HydrationDomSpace t)
1292+commentNodeInternal tc@(CommentNodeConfig t0 mSetContents) = do
1293+ doc <- askDocument
1294+ getHydrationMode >>= \case
1295+ HydrationMode_Immediate -> void $ commentNodeInternal tc
1296+ HydrationMode_Hydrating -> addHydrationStepWithSetup (maybe (pure $ pure t0) (hold t0) mSetContents) $ \bt -> do
1297+ t <- sample bt
1298+ void $ hydrateComment doc t mSetContents
1299+ pure $ CommentNode ()
1300+
1301+{-# INLINE hydrateComment #-}
1302+hydrateComment :: (MonadJSM m, Reflex t, MonadFix m) => Document -> Text -> Maybe (Event t Text) -> HydrationRunnerT t m DOM.Comment
1303+hydrateComment doc t mSetContents = do
1304+ parent <- askParent
1305+ let go mLastNode = maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
1306+ Nothing -> do
1307+ c <- createComment doc t
1308+ insertAfterPreviousNode c
1309+ pure c
1310+ Just node -> DOM.castTo DOM.Comment node >>= \case
1311+ Nothing -> go (Just node)
1312+ Just c -> do
1313+ t' <- Node.getTextContentUnchecked c
1314+ if t == t'
1315+ then pure c
1316+ else do
1317+ c' <- createComment doc t
1318+ insertAfterPreviousNode c'
1319+ pure c'
1320+ n <- go =<< getPreviousNode
1321+ setPreviousNode $ Just $ toNode n
1322+ mapM_ (requestDomAction_ . fmap (setNodeValue n . Just)) mSetContents
1323+ pure n
1324+
1325+-- | We leave markers in the static builder as comments, and rip these comments
1326+-- out at hydration time, replacing them with empty text nodes.
1327+{-# INLINABLE skipToAndReplaceComment #-}
1328+skipToAndReplaceComment
1329+ :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
1330+ => Text
1331+ -> IORef (Maybe Text)
1332+ -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef (Maybe Text))
1333+skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
1334+ HydrationMode_Immediate -> do
1335+ -- If we're in immediate mode, we don't try to replace an existing comment,
1336+ -- and just return a dummy key
1337+ t <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
1338+ append $ toNode t
1339+ textNodeRef <- liftIO $ newIORef t
1340+ keyRef <- liftIO $ newIORef Nothing
1341+ pure (pure (), textNodeRef, keyRef)
1342+ HydrationMode_Hydrating -> do
1343+ doc <- askDocument
1344+ textNodeRef <- liftIO $ newIORef $ error "textNodeRef not yet initialized"
1345+ keyRef <- liftIO $ newIORef $ error "keyRef not yet initialized"
1346+ let
1347+ go Nothing _ = do
1348+ tn <- createTextNode doc ("" :: Text)
1349+ insertAfterPreviousNode tn
1350+ HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1351+ pure (tn, Nothing)
1352+ go (Just key0) mLastNode = do
1353+ parent <- askParent
1354+ maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
1355+ Nothing -> go Nothing Nothing
1356+ Just node -> DOM.castTo DOM.Comment node >>= \case
1357+ Just comment -> do
1358+ commentText <- fromMaybe (error "Cannot get text content of comment node") <$> Node.getTextContent comment
1359+ case T.stripPrefix (prefix <> key0) commentText of -- 'key0' may be @""@ in which case we're just finding the actual key; TODO: Don't be clever.
1360+ Just key -> do
1361+ -- Replace the comment with an (invisible) text node
1362+ tn <- createTextNode doc ("" :: Text)
1363+ Node.replaceChild_ parent tn comment
1364+ pure (tn, Just key)
1365+ Nothing -> do
1366+ go (Just key0) (Just node)
1367+ Nothing -> do
1368+ go (Just key0) (Just node)
1369+ switchComment = do
1370+ key0 <- liftIO $ readIORef key0Ref
1371+ (tn, key) <- go key0 =<< getPreviousNode
1372+ setPreviousNode $ Just $ toNode tn
1373+ liftIO $ do
1374+ writeIORef textNodeRef tn
1375+ writeIORef keyRef key
1376+ pure (switchComment, textNodeRef, keyRef)
1377+
1378+{-# INLINABLE skipToReplaceStart #-}
1379+skipToReplaceStart :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef (Maybe Text))
1380+skipToReplaceStart = skipToAndReplaceComment "replace-start" =<< liftIO (newIORef $ Just "") -- TODO: Don't rely on clever usage @""@ to make this work.
1381+
1382+{-# INLINABLE skipToReplaceEnd #-}
1383+skipToReplaceEnd :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => IORef (Maybe Text) -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text)
1384+skipToReplaceEnd key = fmap (\(m,e,_) -> (m,e)) $ skipToAndReplaceComment "replace-end" key
1385+
1386+instance SupportsHydrationDomBuilder t m => NotReady t (HydrationDomBuilderT s t m) where
1387+ notReadyUntil e = do
1388+ eOnce <- headE e
1389+ unreadyChildren <- askUnreadyChildren
1390+ commitAction <- askCommitAction
1391+ liftIO $ modifyIORef' unreadyChildren succ
1392+ let ready = do
1393+ old <- liftIO $ readIORef unreadyChildren
1394+ let new = pred old
1395+ liftIO $ writeIORef unreadyChildren $! new
1396+ when (new == 0) commitAction
1397+ requestDomAction_ $ ready <$ eOnce
1398+ notReady = do
1399+ unreadyChildren <- askUnreadyChildren
1400+ liftIO $ modifyIORef' unreadyChildren succ
1401+
1402+data HydrationDomSpace
1403+
1404+instance DomSpace HydrationDomSpace where
1405+ type EventSpec HydrationDomSpace = GhcjsEventSpec
1406+ type RawDocument HydrationDomSpace = DOM.Document
1407+ type RawTextNode HydrationDomSpace = ()
1408+ type RawCommentNode HydrationDomSpace = ()
1409+ type RawElement HydrationDomSpace = ()
1410+ type RawInputElement HydrationDomSpace = ()
1411+ type RawTextAreaElement HydrationDomSpace = ()
1412+ type RawSelectElement HydrationDomSpace = ()
1413+ addEventSpecFlags _ en f es = es
1414+ { _ghcjsEventSpec_filters =
1415+ let f' = Just . GhcjsEventFilter . \case
1416+ Nothing -> \evt -> do
1417+ mEventResult <- unGhcjsEventHandler (_ghcjsEventSpec_handler es) (en, evt)
1418+ return (f mEventResult, return mEventResult)
1419+ Just (GhcjsEventFilter oldFilter) -> \evt -> do
1420+ (oldFlags, oldContinuation) <- oldFilter evt
1421+ mEventResult <- oldContinuation
1422+ let newFlags = oldFlags <> f mEventResult
1423+ return (newFlags, return mEventResult)
1424+ in DMap.alter f' en $ _ghcjsEventSpec_filters es
1425+ }
1426+
1427+instance SupportsHydrationDomBuilder t m => DomBuilder t (HydrationDomBuilderT HydrationDomSpace t m) where
1428+ type DomBuilderSpace (HydrationDomBuilderT HydrationDomSpace t m) = HydrationDomSpace
1429+ {-# INLINABLE element #-}
1430+ element = elementInternal
1431+ {-# INLINABLE textNode #-}
1432+ textNode = textNodeInternal
1433+ {-# INLINABLE commentNode #-}
1434+ commentNode = commentNodeInternal
1435+ {-# INLINABLE inputElement #-}
1436+ inputElement = inputElementInternal
1437+ {-# INLINABLE textAreaElement #-}
1438+ textAreaElement = textAreaElementInternal
1439+ {-# INLINABLE selectElement #-}
1440+ selectElement = selectElementInternal
1441+ placeRawElement () = pure ()
1442+ wrapRawElement () _cfg = pure $ Element (EventSelector $ const never) ()
1443+
1444+instance SupportsHydrationDomBuilder t m => DomBuilder t (HydrationDomBuilderT GhcjsDomSpace t m) where
1445+ type DomBuilderSpace (HydrationDomBuilderT GhcjsDomSpace t m) = GhcjsDomSpace
1446+ {-# INLINABLE element #-}
1447+ element = elementImmediate
1448+ {-# INLINABLE textNode #-}
1449+ textNode = fmap TextNode . textNodeImmediate
1450+ {-# INLINABLE commentNode #-}
1451+ commentNode = fmap CommentNode . commentNodeImmediate
1452+ {-# INLINABLE inputElement #-}
1453+ inputElement = inputElementImmediate
1454+ {-# INLINABLE textAreaElement #-}
1455+ textAreaElement = textAreaElementImmediate
1456+ {-# INLINABLE selectElement #-}
1457+ selectElement = selectElementImmediate
1458+ placeRawElement = append . toNode
1459+ wrapRawElement e rawCfg = do
1460+ events <- askEvents
1461+ ctx <- askJSM
1462+ eventTriggerRefs <- wrap events e rawCfg
1463+ es <- newFanEventWithTrigger $ triggerBody ctx rawCfg events eventTriggerRefs e
1464+ pure $ Element es e
1465+
1466+data FragmentState
1467+ = FragmentState_Unmounted
1468+ | FragmentState_Mounted (DOM.Text, DOM.Text)
1469+
1470+data ImmediateDomFragment = ImmediateDomFragment
1471+ { _immediateDomFragment_document :: DOM.DocumentFragment
1472+ , _immediateDomFragment_state :: IORef FragmentState
1473+ }
1474+
1475+extractFragment :: MonadJSM m => ImmediateDomFragment -> m ()
1476+extractFragment fragment = do
1477+ state <- liftIO $ readIORef $ _immediateDomFragment_state fragment
1478+ case state of
1479+ FragmentState_Unmounted -> return ()
1480+ FragmentState_Mounted (before, after) -> do
1481+ extractBetweenExclusive (_immediateDomFragment_document fragment) before after
1482+ liftIO $ writeIORef (_immediateDomFragment_state fragment) FragmentState_Unmounted
1483+
1484+instance SupportsHydrationDomBuilder t m => MountableDomBuilder t (HydrationDomBuilderT GhcjsDomSpace t m) where
1485+ type DomFragment (HydrationDomBuilderT GhcjsDomSpace t m) = ImmediateDomFragment
1486+ buildDomFragment w = do
1487+ df <- createDocumentFragment =<< askDocument
1488+ result <- flip localEnv w $ \env -> env
1489+ { _hydrationDomBuilderEnv_parent = Left $ toNode df
1490+ }
1491+ state <- liftIO $ newIORef FragmentState_Unmounted
1492+ return (ImmediateDomFragment df state, result)
1493+ mountDomFragment fragment setFragment = do
1494+ parent <- getParent
1495+ extractFragment fragment
1496+ before <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
1497+ appendChild_ parent $ _immediateDomFragment_document fragment
1498+ after <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
1499+ xs <- foldDyn (\new (previous, _) -> (new, Just previous)) (fragment, Nothing) setFragment
1500+ requestDomAction_ $ ffor (updated xs) $ \(childFragment, Just previousFragment) -> do
1501+ extractFragment previousFragment
1502+ extractFragment childFragment
1503+ insertBefore (_immediateDomFragment_document childFragment) after
1504+ liftIO $ writeIORef (_immediateDomFragment_state childFragment) $ FragmentState_Mounted (before, after)
1505+ liftIO $ writeIORef (_immediateDomFragment_state fragment) $ FragmentState_Mounted (before, after)
1506+
1507+instance (Reflex t, Monad m, Adjustable t m, MonadHold t m, MonadFix m) => Adjustable t (DomRenderHookT t m) where
1508+ runWithReplace a0 a' = DomRenderHookT $ runWithReplace (unDomRenderHookT a0) (fmapCheap unDomRenderHookT a')
1509+ traverseIntMapWithKeyWithAdjust f m = DomRenderHookT . traverseIntMapWithKeyWithAdjust (\k -> unDomRenderHookT . f k) m
1510+ traverseDMapWithKeyWithAdjust f m = DomRenderHookT . traverseDMapWithKeyWithAdjust (\k -> unDomRenderHookT . f k) m
1511+ traverseDMapWithKeyWithAdjustWithMove f m = DomRenderHookT . traverseDMapWithKeyWithAdjustWithMove (\k -> unDomRenderHookT . f k) m
1512+
1513+instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => Adjustable t (HydrationDomBuilderT s t m) where
1514+ {-# INLINABLE runWithReplace #-}
5151515 runWithReplace a0 a' = do
516− initialEnv <- ImmediateDomBuilderT ask
517− before <- textNodeInternal ("" :: Text)
1516+ initialEnv <- HydrationDomBuilderT ask
1517+ let hydrating = _hydrationDomBuilderEnv_hydrationMode initialEnv
1518+ (hydrateStart, before, beforeKey) <- skipToReplaceStart
1519+ let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
1520+ haveEverBeenReady <- liftIO $ newIORef False
1521+ currentCohort <- liftIO $ newIORef (-1 :: Int) -- Equal to the cohort currently in the DOM
1522+ let myCommitAction = do
1523+ liftIO (readIORef haveEverBeenReady) >>= \case
1524+ True -> return ()
1525+ False -> do
1526+ liftIO $ writeIORef haveEverBeenReady True
1527+ old <- liftIO $ readIORef parentUnreadyChildren
1528+ let new = pred old
1529+ liftIO $ writeIORef parentUnreadyChildren $! new
1530+ when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
5181531 -- We draw 'after' in this roundabout way to avoid using MonadFix
519− after <- createTextNodeUnchecked (_immediateDomBuilderEnv_document initialEnv) ("" :: Text)
1532+ doc <- askDocument
1533+ parent <- getParent
1534+ (hydrateEnd, after) <- skipToReplaceEnd beforeKey
5201535 let drawInitialChild = do
521− result <- a0
522− append after
523− return result
524− (result0, result') <- ImmediateDomBuilderT $ lift $ runWithReplace (runReaderT (unImmediateDomBuilderT drawInitialChild) initialEnv) $ ffor a' $ \child -> do
525− df <- createDocumentFragmentUnchecked $ _immediateDomBuilderEnv_document initialEnv
526− result <- runReaderT (unImmediateDomBuilderT child) $ initialEnv
527− { _immediateDomBuilderEnv_parent = toNode df
528− }
529− let update = do
530− deleteBetweenExclusive before after
531− insertBefore df after
532− return (result, update)
533− requestDomAction_ $ snd <$> result'
534− return (result0, fst <$> result')
535− traverseDMapWithKeyWithAdjust (f :: forall a. k a -> v a -> ImmediateDomBuilderT t m (v' a)) (dm0 :: DMap k v) dm' = do
536− initialEnv <- ImmediateDomBuilderT ask
537− (children0, children') <- ImmediateDomBuilderT $ lift $ traverseDMapWithKeyWithAdjust (\k v -> drawChildUpdate initialEnv $ f k v) dm0 dm'
538− let result0 = DMap.map (\(Compose (_, _, v)) -> v) children0
539− placeholders0 = weakenDMapWith (\(Compose (_, ph, _)) -> ph) children0
540− result' = ffor children' $ mapPatchDMap $ \(Compose (_, _, r)) -> r
541− placeholders' = fforCheap children' $ weakenPatchDMapWith $ \(Compose (_, ph, _)) -> ph
542− placeholders <- current . incrementalToDynamic <$> holdIncremental placeholders0 placeholders'
543− _ <- DMap.traverseWithKey (\_ (Compose (df, _, _)) -> Constant () <$ append df) children0
544− lastPlaceholder <- textNodeInternal ("" :: Text)
545− requestDomAction_ $ flip push children' $ \(PatchDMap p) -> do
546− phs <- sample placeholders
547− if DMap.null p then return Nothing else return $ Just $ do
548− let g :: DSum k (ComposeMaybe (Compose ((,,) DOM.DocumentFragment DOM.Text) v')) -> JSM ()
549− g (k :=> ComposeMaybe mv) = do
550− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phs
551− forM_ (Map.lookup (Some.This k) phs) $ \thisPlaceholder -> thisPlaceholder `deleteUpTo` nextPlaceholder
552− forM_ mv $ \(Compose (df, _, _)) -> df `insertBefore` nextPlaceholder
553− mapM_ g $ DMap.toList p
554− return (result0, result')
555− traverseDMapWithKeyWithAdjustWithMove (f :: forall a. k a -> v a -> ImmediateDomBuilderT t m (v' a)) (dm0 :: DMap k v) dm' = do
556− initialEnv <- ImmediateDomBuilderT ask
557− (children0, children') <- ImmediateDomBuilderT $ lift $ traverseDMapWithKeyWithAdjustWithMove (\k v -> drawChildUpdate initialEnv $ f k v) dm0 dm'
558− let result0 = DMap.map (\(Compose (_, _, v)) -> v) children0
559− placeholders0 = weakenDMapWith (\(Compose (_, ph, _)) -> ph) children0
560− result' = ffor children' $ mapPatchDMapWithMove $ \(Compose (_, _, r)) -> r
561− placeholders' = fforCheap children' $ weakenPatchDMapWithMoveWith $ \(Compose (_, ph, _)) -> ph
562− placeholders <- current . incrementalToDynamic <$> holdIncremental placeholders0 placeholders'
563− _ <- DMap.traverseWithKey (\_ (Compose (df, _, _)) -> Constant () <$ append df) children0
564− lastPlaceholder <- textNodeInternal ("" :: Text)
565− requestDomAction_ $ flip push children' $ \p_ -> do
1536+ h <- liftIO $ readIORef hydrating
1537+ p' <- case h of
1538+ HydrationMode_Hydrating -> pure parent
1539+ HydrationMode_Immediate -> toNode <$> createDocumentFragment doc
1540+ unreadyChildren <- liftIO $ newIORef 0
1541+ let a0' = case h of
1542+ HydrationMode_Hydrating -> a0
1543+ HydrationMode_Immediate -> do
1544+ a <- a0
1545+ insertBefore p' =<< liftIO (readIORef after)
1546+ pure a
1547+ delayed <- case h of
1548+ HydrationMode_Hydrating -> liftIO $ newIORef $ pure ()
1549+ HydrationMode_Immediate -> pure $ _hydrationDomBuilderEnv_delayed initialEnv
1550+ result <- runReaderT (unHydrationDomBuilderT a0') initialEnv
1551+ { _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
1552+ , _hydrationDomBuilderEnv_commitAction = myCommitAction
1553+ , _hydrationDomBuilderEnv_parent = Left p'
1554+ , _hydrationDomBuilderEnv_delayed = delayed
1555+ }
1556+ dom <- case h of
1557+ HydrationMode_Hydrating -> liftIO $ readIORef delayed
1558+ HydrationMode_Immediate -> pure $ pure ()
1559+ liftIO $ readIORef unreadyChildren >>= \case
1560+ 0 -> writeIORef haveEverBeenReady True
1561+ _ -> modifyIORef' parentUnreadyChildren succ
1562+ return (dom, result)
1563+ a'' <- numberOccurrences a'
1564+ ((hydrate0, result0), child') <- HydrationDomBuilderT $ lift $ runWithReplace drawInitialChild $ ffor a'' $ \(cohortId, child) -> do
1565+ h <- liftIO $ readIORef hydrating
1566+ p' <- case h of
1567+ HydrationMode_Hydrating -> pure parent
1568+ HydrationMode_Immediate -> toNode <$> createDocumentFragment doc
1569+ unreadyChildren <- liftIO $ newIORef 0
1570+ let commitAction = do
1571+ c <- liftIO $ readIORef currentCohort
1572+ when (c <= cohortId) $ do -- If a newer cohort has already been committed, just ignore this
1573+ !before' <- liftIO $ readIORef before
1574+ !after' <- liftIO $ readIORef after
1575+ deleteBetweenExclusive before' after'
1576+ insertBefore p' after'
1577+ liftIO $ writeIORef currentCohort cohortId
1578+ myCommitAction
1579+ delayed <- case h of
1580+ HydrationMode_Hydrating -> liftIO $ newIORef $ pure ()
1581+ HydrationMode_Immediate -> pure $ _hydrationDomBuilderEnv_delayed initialEnv
1582+ result <- runReaderT (unHydrationDomBuilderT child) $ initialEnv
1583+ { _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
1584+ , _hydrationDomBuilderEnv_commitAction = case h of
1585+ HydrationMode_Hydrating -> myCommitAction
1586+ HydrationMode_Immediate -> commitAction
1587+ , _hydrationDomBuilderEnv_parent = Left p'
1588+ , _hydrationDomBuilderEnv_delayed = delayed
1589+ }
1590+ dom <- case h of
1591+ HydrationMode_Hydrating -> liftIO $ readIORef delayed
1592+ HydrationMode_Immediate -> pure $ pure ()
1593+ uc <- liftIO $ readIORef unreadyChildren
1594+ let commitActionToRunNow = if uc == 0
1595+ then Just $ commitAction
1596+ else Nothing -- A child will run it when unreadyChildren is decremented to 0
1597+ actions = case h of
1598+ HydrationMode_Hydrating -> Left dom
1599+ HydrationMode_Immediate -> Right commitActionToRunNow
1600+ return (actions, result)
1601+ let (hydrate', commitAction) = fanEither $ fmap fst child'
1602+ addHydrationStepWithSetup (hold hydrate0 hydrate') $ \contents -> do
1603+ hydrateStart
1604+ join $ sample contents
1605+ hydrateEnd
1606+ requestDomAction_ $ fmapMaybe id commitAction
1607+ return (result0, snd <$> child')
1608+
1609+ {-# INLINABLE traverseIntMapWithKeyWithAdjust #-}
1610+ traverseIntMapWithKeyWithAdjust = traverseIntMapWithKeyWithAdjust'
1611+ {-# INLINABLE traverseDMapWithKeyWithAdjust #-}
1612+ traverseDMapWithKeyWithAdjust = traverseDMapWithKeyWithAdjust'
1613+ {-# INLINABLE traverseDMapWithKeyWithAdjustWithMove #-}
1614+ traverseDMapWithKeyWithAdjustWithMove = do
1615+ let updateChildUnreadiness (p :: PatchDMapWithMove k (Compose (TraverseChild t m (Some k)) v')) old = do
1616+ let new :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> IO (PatchDMapWithMove.NodeInfo k (Constant (IORef (ChildReadyState (Some k)))) a)
1617+ new k = PatchDMapWithMove.nodeInfoMapFromM $ \case
1618+ PatchDMapWithMove.From_Insert (Compose (TraverseChild (Left _hydration) _)) -> return PatchDMapWithMove.From_Delete
1619+ PatchDMapWithMove.From_Insert (Compose (TraverseChild (Right immediate) _)) -> do
1620+ readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1621+ ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
1622+ ChildReadyState_Unready _ -> do
1623+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1624+ return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)
1625+ PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
1626+ PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
1627+ deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)
1628+ deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
1629+ writeIORef sRef $ ChildReadyState_Unready $ Some <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
1630+ return $ Constant ()
1631+ p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
1632+ _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
1633+ return $ applyAlways p' old
1634+ hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove updateChildUnreadiness $ \placeholders lastPlaceholder (p_ :: PatchDMapWithMove k (Compose (TraverseChild t m (Some k)) v')) -> do
5661635 let p = unPatchDMapWithMove p_
567− phsBefore <- sample placeholders
568− if DMap.null p then return Nothing else return $ Just $ do
569− let collectIfMoved :: forall a. k a -> DMapEdit k (Compose ((,,) DOM.DocumentFragment DOM.Text) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
570− collectIfMoved k e = do
571− let mThisPlaceholder = Map.lookup (Some.This k) phsBefore -- Will be Nothing if this element wasn't present before
572− nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phsBefore
573− case dmapEditMoved e of
574− False -> do
575− mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
576− return $ Constant Nothing
577− True -> do
578− Constant <$> mapM (`collectUpTo` nextPlaceholder) mThisPlaceholder
579− collected <- DMap.traverseWithKey collectIfMoved p
580− let phsAfter = fromMaybe phsBefore $ apply (weakenPatchDMapWithMoveWith (\(Compose (_, ph, _)) -> ph) p_) phsBefore --TODO: Don't recompute this
581− let placeFragment :: forall a. k a -> DMapEdit k (Compose ((,,) DOM.DocumentFragment DOM.Text) v') a -> JSM (Constant () a)
582− placeFragment k e = do
583− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some.This k) phsAfter
584− case e of
585− DMapEdit_Insert _ (Compose (df, _, _)) -> do
586− df `insertBefore` nextPlaceholder
587− DMapEdit_Delete _ -> do
588− return ()
589− DMapEdit_Move _ fromKey -> do
590− Just (Constant mdf) <- return $ DMap.lookup fromKey collected
591− mapM_ (`insertBefore` nextPlaceholder) mdf
1636+ phsBefore <- liftIO $ readIORef placeholders
1637+ let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
1638+ collectIfMoved k e = do
1639+ let mThisPlaceholder = Map.lookup (Some k) phsBefore -- Will be Nothing if this element wasn't present before
1640+ nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsBefore
1641+ case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
1642+ False -> do
1643+ mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
1644+ return $ Constant Nothing
1645+ True -> do
1646+ Constant <$> mapM (`collectUpTo` nextPlaceholder) mThisPlaceholder
1647+ collected <- DMap.traverseWithKey collectIfMoved p
1648+ let !phsAfter = fromMaybe phsBefore $ apply filtered phsBefore
1649+ weakened :: PatchMapWithMove (Some k) (Either (TraverseChildHydration t m) (TraverseChildImmediate (Some k)))
1650+ weakened = weakenPatchDMapWithMoveWith (_traverseChild_mode . getCompose) p_
1651+ filtered :: PatchMapWithMove (Some k) DOM.Text
1652+ filtered = PatchMapWithMove $ flip Map.mapMaybe (unPatchMapWithMove weakened) $ \(PatchMapWithMove.NodeInfo from to) -> flip PatchMapWithMove.NodeInfo to <$> case from of
1653+ PatchMapWithMove.From_Insert (Left _hydration) -> Nothing
1654+ PatchMapWithMove.From_Insert (Right immediate) -> Just $ PatchMapWithMove.From_Insert $ _traverseChildImmediate_placeholder immediate
1655+ PatchMapWithMove.From_Delete -> Just $ PatchMapWithMove.From_Delete
1656+ PatchMapWithMove.From_Move k -> Just $ PatchMapWithMove.From_Move k
1657+ let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant () a)
1658+ placeFragment k e = do
1659+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsAfter
1660+ case PatchDMapWithMove._nodeInfo_from e of
1661+ PatchDMapWithMove.From_Insert (Compose (TraverseChild x _)) -> case x of
1662+ Left _ -> pure ()
1663+ Right immediate -> _traverseChildImmediate_fragment immediate `insertBefore` nextPlaceholder
1664+ PatchDMapWithMove.From_Delete -> do
1665+ return ()
1666+ PatchDMapWithMove.From_Move fromKey -> do
1667+ Just (Constant mdf) <- return $ DMap.lookup fromKey collected
1668+ mapM_ (`insertBefore` nextPlaceholder) mdf
1669+ return $ Constant ()
1670+ mapM_ (\(k :=> v) -> void $ placeFragment k v) $ DMap.toDescList p -- We need to go in reverse order here, to make sure the placeholders are in the right spot at the right time
1671+ liftIO $ writeIORef placeholders $! phsAfter
1672+
1673+{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
1674+traverseDMapWithKeyWithAdjust'
1675+ :: forall s t m (k :: * -> *) v v'. (Adjustable t m, MonadHold t m, MonadFix m, MonadJSM m, PrimMonad m, GCompare k, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
1676+ => (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
1677+ -> DMap k v
1678+ -> Event t (PatchDMap k v)
1679+ -> HydrationDomBuilderT s t m (DMap k v', Event t (PatchDMap k v'))
1680+traverseDMapWithKeyWithAdjust' = do
1681+ let updateChildUnreadiness (p :: PatchDMap k (Compose (TraverseChild t m (Some k)) v')) old = do
1682+ let new :: forall a. k a -> ComposeMaybe (Compose (TraverseChild t m (Some k)) v') a -> IO (ComposeMaybe (Constant (IORef (ChildReadyState (Some k)))) a)
1683+ new k (ComposeMaybe m) = ComposeMaybe <$> case m of
1684+ Nothing -> return Nothing
1685+ Just (Compose (TraverseChild (Left _hydration) _)) -> pure Nothing
1686+ Just (Compose (TraverseChild (Right immediate) _)) -> do
1687+ readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1688+ ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
1689+ ChildReadyState_Unready _ -> do
1690+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1691+ return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
1692+ delete _ (Constant sRef) = do
1693+ writeIORef sRef $ ChildReadyState_Unready Nothing
5921694 return $ Constant ()
593− mapM_ (\(k :=> v) -> void $ placeFragment k v) $ DMap.toDescList p -- We need to go in reverse order here, to make sure the placeholders are in the right spot at the right time
594− return ()
595− return (result0, result')
596−
597−drawChildUpdate :: (MonadJSM m, PerformEvent t m, MonadFix m, MonadJSM (Performable m)) => ImmediateDomBuilderEnv t m -> ImmediateDomBuilderT t m (v' a) -> RequesterT t JSM Identity (TriggerEventT t m) (Compose ((,,) DOM.DocumentFragment DOM.Text) v' a)
598−drawChildUpdate initialEnv child = do
599− df <- createDocumentFragmentUnchecked $ _immediateDomBuilderEnv_document initialEnv
600− runReaderT (unImmediateDomBuilderT $ Compose <$> ((,,) <$> pure df <*> textNodeInternal ("" :: Text) <*> child)) $ initialEnv
601− { _immediateDomBuilderEnv_parent = toNode df
602− }
1695+ p' <- fmap PatchDMap $ DMap.traverseWithKey new $ unPatchDMap p
1696+ _ <- DMap.traverseWithKey delete $ PatchDMap.getDeletions p old
1697+ return $ applyAlways p' old
1698+ hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholder (PatchDMap patch) -> do
1699+ phs <- liftIO $ readIORef placeholders
1700+ forM_ (DMap.toList patch) $ \(k :=> ComposeMaybe mv) -> do
1701+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phs
1702+ -- Delete old node
1703+ forM_ (Map.lookup (Some k) phs) $ \thisPlaceholder -> do
1704+ thisPlaceholder `deleteUpTo` nextPlaceholder
1705+ -- Insert new node
1706+ forM_ mv $ \(Compose (TraverseChild e _)) -> case e of
1707+ Left _hydration -> pure ()
1708+ Right immediate -> do
1709+ _traverseChildImmediate_fragment immediate `insertBefore` nextPlaceholder
1710+ let weakened :: PatchMap (Some k) (Either (TraverseChildHydration t m) (TraverseChildImmediate (Some k)))
1711+ weakened = weakenPatchDMapWith (_traverseChild_mode . getCompose) $ PatchDMap patch
1712+ filtered :: PatchMap (Some k) DOM.Text
1713+ filtered = PatchMap $ flip Map.mapMaybe (unPatchMap weakened) $ \case
1714+ Nothing -> Just Nothing -- deletion
1715+ Just (Left _) -> Nothing
1716+ Just (Right immediate) -> Just $ Just $ _traverseChildImmediate_placeholder immediate
1717+ liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
1718+
1719+{-# INLINABLE traverseIntMapWithKeyWithAdjust' #-}
1720+traverseIntMapWithKeyWithAdjust'
1721+ :: forall s t m v v'. (Adjustable t m, MonadJSM m, MonadFix m, PrimMonad m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
1722+ => (IntMap.Key -> v -> HydrationDomBuilderT s t m v')
1723+ -> IntMap v
1724+ -> Event t (PatchIntMap v)
1725+ -> HydrationDomBuilderT s t m (IntMap v', Event t (PatchIntMap v'))
1726+traverseIntMapWithKeyWithAdjust' = do
1727+ let updateChildUnreadiness (p@(PatchIntMap pInner) :: PatchIntMap (TraverseChild t m Int v')) old = do
1728+ let new :: IntMap.Key -> Maybe (TraverseChild t m Int v') -> IO (Maybe (IORef (ChildReadyState Int)))
1729+ new k m = case m of
1730+ Nothing -> return Nothing
1731+ Just (TraverseChild (Left _hydration) _) -> pure Nothing
1732+ Just (TraverseChild (Right immediate) _) -> do
1733+ let sRef = _traverseChildImmediate_childReadyState immediate
1734+ readIORef sRef >>= \case
1735+ ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
1736+ ChildReadyState_Unready _ -> do
1737+ writeIORef sRef $ ChildReadyState_Unready $ Just k
1738+ return $ Just sRef
1739+ delete _ sRef = do
1740+ writeIORef sRef $ ChildReadyState_Unready Nothing
1741+ return ()
1742+ p' <- PatchIntMap <$> IntMap.traverseWithKey new pInner
1743+ _ <- IntMap.traverseWithKey delete $ FastMutableIntMap.getDeletions p old
1744+ return $ applyAlways p' old
1745+ hoistTraverseIntMapWithKeyWithAdjust traverseIntMapWithKeyWithAdjust updateChildUnreadiness $ \placeholders lastPlaceholder (PatchIntMap p) -> do
1746+ phs <- liftIO $ readIORef placeholders
1747+ forM_ (IntMap.toList p) $ \(k, mv) -> do
1748+ let nextPlaceholder = maybe lastPlaceholder snd $ IntMap.lookupGT k phs
1749+ -- Delete old node
1750+ forM_ (IntMap.lookup k phs) $ \thisPlaceholder -> thisPlaceholder `deleteUpTo` nextPlaceholder
1751+ -- Insert new node
1752+ forM_ mv $ \(TraverseChild e _) -> case e of
1753+ Left _hydration -> pure ()
1754+ Right immediate -> do
1755+ _traverseChildImmediate_fragment immediate `insertBefore` nextPlaceholder
1756+ let filtered :: PatchIntMap DOM.Text
1757+ filtered = PatchIntMap $ flip IntMap.mapMaybe p $ \case
1758+ Nothing -> Just Nothing -- deletion
1759+ Just tc
1760+ | Right immediate <- _traverseChild_mode tc -> Just $ Just $ _traverseChildImmediate_placeholder immediate
1761+ | otherwise -> Nothing
1762+ liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
1763+
1764+{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1765+ :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
1766+ -> IntMap v
1767+ -> Event DomTimeline (PatchIntMap v)
1768+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1769+ #-}
1770+
1771+{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1772+ :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
1773+ -> IntMap v
1774+ -> Event DomTimeline (PatchIntMap v)
1775+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1776+ #-}
1777+
1778+data ChildReadyState a
1779+ = ChildReadyState_Ready
1780+ | ChildReadyState_Unready !(Maybe a)
1781+ deriving (Show, Read, Eq, Ord)
1782+
1783+insertAfterPreviousNode :: (Monad m, MonadJSM m) => DOM.IsNode node => node -> HydrationRunnerT t m ()
1784+insertAfterPreviousNode node = do
1785+ parent <- askParent
1786+ nextNode <- maybe (Node.getFirstChild parent) Node.getNextSibling =<< getPreviousNode
1787+ Node.insertBefore_ parent node nextNode
1788+ setPreviousNode $ Just $ toNode node
1789+
1790+{-# INLINABLE hoistTraverseWithKeyWithAdjust #-}
1791+hoistTraverseWithKeyWithAdjust
1792+ ::
1793+ ( Adjustable t m
1794+ , MonadHold t m
1795+ , GCompare k
1796+ , MonadIO m
1797+ , MonadJSM m
1798+ , PrimMonad m
1799+ , MonadFix m
1800+ , Patch (p k v)
1801+ , Patch (p k (Constant Int))
1802+ , PatchTarget (p k (Constant Int)) ~ DMap k (Constant Int)
1803+ , Patch (p k (Compose (TraverseChild t m (Some k)) v'))
1804+ , PatchTarget (p k (Compose (TraverseChild t m (Some k)) v')) ~ DMap k (Compose (TraverseChild t m (Some k)) v')
1805+ , Monoid (p k (Compose (TraverseChild t m (Some k)) v'))
1806+ , RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document
1807+ )
1808+ => (forall vv vv'.
1809+ (forall a. k a -> vv a -> DomRenderHookT t m (vv' a))
1810+ -> DMap k vv
1811+ -> Event t (p k vv)
1812+ -> DomRenderHookT t m (DMap k vv', Event t (p k vv')))
1813+ -- ^ The base monad's traversal
1814+ -> (forall vv vv'. (forall a. vv a -> vv' a) -> p k vv -> p k vv')
1815+ -- ^ A way of mapping over the patch type
1816+ -> (p k (Compose (TraverseChild t m (Some k)) v') -> DMap k (Constant (IORef (ChildReadyState (Some k)))) -> IO (DMap k (Constant (IORef (ChildReadyState (Some k))))))
1817+ -- ^ Given a patch for the children DOM elements, produce a patch for the childrens' unreadiness state
1818+ -> (IORef (Map.Map (Some k) DOM.Text) -> DOM.Text -> p k (Compose (TraverseChild t m (Some k)) v') -> JSM ())
1819+ -- ^ Apply a patch to the DOM
1820+ -> (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
1821+ -> DMap k v
1822+ -> Event t (p k v)
1823+ -> HydrationDomBuilderT s t m (DMap k v', Event t (p k v'))
1824+hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpdate_ f dm0 dm' = do
1825+ doc <- askDocument
1826+ initialEnv <- HydrationDomBuilderT ask
1827+ let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
1828+ pendingChange :: IORef (DMap k (Constant (IORef (ChildReadyState (Some k)))), p k (Compose (TraverseChild t m (Some k)) v')) <- liftIO $ newIORef mempty
1829+ haveEverBeenReady <- liftIO $ newIORef False
1830+ placeholders <- liftIO $ newIORef Map.empty
1831+ lastPlaceholder <- createTextNode doc ("" :: Text)
1832+ let applyDomUpdate p = do
1833+ applyDomUpdate_ placeholders lastPlaceholder p
1834+ markSelfReady
1835+ liftIO $ writeIORef pendingChange $! mempty
1836+ markSelfReady = do
1837+ liftIO (readIORef haveEverBeenReady) >>= \case
1838+ True -> return ()
1839+ False -> do
1840+ liftIO $ writeIORef haveEverBeenReady True
1841+ old <- liftIO $ readIORef parentUnreadyChildren
1842+ let new = pred old
1843+ liftIO $ writeIORef parentUnreadyChildren $! new
1844+ when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
1845+ markChildReady :: IORef (ChildReadyState (Some k)) -> JSM ()
1846+ markChildReady childReadyState = do
1847+ liftIO (readIORef childReadyState) >>= \case
1848+ ChildReadyState_Ready -> return ()
1849+ ChildReadyState_Unready countedAt -> do
1850+ liftIO $ writeIORef childReadyState ChildReadyState_Ready
1851+ case countedAt of
1852+ Nothing -> return ()
1853+ Just (Some k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
1854+ (oldUnready, p) <- liftIO $ readIORef pendingChange
1855+ when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
1856+ let newUnready = DMap.delete k oldUnready
1857+ liftIO $ writeIORef pendingChange (newUnready, p)
1858+ when (DMap.null newUnready) $ do
1859+ applyDomUpdate p
1860+ (children0 :: DMap k (Compose (TraverseChild t m (Some k)) v'), children' :: Event t (p k (Compose (TraverseChild t m (Some k)) v')))
1861+ <- HydrationDomBuilderT $ lift $ base (\k v -> drawChildUpdate initialEnv markChildReady $ f k v) dm0 dm'
1862+ let processChild k (Compose (TraverseChild e _)) = case e of
1863+ Left _ -> pure $ ComposeMaybe Nothing
1864+ Right immediate -> ComposeMaybe <$> do
1865+ readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1866+ ChildReadyState_Ready -> return Nothing
1867+ ChildReadyState_Unready _ -> do
1868+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1869+ return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
1870+ initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
1871+ liftIO $ if DMap.null initialUnready
1872+ then writeIORef haveEverBeenReady True
1873+ else do
1874+ modifyIORef' parentUnreadyChildren succ
1875+ writeIORef pendingChange (initialUnready, mempty) -- The patch is always empty because it got applied implicitly when we ran the children the first time
1876+ getHydrationMode >>= \case
1877+ HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
1878+ dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children
1879+ phs <- sequenceA $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
1880+ liftIO $ writeIORef placeholders $! phs
1881+ insertAfterPreviousNode lastPlaceholder
1882+ HydrationMode_Immediate -> do
1883+ let activate i = do
1884+ append $ toNode $ _traverseChildImmediate_fragment i
1885+ pure $ _traverseChildImmediate_placeholder i
1886+ phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
1887+ liftIO $ writeIORef placeholders $! phs
1888+ append $ toNode lastPlaceholder
1889+ requestDomAction_ $ ffor children' $ \p -> do
1890+ (oldUnready, oldP) <- liftIO $ readIORef pendingChange
1891+ newUnready <- liftIO $ updateChildUnreadiness p oldUnready
1892+ let !newP = p <> oldP
1893+ liftIO $ writeIORef pendingChange (newUnready, newP)
1894+ when (DMap.null newUnready) $ do
1895+ applyDomUpdate newP
1896+ let result0 = DMap.map (_traverseChild_result . getCompose) children0
1897+ result' = ffor children' $ mapPatch $ _traverseChild_result . getCompose
1898+ return (result0, result')
1899+
1900+{-# INLINE hoistTraverseIntMapWithKeyWithAdjust #-}
1901+hoistTraverseIntMapWithKeyWithAdjust ::
1902+ ( Adjustable t m
1903+ , MonadHold t m
1904+ , MonadJSM m
1905+ , MonadFix m
1906+ , PrimMonad m
1907+ , Monoid (p (TraverseChild t m Int v'))
1908+ , Functor p
1909+ , PatchTarget (p (HydrationRunnerT t m ())) ~ IntMap (HydrationRunnerT t m ())
1910+ , PatchTarget (p (TraverseChild t m Int v')) ~ IntMap (TraverseChild t m Int v')
1911+ , Patch (p (HydrationRunnerT t m ()))
1912+ , Patch (p (TraverseChild t m Int v'))
1913+ , RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document
1914+ )
1915+ => ((IntMap.Key -> v -> DomRenderHookT t m (TraverseChild t m Int v'))
1916+ -> IntMap v
1917+ -> Event t (p v)
1918+ -> DomRenderHookT t m (IntMap (TraverseChild t m Int v'), Event t (p (TraverseChild t m Int v'))))
1919+ -- ^ The base monad's traversal
1920+ -> (p (TraverseChild t m Int v')
1921+ -> IntMap (IORef (ChildReadyState Int))
1922+ -> IO (IntMap (IORef (ChildReadyState Int))))
1923+ -- ^ Given a patch for the children DOM elements, produce a patch for the childrens' unreadiness state
1924+ -> (IORef (IntMap DOM.Text)
1925+ -> DOM.Text
1926+ -> p (TraverseChild t m Int v')
1927+ -> JSM ())
1928+ -- ^ Apply a patch to the DOM
1929+ -> (IntMap.Key -> v -> HydrationDomBuilderT s t m v')
1930+ -> IntMap v
1931+ -> Event t (p v)
1932+ -> HydrationDomBuilderT s t m (IntMap v', Event t (p v'))
1933+hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_ f dm0 dm' = do
1934+ doc <- askDocument
1935+ initialEnv <- HydrationDomBuilderT ask
1936+ let parentUnreadyChildren = _hydrationDomBuilderEnv_unreadyChildren initialEnv
1937+ pendingChange :: IORef (IntMap (IORef (ChildReadyState Int)), p (TraverseChild t m Int v')) <- liftIO $ newIORef mempty
1938+ haveEverBeenReady <- liftIO $ newIORef False
1939+ placeholders <- liftIO $ newIORef IntMap.empty
1940+ lastPlaceholder <- createTextNode doc ("" :: Text)
1941+ let applyDomUpdate p = do
1942+ applyDomUpdate_ placeholders lastPlaceholder p
1943+ markSelfReady
1944+ liftIO $ writeIORef pendingChange $! mempty
1945+ markSelfReady = do
1946+ liftIO (readIORef haveEverBeenReady) >>= \case
1947+ True -> return ()
1948+ False -> do
1949+ liftIO $ writeIORef haveEverBeenReady True
1950+ old <- liftIO $ readIORef parentUnreadyChildren
1951+ let new = pred old
1952+ liftIO $ writeIORef parentUnreadyChildren $! new
1953+ when (new == 0) $ _hydrationDomBuilderEnv_commitAction initialEnv
1954+ markChildReady :: IORef (ChildReadyState Int) -> JSM ()
1955+ markChildReady childReadyState = do
1956+ liftIO (readIORef childReadyState) >>= \case
1957+ ChildReadyState_Ready -> return ()
1958+ ChildReadyState_Unready countedAt -> do
1959+ liftIO $ writeIORef childReadyState ChildReadyState_Ready
1960+ case countedAt of
1961+ Nothing -> return ()
1962+ Just k -> do -- This child has been counted as unready, so we need to remove it from the unready set
1963+ (oldUnready, p) <- liftIO $ readIORef pendingChange
1964+ when (not $ IntMap.null oldUnready) $ do -- This shouldn't actually ever be null
1965+ let newUnready = IntMap.delete k oldUnready
1966+ liftIO $ writeIORef pendingChange (newUnready, p)
1967+ when (IntMap.null newUnready) $ do
1968+ applyDomUpdate p
1969+ (children0 :: IntMap (TraverseChild t m Int v'), children' :: Event t (p (TraverseChild t m Int v')))
1970+ <- HydrationDomBuilderT $ lift $ base (\k v -> drawChildUpdateInt initialEnv markChildReady $ f k v) dm0 dm'
1971+ let processChild k (TraverseChild e _) = case e of
1972+ Left _ -> pure Nothing
1973+ Right immediate -> do
1974+ readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1975+ ChildReadyState_Ready -> return Nothing
1976+ ChildReadyState_Unready _ -> do
1977+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just k
1978+ return $ Just (_traverseChildImmediate_childReadyState immediate)
1979+ initialUnready <- liftIO $ IntMap.mapMaybe id <$> IntMap.traverseWithKey processChild children0
1980+ liftIO $ if IntMap.null initialUnready
1981+ then writeIORef haveEverBeenReady True
1982+ else do
1983+ modifyIORef' parentUnreadyChildren succ
1984+ writeIORef pendingChange (initialUnready, mempty) -- The patch is always empty because it got applied implicitly when we ran the children the first time
1985+ getHydrationMode >>= \case
1986+ HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
1987+ dm :: IntMap (TraverseChild t m Int v') <- sample $ currentIncremental children
1988+ phs <- traverse (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode) dm
1989+ liftIO $ writeIORef placeholders $! phs
1990+ insertAfterPreviousNode lastPlaceholder
1991+ HydrationMode_Immediate -> do
1992+ let activate i = do
1993+ append $ toNode $ _traverseChildImmediate_fragment i
1994+ pure $ _traverseChildImmediate_placeholder i
1995+ phs <- traverse (either (error "impossible") activate . _traverseChild_mode) children0
1996+ liftIO $ writeIORef placeholders $! phs
1997+ append $ toNode lastPlaceholder
1998+ requestDomAction_ $ ffor children' $ \p -> do
1999+ (oldUnready, oldP) <- liftIO $ readIORef pendingChange
2000+ newUnready <- liftIO $ updateChildUnreadiness p oldUnready
2001+ let !newP = p <> oldP
2002+ liftIO $ writeIORef pendingChange (newUnready, newP)
2003+ when (IntMap.null newUnready) $ do
2004+ applyDomUpdate newP
2005+ let result0 = IntMap.map _traverseChild_result children0
2006+ result' = ffor children' $ fmap $ _traverseChild_result
2007+ return (result0, result')
2008+
2009+{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2010+ :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
2011+ -> IntMap v
2012+ -> Event DomTimeline (PatchIntMap v)
2013+ -> DomRenderHookT DomTimeline HydrationM (IntMap (TraverseChild DomTimeline HydrationM Int v'), Event DomTimeline (PatchIntMap (TraverseChild DomTimeline HydrationM Int v'))))
2014+ -> (PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
2015+ -> IntMap (IORef (ChildReadyState Int))
2016+ -> IO (IntMap (IORef (ChildReadyState Int))))
2017+ -> (IORef (IntMap DOM.Text)
2018+ -> DOM.Text
2019+ -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
2020+ -> JSM ())
2021+ -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
2022+ -> IntMap v
2023+ -> Event DomTimeline (PatchIntMap v)
2024+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
2025+ #-}
2026+
2027+{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2028+ :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
2029+ -> IntMap v
2030+ -> Event DomTimeline (PatchIntMap v)
2031+ -> DomRenderHookT DomTimeline HydrationM (IntMap (TraverseChild DomTimeline HydrationM Int v'), Event DomTimeline (PatchIntMap (TraverseChild DomTimeline HydrationM Int v'))))
2032+ -> (PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
2033+ -> IntMap (IORef (ChildReadyState Int))
2034+ -> IO (IntMap (IORef (ChildReadyState Int))))
2035+ -> (IORef (IntMap DOM.Text)
2036+ -> DOM.Text
2037+ -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
2038+ -> JSM ())
2039+ -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
2040+ -> IntMap v
2041+ -> Event DomTimeline (PatchIntMap v)
2042+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
2043+ #-}
2044+
2045+data TraverseChildImmediate k = TraverseChildImmediate
2046+ { _traverseChildImmediate_fragment :: {-# UNPACK #-} !DOM.DocumentFragment
2047+ -- ^ Child is appended to this fragment
2048+ , _traverseChildImmediate_placeholder :: {-# UNPACK #-} !DOM.Text
2049+ -- ^ Placeholder reference
2050+ , _traverseChildImmediate_childReadyState :: {-# UNPACK #-} !(IORef (ChildReadyState k))
2051+ }
2052+
2053+newtype TraverseChildHydration t m = TraverseChildHydration
2054+ { _traverseChildHydration_delayed :: HydrationRunnerT t m DOM.Text
2055+ -- ^ Action to run at switchover, returns the placeholder
2056+ }
2057+
2058+data TraverseChild t m k a = TraverseChild
2059+ { _traverseChild_mode :: !(Either (TraverseChildHydration t m) (TraverseChildImmediate k))
2060+ , _traverseChild_result :: !a
2061+ } deriving Functor
2062+
2063+{-# INLINABLE drawChildUpdate #-}
2064+drawChildUpdate :: (MonadJSM m, Reflex t)
2065+ => HydrationDomBuilderEnv t m
2066+ -> (IORef (ChildReadyState k) -> JSM ()) -- This will NOT be called if the child is ready at initialization time; instead, the ChildReadyState return value will be ChildReadyState_Ready
2067+ -> HydrationDomBuilderT s t m (f a)
2068+ -> DomRenderHookT t m (Compose (TraverseChild t m k) f a)
2069+drawChildUpdate initialEnv markReady child = do
2070+ let doc = _hydrationDomBuilderEnv_document initialEnv
2071+ unreadyChildren <- liftIO $ newIORef 0
2072+ liftIO (readIORef $ _hydrationDomBuilderEnv_hydrationMode initialEnv) >>= \case
2073+ HydrationMode_Hydrating -> do
2074+ childDelayedRef <- liftIO $ newIORef $ pure ()
2075+ result <- runReaderT (unHydrationDomBuilderT child) initialEnv
2076+ { _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
2077+ , _hydrationDomBuilderEnv_delayed = childDelayedRef
2078+ }
2079+ childDelayed <- liftIO $ readIORef childDelayedRef
2080+ return $ Compose $ TraverseChild
2081+ { _traverseChild_result = result
2082+ , _traverseChild_mode = Left TraverseChildHydration
2083+ { _traverseChildHydration_delayed = do
2084+ placeholder <- createTextNode doc ("" :: Text)
2085+ insertAfterPreviousNode placeholder
2086+ childDelayed
2087+ pure placeholder
2088+ }
2089+ }
2090+ HydrationMode_Immediate -> do
2091+ childReadyState <- liftIO $ newIORef $ ChildReadyState_Unready Nothing
2092+ df <- createDocumentFragment doc
2093+ placeholder <- createTextNode doc ("" :: Text)
2094+ Node.appendChild_ df placeholder
2095+ result <- runReaderT (unHydrationDomBuilderT child) initialEnv
2096+ { _hydrationDomBuilderEnv_parent = Left $ toNode df
2097+ , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
2098+ , _hydrationDomBuilderEnv_commitAction = markReady childReadyState
2099+ }
2100+ u <- liftIO $ readIORef unreadyChildren
2101+ when (u == 0) $ liftIO $ writeIORef childReadyState ChildReadyState_Ready
2102+ return $ Compose $ TraverseChild
2103+ { _traverseChild_result = result
2104+ , _traverseChild_mode = Right TraverseChildImmediate
2105+ { _traverseChildImmediate_fragment = df
2106+ , _traverseChildImmediate_placeholder = placeholder
2107+ , _traverseChildImmediate_childReadyState = childReadyState
2108+ }
2109+ }
6032110
604−mkHasFocus :: (MonadHold t m, Reflex t) => Element er d t -> m (Dynamic t Bool)
2111+{-# SPECIALIZE drawChildUpdate
2112+ :: HydrationDomBuilderEnv DomTimeline HydrationM
2113+ -> (IORef (ChildReadyState Int) -> JSM ())
2114+ -> HydrationDomBuilderT s DomTimeline HydrationM (Identity a)
2115+ -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM Int) Identity a)
2116+ #-}
2117+
2118+{-# SPECIALIZE drawChildUpdate
2119+ :: HydrationDomBuilderEnv DomTimeline HydrationM
2120+ -> (IORef (ChildReadyState (Some k)) -> JSM ())
2121+ -> HydrationDomBuilderT s DomTimeline HydrationM (f a)
2122+ -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM (Some k)) f a)
2123+ #-}
2124+
2125+{-# INLINABLE drawChildUpdateInt #-}
2126+drawChildUpdateInt :: (MonadIO m, MonadJSM m, Reflex t)
2127+ => HydrationDomBuilderEnv t m
2128+ -> (IORef (ChildReadyState k) -> JSM ())
2129+ -> HydrationDomBuilderT s t m v
2130+ -> DomRenderHookT t m (TraverseChild t m k v)
2131+drawChildUpdateInt env mark m = fmap runIdentity . getCompose <$> drawChildUpdate env mark (Identity <$> m)
2132+
2133+{-# SPECIALIZE drawChildUpdateInt
2134+ :: HydrationDomBuilderEnv DomTimeline HydrationM
2135+ -> (IORef (ChildReadyState k) -> JSM ())
2136+ -> HydrationDomBuilderT s DomTimeline HydrationM v
2137+ -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM k v)
2138+ #-}
2139+
2140+{-# INLINE mkHasFocus #-}
2141+mkHasFocus
2142+ :: (HasDocument m, MonadJSM m, IsNode (RawElement d), MonadHold t m, Reflex t, DOM.IsDocumentOrShadowRoot (RawDocument (DomBuilderSpace m)))
2143+ => Element er d t -> m (Dynamic t Bool)
6052144mkHasFocus e = do
606− let initialFocus = False --TODO: Actually get the initial focus of the element
2145+ doc <- askDocument
2146+ initialFocus <- Node.isSameNode (toNode $ _element_raw e) . fmap toNode =<< Document.getActiveElement doc
6072147 holdDyn initialFocus $ leftmost
6082148 [ False <$ Reflex.select (_element_events e) (WrapArg Blur)
6092149 , True <$ Reflex.select (_element_events e) (WrapArg Focus)
@@ -612,39 +2152,49 @@ mkHasFocus e = do
6122152insertBefore :: (MonadJSM m, IsNode new, IsNode existing) => new -> existing -> m ()
6132153insertBefore new existing = do
6142154 p <- getParentNodeUnchecked existing
615− DOM.insertBefore_ p (Just new) (Just existing) -- If there's no parent, that means we've been removed from the DOM; this should not happen if the we're removing ourselves from the performEvent properly
2155+ Node.insertBefore_ p new (Just existing) -- If there's no parent, that means we've been removed from the DOM; this should not happen if the we're removing ourselves from the performEvent properly
2156+
2157+type ImmediateDomBuilderT = HydrationDomBuilderT GhcjsDomSpace
6162158
617−instance PerformEvent t m => PerformEvent t (ImmediateDomBuilderT t m) where
618− type Performable (ImmediateDomBuilderT t m) = Performable m
2159+instance PerformEvent t m => PerformEvent t (HydrationDomBuilderT s t m) where
2160+ type Performable (HydrationDomBuilderT s t m) = Performable m
6192161 {-# INLINABLE performEvent_ #-}
6202162 performEvent_ e = lift $ performEvent_ e
6212163 {-# INLINABLE performEvent #-}
6222164 performEvent e = lift $ performEvent e
6232165
624−instance PostBuild t m => PostBuild t (ImmediateDomBuilderT t m) where
2166+instance PostBuild t m => PostBuild t (HydrationDomBuilderT s t m) where
6252167 {-# INLINABLE getPostBuild #-}
6262168 getPostBuild = lift getPostBuild
6272169
628−instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (ImmediateDomBuilderT t m) where
2170+instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationDomBuilderT s t m) where
6292171 {-# INLINABLE newEventWithTrigger #-}
6302172 newEventWithTrigger = lift . newEventWithTrigger
6312173 {-# INLINABLE newFanEventWithTrigger #-}
6322174 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
6332175
634−instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (ImmediateDomBuilderT t m) where
2176+instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (HydrationDomBuilderT s t m) where
2177+ {-# INLINABLE newTriggerEvent #-}
2178+ newTriggerEvent = HydrationDomBuilderT . lift $ newTriggerEvent
2179+ {-# INLINABLE newTriggerEventWithOnComplete #-}
2180+ newTriggerEventWithOnComplete = HydrationDomBuilderT . lift $ newTriggerEventWithOnComplete
2181+ {-# INLINABLE newEventWithLazyTriggerWithOnComplete #-}
2182+ newEventWithLazyTriggerWithOnComplete f = HydrationDomBuilderT . lift $ newEventWithLazyTriggerWithOnComplete f
2183+
2184+instance (Monad m, MonadRef m, Ref m ~ Ref IO, MonadReflexCreateTrigger t m) => TriggerEvent t (DomRenderHookT t m) where
6352185 {-# INLINABLE newTriggerEvent #-}
636− newTriggerEvent = ImmediateDomBuilderT . lift . lift $ newTriggerEvent
2186+ newTriggerEvent = DomRenderHookT . lift $ newTriggerEvent
6372187 {-# INLINABLE newTriggerEventWithOnComplete #-}
638− newTriggerEventWithOnComplete = ImmediateDomBuilderT . lift . lift $ newTriggerEventWithOnComplete
2188+ newTriggerEventWithOnComplete = DomRenderHookT . lift $ newTriggerEventWithOnComplete
6392189 {-# INLINABLE newEventWithLazyTriggerWithOnComplete #-}
640− newEventWithLazyTriggerWithOnComplete f = ImmediateDomBuilderT . lift . lift $ newEventWithLazyTriggerWithOnComplete f
2190+ newEventWithLazyTriggerWithOnComplete f = DomRenderHookT . lift $ newEventWithLazyTriggerWithOnComplete f
6412191
642−instance HasJSContext m => HasJSContext (ImmediateDomBuilderT t m) where
643− type JSContextPhantom (ImmediateDomBuilderT t m) = JSContextPhantom m
2192+instance HasJSContext m => HasJSContext (HydrationDomBuilderT s t m) where
2193+ type JSContextPhantom (HydrationDomBuilderT s t m) = JSContextPhantom m
6442194 askJSContext = lift askJSContext
6452195
646−instance MonadRef m => MonadRef (ImmediateDomBuilderT t m) where
647− type Ref (ImmediateDomBuilderT t m) = Ref m
2196+instance MonadRef m => MonadRef (HydrationDomBuilderT s t m) where
2197+ type Ref (HydrationDomBuilderT s t m) = Ref m
6482198 {-# INLINABLE newRef #-}
6492199 newRef = lift . newRef
6502200 {-# INLINABLE readRef #-}
@@ -652,12 +2202,12 @@ instance MonadRef m => MonadRef (ImmediateDomBuilderT t m) where
6522202 {-# INLINABLE writeRef #-}
6532203 writeRef r = lift . writeRef r
6542204
655−instance MonadAtomicRef m => MonadAtomicRef (ImmediateDomBuilderT t m) where
2205+instance MonadAtomicRef m => MonadAtomicRef (HydrationDomBuilderT s t m) where
6562206 {-# INLINABLE atomicModifyRef #-}
6572207 atomicModifyRef r = lift . atomicModifyRef r
6582208
659−instance (HasJS x m, ReflexHost t) => HasJS x (ImmediateDomBuilderT t m) where
660− type JSX (ImmediateDomBuilderT t m) = JSX m
2209+instance (HasJS x m, ReflexHost t) => HasJS x (HydrationDomBuilderT s t m) where
2210+ type JSX (HydrationDomBuilderT s t m) = JSX m
6612211 liftJS = lift . liftJS
6622212
6632213type family EventType en where
@@ -694,12 +2244,12 @@ type family EventType en where
6942244 EventType 'SelectTag = UIEvent
6952245 EventType 'SubmitTag = DOM.Event
6962246 EventType 'WheelTag = WheelEvent
697− EventType 'BeforecutTag = DOM.Event
698− EventType 'CutTag = DOM.Event
699− EventType 'BeforecopyTag = DOM.Event
700− EventType 'CopyTag = DOM.Event
701− EventType 'BeforepasteTag = DOM.Event
702− EventType 'PasteTag = DOM.Event
2247+ EventType 'BeforecutTag = ClipboardEvent
2248+ EventType 'CutTag = ClipboardEvent
2249+ EventType 'BeforecopyTag = ClipboardEvent
2250+ EventType 'CopyTag = ClipboardEvent
2251+ EventType 'BeforepasteTag = ClipboardEvent
2252+ EventType 'PasteTag = ClipboardEvent
7032253 EventType 'ResetTag = DOM.Event
7042254 EventType 'SearchTag = DOM.Event
7052255 EventType 'SelectstartTag = DOM.Event
@@ -714,7 +2264,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
7142264 Click -> return ()
7152265 Dblclick -> getMouseEventCoords
7162266 Keypress -> getKeyEvent
717− Scroll -> getScrollTop e
2267+ Scroll -> fromIntegral <$> getScrollTop e
7182268 Keydown -> getKeyEvent
7192269 Keyup -> getKeyEvent
7202270 Mousemove -> getMouseEventCoords
@@ -747,7 +2297,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
7472297 Beforecopy -> return ()
7482298 Copy -> return ()
7492299 Beforepaste -> return ()
750− Paste -> return ()
2300+ Paste -> getPasteData
7512301 Reset -> return ()
7522302 Search -> return ()
7532303 Selectstart -> return ()
@@ -756,7 +2306,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
7562306 Touchend -> getTouchEvent
7572307 Touchcancel -> getTouchEvent
7582308 Mousewheel -> return ()
759− Wheel -> return ()
2309+ Wheel -> getWheelEvent
7602310
7612311{-# INLINABLE defaultDomWindowEventHandler #-}
7622312defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
@@ -797,7 +2347,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
7972347 Beforecopy -> return ()
7982348 Copy -> return ()
7992349 Beforepaste -> return ()
800− Paste -> return ()
2350+ Paste -> getPasteData
8012351 Reset -> return ()
8022352 Search -> return ()
8032353 Selectstart -> return ()
@@ -806,7 +2356,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
8062356 Touchend -> getTouchEvent
8072357 Touchcancel -> getTouchEvent
8082358 Mousewheel -> return ()
809− Wheel -> return ()
2359+ Wheel -> getWheelEvent
8102360
8112361{-# INLINABLE withIsEvent #-}
8122362withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
@@ -907,105 +2457,114 @@ showEventName en = case en of
9072457 Touchend -> "Touchend"
9082458 Touchcancel -> "Touchcancel"
9092459
2460+--TODO: Get rid of this hack
2461+-- ElementEventTarget is here to allow us to treat SVG and HTML elements as the same thing; without it, we'll break any existing SVG code.
2462+newtype ElementEventTarget = ElementEventTarget DOM.Element deriving (DOM.IsGObject, DOM.ToJSVal, DOM.IsSlotable, DOM.IsParentNode, DOM.IsNonDocumentTypeChildNode, DOM.IsChildNode, DOM.IsAnimatable, IsNode, IsElement)
2463+instance DOM.FromJSVal ElementEventTarget where
2464+ fromJSVal = fmap (fmap ElementEventTarget) . DOM.fromJSVal
2465+instance DOM.IsEventTarget ElementEventTarget
2466+instance DOM.IsGlobalEventHandlers ElementEventTarget
2467+instance DOM.IsDocumentAndElementEventHandlers ElementEventTarget
2468+
9102469{-# INLINABLE elementOnEventName #-}
9112470elementOnEventName :: IsElement e => EventName en -> e -> EventM e (EventType en) () -> JSM (JSM ())
912−elementOnEventName en e = case en of
913− Abort -> on e Element.abort
914− Blur -> on e Element.blurEvent
915− Change -> on e Element.change
916− Click -> on e Element.click
917− Contextmenu -> on e Element.contextMenu
918− Dblclick -> on e Element.dblClick
919− Drag -> on e Element.drag
920− Dragend -> on e Element.dragEnd
921− Dragenter -> on e Element.dragEnter
922− Dragleave -> on e Element.dragLeave
923− Dragover -> on e Element.dragOver
924− Dragstart -> on e Element.dragStart
925− Drop -> on e Element.drop
926− Error -> on e Element.error
927− Focus -> on e Element.focusEvent
928− Input -> on e Element.input
929− Invalid -> on e Element.invalid
930− Keydown -> on e Element.keyDown
931− Keypress -> on e Element.keyPress
932− Keyup -> on e Element.keyUp
933− Load -> on e Element.load
934− Mousedown -> on e Element.mouseDown
935− Mouseenter -> on e Element.mouseEnter
936− Mouseleave -> on e Element.mouseLeave
937− Mousemove -> on e Element.mouseMove
938− Mouseout -> on e Element.mouseOut
939− Mouseover -> on e Element.mouseOver
940− Mouseup -> on e Element.mouseUp
941− Mousewheel -> on e Element.mouseWheel
942− Scroll -> on e Element.scroll
943− Select -> on e Element.select
944− Submit -> on e Element.submit
945− Wheel -> on e Element.wheel
946− Beforecut -> on e Element.beforeCut
947− Cut -> on e Element.cut
948− Beforecopy -> on e Element.beforeCopy
949− Copy -> on e Element.copy
950− Beforepaste -> on e Element.beforePaste
951− Paste -> on e Element.paste
952− Reset -> on e Element.reset
953− Search -> on e Element.search
2471+elementOnEventName en e_ = let e = ElementEventTarget (DOM.toElement e_) in case en of
2472+ Abort -> on e Events.abort
2473+ Blur -> on e Events.blur
2474+ Change -> on e Events.change
2475+ Click -> on e Events.click
2476+ Contextmenu -> on e Events.contextMenu
2477+ Dblclick -> on e Events.dblClick
2478+ Drag -> on e Events.drag
2479+ Dragend -> on e Events.dragEnd
2480+ Dragenter -> on e Events.dragEnter
2481+ Dragleave -> on e Events.dragLeave
2482+ Dragover -> on e Events.dragOver
2483+ Dragstart -> on e Events.dragStart
2484+ Drop -> on e Events.drop
2485+ Error -> on e Events.error
2486+ Focus -> on e Events.focus
2487+ Input -> on e Events.input
2488+ Invalid -> on e Events.invalid
2489+ Keydown -> on e Events.keyDown
2490+ Keypress -> on e Events.keyPress
2491+ Keyup -> on e Events.keyUp
2492+ Load -> on e Events.load
2493+ Mousedown -> on e Events.mouseDown
2494+ Mouseenter -> on e Events.mouseEnter
2495+ Mouseleave -> on e Events.mouseLeave
2496+ Mousemove -> on e Events.mouseMove
2497+ Mouseout -> on e Events.mouseOut
2498+ Mouseover -> on e Events.mouseOver
2499+ Mouseup -> on e Events.mouseUp
2500+ Mousewheel -> on e Events.mouseWheel
2501+ Scroll -> on e Events.scroll
2502+ Select -> on e Events.select
2503+ Submit -> on e Events.submit
2504+ Wheel -> on e Events.wheel
2505+ Beforecut -> on e Events.beforeCut
2506+ Cut -> on e Events.cut
2507+ Beforecopy -> on e Events.beforeCopy
2508+ Copy -> on e Events.copy
2509+ Beforepaste -> on e Events.beforePaste
2510+ Paste -> on e Events.paste
2511+ Reset -> on e Events.reset
2512+ Search -> on e Events.search
9542513 Selectstart -> on e Element.selectStart
955− Touchstart -> on e Element.touchStart
956− Touchmove -> on e Element.touchMove
957− Touchend -> on e Element.touchEnd
958− Touchcancel -> on e Element.touchCancel
2514+ Touchstart -> on e Events.touchStart
2515+ Touchmove -> on e Events.touchMove
2516+ Touchend -> on e Events.touchEnd
2517+ Touchcancel -> on e Events.touchCancel
9592518
9602519{-# INLINABLE windowOnEventName #-}
9612520windowOnEventName :: EventName en -> DOM.Window -> EventM DOM.Window (EventType en) () -> JSM (JSM ())
9622521windowOnEventName en e = case en of
963− Abort -> on e Window.abort
964− Blur -> on e Window.blurEvent
965− Change -> on e Window.change
966− Click -> on e Window.click
967− Contextmenu -> on e Window.contextMenu
968− Dblclick -> on e Window.dblClick
969− Drag -> on e Window.drag
970− Dragend -> on e Window.dragEnd
971− Dragenter -> on e Window.dragEnter
972− Dragleave -> on e Window.dragLeave
973− Dragover -> on e Window.dragOver
974− Dragstart -> on e Window.dragStart
975− Drop -> on e Window.drop
976− Error -> on e Window.error
977− Focus -> on e Window.focusEvent
978− Input -> on e Window.input
979− Invalid -> on e Window.invalid
980− Keydown -> on e Window.keyDown
981− Keypress -> on e Window.keyPress
982− Keyup -> on e Window.keyUp
983− Load -> on e Window.load
984− Mousedown -> on e Window.mouseDown
985− Mouseenter -> on e Window.mouseEnter
986− Mouseleave -> on e Window.mouseLeave
987− Mousemove -> on e Window.mouseMove
988− Mouseout -> on e Window.mouseOut
989− Mouseover -> on e Window.mouseOver
990− Mouseup -> on e Window.mouseUp
991− Mousewheel -> on e Window.mouseWheel
992− Scroll -> on e Window.scrollEvent
993− Select -> on e Window.select
994− Submit -> on e Window.submit
995− Wheel -> on e Window.wheel
2522+ Abort -> on e Events.abort
2523+ Blur -> on e Events.blur
2524+ Change -> on e Events.change
2525+ Click -> on e Events.click
2526+ Contextmenu -> on e Events.contextMenu
2527+ Dblclick -> on e Events.dblClick
2528+ Drag -> on e Events.drag
2529+ Dragend -> on e Events.dragEnd
2530+ Dragenter -> on e Events.dragEnter
2531+ Dragleave -> on e Events.dragLeave
2532+ Dragover -> on e Events.dragOver
2533+ Dragstart -> on e Events.dragStart
2534+ Drop -> on e Events.drop
2535+ Error -> on e Events.error
2536+ Focus -> on e Events.focus
2537+ Input -> on e Events.input
2538+ Invalid -> on e Events.invalid
2539+ Keydown -> on e Events.keyDown
2540+ Keypress -> on e Events.keyPress
2541+ Keyup -> on e Events.keyUp
2542+ Load -> on e Events.load
2543+ Mousedown -> on e Events.mouseDown
2544+ Mouseenter -> on e Events.mouseEnter
2545+ Mouseleave -> on e Events.mouseLeave
2546+ Mousemove -> on e Events.mouseMove
2547+ Mouseout -> on e Events.mouseOut
2548+ Mouseover -> on e Events.mouseOver
2549+ Mouseup -> on e Events.mouseUp
2550+ Mousewheel -> on e Events.mouseWheel
2551+ Scroll -> on e Events.scroll
2552+ Select -> on e Events.select
2553+ Submit -> on e Events.submit
2554+ Wheel -> on e Events.wheel
9962555 Beforecut -> const $ return $ return () --TODO
9972556 Cut -> const $ return $ return () --TODO
9982557 Beforecopy -> const $ return $ return () --TODO
9992558 Copy -> const $ return $ return () --TODO
10002559 Beforepaste -> const $ return $ return () --TODO
10012560 Paste -> const $ return $ return () --TODO
1002− Reset -> on e Window.reset
1003− Search -> on e Window.search
2561+ Reset -> on e Events.reset
2562+ Search -> on e Events.search
10042563 Selectstart -> const $ return $ return () --TODO
1005− Touchstart -> on e Window.touchStart
1006− Touchmove -> on e Window.touchMove
1007− Touchend -> on e Window.touchEnd
1008− Touchcancel -> on e Window.touchCancel
2564+ Touchstart -> on e Events.touchStart
2565+ Touchmove -> on e Events.touchMove
2566+ Touchend -> on e Events.touchEnd
2567+ Touchcancel -> on e Events.touchCancel
10092568
10102569{-# INLINABLE wrapDomEvent #-}
10112570wrapDomEvent :: (TriggerEvent t m, MonadJSM m) => e -> (e -> EventM e event () -> JSM (JSM ())) -> EventM e event a -> m (Event t a)
@@ -1050,10 +2609,10 @@ wrapDomEventsMaybe target handlers onEventName = do
10502609 return $! e
10512610
10522611{-# INLINABLE getKeyEvent #-}
1053−getKeyEvent :: EventM e KeyboardEvent Int
2612+getKeyEvent :: EventM e KeyboardEvent Word
10542613getKeyEvent = do
10552614 e <- event
1056− which <- getWhich e
2615+ which <- KeyboardEvent.getWhich e
10572616 if which /= 0 then return which else do
10582617 charCode <- getCharCode e
10592618 if charCode /= 0 then return charCode else
@@ -1065,32 +2624,38 @@ getMouseEventCoords = do
10652624 e <- event
10662625 bisequence (getClientX e, getClientY e)
10672626
2627+{-# INLINABLE getPasteData #-}
2628+getPasteData :: EventM e ClipboardEvent (Maybe Text)
2629+getPasteData = do
2630+ e <- event
2631+ mdt <- ClipboardEvent.getClipboardData e
2632+ case mdt of
2633+ Nothing -> return Nothing
2634+ Just dt -> Just <$> DataTransfer.getData dt ("text" :: Text)
2635+
10682636{-# INLINABLE getTouchEvent #-}
10692637getTouchEvent :: EventM e TouchEvent TouchEventResult
10702638getTouchEvent = do
1071− let touchResults = \case
1072− Nothing -> return []
1073− Just ts -> do
2639+ let touchResults ts = do
10742640 n <- TouchList.getLength ts
1075− fmap catMaybes . forM (takeWhile (< n) [0..]) $ \ix -> do
1076− mt <- TouchList.item ts ix
1077− forM mt $ \t -> do
1078− identifier <- Touch.getIdentifier t
1079− screenX <- Touch.getScreenX t
1080− screenY <- Touch.getScreenY t
1081− clientX <- Touch.getClientX t
1082− clientY <- Touch.getClientY t
1083− pageX <- Touch.getPageX t
1084− pageY <- Touch.getPageY t
1085− return $ TouchResult
1086− { _touchResult_identifier = identifier
1087− , _touchResult_screenX = screenX
1088− , _touchResult_screenY = screenY
1089− , _touchResult_clientX = clientX
1090− , _touchResult_clientY = clientY
1091− , _touchResult_pageX = pageX
1092− , _touchResult_pageY = pageY
1093− }
2641+ forM (takeWhile (< n) [0..]) $ \ix -> do
2642+ t <- TouchList.item ts ix
2643+ identifier <- Touch.getIdentifier t
2644+ screenX <- Touch.getScreenX t
2645+ screenY <- Touch.getScreenY t
2646+ clientX <- Touch.getClientX t
2647+ clientY <- Touch.getClientY t
2648+ pageX <- Touch.getPageX t
2649+ pageY <- Touch.getPageY t
2650+ return TouchResult
2651+ { _touchResult_identifier = identifier
2652+ , _touchResult_screenX = screenX
2653+ , _touchResult_screenY = screenY
2654+ , _touchResult_clientX = clientX
2655+ , _touchResult_clientY = clientY
2656+ , _touchResult_pageX = pageX
2657+ , _touchResult_pageY = pageY
2658+ }
10942659 e <- event
10952660 altKey <- TouchEvent.getAltKey e
10962661 ctrlKey <- TouchEvent.getCtrlKey e
@@ -1109,17 +2674,41 @@ getTouchEvent = do
11092674 , _touchEventResult_touches = touches
11102675 }
11112676
1112−instance MonadSample t m => MonadSample t (ImmediateDomBuilderT t m) where
2677+{-# INLINABLE getWheelEvent #-}
2678+getWheelEvent :: EventM e WheelEvent WheelEventResult
2679+getWheelEvent = do
2680+ e <- event
2681+ dx :: Double <- WheelEvent.getDeltaX e
2682+ dy :: Double <- WheelEvent.getDeltaY e
2683+ dz :: Double <- WheelEvent.getDeltaZ e
2684+ deltaMode :: Word <- WheelEvent.getDeltaMode e
2685+ return $ WheelEventResult
2686+ { _wheelEventResult_deltaX = dx
2687+ , _wheelEventResult_deltaY = dy
2688+ , _wheelEventResult_deltaZ = dz
2689+ , _wheelEventResult_deltaMode = case deltaMode of
2690+ 0 -> DeltaPixel
2691+ 1 -> DeltaLine
2692+ 2 -> DeltaPage
2693+ -- See https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent/deltaMode
2694+ _ -> error "getWheelEvent: impossible encoding"
2695+ }
2696+
2697+instance MonadSample t m => MonadSample t (HydrationDomBuilderT s t m) where
11132698 {-# INLINABLE sample #-}
11142699 sample = lift . sample
11152700
1116−instance MonadHold t m => MonadHold t (ImmediateDomBuilderT t m) where
2701+instance MonadHold t m => MonadHold t (HydrationDomBuilderT s t m) where
11172702 {-# INLINABLE hold #-}
11182703 hold v0 v' = lift $ hold v0 v'
11192704 {-# INLINABLE holdDyn #-}
11202705 holdDyn v0 v' = lift $ holdDyn v0 v'
11212706 {-# INLINABLE holdIncremental #-}
11222707 holdIncremental v0 v' = lift $ holdIncremental v0 v'
2708+ {-# INLINABLE buildDynamic #-}
2709+ buildDynamic a0 = lift . buildDynamic a0
2710+ {-# INLINABLE headE #-}
2711+ headE = lift . headE
11232712
11242713data WindowConfig t = WindowConfig -- No config options yet
11252714
@@ -1131,7 +2720,7 @@ data Window t = Window
11312720 , _window_raw :: DOM.Window
11322721 }
11332722
1134−wrapWindow :: (MonadJSM m, MonadReflexCreateTrigger t m) => DOM.Window -> WindowConfig t -> ImmediateDomBuilderT t m (Window t)
2723+wrapWindow :: (MonadJSM m, MonadReflexCreateTrigger t m) => DOM.Window -> WindowConfig t -> HydrationDomBuilderT GhcjsDomSpace t m (Window t)
11352724wrapWindow wv _ = do
11362725 events <- wrapDomEventsMaybe wv (defaultDomWindowEventHandler wv) windowOnEventName
11372726 return $ Window
reflex-dom-core/src/Reflex/Dom/Builder/InputDisabled.hs+26−4
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE FlexibleInstances #-}
23{-# LANGUAGE GeneralizedNewtypeDeriving #-}
34{-# LANGUAGE MultiParamTypeClasses #-}
@@ -15,8 +16,12 @@ import Control.Monad.Trans.Control
1516import Data.Coerce
1617import qualified Data.Map as Map
1718import Foreign.JavaScript.TH
19+#ifndef ghcjs_HOST_OS
20+import GHCJS.DOM.Types (MonadJSM (..))
21+#endif
1822import Reflex
1923import Reflex.Dom.Builder.Class
24+import Reflex.Dom.Builder.Immediate (HasDocument (..))
2025import Reflex.Host.Class
2126
2227-- | A DomBuilder transformer that disables all 'inputElement's,
@@ -25,6 +30,11 @@ import Reflex.Host.Class
2530-- "select" as their tag will NOT be disabled.
2631newtype InputDisabledT m a = InputDisabledT { runInputDisabledT :: m a } deriving (Functor, Applicative, Monad, MonadAtomicRef, MonadFix, MonadIO)
2732
33+#ifndef ghcjs_HOST_OS
34+instance MonadJSM m => MonadJSM (InputDisabledT m) where
35+ liftJSM' = InputDisabledT . liftJSM'
36+#endif
37+
2838deriving instance MonadSample t m => MonadSample t (InputDisabledT m)
2939deriving instance MonadHold t m => MonadHold t (InputDisabledT m)
3040
@@ -66,25 +76,32 @@ instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (InputDisabl
6676 newEventWithTrigger = lift . newEventWithTrigger
6777 newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
6878
69−instance MonadAdjust t m => MonadAdjust t (InputDisabledT m) where
79+instance Adjustable t m => Adjustable t (InputDisabledT m) where
7080 runWithReplace a0 a' = InputDisabledT $ runWithReplace (coerce a0) (coerceEvent a')
7181 traverseDMapWithKeyWithAdjust f dm0 dm' = InputDisabledT $ traverseDMapWithKeyWithAdjust (\k v -> runInputDisabledT $ f k v) (coerce dm0) (coerceEvent dm')
7282 traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = InputDisabledT $ traverseDMapWithKeyWithAdjustWithMove (\k v -> runInputDisabledT $ f k v) (coerce dm0) (coerceEvent dm')
83+ traverseIntMapWithKeyWithAdjust f m0 m' = InputDisabledT $ traverseIntMapWithKeyWithAdjust (\k v -> runInputDisabledT $ f k v) (coerce m0) (coerceEvent m')
84+
85+instance NotReady t m => NotReady t (InputDisabledT m) where
86+ notReadyUntil = lift . notReadyUntil
87+ notReady = lift notReady
7388
7489instance DomBuilder t m => DomBuilder t (InputDisabledT m) where
7590 type DomBuilderSpace (InputDisabledT m) = DomBuilderSpace m
7691 inputElement cfg = lift $ inputElement $ cfg
77− { _inputElementConfig_elementConfig = liftElementConfig $ disableElementConfig $ _inputElementConfig_elementConfig cfg
92+ { _inputElementConfig_elementConfig = disableElementConfig $ _inputElementConfig_elementConfig cfg
7893 }
7994 textAreaElement cfg = lift $ textAreaElement $ cfg
80− { _textAreaElementConfig_elementConfig = liftElementConfig $ disableElementConfig $ _textAreaElementConfig_elementConfig cfg
95+ { _textAreaElementConfig_elementConfig = disableElementConfig $ _textAreaElementConfig_elementConfig cfg
8196 }
8297 selectElement cfg child = do
8398 let cfg' = cfg
84− { _selectElementConfig_elementConfig = liftElementConfig $ disableElementConfig $ _selectElementConfig_elementConfig cfg
99+ { _selectElementConfig_elementConfig = disableElementConfig $ _selectElementConfig_elementConfig cfg
85100 }
86101 lift $ selectElement cfg' $ runInputDisabledT child
87102
103+instance HasDocument m => HasDocument (InputDisabledT m)
104+
88105instance HasJSContext m => HasJSContext (InputDisabledT m) where
89106 type JSContextPhantom (InputDisabledT m) = JSContextPhantom m
90107 askJSContext = lift askJSContext
@@ -92,3 +109,8 @@ instance HasJSContext m => HasJSContext (InputDisabledT m) where
92109instance HasJS js m => HasJS js (InputDisabledT m) where
93110 type JSX (InputDisabledT m) = JSX m
94111 liftJS = lift . liftJS
112+
113+instance DomRenderHook t m => DomRenderHook t (InputDisabledT m) where
114+ withRenderHook f = InputDisabledT . withRenderHook f . runInputDisabledT
115+ requestDomAction = InputDisabledT . requestDomAction
116+ requestDomAction_ = InputDisabledT . requestDomAction_
reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+169−37
@@ -5,7 +5,6 @@
55{-# LANGUAGE FlexibleContexts #-}
66{-# LANGUAGE FlexibleInstances #-}
77{-# LANGUAGE GeneralizedNewtypeDeriving #-}
8−{-# LANGUAGE LambdaCase #-}
98{-# LANGUAGE MultiParamTypeClasses #-}
109{-# LANGUAGE OverloadedStrings #-}
1110{-# LANGUAGE PolyKinds #-}
@@ -16,6 +15,7 @@
1615{-# LANGUAGE UndecidableInstances #-}
1716module Reflex.Dom.Builder.Static where
1817
18+import Data.IORef (IORef)
1919import Blaze.ByteString.Builder.Html.Utf8
2020import Control.Lens hiding (element)
2121import Control.Monad.Exception
@@ -33,22 +33,28 @@ import qualified Data.Dependent.Map as DMap
3333import Data.Dependent.Sum (DSum (..))
3434import Data.Functor.Compose
3535import Data.Functor.Constant
36+import Data.IntMap (IntMap)
37+import qualified Data.IntMap as IntMap
3638import qualified Data.Map as Map
37−import Data.Monoid
39+import Data.Map.Misc (applyMap)
40+import Data.Maybe (fromMaybe)
41+import Data.Monoid ((<>))
3842import qualified Data.Set as Set
3943import Data.Text (Text)
44+import qualified Data.Text as T
4045import Data.Text.Encoding
4146import Data.Tuple
4247import GHC.Generics
48+import Reflex.Adjustable.Class
4349import Reflex.Class
50+import Reflex.Dom.Main (DomHost, DomTimeline, runDomHost)
4451import Reflex.Dom.Builder.Class
45−import Reflex.Dom.Widget.Basic (applyMap)
4652import Reflex.Dynamic
4753import Reflex.Host.Class
4854import Reflex.PerformEvent.Base
4955import Reflex.PerformEvent.Class
5056import Reflex.PostBuild.Base
51−import Reflex.Spider
57+import Reflex.PostBuild.Class
5258import Reflex.TriggerEvent.Class
5359
5460data StaticDomBuilderEnv t = StaticDomBuilderEnv
@@ -58,6 +64,7 @@ data StaticDomBuilderEnv t = StaticDomBuilderEnv
5864 -- We use this to add a "selected" attribute to the appropriate "option" child element.
5965 -- This is not yet a perfect simulation of what the browser does, but it is much closer than doing nothing.
6066 -- TODO: Handle edge cases, e.g. setting to a value for which there is no option, then adding that option dynamically afterwards.
67+ , _staticDomBuilderEnv_nextRunWithReplaceKey :: IORef Int
6168 }
6269
6370newtype StaticDomBuilderT t m a = StaticDomBuilderT
@@ -77,6 +84,10 @@ runStaticDomBuilderT (StaticDomBuilderT a) e = do
7784 (result, a') <- runStateT (runReaderT a e) []
7885 return (result, mconcat $ reverse a')
7986
87+instance PostBuild t m => PostBuild t (StaticDomBuilderT t m) where
88+ {-# INLINABLE getPostBuild #-}
89+ getPostBuild = lift getPostBuild
90+
8091instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (StaticDomBuilderT t m) where
8192 {-# INLINABLE newEventWithTrigger #-}
8293 newEventWithTrigger = lift . newEventWithTrigger
@@ -101,6 +112,10 @@ instance MonadHold t m => MonadHold t (StaticDomBuilderT t m) where
101112 holdDyn v0 v' = lift $ holdDyn v0 v'
102113 {-# INLINABLE holdIncremental #-}
103114 holdIncremental v0 v' = lift $ holdIncremental v0 v'
115+ {-# INLINABLE buildDynamic #-}
116+ buildDynamic a0 = lift . buildDynamic a0
117+ {-# INLINABLE headE #-}
118+ headE = lift . headE
104119
105120instance (Monad m, Ref m ~ Ref IO, Reflex t) => TriggerEvent t (StaticDomBuilderT t m) where
106121 {-# INLINABLE newTriggerEvent #-}
@@ -119,7 +134,7 @@ instance MonadRef m => MonadRef (StaticDomBuilderT t m) where
119134instance MonadAtomicRef m => MonadAtomicRef (StaticDomBuilderT t m) where
120135 atomicModifyRef r = lift . atomicModifyRef r
121136
122−type SupportsStaticDomBuilder t m = (Reflex t, MonadIO m, MonadHold t m, MonadFix m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadRef m, Ref m ~ Ref IO, MonadAdjust t m)
137+type SupportsStaticDomBuilder t m = (Reflex t, MonadIO m, MonadHold t m, MonadFix m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadRef m, Ref m ~ Ref IO, Adjustable t m)
123138
124139data StaticDomSpace
125140
@@ -135,36 +150,112 @@ instance Default (StaticEventSpec er)
135150
136151instance DomSpace StaticDomSpace where
137152 type EventSpec StaticDomSpace = StaticEventSpec
153+ type RawDocument StaticDomSpace = ()
138154 type RawTextNode StaticDomSpace = ()
155+ type RawCommentNode StaticDomSpace = ()
139156 type RawElement StaticDomSpace = ()
140− type RawFile StaticDomSpace = ()
141157 type RawInputElement StaticDomSpace = ()
142158 type RawTextAreaElement StaticDomSpace = ()
143159 type RawSelectElement StaticDomSpace = ()
144160 addEventSpecFlags _ _ _ _ = StaticEventSpec
145161
146−instance (Reflex t, MonadAdjust t m, MonadHold t m) => MonadAdjust t (StaticDomBuilderT t m) where
162+instance (SupportsStaticDomBuilder t m, Monad m) => HasDocument (StaticDomBuilderT t m) where
163+ askDocument = pure ()
164+
165+instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m) => Adjustable t (StaticDomBuilderT t m) where
147166 runWithReplace a0 a' = do
148167 e <- StaticDomBuilderT ask
168+ key <- replaceStart e
149169 (result0, result') <- lift $ runWithReplace (runStaticDomBuilderT a0 e) (flip runStaticDomBuilderT e <$> a')
150170 o <- hold (snd result0) $ fmapCheap snd result'
151171 StaticDomBuilderT $ modify $ (:) $ join o
172+ replaceEnd key
152173 return (fst result0, fmapCheap fst result')
153− traverseDMapWithKeyWithAdjust f (dm0 :: DMap k v) dm' = do
154− e <- StaticDomBuilderT ask
155− (children0, children') <- lift $ traverseDMapWithKeyWithAdjust (\k v -> fmap (Compose . swap) (runStaticDomBuilderT (f k v) e)) dm0 dm'
156− let result0 = DMap.map (snd . getCompose) children0
157− result' = ffor children' $ mapPatchDMap $ snd . getCompose
158− outputs0 :: DMap k (Constant (Behavior t Builder))
159− outputs0 = DMap.map (Constant . fst . getCompose) children0
160− outputs' :: Event t (PatchDMap k (Constant (Behavior t Builder)))
161− outputs' = ffor children' $ mapPatchDMap $ Constant . fst . getCompose
162− outputs <- holdIncremental outputs0 outputs'
163− StaticDomBuilderT $ modify $ (:) $ pull $ do
164− os <- sample $ currentIncremental outputs
165− fmap mconcat $ forM (DMap.toList os) $ \(_ :=> Constant o) -> do
166− sample o
167− return (result0, result')
174+ traverseIntMapWithKeyWithAdjust = hoistIntMapWithKeyWithAdjust traverseIntMapWithKeyWithAdjust
175+ traverseDMapWithKeyWithAdjust = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap
176+ traverseDMapWithKeyWithAdjustWithMove = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove
177+
178+replaceStart :: (DomBuilder t m, MonadIO m) => StaticDomBuilderEnv t -> m Text
179+replaceStart env = do
180+ str <- show <$> liftIO (atomicModifyRef (_staticDomBuilderEnv_nextRunWithReplaceKey env) $ \k -> (succ k, k))
181+ let key = "-" <> T.pack str
182+ _ <- commentNode $ def { _commentNodeConfig_initialContents = "replace-start" <> key }
183+ pure key
184+
185+replaceEnd :: DomBuilder t m => Text -> m ()
186+replaceEnd key = void $ commentNode $ def { _commentNodeConfig_initialContents = "replace-end" <> key }
187+
188+hoistIntMapWithKeyWithAdjust :: forall t m p a b.
189+ ( Adjustable t m
190+ , MonadHold t m
191+ , Patch (p a)
192+ , Functor p
193+ , Patch (p (Behavior t Builder))
194+ , PatchTarget (p (Behavior t Builder)) ~ IntMap (Behavior t Builder)
195+ , Ref m ~ IORef, MonadIO m, MonadFix m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadRef m -- TODO remove
196+ )
197+ => (forall x. (IntMap.Key -> a -> m x)
198+ -> IntMap a
199+ -> Event t (p a)
200+ -> m (IntMap x, Event t (p x))
201+ ) -- ^ The base monad's traversal
202+ -> (IntMap.Key -> a -> StaticDomBuilderT t m b)
203+ -> IntMap a
204+ -> Event t (p a)
205+ -> StaticDomBuilderT t m (IntMap b, Event t (p b))
206+hoistIntMapWithKeyWithAdjust base f im0 im' = do
207+ e <- StaticDomBuilderT ask
208+ (children0, children') <- lift $ base (\k v -> runStaticDomBuilderT (f k v) e) im0 im'
209+ let result0 = IntMap.map fst children0
210+ result' = (fmap . fmap) fst children'
211+ outputs0 :: IntMap (Behavior t Builder)
212+ outputs0 = IntMap.map snd children0
213+ outputs' :: Event t (p (Behavior t Builder))
214+ outputs' = (fmap . fmap) snd children'
215+ outputs <- holdIncremental outputs0 outputs'
216+ StaticDomBuilderT $ modify $ (:) $ pull $ do
217+ os <- sample $ currentIncremental outputs
218+ fmap mconcat $ forM (IntMap.toList os) $ \(_, o) -> do
219+ sample o
220+ return (result0, result')
221+
222+hoistDMapWithKeyWithAdjust :: forall (k :: * -> *) v v' t m p.
223+ ( Adjustable t m
224+ , MonadHold t m
225+ , PatchTarget (p k (Constant (Behavior t Builder))) ~ DMap k (Constant (Behavior t Builder))
226+ , Patch (p k (Constant (Behavior t Builder)))
227+ , Ref m ~ IORef, MonadIO m, MonadFix m, PerformEvent t m, MonadReflexCreateTrigger t m, MonadRef m -- TODO remove
228+ )
229+ => (forall vv vv'.
230+ (forall a. k a -> vv a -> m (vv' a))
231+ -> DMap k vv
232+ -> Event t (p k vv)
233+ -> m (DMap k vv', Event t (p k vv'))
234+ ) -- ^ The base monad's traversal
235+ -> (forall vv vv'. (forall a. vv a -> vv' a) -> p k vv -> p k vv') -- ^ A way of mapping over the patch type
236+ -> (forall a. k a -> v a -> StaticDomBuilderT t m (v' a))
237+ -> DMap k v
238+ -> Event t (p k v)
239+ -> StaticDomBuilderT t m (DMap k v', Event t (p k v'))
240+hoistDMapWithKeyWithAdjust base mapPatch f dm0 dm' = do
241+ e <- StaticDomBuilderT ask
242+ (children0, children') <- lift $ base (\k v -> fmap (Compose . swap) (runStaticDomBuilderT (f k v) e)) dm0 dm'
243+ let result0 = DMap.map (snd . getCompose) children0
244+ result' = ffor children' $ mapPatch $ snd . getCompose
245+ outputs0 :: DMap k (Constant (Behavior t Builder))
246+ outputs0 = DMap.map (Constant . fst . getCompose) children0
247+ outputs' :: Event t (p k (Constant (Behavior t Builder)))
248+ outputs' = ffor children' $ mapPatch $ Constant . fst . getCompose
249+ outputs <- holdIncremental outputs0 outputs'
250+ StaticDomBuilderT $ modify $ (:) $ pull $ do
251+ os <- sample $ currentIncremental outputs
252+ fmap mconcat $ forM (DMap.toList os) $ \(_ :=> Constant o) -> do
253+ sample o
254+ return (result0, result')
255+
256+instance SupportsStaticDomBuilder t m => NotReady t (StaticDomBuilderT t m) where
257+ notReadyUntil _ = pure ()
258+ notReady = pure ()
168259
169260-- TODO: the uses of illegal lenses in this instance causes it to be somewhat less efficient than it can be. replacing them with explicit cases to get the underlying Maybe Event and working with those is ideal.
170261instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) where
@@ -178,6 +269,15 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
178269 Nothing -> return (pure (escape initialContents))
179270 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on
180271 return $ TextNode ()
272+ {-# INLINABLE commentNode #-}
273+ commentNode (CommentNodeConfig initialContents mSetContents) = StaticDomBuilderT $ do
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 -> "<!--" <> 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 ()
181281 {-# INLINABLE element #-}
182282 element elementTag cfg child = do
183283 -- https://www.w3.org/TR/html-markup/syntax.html#syntax-elements
@@ -187,7 +287,8 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
187287 es <- newFanEventWithTrigger $ \_ _ -> return (return ())
188288 StaticDomBuilderT $ do
189289 let shouldEscape = elementTag `Set.notMember` noEscapeElements
190− (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing
290+ nextRunWithReplaceKey <- asks _staticDomBuilderEnv_nextRunWithReplaceKey
291+ (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing nextRunWithReplaceKey
191292 attrs0 <- foldDyn applyMap (cfg ^. initialAttributes) (cfg ^. modifyAttributes)
192293 selectValue <- asks _staticDomBuilderEnv_selectValue
193294 let addSelectedAttr attrs sel = case Map.lookup "value" attrs of
@@ -204,16 +305,39 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
204305 let open = mconcat [constant ("<" <> byteString tagBS), attrs2, constant (byteString ">")]
205306 let close = constant $ byteString $ "</" <> tagBS <> ">"
206307 modify $ (:) $ mconcat [open, innerHtml, close]
207− return (Element es (), result)
308+ let e = Element
309+ { _element_events = es
310+ , _element_raw = ()
311+ }
312+ return (e, result)
208313 {-# INLINABLE inputElement #-}
209314 inputElement cfg = do
210− (e, _result) <- element "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
211− let v0 = constDyn $ cfg ^. inputElementConfig_initialValue
212− let c0 = constDyn $ cfg ^. inputElementConfig_initialChecked
315+ -- Tweak the config to update the "value" and "checked" attributes appropriately.
316+ -- TODO: warn upon overwriting values.
317+ let setInitialValue = Map.insert "value" (_inputElementConfig_initialValue cfg)
318+ setUpdatedValue updatedAttrs = case _inputElementConfig_setValue cfg of
319+ Nothing -> updatedAttrs
320+ Just e -> (Map.singleton "value" . Just <$> e) <> updatedAttrs
321+ setInitialChecked = case _inputElementConfig_initialChecked cfg of
322+ True -> Map.insert "checked" "checked"
323+ False -> id
324+ setUpdatedChecked updatedAttrs = case _inputElementConfig_setChecked cfg of
325+ Nothing -> updatedAttrs
326+ Just e -> (Map.singleton "checked" (Just "checked") <$ e) <> updatedAttrs
327+ adjustedConfig = _inputElementConfig_elementConfig cfg
328+ & elementConfig_initialAttributes %~ setInitialValue . setInitialChecked
329+ & elementConfig_modifyAttributes %~ setUpdatedValue . setUpdatedChecked
330+ (e, _result) <- element "input" adjustedConfig $ return ()
331+ v <- case _inputElementConfig_setValue cfg of
332+ Nothing -> pure $ constDyn (cfg ^. inputElementConfig_initialValue)
333+ Just ev -> holdDyn (cfg ^. inputElementConfig_initialValue) ev
334+ c <- case _inputElementConfig_setChecked cfg of
335+ Nothing -> pure $ constDyn $ _inputElementConfig_initialChecked cfg
336+ Just ev -> holdDyn (_inputElementConfig_initialChecked cfg) ev
213337 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
214338 return $ InputElement
215− { _inputElement_value = v0
216− , _inputElement_checked = c0
339+ { _inputElement_value = v
340+ , _inputElement_checked = c
217341 , _inputElement_checkedChange = never
218342 , _inputElement_input = never
219343 , _inputElement_hasFocus = hasFocus
@@ -223,12 +347,17 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
223347 }
224348 {-# INLINABLE textAreaElement #-}
225349 textAreaElement cfg = do
226− --TODO: Support setValue event
227− (e, _domElement) <- element "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
228− let v0 = constDyn $ cfg ^. textAreaElementConfig_initialValue
350+ (e, _domElement) <- element "textarea" (_textAreaElementConfig_elementConfig cfg) $ do
351+ -- Set the initial value
352+ void $ textNode $ def
353+ & textNodeConfig_initialContents .~ _textAreaElementConfig_initialValue cfg
354+ & textNodeConfig_setContents .~ fromMaybe never (_textAreaElementConfig_setValue cfg)
355+ v <- case _textAreaElementConfig_setValue cfg of
356+ Nothing -> pure $ constDyn (cfg ^. textAreaElementConfig_initialValue)
357+ Just ev -> holdDyn (cfg ^. textAreaElementConfig_initialValue) ev
229358 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
230359 return $ TextAreaElement
231− { _textAreaElement_value = v0
360+ { _textAreaElement_value = v
232361 , _textAreaElement_input = never
233362 , _textAreaElement_hasFocus = hasFocus
234363 , _textAreaElement_element = e
@@ -237,7 +366,9 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
237366 selectElement cfg child = do
238367 v <- holdDyn (cfg ^. selectElementConfig_initialValue) (cfg ^. selectElementConfig_setValue)
239368 (e, result) <- element "select" (_selectElementConfig_elementConfig cfg) $ do
240− (a, innerHtml) <- StaticDomBuilderT $ lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv False $ Just (current v)
369+ (a, innerHtml) <- StaticDomBuilderT $ do
370+ nextRunWithReplaceKey <- asks _staticDomBuilderEnv_nextRunWithReplaceKey
371+ lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv False (Just $ current v) nextRunWithReplaceKey
241372 StaticDomBuilderT $ lift $ modify $ (:) innerHtml
242373 return a
243374 let wrapped = SelectElement
@@ -252,14 +383,15 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
252383 wrapRawElement () _ = return $ Element (EventSelector $ const never) ()
253384
254385--TODO: Make this more abstract --TODO: Put the WithWebView underneath PerformEventT - I think this would perform better
255−type StaticWidget x = PostBuildT Spider (StaticDomBuilderT Spider (PerformEventT Spider (SpiderHost Global)))
386+type StaticWidget x = PostBuildT DomTimeline (StaticDomBuilderT DomTimeline (PerformEventT DomTimeline DomHost))
256387
257388{-# INLINE renderStatic #-}
258389renderStatic :: StaticWidget x a -> IO (a, ByteString)
259390renderStatic w = do
260− runSpiderHost $ do
391+ runDomHost $ do
261392 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
262− let env0 = StaticDomBuilderEnv True Nothing
393+ nextRunWithReplaceKey <- newRef 0
394+ let env0 = StaticDomBuilderEnv True Nothing nextRunWithReplaceKey
263395 ((res, bs), FireCommand fire) <- hostPerformEventT $ runStaticDomBuilderT (runPostBuildT w postBuild) env0
264396 mPostBuildTrigger <- readRef postBuildTriggerRef
265397 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
reflex-dom-core/src/Reflex/Dom/Class.hs+4−7
@@ -4,8 +4,7 @@ module Reflex.Dom.Class ( module Reflex.Dom.Class
44 , module Web.KeyCode
55 ) where
66
7−import Data.Map (Map)
8−import qualified Data.Map as Map
7+import Control.Lens
98import Reflex.Class
109import Web.KeyCode
1110
@@ -13,11 +12,9 @@ import Foreign.JavaScript.TH
1312import Reflex.PerformEvent.Class
1413import Reflex.PostBuild.Class
1514
16−import Prelude hiding (concat, mapM, mapM_, sequence)
17−
18−-- | Alias for Data.Map.singleton
19−(=:) :: k -> a -> Map k a
20−(=:) = Map.singleton
15+-- | Previously an alias for 'Data.Map.singleton', but now generalised to 'At'
16+(=:) :: (At m, Monoid m) => Index m -> IxValue m -> m
17+k =: a = at k ?~ a $ mempty
2118infixr 7 =: -- Ought to bind tighter than <>, which is infixr 6
2219
2320{-# DEPRECATED keycodeEnter "Instead of `x == keycodeEnter`, use `keyCodeLookup x == Enter`" #-}
reflex-dom-core/src/Reflex/Dom/Core.hs+8−1
@@ -1,15 +1,22 @@
1+-- Disable haddocks on this module due to a bug on haddocks when selectively
2+-- reexporting on ghc > 8.2.
3+-- https://github.com/haskell/haddock/issues/979
4+{-# OPTIONS_HADDOCK hide, prune, ignore-exports #-}
15module Reflex.Dom.Core (module X) where
26
37import Reflex as X hiding (askEvents)
48import Reflex.Dom.Builder.Class as X
9+import Reflex.Dom.Builder.Hydratable as X
510import Reflex.Dom.Builder.Immediate as X
611import Reflex.Dom.Builder.InputDisabled as X
712import Reflex.Dom.Builder.Static as X
813import Reflex.Dom.Class as X
914import Reflex.Dom.Location as X
1015import Reflex.Dom.Main as X
16+import Reflex.Dom.Modals.Class as X
1117import Reflex.Dom.Old as X
12−import Reflex.Dom.Time as X
18+import Reflex.Dom.Prerender as X
1319import Reflex.Dom.WebSocket as X
1420import Reflex.Dom.Widget as X
1521import Reflex.Dom.Xhr as X
22+import Reflex.Dom.Xhr.FormData as X
reflex-dom-core/src/Reflex/Dom/Location.hs+194−7
@@ -1,13 +1,200 @@
1−module Reflex.Dom.Location (getLocationHost, getLocationProtocol) where
1+{-# LANGUAGE FlexibleContexts #-}
2+{-# LANGUAGE LambdaCase #-}
3+{-# LANGUAGE MultiParamTypeClasses #-}
4+{-# LANGUAGE OverloadedStrings #-}
5+{-# LANGUAGE RankNTypes #-}
6+module Reflex.Dom.Location
7+ ( browserHistoryWith
8+ , getLocationAfterHost
9+ , getLocationFragment
10+ , getLocationHost
11+ , getLocationPath
12+ , getLocationProtocol
13+ , getLocationUrl
14+ , manageHistory
15+ , manageHistory'
16+ , HistoryCommand (..)
17+ , HistoryStateUpdate (..)
18+ , HistoryItem (..)
19+ , getLocationUri
20+ ) where
221
22+import Reflex
23+import Reflex.Dom.Builder.Immediate (wrapDomEvent)
24+
25+import Control.Lens ((^.))
26+import Control.Monad ((>=>))
27+import Control.Monad.Fix (MonadFix)
28+import Data.Align (align)
29+import Data.Monoid
330import Data.Text (Text)
4−import GHCJS.DOM.Types (MonadJSM)
5−import GHCJS.DOM (currentWindowUnchecked)
6−import GHCJS.DOM.Window (getLocationUnchecked)
7−import GHCJS.DOM.Location (getProtocol, getHost)
31+import Data.These (These(..))
32+import qualified GHCJS.DOM as DOM
33+import qualified GHCJS.DOM.EventM as DOM
34+import qualified GHCJS.DOM.Location as Location
35+import qualified GHCJS.DOM.History as History
36+import qualified GHCJS.DOM.PopStateEvent as PopStateEvent
37+import GHCJS.DOM.Types (Location, History, SerializedScriptValue (..), liftJSM)
38+import qualified GHCJS.DOM.Types as DOM
39+import qualified GHCJS.DOM.Window as Window
40+import qualified GHCJS.DOM.WindowEventHandlers as DOM
41+import Language.Javascript.JSaddle (FromJSString, MonadJSM, ToJSString, fromJSValUnchecked, js1, ToJSVal (..), FromJSVal (..))
42+import Network.URI
43+
44+withLocation :: (MonadJSM m) => (Location -> m a) -> m a
45+withLocation f = DOM.currentWindowUnchecked >>= Window.getLocation >>= f
46+
47+-- | Returns the full URI-decoded URL of the current window location.
48+getLocationUrl :: (MonadJSM m) => m Text
49+getLocationUrl = withLocation (Location.getHref >=> decodeURIText)
850
51+-- | Returns the host of the current window location
952getLocationHost :: (MonadJSM m) => m Text
10−getLocationHost = currentWindowUnchecked >>= getLocationUnchecked >>= getHost
53+getLocationHost = withLocation Location.getHost
1154
55+-- | Returns the protocol/scheme (e.g. @http:@ or @https:@) of the current window location
1256getLocationProtocol :: (MonadJSM m) => m Text
13−getLocationProtocol = currentWindowUnchecked >>= getLocationUnchecked >>= getProtocol
57+getLocationProtocol = withLocation Location.getProtocol
58+
59+-- | Returns the URI-decoded location after the host and port; i.e. returns the path, query, and fragment of the location.
60+getLocationAfterHost :: (MonadJSM m) => m Text
61+getLocationAfterHost = withLocation $ \loc -> do
62+ pathname <- Location.getPathname loc
63+ search <- Location.getSearch loc
64+ hash <- Location.getHash loc
65+ decodeURI (mconcat [pathname, search, hash] :: Text)
66+
67+-- | Returns the URI-decoded path of the current window location.
68+getLocationPath :: (MonadJSM m) => m Text
69+getLocationPath = withLocation (Location.getPathname >=> decodeURIText)
70+
71+-- | Returns the URI-decoded fragment/hash of the current window location.
72+getLocationFragment :: (MonadJSM m) => m Text
73+getLocationFragment = withLocation (Location.getHash >=> decodeURIText)
74+
75+
76+-- | Decodes a URI with JavaScript's @decodeURI@ function.
77+--
78+-- FIXME: @decodeURI@ will throw when URI is malformed
79+decodeURI :: (MonadJSM m, ToJSString a, FromJSString b) => a -> m b
80+decodeURI input = do
81+ window <- DOM.currentWindowUnchecked
82+ window' <- DOM.liftJSM $ toJSVal window
83+ DOM.liftJSM $ window' ^. js1 ("decodeURI"::Text) input >>= fromJSValUnchecked
84+
85+decodeURIText :: (MonadJSM m) => Text -> m Text
86+decodeURIText = decodeURI
87+
88+-- | Builds a Dynamic carrying the current window location.
89+browserHistoryWith :: (MonadJSM m, TriggerEvent t m, MonadHold t m)
90+ => (forall jsm. MonadJSM jsm => Location -> jsm a)
91+ -- ^ A function to encode the window location in a more useful form (e.g. @getLocationAfterHost@).
92+ -> m (Dynamic t a)
93+browserHistoryWith f = do
94+ window <- DOM.currentWindowUnchecked
95+ location <- Window.getLocation window
96+ loc0 <- f location
97+ locEv <- wrapDomEvent window (`DOM.on` DOM.popState) $ f location
98+ holdDyn loc0 locEv
99+
100+--TODO: Pending https://github.com/haskell/network-uri/issues/39, ensure that
101+--we're handling escaping of URIs correctly
102+data HistoryItem = HistoryItem
103+ { _historyItem_state :: SerializedScriptValue
104+ , _historyItem_uri :: URI
105+ -- ^ NOTE: All URIs in this module are assumed to be already percent-escaped
106+ }
107+
108+data HistoryStateUpdate = HistoryStateUpdate
109+ { _historyStateUpdate_state :: SerializedScriptValue
110+ , _historyStateUpdate_title :: Text
111+ , _historyStateUpdate_uri :: Maybe URI
112+ -- ^ If Just, update the URI; otherwise leave it unchanged
113+ -- NOTE: All URIs in this module are assumed to be already percent-escaped
114+ }
115+
116+data HistoryCommand
117+ = HistoryCommand_PushState HistoryStateUpdate
118+ | HistoryCommand_ReplaceState HistoryStateUpdate
119+
120+runHistoryCommand :: MonadJSM m => History -> HistoryCommand -> m ()
121+runHistoryCommand history = \case
122+ HistoryCommand_PushState su -> History.pushState history
123+ (_historyStateUpdate_state su)
124+ (_historyStateUpdate_title su)
125+ (show <$> _historyStateUpdate_uri su)
126+ HistoryCommand_ReplaceState su -> History.replaceState history
127+ (_historyStateUpdate_state su)
128+ (_historyStateUpdate_title su)
129+ (show <$> _historyStateUpdate_uri su)
130+
131+getLocationUriAuth :: MonadJSM m => Location -> m URIAuth
132+getLocationUriAuth location = URIAuth "" -- Username and password don't seem to be available in most browsers
133+ <$> Location.getHostname location
134+ <*> (appendColonIfNotEmpty <$> Location.getPort location)
135+ where appendColonIfNotEmpty = \case
136+ "" -> ""
137+ x -> ":" <> x
138+
139+getLocationUri :: MonadJSM m => Location -> m URI
140+getLocationUri location = URI
141+ <$> Location.getProtocol location
142+ <*> (Just <$> getLocationUriAuth location)
143+ <*> Location.getPathname location
144+ <*> Location.getSearch location
145+ <*> Location.getHash location
146+
147+manageHistory :: (MonadJSM m, TriggerEvent t m, MonadHold t m, PerformEvent t m, MonadJSM (Performable m)) => Event t HistoryCommand -> m (Dynamic t HistoryItem)
148+manageHistory runCmd = do
149+ window <- DOM.currentWindowUnchecked
150+ location <- Window.getLocation window
151+ history <- Window.getHistory window
152+ let getCurrentHistoryItem = HistoryItem
153+ <$> History.getState history
154+ <*> getLocationUri location
155+ item0 <- liftJSM getCurrentHistoryItem
156+ itemSetInternal <- performEvent $ ffor runCmd $ \cmd -> liftJSM $ do
157+ runHistoryCommand history cmd
158+ getCurrentHistoryItem
159+ itemSetExternal <- wrapDomEvent window (`DOM.on` DOM.popState) $ do
160+ e <- DOM.event
161+ HistoryItem
162+ <$> (SerializedScriptValue <$> PopStateEvent.getState e)
163+ <*> getLocationUri location
164+ holdDyn item0 $ leftmost [itemSetInternal, itemSetExternal]
165+--TODO: Handle title setting better
166+
167+manageHistory'
168+ :: (MonadFix m, MonadJSM m, TriggerEvent t m, MonadHold t m, PerformEvent t m, MonadJSM (Performable m))
169+ => Event t ()
170+ -- ^ Don't do anything until this event has fired
171+ -> Event t HistoryCommand
172+ -> m (Dynamic t HistoryItem)
173+manageHistory' switchover runCmd = do
174+ window <- DOM.currentWindowUnchecked
175+ location <- Window.getLocation window
176+ history <- Window.getHistory window
177+ let getCurrentHistoryItem = HistoryItem
178+ <$> History.getState history
179+ <*> getLocationUri location
180+ item0 <- liftJSM getCurrentHistoryItem
181+ itemSetExternal' <- wrapDomEvent window (`DOM.on` DOM.popState) $ do
182+ e <- DOM.event
183+ HistoryItem
184+ <$> (SerializedScriptValue <$> PopStateEvent.getState e)
185+ <*> getLocationUri location
186+ let f :: (Bool, Maybe a) -> These a () -> (Maybe (Bool, Maybe a), Maybe a)
187+ f (switched, acc) = \case
188+ This change
189+ | switched -> (Nothing, Just change)
190+ | otherwise -> (Just (switched, Just change), Nothing)
191+ That () -> (Just (True, Nothing), acc)
192+ These change () -> (Just (True, Nothing), Just change)
193+ -- Accumulate the events before switchover
194+ (_, cmd') <- mapAccumMaybeB f (False, Nothing) $ align (leftmost [Left <$> runCmd, Right <$> itemSetExternal']) switchover
195+ let (itemSetInternal', itemSetExternal) = fanEither cmd'
196+ itemSetInternal <- performEvent $ ffor itemSetInternal' $ \cmd -> liftJSM $ do
197+ runHistoryCommand history cmd
198+ getCurrentHistoryItem
199+ holdDyn item0 $ leftmost [itemSetInternal, itemSetExternal]
200+--TODO: Handle title setting better
reflex-dom-core/src/Reflex/Dom/Main.hs+247−50
@@ -3,7 +3,6 @@
33{-# LANGUAGE FlexibleContexts #-}
44{-# LANGUAGE FlexibleInstances #-}
55{-# LANGUAGE GADTs #-}
6−{-# LANGUAGE LambdaCase #-}
76{-# LANGUAGE MultiParamTypeClasses #-}
87{-# LANGUAGE NoMonomorphismRestriction #-}
98{-# LANGUAGE RankNTypes #-}
@@ -12,11 +11,13 @@
1211{-# LANGUAGE TypeFamilies #-}
1312{-# LANGUAGE TypeOperators #-}
1413{-# LANGUAGE UndecidableInstances #-}
15−{-# LANGUAGE PatternSynonyms #-}
14+{-# OPTIONS_GHC -fspecialise-aggressively #-}
1615module Reflex.Dom.Main where
1716
1817import Prelude hiding (concat, mapM, mapM_, sequence, sequence_)
1918
19+import Reflex.Adjustable.Class
20+import Reflex.Class
2021import Reflex.Dom.Builder.Immediate
2122import Reflex.Dom.Class
2223import Reflex.Host.Class
@@ -24,6 +25,10 @@ import Reflex.PerformEvent.Base
2425import Reflex.PostBuild.Base
2526import Reflex.Spider (Global, Spider, SpiderHost, runSpiderHost)
2627import Reflex.TriggerEvent.Base
28+import Reflex.TriggerEvent.Class
29+#ifdef PROFILE_REFLEX
30+import Reflex.Profiled
31+#endif
2732
2833import Control.Concurrent
2934import Control.Lens
@@ -32,6 +37,7 @@ import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence, sequence
3237import Control.Monad.Ref
3338import Data.ByteString (ByteString)
3439import Data.Dependent.Sum (DSum (..))
40+import Data.Foldable (for_)
3541import Data.IORef
3642import Data.Maybe
3743import Data.Monoid ((<>))
@@ -42,12 +48,151 @@ import GHCJS.DOM
4248import GHCJS.DOM.Document
4349import GHCJS.DOM.Element
4450import GHCJS.DOM.Node
45−import qualified GHCJS.DOM.Types as DOM
51+import GHCJS.DOM.NonElementParentNode
4652import GHCJS.DOM.Types (JSM)
53+import qualified GHCJS.DOM.Types as DOM
54+
55+#ifdef PROFILE_REFLEX
56+import Reflex.Profiled
57+#endif
58+
59+{-# INLINE mainHydrationWidgetWithHead #-}
60+mainHydrationWidgetWithHead :: (forall x. HydrationWidget x ()) -> (forall x. HydrationWidget x ()) -> JSM ()
61+mainHydrationWidgetWithHead = mainHydrationWidgetWithHead'
62+
63+{-# INLINABLE mainHydrationWidgetWithHead' #-}
64+-- | Warning: `mainHydrationWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.
65+mainHydrationWidgetWithHead' :: HydrationWidget () () -> HydrationWidget () () -> JSM ()
66+mainHydrationWidgetWithHead' = mainHydrationWidgetWithSwitchoverAction' (pure ())
67+
68+{-# INLINE mainHydrationWidgetWithSwitchoverAction #-}
69+mainHydrationWidgetWithSwitchoverAction :: JSM () -> (forall x. HydrationWidget x ()) -> (forall x. HydrationWidget x ()) -> JSM ()
70+mainHydrationWidgetWithSwitchoverAction = mainHydrationWidgetWithSwitchoverAction'
71+
72+{-# INLINABLE mainHydrationWidgetWithSwitchoverAction' #-}
73+-- | Warning: `mainHydrationWidgetWithSwitchoverAction'` is provided only as performance tweak. It is expected to disappear in future releases.
74+mainHydrationWidgetWithSwitchoverAction' :: JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()
75+mainHydrationWidgetWithSwitchoverAction' = mainHydrationWidgetWithSwitchoverActionWithFailure' (pure ())
76+
77+
78+{-# INLINABLE mainHydrationWidgetWithSwitchoverActionWithFailure' #-}
79+-- | Warning: `mainHydrationWidgetWithSwitchoverActionWithFaiilure'` is provided only as performance tweak. It is expected to disappear in future releases.
80+mainHydrationWidgetWithSwitchoverActionWithFailure' :: IO () -> JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()
81+mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchoverAction head' body = do
82+ runHydrationWidgetWithHeadAndBodyWithFailure onFailure switchoverAction $ \appendHead appendBody -> do
83+ appendHead head'
84+ appendBody body
85+
86+{-# INLINABLE attachHydrationWidget #-}
87+attachHydrationWidget
88+ :: JSM ()
89+ -> JSContextSingleton ()
90+ -> ( Event DomTimeline ()
91+ -> IORef HydrationMode
92+ -> Maybe (IORef [(Node, HydrationRunnerT DomTimeline (DomCoreWidget ()) ())])
93+ -> EventChannel
94+ -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
95+ )
96+ -> IO (a, FireCommand DomTimeline DomHost)
97+attachHydrationWidget = attachHydrationWidgetWithFailure (pure ())
98+
99+{-# INLINABLE attachHydrationWidgetWithFailure #-}
100+attachHydrationWidgetWithFailure
101+ :: IO ()
102+ -> JSM ()
103+ -> JSContextSingleton ()
104+ -> ( Event DomTimeline ()
105+ -> IORef HydrationMode
106+ -> Maybe (IORef [(Node, HydrationRunnerT DomTimeline (DomCoreWidget ()) ())])
107+ -> EventChannel
108+ -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
109+ )
110+ -> IO (a, FireCommand DomTimeline DomHost)
111+attachHydrationWidgetWithFailure onFailure switchoverAction jsSing w = do
112+ hydrationMode <- liftIO $ newIORef HydrationMode_Hydrating
113+ rootNodesRef <- liftIO $ newIORef []
114+ events <- newChan
115+ runDomHost $ flip runTriggerEventT events $ mdo
116+ (syncEvent, fireSync) <- newTriggerEvent
117+ ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- lift $ hostPerformEventT $ do
118+ a <- w syncEvent hydrationMode (Just rootNodesRef) events
119+ _ <- runWithReplace (return ()) $ delayedAction <$ syncEvent
120+ pure a
121+ mPostBuildTrigger <- readRef postBuildTriggerRef
122+ lift $ forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
123+ liftIO $ fireSync ()
124+ rootNodes <- liftIO $ readIORef rootNodesRef
125+ let delayedAction = do
126+ for_ (reverse rootNodes) $ \(rootNode, runner) -> do
127+ let hydrate = runHydrationRunnerTWithFailure runner onFailure Nothing rootNode events
128+ void $ runWithJSContextSingleton (runPostBuildT hydrate never) jsSing
129+ liftIO $ writeIORef hydrationMode HydrationMode_Immediate
130+ runWithJSContextSingleton (DOM.liftJSM switchoverAction) jsSing
131+ pure (result, fc)
132+
133+type HydrationWidget x a = HydrationDomBuilderT HydrationDomSpace DomTimeline (DomCoreWidget x) a
134+
135+-- | A widget that isn't attached to any particular part of the DOM hierarchy
136+type FloatingWidget x = TriggerEventT DomTimeline (DomCoreWidget x)
137+
138+type DomCoreWidget x = PostBuildT DomTimeline (WithJSContextSingleton x (PerformEventT DomTimeline DomHost))
139+
140+{-# INLINABLE runHydrationWidgetWithHeadAndBody #-}
141+runHydrationWidgetWithHeadAndBody
142+ :: JSM ()
143+ -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once
144+ -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body" --TODO: test invoking this more than once
145+ -> FloatingWidget () ()
146+ )
147+ -> JSM ()
148+runHydrationWidgetWithHeadAndBody = runHydrationWidgetWithHeadAndBodyWithFailure (pure ())
149+
150+{-# INLINABLE runHydrationWidgetWithHeadAndBodyWithFailure #-}
151+runHydrationWidgetWithHeadAndBodyWithFailure
152+ :: IO ()
153+ -> JSM ()
154+ -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once
155+ -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body" --TODO: test invoking this more than once
156+ -> FloatingWidget () ()
157+ )
158+ -> JSM ()
159+runHydrationWidgetWithHeadAndBodyWithFailure onFailure switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
160+ globalDoc <- currentDocumentUnchecked
161+ headElement <- getHeadUnchecked globalDoc
162+ bodyElement <- getBodyUnchecked globalDoc
163+ (events, fc) <- liftIO . attachHydrationWidgetWithFailure onFailure switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
164+ (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
165+ let hydrateDom :: DOM.Node -> HydrationWidget () c -> FloatingWidget () c
166+ hydrateDom n w = do
167+ delayed <- liftIO $ newIORef $ pure ()
168+ unreadyChildren <- liftIO $ newIORef 0
169+ lift $ do
170+ let builderEnv = HydrationDomBuilderEnv
171+ { _hydrationDomBuilderEnv_document = globalDoc
172+ , _hydrationDomBuilderEnv_parent = Left $ toNode n
173+ , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
174+ , _hydrationDomBuilderEnv_commitAction = pure ()
175+ , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
176+ , _hydrationDomBuilderEnv_switchover = switchover
177+ , _hydrationDomBuilderEnv_delayed = delayed
178+ }
179+ a <- runHydrationDomBuilderT w builderEnv events
180+ forM_ hydrationResult $ \hr -> do
181+ res <- liftIO $ readIORef delayed
182+ liftIO $ modifyIORef' hr ((n, res) :)
183+ pure a
184+ runWithJSContextSingleton (runPostBuildT (runTriggerEventT (app (hydrateDom $ toNode headElement) (hydrateDom $ toNode bodyElement)) events) postBuild) jsSing
185+ return (events, postBuildTriggerRef)
186+ liftIO $ processAsyncEvents events fc
47187
48−{-# INLINABLE mainWidget #-}
188+{-# INLINE mainWidget #-}
49189mainWidget :: (forall x. Widget x ()) -> JSM ()
50−mainWidget w = withJSContextSingleton $ \jsSing -> do
190+mainWidget = mainWidget'
191+
192+{-# INLINABLE mainWidget' #-}
193+-- | Warning: `mainWidget'` is provided only as performance tweak. It is expected to disappear in future releases.
194+mainWidget' :: Widget () () -> JSM ()
195+mainWidget' w = withJSContextSingletonMono $ \jsSing -> do
51196 doc <- currentDocumentUnchecked
52197 body <- getBodyUnchecked doc
53198 attachWidget body jsSing w
@@ -55,7 +200,7 @@ mainWidget w = withJSContextSingleton $ \jsSing -> do
55200--TODO: The x's should be unified here
56201{-# INLINABLE mainWidgetWithHead #-}
57202mainWidgetWithHead :: (forall x. Widget x ()) -> (forall x. Widget x ()) -> JSM ()
58−mainWidgetWithHead h b = withJSContextSingleton $ \jsSing -> do
203+mainWidgetWithHead h b = withJSContextSingletonMono $ \jsSing -> do
59204 doc <- currentDocumentUnchecked
60205 headElement <- getHeadUnchecked doc
61206 attachWidget headElement jsSing h
@@ -67,82 +212,130 @@ mainWidgetWithCss :: ByteString -> (forall x. Widget x ()) -> JSM ()
67212mainWidgetWithCss css w = withJSContextSingleton $ \jsSing -> do
68213 doc <- currentDocumentUnchecked
69214 headElement <- getHeadUnchecked doc
70− setInnerHTML headElement . Just $ "<style>" <> T.unpack (decodeUtf8 css) <> "</style>" --TODO: Fix this
215+ setInnerHTML headElement $ "<style>" <> T.unpack (decodeUtf8 css) <> "</style>" --TODO: Fix this
71216 body <- getBodyUnchecked doc
72217 attachWidget body jsSing w
73218
74−type Widget x = PostBuildT Spider (ImmediateDomBuilderT Spider (WithJSContextSingleton x (PerformEventT Spider (SpiderHost Global)))) --TODO: Make this more abstract --TODO: Put the WithJSContext underneath PerformEventT - I think this would perform better
219+-- | The Reflex timeline for interacting with the DOM
220+type DomTimeline =
221+#ifdef PROFILE_REFLEX
222+ ProfiledTimeline
223+#endif
224+ Spider
225+
226+-- | The ReflexHost the DOM lives in
227+type DomHost =
228+#ifdef PROFILE_REFLEX
229+ ProfiledM
230+#endif
231+ (SpiderHost Global)
232+
233+runDomHost :: DomHost a -> IO a
234+runDomHost = runSpiderHost
235+#ifdef PROFILE_REFLEX
236+ . runProfiledM
237+#endif
238+
239+type Widget x = ImmediateDomBuilderT DomTimeline (DomCoreWidget x)
75240
76241{-# INLINABLE attachWidget #-}
77242attachWidget :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> JSM a
78243attachWidget rootElement wv w = fst <$> attachWidget' rootElement wv w
79244
80−-- | Warning: `mainWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.
81−mainWidgetWithHead' :: (a -> Widget () b, b -> Widget () a) -> JSM ()
82−mainWidgetWithHead' widgets = withJSContextSingletonMono $ \jsSing -> do
83− doc <- currentDocumentUnchecked
84− headElement <- getHeadUnchecked doc
85− headFragment <- createDocumentFragmentUnchecked doc
86− bodyElement <- getBodyUnchecked doc
87− bodyFragment <- createDocumentFragmentUnchecked doc
88− (events, fc) <- liftIO . attachWidget'' $ \events -> do
89− let (headWidget, bodyWidget) = widgets
245+{-# INLINABLE runImmediateWidgetWithHeadAndBody #-}
246+runImmediateWidgetWithHeadAndBody
247+ :: ( (forall c. Widget () c -> FloatingWidget () c) -- "Append to head"
248+ -> (forall c. Widget () c -> FloatingWidget () c) -- "Append to body"
249+ -> FloatingWidget () ()
250+ )
251+ -> JSM ()
252+runImmediateWidgetWithHeadAndBody app = withJSContextSingletonMono $ \jsSing -> do
253+ globalDoc <- currentDocumentUnchecked
254+ headElement <- getHeadUnchecked globalDoc
255+ bodyElement <- getBodyUnchecked globalDoc
256+ headFragment <- createDocumentFragment globalDoc
257+ bodyFragment <- createDocumentFragment globalDoc
258+ (events, fc) <- liftIO . attachImmediateWidget $ \hydrationMode events -> do
90259 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
91− let go :: forall c. Widget () c -> DOM.DocumentFragment -> PerformEventT Spider (SpiderHost Global) c
92− go w df = do
93− let builderEnv = ImmediateDomBuilderEnv
94− { _immediateDomBuilderEnv_document = toDocument doc
95− , _immediateDomBuilderEnv_parent = toNode df
96− , _immediateDomBuilderEnv_events = events
260+ let go :: forall c. DOM.DocumentFragment -> Widget () c -> FloatingWidget () c
261+ go df w = do
262+ unreadyChildren <- liftIO $ newIORef 0
263+ delayed <- liftIO $ newIORef $ pure ()
264+ let builderEnv = HydrationDomBuilderEnv
265+ { _hydrationDomBuilderEnv_document = globalDoc
266+ , _hydrationDomBuilderEnv_parent = Left $ toNode df
267+ , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
268+ , _hydrationDomBuilderEnv_commitAction = pure () --TODO: possibly `replaceElementContents n f`
269+ , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
270+ , _hydrationDomBuilderEnv_switchover = never
271+ , _hydrationDomBuilderEnv_delayed = delayed
97272 }
98− runWithJSContextSingleton (runImmediateDomBuilderT (runPostBuildT w postBuild) builderEnv) jsSing
99− rec b <- go (headWidget a) headFragment
100− a <- go (bodyWidget b) bodyFragment
273+ lift $ runHydrationDomBuilderT w builderEnv events
274+ runWithJSContextSingleton (runPostBuildT (runTriggerEventT (app (go headFragment) (go bodyFragment)) events) postBuild) jsSing
101275 return (events, postBuildTriggerRef)
102276 replaceElementContents headElement headFragment
103277 replaceElementContents bodyElement bodyFragment
104278 liftIO $ processAsyncEvents events fc
105279
280+-- | Warning: `mainWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.
281+mainWidgetWithHead' :: (a -> Widget () b, b -> Widget () a) -> JSM ()
282+mainWidgetWithHead' (h, b) = runImmediateWidgetWithHeadAndBody $ \appendHead appendBody -> do
283+ rec hOut <- appendHead $ h bOut
284+ bOut <- appendBody $ b hOut
285+ pure ()
286+
106287replaceElementContents :: DOM.IsElement e => e -> DOM.DocumentFragment -> JSM ()
107288replaceElementContents e df = do
108− setInnerHTML e $ Just ("" :: String)
109− _ <- appendChildUnchecked e $ Just df
289+ setInnerHTML e ("" :: String)
290+ _ <- appendChild e df
110291 return ()
111292
112293{-# INLINABLE attachWidget' #-}
113−attachWidget' :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> JSM (a, FireCommand Spider (SpiderHost Global))
294+attachWidget' :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> JSM (a, FireCommand DomTimeline DomHost)
114295attachWidget' rootElement jsSing w = do
115296 doc <- getOwnerDocumentUnchecked rootElement
116− df <- createDocumentFragmentUnchecked doc
117− ((a, events), fc) <- liftIO . attachWidget'' $ \events -> do
297+ df <- createDocumentFragment doc
298+ ((a, events), fc) <- liftIO . attachImmediateWidget $ \hydrationMode events -> do
118299 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
119− let builderEnv = ImmediateDomBuilderEnv
120− { _immediateDomBuilderEnv_document = toDocument doc
121− , _immediateDomBuilderEnv_parent = toNode df
122− , _immediateDomBuilderEnv_events = events
300+ unreadyChildren <- liftIO $ newIORef 0
301+ delayed <- liftIO $ newIORef $ pure ()
302+ let builderEnv = HydrationDomBuilderEnv
303+ { _hydrationDomBuilderEnv_document = toDocument doc
304+ , _hydrationDomBuilderEnv_parent = Left $ toNode df
305+ , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
306+ , _hydrationDomBuilderEnv_commitAction = return () --TODO
307+ , _hydrationDomBuilderEnv_switchover = never
308+ , _hydrationDomBuilderEnv_delayed = delayed
309+ , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
123310 }
124− a <- runWithJSContextSingleton (runImmediateDomBuilderT (runPostBuildT w postBuild) builderEnv) jsSing
311+ a <- runWithJSContextSingleton (runPostBuildT (runHydrationDomBuilderT w builderEnv events) postBuild) jsSing
125312 return ((a, events), postBuildTriggerRef)
126313 replaceElementContents rootElement df
127314 liftIO $ processAsyncEvents events fc
128315 return (a, fc)
129316
130−type EventChannel = Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
317+type EventChannel = Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
131318
132−{-# INLINABLE attachWidget'' #-}
133−attachWidget'' :: (EventChannel -> PerformEventT Spider (SpiderHost Global) (a, IORef (Maybe (EventTrigger Spider ())))) -> IO (a, FireCommand Spider (SpiderHost Global))
134−attachWidget'' w = do
319+{-# INLINABLE attachImmediateWidget #-}
320+attachImmediateWidget
321+ :: ( IORef HydrationMode
322+ -> EventChannel
323+ -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
324+ )
325+ -> IO (a, FireCommand DomTimeline DomHost)
326+attachImmediateWidget w = do
327+ hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
135328 events <- newChan
136− runSpiderHost $ do
137− ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w events
329+ runDomHost $ do
330+ ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w hydrationMode events
138331 mPostBuildTrigger <- readRef postBuildTriggerRef
139332 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
140333 return (result, fc)
141334
142−processAsyncEvents :: EventChannel -> FireCommand Spider (SpiderHost Global) -> IO ()
335+processAsyncEvents :: EventChannel -> FireCommand DomTimeline DomHost -> IO ()
143336processAsyncEvents events (FireCommand fire) = void $ forkIO $ forever $ do
144337 ers <- readChan events
145− _ <- runSpiderHost $ do
338+ _ <- runDomHost $ do
146339 mes <- liftIO $ forM ers $ \(EventTriggerRef er :=> TriggerInvocation a _) -> do
147340 me <- readIORef er
148341 return $ fmap (\e -> e :=> Identity a) me
@@ -150,7 +343,6 @@ processAsyncEvents events (FireCommand fire) = void $ forkIO $ forever $ do
150343 liftIO $ forM_ ers $ \(_ :=> TriggerInvocation _ cb) -> cb
151344 return ()
152345
153−
154346-- | Run a reflex-dom application inside of an existing DOM element with the given ID
155347mainWidgetInElementById :: Text -> (forall x. Widget x ()) -> JSM ()
156348mainWidgetInElementById eid w = withJSContextSingleton $ \jsSing -> do
@@ -158,22 +350,27 @@ mainWidgetInElementById eid w = withJSContextSingleton $ \jsSing -> do
158350 root <- getElementByIdUnchecked doc eid
159351 attachWidget root jsSing w
160352
161−data AppInput t = AppInput
353+newtype AppInput t = AppInput
162354 { _appInput_window :: Window t
163355 }
164356
165−data AppOutput t = AppOutput --TODO: Add quit event
357+newtype AppOutput t = AppOutput --TODO: Add quit event
166358 { _appOutput_windowConfig :: WindowConfig t
167359 }
168360
169−runApp' :: (t ~ Spider) => (forall x. AppInput t -> Widget x (AppOutput t)) -> JSM ()
361+runApp' :: (t ~ DomTimeline) => (forall x. AppInput t -> Widget x (AppOutput t)) -> JSM ()
170362runApp' app = withJSContextSingleton $ \jsSing -> do
171363 doc <- currentDocumentUnchecked
172364 body <- getBodyUnchecked doc
173365 win <- getDefaultViewUnchecked doc
174366 rec o <- attachWidget body jsSing $ do
175− w <- lift $ wrapWindow win $ _appOutput_windowConfig o
367+ w <- wrapWindow win $ _appOutput_windowConfig o
176368 app $ AppInput
177369 { _appInput_window = w
178370 }
179371 return ()
372+
373+{-# DEPRECATED attachWidget'' "Use 'attachImmediateWidget . const' instead" #-}
374+{-# INLINABLE attachWidget'' #-}
375+attachWidget'' :: (EventChannel -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))) -> IO (a, FireCommand DomTimeline DomHost)
376+attachWidget'' = attachImmediateWidget . const
reflex-dom-core/src/Reflex/Dom/Modals/Class.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE MultiParamTypeClasses #-}
2+module Reflex.Dom.Modals.Class where
3+
4+import Reflex
5+
6+class ModalOpener t m where
7+ requestingModal :: Event t (m (Event t a)) -> m (Event t (Maybe a))
reflex-dom-core/src/Reflex/Dom/Old.hs+22−26
@@ -1,6 +1,5 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE ConstraintKinds #-}
3−{-# LANGUAGE ExplicitForAll #-}
43{-# LANGUAGE FlexibleContexts #-}
54{-# LANGUAGE FlexibleInstances #-}
65{-# LANGUAGE MultiParamTypeClasses #-}
@@ -61,17 +60,16 @@ import Data.Dependent.Map as DMap
6160import Data.Functor.Misc
6261import Data.Map (Map)
6362import qualified Data.Map as Map
64−import Data.Maybe
6563import Data.Set (Set)
6664import qualified Data.Set as Set
67−import Data.Text
65+import Data.Text (Text)
6866import Foreign.JavaScript.TH
6967import qualified GHCJS.DOM.Element as Element
7068import GHCJS.DOM.EventM (EventM)
7169import GHCJS.DOM.NamedNodeMap as NNM
72−import GHCJS.DOM.Node (getFirstChild, getNodeName, removeChildUnchecked)
70+import GHCJS.DOM.Node (getFirstChild, getNodeName, removeChild)
7371import GHCJS.DOM.Types
74− (MonadJSM, liftJSM, JSM, IsElement, IsNode)
72+ (liftJSM, JSM, IsHTMLElement, IsNode)
7573import qualified GHCJS.DOM.Types as DOM
7674import Reflex.Class
7775import Reflex.Dom.Builder.Class
@@ -104,7 +102,6 @@ elConfig_attributes f (ElConfig a b) = (\b' -> ElConfig a b') <$> f b
104102{-# INLINE elConfig_attributes #-}
105103#endif
106104
107−--TODO: HasDocument is still not accounted for
108105type MonadWidgetConstraints t m =
109106 ( DomBuilder t m
110107 , DomBuilderSpace m ~ GhcjsDomSpace
@@ -117,12 +114,13 @@ type MonadWidgetConstraints t m =
117114 , MonadIO m
118115 , MonadIO (Performable m)
119116#ifndef ghcjs_HOST_OS
120− , MonadJSM m
121− , MonadJSM (Performable m)
117+ , DOM.MonadJSM m
118+ , DOM.MonadJSM (Performable m)
122119#endif
123120 , TriggerEvent t m
124121 , HasJSContext m
125122 , HasJSContext (Performable m)
123+ , HasDocument m
126124 , MonadRef m
127125 , Ref m ~ Ref IO
128126 , MonadRef (Performable m)
@@ -161,7 +159,7 @@ instance Attributes m (Map Text Text) t where
161159 let cfg = def & elementConfig_namespace .~ ns
162160 buildElementCommon elementTag child =<< addStaticAttributes attrs cfg
163161
164−addStaticAttributes :: Applicative m => Map Text Text -> ElementConfig er t m -> m (ElementConfig er t m)
162+addStaticAttributes :: Applicative m => Map Text Text -> ElementConfig er t (DomBuilderSpace m) -> m (ElementConfig er t (DomBuilderSpace m))
165163addStaticAttributes attrs cfg = do
166164 let initialAttrs = Map.fromList $ first (AttributeName Nothing) <$> Map.toList attrs
167165 pure $ cfg & elementConfig_initialAttributes .~ initialAttrs
@@ -171,16 +169,16 @@ instance PostBuild t m => Attributes m (Dynamic t (Map Text Text)) t where
171169 let cfg = def & elementConfig_namespace .~ ns
172170 buildElementCommon elementTag child =<< addDynamicAttributes attrs cfg
173171
174−addDynamicAttributes :: PostBuild t m => Dynamic t (Map Text Text) -> ElementConfig er t m -> m (ElementConfig er t m)
172+addDynamicAttributes :: PostBuild t m => Dynamic t (Map Text Text) -> ElementConfig er t (DomBuilderSpace m) -> m (ElementConfig er t (DomBuilderSpace m))
175173addDynamicAttributes attrs cfg = do
176174 modifyAttrs <- dynamicAttributesToModifyAttributes attrs
177175 return $ cfg & elementConfig_modifyAttributes .~ fmap mapKeysToAttributeName modifyAttrs
178176
179−buildElementCommon :: MonadWidget t m => Text -> m a -> ElementConfig er t m -> m (Element er (DomBuilderSpace m) t, a)
177+buildElementCommon :: MonadWidget t m => Text -> m a -> ElementConfig er t (DomBuilderSpace m) -> m (Element er (DomBuilderSpace m) t, a)
180178buildElementCommon elementTag child cfg = element elementTag cfg child
181179
182180
183−onEventName :: IsElement e => EventName en -> e -> EventM e (EventType en) () -> JSM (JSM ())
181+onEventName :: IsHTMLElement e => EventName en -> e -> EventM e (EventType en) () -> JSM (JSM ())
184182onEventName = elementOnEventName
185183
186184schedulePostBuild :: (PostBuild t m, PerformEvent t m) => WidgetHost m () -> m ()
@@ -223,35 +221,33 @@ _el_events :: Element er d t -> EventSelector t (WrapArg er EventName)
223221_el_events = _element_events
224222
225223{-# DEPRECATED _el_keypress "Use 'domEvent Keypress' instead" #-}
226−_el_keypress :: Reflex t => El t -> Event t Int
224+_el_keypress :: Reflex t => El t -> Event t Word
227225_el_keypress = domEvent Keypress
228226
229227{-# DEPRECATED _el_scrolled "Use 'domEvent Scroll' instead" #-}
230−_el_scrolled :: Reflex t => El t -> Event t Int
228+_el_scrolled :: Reflex t => El t -> Event t Double
231229_el_scrolled = domEvent Scroll
232230
233−wrapElement :: forall t m. MonadWidget t m => (forall en. DOM.Element -> EventName en -> EventM DOM.Element (EventType en) (Maybe (EventResult en))) -> DOM.Element -> m (El t)
231+wrapElement :: forall t m. MonadWidget t m => (forall en. DOM.HTMLElement -> EventName en -> EventM DOM.Element (EventType en) (Maybe (EventResult en))) -> DOM.HTMLElement -> m (El t)
234232wrapElement eh e = do
235233 let h :: (EventName en, GhcjsDomEvent en) -> JSM (Maybe (EventResult en))
236234 h (en, GhcjsDomEvent evt) = runReaderT (eh e en) evt
237− wrapRawElement e $ (def :: RawElementConfig EventResult t m)
235+ wrapRawElement (DOM.toElement e) $ (def :: RawElementConfig EventResult t (DomBuilderSpace m))
238236 { _rawElementConfig_eventSpec = def
239237 { _ghcjsEventSpec_handler = GhcjsEventHandler h
240238 }
241239 }
242240
243−unsafePlaceElement :: MonadWidget t m => DOM.Element -> m (Element EventResult (DomBuilderSpace m) t)
241+unsafePlaceElement :: MonadWidget t m => DOM.HTMLElement -> m (Element EventResult (DomBuilderSpace m) t)
244242unsafePlaceElement e = do
245− placeRawElement e
246− wrapRawElement e def
243+ placeRawElement $ DOM.toElement e
244+ wrapRawElement (DOM.toElement e) def
247245
248246namedNodeMapGetNames :: DOM.NamedNodeMap -> JSM (Set Text)
249247namedNodeMapGetNames self = do
250248 l <- NNM.getLength self
251− let locations = if l == 0 then [] else [0..l-1] -- Can't use 0..l-1 if l is 0 because l is unsigned and will wrap around
252− fmap (Set.fromList . catMaybes) $ forM locations $ \i -> do
253− n <- NNM.itemUnchecked self i
254− getNodeName n
249+ Set.fromList <$> forM (take (fromIntegral l) [0..]) (
250+ NNM.itemUnchecked self >=> getNodeName)
255251
256252nodeClear :: IsNode self => self -> JSM ()
257253nodeClear n = do
@@ -259,14 +255,14 @@ nodeClear n = do
259255 case mfc of
260256 Nothing -> return ()
261257 Just fc -> do
262− _ <- removeChildUnchecked n $ Just fc
258+ _ <- removeChild n fc
263259 nodeClear n
264260
265261elStopPropagationNS :: forall t m en a. (MonadWidget t m) => Maybe Text -> Text -> EventName en -> m a -> m a
266262elStopPropagationNS ns elementTag en child = do
267263 let f = GhcjsEventFilter $ \_ -> do
268264 return (stopPropagation, return Nothing)
269− cfg = (def :: ElementConfig EventResult t m)
265+ cfg = (def :: ElementConfig EventResult t (DomBuilderSpace m))
270266 & namespace .~ ns
271267 & elementConfig_eventSpec . ghcjsEventSpec_filters %~ DMap.insert en f
272268 snd <$> element elementTag cfg child
@@ -276,7 +272,7 @@ elDynHtmlAttr' elementTag attrs html = do
276272 let cfg = def & initialAttributes .~ Map.mapKeys (AttributeName Nothing) attrs
277273 (e, _) <- element elementTag cfg $ return ()
278274 postBuild <- getPostBuild
279− performEvent_ $ liftJSM . Element.setInnerHTML (_element_raw e) . Just <$> leftmost [updated html, tag (current html) postBuild]
275+ performEvent_ $ liftJSM . Element.setInnerHTML (_element_raw e) <$> leftmost [updated html, tag (current html) postBuild]
280276 return e
281277
282278elDynHtml' :: MonadWidget t m => Text -> Dynamic t Text -> m (Element EventResult GhcjsDomSpace t)
reflex-dom-core/src/Reflex/Dom/Prerender.hsnew file+326
@@ -0,0 +1,326 @@
1+{-# LANGUAGE ConstraintKinds #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE EmptyCase #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# LANGUAGE FlexibleInstances #-}
6+{-# LANGUAGE FunctionalDependencies #-}
7+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
8+{-# LANGUAGE LambdaCase #-}
9+{-# LANGUAGE OverloadedStrings #-}
10+{-# LANGUAGE Rank2Types #-}
11+{-# LANGUAGE RecursiveDo #-}
12+{-# LANGUAGE ScopedTypeVariables #-}
13+{-# LANGUAGE TypeFamilies #-}
14+{-# LANGUAGE UndecidableInstances #-}
15+{-# LANGUAGE UndecidableSuperClasses #-}
16+
17+-- | Render the first widget on the server, and the second on the client.
18+module Reflex.Dom.Prerender
19+ ( Prerender (..)
20+ , prerender_
21+ , PrerenderClientConstraint
22+ , PrerenderBaseConstraints
23+ ) where
24+
25+import Control.Monad.Primitive (PrimMonad(..))
26+import Control.Monad.Reader
27+import Control.Monad.Ref (MonadRef(..), MonadAtomicRef(..))
28+import Data.IORef (IORef, newIORef)
29+import Data.Semigroup (Semigroup)
30+import Data.Text (Text)
31+import Data.Void
32+import Foreign.JavaScript.TH
33+import GHCJS.DOM.Types (MonadJSM)
34+import Reflex hiding (askEvents)
35+import Reflex.Dom.Builder.Class
36+import Reflex.Dom.Builder.Hydratable
37+import Reflex.Dom.Builder.Immediate
38+import Reflex.Dom.Builder.InputDisabled
39+import Reflex.Dom.Builder.Static
40+import Reflex.Host.Class
41+import Data.IntMap.Strict (IntMap)
42+import qualified Data.IntMap.Strict as IntMap
43+
44+import qualified GHCJS.DOM.Document as Document
45+import qualified GHCJS.DOM.Node as Node
46+import qualified GHCJS.DOM.Types as DOM
47+
48+type PrerenderClientConstraint js t m =
49+ ( DomBuilder t m
50+ , DomBuilderSpace m ~ GhcjsDomSpace
51+ , DomRenderHook t m
52+ , HasDocument m
53+ , TriggerEvent t m
54+ , PrerenderBaseConstraints js t m
55+ )
56+
57+type PrerenderBaseConstraints js t m =
58+ ( HasJSContext (Performable m)
59+ , HasJSContext m
60+ , MonadFix m
61+ , MonadHold t m
62+ , MonadJSM (Performable m)
63+ , MonadJSM m
64+ , MonadRef (Performable m)
65+ , MonadRef m
66+ , MonadReflexCreateTrigger t m
67+ , MonadSample t (Performable m)
68+ , PerformEvent t m
69+ , PostBuild t m
70+ , PrimMonad m
71+ , Ref (Performable m) ~ IORef
72+ , Ref m ~ IORef
73+ , HasJS js m
74+ , HasJS js (Performable m)
75+ )
76+
77+-- | Render the first widget on the server, and the second on the client. The
78+-- hydration builder will run *both* widgets.
79+prerender_
80+ :: (Functor m, Reflex t, Prerender js t m)
81+ => m () -> Client m () -> m ()
82+prerender_ server client = void $ prerender server client
83+
84+class (PrerenderClientConstraint js t (Client m), Client (Client m) ~ Client m, Prerender js t (Client m)) => Prerender js t m | m -> t js where
85+ -- | Monad in which the client widget is built
86+ type Client m :: * -> *
87+ -- | Render the first widget on the server, and the second on the client. The
88+ -- hydration builder will run *both* widgets, updating the result dynamic at
89+ -- switchover time.
90+ prerender :: m a -> Client m a -> m (Dynamic t a)
91+
92+instance (ReflexHost t, Adjustable t m, PrerenderBaseConstraints js t m) => Prerender js t (HydrationDomBuilderT GhcjsDomSpace t m) where
93+ type Client (HydrationDomBuilderT GhcjsDomSpace t m) = HydrationDomBuilderT GhcjsDomSpace t m
94+ prerender _ client = pure <$> client
95+
96+instance (Adjustable t m, PrerenderBaseConstraints js t m, ReflexHost t) => Prerender js t (HydrationDomBuilderT HydrationDomSpace t m) where
97+ -- | PostBuildT is needed here because we delay running the client builder
98+ -- until after switchover, at which point the postBuild of @m@ has already fired
99+ type Client (HydrationDomBuilderT HydrationDomSpace t m) = PostBuildT t (HydrationDomBuilderT GhcjsDomSpace t m)
100+ -- | Runs the server widget up until switchover, then replaces it with the
101+ -- client widget.
102+ prerender server client = do
103+ env <- HydrationDomBuilderT ask
104+ events <- askEvents
105+ doc <- askDocument
106+ serverDf <- Document.createDocumentFragment doc -- server dom should not be mounted in the window's doc in hydration
107+ df <- Document.createDocumentFragment doc
108+ unreadyChildren <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_unreadyChildren
109+ immediateMode <- liftIO $ newIORef HydrationMode_Immediate
110+ delayed <- liftIO $ newIORef $ pure ()
111+ let clientEnv = env
112+ { _hydrationDomBuilderEnv_parent = Left $ DOM.toNode df
113+ , _hydrationDomBuilderEnv_hydrationMode = immediateMode
114+ }
115+ serverEnv = HydrationDomBuilderEnv
116+ { _hydrationDomBuilderEnv_document = doc
117+ , _hydrationDomBuilderEnv_parent = Left $ DOM.toNode serverDf
118+ , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
119+ , _hydrationDomBuilderEnv_commitAction = pure ()
120+ , _hydrationDomBuilderEnv_delayed = delayed
121+ , _hydrationDomBuilderEnv_hydrationMode = immediateMode
122+ , _hydrationDomBuilderEnv_switchover = never
123+ }
124+ a0 <- lift $ runHydrationDomBuilderT server serverEnv events
125+ (a', trigger) <- newTriggerEvent
126+ getHydrationMode >>= \case
127+ HydrationMode_Immediate -> do
128+ liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') clientEnv events
129+ append $ DOM.toNode df
130+ HydrationMode_Hydrating -> addHydrationStep $ do
131+ liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') clientEnv events
132+ insertBefore df =<< deleteToPrerenderEnd doc
133+ holdDyn a0 a'
134+
135+newtype UnrunnableT js t m a = UnrunnableT (ReaderT Void m a)
136+ deriving (Functor, Applicative, Monad, MonadTrans)
137+
138+unrunnable :: UnrunnableT js t m a
139+unrunnable = UnrunnableT $ ReaderT $ \case {}
140+
141+instance (Reflex t, Monad m) => DomBuilder t (UnrunnableT js t m) where
142+ type DomBuilderSpace (UnrunnableT js t m) = GhcjsDomSpace
143+ textNode _ = unrunnable
144+ commentNode _ = unrunnable
145+ element _ _ _ = unrunnable
146+ inputElement _ = unrunnable
147+ textAreaElement _ = unrunnable
148+ selectElement _ _ = unrunnable
149+ placeRawElement _ = unrunnable
150+ wrapRawElement _ _ = unrunnable
151+instance (Reflex t, Monad m) => NotReady t (UnrunnableT js t m) where
152+ notReadyUntil _ = unrunnable
153+ notReady = unrunnable
154+instance (Reflex t, Monad m) => Adjustable t (UnrunnableT js t m) where
155+ runWithReplace _ _ = unrunnable
156+ traverseIntMapWithKeyWithAdjust _ _ _ = unrunnable
157+ traverseDMapWithKeyWithAdjust _ _ _ = unrunnable
158+ traverseDMapWithKeyWithAdjustWithMove _ _ _ = unrunnable
159+instance (Reflex t, Monad m) => PerformEvent t (UnrunnableT js t m) where
160+ type Performable (UnrunnableT js t m) = UnrunnableT js t m
161+ performEvent _ = unrunnable
162+ performEvent_ _ = unrunnable
163+instance Monad m => MonadRef (UnrunnableT js t m) where
164+ type Ref (UnrunnableT js t m) = Ref IO
165+ newRef _ = unrunnable
166+ readRef _ = unrunnable
167+ writeRef _ _ = unrunnable
168+instance Monad m => MonadAtomicRef (UnrunnableT js t m) where
169+ atomicModifyRef _ _ = unrunnable
170+instance Monad m => HasDocument (UnrunnableT js t m) where
171+ askDocument = unrunnable
172+instance Monad m => HasJSContext (UnrunnableT js t m) where
173+ type JSContextPhantom (UnrunnableT js t m) = ()
174+ askJSContext = unrunnable
175+instance Monad m => HasJS JS' (UnrunnableT js t m) where
176+ type JSX (UnrunnableT js t m) = UnrunnableT js t m
177+ liftJS _ = unrunnable
178+instance Monad m => MonadJS JS' (UnrunnableT js t m) where
179+ runJS _ _ = unrunnable
180+ forkJS _ = unrunnable
181+ mkJSUndefined = unrunnable
182+ isJSNull _ = unrunnable
183+ isJSUndefined _ = unrunnable
184+ fromJSBool _ = unrunnable
185+ fromJSString _ = unrunnable
186+ fromJSArray _ = unrunnable
187+ fromJSUint8Array _ = unrunnable
188+ fromJSNumber _ = unrunnable
189+ withJSBool _ _ = unrunnable
190+ withJSString _ _ = unrunnable
191+ withJSNumber _ _ = unrunnable
192+ withJSArray _ _ = unrunnable
193+ withJSUint8Array _ _ = unrunnable
194+ mkJSFun _ = unrunnable
195+ freeJSFun _ = unrunnable
196+ setJSProp _ _ _ = unrunnable
197+ getJSProp _ _ = unrunnable
198+ withJSNode _ _ = unrunnable
199+instance Monad m => TriggerEvent t (UnrunnableT js t m) where
200+ newTriggerEvent = unrunnable
201+ newTriggerEventWithOnComplete = unrunnable
202+ newEventWithLazyTriggerWithOnComplete _ = unrunnable
203+instance Monad m => MonadReflexCreateTrigger t (UnrunnableT js t m) where
204+ newEventWithTrigger _ = unrunnable
205+ newFanEventWithTrigger _ = unrunnable
206+instance Monad m => MonadFix (UnrunnableT js t m) where
207+ mfix _ = unrunnable
208+instance (Monad m, MonadHold t m) => MonadHold t (UnrunnableT js t m) where
209+ hold _ _ = unrunnable
210+ holdDyn _ _ = unrunnable
211+ holdIncremental _ _ = unrunnable
212+ buildDynamic _ _ = unrunnable
213+ headE _ = unrunnable
214+ now = unrunnable
215+instance Monad m => MonadSample t (UnrunnableT js t m) where
216+ sample _ = unrunnable
217+instance Monad m => MonadIO (UnrunnableT js t m) where
218+ liftIO _ = unrunnable
219+#ifndef ghcjs_HOST_OS
220+instance Monad m => MonadJSM (UnrunnableT js t m) where
221+ liftJSM' _ = unrunnable
222+#endif
223+instance (Reflex t, Monad m) => PostBuild t (UnrunnableT js t m) where
224+ getPostBuild = unrunnable
225+instance Monad m => PrimMonad (UnrunnableT js t m) where
226+ type PrimState (UnrunnableT js t m) = PrimState IO
227+ primitive _ = unrunnable
228+instance (Reflex t, Monad m) => DomRenderHook t (UnrunnableT js t m) where
229+ withRenderHook _ _ = unrunnable
230+ requestDomAction _ = unrunnable
231+ requestDomAction_ _ = unrunnable
232+instance (Reflex t, Monad m, MonadHold t m) => Prerender JS' t (UnrunnableT js t m) where
233+ type Client (UnrunnableT js t m) = UnrunnableT js t m
234+ prerender _ _ = unrunnable
235+
236+instance (SupportsStaticDomBuilder t m) => Prerender JS' t (StaticDomBuilderT t m) where
237+ type Client (StaticDomBuilderT t m) = UnrunnableT JS' t m
238+ prerender server _ = do
239+ _ <- commentNode $ CommentNodeConfig startMarker Nothing
240+ a <- server
241+ _ <- commentNode $ CommentNodeConfig endMarker Nothing
242+ pure $ pure a
243+
244+instance (Prerender js t m, Monad m) => Prerender js t (ReaderT r m) where
245+ type Client (ReaderT r m) = ReaderT r (Client m)
246+ prerender server client = do
247+ r <- ask
248+ lift $ prerender (runReaderT server r) (runReaderT client r)
249+
250+instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Monoid w) => Prerender js t (DynamicWriterT t w m) where
251+ type Client (DynamicWriterT t w m) = DynamicWriterT t w (Client m)
252+ prerender server client = do
253+ x <- lift $ prerender (runDynamicWriterT server) (runDynamicWriterT client)
254+ let (a, w') = splitDynPure x
255+ w = join w'
256+ tellDyn w
257+ pure a
258+
259+instance (Prerender js t m, Monad m, Reflex t, Semigroup w) => Prerender js t (EventWriterT t w m) where
260+ type Client (EventWriterT t w m) = EventWriterT t w (Client m)
261+ prerender server client = do
262+ x <- lift $ prerender (runEventWriterT server) (runEventWriterT client)
263+ let (a, w') = splitDynPure x
264+ w = switch $ current w'
265+ tellEvent w
266+ pure a
267+
268+instance (Prerender js t m, MonadFix m, Reflex t) => Prerender js t (RequesterT t request response m) where
269+ type Client (RequesterT t request response m) = RequesterT t request response (Client m)
270+ prerender server client = mdo
271+ let fannedResponses = fanInt responses
272+ withFannedResponses :: forall m' a. Monad m' => RequesterT t request response m' a -> Int -> m' (a, Event t (IntMap (RequesterData request)))
273+ withFannedResponses w selector = do
274+ (x, e) <- runRequesterT w (selectInt fannedResponses selector)
275+ pure (x, fmapCheap (IntMap.singleton selector) e)
276+ (result, requestsDyn) <- fmap splitDynPure $ lift $ prerender (withFannedResponses server 0) (withFannedResponses client 1)
277+ responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switchPromptlyDyn requestsDyn
278+ return result
279+
280+instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q) => Prerender js t (QueryT t q m) where
281+ type Client (QueryT t q m) = QueryT t q (Client m)
282+ prerender server client = mdo
283+ result <- queryDyn query
284+ x <- lift $ prerender (runQueryT server result) (runQueryT client result)
285+ let (a, inc) = splitDynPure x
286+ query = incrementalToDynamic =<< inc -- Can we avoid the incrementalToDynamic?
287+ pure a
288+
289+instance (Prerender js t m, Monad m) => Prerender js t (InputDisabledT m) where
290+ type Client (InputDisabledT m) = InputDisabledT (Client m)
291+ prerender (InputDisabledT server) (InputDisabledT client) = InputDisabledT $ prerender server client
292+
293+instance (Prerender js t m, Monad m) => Prerender js t (HydratableT m) where
294+ type Client (HydratableT m) = HydratableT (Client m)
295+ prerender (HydratableT server) (HydratableT client) = HydratableT $ prerender server client
296+
297+instance (Prerender js t m, Monad m, ReflexHost t) => Prerender js t (PostBuildT t m) where
298+ type Client (PostBuildT t m) = PostBuildT t (Client m)
299+ prerender server client = PostBuildT $ do
300+ pb <- ask
301+ lift $ prerender (runPostBuildT server pb) (runPostBuildT client pb)
302+
303+startMarker, endMarker :: Text
304+startMarker = "prerender/start"
305+endMarker = "prerender/end"
306+
307+deleteToPrerenderEnd :: (MonadIO m, MonadJSM m, Reflex t, MonadFix m) => DOM.Document -> HydrationRunnerT t m DOM.Comment
308+deleteToPrerenderEnd doc = do
309+ startNode <- hydrateComment doc startMarker Nothing
310+ let go (n :: Int) lastNode = Node.getNextSibling lastNode >>= \case
311+ Nothing -> do
312+ c <- Document.createComment doc endMarker
313+ insertAfterPreviousNode c
314+ pure c
315+ Just node -> DOM.castTo DOM.Comment node >>= \case
316+ Nothing -> go n node
317+ Just c -> Node.getTextContentUnchecked c >>= \case
318+ t | t == startMarker -> go (succ n) node
319+ | t == endMarker -> case n of
320+ 0 -> pure c
321+ _ -> go (pred n) node
322+ | otherwise -> go n node
323+ endNode <- go 0 $ DOM.toNode startNode
324+ deleteBetweenExclusive startNode endNode
325+ setPreviousNode $ Just $ DOM.toNode endNode
326+ pure endNode
reflex-dom-core/src/Reflex/Dom/Time.hs+2−217
@@ -1,218 +1,3 @@
1−{-# LANGUAGE DeriveDataTypeable #-}
2−{-# LANGUAGE FlexibleContexts #-}
3−{-# LANGUAGE MultiParamTypeClasses #-}
4−{-# LANGUAGE RecursiveDo #-}
5−{-# LANGUAGE ScopedTypeVariables #-}
6−{-# LANGUAGE TypeFamilies #-}
7−module Reflex.Dom.Time where
1+module Reflex.Dom.Time {-# DEPRECATED "Use Reflex.Time instead" #-} (module Reflex.Time) where
82
9−import Reflex.Class
10−import Reflex.Dynamic
11−import Reflex.PerformEvent.Class
12−import Reflex.PostBuild.Class
13−import Reflex.TriggerEvent.Class
14−
15−import Control.Concurrent
16−import qualified Control.Concurrent.Thread.Delay as Concurrent
17−import Control.Monad
18−import Control.Monad.Fix
19−import Control.Monad.IO.Class
20−import Data.Align
21−import Data.Fixed
22−import Data.Sequence (Seq, (|>))
23−import qualified Data.Sequence as Seq
24−import Data.These
25−import Data.Time.Clock
26−import Data.Typeable
27−import System.Random
28−
29−data TickInfo
30− = TickInfo { _tickInfo_lastUTC :: UTCTime
31− -- ^ UTC time immediately after the last tick.
32− , _tickInfo_n :: Integer
33− -- ^ Number of time periods since t0
34− , _tickInfo_alreadyElapsed :: NominalDiffTime
35− -- ^ Amount of time already elapsed in the current tick period.
36− }
37− deriving (Eq, Ord, Show, Typeable)
38−
39−-- | Special case of tickLossyFrom that uses the post-build event to start the
40−-- tick thread.
41−tickLossy :: (PostBuild t m, PerformEvent t m, TriggerEvent t m, MonadIO (Performable m), MonadFix m) => NominalDiffTime -> UTCTime -> m (Event t TickInfo)
42−tickLossy dt t0 = tickLossyFrom dt t0 =<< getPostBuild
43−
44−-- | Send events over time with the given basis time and interval
45−-- If the system starts running behind, occurrences will be dropped rather than buffered
46−-- Each occurrence of the resulting event will contain the index of the current interval, with 0 representing the basis time
47−tickLossyFrom
48− :: (PerformEvent t m, TriggerEvent t m, MonadIO (Performable m), MonadFix m)
49− => NominalDiffTime
50− -> UTCTime
51− -> Event t a
52− -- ^ Event that starts a tick generation thread. Usually you want this to
53− -- be something like the result of getPostBuild that only fires once. But
54− -- there could be uses for starting multiple timer threads.
55− -> m (Event t TickInfo)
56−tickLossyFrom dt t0 e = tickLossyFrom' $ (dt, t0) <$ e
57−
58−-- | Generalization of tickLossyFrom that takes dt and t0 in the event.
59−tickLossyFrom'
60− :: (PerformEvent t m, TriggerEvent t m, MonadIO (Performable m), MonadFix m)
61− => Event t (NominalDiffTime, UTCTime)
62− -- ^ Event that starts a tick generation thread. Usually you want this to
63− -- be something like the result of getPostBuild that only fires once. But
64− -- there could be uses for starting multiple timer threads.
65− -> m (Event t TickInfo)
66−tickLossyFrom' e = do
67− rec result <- performEventAsync $ callAtNextInterval <$> leftmost [e, snd <$> result]
68− return $ fst <$> result
69− where callAtNextInterval pair cb = void $ liftIO $ forkIO $ do
70− tick <- uncurry getCurrentTick pair
71− Concurrent.delay $ ceiling $ (fst pair - _tickInfo_alreadyElapsed tick) * 1000000
72− cb (tick, pair)
73−
74−clockLossy :: (MonadIO m, PerformEvent t m, TriggerEvent t m, MonadIO (Performable m), PostBuild t m, MonadHold t m, MonadFix m) => NominalDiffTime -> UTCTime -> m (Dynamic t TickInfo)
75−clockLossy dt t0 = do
76− initial <- liftIO $ getCurrentTick dt t0
77− e <- tickLossy dt t0
78− holdDyn initial e
79−
80−getCurrentTick :: NominalDiffTime -> UTCTime -> IO TickInfo
81−getCurrentTick dt t0 = do
82− t <- getCurrentTime
83− let offset = t `diffUTCTime` t0
84− (n, alreadyElapsed) = offset `divMod'` dt
85− return $ TickInfo t n alreadyElapsed
86−
87−-- | Delay an Event's occurrences by a given amount in seconds.
88−delay :: (PerformEvent t m, TriggerEvent t m, MonadIO (Performable m)) => NominalDiffTime -> Event t a -> m (Event t a)
89−delay dt e = performEventAsync $ ffor e $ \a cb -> liftIO $ void $ forkIO $ do
90− Concurrent.delay $ ceiling $ dt * 1000000
91− cb a
92−
93−-- | Send events with Poisson timing with the given basis and rate
94−-- Each occurence of the resulting event will contain the index of
95−-- the current interval, with 0 representing the basis time
96−poissonLossyFrom
97− :: (RandomGen g, MonadIO (Performable m), PerformEvent t m, TriggerEvent t m)
98− => g
99− -> Double
100− -- ^ Poisson event rate (Hz)
101− -> UTCTime
102− -- ^ Baseline time for events
103− -> Event t a
104− -- ^ Event that starts a tick generation thread. Usually you want this to
105− -- be something like the result of getPostBuild that only fires once. But
106− -- there could be uses for starting multiple timer threads.
107− -- Start sending events in response to the event parameter.
108− -> m (Event t TickInfo)
109−poissonLossyFrom rnd rate = inhomogeneousPoissonFrom rnd (constant rate) rate
110−
111−
112−-- | Send events with Poisson timing with the given basis and rate
113−-- Each occurence of the resulting event will contain the index of
114−-- the current interval, with 0 representing the basis time.
115−-- Automatically begin sending events when the DOM is built
116−poissonLossy
117− :: (RandomGen g, MonadIO (Performable m), PerformEvent t m, TriggerEvent t m, PostBuild t m)
118− => g
119− -> Double
120− -- ^ Poisson event rate (Hz)
121− -> UTCTime
122− -- ^ Baseline time for events
123− -> m (Event t TickInfo)
124−poissonLossy rnd rate t0 = poissonLossyFrom rnd rate t0 =<< getPostBuild
125−
126−-- | Send events with inhomogeneous Poisson timing with the given basis
127−-- and variable rate. Provide a maxRate that you expect to support.
128−inhomogeneousPoissonFrom
129− :: (RandomGen g, MonadIO (Performable m), PerformEvent t m, TriggerEvent t m)
130− => g
131− -> Behavior t Double
132− -> Double
133− -> UTCTime
134− -> Event t a
135− -> m (Event t TickInfo)
136−inhomogeneousPoissonFrom rnd rate maxRate t0 e = do
137−
138− -- Create a thread for producing homogeneous poisson events
139− -- along with random Doubles (usage of Double's explained below)
140− ticksWithRateRand <- performEventAsync $
141− fmap callAtNextInterval e
142−
143− -- Filter homogeneous events according to associated
144− -- random values and the current rate parameter
145− return $ attachWithMaybe filterFun rate ticksWithRateRand
146−
147− where
148−
149− -- Inhomogeneous poisson processes are built from faster
150− -- homogeneous ones by randomly dropping events from the
151− -- fast process. For each fast homogeneous event, choose
152− -- a uniform random sample from (0, rMax). If the
153− -- inhomogeneous rate at this moment is greater than the
154− -- random sample, then keep this event, otherwise drop it
155− filterFun :: Double -> (TickInfo, Double) -> Maybe TickInfo
156− filterFun r (tInfo, p)
157− | r >= p = Just tInfo
158− | otherwise = Nothing
159−
160− callAtNextInterval _ cb = void $ liftIO $ forkIO $ go t0 rnd cb 0
161−
162− go tTargetLast lastGen cb lastN = do
163− t <- getCurrentTime
164−
165− -- Generate random numbers for this poisson interval (u)
166− -- and sample-retention likelihood (p)
167− let (u, nextGen) = randomR (0,1) lastGen
168− (p :: Double, nextGen') = randomR (0,maxRate) nextGen
169−
170− -- Inter-event interval is drawn from exponential
171− -- distribution accourding to u
172− let dt = realToFrac $ (-1) * log u / maxRate :: NominalDiffTime
173− nEvents = lastN + 1
174− alreadyElapsed = diffUTCTime t tTargetLast
175− tTarget = addUTCTime dt tTargetLast
176− thisDelay = realToFrac $ diffUTCTime tTarget t :: Double
177− Concurrent.delay $ ceiling $ thisDelay * 1000000
178− _ <- cb (TickInfo t nEvents alreadyElapsed, p)
179− go tTarget nextGen' cb nEvents
180−
181−-- | Send events with inhomogeneous Poisson timing with the given basis
182−-- and variable rate. Provide a maxRate that you expect to support
183−inhomogeneousPoisson
184− :: (RandomGen g, MonadIO (Performable m), PerformEvent t m, TriggerEvent t m, PostBuild t m)
185− => g
186− -> Behavior t Double
187− -> Double
188− -> UTCTime
189− -> m (Event t TickInfo)
190−inhomogeneousPoisson rnd rate maxRate t0 =
191− inhomogeneousPoissonFrom rnd rate maxRate t0 =<< getPostBuild
192−
193−-- | Block occurrences of an Event until the given number of seconds elapses without
194−-- the Event firing, at which point the last occurrence of the Event will fire.
195−debounce :: (MonadFix m, MonadHold t m, PerformEvent t m, TriggerEvent t m, MonadIO (Performable m)) => NominalDiffTime -> Event t a -> m (Event t a)
196−debounce dt e = do
197− n :: Dynamic t Integer <- count e
198− let tagged = attachPromptlyDynWith (,) n e
199− delayed <- delay dt tagged
200− return $ attachWithMaybe (\n' (t, v) -> if n' == t then Just v else Nothing) (current n) delayed
201−
202−-- | When the given 'Event' occurs, wait the given amount of time and collect
203−-- all occurrences during that time. Then, fire the output 'Event' with the
204−-- collected output.
205−batchOccurrences :: (MonadFix m, MonadHold t m, PerformEvent t m, TriggerEvent t m, MonadIO (Performable m)) => NominalDiffTime -> Event t a -> m (Event t (Seq a))
206−batchOccurrences t newValues = do
207− let f s x = (Just newState, out)
208− where newState = case x of
209− This a -> s |> a
210− That _ -> mempty
211− These a _ -> Seq.singleton a
212− out = case x of
213− This _ -> if Seq.null s then Just () else Nothing
214− That _ -> Nothing
215− These _ _ -> Just ()
216− rec (buffer, toDelay) <- mapAccumMaybe f mempty $ align newValues delayed
217− delayed <- delay t toDelay
218− return $ tag buffer delayed
3+import Reflex.Time
reflex-dom-core/src/Reflex/Dom/WebSocket.hs+59−17
@@ -9,6 +9,7 @@
99{-# LANGUAGE GADTs #-}
1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1111{-# LANGUAGE JavaScriptFFI #-}
12+{-# LANGUAGE LambdaCase #-}
1213{-# LANGUAGE MultiParamTypeClasses #-}
1314{-# LANGUAGE NoMonomorphismRestriction #-}
1415{-# LANGUAGE PolyKinds #-}
@@ -22,7 +23,10 @@
2223{-# LANGUAGE TypeFamilies #-}
2324{-# LANGUAGE UndecidableInstances #-}
2425
25−module Reflex.Dom.WebSocket where
26+module Reflex.Dom.WebSocket
27+ ( module Reflex.Dom.WebSocket
28+ , jsonDecode
29+ ) where
2630
2731import Prelude hiding (all, concat, concatMap, div, mapM, mapM_, sequence, span)
2832
@@ -35,27 +39,35 @@ import Reflex.TriggerEvent.Class
3539
3640import Control.Concurrent
3741import Control.Concurrent.STM
38−import Control.Exception (SomeException)
42+import Control.Exception
3943import Control.Lens
4044import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)
4145import Control.Monad.IO.Class
4246import Control.Monad.State
47+import Data.Aeson
4348import Data.ByteString (ByteString)
49+import Data.ByteString.Lazy (toStrict)
4450import Data.Default
4551import Data.IORef
52+import Data.JSString.Text
4653import Data.Maybe (isJust)
4754import Data.Text
55+import Data.Text.Encoding
56+import Foreign.JavaScript.Utils (jsonDecode)
4857import GHCJS.DOM.Types (runJSM, askJSM, MonadJSM, liftJSM, JSM)
58+import GHCJS.DOM.WebSocket (getReadyState)
59+import GHCJS.Marshal
4960import qualified Language.Javascript.JSaddle.Monad as JS (catch)
5061
5162data WebSocketConfig t a
5263 = WebSocketConfig { _webSocketConfig_send :: Event t [a]
5364 , _webSocketConfig_close :: Event t (Word, Text)
5465 , _webSocketConfig_reconnect :: Bool
66+ , _webSocketConfig_protocols :: [Text]
5567 }
5668
5769instance Reflex t => Default (WebSocketConfig t a) where
58− def = WebSocketConfig never never True
70+ def = WebSocketConfig never never True []
5971
6072type WebSocket t = RawWebSocket t ByteString
6173
@@ -71,12 +83,6 @@ data RawWebSocket t a
7183 )
7284 }
7385
74−-- This can be used to send either binary or text messages for the same websocket connection
75−instance (IsWebSocketMessage a, IsWebSocketMessage b) => IsWebSocketMessage (Either a b) where
76− webSocketSend jws (Left a) = webSocketSend jws a
77− webSocketSend jws (Right a) = webSocketSend jws a
78−
79−
8086webSocket :: (MonadJSM m, MonadJSM (Performable m), HasJSContext m, PerformEvent t m, TriggerEvent t m, PostBuild t m, IsWebSocketMessage a) => Text -> WebSocketConfig t a -> m (WebSocket t)
8187webSocket url config = webSocket' url config onBSMessage
8288
@@ -96,11 +102,11 @@ webSocket' url config onRawMessage = do
96102 liftIO $ triggerEClose args
97103 _ <- liftIO $ atomically $ tryTakeTMVar isOpen
98104 liftIO $ writeIORef currentSocketRef Nothing
99− when (_webSocketConfig_reconnect config) $ do
105+ when (_webSocketConfig_reconnect config) $ forkJSM $ do
100106 liftIO $ threadDelay 1000000
101107 start
102108 start = do
103− ws <- newWebSocket wv url (onRawMessage >=> liftIO . onMessage) (liftIO onOpen) (liftIO onError) onClose
109+ ws <- newWebSocket wv url (_webSocketConfig_protocols config) (onRawMessage >=> liftIO . onMessage) (liftIO onOpen) (liftIO onError) onClose
104110 liftIO $ writeIORef currentSocketRef $ Just ws
105111 return ()
106112 performEvent_ . (liftJSM start <$) =<< getPostBuild
@@ -122,26 +128,62 @@ webSocket' url config onRawMessage = do
122128 mws <- liftIO $ readIORef currentSocketRef
123129 success <- case mws of
124130 Nothing -> return False
125− Just ws -> runJSM ((webSocketSend ws payload >> return True)
126− `JS.catch`
127− (\(_ :: SomeException) -> return False)) ctx
131+ Just ws -> flip runJSM ctx $ do
132+ rs <- getReadyState $ unWebSocket ws
133+ if rs == 1
134+ then (webSocketSend ws payload >> return True) `JS.catch` (\(_ :: SomeException) -> return False)
135+ else return False
128136 unless success $ atomically $ unGetTQueue payloadQueue payload
129137 return $ RawWebSocket eRecv eOpen eError eClose
130138
139+textWebSocket :: (IsWebSocketMessage a, MonadJSM m, MonadJSM (Performable m), HasJSContext m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, Reflex t) => Text -> WebSocketConfig t a -> m (RawWebSocket t Text)
140+textWebSocket url cfg = webSocket' url cfg (either (return . decodeUtf8) fromJSValUnchecked)
141+
142+jsonWebSocket :: (ToJSON a, FromJSON b, MonadJSM m, MonadJSM (Performable m), HasJSContext m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, Reflex t) => Text -> WebSocketConfig t a -> m (RawWebSocket t (Maybe b))
143+jsonWebSocket url cfg = do
144+ ws <- textWebSocket url $ cfg { _webSocketConfig_send = fmap (decodeUtf8 . toStrict . encode) <$> _webSocketConfig_send cfg }
145+ return ws { _webSocket_recv = jsonDecode . textToJSString <$> _webSocket_recv ws }
146+
147+forkJSM :: JSM () -> JSM ()
148+forkJSM a = do
149+ jsm <- askJSM
150+ void $ liftIO $ forkIO $ runJSM a jsm
151+
131152#ifdef USE_TEMPLATE_HASKELL
132153makeLensesWith (lensRules & simpleLenses .~ True) ''WebSocketConfig
154+makeLensesWith (lensRules & simpleLenses .~ True) ''RawWebSocket
133155#else
134156
135157webSocketConfig_send :: Lens' (WebSocketConfig t a) (Event t [a])
136−webSocketConfig_send f (WebSocketConfig x1 x2 x3) = (\y -> WebSocketConfig y x2 x3) <$> f x1
158+webSocketConfig_send f (WebSocketConfig x1 x2 x3 x4) = (\y -> WebSocketConfig y x2 x3 x4) <$> f x1
137159{-# INLINE webSocketConfig_send #-}
138160
139161webSocketConfig_close :: Lens' (WebSocketConfig t a) (Event t (Word, Text))
140−webSocketConfig_close f (WebSocketConfig x1 x2 x3) = (\y -> WebSocketConfig x1 y x3) <$> f x2
162+webSocketConfig_close f (WebSocketConfig x1 x2 x3 x4) = (\y -> WebSocketConfig x1 y x3 x4) <$> f x2
141163{-# INLINE webSocketConfig_close #-}
142164
143165webSocketConfig_reconnect :: Lens' (WebSocketConfig t a) Bool
144−webSocketConfig_reconnect f (WebSocketConfig x1 x2 x3) = (\y -> WebSocketConfig x1 x2 y) <$> f x3
166+webSocketConfig_reconnect f (WebSocketConfig x1 x2 x3 x4) = (\y -> WebSocketConfig x1 x2 y x4) <$> f x3
145167{-# INLINE webSocketConfig_reconnect #-}
146168
169+webSocketConfig_protocols :: Lens' (WebSocketConfig t a) [Text]
170+webSocketConfig_protocols f (WebSocketConfig x1 x2 x3 x4) = (\y -> WebSocketConfig x1 x2 x3 y) <$> f x4
171+{-# INLINE webSocketConfig_protocols #-}
172+
173+webSocket_recv :: Lens' (RawWebSocket t a) (Event t a)
174+webSocket_recv f (RawWebSocket x1 x2 x3 x4) = (\y -> RawWebSocket y x2 x3 x4) <$> f x1
175+{-# INLINE webSocket_recv #-}
176+
177+webSocket_open :: Lens' (RawWebSocket t a) (Event t ())
178+webSocket_open f (RawWebSocket x1 x2 x3 x4) = (\y -> RawWebSocket x1 y x3 x4) <$> f x2
179+{-# INLINE webSocket_open #-}
180+
181+webSocket_error :: Lens' (RawWebSocket t a) (Event t ())
182+webSocket_error f (RawWebSocket x1 x2 x3 x4) = (\y -> RawWebSocket x1 x2 y x4) <$> f x3
183+{-# INLINE webSocket_error #-}
184+
185+webSocket_close :: Lens' (RawWebSocket t a) (Event t (Bool, Word, Text))
186+webSocket_close f (RawWebSocket x1 x2 x3 x4) = (\y -> RawWebSocket x1 x2 x3 y) <$> f x4
187+{-# INLINE webSocket_close #-}
188+
147189#endif
reflex-dom-core/src/Reflex/Dom/WebSocket/Foreign.hs+55−50
@@ -12,86 +12,91 @@ module Reflex.Dom.WebSocket.Foreign
1212
1313import Prelude hiding (all, concat, concatMap, div, mapM, mapM_, sequence, span)
1414
15−import Control.Monad.Reader
15+import Data.Bifoldable
1616import Data.ByteString (ByteString)
17−import qualified Data.ByteString as BS
17+import qualified Data.ByteString.Lazy as LBS
1818import Data.Text (Text)
19−import qualified Data.Text as T (unpack)
2019import Data.Text.Encoding
21−import GHCJS.Buffer
20+import Foreign.JavaScript.Utils (bsFromMutableArrayBuffer, bsToArrayBuffer)
2221import GHCJS.DOM.CloseEvent
23−import GHCJS.DOM.EventM (on)
2422import GHCJS.DOM.MessageEvent
25−import GHCJS.DOM.Types hiding (Text)
26−import qualified GHCJS.DOM.WebSocket as GD
23+import GHCJS.DOM.Types (JSM, JSVal, liftJSM, fromJSValUnchecked, WebSocket(..))
24+import qualified GHCJS.DOM.WebSocket as DOM
2725import GHCJS.Foreign (JSType(..), jsTypeOf)
28−import GHCJS.Types
29−import JavaScript.TypedArray.ArrayBuffer as JS
26+import Language.Javascript.JSaddle (fun, eval, toJSVal, call)
3027import Language.Javascript.JSaddle.Helper (mutableArrayBufferFromJSVal)
3128import Language.Javascript.JSaddle.Types (ghcjsPure)
32−#ifndef ghcjs_HOST_OS
33−import Language.Javascript.JSaddle.Object (new, jsg)
34−#endif
3529
36−data JSWebSocket = JSWebSocket { unWebSocket :: WebSocket }
30+newtype JSWebSocket = JSWebSocket { unWebSocket :: WebSocket }
3731
3832class IsWebSocketMessage a where
3933 webSocketSend :: JSWebSocket -> a -> JSM ()
4034
35+instance (IsWebSocketMessage a, IsWebSocketMessage b) => IsWebSocketMessage (Either a b) where
36+ webSocketSend jws = bitraverse_ (webSocketSend jws) (webSocketSend jws)
37+
4138-- Use binary websocket communication for ByteString
4239-- Note: Binary websockets may not work correctly in IE 11 and below
4340instance IsWebSocketMessage ByteString where
4441 webSocketSend (JSWebSocket ws) bs = do
45− (b, off, len) <- ghcjsPure $ fromByteString bs
46− ab <- ArrayBuffer <$> if BS.length bs == 0 --TODO: remove this logic when https://github.com/ghcjs/ghcjs-base/issues/49 is fixed
47− then create 0 >>= ghcjsPure . getArrayBuffer >>= ghcjsPure . jsval
48− else do
49− ref <- ghcjsPure (getArrayBuffer b) >>= ghcjsPure . jsval
50− js_dataView off len ref -- new (jsg "DataView") (ref, off, len)
51− GD.send ws $ Just ab
42+ ab <- bsToArrayBuffer bs
43+ DOM.send ws ab
44+
45+instance IsWebSocketMessage LBS.ByteString where
46+ webSocketSend ws = webSocketSend ws . LBS.toStrict
5247
5348-- Use plaintext websocket communication for Text, and String
5449instance IsWebSocketMessage Text where
55− webSocketSend (JSWebSocket ws) = GD.sendString ws . T.unpack
50+ webSocketSend (JSWebSocket ws) = DOM.sendString ws
5651
5752closeWebSocket :: JSWebSocket -> Word -> Text -> JSM ()
58−closeWebSocket (JSWebSocket ws) = GD.close ws
53+closeWebSocket (JSWebSocket ws) code reason = DOM.close ws (Just code) (Just reason)
5954
6055newWebSocket
6156 :: a
6257 -> Text -- url
58+ -> [Text] -- protocols
6359 -> (Either ByteString JSVal -> JSM ()) -- onmessage
6460 -> JSM () -- onopen
6561 -> JSM () -- onerror
6662 -> ((Bool, Word, Text) -> JSM ()) -- onclose
6763 -> JSM JSWebSocket
68−newWebSocket _ url onMessage onOpen onError onClose = do
69− ws <- GD.newWebSocket url (Just [] :: Maybe [Text])
70− GD.setBinaryType ws "arraybuffer"
71− _ <- on ws GD.open $ liftJSM onOpen
72− _ <- on ws GD.error $ liftJSM onError
73− _ <- on ws GD.closeEvent $ do
74− e <- ask
75− wasClean <- getWasClean e
76− code <- getCode e
77− reason <- getReason e
78− liftJSM $ onClose (wasClean, code, reason)
79− _ <- on ws GD.message $ do
80− e <- ask
81− d <- getData e
82− liftJSM $ ghcjsPure (jsTypeOf d) >>= \case
83− String -> onMessage $ Right d
84− _ -> do
85− ab <- mutableArrayBufferFromJSVal d >>= unsafeFreeze
86− ghcjsPure (createFromArrayBuffer ab) >>= ghcjsPure . toByteString 0 Nothing >>= onMessage . Left
87− return $ JSWebSocket ws
88−
89−#ifdef ghcjs_HOST_OS
90−foreign import javascript safe "new DataView($3,$1,$2)" js_dataView :: Int -> Int -> JSVal -> IO JSVal
91−#else
92−js_dataView :: Int -> Int -> JSVal -> JSM JSVal
93−js_dataView off len ref = new (jsg "DataView") (ref, off, len)
94−#endif
64+newWebSocket _ url protocols onMessage onOpen onError onClose = do
65+ let onOpenWrapped = fun $ \_ _ _ -> onOpen
66+ onErrorWrapped = fun $ \_ _ _ -> onError
67+ onCloseWrapped = fun $ \_ _ (e:_) -> do
68+ let e' = CloseEvent e
69+ wasClean <- getWasClean e'
70+ code <- getCode e'
71+ reason <- getReason e'
72+ liftJSM $ onClose (wasClean, code, reason)
73+ onMessageWrapped = fun $ \_ _ (e:_) -> do
74+ let e' = MessageEvent e
75+ d <- getData e'
76+ liftJSM $ ghcjsPure (jsTypeOf d) >>= \case
77+ String -> onMessage $ Right d
78+ _ -> do
79+ ab <- mutableArrayBufferFromJSVal d
80+ bsFromMutableArrayBuffer ab >>= onMessage . Left
81+ newWS <- eval $ unlines
82+ [ "(function(url, protos, open, error, close, message) {"
83+ , " var ws = new window['WebSocket'](url, protos);"
84+ , " ws['binaryType'] = 'arraybuffer';"
85+ , " ws['addEventListener']('open', open);"
86+ , " ws['addEventListener']('error', error);"
87+ , " ws['addEventListener']('close', close);"
88+ , " ws['addEventListener']('message', message);"
89+ , " return ws;"
90+ , "})"
91+ ]
92+ url' <- toJSVal url
93+ protocols' <- toJSVal protocols
94+ onOpen' <- toJSVal onOpenWrapped
95+ onError' <- toJSVal onErrorWrapped
96+ onClose' <- toJSVal onCloseWrapped
97+ onMessage' <- toJSVal onMessageWrapped
98+ ws <- call newWS newWS [url', protocols', onOpen', onError', onClose', onMessage']
99+ return $ JSWebSocket $ WebSocket ws
95100
96101onBSMessage :: Either ByteString JSVal -> JSM ByteString
97−onBSMessage = either return (\v -> encodeUtf8 <$> fromJSValUnchecked v)
102+onBSMessage = either return $ fmap encodeUtf8 . fromJSValUnchecked
reflex-dom-core/src/Reflex/Dom/WebSocket/Query.hsnew file+37
@@ -0,0 +1,37 @@
1+{-# LANGUAGE FlexibleContexts #-}
2+{-# LANGUAGE RecursiveDo #-}
3+module Reflex.Dom.WebSocket.Query (cropQueryT, runWebSocketQuery) where
4+
5+import Data.Default
6+import Control.Monad.Fix
7+import Data.Text (Text)
8+import Data.Aeson
9+import Reflex
10+import Reflex.Dom.WebSocket
11+import Foreign.JavaScript.TH
12+import Data.Maybe
13+import Language.Javascript.JSaddle.Types (MonadJSM)
14+
15+runWebSocketQuery :: (MonadJSM m, MonadJSM (Performable m), HasJSContext m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, Reflex t, ToJSON q, MonadFix m, Query q, FromJSON (QueryResult q), Additive q, Group q, Eq q)
16+ => QueryT t q m a
17+ -> Text -- ^ WebSocket url
18+ -> m a
19+runWebSocketQuery app url = do
20+ postBuild <- getPostBuild
21+ rec ws <- jsonWebSocket url $ def { _webSocketConfig_send = pure <$> updatedRequest }
22+ (a, request) <- cropQueryT app $ fromMaybe mempty <$> _webSocket_recv ws
23+ let updatedRequest = leftmost [updated request, tag (current request) postBuild]
24+ return a
25+
26+cropQueryT :: (Reflex t, MonadHold t m, MonadFix m, Query q, Additive q, Group q, Eq q)
27+ => QueryT t q m a
28+ -> Event t (QueryResult q)
29+ -> m (a, Dynamic t q)
30+cropQueryT app result = do
31+ rec (a, requestPatch) <- runQueryT app croppedResult
32+ requestUniq <- holdUniqDyn $ incrementalToDynamic requestPatch
33+ croppedResult <- cropDyn requestUniq result
34+ return (a, requestUniq)
35+
36+cropDyn :: (Query q, MonadHold t m, Reflex t, MonadFix m) => Dynamic t q -> Event t (QueryResult q) -> m (Dynamic t (QueryResult q))
37+cropDyn q = foldDyn (\(q', qr) v -> crop q' (qr `mappend` v)) mempty . attach (current q)
reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs+93−230
@@ -3,7 +3,6 @@
33{-# LANGUAGE FlexibleContexts #-}
44{-# LANGUAGE FlexibleInstances #-}
55{-# LANGUAGE GADTs #-}
6−{-# LANGUAGE LambdaCase #-}
76{-# LANGUAGE MultiParamTypeClasses #-}
87{-# LANGUAGE OverloadedStrings #-}
98{-# LANGUAGE RankNTypes #-}
@@ -11,32 +10,18 @@
1110{-# LANGUAGE ScopedTypeVariables #-}
1211{-# LANGUAGE TypeFamilies #-}
1312module Reflex.Dom.Widget.Basic
14− ( partitionMapBySetLT
15− , listHoldWithKey
16− , ChildResult (..)
17−
13+ (
1814 -- * Displaying Values
19− , text
15+ text
2016 , dynText
17+ , comment
18+ , dynComment
2119 , display
2220 , button
2321 , dyn
22+ , dyn_
2423 , widgetHold
25−
26− -- * Working with Maps
27− , diffMapNoEq
28− , diffMap
29− , applyMap
30− , mapPartitionEithers
31− , applyMapKeysSet
32−
33− -- * Widgets on Collections
34− , listWithKey
35− , listWithKey'
36− , listWithKeyShallowDiff
37− , listViewWithKey
38− , selectViewListWithKey
39− , selectViewListWithKey_
24+ , widgetHold_
4025
4126 -- * Creating DOM Elements
4227 , el
@@ -44,6 +29,7 @@ module Reflex.Dom.Widget.Basic
4429 , elClass
4530 , elDynAttr
4631 , elDynClass
32+ , elDynAttrNS
4733
4834 -- ** With Element Results
4935 , el'
@@ -53,10 +39,7 @@ module Reflex.Dom.Widget.Basic
5339 , elDynClass'
5440 , elDynAttrNS'
5541 , dynamicAttributesToModifyAttributes
56−
57− -- * List Utils
58− , list
59− , simpleList
42+ , dynamicAttributesToModifyAttributesWithInitial
6043
6144 -- * Specific DOM Elements
6245 , Link (..)
@@ -66,25 +49,26 @@ module Reflex.Dom.Widget.Basic
6649 , dtdd
6750 , blank
6851
69− -- * Workflows
70− , Workflow (..)
71− , workflow
72− , workflowView
73− , mapWorkflow
74− , mapWorkflowCheap
75−
7652 -- * Tables and Lists
7753 , tableDynAttr
7854 , tabDisplay
7955
8056 , HasAttributes (..)
57+ , module Data.Map.Misc
58+ , module Reflex.Collection
59+ , module Reflex.Workflow
60+ , partitionMapBySetLT
8161 ) where
8262
63+import Reflex.Adjustable.Class
8364import Reflex.Class
65+import Reflex.Collection
8466import Reflex.Dom.Builder.Class
8567import Reflex.Dom.Class
8668import Reflex.Dynamic
69+import Reflex.Network
8770import Reflex.PostBuild.Class
71+import Reflex.Workflow
8872
8973import Control.Arrow
9074import Control.Lens hiding (children, element)
@@ -93,9 +77,10 @@ import Data.Align
9377import Data.Default
9478import Data.Either
9579import Data.Foldable
96−import Data.Functor.Misc
80+import Data.Functor (void)
9781import Data.Map (Map)
9882import qualified Data.Map as Map
83+import Data.Map.Misc
9984import Data.Maybe
10085import Data.Set (Set)
10186import qualified Data.Set as Set
@@ -105,14 +90,12 @@ import Data.These
10590import Data.Traversable
10691import Prelude hiding (mapM, mapM_, sequence, sequence_)
10792
108−widgetHoldInternal :: forall t m a b. DomBuilder t m => m a -> Event t (m b) -> m (a, Event t b)
109−widgetHoldInternal = runWithReplace
110−
11193-- | Breaks the given Map into pieces based on the given Set. Each piece will contain only keys that are less than the key of the piece, and greater than or equal to the key of the piece with the next-smaller key. There will be one additional piece containing all keys from the original Map that are larger or equal to the largest key in the Set.
11294-- Either k () is used instead of Maybe k so that the resulting map of pieces is sorted so that the additional piece has the largest key.
11395-- No empty pieces will be included in the output.
11496
11597--TODO: This can probably be done more efficiently by dividing and conquering, re-using the structure of the Set instead of going through the Set linearally
98+{-# DEPRECATED partitionMapBySetLT "This will be removed in future releases." #-}
11699partitionMapBySetLT :: forall k v. Ord k => Set k -> Map k v -> Map (Either k ()) (Map k v)
117100partitionMapBySetLT s m0 = Map.fromDistinctAscList $ go (Set.toAscList s) m0
118101 where go :: [k] -> Map k v -> [(Either k (), Map k v)]
@@ -125,18 +108,11 @@ partitionMapBySetLT s m0 = Map.fromDistinctAscList $ go (Set.toAscList s) m0
125108 then go t geq
126109 else (Left h, lt) : go t geq
127110
128−newtype ChildResult t k a = ChildResult { unChildResult :: (a, Event t (Map k (Maybe (ChildResult t k a)))) }
129−
130−listHoldWithKey :: forall t m k v a. (Ord k, DomBuilder t m, MonadHold t m) => Map k v -> Event t (Map k (Maybe v)) -> (k -> v -> m a) -> m (Dynamic t (Map k a))
131−listHoldWithKey m0 m' f = do
132− let dm0 = mapWithFunctorToDMap $ Map.mapWithKey f m0
133− dm' = fmap (PatchDMap . mapWithFunctorToDMap . Map.mapWithKey (\k v -> ComposeMaybe $ fmap (f k) v)) m'
134− (a0, a') <- sequenceDMapWithAdjust dm0 dm'
135− fmap dmapToMap . incrementalToDynamic <$> holdIncremental a0 a' --TODO: Move the dmapToMap to the righthand side so it doesn't get fully redone every time
136−
111+{-# INLINABLE text #-}
137112text :: DomBuilder t m => Text -> m ()
138113text t = void $ textNode $ def & textNodeConfig_initialContents .~ t
139114
115+{-# INLINABLE dynText #-}
140116dynText :: forall t m. (PostBuild t m, DomBuilder t m) => Dynamic t Text -> m ()
141117dynText t = do
142118 postBuild <- getPostBuild
@@ -144,6 +120,20 @@ dynText t = do
144120 [ updated t
145121 , tag (current t) postBuild
146122 ]
123+ notReadyUntil postBuild
124+
125+comment :: DomBuilder t m => Text -> m ()
126+comment t = void $ commentNode $ def & commentNodeConfig_initialContents .~ t
127+
128+{-# INLINABLE dynComment #-}
129+dynComment :: forall t m. (PostBuild t m, DomBuilder t m) => Dynamic t Text -> m ()
130+dynComment t = do
131+ postBuild <- getPostBuild
132+ void $ commentNode $ (def :: CommentNodeConfig t) & commentNodeConfig_setContents .~ leftmost
133+ [ updated t
134+ , tag (current t) postBuild
135+ ]
136+ notReadyUntil postBuild
147137
148138display :: (PostBuild t m, DomBuilder t m, Show a) => Dynamic t a -> m ()
149139display = dynText . fmap (T.pack . show)
@@ -155,161 +145,73 @@ button t = do
155145
156146--TODO: Should this be renamed to 'widgetView' for consistency with 'widgetHold'?
157147-- | Given a Dynamic of widget-creating actions, create a widget that is recreated whenever the Dynamic updates.
158−-- The returned Event of widget results occurs when the Dynamic does.
159−-- Note: Often, the type 'a' is an Event, in which case the return value is an Event-of-Events that would typically be flattened (via 'switchPromptly').
160−dyn :: (DomBuilder t m, PostBuild t m) => Dynamic t (m a) -> m (Event t a)
161−dyn child = do
162− postBuild <- getPostBuild
163− let newChild = leftmost [updated child, tagCheap (current child) postBuild]
164− snd <$> widgetHoldInternal (return ()) newChild
148+-- The returned Event occurs whenever the child widget is updated, which is
149+-- at post-build in addition to the times at which the input Dynamic is
150+-- updated, and its value is the result of running the widget.
151+-- Note: Often, the type @a@ is an 'Event', in which case the return value is an Event-of-Events that would typically be flattened (via 'switchHold').
152+dyn :: (Adjustable t m, NotReady t m, PostBuild t m) => Dynamic t (m a) -> m (Event t a)
153+dyn = networkView
154+
155+-- | Like 'dyn' but discards result.
156+dyn_ :: (Adjustable t m, NotReady t m, PostBuild t m) => Dynamic t (m a) -> m ()
157+dyn_ = void . dyn
165158
166159-- | Given an initial widget and an Event of widget-creating actions, create a widget that is recreated whenever the Event fires.
167160-- The returned Dynamic of widget results occurs when the Event does.
168−-- Note: Often, the type 'a' is an Event, in which case the return value is a Dynamic-of-Events that would typically be flattened.
169−widgetHold :: (DomBuilder t m, MonadHold t m) => m a -> Event t (m a) -> m (Dynamic t a)
170−widgetHold child0 newChild = do
171− (result0, newResult) <- widgetHoldInternal child0 newChild
172− holdDyn result0 newResult
173−
174−diffMapNoEq :: (Ord k) => Map k v -> Map k v -> Map k (Maybe v)
175−diffMapNoEq olds news = flip Map.mapMaybe (align olds news) $ \case
176− This _ -> Just Nothing
177− These _ new -> Just $ Just new
178− That new -> Just $ Just new
179−
180−diffMap :: (Ord k, Eq v) => Map k v -> Map k v -> Map k (Maybe v)
181−diffMap olds news = flip Map.mapMaybe (align olds news) $ \case
182− This _ -> Just Nothing
183− These old new
184− | old == new -> Nothing
185− | otherwise -> Just $ Just new
186− That new -> Just $ Just new
187−
188−applyMap :: Ord k => Map k (Maybe v) -> Map k v -> Map k v
189−applyMap patch old = insertions `Map.union` (old `Map.difference` deletions)
190− where (deletions, insertions) = mapPartitionEithers $ maybeToEither <$> patch
191− maybeToEither = \case
192− Nothing -> Left ()
193− Just r -> Right r
194−
195−mapPartitionEithers :: Map k (Either a b) -> (Map k a, Map k b)
196−mapPartitionEithers m = (fromLeft <$> ls, fromRight <$> rs)
197− where (ls, rs) = Map.partition isLeft m
198− fromLeft (Left l) = l
199− fromLeft _ = error "mapPartitionEithers: fromLeft received a Right value; this should be impossible"
200− fromRight (Right r) = r
201− fromRight _ = error "mapPartitionEithers: fromRight received a Left value; this should be impossible"
202−
203−-- | Apply a map patch to a set
204−-- > applyMapKeysSet patch (Map.keysSet m) == Map.keysSet (applyMap patch m)
205−applyMapKeysSet :: Ord k => Map k (Maybe v) -> Set k -> Set k
206−applyMapKeysSet patch old = Map.keysSet insertions `Set.union` (old `Set.difference` Map.keysSet deletions)
207− where (insertions, deletions) = Map.partition isJust patch
208−
209−--TODO: Something better than Dynamic t (Map k v) - we want something where the Events carry diffs, not the whole value
210−listWithKey :: forall t k v m a. (Ord k, DomBuilder t m, PostBuild t m, MonadFix m, MonadHold t m) => Dynamic t (Map k v) -> (k -> Dynamic t v -> m a) -> m (Dynamic t (Map k a))
211−listWithKey vals mkChild = do
212− postBuild <- getPostBuild
213− let childValChangedSelector = fanMap $ updated vals
214− -- We keep track of changes to children values in the mkChild function we pass to listHoldWithKey
215− -- The other changes we need to keep track of are child insertions and deletions. diffOnlyKeyChanges
216− -- keeps track of insertions and deletions but ignores value changes, since they're already accounted for.
217− diffOnlyKeyChanges olds news = flip Map.mapMaybe (align olds news) $ \case
218− This _ -> Just Nothing
219− These _ _ -> Nothing
220− That new -> Just $ Just new
221− rec sentVals :: Dynamic t (Map k v) <- foldDyn applyMap Map.empty changeVals
222− let changeVals :: Event t (Map k (Maybe v))
223− changeVals = attachWith diffOnlyKeyChanges (current sentVals) $ leftmost
224− [ updated vals
225− , tag (current vals) postBuild --TODO: This should probably be added to the attachWith, not to the updated; if we were using diffMap instead of diffMapNoEq, I think it might not work
226− ]
227− listHoldWithKey Map.empty changeVals $ \k v ->
228− mkChild k =<< holdDyn v (select childValChangedSelector $ Const2 k)
229−
230−{-# DEPRECATED listWithKey' "listWithKey' has been renamed to listWithKeyShallowDiff; also, its behavior has changed to fix a bug where children were always rebuilt (never updated)" #-}
231−listWithKey' :: (Ord k, DomBuilder t m, MonadFix m, MonadHold t m) => Map k v -> Event t (Map k (Maybe v)) -> (k -> v -> Event t v -> m a) -> m (Dynamic t (Map k a))
232−listWithKey' = listWithKeyShallowDiff
233−
234−-- | Display the given map of items (in key order) using the builder function provided, and update it with the given event. 'Nothing' update entries will delete the corresponding children, and 'Just' entries will create them if they do not exist or send an update event to them if they do.
235−listWithKeyShallowDiff :: (Ord k, DomBuilder t m, MonadFix m, MonadHold t m) => Map k v -> Event t (Map k (Maybe v)) -> (k -> v -> Event t v -> m a) -> m (Dynamic t (Map k a))
236−listWithKeyShallowDiff initialVals valsChanged mkChild = do
237− let childValChangedSelector = fanMap $ fmap (Map.mapMaybe id) valsChanged
238− sentVals <- foldDyn applyMap Map.empty $ fmap (fmap void) valsChanged
239− let relevantPatch patch _ = case patch of
240− Nothing -> Just Nothing -- Even if we let a Nothing through when the element doesn't already exist, this doesn't cause a problem because it is ignored
241− Just _ -> Nothing -- We don't want to let spurious re-creations of items through
242− listHoldWithKey initialVals (attachWith (flip (Map.differenceWith relevantPatch)) (current sentVals) valsChanged) $ \k v ->
243− mkChild k v $ select childValChangedSelector $ Const2 k
244−
245−--TODO: Something better than Dynamic t (Map k v) - we want something where the Events carry diffs, not the whole value
246−-- | Create a dynamically-changing set of Event-valued widgets.
247−-- This is like listWithKey, specialized for widgets returning (Event t a). listWithKey would return 'Dynamic t (Map k (Event t a))' in this scenario, but listViewWithKey flattens this to 'Event t (Map k a)' via 'switch'.
248−listViewWithKey :: (Ord k, DomBuilder t m, PostBuild t m, MonadHold t m, MonadFix m) => Dynamic t (Map k v) -> (k -> Dynamic t v -> m (Event t a)) -> m (Event t (Map k a))
249−listViewWithKey vals mkChild = switch . fmap mergeMap <$> listViewWithKey' vals mkChild
250−
251−listViewWithKey' :: (Ord k, DomBuilder t m, PostBuild t m, MonadHold t m, MonadFix m) => Dynamic t (Map k v) -> (k -> Dynamic t v -> m a) -> m (Behavior t (Map k a))
252−listViewWithKey' vals mkChild = current <$> listWithKey vals mkChild
253−
254−-- | Create a dynamically-changing set of widgets, one of which is selected at any time.
255−selectViewListWithKey :: forall t m k v a. (DomBuilder t m, Ord k, PostBuild t m, MonadHold t m, MonadFix m)
256− => Dynamic t k -- ^ Current selection key
257− -> Dynamic t (Map k v) -- ^ Dynamic key/value map
258− -> (k -> Dynamic t v -> Dynamic t Bool -> m (Event t a)) -- ^ Function to create a widget for a given key from Dynamic value and Dynamic Bool indicating if this widget is currently selected
259− -> m (Event t (k, a)) -- ^ Event that fires when any child's return Event fires. Contains key of an arbitrary firing widget.
260−selectViewListWithKey selection vals mkChild = do
261− let selectionDemux = demux selection -- For good performance, this value must be shared across all children
262− selectChild <- listWithKey vals $ \k v -> do
263− let selected = demuxed selectionDemux k
264− selectSelf <- mkChild k v selected
265− return $ fmap ((,) k) selectSelf
266− return $ switchPromptlyDyn $ leftmost . Map.elems <$> selectChild
267−
268−selectViewListWithKey_ :: forall t m k v a. (DomBuilder t m, Ord k, PostBuild t m, MonadHold t m, MonadFix m)
269− => Dynamic t k -- ^ Current selection key
270− -> Dynamic t (Map k v) -- ^ Dynamic key/value map
271− -> (k -> Dynamic t v -> Dynamic t Bool -> m (Event t a)) -- ^ Function to create a widget for a given key from Dynamic value and Dynamic Bool indicating if this widget is currently selected
272− -> m (Event t k) -- ^ Event that fires when any child's return Event fires. Contains key of an arbitrary firing widget.
273−selectViewListWithKey_ selection vals mkChild = fmap fst <$> selectViewListWithKey selection vals mkChild
161+-- Note: Often, the type 'a' is an Event, in which case the return value is a Dynamic-of-Events that would typically be flattened (via 'switchDyn').
162+widgetHold :: (Adjustable t m, MonadHold t m) => m a -> Event t (m a) -> m (Dynamic t a)
163+widgetHold = networkHold
164+
165+-- | Like 'widgetHold' but discards result.
166+widgetHold_ :: (Adjustable t m, MonadHold t m) => m a -> Event t (m a) -> m ()
167+widgetHold_ z = void . widgetHold z
274168
275169-- | Create a DOM element
276−-- > el "div" (text "Hello World")
170+--
171+-- >>> el "div" (text "Hello World")
277172-- <div>Hello World</div>
278173{-# INLINABLE el #-}
279174el :: forall t m a. DomBuilder t m => Text -> m a -> m a
280175el elementTag child = snd <$> el' elementTag child
281176
282177-- | Create a DOM element with attributes
283−-- > elAttr "a" ("href" =: "http://google.com") (text "Google!")
284−-- <a href="http://google.com">Google!</a>
178+--
179+-- >>> elAttr "a" ("href" =: "https://reflex-frp.org") (text "Reflex-FRP!")
180+-- <a href="https://reflex-frp.org">Reflex-FRP!</a>
285181{-# INLINABLE elAttr #-}
286182elAttr :: forall t m a. DomBuilder t m => Text -> Map Text Text -> m a -> m a
287183elAttr elementTag attrs child = snd <$> elAttr' elementTag attrs child
288184
289185-- | Create a DOM element with classes
290−-- > elClass "div" "row" (return ())
186+--
187+-- >>> elClass "div" "row" (return ())
291188-- <div class="row"></div>
292189{-# INLINABLE elClass #-}
293190elClass :: forall t m a. DomBuilder t m => Text -> Text -> m a -> m a
294191elClass elementTag c child = snd <$> elClass' elementTag c child
295192
296193-- | Create a DOM element with Dynamic Attributes
297−-- > elClass "div" (constDyn ("class" =: "row")) (return ())
194+--
195+-- >>> elClass "div" (constDyn ("class" =: "row")) (return ())
298196-- <div class="row"></div>
299197{-# INLINABLE elDynAttr #-}
300198elDynAttr :: forall t m a. (DomBuilder t m, PostBuild t m) => Text -> Dynamic t (Map Text Text) -> m a -> m a
301199elDynAttr elementTag attrs child = snd <$> elDynAttr' elementTag attrs child
302200
303201-- | Create a DOM element with a Dynamic Class
304−-- > elDynClass "div" (constDyn "row") (return ())
202+--
203+-- >>> elDynClass "div" (constDyn "row") (return ())
305204-- <div class="row"></div>
306205{-# INLINABLE elDynClass #-}
307206elDynClass :: forall t m a. (DomBuilder t m, PostBuild t m) => Text -> Dynamic t Text -> m a -> m a
308207elDynClass elementTag c child = snd <$> elDynClass' elementTag c child
309208
310209-- | Create a DOM element and return the element
311−-- > do (e, _) <- el' "div" (text "Click")
312−-- > return $ domEvent Click e
210+--
211+-- @
212+-- do (e, _) <- el' "div" (text "Click")
213+-- return $ domEvent Click e
214+-- @
313215{-# INLINABLE el' #-}
314216el' :: forall t m a. DomBuilder t m => Text -> m a -> m (Element EventResult (DomBuilderSpace m) t, a)
315217el' elementTag = element elementTag def
@@ -341,8 +243,15 @@ elDynAttrNS' mns elementTag attrs child = do
341243 modifyAttrs <- dynamicAttributesToModifyAttributes attrs
342244 let cfg = def
343245 & elementConfig_namespace .~ mns
344− & modifyAttributes .~ fmap mapKeysToAttributeName modifyAttrs
345− element elementTag cfg child
246+ & modifyAttributes .~ fmapCheap mapKeysToAttributeName modifyAttrs
247+ result <- element elementTag cfg child
248+ postBuild <- getPostBuild
249+ notReadyUntil postBuild
250+ return result
251+
252+{-# INLINABLE elDynAttrNS #-}
253+elDynAttrNS :: forall t m a. (DomBuilder t m, PostBuild t m) => Maybe Text -> Text -> Dynamic t (Map Text Text) -> m a -> m a
254+elDynAttrNS mns elementTag attrs child = fmap snd $ elDynAttrNS' mns elementTag attrs child
346255
347256dynamicAttributesToModifyAttributes :: (Ord k, PostBuild t m) => Dynamic t (Map k Text) -> m (Event t (Map k (Maybe Text)))
348257dynamicAttributesToModifyAttributes = dynamicAttributesToModifyAttributesWithInitial mempty
@@ -350,48 +259,19 @@ dynamicAttributesToModifyAttributes = dynamicAttributesToModifyAttributesWithIni
350259dynamicAttributesToModifyAttributesWithInitial :: (Ord k, PostBuild t m) => Map k Text -> Dynamic t (Map k Text) -> m (Event t (Map k (Maybe Text)))
351260dynamicAttributesToModifyAttributesWithInitial attrs0 d = do
352261 postBuild <- getPostBuild
353− let modificationsNeeded = flip pushAlways (align postBuild $ updated d) $ \case
354− This () -> do
355− new <- sample $ current d
356− return $ diffMap attrs0 new
357− These () new -> return $ diffMap attrs0 new
358− That new -> do
359− old <- sample $ current d
360− return $ diffMap old new
262+ let modificationsNeeded = flip push (align postBuild $ updated d) $ \x -> do
263+ p <- case x of
264+ This () -> do
265+ new <- sample $ current d
266+ return $ diffMap attrs0 new
267+ These () new -> return $ diffMap attrs0 new
268+ That new -> do
269+ old <- sample $ current d
270+ return $ diffMap old new
271+ return $ if Map.null p then Nothing else Just p
361272 return modificationsNeeded
362273
363−--------------------------------------------------------------------------------
364−-- Copied and pasted from Reflex.Widget.Class
365−--------------------------------------------------------------------------------
366−
367−-- | Create a dynamically-changing set of widgets from a Dynamic key/value map.
368−-- Unlike the 'withKey' variants, the child widgets are insensitive to which key they're associated with.
369−list :: (Ord k, DomBuilder t m, MonadHold t m, PostBuild t m, MonadFix m) => Dynamic t (Map k v) -> (Dynamic t v -> m a) -> m (Dynamic t (Map k a))
370−list dm mkChild = listWithKey dm (\_ dv -> mkChild dv)
371−
372−-- | Create a dynamically-changing set of widgets from a Dynamic list.
373−simpleList :: (DomBuilder t m, MonadHold t m, PostBuild t m, MonadFix m) => Dynamic t [v] -> (Dynamic t v -> m a) -> m (Dynamic t [a])
374−simpleList xs mkChild = fmap (fmap (map snd . Map.toList)) $ flip list mkChild $ fmap (Map.fromList . zip [(1::Int)..]) xs
375−
376−{-
377−schedulePostBuild x = performEvent_ . (x <$) =<< getPostBuild
378−
379−elDynHtml' :: DomBuilder t m => Text -> Dynamic t Text -> m (El t)
380−elDynHtml' elementTag html = do
381− e <- buildEmptyElement elementTag (Map.empty :: Map Text Text)
382− schedulePostBuild $ setInnerHTML e . Just =<< sample (current html)
383− performEvent_ $ fmap (setInnerHTML e . Just) $ updated html
384− wrapElement defaultDomEventHandler e
385−
386−elDynHtmlAttr' :: DomBuilder t m => Text -> Map Text Text -> Dynamic t Text -> m (El t)
387−elDynHtmlAttr' elementTag attrs html = do
388− e <- buildEmptyElement elementTag attrs
389− schedulePostBuild $ setInnerHTML e . Just =<< sample (current html)
390− performEvent_ $ fmap (setInnerHTML e . Just) $ updated html
391− wrapElement defaultDomEventHandler e
392−-}
393−
394−data Link t
274+newtype Link t
395275 = Link { _link_clicked :: Event t ()
396276 }
397277
@@ -414,25 +294,7 @@ dtdd h w = do
414294blank :: forall m. Monad m => m ()
415295blank = return ()
416296
417−newtype Workflow t m a = Workflow { unWorkflow :: m (a, Event t (Workflow t m a)) }
418−
419−workflow :: forall t m a. (DomBuilder t m, MonadFix m, MonadHold t m) => Workflow t m a -> m (Dynamic t a)
420−workflow w0 = do
421− rec eResult <- widgetHold (unWorkflow w0) $ fmap unWorkflow $ switch $ snd <$> current eResult
422− return $ fmap fst eResult
423−
424−workflowView :: forall t m a. (DomBuilder t m, MonadFix m, MonadHold t m, PostBuild t m) => Workflow t m a -> m (Event t a)
425−workflowView w0 = do
426− rec eResult <- dyn . fmap unWorkflow =<< holdDyn w0 eReplace
427− eReplace <- fmap switch $ hold never $ fmap snd eResult
428− return $ fmap fst eResult
429−
430−mapWorkflow :: (DomBuilder t m) => (a -> b) -> Workflow t m a -> Workflow t m b
431−mapWorkflow f (Workflow x) = Workflow (fmap (f *** fmap (mapWorkflow f)) x)
432−
433−mapWorkflowCheap :: (DomBuilder t m) => (a -> b) -> Workflow t m a -> Workflow t m b
434−mapWorkflowCheap f (Workflow x) = Workflow (fmap (f *** fmapCheap (mapWorkflowCheap f)) x)
435−
297+-- TODO: Move to an example project.
436298-- | A widget to display a table with static columns and dynamic rows.
437299tableDynAttr :: forall t m r k v. (Ord k, DomBuilder t m, MonadHold t m, PostBuild t m, MonadFix m)
438300 => Text -- ^ Class applied to <table> element
@@ -440,15 +302,16 @@ tableDynAttr :: forall t m r k v. (Ord k, DomBuilder t m, MonadHold t m, PostBui
440302 -> Dynamic t (Map k r) -- ^ Map from row key to row value
441303 -> (k -> m (Dynamic t (Map Text Text))) -- ^ Function to compute <tr> element attributes from row key
442304 -> m (Dynamic t (Map k (Element EventResult (DomBuilderSpace m) t, [v]))) -- ^ Map from row key to (El, list of widget return values)
443−tableDynAttr klass cols dRows rowAttrs = elAttr "div" (Map.singleton "style" "zoom: 1; overflow: auto; background: white;") $ do
305+tableDynAttr klass cols dRows rowAttrs = elAttr "div" (Map.singleton "style" "zoom: 1; overflow: auto; background: white;") $
444306 elAttr "table" (Map.singleton "class" klass) $ do
445− el "thead" $ el "tr" $ do
307+ el "thead" $ el "tr" $
446308 mapM_ (\(h, _) -> el "th" $ text h) cols
447− el "tbody" $ do
309+ el "tbody" $
448310 listWithKey dRows (\k r -> do
449311 dAttrs <- rowAttrs k
450312 elDynAttr' "tr" dAttrs $ mapM (\x -> el "td" $ snd x k r) cols)
451313
314+-- TODO: Move to an example project.
452315-- | A widget to construct a tabbed view that shows only one of its child widgets at a time.
453316-- Creates a header bar containing a <ul> with one <li> per child; clicking a <li> displays
454317-- the corresponding child and hides all others.
reflex-dom-core/src/Reflex/Dom/Widget/Input.hs+41−72
@@ -33,14 +33,15 @@ import Data.Maybe
3333import Data.Semigroup
3434import Data.Text (Text)
3535import qualified Data.Text as T
36−import qualified GHCJS.DOM.Element as Element
36+import qualified GHCJS.DOM.GlobalEventHandlers as Events
3737import GHCJS.DOM.EventM (on)
3838import qualified GHCJS.DOM.FileList as FileList
3939import GHCJS.DOM.HTMLInputElement (HTMLInputElement)
4040import GHCJS.DOM.HTMLTextAreaElement (HTMLTextAreaElement)
4141import GHCJS.DOM.Types (MonadJSM, File, uncheckedCastTo)
42−import qualified GHCJS.DOM.Types as DOM (Element(..), EventTarget(..))
42+import qualified GHCJS.DOM.Types as DOM (HTMLElement(..), EventTarget(..))
4343import Reflex.Class
44+import Reflex.Collection
4445import Reflex.Dom.Builder.Class
4546import Reflex.Dom.Builder.Immediate
4647import Reflex.Dom.Class
@@ -53,12 +54,13 @@ import qualified Text.Read as T
5354import qualified GHCJS.DOM.Event as Event
5455import qualified GHCJS.DOM.HTMLInputElement as Input
5556
57+{-# DEPRECATED TextInput, _textInput_element, TextInputConfig, textInput "Use 'inputElement' directly" #-}
5658data TextInput t
5759 = TextInput { _textInput_value :: Dynamic t Text
5860 , _textInput_input :: Event t Text
59− , _textInput_keypress :: Event t Int
60− , _textInput_keydown :: Event t Int
61− , _textInput_keyup :: Event t Int
61+ , _textInput_keypress :: Event t Word
62+ , _textInput_keydown :: Event t Word
63+ , _textInput_keyup :: Event t Word
6264 , _textInput_hasFocus :: Dynamic t Bool
6365 , _textInput_builderElement :: InputElement EventResult GhcjsDomSpace t
6466 }
@@ -110,8 +112,16 @@ textInputGetEnter :: Reflex t => TextInput t -> Event t ()
110112textInputGetEnter = keypress Enter
111113
112114{-# INLINABLE keypress #-}
113−keypress :: (Reflex t, HasDomEvent t e 'KeypressTag, DomEventType e 'KeypressTag ~ Int) => Key -> e -> Event t ()
114−keypress key i = fmapMaybe (\n -> if keyCodeLookup n == key then Just () else Nothing) $ domEvent Keypress i
115+keypress :: (Reflex t, HasDomEvent t e 'KeypressTag, DomEventType e 'KeypressTag ~ Word) => Key -> e -> Event t ()
116+keypress key = fmapMaybe (\n -> guard $ keyCodeLookup (fromIntegral n) == key) . domEvent Keypress
117+
118+{-# INLINABLE keydown #-}
119+keydown :: (Reflex t, HasDomEvent t e 'KeydownTag, DomEventType e 'KeydownTag ~ Word) => Key -> e -> Event t ()
120+keydown key = fmapMaybe (\n -> guard $ keyCodeLookup (fromIntegral n) == key) . domEvent Keydown
121+
122+{-# INLINABLE keyup #-}
123+keyup :: (Reflex t, HasDomEvent t e 'KeyupTag, DomEventType e 'KeyupTag ~ Word) => Key -> e -> Event t ()
124+keyup key = fmapMaybe (\n -> guard $ keyCodeLookup (fromIntegral n) == key) . domEvent Keyup
115125
116126data RangeInputConfig t
117127 = RangeInputConfig { _rangeInputConfig_initialValue :: Float
@@ -152,6 +162,7 @@ rangeInput (RangeInputConfig initial eSetValue dAttrs) = do
152162 , _rangeInput_element = _inputElement_raw i
153163 }
154164
165+{-# DEPRECATED TextAreaConfig, TextArea, textArea "Use 'textAreaElement' directly" #-}
155166data TextAreaConfig t
156167 = TextAreaConfig { _textAreaConfig_initialValue :: Text
157168 , _textAreaConfig_setValue :: Event t Text
@@ -169,7 +180,7 @@ data TextArea t
169180 = TextArea { _textArea_value :: Dynamic t Text
170181 , _textArea_input :: Event t Text
171182 , _textArea_hasFocus :: Dynamic t Bool
172− , _textArea_keypress :: Event t Int
183+ , _textArea_keypress :: Event t Word
173184 , _textArea_element :: HTMLTextAreaElement
174185 }
175186
@@ -189,6 +200,7 @@ textArea (TextAreaConfig initial eSet attrs) = do
189200 , _textArea_element = _textAreaElement_raw i
190201 }
191202
203+{-# DEPRECATED CheckboxConfig, Checkbox, checkbox, checkboxView, CheckboxViewEventResultType, regularToCheckboxViewEventType, CheckboxViewEventResult "Use 'inputElement' directly" #-}
192204data CheckboxConfig t
193205 = CheckboxConfig { _checkboxConfig_setValue :: Event t Bool
194206 , _checkboxConfig_attributes :: Dynamic t (Map Text Text)
@@ -278,7 +290,7 @@ regularToCheckboxViewEventType en r = case en of
278290
279291newtype CheckboxViewEventResult en = CheckboxViewEventResult { unCheckboxViewEventResult :: CheckboxViewEventResultType en }
280292
281−--TODO
293+-- | Create a view only checkbox
282294{-# INLINABLE checkboxView #-}
283295checkboxView :: forall t m. (DomBuilder t m, DomBuilderSpace m ~ GhcjsDomSpace, PostBuild t m, MonadHold t m) => Dynamic t (Map Text Text) -> Dynamic t Bool -> m (Event t Bool)
284296checkboxView dAttrs dValue = do
@@ -290,8 +302,8 @@ checkboxView dAttrs dValue = do
290302 t <- Event.getTargetUnchecked evt
291303 b <- Input.getChecked $ uncheckedCastTo Input.HTMLInputElement t
292304 return $ (,) preventDefault $ return $ Just $ CheckboxViewEventResult b
293− elementConfig :: ElementConfig CheckboxViewEventResult t m
294− elementConfig = (def :: ElementConfig EventResult t m)
305+ elementConfig :: ElementConfig CheckboxViewEventResult t (DomBuilderSpace m)
306+ elementConfig = (def :: ElementConfig EventResult t (DomBuilderSpace m))
295307 { _elementConfig_modifyAttributes = Just $ fmap mapKeysToAttributeName modifyAttrs
296308 , _elementConfig_initialAttributes = Map.mapKeys (AttributeName Nothing) permanentAttrs
297309 , _elementConfig_eventSpec = GhcjsEventSpec
@@ -300,24 +312,25 @@ checkboxView dAttrs dValue = do
300312 Click -> error "impossible"
301313 _ -> do
302314 e :: DOM.EventTarget <- withIsEvent en $ Event.getTargetUnchecked evt
303− let myElement = uncheckedCastTo DOM.Element e
315+ let myElement = uncheckedCastTo DOM.HTMLElement e
304316 mr <- runReaderT (defaultDomEventHandler myElement en) evt
305317 return $ ffor mr $ \(EventResult r) -> CheckboxViewEventResult $ regularToCheckboxViewEventType en r
306318 }
307319 }
308− inputElementConfig :: InputElementConfig CheckboxViewEventResult t m
309− inputElementConfig = (def :: InputElementConfig EventResult t m)
320+ inputElementConfig :: InputElementConfig CheckboxViewEventResult t (DomBuilderSpace m)
321+ inputElementConfig = (def :: InputElementConfig EventResult t (DomBuilderSpace m))
310322 & inputElementConfig_setChecked .~ leftmost [updated dValue, tag (current dValue) postBuild]
311323 & inputElementConfig_elementConfig .~ elementConfig
312324 i <- inputElement inputElementConfig
313325 return $ unCheckboxViewEventResult <$> select (_element_events $ _inputElement_element i) (WrapArg Click)
314326
327+{-# DEPRECATED FileInput, FileInputConfig, fileInput "Use 'inputElement' directly" #-}
315328data FileInput d t
316329 = FileInput { _fileInput_value :: Dynamic t [File]
317330 , _fileInput_element :: RawInputElement d
318331 }
319332
320−data FileInputConfig t
333+newtype FileInputConfig t
321334 = FileInputConfig { _fileInputConfig_attributes :: Dynamic t (Map Text Text)
322335 }
323336
@@ -333,20 +346,14 @@ fileInput config = do
333346 modifyAttrs <- dynamicAttributesToModifyAttributes dAttrs
334347 let filters = DMap.singleton Change . GhcjsEventFilter $ \_ -> do
335348 return . (,) mempty $ return . Just $ EventResult ()
336− elCfg = (def :: ElementConfig EventResult t m)
349+ elCfg = (def :: ElementConfig EventResult t (DomBuilderSpace m))
337350 & modifyAttributes .~ fmap mapKeysToAttributeName modifyAttrs
338351 & elementConfig_eventSpec . ghcjsEventSpec_filters .~ filters
339− cfg = (def :: InputElementConfig EventResult t m) & inputElementConfig_elementConfig .~ elCfg
340− eRaw <- inputElement cfg
341− let e = _inputElement_raw eRaw
342− eChange <- wrapDomEvent e (`on` Element.change) $ do
343− files <- Input.getFilesUnchecked e
344− len <- FileList.getLength files
345− mapM (fmap (fromMaybe (error "fileInput: fileList.item returned null")) . FileList.item files) [0 .. len-1]
346− dValue <- holdDyn [] eChange
352+ cfg = (def :: InputElementConfig EventResult t (DomBuilderSpace m)) & inputElementConfig_elementConfig .~ elCfg
353+ input <- inputElement cfg
347354 return $ FileInput
348− { _fileInput_value = dValue
349− , _fileInput_element = e
355+ { _fileInput_value = _inputElement_files input
356+ , _fileInput_element = _inputElement_raw input
350357 }
351358
352359data Dropdown t k
@@ -430,9 +437,12 @@ dropdown k0 options (DropdownConfig setK attrs) = do
430437 let xs = fmap (\(ix, (k, v)) -> ((ix, k), ((ix, k), v))) $ zip [0::Int ..] $ Map.toList os
431438 in (Map.fromList $ map snd xs, Bimap.fromList $ map fst xs)
432439 modifyAttrs <- dynamicAttributesToModifyAttributes attrs
440+ postBuild <- getPostBuild
441+ let setSelection = attachPromptlyDynWithMaybe (flip Bimap.lookupR) ixKeys $
442+ leftmost [setK, k0 <$ postBuild]
433443 let cfg = def
434444 & selectElementConfig_elementConfig . elementConfig_modifyAttributes .~ fmap mapKeysToAttributeName modifyAttrs
435− & selectElementConfig_setValue .~ fmap (T.pack . show) (attachPromptlyDynWithMaybe (flip Bimap.lookupR) ixKeys setK)
445+ & selectElementConfig_setValue .~ fmap (T.pack . show) setSelection
436446 (eRaw, _) <- selectElement cfg $ listWithKey indexedOptions $ \(ix, k) v -> do
437447 let optionAttrs = fmap (\dk -> "value" =: T.pack (show ix) <> if dk == k then "selected" =: "selected" else mempty) defaultKey
438448 elDynAttr "option" optionAttrs $ dynText v
@@ -481,7 +491,7 @@ textArea_hasFocus f (TextArea x1 x2 x3 x4 x5) = (\y -> TextArea x1 x2 y x4 x5) <
481491textArea_input :: Lens' (TextArea t) (Event t Text)
482492textArea_input f (TextArea x1 x2 x3 x4 x5) = (\y -> TextArea x1 y x3 x4 x5) <$> f x2
483493{-# INLINE textArea_input #-}
484−textArea_keypress :: Lens' (TextArea t) (Event t Int)
494+textArea_keypress :: Lens' (TextArea t) (Event t Word)
485495textArea_keypress f (TextArea x1 x2 x3 x4 x5) = (\y -> TextArea x1 x2 x3 y x5) <$> f x4
486496{-# INLINE textArea_keypress #-}
487497textArea_value :: Lens' (TextArea t) (Dynamic t Text)
@@ -508,13 +518,13 @@ textInput_hasFocus f (TextInput x1 x2 x3 x4 x5 x6 x7) = (\y -> TextInput x1 x2 x
508518textInput_input :: Lens' (TextInput t) (Event t Text)
509519textInput_input f (TextInput x1 x2 x3 x4 x5 x6 x7) = (\y -> TextInput x1 y x3 x4 x5 x6 x7) <$> f x2
510520{-# INLINE textInput_input #-}
511−textInput_keydown :: Lens' (TextInput t) (Event t Int)
521+textInput_keydown :: Lens' (TextInput t) (Event t Word)
512522textInput_keydown f (TextInput x1 x2 x3 x4 x5 x6 x7) = (\y -> TextInput x1 x2 x3 y x5 x6 x7) <$> f x4
513523{-# INLINE textInput_keydown #-}
514−textInput_keypress :: Lens' (TextInput t) (Event t Int)
524+textInput_keypress :: Lens' (TextInput t) (Event t Word)
515525textInput_keypress f (TextInput x1 x2 x3 x4 x5 x6 x7) = (\y -> TextInput x1 x2 y x4 x5 x6 x7) <$> f x3
516526{-# INLINE textInput_keypress #-}
517−textInput_keyup :: Lens' (TextInput t) (Event t Int)
527+textInput_keyup :: Lens' (TextInput t) (Event t Word)
518528textInput_keyup f (TextInput x1 x2 x3 x4 x5 x6 x7) = (\y -> TextInput x1 x2 x3 x4 y x6 x7) <$> f x5
519529{-# INLINE textInput_keyup #-}
520530textInput_value :: Lens' (TextInput t) (Dynamic t Text)
@@ -619,9 +629,6 @@ instance HasAttributes (FileInputConfig t) where
619629 type Attrs (FileInputConfig t) = Dynamic t (Map Text Text)
620630 attributes = fileInputConfig_attributes
621631
622−class HasSetValue a where
623− type SetValue a :: *
624− setValue :: Lens' a (SetValue a)
625632
626633instance HasSetValue (TextAreaConfig t) where
627634 type SetValue (TextAreaConfig t) = Event t Text
@@ -678,41 +685,3 @@ instance HasValue (Dropdown t k) where
678685instance HasValue (Checkbox t) where
679686 type Value (Checkbox t) = Dynamic t Bool
680687 value = _checkbox_value
681−
682−{-
683−type family Controller sm t a where
684− Controller Edit t a = (a, Event t a) -- Initial value and setter
685− Controller View t a = Dynamic t a -- Value (always)
686−
687−type family Output sm t a where
688− Output Edit t a = Dynamic t a -- Value (always)
689− Output View t a = Event t a -- Requested changes
690−
691−data CheckboxConfig sm t
692− = CheckboxConfig { _checkbox_input :: Controller sm t Bool
693− , _checkbox_attributes :: Attributes
694− }
695−
696−instance Reflex t => Default (CheckboxConfig Edit t) where
697− def = CheckboxConfig (False, never) mempty
698−
699−data Checkbox sm t
700− = Checkbox { _checkbox_output :: Output sm t Bool
701− }
702−
703−data StateMode = Edit | View
704−
705−--TODO: There must be a more generic way to get this witness and allow us to case on the type-level StateMode
706−data StateModeWitness (sm :: StateMode) where
707− EditWitness :: StateModeWitness Edit
708− ViewWitness :: StateModeWitness View
709−
710−class HasStateModeWitness (sm :: StateMode) where
711− stateModeWitness :: StateModeWitness sm
712−
713−instance HasStateModeWitness Edit where
714− stateModeWitness = EditWitness
715−
716−instance HasStateModeWitness View where
717− stateModeWitness = ViewWitness
718−-}
reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+10−8
@@ -7,6 +7,7 @@
77module Reflex.Dom.Widget.Lazy where
88
99import Reflex.Class
10+import Reflex.Collection
1011import Reflex.Dom.Builder.Class
1112import Reflex.Dom.Builder.Immediate
1213import Reflex.Dom.Class
@@ -52,7 +53,7 @@ virtualListWithSelection heightPx rowPx maxIndex i0 setI listTag listAttrs rowTa
5253 return lis
5354 selected <- holdDyn (indexToKey i0) sel
5455 pb <- getPostBuild
55− scrollPosition <- holdDyn 0 $ leftmost [ domEvent Scroll container
56+ scrollPosition <- holdDyn 0 $ leftmost [ round <$> domEvent Scroll container
5657 , fmap (const (i0 * rowPx)) pb
5758 ]
5859 let window = zipDynWith (findWindow rowPx) heightPx scrollPosition
@@ -63,7 +64,7 @@ virtualListWithSelection heightPx rowPx maxIndex i0 setI listTag listAttrs rowTa
6364 let indexAndLength = fmap snd window
6465 return (indexAndLength, sel)
6566 where
66− toStyleAttr m = "style" =: Map.foldWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
67+ toStyleAttr m = "style" =: Map.foldrWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
6768 toViewport h = toStyleAttr $ "overflow" =: "auto" <> "position" =: "absolute" <>
6869 "left" =: "0" <> "right" =: "0" <> "height" =: (T.pack (show h) <> "px")
6970 toContainer h = toStyleAttr $ "position" =: "relative" <> "height" =: (T.pack (show h) <> "px")
@@ -92,21 +93,22 @@ virtualList :: forall t m k v a. (DomBuilder t m, PostBuild t m, MonadHold t m,
9293 -> (k -> v -> Event t v -> m a) -- ^ The row child element builder.
9394 -> m (Dynamic t (Int, Int), Dynamic t (Map k a)) -- ^ A tuple containing: a 'Dynamic' of the index (based on the current scroll position) and number of items currently being rendered, and the 'Dynamic' list result
9495virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBuilder = do
95− let virtualH = fmap (mkVirtualHeight . (*) rowPx) maxIndex
96+ let virtualH = mkVirtualHeight <$> maxIndex
9697 containerStyle = fmap mkContainer heightPx
9798 viewportStyle = fmap mkViewport heightPx
9899 pb <- getPostBuild
99100 rec (viewport, result) <- elDynAttr "div" containerStyle $ elDynAttr' "div" viewportStyle $ elDynAttr "div" virtualH $
100101 listWithKeyShallowDiff items0 itemsUpdate $ \k v e -> elAttr "div" (mkRow k) $ itemBuilder k v e
101− scrollPosition <- holdDyn 0 $ leftmost [ domEvent Scroll viewport
102+ scrollPosition <- holdDyn 0 $ leftmost [ round <$> domEvent Scroll viewport
102103 , fmap (const (i0 * rowPx)) pb
103104 ]
104105 let window = zipDynWith (findWindow rowPx) heightPx scrollPosition
105106 performEvent_ $ ffor (leftmost [setI, i0 <$ pb]) $ \i ->
106107 setScrollTop (_element_raw viewport) (i * rowPx)
107− return (uniqDyn window, result)
108+ uniqWindow <- holdUniqDyn window
109+ return (uniqWindow, result)
108110 where
109− toStyleAttr m = "style" =: Map.foldWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
111+ toStyleAttr m = "style" =: Map.foldrWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
110112 mkViewport h = toStyleAttr $ "overflow" =: "auto" <> "position" =: "absolute" <>
111113 "left" =: "0" <> "right" =: "0" <> "height" =: (T.pack (show h) <> "px")
112114 mkContainer h = toStyleAttr $ "position" =: "relative" <> "height" =: (T.pack (show h) <> "px")
@@ -115,7 +117,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu
115117 "overflow" =: "hidden" <>
116118 "position" =: "relative"
117119 mkRow k = toStyleAttr $ "height" =: (T.pack (show rowPx) <> "px") <>
118− "top" =: ((<>"px") $ T.pack $ show $ keyToIndex k * rowPx) <>
120+ "top" =: (<> "px") (T.pack $ show $ keyToIndex k * rowPx) <>
119121 "position" =: "absolute" <>
120122 "width" =: "100%"
121123 findWindow sizeIncrement windowSize startingPosition =
@@ -140,7 +142,7 @@ virtualListBuffered buffer heightPx rowPx maxIndex i0 setI keyToIndex items0 ite
140142 (win, m) <- virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBuilder
141143 pb <- getPostBuild
142144 let extendWin o l = (max 0 (o - l * (buffer-1) `div` 2), l * buffer)
143− rec let winHitEdge = fmapMaybe id $ attachWith (\(oldOffset, oldLimit) (winOffset, winLimit) ->
145+ rec let winHitEdge = attachWithMaybe (\(oldOffset, oldLimit) (winOffset, winLimit) ->
144146 if winOffset > oldOffset && winOffset + winLimit < oldOffset + oldLimit
145147 then Nothing
146148 else Just (extendWin winOffset winLimit)) (current winBuffered) (updated win)
reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+25−17
@@ -1,16 +1,16 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
21{-# LANGUAGE FlexibleContexts #-}
32{-# LANGUAGE MultiParamTypeClasses #-}
43{-# LANGUAGE OverloadedStrings #-}
54{-# LANGUAGE RecursiveDo #-}
5+{-# LANGUAGE ScopedTypeVariables #-}
66{-# LANGUAGE TypeFamilies #-}
77module Reflex.Dom.Widget.Resize where
88
99import Reflex.Class
10+import Reflex.Time
1011import Reflex.Dom.Builder.Class
1112import Reflex.Dom.Builder.Immediate
1213import Reflex.Dom.Class
13−import Reflex.Dom.Time
1414import Reflex.Dom.Widget.Basic
1515import Reflex.PerformEvent.Class
1616import Reflex.PostBuild.Class
@@ -24,25 +24,32 @@ import qualified Data.Map as Map
2424import Data.Monoid
2525import Data.Text (Text)
2626import qualified Data.Text as T
27−import GHCJS.DOM.Element hiding (reset)
27+import GHCJS.DOM.Element
2828import GHCJS.DOM.EventM (on)
29−import GHCJS.DOM.Types (liftJSM, MonadJSM)
29+import qualified GHCJS.DOM.GlobalEventHandlers as Events (scroll)
30+import GHCJS.DOM.Types (MonadJSM, liftJSM, uncheckedCastTo, HTMLElement(..))
31+import GHCJS.DOM.HTMLElement (getOffsetWidth, getOffsetHeight)
32+import qualified GHCJS.DOM.Types as DOM
3033
3134-- | A widget that wraps the given widget in a div and fires an event when resized.
32−-- Adapted from github.com/marcj/css-element-queries
33−resizeDetector :: (MonadJSM m, DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadJSM (Performable m), MonadFix m) => m a -> m (Event t (), a)
35+-- Adapted from @github.com\/marcj\/css-element-queries@
36+--
37+-- This function can cause strange scrollbars to appear in some circumstances.
38+-- These can be hidden with pseudo selectors, for example, in webkit browsers:
39+-- .wrapper *::-webkit-scrollbar { width: 0px; background: transparent; }
40+resizeDetector :: (MonadJSM m, DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadJSM (Performable m), MonadFix m) => m a -> m (Event t (Maybe Double, Maybe Double), a)
3441resizeDetector = resizeDetectorWithStyle ""
3542
3643resizeDetectorWithStyle :: (MonadJSM m, DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadJSM (Performable m), MonadFix m)
3744 => Text -- ^ A css style string. Warning: It should not contain the "position" style attribute.
3845 -> m a -- ^ The embedded widget
39− -> m (Event t (), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget
46+ -> m (Event t (Maybe Double, Maybe Double), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget
4047resizeDetectorWithStyle styleString = resizeDetectorWithAttrs ("style" =: styleString)
4148
4249resizeDetectorWithAttrs :: (MonadJSM m, DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadJSM (Performable m), MonadFix m)
4350 => Map Text Text -- ^ A map of attributes. Warning: It should not modify the "position" style attribute.
4451 -> m a -- ^ The embedded widget
45− -> m (Event t (), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget
52+ -> m (Event t (Maybe Double, Maybe Double), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget
4653resizeDetectorWithAttrs attrs w = do
4754 let childStyle = "position: absolute; left: 0; top: 0;"
4855 containerAttrs = "style" =: "position: absolute; left: 0; top: 0; right: 0; bottom: 0; overflow: scroll; z-index: -1; visibility: hidden;"
@@ -52,8 +59,9 @@ resizeDetectorWithAttrs attrs w = do
5259 (expand, (expandChild, _)) <- elAttr' "div" containerAttrs $ elAttr' "div" ("style" =: childStyle) $ return ()
5360 (shrink, _) <- elAttr' "div" containerAttrs $ elAttr "div" ("style" =: (childStyle <> "width: 200%; height: 200%;")) $ return ()
5461 return (expand, expandChild, shrink, w')
55− let reset = do
56− let e = _element_raw expand
62+ let p = uncheckedCastTo HTMLElement $ _element_raw parent
63+ reset = do
64+ let e = uncheckedCastTo HTMLElement $ _element_raw expand
5765 s = _element_raw shrink
5866 eow <- getOffsetWidth e
5967 eoh <- getOffsetHeight e
@@ -68,19 +76,19 @@ resizeDetectorWithAttrs attrs w = do
6876 setScrollLeft s ssw
6977 ssh <- getScrollHeight s
7078 setScrollTop s ssh
71− lastWidth <- getOffsetWidth (_element_raw parent)
72− lastHeight <- getOffsetHeight (_element_raw parent)
79+ lastWidth <- getOffsetWidth p
80+ lastHeight <- getOffsetHeight p
7381 return (Just lastWidth, Just lastHeight)
7482 resetIfChanged ds = do
75− pow <- getOffsetWidth (_element_raw parent)
76− poh <- getOffsetHeight (_element_raw parent)
83+ pow <- getOffsetWidth p
84+ poh <- getOffsetHeight p
7785 if ds == (Just pow, Just poh)
7886 then return Nothing
7987 else fmap Just reset
8088 pb <- delay 0 =<< getPostBuild
81− expandScroll <- wrapDomEvent (_element_raw expand) (`on` scroll) $ return ()
82− shrinkScroll <- wrapDomEvent (_element_raw shrink) (`on` scroll) $ return ()
89+ expandScroll <- wrapDomEvent (DOM.uncheckedCastTo DOM.HTMLElement $ _element_raw expand) (`on` Events.scroll) $ return ()
90+ shrinkScroll <- wrapDomEvent (DOM.uncheckedCastTo DOM.HTMLElement $ _element_raw shrink) (`on` Events.scroll) $ return ()
8391 size0 <- performEvent $ fmap (const $ liftJSM reset) pb
8492 rec resize <- performEventAsync $ fmap (\d cb -> (liftIO . cb) =<< liftJSM (resetIfChanged d)) $ tag (current dimensions) $ leftmost [expandScroll, shrinkScroll]
8593 dimensions <- holdDyn (Nothing, Nothing) $ leftmost [ size0, fmapMaybe id resize ]
86− return (fmapMaybe void resize, w')
94+ return (updated dimensions, w')
reflex-dom-core/src/Reflex/Dom/Xhr.hs+10−8
@@ -159,6 +159,8 @@ import Data.Aeson.Text
159159import Data.Aeson.Encode
160160#endif
161161import qualified Data.ByteString.Lazy as BL
162+import Data.CaseInsensitive (CI)
163+import qualified Data.CaseInsensitive as CI
162164import Data.Default
163165import qualified Data.List as L
164166import Data.Map (Map)
@@ -198,12 +200,12 @@ data XhrResponse
198200 , _xhrResponse_statusText :: Text
199201 , _xhrResponse_response :: Maybe XhrResponseBody
200202 , _xhrResponse_responseText :: Maybe Text
201− , _xhrResponse_headers :: Map Text Text
203+ , _xhrResponse_headers :: Map (CI Text) Text
202204 }
203205 deriving (Typeable)
204206
205207data XhrResponseHeaders =
206− OnlyHeaders (Set.Set Text) -- ^ Parse a subset of headers from the XHR Response
208+ OnlyHeaders (Set.Set (CI Text)) -- ^ Parse a subset of headers from the XHR Response
207209 | AllHeaders -- ^ Parse all headers from the XHR Response
208210 deriving (Show, Read, Eq, Ord, Typeable)
209211
@@ -215,7 +217,7 @@ _xhrResponse_body :: XhrResponse -> Maybe Text
215217_xhrResponse_body = _xhrResponse_responseText
216218
217219{-# DEPRECATED xhrResponse_body "Use xhrResponse_response or xhrResponse_responseText instead." #-}
218−xhrResponse_body :: Lens XhrResponse XhrResponse (Maybe Text) (Maybe Text)
220+xhrResponse_body :: Lens' XhrResponse (Maybe Text)
219221xhrResponse_body = lens _xhrResponse_responseText (\r t -> r { _xhrResponse_responseText = t })
220222
221223instance a ~ () => Default (XhrRequestConfig a) where
@@ -275,7 +277,7 @@ newXMLHttpRequestWithError req cb = do
275277 AllHeaders -> parseAllHeadersString <$>
276278 xmlHttpRequestGetAllResponseHeaders xhr
277279 OnlyHeaders xs -> traverse (xmlHttpRequestGetResponseHeader xhr)
278− (Map.fromSet id xs)
280+ (Map.fromSet CI.original xs)
279281 _ <- liftJSM $ cb $ Right
280282 XhrResponse { _xhrResponse_status = status
281283 , _xhrResponse_statusText = statusText
@@ -288,10 +290,10 @@ newXMLHttpRequestWithError req cb = do
288290 return ()
289291 return xhr
290292
291−parseAllHeadersString :: Text -> Map Text Text
293+parseAllHeadersString :: Text -> Map (CI Text) Text
292294parseAllHeadersString s = Map.fromList $ fmap (stripBoth . T.span (/=':')) $
293295 L.dropWhileEnd T.null $ T.splitOn (T.pack "\r\n") s
294− where stripBoth (txt1, txt2) = (T.strip txt1, T.strip $ T.drop 1 txt2)
296+ where stripBoth (txt1, txt2) = (CI.mk $ T.strip txt1, T.strip $ T.drop 1 txt2)
295297
296298newXMLHttpRequest :: (HasJSContext m, MonadJSM m, IsXhrPayload a) => XhrRequest a -> (XhrResponse -> JSM ()) -> m XMLHttpRequest
297299newXMLHttpRequest req cb = newXMLHttpRequestWithError req $ mapM_ cb
@@ -378,7 +380,7 @@ decodeText = decode . BL.fromStrict . encodeUtf8
378380
379381-- | Convenience function to decode JSON-encoded responses.
380382decodeXhrResponse :: FromJSON a => XhrResponse -> Maybe a
381−decodeXhrResponse = join . fmap decodeText . _xhrResponse_responseText
383+decodeXhrResponse = decodeText <=< _xhrResponse_responseText
382384
383385#ifdef USE_TEMPLATE_HASKELL
384386concat <$> mapM makeLenses
@@ -444,7 +446,7 @@ xhrResponse_responseText :: Lens' XhrResponse (Maybe Text)
444446xhrResponse_responseText f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 y x5) <$> f x4
445447{-# INLINE xhrResponse_responseText #-}
446448
447−xhrResponse_headers :: Lens' XhrResponse (Map Text Text)
449+xhrResponse_headers :: Lens' XhrResponse (Map (CI Text) Text)
448450xhrResponse_headers f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 x4 y) <$> f x5
449451{-# INLINE xhrResponse_headers #-}
450452
reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs+20−24
@@ -1,7 +1,6 @@
11{-# LANGUAGE FlexibleInstances #-}
22{-# LANGUAGE JavaScriptFFI #-}
33{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE TypeSynonymInstances #-}
54
65module Reflex.Dom.Xhr.Foreign (
76 XMLHttpRequest
@@ -10,26 +9,21 @@ module Reflex.Dom.Xhr.Foreign (
109) where
1110
1211import Control.Exception (throwIO)
13−import Control.Monad (join)
1412import Control.Monad.IO.Class (MonadIO(..))
1513import Data.Maybe (fromMaybe)
1614import Data.Text (Text)
1715import Data.ByteString (ByteString)
16+import Foreign.JavaScript.Utils (bsFromMutableArrayBuffer, bsToArrayBuffer)
1817import GHCJS.DOM.Enums
19−import GHCJS.DOM.EventM (EventM, on)
18+import GHCJS.DOM.EventM (EventM, on, onSync)
2019import GHCJS.DOM.EventTarget (dispatchEvent)
21−import GHCJS.DOM.Types hiding (Text)
20+import GHCJS.DOM.Types (MonadJSM, ToJSString, FormData, Document, Blob (..), ArrayBuffer (..), JSVal, JSM, IsEvent, XMLHttpRequestProgressEvent, ProgressEvent, Event, XMLHttpRequestUpload, FromJSString, ArrayBufferView (..), liftJSM, castTo)
2221import GHCJS.DOM.XMLHttpRequest
23−-- import GHCJS.Types
22+import Language.Javascript.JSaddle.Helper (mutableArrayBufferFromJSVal)
23+import qualified Language.Javascript.JSaddle.Monad as JS (catch)
2424import Prelude hiding (error)
2525import Reflex.Dom.Xhr.Exception
2626import Reflex.Dom.Xhr.ResponseType
27−import Language.Javascript.JSaddle.Types (ghcjsPure)
28−import qualified Language.Javascript.JSaddle.Monad as JS (catch)
29−import qualified GHCJS.Buffer as JS
30− (createFromArrayBuffer, toByteString)
31−import qualified JavaScript.TypedArray.ArrayBuffer as JS
32− (unsafeFreeze, MutableArrayBuffer)
3327
3428xmlHttpRequestNew :: MonadJSM m => m XMLHttpRequest
3529xmlHttpRequestNew = newXMLHttpRequest
@@ -37,7 +31,7 @@ xmlHttpRequestNew = newXMLHttpRequest
3731xmlHttpRequestOpen ::
3832 (ToJSString method, ToJSString url, ToJSString user, ToJSString password, MonadJSM m) =>
3933 XMLHttpRequest -> method -> url -> Bool -> user -> password -> m ()
40−xmlHttpRequestOpen = open
34+xmlHttpRequestOpen request method url async user password = open request method url async (Just user) (Just password)
4135
4236convertException :: XHRError -> XhrException
4337convertException e = case e of
@@ -65,6 +59,12 @@ instance IsXhrPayload Document where
6559instance IsXhrPayload Blob where
6660 sendXhrPayload = sendBlob
6761
62+instance IsXhrPayload ArrayBuffer where
63+ sendXhrPayload xhr ab = sendArrayBuffer xhr (ArrayBufferView $ unArrayBuffer ab)
64+
65+instance IsXhrPayload ByteString where
66+ sendXhrPayload xhr bs = sendXhrPayload xhr =<< liftJSM (bsToArrayBuffer bs)
67+
6868newtype XhrPayload = XhrPayload { unXhrPayload :: JSVal }
6969
7070-- This used to be a non blocking call, but now it uses an interruptible ffi
@@ -80,7 +80,7 @@ xmlHttpRequestAbort :: MonadJSM m => XMLHttpRequest -> m ()
8080xmlHttpRequestAbort = abort
8181
8282xmlHttpRequestGetAllResponseHeaders :: MonadJSM m => XMLHttpRequest -> m Text
83−xmlHttpRequestGetAllResponseHeaders self = fromMaybe "" <$> getAllResponseHeaders self
83+xmlHttpRequestGetAllResponseHeaders = getAllResponseHeaders
8484
8585xmlHttpRequestGetResponseHeader :: (ToJSString header, MonadJSM m)
8686 => XMLHttpRequest -> header -> m Text
@@ -89,7 +89,7 @@ xmlHttpRequestGetResponseHeader self header = fromMaybe "" <$> getResponseHeader
8989xmlHttpRequestOverrideMimeType :: (ToJSString override, MonadJSM m) => XMLHttpRequest -> override -> m ()
9090xmlHttpRequestOverrideMimeType = overrideMimeType
9191
92−xmlHttpRequestDispatchEvent :: (IsEvent evt, MonadJSM m) => XMLHttpRequest -> Maybe evt -> m Bool
92+xmlHttpRequestDispatchEvent :: (IsEvent evt, MonadJSM m) => XMLHttpRequest -> evt -> m Bool
9393xmlHttpRequestDispatchEvent = dispatchEvent
9494
9595xmlHttpRequestOnabort :: XMLHttpRequest -> EventM XMLHttpRequest XMLHttpRequestProgressEvent () -> JSM (JSM ())
@@ -114,7 +114,7 @@ xmlHttpRequestOntimeout :: XMLHttpRequest -> EventM XMLHttpRequest ProgressEvent
114114xmlHttpRequestOntimeout = (`on` timeout)
115115
116116xmlHttpRequestOnreadystatechange :: XMLHttpRequest -> EventM XMLHttpRequest Event () -> JSM (JSM ())
117−xmlHttpRequestOnreadystatechange = (`on` readyStateChange)
117+xmlHttpRequestOnreadystatechange = (`onSync` readyStateChange)
118118
119119xmlHttpRequestSetTimeout :: MonadJSM m => XMLHttpRequest -> Word -> m ()
120120xmlHttpRequestSetTimeout = setTimeout
@@ -132,7 +132,7 @@ xmlHttpRequestGetWithCredentials :: MonadJSM m => XMLHttpRequest -> m Bool
132132xmlHttpRequestGetWithCredentials = getWithCredentials
133133
134134xmlHttpRequestGetUpload :: MonadJSM m => XMLHttpRequest -> m (Maybe XMLHttpRequestUpload)
135−xmlHttpRequestGetUpload = getUpload
135+xmlHttpRequestGetUpload = fmap Just . getUpload
136136
137137xmlHttpRequestGetResponseText :: (FromJSString result, MonadJSM m) => XMLHttpRequest -> m (Maybe result)
138138xmlHttpRequestGetResponseText = getResponseText
@@ -173,14 +173,10 @@ xmlHttpRequestGetResponse xhr = do
173173 mr <- getResponse xhr
174174 rt <- xmlHttpRequestGetResponseType xhr
175175 case rt of
176− Just XhrResponseType_Blob -> fmap XhrResponseBody_Blob . join <$> mapM (castTo Blob) mr
176+ Just XhrResponseType_Blob -> fmap XhrResponseBody_Blob <$> castTo Blob mr
177177 Just XhrResponseType_Text -> Just . XhrResponseBody_Text <$> xmlHttpRequestGetStatusText xhr
178178 Just XhrResponseType_Default -> Just . XhrResponseBody_Text <$> xmlHttpRequestGetStatusText xhr
179− Just XhrResponseType_ArrayBuffer -> case fmap unGObject mr of
180− Nothing -> return Nothing
181− Just ptr -> Just . XhrResponseBody_ArrayBuffer <$> bsFromArrayBuffer (pFromJSVal ptr)
179+ Just XhrResponseType_ArrayBuffer -> do
180+ ab <- liftJSM $ mutableArrayBufferFromJSVal mr
181+ Just . XhrResponseBody_ArrayBuffer <$> bsFromMutableArrayBuffer ab
182182 _ -> return Nothing
183−
184−bsFromArrayBuffer :: MonadJSM m => JS.MutableArrayBuffer -> m ByteString
185−bsFromArrayBuffer ab = liftJSM $ JS.unsafeFreeze ab >>=
186− ghcjsPure . JS.createFromArrayBuffer >>= ghcjsPure . JS.toByteString 0 Nothing
reflex-dom-core/src/Reflex/Dom/Xhr/FormData.hsnew file+47
@@ -0,0 +1,47 @@
1+{-# LANGUAGE FlexibleContexts #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+module Reflex.Dom.Xhr.FormData
4+ ( postForms
5+ , FormValue (..)
6+ , fileToFormValue
7+ )
8+ where
9+
10+import Control.Lens
11+import Data.Default
12+import Data.Map (Map)
13+import Data.Text (Text)
14+import Data.Traversable
15+import qualified GHCJS.DOM.FormData as FD
16+import Foreign.JavaScript.TH
17+import GHCJS.DOM.File (getName)
18+import GHCJS.DOM.Types (File, IsBlob)
19+import Language.Javascript.JSaddle.Monad (MonadJSM, liftJSM)
20+import Reflex
21+import Reflex.Dom.Xhr
22+
23+-- | A FormData value may be a blob/file or a string. The file can optionally be provided with filename.
24+data FormValue blob = FormValue_Text Text
25+ | FormValue_File blob (Maybe Text) -- maybe filename
26+
27+-- | Performs a POST request with the provided FormData payload
28+postForms
29+ :: ( IsBlob blob, HasJSContext (Performable m), MonadJSM (Performable m)
30+ , PerformEvent t m, TriggerEvent t m
31+ , Traversable f)
32+ => Text -- ^ The target url
33+ -> Event t (f (Map Text (FormValue blob))) -- ^ Maps of text keys and values that will be sent as "FormData"
34+ -> m (Event t (f XhrResponse))
35+postForms url payload = do
36+ performMkRequestsAsync $ ffor payload $ \fs -> for fs $ \u -> liftJSM $ do
37+ fd <- FD.newFormData Nothing
38+ iforM_ u $ \k v -> case v of
39+ FormValue_Text t -> FD.append fd k t
40+ FormValue_File b fn -> FD.appendBlob fd k b fn
41+ return $ xhrRequest "POST" url $ def & xhrRequestConfig_sendData .~ fd
42+
43+-- | Converts a File (e.g., the output of a 'FileInput') into a 'FormValue'. The filename will be included if it is available.
44+fileToFormValue :: MonadJSM m => File -> m (FormValue File)
45+fileToFormValue f = do
46+ fn <- getName f
47+ return $ FormValue_File f $ Just fn
reflex-dom-core/src/Reflex/Dom/Xhr/ResponseType.hs+11−11
@@ -7,15 +7,15 @@ import Data.Text (Text)
77import Data.Typeable
88import GHCJS.DOM.Blob (Blob)
99
10−data XhrResponseType = XhrResponseType_Default
11− | XhrResponseType_ArrayBuffer
12− | XhrResponseType_Blob
13− | XhrResponseType_Text
14− deriving (Show, Read, Eq, Ord, Typeable)
15−
16−data XhrResponseBody = XhrResponseBody_Default Text
17− | XhrResponseBody_Text Text
18− | XhrResponseBody_Blob Blob
19− | XhrResponseBody_ArrayBuffer ByteString
20−-- deriving (Eq)
10+data XhrResponseType
11+ = XhrResponseType_Default
12+ | XhrResponseType_ArrayBuffer
13+ | XhrResponseType_Blob
14+ | XhrResponseType_Text
15+ deriving (Show, Read, Eq, Ord, Typeable)
2116
17+data XhrResponseBody
18+ = XhrResponseBody_Default Text
19+ | XhrResponseBody_Text Text
20+ | XhrResponseBody_Blob Blob
21+ | XhrResponseBody_ArrayBuffer ByteString
reflex-dom-core/test/gc.hs+51−12
@@ -1,33 +1,66 @@
1+{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE CPP #-}
13{-# LANGUAGE OverloadedStrings #-}
24{-# LANGUAGE RecursiveDo #-}
5+{-# LANGUAGE ScopedTypeVariables #-}
36import Control.Concurrent
7+import Control.Exception
48import Control.Monad
59import Control.Monad.IO.Class
610import Data.Int
7−import GHC.Stats
11+import Data.Text as T
812import Language.Javascript.JSaddle.Warp
913import Reflex.Dom.Core
14+import Reflex.Time
1015import System.Exit
11−import System.IO.Temp
1216import System.Mem
1317import System.Process
1418
19+import Test.Util.ChromeFlags
20+import Test.Util.UnshareNetwork
21+
22+#if MIN_VERSION_base(4,11,0)
23+import GHC.Stats (getRTSStatsEnabled, getRTSStats, RTSStats(..), gcdetails_live_bytes, gc)
24+currentBytesUsed :: RTSStats -> Int64
25+currentBytesUsed = fromIntegral . gcdetails_live_bytes . gc
26+#else
27+import GHC.Stats (getGCStats, GCStats(..))
28+getRTSStats = getGCStats
29+#endif
30+
1531-- In initial testing, the minimum live bytes count was 233128 and maximum was
1632-- 363712. Going over the maximum means the test has actually failed - we
1733-- probably have a memory leak; going under the minimum doesn't indicate a
1834-- memory leak, but may mean the test needs to be updated.
19−minBytesAllowed, maxBytesAllowed :: Int64
20−(minBytesAllowed, maxBytesAllowed) = (200000, 400000)
35+minBytesAllowed, resetThreshold, maxBytesAllowed :: Int64
36+(minBytesAllowed, resetThreshold, maxBytesAllowed) = (200000, 400000, 600000)
37+
38+-- Some times the memory usage might flair up and then then return to normal
39+-- this probably indicates an issue, but if you are trying to fix a slow consistent
40+-- leak it can confuse the results by making the tests fail when the slow leak is
41+-- fixed.
42+-- Set this limit to say how many failures (currentBytesUsed > maxBytesAllowed)
43+-- want to ignore. If the memory usage goes back under resetThreshold
44+-- the failure count is reset to 0.
45+failureLimit :: Int
46+failureLimit = 0
2147
2248main :: IO ()
2349main = do
24− mainThread <- myThreadId
25− withSystemTempDirectory "reflex-dom-core_test_gc" $ \tmp -> do
26− browserProcess <- spawnCommand $ "xvfb-run -a chromium --user-data-dir=" ++ tmp ++ " http://localhost:3911"
50+ handle (\(_ :: IOError) -> return ()) $ unshareNetwork -- If we run into an exception with sandboxing, just don't bother
51+ withSandboxedChromeFlags True $ \chromeFlags -> do
52+ mainThread <- myThreadId
53+ browserProcess <- spawnCommand $ mconcat
54+ [ "echo 'Starting Chromium' ; chromium "
55+ , unpack $ T.unwords chromeFlags
56+ , " http://localhost:3911 ; echo 'Chromium exited'"
57+ ]
2758 let finishTest result = do
2859 interruptProcessGroupOf browserProcess
2960 throwTo mainThread result
61+ putStrLn "About to start the server"
3062 run 3911 $ do
63+ -- enableLogging True
3164 liftIO $ putStrLn "Running..."
3265 mainWidget $ do
3366 let w = do
@@ -36,22 +69,28 @@ main = do
3669 d <- holdDyn mempty $ mempty <$ domEvent Click e
3770 return ()
3871 postBuild <- getPostBuild
39− let f n = liftIO $ if n < 3000
72+ let f (!failures, !n) = liftIO $ if n < 3000
4073 then do performMajorGC
41− gcStats <- getGCStats
74+ threadDelay 5000 -- Wait a bit to allow requestAnimationFrame to call its callback sometimes; this value was experimentally determined
75+ gcStats <- getRTSStats
4276 print $ currentBytesUsed gcStats
4377 when (currentBytesUsed gcStats < minBytesAllowed) $ do
4478 putStrLn "FAILED: currentBytesUsed < minBytesAllowed"
4579 finishTest $ ExitFailure 2
46− when (currentBytesUsed gcStats > maxBytesAllowed) $ do
80+ let overMax = currentBytesUsed gcStats > maxBytesAllowed
81+ underReset = currentBytesUsed gcStats < resetThreshold
82+ when (overMax && failures >= failureLimit) $ do
4783 putStrLn "FAILED: currentBytesUsed > maxBytesAllowed"
4884 finishTest $ ExitFailure 1
49− return $ Just $ succ n
85+ return $ Just (
86+ if overMax
87+ then succ failures
88+ else (if underReset then 0 else failures), succ n)
5089 else do putStrLn "SUCCEEDED"
5190 finishTest ExitSuccess
5291 return Nothing
5392 rec redraw <- performEvent <=< delay 0 $ f <$> leftmost
54− [ (0 :: Int) <$ postBuild
93+ [ (0 :: Int, 0 :: Int) <$ postBuild
5594 , fmapMaybe id redraw
5695 ]
5796 _ <- widgetHold w $ w <$ redraw
reflex-dom-core/test/hlint.hs+6−1
@@ -1,4 +1,4 @@
1−import Language.Haskell.HLint3 (hlint)
1+import Language.Haskell.HLint (hlint)
22import System.Exit (exitFailure, exitSuccess)
33
44main :: IO ()
@@ -15,7 +15,12 @@ main = do
1515 , "--ignore=Use ."
1616 , "--ignore=Use unless"
1717 , "--ignore=Use if"
18+ , "--ignore=Use fewer imports"
19+ , "--ignore=Use list comprehension"
20+ , "--ignore=Unnecessary hiding" -- Interferes with cross-version compatibility
21+ , "--ignore=Use <$>"
1822 , "--ignore=Reduce duplication" --TODO: Re-enable this test
23+ , "--ignore=Use list comprehension"
1924 , "--cpp-define=USE_TEMPLATE_HASKELL"
2025 ]
2126 if null ideas then exitSuccess else exitFailure
reflex-dom-core/test/hydration.hsnew file+1828
@@ -0,0 +1,1828 @@
1+{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE FlexibleInstances #-}
5+{-# LANGUAGE GADTs #-}
6+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
7+{-# LANGUAGE LambdaCase #-}
8+{-# LANGUAGE MultiParamTypeClasses #-}
9+{-# LANGUAGE OverloadedStrings #-}
10+{-# LANGUAGE PolyKinds #-}
11+{-# LANGUAGE RankNTypes #-}
12+{-# LANGUAGE RecursiveDo #-}
13+{-# LANGUAGE ScopedTypeVariables #-}
14+{-# LANGUAGE StandaloneDeriving #-}
15+{-# LANGUAGE TemplateHaskell #-}
16+{-# LANGUAGE TupleSections #-}
17+{-# LANGUAGE TypeApplications #-}
18+{-# LANGUAGE TypeFamilies #-}
19+{-# LANGUAGE UndecidableInstances #-}
20+
21+{-# OPTIONS_GHC -fno-warn-orphans #-}
22+
23+-- Notice to those working on this test suite:
24+-- It doesn't appear to be possible to use --match to run a particular test, in
25+-- this situation the test may hang before reaching our code. This seems to
26+-- happen when the test is not the first test in the block. As a workaround, you
27+-- can just comment out the other tests. Also, using `xit` will cause the same
28+-- issue. `xit` tests must be the last tests in the session, or the session will
29+-- hang in the following test.
30+
31+import Prelude hiding (fail)
32+import Control.Concurrent
33+import qualified Control.Concurrent.Async as Async
34+import Control.Lens.Operators
35+import Control.Monad hiding (fail)
36+import Control.Monad.Catch
37+import Control.Monad.Fail
38+import Control.Monad.Fix
39+import Control.Monad.IO.Class
40+import Control.Monad.Ref
41+import Data.Constraint.Extras
42+import Data.Constraint.Extras.TH
43+import Data.Dependent.Map (DMap)
44+import Data.Dependent.Sum (DSum(..), (==>))
45+import Data.Functor.Identity
46+import Data.Functor.Misc
47+import Data.GADT.Compare.TH
48+import Data.GADT.Show.TH
49+import Data.IORef (IORef)
50+import Data.List (sort)
51+import Data.Maybe
52+import Data.Proxy
53+import Data.Text (Text)
54+import Language.Javascript.JSaddle (syncPoint, liftJSM)
55+import Language.Javascript.JSaddle.Warp
56+import Network.HTTP.Types (status200)
57+import Network.Socket
58+import Network.Wai
59+import Network.WebSockets
60+import Reflex.Dom.Core
61+import Reflex.Dom.Widget.Input (dropdown)
62+import Reflex.Patch.DMapWithMove
63+import System.Directory
64+import System.Environment
65+import System.IO (stderr)
66+import System.IO.Silently
67+import System.IO.Temp
68+import System.Process
69+import System.Which (staticWhich)
70+import qualified Test.HUnit as HUnit
71+import qualified Test.Hspec as H
72+import qualified Test.Hspec.Core.Spec as H
73+import Test.Hspec (xit)
74+import Test.Hspec.WebDriver hiding (runWD, click, uploadFile, WD)
75+import qualified Test.Hspec.WebDriver as WD
76+import Test.WebDriver (WD(..))
77+
78+import qualified Data.ByteString.Lazy as LBS
79+import qualified Data.Dependent.Map as DMap
80+import qualified Data.IntMap as IntMap
81+import qualified Data.Text as T
82+import qualified Data.Text.Encoding as TE
83+import qualified GHCJS.DOM.File as File
84+import qualified Network.Wai.Handler.Warp as Warp
85+import qualified System.FilePath as FilePath
86+import qualified Test.WebDriver as WD
87+import qualified Test.WebDriver.Capabilities as WD
88+
89+import Test.Util.ChromeFlags
90+import Test.Util.UnshareNetwork
91+
92+-- ORPHAN: https://github.com/kallisti-dev/hs-webdriver/pull/167
93+deriving instance MonadMask WD
94+
95+chromium :: FilePath
96+chromium = $(staticWhich "chromium")
97+
98+seleniumPort, jsaddlePort :: PortNumber
99+seleniumPort = 8000
100+jsaddlePort = 8001
101+
102+-- TODO Remove orphan
103+instance MonadRef WD where
104+ type Ref WD = Ref IO
105+ newRef = WD . newRef
106+ readRef = WD . readRef
107+ writeRef r = WD . writeRef r
108+
109+assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
110+assertEqual msg a b = liftIO $ HUnit.assertEqual msg a b
111+
112+assertFailure :: MonadIO m => String -> m ()
113+assertFailure = liftIO . HUnit.assertFailure
114+
115+assertBool :: (MonadIO m) => String -> Bool -> m ()
116+assertBool msg bool = liftIO $ HUnit.assertBool msg bool
117+
118+chromeConfig :: Text -> [Text] -> WD.WDConfig
119+chromeConfig fp flags = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags }) WD.defaultConfig
120+
121+keyMap :: DMap DKey Identity
122+keyMap = DMap.fromList
123+ [ Key_Int ==> 0
124+ , Key_Char ==> 'A'
125+ ]
126+
127+data DKey a where
128+ Key_Int :: DKey Int
129+ Key_Char :: DKey Char
130+ Key_Bool :: DKey Bool
131+
132+
133+textKey :: DKey a -> Text
134+textKey = \case
135+ Key_Int -> "Key_Int"
136+ Key_Char -> "Key_Char"
137+ Key_Bool -> "Key_Bool"
138+
139+deriveArgDict ''DKey
140+deriveGEq ''DKey
141+deriveGCompare ''DKey
142+deriveGShow ''DKey
143+
144+deriving instance MonadFail WD
145+
146+main :: IO ()
147+main = do
148+ unshareNetwork
149+ isHeadless <- (== Nothing) <$> lookupEnv "NO_HEADLESS"
150+ withSandboxedChromeFlags isHeadless $ \chromeFlags -> do
151+ withSeleniumServer $ \selenium -> do
152+ let browserPath = T.strip $ T.pack chromium
153+ when (T.null browserPath) $ fail "No browser found"
154+ withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"
155+ let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
156+ chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
157+ hspec (tests withDebugging wdConfig [(chromeCaps', "chrome")] selenium) `finally` _selenium_stopServer selenium
158+
159+tests :: Bool -> WD.WDConfig -> [(Capabilities, String)] -> Selenium -> Spec
160+tests withDebugging wdConfig caps _selenium = do
161+ let putStrLnDebug :: MonadIO m => Text -> m ()
162+ putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
163+ session' t = sessionWith wdConfig t . using caps
164+ runWD m = runWDOptions (WdOptions False) $ do
165+ putStrLnDebug "before"
166+ r <- m
167+ putStrLnDebug "after"
168+ return r
169+ testWidgetStatic :: WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
170+ testWidgetStatic = testWidgetStaticDebug withDebugging
171+ testWidget :: WD () -> WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
172+ testWidget = testWidgetDebug True withDebugging
173+ testWidget' :: WD a -> (a -> WD b) -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
174+ testWidget' = testWidgetDebug' True withDebugging
175+ session' "text" $ do
176+ it "works" $ runWD $ do
177+ testWidgetStatic (checkBodyText "hello world") $ do
178+ text "hello world"
179+ it "works with postBuild" $ runWD $ do
180+ testWidgetStatic (checkBodyText "pb") $ do
181+ pb <- getPostBuild
182+ void $ textNode $ TextNodeConfig "" $ Just $ "pb" <$ pb
183+ it "works for adjacent text nodes" $ runWD $ do
184+ testWidgetStatic (checkBodyText "hello world") $ do
185+ text "hello "
186+ text "world"
187+ it "works for empty adjacent text nodes" $ runWD $ do
188+ testWidgetStatic (checkBodyText "hello world") $ do
189+ pb <- getPostBuild
190+ text ""
191+ text ""
192+ _ <- textNode $ TextNodeConfig "" $ Just $ "hello " <$ pb
193+ _ <- textNode $ TextNodeConfig "abc" $ Just $ "" <$ pb
194+ _ <- textNode $ TextNodeConfig "" $ Just $ "world" <$ pb
195+ text ""
196+ it "works when empty text nodes are the only children of an element" $ runWD $ do
197+ testWidgetStatic (checkBodyText "hello world") $ do
198+ el "div" $ do
199+ text ""
200+ text ""
201+ text "hello world"
202+ it "works when an empty text node is the first child before text" $ runWD $ do
203+ testWidgetStatic (checkTextInTag "div" "hello world") $ do
204+ el "div" $ do
205+ text ""
206+ text "hello world"
207+ it "works when an empty text node is the first child before element" $ runWD $ do
208+ testWidgetStatic (checkTextInTag "div" "hello world") $ do
209+ el "div" $ do
210+ text ""
211+ el "span" $ text "hello world"
212+ it "works when an empty text node is the last child" $ runWD $ do
213+ testWidgetStatic (checkTextInTag "div" "hello world") $ do
214+ el "div" $ do
215+ el "span" $ text "hello world"
216+ text ""
217+-- TODO I think these two tests are broken
218+-- it "updates after postBuild" $ runWD $ do
219+-- testWidget (checkBodyText "initial") (checkBodyText "after") $ do
220+-- after <- delay 0 =<< getPostBuild
221+-- void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ after
222+-- it "updates immediately after postBuild" $ runWD $ do
223+-- testWidget (checkBodyText "pb") (checkBodyText "after") $ do
224+-- pb <- getPostBuild
225+-- after <- delay 0 pb
226+-- void $ textNode $ TextNodeConfig "initial" $ Just $ leftmost ["pb" <$ pb, "after" <$ after]
227+ it "updates in immediate mode" $ runWD $ do
228+ let checkUpdated = do
229+ checkBodyText "initial"
230+ WD.click =<< findElemWithRetry (WD.ByTag "button")
231+ checkBodyText "after"
232+ testWidget (pure ()) checkUpdated $ prerender_ (pure ()) $ do
233+ click <- button ""
234+ void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
235+
236+ session' "element" $ do
237+ it "works with domEvent Click" $ runWD $ do
238+ clickedRef <- liftIO $ newRef False
239+ testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
240+ (e, _) <- el' "div" $ text "hello world"
241+ performEvent_ $ liftIO (writeRef clickedRef True) <$ domEvent Click e
242+ readRef clickedRef `shouldBeWithRetryM` True
243+ it "works with eventFlags stopPropagation" $ runWD $ do
244+ firstClickedRef <- newRef False
245+ secondClickedRef <- newRef False
246+ let clickBoth = do
247+ findElemWithRetry (WD.ById "first") >>= WD.click
248+ findElemWithRetry (WD.ById "second") >>= WD.click
249+ testWidget (pure ()) clickBoth $ do
250+ (firstDivEl, _) <- el' "div" $ prerender_ (pure ()) $ do
251+ void $ elAttr "span" ("id" =: "first") $ text "hello world"
252+ performEvent_ $ liftIO (writeRef firstClickedRef True) <$ domEvent Click firstDivEl
253+ (secondDivEl, _) <- el' "div" $ prerender_ (pure ()) $ do
254+ let conf :: ElementConfig EventResult (SpiderTimeline Global) GhcjsDomSpace
255+ conf = (def :: ElementConfig EventResult (SpiderTimeline Global) GhcjsDomSpace)
256+ & initialAttributes .~ "id" =: "second"
257+ & elementConfig_eventSpec .~ addEventSpecFlags (Proxy :: Proxy GhcjsDomSpace) Click (\_ -> stopPropagation) def
258+ void $ element "span" conf $ text "hello world"
259+ performEvent_ $ liftIO (writeRef secondClickedRef True) <$ domEvent Click secondDivEl
260+ firstClicked <- readRef firstClickedRef
261+ secondClicked <- readRef secondClickedRef
262+ assertEqual "Click propagated when it should have stopped" (True, False) (firstClicked, secondClicked)
263+ it "works with eventFlags preventDefault" $ runWD $ do
264+ let click = do
265+ e <- findElemWithRetry $ WD.ByTag "input"
266+ s0 <- WD.isSelected e
267+ WD.click e
268+ s1 <- WD.isSelected e
269+ pure (s0, s1)
270+ clicked <- testWidget (pure ()) click $ prerender_ (pure ()) $ do
271+ let conf :: ElementConfig EventResult (SpiderTimeline Global) GhcjsDomSpace
272+ conf = (def :: ElementConfig EventResult (SpiderTimeline Global) GhcjsDomSpace)
273+ & elementConfig_eventSpec .~ addEventSpecFlags (Proxy :: Proxy GhcjsDomSpace) Click (\_ -> preventDefault) def
274+ & initialAttributes .~ "type" =: "checkbox"
275+ void $ element "input" conf $ text "hello world"
276+ assertEqual "Click not prevented" (False, False) clicked
277+ it "can add/update/remove attributes" $ runWD $ do
278+ let checkInitialAttrs = do
279+ e <- findElemWithRetry $ WD.ByTag "div"
280+ assertAttr e "const" (Just "const")
281+ assertAttr e "delete" (Just "delete")
282+ assertAttr e "init" (Just "init")
283+ assertAttr e "click" Nothing
284+ pure e
285+ checkModifyAttrs e = do
286+ WD.click e
287+ withRetry $ do
288+ assertAttr e "const" (Just "const")
289+ assertAttr e "delete" Nothing
290+ assertAttr e "init" (Just "click")
291+ assertAttr e "click" (Just "click")
292+ testWidget' checkInitialAttrs checkModifyAttrs $ mdo
293+ let conf = def
294+ & initialAttributes .~ "const" =: "const" <> "delete" =: "delete" <> "init" =: "init"
295+ & modifyAttributes .~ (("delete" =: Nothing <> "init" =: Just "click" <> "click" =: Just "click") <$ click)
296+ (e, ()) <- element "div" conf $ text "hello world"
297+ let click = domEvent Click e
298+ return ()
299+
300+ session' "inputElement" $ do
301+ describe "static renderer" $ do
302+ it "sets value attribute" $ runWD $ do
303+ let checkStatic = do
304+ e <- findElemWithRetry $ WD.ByTag "input"
305+ WD.attr e "value" `shouldBeWithRetryM` Just "test"
306+ pure e
307+ checkHydrated e = do
308+ WD.attr e "value" `shouldBeWithRetryM` Just "test"
309+ testWidget' checkStatic checkHydrated $ void $ inputElement $ def
310+ & inputElementConfig_initialValue .~ "test"
311+ it "updates value attribute at postBuild" $ runWD $ do
312+ let checkStatic = do
313+ e <- findElemWithRetry $ WD.ByTag "input"
314+ WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
315+ pure e
316+ checkHydrated e = do
317+ WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
318+ testWidget' checkStatic checkHydrated $ do
319+ pb <- getPostBuild
320+ _ <- inputElement $ def
321+ & inputElementConfig_initialValue .~ "test"
322+ & inputElementConfig_setValue .~ ("test-updated" <$ pb)
323+ pure ()
324+ it "sets checked attr appropriately" $ runWD $ do
325+ setCheckedChan <- liftIO newChan
326+ let checkStatic = do
327+ e <- findElemWithRetry $ WD.ByTag "input"
328+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
329+ pure e
330+ checkValue e = do
331+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
332+ WD.moveToCenter e
333+ WD.click e -- Click to uncheck
334+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
335+ liftIO $ writeChan setCheckedChan True -- Programatically check the checkbox
336+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
337+ testWidget' checkStatic checkValue $ do
338+ setChecked <- triggerEventWithChan setCheckedChan
339+ _ <- inputElement $ def
340+ & initialAttributes .~ "type" =: "checkbox"
341+ & inputElementConfig_initialChecked .~ True
342+ & inputElementConfig_setChecked .~ setChecked
343+ pure ()
344+ it "sets checked attr appropriately at postbuild" $ runWD $ do
345+ let checkStatic = do
346+ e <- findElemWithRetry $ WD.ByTag "input"
347+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
348+ pure e
349+ checkValue e = do
350+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
351+ testWidget' checkStatic checkValue $ do
352+ pb <- getPostBuild
353+ _ <- inputElement $ def
354+ & initialAttributes .~ "type" =: "checkbox"
355+ & inputElementConfig_initialChecked .~ False
356+ & inputElementConfig_setChecked .~ (True <$ pb)
357+ pure ()
358+ describe "hydration" $ do
359+ it "doesn't wipe user input when switching over" $ runWD $ do
360+ inputRef <- newRef ("hello " :: Text)
361+ testWidget'
362+ (do
363+ e <- findElemWithRetry $ WD.ByTag "input"
364+ WD.sendKeys "world" e
365+ pure e)
366+ (\e -> do
367+ WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
368+ WD.click =<< findElemWithRetry (WD.ByTag "button")
369+ readRef inputRef `shouldBeWithRetryM` "hello world"
370+ ) $ do
371+ e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
372+ click <- button "save"
373+ performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
374+ it "captures user input after switchover" $ runWD $ do
375+ inputRef <- newRef ("" :: Text)
376+ let checkValue = do
377+ WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
378+ WD.click =<< findElemWithRetry (WD.ByTag "button")
379+ readRef inputRef `shouldBeWithRetryM` "hello world"
380+ testWidget (pure ()) checkValue $ do
381+ e <- inputElement def
382+ click <- button "save"
383+ performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
384+ it "sets focus appropriately" $ runWD $ do
385+ focusRef <- newRef False
386+ let checkValue = do
387+ readRef focusRef `shouldBeWithRetryM` False
388+ e <- findElemWithRetry $ WD.ByTag "input"
389+ WD.click e
390+ readRef focusRef `shouldBeWithRetryM` True
391+ testWidget (pure ()) checkValue $ do
392+ e <- inputElement def
393+ performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
394+ it "sets focus when focus occurs before hydration" $ runWD $ do
395+ focusRef <- newRef False
396+ let setup = do
397+ e <- findElemWithRetry $ WD.ByTag "input"
398+ WD.click e
399+ ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
400+ readRef focusRef `shouldBeWithRetryM` False
401+ check = readRef focusRef `shouldBeWithRetryM` True
402+ testWidget setup check $ do
403+ e <- inputElement def
404+ performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
405+ it "sets value appropriately" $ runWD $ do
406+ valueByUIRef <- newRef ("" :: Text)
407+ valueRef <- newRef ("" :: Text)
408+ setValueChan :: Chan Text <- liftIO newChan
409+ let checkValue = do
410+ readRef valueByUIRef `shouldBeWithRetryM` ""
411+ readRef valueRef `shouldBeWithRetryM` ""
412+ e <- findElemWithRetry $ WD.ByTag "input"
413+ WD.sendKeys "hello" e
414+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
415+ readRef valueRef `shouldBeWithRetryM` "hello"
416+ liftIO $ writeChan setValueChan "world"
417+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
418+ readRef valueRef `shouldBeWithRetryM` "world"
419+ testWidget (pure ()) checkValue $ do
420+ update <- triggerEventWithChan setValueChan
421+ e <- inputElement $ def & inputElementConfig_setValue .~ update
422+ performEvent_ $ liftIO . writeRef valueByUIRef <$> _inputElement_input e
423+ performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
424+ it "sets checked appropriately" $ runWD $ do
425+ checkedByUIRef <- newRef False
426+ checkedRef <- newRef False
427+ setCheckedChan <- liftIO newChan
428+ let checkStatic = do
429+ e <- findElemWithRetry $ WD.ByTag "input"
430+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
431+ pure e
432+ checkValue e = do
433+ readRef checkedByUIRef `shouldBeWithRetryM` False
434+ readRef checkedRef `shouldBeWithRetryM` False
435+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
436+ WD.moveToCenter e
437+ WD.click e
438+ readRef checkedByUIRef `shouldBeWithRetryM` True
439+ readRef checkedRef `shouldBeWithRetryM` True
440+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
441+ liftIO $ writeChan setCheckedChan False
442+ readRef checkedByUIRef `shouldBeWithRetryM` True
443+ readRef checkedRef `shouldBeWithRetryM` False
444+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
445+ testWidget' checkStatic checkValue $ do
446+ setChecked <- triggerEventWithChan setCheckedChan
447+ e <- inputElement $ def
448+ & initialAttributes .~ "type" =: "checkbox"
449+ & inputElementConfig_setChecked .~ setChecked
450+ performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
451+ performEvent_ $ liftIO . writeRef checkedRef <$> updated (_inputElement_checked e)
452+ it "respects user updates to checked which happen before hydration" $ runWD $ do
453+ checkedByUIRef <- newRef False
454+ checkedRef <- newRef False
455+ let checkStatic = do
456+ e <- findElemWithRetry $ WD.ByTag "input"
457+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
458+ WD.moveToCenter e
459+ WD.click e
460+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
461+ pure e
462+ checkValue e = do
463+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
464+ readRef checkedByUIRef `shouldBeWithRetryM` True
465+ readRef checkedRef `shouldBeWithRetryM` True
466+ testWidget' checkStatic checkValue $ do
467+ e <- inputElement $ def
468+ & initialAttributes .~ "type" =: "checkbox"
469+ performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
470+ performEvent_ $ liftIO . writeRef checkedRef <$> updated (_inputElement_checked e)
471+ it "captures file uploads" $ runWD $ do
472+ filesRef :: IORef [Text] <- newRef []
473+ let uploadFile = do
474+ e <- findElemWithRetry $ WD.ByTag "input"
475+ path <- liftIO $ writeSystemTempFile "testFile" "file contents"
476+ WD.sendKeys (T.pack path) e
477+ WD.click =<< findElemWithRetry (WD.ByTag "button")
478+ liftIO $ removeFile path
479+ readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
480+ testWidget (pure ()) uploadFile $ do
481+ e <- inputElement $ def & initialAttributes .~ "type" =: "file"
482+ click <- button "save"
483+ prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
484+ names <- liftJSM $ traverse File.getName fs
485+ liftIO $ writeRef filesRef names
486+ it "fires _input event if the user altered the value before hydration" $ runWD $ do
487+ input <- newRef ("" :: Text)
488+ update <- newRef ("" :: Text)
489+ let checkStatic = do
490+ e <- findElemWithRetry $ WD.ByTag "input"
491+ WD.attr e "value" `shouldBeWithRetryM` Just ""
492+ WD.sendKeys "test" e
493+ WD.attr e "value" `shouldBeWithRetryM` Just "test"
494+ pure e
495+ checkHydrated e = do
496+ WD.attr e "value" `shouldBeWithRetryM` Just "test"
497+ readRef input `shouldBeWithRetryM` "test"
498+ readRef update `shouldBeWithRetryM` "test"
499+ testWidget' checkStatic checkHydrated $ do
500+ e <- inputElement def
501+ performEvent_ $ liftIO . writeRef input <$> _inputElement_input e
502+ performEvent_ $ liftIO . writeRef update <$> updated (_inputElement_value e)
503+ it "does not fire _input event when the value is updated at postBuild" $ runWD $ do
504+ input <- newRef (Nothing :: Maybe Text)
505+ let checkStatic = do
506+ e <- findElemWithRetry $ WD.ByTag "input"
507+ WD.attr e "value" `shouldBeWithRetryM` Just "pb"
508+ pure e
509+ checkHydrated e = do
510+ WD.attr e "value" `shouldBeWithRetryM` Just "pb"
511+ readRef input `shouldBeWithRetryM` Nothing
512+ testWidget' checkStatic checkHydrated $ do
513+ pb <- getPostBuild
514+ e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
515+ performEvent_ $ liftIO . writeRef input . Just <$> _inputElement_input e
516+ it "SSR produces correct DOM based on inputElement values when setValue happens at postBuild" $ runWD $ do
517+ let checkBoth = do
518+ input <- findElemWithRetry $ WD.ByTag "input"
519+ WD.attr input "value" `shouldBeWithRetryM` Just "pb"
520+ p <- findElemWithRetry (WD.ByTag "p")
521+ shouldContainText "pb" p
522+ testWidget checkBoth checkBoth $ do
523+ pb <- getPostBuild
524+ e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
525+ el "p" $ dynText $ _inputElement_value e
526+ it "does not fail when both setValue AND user updated value happen before switchover" $ runWD $ do
527+ let checkStatic = do
528+ input <- findElemWithRetry $ WD.ByTag "input"
529+ h2_value <- findElemWithRetry (WD.ByTag "h2")
530+ h3_input <- findElemWithRetry (WD.ByTag "h3")
531+ WD.attr input "value" `shouldBeWithRetryM` Just "pb"
532+ shouldContainText "pb" h2_value
533+ shouldContainText "" h3_input
534+ WD.sendKeys "abc" input
535+ WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
536+ shouldContainText "pb" h2_value
537+ shouldContainText "" h3_input
538+ pure (input, h2_value, h3_input)
539+ checkHydrated (input, h2_value, h3_input) = do
540+ WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
541+ shouldContainText "pbabc" h3_input
542+ shouldContainText "pbabc pb" h2_value
543+ pure ()
544+ testWidget' checkStatic checkHydrated $ do
545+ pb <- getPostBuild
546+ e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
547+ el "h1" $ dynText $ _inputElement_value e
548+ el "h2" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ updated $ _inputElement_value e
549+ el "h3" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ _inputElement_input e
550+ it "value is correct when both setValue AND user updated value happen before switchover" $ runWD $ do
551+ let checkStatic = do
552+ input <- findElemWithRetry $ WD.ByTag "input"
553+ p <- findElemWithRetry (WD.ByTag "p")
554+ WD.attr input "value" `shouldBeWithRetryM` Just "pb"
555+ shouldContainText "pb" p
556+ WD.sendKeys "abc" input
557+ WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
558+ shouldContainText "pb" p -- It won't be updated yet
559+ pure (input, p)
560+ checkHydrated (input, p) = do
561+ WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
562+ shouldContainText "pbabc" p
563+ pure ()
564+ testWidget' checkStatic checkHydrated $ do
565+ pb <- getPostBuild
566+ e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
567+ el "p" $ dynText $ _inputElement_value e
568+ it "input event and (updated value) fire correctly when both setValue AND user updated value happen before switchover" $ runWD $ do
569+ valRef <- newRef ([] :: [Text])
570+ inputRef <- newRef ([] :: [Text])
571+ let consRef ref a = liftIO $ atomicModifyRef ref $ \as -> (a:as, ())
572+ checkStatic = do
573+ input <- findElemWithRetry $ WD.ByTag "input"
574+ p <- findElemWithRetry (WD.ByTag "p")
575+ WD.attr input "value" `shouldBeWithRetryM` Just "pb"
576+ shouldContainText "pb" p
577+ WD.sendKeys "abc" input
578+ WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
579+ shouldContainText "pb" p -- It won't be updated yet
580+ readRef inputRef `shouldBeWithRetryM` [] -- Should never fire input ref during SSR
581+ readRef valRef `shouldBeWithRetryM` ["pb"]
582+ pure (input, p)
583+ checkHydrated (input, p) = do
584+ readRef inputRef `shouldBeWithRetryM` ["pbabc"]
585+ readRef valRef `shouldBeWithRetryM` ["pbabc", "pb"]
586+ WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
587+ shouldContainText "pbabc" p
588+ pure ()
589+ testWidget' checkStatic checkHydrated $ do
590+ liftIO $ writeRef valRef []
591+ pb <- getPostBuild
592+ e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
593+ el "p" $ dynText $ _inputElement_value e
594+ performEvent_ $ consRef valRef <$> updated (_inputElement_value e)
595+ performEvent_ $ consRef inputRef <$> _inputElement_input e
596+ describe "hydration/immediate" $ do
597+ it "captures user input after switchover" $ runWD $ do
598+ inputRef :: IORef Text <- newRef ""
599+ let checkValue = do
600+ WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
601+ WD.click =<< findElemWithRetry (WD.ByTag "button")
602+ readRef inputRef `shouldBeWithRetryM` "hello world"
603+ testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
604+ e <- inputElement def
605+ click <- button "save"
606+ performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
607+ it "sets focus appropriately" $ runWD $ do
608+ focusRef <- newRef False
609+ let checkValue = do
610+ readRef focusRef `shouldBeWithRetryM` False
611+ e <- findElemWithRetry $ WD.ByTag "input"
612+ WD.click e
613+ readRef focusRef `shouldBeWithRetryM` True
614+ testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
615+ e <- inputElement def
616+ performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
617+ it "sets value appropriately" $ runWD $ do
618+ valueByUIRef :: IORef Text <- newRef ""
619+ valueRef :: IORef Text <- newRef ""
620+ setValueChan :: Chan Text <- liftIO newChan
621+ let checkValue = do
622+ readRef valueByUIRef `shouldBeWithRetryM` ""
623+ readRef valueRef `shouldBeWithRetryM` ""
624+ e <- findElemWithRetry $ WD.ByTag "input"
625+ WD.sendKeys "hello" e
626+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
627+ readRef valueRef `shouldBeWithRetryM` "hello"
628+ liftIO $ writeChan setValueChan "world"
629+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
630+ readRef valueRef `shouldBeWithRetryM` "world"
631+ testWidget (pure ()) checkValue $ do
632+ update <- triggerEventWithChan setValueChan
633+ prerender_ (pure ()) $ do
634+ e <- inputElement $ def & inputElementConfig_setValue .~ update
635+ performEvent_ $ liftIO . writeRef valueByUIRef <$> _inputElement_input e
636+ performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
637+ it "sets checked appropriately" $ runWD $ do
638+ checkedByUIRef <- newRef False
639+ checkedRef <- newRef False
640+ setCheckedChan <- liftIO newChan
641+ let checkValue = do
642+ readRef checkedByUIRef `shouldBeWithRetryM` False
643+ readRef checkedRef `shouldBeWithRetryM` False
644+ e <- findElemWithRetry $ WD.ByTag "input"
645+ WD.moveToCenter e
646+ WD.click e
647+ readRef checkedByUIRef `shouldBeWithRetryM` True
648+ readRef checkedRef `shouldBeWithRetryM` True
649+ liftIO $ writeChan setCheckedChan False
650+ readRef checkedByUIRef `shouldBeWithRetryM` True
651+ readRef checkedRef `shouldBeWithRetryM` False
652+ testWidget (pure ()) checkValue $ do
653+ setChecked <- triggerEventWithChan setCheckedChan
654+ prerender_ (pure ()) $ do
655+ e <- inputElement $ def
656+ & initialAttributes .~ "type" =: "checkbox"
657+ & inputElementConfig_setChecked .~ setChecked
658+ performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
659+ performEvent_ $ liftIO . writeRef checkedRef <$> updated (_inputElement_checked e)
660+ it "captures file uploads" $ runWD $ do
661+ filesRef :: IORef [Text] <- newRef []
662+ let uploadFile = do
663+ e <- findElemWithRetry $ WD.ByTag "input"
664+ path <- liftIO $ writeSystemTempFile "testFile" "file contents"
665+ WD.sendKeys (T.pack path) e
666+ WD.click =<< findElemWithRetry (WD.ByTag "button")
667+ liftIO $ removeFile path
668+ readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
669+ testWidget (pure ()) uploadFile $ prerender_ (pure ()) $ do
670+ e <- inputElement $ def & initialAttributes .~ "type" =: "file"
671+ click <- button "save"
672+ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
673+ names <- liftJSM $ traverse File.getName fs
674+ liftIO $ writeRef filesRef names
675+
676+ session' "textAreaElement" $ do
677+ describe "static renderer" $ do
678+ it "sets value attribute" $ runWD $ do
679+ let checkStatic = do
680+ e <- findElemWithRetry $ WD.ByTag "textarea"
681+ WD.attr e "value" `shouldBeWithRetryM` Just "test"
682+ pure e
683+ checkHydrated e = do
684+ WD.attr e "value" `shouldBeWithRetryM` Just "test"
685+ testWidget' checkStatic checkHydrated $ void $ textAreaElement $ def
686+ & textAreaElementConfig_initialValue .~ "test"
687+ it "updates value attribute at postBuild" $ runWD $ do
688+ let checkStatic = do
689+ e <- findElemWithRetry $ WD.ByTag "textarea"
690+ WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
691+ pure e
692+ checkHydrated e = do
693+ WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
694+ testWidget' checkStatic checkHydrated $ do
695+ pb <- getPostBuild
696+ _ <- textAreaElement $ def
697+ & textAreaElementConfig_initialValue .~ "test"
698+ & textAreaElementConfig_setValue .~ ("test-updated" <$ pb)
699+ pure ()
700+ describe "hydration" $ do
701+ it "doesn't wipe user input when switching over" $ runWD $ do
702+ inputRef <- newRef ("" :: Text)
703+ testWidget'
704+ (do
705+ e <- findElemWithRetry $ WD.ByTag "textarea"
706+ WD.sendKeys "hello world" e
707+ pure e)
708+ (\e -> do
709+ WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
710+ WD.click <=< findElemWithRetry $ WD.ByTag "button"
711+ readRef inputRef `shouldBeWithRetryM` "hello world"
712+ ) $ do
713+ e <- textAreaElement def
714+ click <- button "save"
715+ performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
716+ it "captures user input after switchover" $ runWD $ do
717+ inputRef <- newRef ("" :: Text)
718+ let checkValue = do
719+ WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "textarea")
720+ WD.click =<< findElemWithRetry (WD.ByTag "button")
721+ readRef inputRef `shouldBeWithRetryM` "hello world"
722+ testWidget (pure ()) checkValue $ do
723+ e <- textAreaElement def
724+ click <- button "save"
725+ performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
726+ it "sets focus appropriately" $ runWD $ do
727+ focusRef <- newRef False
728+ let checkValue = do
729+ readRef focusRef `shouldBeWithRetryM` False
730+ e <- findElemWithRetry $ WD.ByTag "textarea"
731+ WD.click e
732+ readRef focusRef `shouldBeWithRetryM` True
733+ testWidget (pure ()) checkValue $ do
734+ e <- textAreaElement def
735+ performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
736+ it "sets focus when focus occurs before hydration" $ runWD $ do
737+ focusRef <- newRef False
738+ let setup = do
739+ e <- findElemWithRetry $ WD.ByTag "textarea"
740+ WD.click e
741+ ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
742+ readRef focusRef `shouldBeWithRetryM` False
743+ check = readRef focusRef `shouldBeWithRetryM` True
744+ testWidget setup check $ do
745+ e <- textAreaElement def
746+ performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
747+ it "sets value appropriately" $ runWD $ do
748+ valueByUIRef <- newRef ("" :: Text)
749+ valueRef <- newRef ("" :: Text)
750+ setValueChan :: Chan Text <- liftIO newChan
751+ let checkValue = do
752+ readRef valueByUIRef `shouldBeWithRetryM` ""
753+ readRef valueRef `shouldBeWithRetryM` ""
754+ e <- findElemWithRetry $ WD.ByTag "textarea"
755+ WD.sendKeys "hello" e
756+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
757+ readRef valueRef `shouldBeWithRetryM` "hello"
758+ liftIO $ writeChan setValueChan "world"
759+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
760+ readRef valueRef `shouldBeWithRetryM` "world"
761+ testWidget (pure ()) checkValue $ do
762+ setValue' <- triggerEventWithChan setValueChan
763+ e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
764+ performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
765+ performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
766+ it "fires _input event if the user altered the value before hydration" $ runWD $ do
767+ textarea <- newRef ("" :: Text)
768+ update <- newRef ("" :: Text)
769+ let checkStatic = do
770+ e <- findElemWithRetry $ WD.ByTag "textarea"
771+ WD.attr e "value" `shouldBeWithRetryM` Just ""
772+ WD.sendKeys "test" e
773+ WD.attr e "value" `shouldBeWithRetryM` Just "test"
774+ pure e
775+ checkHydrated e = do
776+ WD.attr e "value" `shouldBeWithRetryM` Just "test"
777+ readRef textarea `shouldBeWithRetryM` "test"
778+ readRef update `shouldBeWithRetryM` "test"
779+ testWidget' checkStatic checkHydrated $ do
780+ e <- textAreaElement def
781+ performEvent_ $ liftIO . writeRef textarea <$> _textAreaElement_input e
782+ performEvent_ $ liftIO . writeRef update <$> updated (_textAreaElement_value e)
783+ it "does not fire _input event when the value is updated at postBuild" $ runWD $ do
784+ textarea <- newRef (Nothing :: Maybe Text)
785+ let checkStatic = do
786+ e <- findElemWithRetry $ WD.ByTag "textarea"
787+ WD.attr e "value" `shouldBeWithRetryM` Just "pb"
788+ pure e
789+ checkHydrated e = do
790+ WD.attr e "value" `shouldBeWithRetryM` Just "pb"
791+ readRef textarea `shouldBeWithRetryM` Nothing
792+ testWidget' checkStatic checkHydrated $ do
793+ pb <- getPostBuild
794+ e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
795+ performEvent_ $ liftIO . writeRef textarea . Just <$> _textAreaElement_input e
796+ it "SSR produces correct DOM based on textAreaElement values when setValue happens at postBuild" $ runWD $ do
797+ let checkBoth = do
798+ textarea <- findElemWithRetry $ WD.ByTag "textarea"
799+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pb"
800+ p <- findElemWithRetry (WD.ByTag "p")
801+ shouldContainText "pb" p
802+ testWidget checkBoth checkBoth $ do
803+ pb <- getPostBuild
804+ e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
805+ el "p" $ dynText $ _textAreaElement_value e
806+ it "does not fail when both setValue AND user updated value happen before switchover" $ runWD $ do
807+ let checkStatic = do
808+ textarea <- findElemWithRetry $ WD.ByTag "textarea"
809+ h2_value <- findElemWithRetry (WD.ByTag "h2")
810+ h3_input <- findElemWithRetry (WD.ByTag "h3")
811+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pb"
812+ shouldContainText "pb" h2_value
813+ shouldContainText "" h3_input
814+ WD.sendKeys "abc" textarea
815+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
816+ shouldContainText "pb" h2_value
817+ shouldContainText "" h3_input
818+ pure (textarea, h2_value, h3_input)
819+ checkHydrated (textarea, h2_value, h3_input) = do
820+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
821+ shouldContainText "pbabc" h3_input
822+ shouldContainText "pbabc pb" h2_value
823+ pure ()
824+ testWidget' checkStatic checkHydrated $ do
825+ pb <- getPostBuild
826+ e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
827+ el "h1" $ dynText $ _textAreaElement_value e
828+ el "h2" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ updated $ _textAreaElement_value e
829+ el "h3" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ _textAreaElement_input e
830+ it "value is correct when both setValue AND user updated value happen before switchover" $ runWD $ do
831+ let checkStatic = do
832+ textarea <- findElemWithRetry $ WD.ByTag "textarea"
833+ p <- findElemWithRetry (WD.ByTag "p")
834+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pb"
835+ shouldContainText "pb" p
836+ WD.sendKeys "abc" textarea
837+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
838+ shouldContainText "pb" p -- It won't be updated yet
839+ pure (textarea, p)
840+ checkHydrated (textarea, p) = do
841+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
842+ shouldContainText "pbabc" p
843+ pure ()
844+ testWidget' checkStatic checkHydrated $ do
845+ pb <- getPostBuild
846+ e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
847+ el "p" $ dynText $ _textAreaElement_value e
848+
849+ describe "hydration/immediate" $ do
850+ it "captures user input after switchover" $ runWD $ do
851+ inputRef :: IORef Text <- newRef ""
852+ let checkValue = do
853+ WD.sendKeys "hello world" <=< findElemWithRetry $ WD.ByTag "textarea"
854+ WD.click <=< findElemWithRetry $ WD.ByTag "button"
855+ readRef inputRef `shouldBeWithRetryM` "hello world"
856+ testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
857+ e <- textAreaElement def
858+ click <- button "save"
859+ performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
860+ it "sets focus appropriately" $ runWD $ do
861+ focusRef <- newRef False
862+ let checkValue = do
863+ readRef focusRef `shouldBeWithRetryM` False
864+ e <- findElemWithRetry $ WD.ByTag "textarea"
865+ WD.click e
866+ readRef focusRef `shouldBeWithRetryM` True
867+ testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
868+ e <- textAreaElement def
869+ performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
870+ it "sets value appropriately" $ runWD $ do
871+ valueByUIRef :: IORef Text <- newRef ""
872+ valueRef :: IORef Text <- newRef ""
873+ setValueChan :: Chan Text <- liftIO newChan
874+ let checkValue = do
875+ readRef valueByUIRef `shouldBeWithRetryM` ""
876+ readRef valueRef `shouldBeWithRetryM` ""
877+ e <- findElemWithRetry $ WD.ByTag "textarea"
878+ WD.sendKeys "hello" e
879+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
880+ readRef valueRef `shouldBeWithRetryM` "hello"
881+ liftIO $ writeChan setValueChan "world"
882+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
883+ readRef valueRef `shouldBeWithRetryM` "world"
884+ testWidget (pure ()) checkValue $ do
885+ setValue' <- triggerEventWithChan setValueChan
886+ prerender_ (pure ()) $ do
887+ e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
888+ performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
889+ performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
890+
891+ session' "selectElement" $ do
892+ let options :: DomBuilder t m => m ()
893+ options = do
894+ elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
895+ elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
896+ elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
897+ describe "hydration" $ do
898+ it "sets initial value correctly" $ runWD $ do
899+ inputRef <- newRef ("" :: Text)
900+ let setup = do
901+ e <- findElemWithRetry $ WD.ByTag "select"
902+ assertAttr e "value" (Just "three")
903+ WD.click =<< findElemWithRetry (WD.ById "two")
904+ pure e
905+ check e = do
906+ assertAttr e "value" (Just "two")
907+ readRef inputRef `shouldBeWithRetryM` "three"
908+ WD.click =<< findElemWithRetry (WD.ByTag "button")
909+ assertAttr e "value" (Just "two")
910+ readRef inputRef `shouldBeWithRetryM` "two"
911+ testWidget' setup check $ do
912+ (e, ()) <- selectElement (def { _selectElementConfig_initialValue = "three" }) options
913+ click <- button "save"
914+ liftIO . writeRef inputRef <=< sample $ current $ _selectElement_value e
915+ performEvent_ $ liftIO . writeRef inputRef <$> tag (current (_selectElement_value e)) click
916+ it "captures user input after switchover" $ runWD $ do
917+ inputRef <- newRef ("" :: Text)
918+ let checkValue = do
919+ e <- findElemWithRetry $ WD.ByTag "select"
920+ assertAttr e "value" (Just "one")
921+ WD.click =<< findElemWithRetry (WD.ById "two")
922+ assertAttr e "value" (Just "two")
923+ WD.click =<< findElemWithRetry (WD.ByTag "button")
924+ readRef inputRef `shouldBeWithRetryM` "two"
925+ testWidget (pure ()) checkValue $ do
926+ (e, ()) <- selectElement def options
927+ click <- button "save"
928+ performEvent_ $ liftIO . writeRef inputRef <$> tag (current (_selectElement_value e)) click
929+ it "sets focus appropriately" $ runWD $ do
930+ focusRef <- newRef False
931+ let checkValue = do
932+ readRef focusRef `shouldBeWithRetryM` False
933+ e <- findElemWithRetry $ WD.ByTag "select"
934+ WD.click e
935+ readRef focusRef `shouldBeWithRetryM` True
936+ testWidget (pure ()) checkValue $ do
937+ (e, ()) <- selectElement def options
938+ performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
939+ it "sets focus when focus occurs before hydration" $ runWD $ do
940+ focusRef <- newRef False
941+ let setup = do
942+ e <- findElemWithRetry $ WD.ByTag "select"
943+ WD.click e
944+ ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
945+ readRef focusRef `shouldBeWithRetryM` False
946+ check = readRef focusRef `shouldBeWithRetryM` True
947+ testWidget setup check $ do
948+ (e, ()) <- selectElement def options
949+ performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
950+ it "sets value appropriately" $ runWD $ do
951+ valueByUIRef <- newRef ("" :: Text)
952+ valueRef <- newRef ("" :: Text)
953+ setValueChan :: Chan Text <- liftIO newChan
954+ let checkValue = do
955+ e <- findElemWithRetry $ WD.ByTag "select"
956+ assertAttr e "value" (Just "one")
957+ readRef valueByUIRef `shouldBeWithRetryM` "one"
958+ readRef valueRef `shouldBeWithRetryM` "one"
959+ WD.click <=< findElemWithRetry $ WD.ById "two"
960+ readRef valueByUIRef `shouldBeWithRetryM` "two"
961+ readRef valueRef `shouldBeWithRetryM` "two"
962+ liftIO $ writeChan setValueChan "three"
963+ readRef valueByUIRef `shouldBeWithRetryM` "two"
964+ readRef valueRef `shouldBeWithRetryM` "three"
965+ testWidget (pure ()) checkValue $ do
966+ setValue' <- triggerEventWithChan setValueChan
967+ (e, ()) <- selectElement def { _selectElementConfig_setValue = Just setValue' } options
968+ performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
969+ performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
970+
971+ describe "hydration/immediate" $ do
972+ it "captures user input after switchover" $ runWD $ do
973+ inputRef :: IORef Text <- newRef ""
974+ let checkValue = do
975+ WD.click <=< findElemWithRetry $ WD.ById "two"
976+ WD.click <=< findElemWithRetry $ WD.ByTag "button"
977+ readRef inputRef `shouldBeWithRetryM` "two"
978+ testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
979+ (e, ()) <- selectElement def options
980+ click <- button "save"
981+ performEvent_ $ liftIO . writeRef inputRef <$> tag (current (_selectElement_value e)) click
982+ it "sets focus appropriately" $ runWD $ do
983+ focusRef <- newRef False
984+ let checkValue = do
985+ readRef focusRef `shouldBeWithRetryM` False
986+ e <- findElemWithRetry $ WD.ByTag "select"
987+ WD.click e
988+ readRef focusRef `shouldBeWithRetryM` True
989+ testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
990+ (e, ()) <- selectElement def options
991+ performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
992+ it "has correct initial value" $ runWD $ do
993+ valueRef :: IORef Text <- newRef ""
994+ let checkValue = readRef valueRef `shouldBeWithRetryM` "one"
995+ testWidget (pure ()) checkValue $ do
996+ prerender_ (pure ()) $ do
997+ (e, ()) <- selectElement def { _selectElementConfig_initialValue = "one" } options
998+ liftIO . writeRef valueRef <=< sample $ current $ _selectElement_value e
999+ it "sets value appropriately" $ runWD $ do
1000+ valueByUIRef :: IORef Text <- newRef ""
1001+ valueRef :: IORef Text <- newRef ""
1002+ setValueChan :: Chan Text <- liftIO newChan
1003+ let checkValue = do
1004+ WD.click =<< findElemWithRetry (WD.ById "two")
1005+ readRef valueByUIRef `shouldBeWithRetryM` "two"
1006+ readRef valueRef `shouldBeWithRetryM` "two"
1007+ liftIO $ writeChan setValueChan "three"
1008+ readRef valueByUIRef `shouldBeWithRetryM` "two"
1009+ readRef valueRef `shouldBeWithRetryM` "three"
1010+ testWidget (pure ()) checkValue $ do
1011+ setValue' <- triggerEventWithChan setValueChan
1012+ prerender_ (pure ()) $ do
1013+ (e, ()) <- selectElement def { _selectElementConfig_setValue = Just setValue' } options
1014+ performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
1015+ performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
1016+
1017+ session' "prerender" $ do
1018+ it "works in simple case" $ runWD $ do
1019+ testWidget (checkBodyText "One") (checkBodyText "Two") $ do
1020+ prerender_ (text "One") (text "Two")
1021+ it "removes element correctly" $ runWD $ do
1022+ testWidget' (findElemWithRetry $ WD.ByTag "span") elementShouldBeRemoved $ do
1023+ prerender_ (el "span" $ text "One") (text "Two")
1024+ it "can be nested in server widget" $ runWD $ do
1025+ testWidget (checkBodyText "One") (checkBodyText "Three") $ do
1026+ prerender_ (prerender_ (text "One") (text "Two")) (text "Three")
1027+ it "can be nested in client widget" $ runWD $ do
1028+ testWidget (checkBodyText "One") (checkBodyText "Three") $ do
1029+ prerender_ (text "One") (prerender_ (text "Two") (text "Three"))
1030+ it "works with prerender_ siblings" $ runWD $ do
1031+ testWidget
1032+ (checkTextInId "a1" "One" >> checkTextInId "b1" "Three" >> checkTextInId "c1" "Five")
1033+ (checkTextInId "a2" "Two" >> checkTextInId "b2" "Four" >> checkTextInId "c2" "Six") $ do
1034+ prerender_ (divId "a1" $ text "One") (divId "a2" $ text "Two")
1035+ prerender_ (divId "b1" $ text "Three") (divId "b2" $ text "Four")
1036+ prerender_ (divId "c1" $ text "Five") (divId "c2" $ text "Six")
1037+ it "works inside other element" $ runWD $ do
1038+ testWidget (checkTextInTag "div" "One") (checkTextInTag "div" "Two") $ do
1039+ el "div" $ prerender_ (text "One") (text "Two")
1040+-- TODO re-enable this
1041+-- it "places fences and removes them" $ runWD $ do
1042+-- testWidget'
1043+-- (do
1044+-- scripts <- WD.findElems $ WD.ByTag "script"
1045+-- filterM (\s -> maybe False (\t -> "prerender" `T.isPrefixOf` t) <$> WD.attr s "type") scripts
1046+-- )
1047+-- (traverse_ elementShouldBeRemoved)
1048+-- (el "span" $ prerender_ (text "One") (text "Two"))
1049+ it "postBuild works on server side" $ runWD $ do
1050+ lock :: MVar () <- liftIO newEmptyMVar
1051+ testWidget (liftIO $ takeMVar lock) (pure ()) $ do
1052+ prerender_ (do
1053+ pb <- getPostBuild
1054+ performEvent_ $ liftIO (putMVar lock ()) <$ pb) blank
1055+ it "postBuild works on client side" $ runWD $ do
1056+ lock :: MVar () <- liftIO newEmptyMVar
1057+ testWidget (pure ()) (liftIO $ takeMVar lock) $ do
1058+ prerender_ blank $ do
1059+ pb <- getPostBuild
1060+ performEvent_ $ liftIO (putMVar lock ()) <$ pb
1061+ it "result Dynamic is updated *after* switchover" $ runWD $ do
1062+ let preSwitchover = checkBodyText "PostBuild"
1063+ check = checkBodyText "Client"
1064+ testWidget preSwitchover check $ void $ do
1065+ d <- prerender (pure "Initial") (pure "Client")
1066+ pb <- getPostBuild
1067+ initial <- sample $ current d
1068+ textNode $ TextNodeConfig initial $ Just $ leftmost [updated d, "PostBuild" <$ pb]
1069+ -- This essentially checks that the client IO runs *after* switchover/postBuild,
1070+ -- thus can't create conflicting DOM
1071+ it "can't exploit IO to break hydration" $ runWD $ do
1072+ let preSwitchover = checkBodyText "Initial"
1073+ testWidgetStatic preSwitchover $ void $ do
1074+ ref <- liftIO $ newRef "Initial"
1075+ prerender_ (pure ()) (liftIO $ writeRef ref "Client")
1076+ text <=< liftIO $ readRef ref
1077+ -- As above, so below
1078+ it "can't exploit triggerEvent to break hydration" $ runWD $ do
1079+ let preSwitchover = checkBodyText "Initial"
1080+ check = checkBodyText "Client"
1081+ testWidget preSwitchover check $ void $ do
1082+ (e, trigger) <- newTriggerEvent
1083+ prerender_ (pure ()) (liftIO $ trigger "Client")
1084+ textNode $ TextNodeConfig "Initial" $ Just e
1085+
1086+ session' "namespaces" $ do
1087+ it "dyn can be nested in namespaced widget" $ runWD $ do
1088+ testWidget (pure ()) (checkTextInTag "svg" "one") $ do
1089+ let svgRootCfg = def
1090+ & (elementConfig_namespace ?~ "http://www.w3.org/2000/svg")
1091+ & (elementConfig_initialAttributes .~ ("width" =: "100%" <> "height" =: "100%" <> "viewBox" =: "0 0 1536 2048"))
1092+ void $ element "svg" svgRootCfg $ do
1093+ dyn_ $ text "one" <$ pure ()
1094+
1095+ session' "runWithReplace" $ do
1096+ it "works" $ runWD $ do
1097+ replaceChan :: Chan Text <- liftIO newChan
1098+ let setup = findElemWithRetry $ WD.ByTag "div"
1099+ check ssr = do
1100+ -- Check that the original element still exists and has the correct text
1101+ shouldContainText "two" ssr
1102+ liftIO $ writeChan replaceChan "three"
1103+ elementShouldBeRemoved ssr
1104+ shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
1105+ testWidget' setup check $ do
1106+ replace <- triggerEventWithChan replaceChan
1107+ pb <- getPostBuild
1108+ void $ runWithReplace (el "div" $ text "one") $ leftmost
1109+ [ el "div" (text "two") <$ pb
1110+ , el "span" . text <$> replace
1111+ ]
1112+ it "can be nested in initial widget" $ runWD $ do
1113+ replaceChan :: Chan Text <- liftIO newChan
1114+ let setup = findElemWithRetry $ WD.ByTag "div"
1115+ check ssr = do
1116+ -- Check that the original element still exists and has the correct text
1117+ shouldContainText "two" ssr
1118+ liftIO $ writeChan replaceChan "three"
1119+ elementShouldBeRemoved ssr
1120+ shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
1121+ testWidget' setup check $ void $ flip runWithReplace never $ do
1122+ replace <- triggerEventWithChan replaceChan
1123+ pb <- getPostBuild
1124+ void $ runWithReplace (el "div" $ text "one") $ leftmost
1125+ [ el "div" (text "two") <$ pb
1126+ , el "span" . text <$> replace
1127+ ]
1128+ it "can be nested in postBuild widget" $ runWD $ do
1129+ replaceChan :: Chan Text <- liftIO newChan
1130+ let setup = findElemWithRetry $ WD.ByTag "div"
1131+ check ssr = do
1132+ -- Check that the original element still exists and has the correct text
1133+ shouldContainText "two" ssr
1134+ liftIO $ writeChan replaceChan "three"
1135+ elementShouldBeRemoved ssr
1136+ shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
1137+ testWidget' setup check $ void $ do
1138+ pb <- getPostBuild
1139+ runWithReplace (pure ()) $ ffor pb $ \() -> do
1140+ replace <- triggerEventWithChan replaceChan
1141+ pb' <- getPostBuild
1142+ void $ runWithReplace (el "div" $ text "one") $ leftmost
1143+ [ el "div" (text "two") <$ pb'
1144+ , el "span" . text <$> replace
1145+ ]
1146+ it "postBuild works in replaced widget" $ runWD $ do
1147+ replaceChan <- liftIO newChan
1148+ pbLock <- liftIO newEmptyMVar
1149+ let check = liftIO $ do
1150+ writeChan replaceChan ()
1151+ takeMVar pbLock
1152+ testWidget (pure ()) check $ void $ do
1153+ replace <- triggerEventWithChan replaceChan
1154+ runWithReplace (pure ()) $ ffor replace $ \() -> do
1155+ pb <- getPostBuild
1156+ performEvent_ $ liftIO (putMVar pbLock ()) <$ pb
1157+ it "can be nested in event widget" $ runWD $ do
1158+ replaceChan1 :: Chan Text <- liftIO newChan
1159+ replaceChan2 :: Chan Text <- liftIO newChan
1160+ lock :: MVar () <- liftIO newEmptyMVar
1161+ let check = do
1162+ shouldContainText "" =<< findElemWithRetry (WD.ByTag "body")
1163+ liftIO $ do
1164+ writeChan replaceChan1 "one"
1165+ takeMVar lock
1166+ one <- findElemWithRetry $ WD.ByTag "div"
1167+ shouldContainText "pb" one
1168+ liftIO $ writeChan replaceChan2 "two"
1169+ elementShouldBeRemoved one
1170+ shouldContainText "two" =<< findElemWithRetry (WD.ByTag "span")
1171+ testWidget (pure ()) check $ void $ do
1172+ replace1 <- triggerEventWithChan replaceChan1
1173+ runWithReplace (pure ()) $ ffor replace1 $ \r1 -> do
1174+ replace2 <- triggerEventWithChan replaceChan2
1175+ pb <- getPostBuild
1176+ performEvent_ $ liftIO (putMVar lock ()) <$ pb
1177+ void $ runWithReplace (el "div" $ text r1) $ leftmost
1178+ [ el "span" . text <$> replace2
1179+ , el "div" (text "pb") <$ pb
1180+ ]
1181+ it "prerender works in replaced widget" $ runWD $ do
1182+ replaceChan <- liftIO newChan
1183+ lock :: MVar () <- liftIO newEmptyMVar
1184+ pbLock :: MVar () <- liftIO newEmptyMVar
1185+ let check = do
1186+ liftIO $ do
1187+ writeChan replaceChan ()
1188+ takeMVar lock
1189+ takeMVar pbLock
1190+ testWidget (pure ()) check $ void $ do
1191+ replace <- triggerEventWithChan replaceChan
1192+ runWithReplace (pure ()) $ ffor replace $ \() -> do
1193+ prerender_ (pure ()) $ do
1194+ liftIO $ putMVar lock ()
1195+ pb <- getPostBuild
1196+ performEvent_ $ liftIO (putMVar pbLock ()) <$ pb
1197+ it "prerender returns in immediate mode" $ runWD $ do
1198+ replaceChan <- liftIO newChan
1199+ pbLock <- liftIO newEmptyMVar
1200+ let check = liftIO $ do
1201+ writeChan replaceChan ()
1202+ takeMVar pbLock
1203+ testWidget (pure ()) check $ void $ do
1204+ replace <- triggerEventWithChan replaceChan
1205+ runWithReplace (pure ()) $ ffor replace $ \() -> do
1206+ prerender_ (pure ()) (pure ())
1207+ liftIO $ putMVar pbLock ()
1208+ it "works in immediate mode (RHS of prerender)" $ runWD $ do
1209+ replaceChan :: Chan Text <- liftIO newChan
1210+ let check = do
1211+ checkBodyText "one"
1212+ one <- findElemWithRetry $ WD.ByTag "div"
1213+ shouldContainText "one" one
1214+ liftIO $ writeChan replaceChan "pb"
1215+ elementShouldBeRemoved one
1216+ shouldContainText "pb" =<< findElemWithRetry (WD.ByTag "span")
1217+ testWidget (pure ()) check $ void $ do
1218+ replace <- triggerEventWithChan replaceChan
1219+ prerender_ blank $ do
1220+ void $ runWithReplace (el "div" $ text "one") $ el "span" . text <$> replace
1221+ it "works with postBuild in immediate mode (RHS of prerender)" $ runWD $ do
1222+ replaceChan :: Chan Text <- liftIO newChan
1223+ let check = do
1224+ checkBodyText "two"
1225+ two <- findElemWithRetry $ WD.ByTag "div"
1226+ shouldContainText "two" two
1227+ liftIO $ writeChan replaceChan "three"
1228+ elementShouldBeRemoved two
1229+ shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
1230+ testWidget (pure ()) check $ void $ do
1231+ replace <- triggerEventWithChan replaceChan
1232+ prerender_ blank $ do
1233+ pb <- getPostBuild
1234+ void $ runWithReplace (el "div" $ text "one") $ leftmost
1235+ [ el "div" (text "two") <$ pb
1236+ , el "span" . text <$> replace
1237+ ]
1238+
1239+ let checkInnerHtml t x = findElemWithRetry (WD.ByTag t) >>= (`attr` "innerHTML") >>= (`shouldBe` Just x)
1240+ it "removes bracketing comments" $ runWD $ do
1241+ replaceChan :: Chan () <- liftIO newChan
1242+ let
1243+ preSwitchover = checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0-->|after"
1244+ check () = do
1245+ liftIO $ writeChan replaceChan () -- trigger creation of p tag
1246+ _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1247+ checkInnerHtml "div" "before|<p>inner2</p>|after"
1248+ testWidget' preSwitchover check $ do
1249+ replace <- triggerEventWithChan replaceChan
1250+ el "div" $ do
1251+ text "before|"
1252+ _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1253+ text "|after"
1254+ it "ignores extra ending bracketing comment" $ runWD $ do
1255+ replaceChan :: Chan () <- liftIO newChan
1256+ let
1257+ preSwitchover = checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0--><!--replace-end-0-->|after"
1258+ check () = do
1259+ liftIO $ writeChan replaceChan () -- trigger creation of p tag
1260+ _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1261+ checkInnerHtml "div" "before|inner2|after"
1262+ testWidget' preSwitchover check $ do
1263+ replace <- triggerEventWithChan replaceChan
1264+ el "div" $ do
1265+ text "before|"
1266+ _ <- runWithReplace (text "inner1" *> comment "replace-end-0") $ text "inner2" <$ replace
1267+ text "|after"
1268+ void $ runWithReplace blank $ el "p" blank <$ replace -- Signal tag for end of test
1269+ -- TODO This test actually causes a hydration failure, but it wasn't
1270+ -- previously detected, so I've marked it pending
1271+ xit "ignores missing ending bracketing comments" $ runWD $ do
1272+ replaceChan :: Chan () <- liftIO newChan
1273+ let
1274+ preSwitchover = do
1275+ checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0-->|after"
1276+ divEl <- findElemWithRetry (WD.ByTag "div")
1277+ let wrongHtml = "<!--replace-start-0-->inner1"
1278+ actualHtml :: String <- WD.executeJS
1279+ [WD.JSArg divEl, WD.JSArg wrongHtml]
1280+ "arguments[0].innerHTML = arguments[1]; return arguments[0].innerHTML"
1281+ actualHtml `shouldBe` wrongHtml
1282+ check () = do
1283+ liftIO $ writeChan replaceChan () -- trigger creation of p tag
1284+ _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1285+ checkInnerHtml "div" "before|<p>inner2</p>|after"
1286+ testWidget' preSwitchover check $ do
1287+ replace <- triggerEventWithChan replaceChan
1288+ el "div" $ do
1289+ text "before|"
1290+ _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1291+ text "|after"
1292+
1293+ session' "traverseDMapWithKeyWithAdjust" $ do
1294+ let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
1295+ widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1296+ elClass "span" "key" $ text $ textKey k
1297+ elClass "span" "value" $ text $ T.pack $ has @Show k $ show v
1298+ pure (Identity v)
1299+ checkItem :: WD.Element -> Text -> Text -> WD ()
1300+ checkItem li k v = do
1301+ putStrLnDebug "checkItem"
1302+ shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1303+ shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
1304+ checkInitialItems dm xs = do
1305+ putStrLnDebug "checkInitialItems"
1306+ liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1307+ forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey k) (T.pack $ has @Show k $ show v)
1308+ getAndCheckInitialItems dm = withRetry $ do
1309+ putStrLnDebug "getAndCheckInitialItems"
1310+ xs <- WD.findElems (WD.ByTag "li")
1311+ checkInitialItems dm xs
1312+ pure xs
1313+ checkRemoval chan k = do
1314+ putStrLnDebug "checkRemoval"
1315+ e <- findElemWithRetry (WD.ById $ textKey k)
1316+ liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe Nothing)
1317+ elementShouldBeRemoved e
1318+ checkReplace chan k v = do
1319+ putStrLnDebug "checkReplace"
1320+ e <- findElemWithRetry (WD.ById $ textKey k)
1321+ liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
1322+ elementShouldBeRemoved e
1323+ e' <- findElemWithRetry $ WD.ById $ textKey k
1324+ checkItem e' (textKey k) (T.pack $ show v)
1325+ checkInsert chan k v = do
1326+ putStrLnDebug "checkInsert"
1327+ liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
1328+ e <- findElemWithRetry (WD.ById $ textKey k)
1329+ checkItem e (textKey k) (T.pack $ show v)
1330+ postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
1331+ it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1332+ chan <- liftIO newChan
1333+ let preSwitchover :: WD [WD.Element]
1334+ preSwitchover = getAndCheckInitialItems keyMap
1335+ check :: [WD.Element] -> WD ()
1336+ check xs = do
1337+ checkInitialItems keyMap xs
1338+ checkRemoval chan Key_Int
1339+ checkReplace chan Key_Char 'B'
1340+ checkInsert chan Key_Bool True
1341+ testWidget' preSwitchover check $ do
1342+ (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
1343+ liftIO $ dmap `H.shouldBe` keyMap
1344+ it "handles postBuild correctly" $ runWD $ do
1345+ chan <- liftIO newChan
1346+ let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1347+ check xs = do
1348+ withRetry $ checkInitialItems (applyAlways postBuildPatch keyMap) xs
1349+ checkRemoval chan Key_Int
1350+ checkInsert chan Key_Char 'B'
1351+ checkReplace chan Key_Bool True
1352+ testWidget' preSwitchover check $ void $ do
1353+ pb <- getPostBuild
1354+ replace <- triggerEventWithChan chan
1355+ (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
1356+ liftIO $ dmap `H.shouldBe` keyMap
1357+ it "can delete/update/insert when built in prerender" $ runWD $ do
1358+ chan <- liftIO newChan
1359+ let check = do
1360+ _ <- getAndCheckInitialItems keyMap
1361+ checkRemoval chan Key_Int
1362+ checkReplace chan Key_Char 'B'
1363+ checkInsert chan Key_Bool True
1364+ testWidget (pure ()) check $ do
1365+ replace <- triggerEventWithChan chan
1366+ prerender_ (pure ()) $ do
1367+ (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap replace
1368+ liftIO $ dmap `H.shouldBe` keyMap
1369+ it "can delete/update/insert when built in immediate mode" $ runWD $ do
1370+ chan <- liftIO newChan
1371+ let check = do
1372+ _ <- getAndCheckInitialItems keyMap
1373+ checkRemoval chan Key_Int
1374+ checkReplace chan Key_Char 'B'
1375+ checkInsert chan Key_Bool True
1376+ testWidget (pure ()) check $ void $ do
1377+ pb <- getPostBuild
1378+ runWithReplace (pure ()) $ ffor pb $ \() -> void $ do
1379+ (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
1380+ liftIO $ dmap `H.shouldBe` keyMap
1381+ -- Should be fixed by prerender changes!
1382+ it "handles postBuild correctly in prerender" $ runWD $ do
1383+ chan <- liftIO newChan
1384+ let check = do
1385+ _ <- getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1386+ checkRemoval chan Key_Int
1387+ checkInsert chan Key_Char 'B'
1388+ checkReplace chan Key_Bool True
1389+ testWidget (pure ()) check $ do
1390+ replace <- triggerEventWithChan chan
1391+ prerender_ (pure ()) $ void $ do
1392+ pb <- getPostBuild
1393+ (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
1394+ liftIO $ dmap `H.shouldBe` keyMap
1395+
1396+ session' "traverseIntMapWithKeyWithAdjust" $ do
1397+ let textKeyInt k = "key" <> T.pack (show k)
1398+ intMap = IntMap.fromList
1399+ [ (1, "one")
1400+ , (2, "two")
1401+ , (3, "three")
1402+ ]
1403+ let widget :: DomBuilder t m => IntMap.Key -> Text -> m Text
1404+ widget k v = elAttr "li" ("id" =: textKeyInt k) $ do
1405+ elClass "span" "key" $ text $ textKeyInt k
1406+ elClass "span" "value" $ text v
1407+ pure v
1408+ checkItem :: WD.Element -> Text -> Text -> WD ()
1409+ checkItem li k v = do
1410+ putStrLnDebug "checkItem"
1411+ shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1412+ shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
1413+ checkInitialItems dm xs = do
1414+ putStrLnDebug "checkInitialItems"
1415+ liftIO $ assertEqual "Wrong amount of items in DOM" (IntMap.size dm) (length xs)
1416+ forM_ (zip xs (IntMap.toList dm)) $ \(e, (k, v)) -> checkItem e (textKeyInt k) v
1417+ getAndCheckInitialItems dm = withRetry $ do
1418+ putStrLnDebug "getAndCheckInitialItems"
1419+ xs <- WD.findElems (WD.ByTag "li")
1420+ checkInitialItems dm xs
1421+ pure xs
1422+ checkRemoval chan k = do
1423+ putStrLnDebug "checkRemoval"
1424+ e <- findElemWithRetry (WD.ById $ textKeyInt k)
1425+ liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k Nothing
1426+ elementShouldBeRemoved e
1427+ checkReplace chan k v = do
1428+ putStrLnDebug "checkReplace"
1429+ e <- findElemWithRetry (WD.ById $ textKeyInt k)
1430+ liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1431+ elementShouldBeRemoved e
1432+ e' <- findElemWithRetry (WD.ById $ textKeyInt k)
1433+ withRetry $ checkItem e' (textKeyInt k) v
1434+ checkInsert chan k v = do
1435+ putStrLnDebug "checkInsert"
1436+ liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1437+ e <- findElemWithRetry (WD.ById $ textKeyInt k)
1438+ checkItem e (textKeyInt k) v
1439+ postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
1440+ xit "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1441+ chan <- liftIO newChan
1442+ let preSwitchover = getAndCheckInitialItems intMap
1443+ check xs = do
1444+ checkInitialItems intMap xs
1445+ checkRemoval chan 1
1446+ checkReplace chan 2 "deux"
1447+ checkInsert chan 4 "four"
1448+ testWidget' preSwitchover check $ void $ do
1449+ (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
1450+ liftIO $ im `H.shouldBe` intMap
1451+ xit "handles postBuild correctly" $ runWD $ do
1452+ chan <- liftIO newChan
1453+ let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1454+ check xs = do
1455+ withRetry $ checkInitialItems (applyAlways postBuildPatch intMap) xs
1456+ checkRemoval chan 1
1457+ checkInsert chan 2 "deux"
1458+ checkReplace chan 3 "trois"
1459+ testWidget' preSwitchover check $ void $ do
1460+ pb <- getPostBuild
1461+ replace <- triggerEventWithChan chan
1462+ (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
1463+ liftIO $ dmap `H.shouldBe` intMap
1464+ xit "can delete/update/insert when built in prerender" $ runWD $ do
1465+ chan <- liftIO newChan
1466+ let check = do
1467+ _ <- getAndCheckInitialItems intMap
1468+ checkRemoval chan 1
1469+ checkReplace chan 2 "deux"
1470+ checkInsert chan 4 "quatre"
1471+ testWidget (pure ()) check $ do
1472+ replace <- triggerEventWithChan chan
1473+ prerender_ (pure ()) $ do
1474+ (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap replace
1475+ liftIO $ dmap `H.shouldBe` intMap
1476+ xit "can delete/update/insert when built in immediate mode" $ runWD $ do
1477+ chan <- liftIO newChan
1478+ let check = do
1479+ _ <- getAndCheckInitialItems intMap
1480+ checkRemoval chan 1
1481+ checkReplace chan 2 "deux"
1482+ checkInsert chan 4 "quatre"
1483+ testWidget (pure ()) check $ void $ do
1484+ pb <- getPostBuild
1485+ runWithReplace (pure ()) $ ffor pb $ \() -> void $ do
1486+ (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
1487+ liftIO $ dmap `H.shouldBe` intMap
1488+ -- Should be fixed by prerender changes!
1489+ xit "handles postBuild correctly in prerender" $ runWD $ do
1490+ chan <- liftIO newChan
1491+ let check = do
1492+ _ <- getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1493+ checkRemoval chan 1
1494+ checkInsert chan 2 "deux"
1495+ checkReplace chan 3 "trois"
1496+ testWidget (pure ()) check $ do
1497+ replace <- triggerEventWithChan chan
1498+ prerender_ (pure ()) $ void $ do
1499+ pb <- getPostBuild
1500+ (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
1501+ liftIO $ dmap `H.shouldBe` intMap
1502+
1503+ session' "traverseDMapWithKeyWithAdjustWithMove" $ do
1504+ let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
1505+ widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
1506+ elClass "span" "key" $ text $ textKey2 k
1507+ elClass "span" "value" $ text $ T.pack $ has @Show k $ show v
1508+ pure (Identity v)
1509+ textKey2 :: Key2 a -> Text
1510+ textKey2 = \case
1511+ Key2_Int i -> "i" <> T.pack (show i)
1512+ Key2_Char c -> "c" <> T.pack [c]
1513+ checkItem :: WD.Element -> Text -> Text -> WD ()
1514+ checkItem li k v = do
1515+ shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1516+ shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
1517+ checkInitialItems dm xs = do
1518+ liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1519+ forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey2 k) (T.pack $ has @Show k $ show v)
1520+ getAndCheckInitialItems dm = withRetry $ do
1521+ xs <- WD.findElems (WD.ByTag "li")
1522+ checkInitialItems dm xs
1523+ pure xs
1524+ moveSpec
1525+ :: (DMap Key2 Identity -> (WD.Element -> Chan (PatchDMapWithMove Key2 Identity) -> WD ()) -> WD ())
1526+ -> H.SpecM (WdTestSession ()) ()
1527+ moveSpec testMove = do
1528+ it "can insert an item" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 3 ==> 3]) $ \body chan -> do
1529+ shouldContainText (T.strip $ T.unlines ["i11","i33"]) body
1530+ liftIO $ writeChan chan (insertDMapKey (Key2_Int 2) 2)
1531+ shouldContainText (T.strip $ T.unlines ["i11","i22","i33"]) body
1532+ it "can delete an item" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 2 ==> 2, Key2_Int 3 ==> 3]) $ \body chan -> do
1533+ shouldContainText (T.strip $ T.unlines ["i11","i22","i33"]) body
1534+ liftIO $ writeChan chan (deleteDMapKey (Key2_Int 2))
1535+ shouldContainText (T.strip $ T.unlines ["i11","i33"]) body
1536+ it "can swap items" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 2 ==> 2, Key2_Int 3 ==> 3, Key2_Int 4 ==> 4]) $ \body chan -> do
1537+ shouldContainText (T.strip $ T.unlines ["i11","i22","i33","i44"]) body
1538+ liftIO $ writeChan chan (swapDMapKey (Key2_Int 2) (Key2_Int 3))
1539+ shouldContainText (T.strip $ T.unlines ["i11","i33","i22","i44"]) body
1540+-- TODO re-enable this
1541+-- it "can move items" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 2 ==> 2, Key2_Int 3 ==> 3, Key2_Int 4 ==> 4]) $ \body chan -> do
1542+-- shouldContainText (T.strip $ T.unlines ["i11","i22","i33", "i44"]) body
1543+-- liftIO $ writeChan chan (moveDMapKey (Key2_Int 2) (Key2_Int 3))
1544+-- shouldContainText (T.strip $ T.unlines ["i11","i22","i44"]) body
1545+-- liftIO $ writeChan chan (moveDMapKey (Key2_Int 2) (Key2_Int 3)) -- attempt a move to nonexistent key should delete
1546+-- shouldContainText (T.strip $ T.unlines ["i11","i44"]) body
1547+-- liftIO $ writeChan chan (moveDMapKey (Key2_Int 2) (Key2_Int 3)) -- this causes a JSException in immediate builder too
1548+-- shouldContainText (T.strip $ T.unlines ["i11","i44"]) body
1549+-- liftIO $ writeChan chan (insertDMapKey (Key2_Int 2) 2) -- this step will fail if the above caused an exception, thus works as a proxy for detecting the exception given we can't catch it
1550+-- shouldContainText (T.strip $ T.unlines ["i11","i22","i44"]) body
1551+
1552+ describe "hydration" $ moveSpec $ \initMap test -> do
1553+ chan <- liftIO newChan
1554+ let preSwitchover = getAndCheckInitialItems initMap
1555+ check xs = do
1556+ checkInitialItems initMap xs
1557+ body <- getBody
1558+ test body chan
1559+ testWidget' preSwitchover check $ void $ do
1560+ (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
1561+ liftIO $ assertEqual "DMap" initMap dmap
1562+
1563+ describe "hydration/immediate" $ moveSpec $ \initMap test -> do
1564+ chan <- liftIO newChan
1565+ replace <- liftIO newChan
1566+ lock :: MVar () <- liftIO newEmptyMVar
1567+ let check = do
1568+ liftIO $ do
1569+ writeChan replace ()
1570+ takeMVar lock
1571+ xs <- getAndCheckInitialItems initMap
1572+ checkInitialItems initMap xs
1573+ body <- getBody
1574+ test body chan
1575+ testWidget (pure ()) check $ void $ do
1576+ e <- triggerEventWithChan replace
1577+ runWithReplace (pure ()) $ ffor e $ \() -> void $ do
1578+ pb <- getPostBuild
1579+ performEvent_ $ liftIO (putMVar lock ()) <$ pb
1580+ (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
1581+ liftIO $ assertEqual "DMap" initMap dmap
1582+
1583+ session' "hydrating invalid HTML" $ do
1584+ xit "can hydrate list in paragraph" $ runWD $ do
1585+ let preSwitchover = do
1586+ checkBodyText "before\ninner\nafter"
1587+ -- Two <p> tags should be present
1588+ (p1, p2) <- WD.findElems (WD.ByTag "p") >>= \case
1589+ [p1, p2] -> pure (p1, p2)
1590+ _ -> error "Unexpected number of `p` tags (expected 2)"
1591+ ol <- findElemWithRetry (WD.ByTag "ol")
1592+ shouldContainText "before" p1
1593+ shouldContainText "inner" ol
1594+ shouldContainText "" p2
1595+ pure (p1, ol, p2)
1596+ check (p1, ol, p2) = do
1597+ checkBodyText "before\ninner\nafter"
1598+ shouldContainText "before\ninner\nafter" p1
1599+ elementShouldBeRemoved ol
1600+ elementShouldBeRemoved p2
1601+ -- Don't fail fatally when hydration encounters the invalid DOM
1602+ testWidgetDebug' False withDebugging preSwitchover check $ do
1603+ -- This is deliberately invalid HTML, the browser will interpret it as
1604+ -- <p>before</p><ol>inner</ol>after<p></p>
1605+ el "p" $ do
1606+ text "before"
1607+ el "ol" $ text "inner"
1608+ text "after"
1609+
1610+ -- TODO: This test presupposes the exact set of labels that "dropdown" places in the "value" fields to distinguish options.
1611+ -- This dependence on internal implementation details is undesirable in a test case, but seems fairly tricky to avoid.
1612+ -- It seems expedient for the time being to expect this test case to be updated, should those implementation details ever change.
1613+ session' "dropdown" $ do
1614+ let doTest expectedOpts (initialValue :: Text) = do
1615+ let doCheck = do
1616+ es <- findElemsWithRetry $ WD.ByTag "option"
1617+ opts <- mapM fetchElement es
1618+ assertEqual "missing/extra/incorrect option element(s)" expectedOpts (sort opts)
1619+ testWidget doCheck doCheck $ do
1620+ void $ dropdown initialValue (constDyn (("aa" :: Text) =: "aaa" <> "bb" =: "bbb")) def
1621+ fetchElement e = do
1622+ val <- WD.attr e "value"
1623+ sel <- WD.attr e "selected"
1624+ return (fromMaybe "" val, isJust sel)
1625+ -- The "aa" test case is important, but a good test implementation probably needs to avoid selenium, because HTML parsers will insert a "selected" attribute on the first "option" tag if no selected attributes are present; thus as written, this erroneously succeeds on the old implementation (but properly implemented, should fail)
1626+ -- Thus, it would appear that we do actually need a HTML5 or maybe XML parser for this test suite.
1627+ xit "statically renders initial values (on aa)" $ runWD $ do
1628+ doTest [("0",True),("1",False)] "aa"
1629+ -- These tests are currently marked "pending" (by using "xit" instead of "it") because this test has a high chance of non-deterministically failing, which is a problem elsewhere in this test suite as well
1630+ xit "statically renders initial values (on bb)" $ runWD $ do
1631+ doTest [("0",False),("1",True)] "bb"
1632+
1633+data Selenium = Selenium
1634+ { _selenium_portNumber :: PortNumber
1635+ , _selenium_stopServer :: IO ()
1636+ }
1637+
1638+startSeleniumServer :: PortNumber -> IO (IO ())
1639+startSeleniumServer port = do
1640+ (_,_,_,ph) <- createProcess $ (proc "selenium-server" ["-port", show port])
1641+ { std_in = NoStream
1642+ , std_out = NoStream
1643+ , std_err = NoStream
1644+ }
1645+ return $ terminateProcess ph
1646+
1647+withSeleniumServer :: (Selenium -> IO ()) -> IO ()
1648+withSeleniumServer f = do
1649+ stopServer <- startSeleniumServer seleniumPort
1650+ threadDelay $ 1000 * 1000 * 2 -- TODO poll or wait on a a signal to block on
1651+ f $ Selenium
1652+ { _selenium_portNumber = seleniumPort
1653+ , _selenium_stopServer = stopServer
1654+ }
1655+
1656+triggerEventWithChan :: (Reflex t, TriggerEvent t m, Prerender js t m) => Chan a -> m (Event t a)
1657+triggerEventWithChan chan = do
1658+ (e, trigger) <- newTriggerEvent
1659+ -- In prerender because we only want to do this on the client
1660+ prerender_ (pure ()) $ void $ liftIO $ forkIO $ forever $ trigger =<< readChan chan
1661+ pure e
1662+
1663+shouldBeWithRetryM :: (Eq a, Show a) => WD a -> a -> WD ()
1664+shouldBeWithRetryM m expected = withRetry $ do
1665+ got <- m
1666+ got `shouldBe` expected
1667+
1668+assertAttr :: WD.Element -> Text -> Maybe Text -> WD ()
1669+assertAttr e k v = liftIO . assertEqual "Incorrect attribute value" v =<< WD.attr e k
1670+
1671+elementShouldBeRemoved :: WD.Element -> WD ()
1672+elementShouldBeRemoved e = withRetry $ do
1673+ try (WD.getText e) >>= \case
1674+ Left (WD.FailedCommand WD.StaleElementReference _) -> return ()
1675+ Left err -> throwM err
1676+ Right !_ -> liftIO $ assertFailure "Expected element to be removed, but it still exists"
1677+
1678+shouldContainText :: Text -> WD.Element -> WD ()
1679+shouldContainText t = withRetry . shouldContainTextNoRetry t
1680+
1681+shouldContainTextNoRetry :: Text -> WD.Element -> WD ()
1682+shouldContainTextNoRetry t = flip shouldBe t <=< WD.getText
1683+
1684+checkBodyText :: Text -> WD ()
1685+checkBodyText = checkTextInTag "body"
1686+
1687+checkTextInTag :: Text -> Text -> WD ()
1688+checkTextInTag t expected = do
1689+ e <- findElemWithRetry (WD.ByTag t)
1690+ shouldContainText expected e
1691+
1692+checkTextInId :: Text -> Text -> WD ()
1693+checkTextInId i expected = do
1694+ e <- findElemWithRetry (WD.ById i)
1695+ shouldContainText expected e
1696+
1697+findElemWithRetry :: Selector -> WD WD.Element
1698+findElemWithRetry = withRetry . WD.findElem
1699+
1700+findElemsWithRetry :: Selector -> WD [WD.Element]
1701+findElemsWithRetry = withRetry . WD.findElems
1702+
1703+getBody :: WD WD.Element
1704+getBody = WD.findElem $ WD.ByTag "body"
1705+
1706+withRetry :: forall a. WD a -> WD a
1707+withRetry a = wait 300
1708+ where wait :: Int -> WD a
1709+ wait 0 = a
1710+ wait n = try a >>= \case
1711+ Left (e :: SomeException) -> do
1712+ liftIO $ putStrLn ("(retrying due to " <> show e <> ")") *> threadDelay 100000
1713+ wait $ n - 1
1714+ Right v -> return v
1715+
1716+divId :: DomBuilder t m => Text -> m a -> m a
1717+divId i = elAttr "div" ("id" =: i)
1718+
1719+type TestWidget js t m = (DomBuilder t m, MonadHold t m, PostBuild t m, Prerender js t m, PerformEvent t m, TriggerEvent t m, MonadFix m, MonadIO (Performable m), MonadIO m)
1720+
1721+testWidgetStaticDebug
1722+ :: Bool
1723+ -> WD b
1724+ -- ^ Webdriver commands to run before JS runs and after hydration switchover
1725+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1726+ -- ^ Widget we are testing
1727+ -> WD b
1728+testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
1729+
1730+-- | TODO: do something about JSExceptions not causing tests to fail
1731+testWidgetDebug
1732+ :: Bool
1733+ -> Bool
1734+ -> WD ()
1735+ -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
1736+ -> WD b
1737+ -- ^ Webdriver commands to run after hydration switchover
1738+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1739+ -- ^ Widget we are testing
1740+ -> WD b
1741+testWidgetDebug hardFailure withDebugging beforeJS afterSwitchover =
1742+ testWidgetDebug' hardFailure withDebugging beforeJS (const afterSwitchover)
1743+
1744+data HydrationFailedException = HydrationFailedException deriving Show
1745+instance Exception HydrationFailedException
1746+
1747+-- | TODO: do something about JSExceptions not causing tests to fail
1748+testWidgetDebug'
1749+ :: Bool
1750+ -> Bool
1751+ -> WD a
1752+ -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
1753+ -> (a -> WD b)
1754+ -- ^ Webdriver commands to run after hydration switchover
1755+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1756+ -- ^ Widget we are testing (contents of body)
1757+ -> WD b
1758+testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget = do
1759+ let putStrLnDebug :: MonadIO m => Text -> m ()
1760+ putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
1761+ staticApp = do
1762+ el "head" $ pure ()
1763+ el "body" $ do
1764+ bodyWidget
1765+ el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1766+ putStrLnDebug "rendering static"
1767+ ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
1768+ putStrLnDebug "rendered static"
1769+ waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770+ onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
1771+ waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
1772+ let entryPoint = do
1773+ putStrLnDebug "taking waitBeforeJS"
1774+ liftIO $ takeMVar waitBeforeJS
1775+ let switchOverAction = do
1776+ putStrLnDebug "switchover syncPoint"
1777+ syncPoint
1778+ putStrLnDebug "putting waitUntilSwitchover"
1779+ liftIO $ putMVar waitUntilSwitchover ()
1780+ putStrLnDebug "put waitUntilSwitchover"
1781+ putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1782+ mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget
1783+ putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
1784+ syncPoint
1785+ application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
1786+ putStrLnDebug "sending response"
1787+ r <- sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
1788+ putStrLnDebug "sent response"
1789+ return r
1790+ waitJSaddle <- liftIO newEmptyMVar
1791+ let settings = foldr ($) Warp.defaultSettings
1792+ [ Warp.setPort $ fromIntegral $ toInteger jsaddlePort
1793+ , Warp.setBeforeMainLoop $ do
1794+ putStrLnDebug "putting waitJSaddle"
1795+ putMVar waitJSaddle ()
1796+ putStrLnDebug "put waitJSaddle"
1797+ ]
1798+ -- hSilence to get rid of ConnectionClosed logs
1799+ silenceIfDebug = if withDebugging then id else hSilence [stderr]
1800+ jsaddleWarp = silenceIfDebug $ Warp.runSettings settings application
1801+ withAsync' jsaddleWarp $ do
1802+ putStrLnDebug "taking waitJSaddle"
1803+ liftIO $ takeMVar waitJSaddle
1804+ putStrLnDebug "opening page"
1805+ WD.openPage $ "http://localhost:" <> show jsaddlePort
1806+ putStrLnDebug "running beforeJS"
1807+ a <- beforeJS
1808+ putStrLnDebug "putting waitBeforeJS"
1809+ liftIO $ putMVar waitBeforeJS ()
1810+ putStrLnDebug "taking waitUntilSwitchover"
1811+ liftIO $ takeMVar waitUntilSwitchover
1812+ putStrLnDebug "running afterSwitchover"
1813+ afterSwitchover a
1814+
1815+withAsync' :: (MonadIO m, MonadMask m) => IO a -> m b -> m b
1816+withAsync' f g = bracket
1817+ (liftIO $ Async.async f)
1818+ (liftIO . Async.uninterruptibleCancel)
1819+ (const g)
1820+
1821+data Key2 a where
1822+ Key2_Int :: Int -> Key2 Int
1823+ Key2_Char :: Char -> Key2 Char
1824+
1825+deriveGEq ''Key2
1826+deriveGCompare ''Key2
1827+deriveGShow ''Key2
1828+deriveArgDict ''Key2
reflex-dom-test-selenium/CHANGELOG.mdnew file+5
@@ -0,0 +1,5 @@
1+# Revision history for reflex-dom-core-selenium
2+
3+## 0.1.0.0 -- YYYY-mm-dd
4+
5+* First version. Released on an unsuspecting world.
reflex-dom-test-selenium/LICENSEnew file+12
@@ -0,0 +1,12 @@
1+Copyright (c) 2020, Obsidian Systems LLC
2+All rights reserved.
3+
4+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
5+
6+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
7+
8+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
9+
10+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
11+
12+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
reflex-dom-test-selenium/Setup.hsnew file+2
@@ -0,0 +1,2 @@
1+import Distribution.Simple
2+main = defaultMain
reflex-dom-test-selenium/add-overrides.nixnew file+20
@@ -0,0 +1,20 @@
1+{ nixpkgs }: testPackage:
2+ nixpkgs.haskell.lib.overrideCabal testPackage
3+ (drv: {
4+
5+ # The headless browser run as part of the tests will exit without this
6+ preBuild = ''
7+ export HOME="$PWD"
8+ '';
9+
10+ testSystemDepends = with nixpkgs; (drv.testSystemDepends or []) ++ [
11+ selenium-server-standalone which
12+ chromium
13+ nixpkgs.iproute
14+ ];
15+
16+ # The headless browser run as part of gc tests would hang/crash without this
17+ preCheck = ''
18+ export FONTCONFIG_PATH=${nixpkgs.fontconfig.out}/etc/fonts
19+ '';
20+ })
reflex-dom-test-selenium/reflex-dom-test-selenium.cabalnew file+41
@@ -0,0 +1,41 @@
1+cabal-version: 1.24
2+Name: reflex-dom-test-selenium
3+Version: 0.0.0.1
4+Synopsis: Testing framework for selenium tests
5+Description:
6+License: BSD3
7+License-file: LICENSE
8+Author: Ryan Trinkle
9+Maintainer: ryan.trinkle@gmail.com
10+Stability: Experimental
11+Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
12+Build-type: Simple
13+
14+library
15+ hs-source-dirs: src
16+ build-depends:
17+ async,
18+ base >= 4.7 && < 4.15,
19+ bytestring == 0.10.*,
20+ chrome-test-utils,
21+ exceptions,
22+ hspec-core,
23+ hspec-webdriver >= 1.2.1,
24+ http-types,
25+ jsaddle >= 0.9.0.0 && < 0.10,
26+ jsaddle-warp,
27+ network,
28+ process,
29+ reflex-dom-core,
30+ silently,
31+ text == 1.2.*,
32+ wai,
33+ warp,
34+ webdriver,
35+ websockets
36+
37+ exposed-modules:
38+ Reflex.Dom.Test.Selenium
39+
40+ default-language: Haskell98
41+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
reflex-dom-test-selenium/src/Reflex/Dom/Test/Selenium.hsnew file+249
@@ -0,0 +1,249 @@
1+{-# LANGUAGE ConstraintKinds #-}
2+{-# LANGUAGE FlexibleContexts #-}
3+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4+{-# LANGUAGE OverloadedStrings #-}
5+{-# LANGUAGE RankNTypes #-}
6+{-# LANGUAGE ScopedTypeVariables #-}
7+{-# LANGUAGE StandaloneDeriving #-}
8+{-# LANGUAGE TemplateHaskell #-}
9+
10+{-# OPTIONS_GHC -fno-warn-orphans #-}
11+
12+-- | Utilities for testing reflex-dom widgets with Selenium.
13+--
14+-- Any uses of the 'testWidget' functions will start a jsaddle warp server and
15+-- serve the given widget in an otherwise empty page. Webdriver commands can run
16+-- on the statically rendered page, and on the hydrated page.
17+module Reflex.Dom.Test.Selenium
18+ ( TestWidget
19+ , TestWidgetConfig (..)
20+ , testWidget, testWidget', testWidgetStatic, testWidgetHydrated
21+ , withSeleniumSpec
22+ , embedSpec
23+ , SeleniumSetupConfig (..)
24+ ) where
25+
26+import Control.Concurrent (threadDelay, newEmptyMVar, takeMVar, putMVar)
27+import Control.Exception (throwIO)
28+import Control.Monad (when)
29+import Control.Monad.Catch (MonadMask, handle)
30+import Control.Monad.Fix (MonadFix)
31+import Control.Monad.IO.Class (MonadIO, liftIO)
32+import Data.Text (Text)
33+import Language.Javascript.JSaddle
34+import Language.Javascript.JSaddle.Warp
35+import Network.HTTP.Types (status200)
36+import Network.Socket (PortNumber)
37+import Network.Wai (responseLBS)
38+import Network.WebSockets (defaultConnectionOptions)
39+import Reflex.Dom.Core
40+import System.IO (stderr)
41+import System.IO.Silently (hSilence)
42+import System.Process (std_in, std_out, std_err, createProcess, proc, StdStream (..), terminateProcess)
43+import Test.Hspec.WebDriver (Spec, SpecWith, WdTestSession, sessionWith, using)
44+import Test.Util.ChromeFlags
45+import Test.Util.UnshareNetwork
46+import Test.WebDriver (WD)
47+
48+import qualified Control.Concurrent.Async as Async
49+import qualified Data.ByteString.Lazy as LBS
50+import qualified Data.Text as T
51+import qualified Data.Text.Encoding as TE
52+import qualified Network.Wai.Handler.Warp as Warp
53+import qualified Test.Hspec.Core.Spec as Hspec
54+import qualified Test.WebDriver as WD
55+import qualified Test.WebDriver.Capabilities as WD
56+
57+deriving instance MonadMask WD
58+
59+data SeleniumSetupConfig = SeleniumSetupConfig
60+ { _seleniumSetupConfig_chromiumPath :: FilePath
61+ -- ^ Path to the chromium executable
62+ , _seleniumSetupConfig_headless :: Bool
63+ -- ^ True means that the browser is invoked in headless mode, False means that
64+ -- the user can see the interaction happening on the browser (useful for debugging).
65+ , _seleniumSetupConfig_seleniumPort :: PortNumber
66+ -- ^ The port number used by selenium
67+ }
68+
69+-- | Setup a selenium server and use it to run some hspec tests.
70+--
71+-- withSeleniumSpec config $ \runSession -> hspec $ do
72+-- describe "tests using webdriver session" $ runSession $ do
73+-- webdriver tests here
74+withSeleniumSpec :: SeleniumSetupConfig -> ((forall multi. SpecWith (WdTestSession multi) -> Spec) -> IO a) -> IO a
75+withSeleniumSpec config runSpec = do
76+ liftIO $ handle (\(_ :: IOError) -> return ()) $ unshareNetork -- If we run into an exception with sandboxing, just don't bother
77+ withSandboxedChromeFlags (_seleniumSetupConfig_headless config) $ \chromeFlags -> do
78+ withSeleniumServer (_seleniumSetupConfig_seleniumPort config) $ do
79+ let browserPath = T.strip $ T.pack $ _seleniumSetupConfig_chromiumPath config
80+ when (T.null browserPath) $ fail "No browser found"
81+ let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _seleniumSetupConfig_seleniumPort config }
82+ chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
83+ runSpec $ sessionWith wdConfig "" . using [(chromeCaps', "chrome")]
84+
85+startSeleniumServer :: PortNumber -> IO (IO ())
86+startSeleniumServer port = do
87+ (_,_,_,ph) <- createProcess $ (proc "selenium-server" ["-port", show port])
88+ { std_in = NoStream
89+ , std_out = NoStream
90+ , std_err = NoStream
91+ }
92+ return $ terminateProcess ph
93+
94+withSeleniumServer :: PortNumber -> IO a -> IO a
95+withSeleniumServer port f = bracket (startSeleniumServer port) id $ \_ -> do
96+ threadDelay $ 1000 * 1000 * 2 -- TODO poll or wait on a a signal to block on
97+ f
98+
99+chromeConfig :: Text -> [Text] -> WD.WDConfig
100+chromeConfig fp flags =
101+ WD.useBrowser
102+ (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags })
103+ WD.defaultConfig
104+
105+--------------------------------------------------------------------------------
106+-- Function to test widgets
107+--------------------------------------------------------------------------------
108+
109+-- | The environment in which your widgets can be tested
110+type TestWidget js t m =
111+ (DomBuilder t m, MonadHold t m, PostBuild t m
112+ , Prerender js t m, PerformEvent t m, TriggerEvent t m
113+ , MonadFix m, MonadIO (Performable m), MonadIO m)
114+
115+-- | Configuration of individual tests
116+data TestWidgetConfig = TestWidgetConfig
117+ { _testWidgetConfig_debug :: Bool
118+ -- ^ If this flag is set to True, during the test we will emit debug messages
119+ , _testWidgetConfig_headWidget :: (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
120+ -- ^ We can add widgets here that will be included in the head of the page
121+ -- (useful for example to include external js libraries in the tests)
122+ , _testWidgetConfig_jsaddlePort :: PortNumber
123+ -- ^ Port used by the jsaddle server
124+ }
125+
126+-- | Test a widget by running some webdriver commands before and after
127+-- hydration.
128+testWidget
129+ :: TestWidgetConfig
130+ -> WD a
131+ -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
132+ -> WD b
133+ -- ^ Webdriver commands to run after hydration switchover
134+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
135+ -- ^ Widget we are testing (contents of body)
136+ -> WD b
137+testWidget cfg before after widget = testWidget' cfg before (const after) widget
138+
139+-- | Test a widget by running some webdriver commands before hydration (on the
140+-- statically rendered page).
141+testWidgetStatic
142+ :: TestWidgetConfig
143+ -> WD a
144+ -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
145+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
146+ -- ^ Widget we are testing (contents of body)
147+ -> WD a
148+testWidgetStatic cfg before widget = testWidget' cfg before pure widget
149+
150+-- | Test a widget by running some webdriver commands after hydration.
151+testWidgetHydrated
152+ :: TestWidgetConfig
153+ -> WD b
154+ -- ^ Webdriver commands to run after hydration switchover
155+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
156+ -- ^ Widget we are testing (contents of body)
157+ -> WD b
158+testWidgetHydrated cfg after widget = testWidget' cfg (pure ()) (const after) widget
159+
160+-- | Test a widget by running some webdriver commands before and after
161+-- hydration. Like 'testWidget', but you can use the result of the webdriver
162+-- commands from before hydration in the post hydration test.
163+testWidget'
164+ :: TestWidgetConfig
165+ -> WD a
166+ -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
167+ -> (a -> WD b)
168+ -- ^ Webdriver commands to run after hydration switchover
169+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
170+ -- ^ Widget we are testing (contents of body)
171+ -> WD b
172+testWidget' (TestWidgetConfig withDebugging headWidget jsaddlePort) beforeJS afterSwitchover bodyWidget = do
173+ let putStrLnDebug :: MonadIO m => Text -> m ()
174+ putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
175+ staticApp = do
176+ el "head" $ headWidget
177+ el "body" $ do
178+ bodyWidget
179+ el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
180+ putStrLnDebug "rendering static"
181+ ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
182+ putStrLnDebug "rendered static"
183+ waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
184+ waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
185+ let entryPoint = do
186+ putStrLnDebug "taking waitBeforeJS"
187+ liftIO $ takeMVar waitBeforeJS
188+ let switchOverAction = do
189+ putStrLnDebug "switchover syncPoint"
190+ syncPoint
191+ putStrLnDebug "putting waitUntilSwitchover"
192+ liftIO $ putMVar waitUntilSwitchover ()
193+ putStrLnDebug "put waitUntilSwitchover"
194+ putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
195+ mainHydrationWidgetWithSwitchoverAction switchOverAction blank bodyWidget
196+ putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
197+ syncPoint
198+ application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
199+ putStrLnDebug "sending response"
200+ r <- sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
201+ putStrLnDebug "sent response"
202+ return r
203+ waitJSaddle <- liftIO newEmptyMVar
204+ let settings = foldr ($) Warp.defaultSettings
205+ [ Warp.setPort $ fromIntegral $ toInteger jsaddlePort
206+ , Warp.setBeforeMainLoop $ do
207+ putStrLnDebug "putting waitJSaddle"
208+ putMVar waitJSaddle ()
209+ putStrLnDebug "put waitJSaddle"
210+ ]
211+ -- hSilence to get rid of ConnectionClosed logs
212+ silenceIfNotDebugging = if withDebugging then id else hSilence [stderr]
213+ jsaddleWarp = silenceIfNotDebugging $ Warp.runSettings settings application
214+ withAsync' jsaddleWarp $ do
215+ putStrLnDebug "taking waitJSaddle"
216+ liftIO $ takeMVar waitJSaddle
217+ putStrLnDebug "opening page"
218+ WD.openPage $ "http://localhost:" <> show jsaddlePort
219+ putStrLnDebug "running beforeJS"
220+ a <- beforeJS
221+ putStrLnDebug "putting waitBeforeJS"
222+ liftIO $ putMVar waitBeforeJS ()
223+ putStrLnDebug "taking waitUntilSwitchover"
224+ liftIO $ takeMVar waitUntilSwitchover
225+ putStrLnDebug "running afterSwitchover"
226+ afterSwitchover a
227+
228+--------------------------------------------------------------------------------
229+-- Utilities
230+--------------------------------------------------------------------------------
231+
232+-- | Embed a different spec type by evaluating it directly.
233+embedSpec :: (Hspec.Example a, MonadIO m) => Hspec.Arg a -> a -> m ()
234+embedSpec arg spec = liftIO $ do
235+ Hspec.Result _info status <- Hspec.evaluateExample
236+ spec
237+ Hspec.defaultParams
238+ (\actionWith -> actionWith arg)
239+ (\_ -> pure ())
240+ case status of
241+ Hspec.Success -> pure ()
242+ Hspec.Pending _ _ -> pure () -- should not happen
243+ failure -> throwIO failure
244+
245+withAsync' :: (MonadIO m, MonadMask m) => IO a -> m b -> m b
246+withAsync' f g = bracket
247+ (liftIO $ Async.async f)
248+ (liftIO . Async.uninterruptibleCancel)
249+ (const g)
reflex-dom/ChangeLog.mdnew file+42
@@ -0,0 +1,42 @@
1+# Revision history for reflex-dom
2+
3+## 0.6.1.0-r1
4+
5+* Loosen reflex-dom-core version bounds
6+
7+## 0.6.1.0
8+
9+* Update for new dependent-map and dependent-sum (after the "some" package split)
10+
11+## 0.6.0.0
12+
13+* ([#379](https://github.com/reflex-frp/reflex-dom/pull/379)) Re-export all modules from `reflex-dom-core`. The newly re-exported modules are:
14+ * `Foreign.JavaScript.Utils`
15+ * `Reflex.Dom.Builder.Hydratable`
16+ * `Reflex.Dom.Modals.Class`
17+ * `Reflex.Dom.Prerender`
18+ * `Reflex.Dom.Time`
19+ * `Reflex.Dom.WebSocket.Query`
20+ * `Reflex.Dom.Xhr.FormData`
21+* ([#366](https://github.com/reflex-frp/reflex-dom/pull/366)) Bump bounds for `reflex` to include 0.7.
22+
23+## 0.5.3
24+
25+* On Android, enable prompting the user for geolocation
26+ permissions on demand by default. See
27+ https://developer.android.com/reference/android/webkit/WebChromeClient.html#onGeolocationPermissionsShowPrompt(java.lang.String,%20android.webkit.GeolocationPermissions.Callback)
28+ for details.
29+
30+ * Add `< 0.7` upper bound for reflex
31+
32+## 0.5.2
33+
34+* The default jsaddle backend on macOS when built from nix
35+ is now jsaddle-wkwebview, matching the behaviour of cabal
36+ builds.
37+
38+## 0.5
39+
40+* Re-export new hydration widget "mainWidget" functions.
41+
42+* The use-warp flag now properly takes precedence on macOS.
reflex-dom/LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2015, Obsidian Systems LLC
1+Copyright (c) 2020, Obsidian Systems LLC
22All rights reserved.
33
44Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
reflex-dom/benchmark.hsnew file+190
@@ -0,0 +1,190 @@
1+{-# LANGUAGE RecursiveDo #-}
2+{-# LANGUAGE GADTs #-}
3+{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE ScopedTypeVariables #-}
5+{-# LANGUAGE RecordWildCards #-}
6+{-# LANGUAGE FlexibleContexts #-}
7+{-# LANGUAGE Rank2Types #-}
8+{-# OPTIONS_GHC -ddump-simpl -ddump-rules -ddump-spec -ddump-to-file -dsuppress-coercions -dsuppress-idinfo #-}
9+module Main (main) where
10+
11+import Control.Monad.State
12+import Data.Monoid
13+import Data.Text (Text)
14+import qualified Data.Text as T
15+import Reflex.Dom
16+import System.Random
17+import qualified Data.Map as Map
18+import Data.Dependent.Map (DMap (..))
19+import qualified Data.Dependent.Map as DMap
20+import Data.Dependent.Sum (DSum (..))
21+import Data.Functor.Misc
22+import Data.Functor.Identity
23+import Data.Functor.Compose
24+import Data.IORef
25+import GHCJS.DOM.Types (JSM)
26+import qualified Data.Some as Some
27+import Data.Functor.Constant
28+import Data.IntMap.Strict (IntMap)
29+import qualified Data.IntMap.Strict as IntMap
30+import Data.FastMutableIntMap
31+
32+import qualified GHCJS.DOM.Element as DOM
33+import qualified GHCJS.DOM.Types as DOM
34+
35+--{-
36+main :: IO ()
37+main = mainWidget' $ do
38+ create1000 <- button "Create 1,000 rows"
39+ let row k _ = el "li" $ text $ T.pack $ show k
40+ el "ul" $ traverseIntMapWithKeyWithAdjust row IntMap.empty $ PatchIntMap (IntMap.fromDistinctAscList [(x, Just ()) | x <- [1 :: Int .. 1000]]) <$ create1000
41+ return ()
42+--}
43+
44+
45+{-
46+main :: IO ()
47+main = do
48+ mainWidget' $ do
49+ create1000 <- button "Create 1,000 rows"
50+ partialUpdate <- button "Update every 10th row"
51+ elClass "table" "table table-hover table-striped test-data" $ el "tbody" $ do
52+ --runWithReplace blank $ forM_ [1..1000] row <$ create1000
53+ rec let u = leftmost
54+ [ PatchIntMap (IntMap.fromDistinctAscList [(x, Just ()) | x <- [1..1000]]) <$ create1000
55+ , PatchIntMap (IntMap.fromDistinctAscList [(x, Just ()) | x <- [1, 11..1000]]) <$ partialUpdate
56+ , PatchIntMap <$> deletes
57+ ]
58+ (_, deletes) <- runEventWriterT $ traverseIntMapWithKeyWithAdjust (\k _ -> row k) mempty u
59+ return ()
60+
61+row :: MonadWidget t m => Int -> EventWriterT t (IntMap (Maybe ())) m ()
62+row rowNum = el "tr" $ do
63+ elClass "td" "col-md-1" $ text $ T.pack $ show rowNum
64+ (sel, _) <- elClass' "td" "col-md-4" $ el "a" $ text "asdf"
65+ (del, _) <- elClass' "td" "col-md-1" deleteButton
66+ tellEvent $ IntMap.singleton rowNum Nothing <$ domEvent Click del
67+ elClass "td" "col-md-6" blank
68+
69+deleteButton :: MonadWidget t m => m ()
70+deleteButton = el "a" $ elAttr "span" ("aria-hidden" =: "true" <> "class" =: "glyphicon glyphicon-remove") $ text "X"
71+
72+--}
73+
74+--
75+{-
76+type RNG = StdGen
77+type Entropy = Int
78+type RowPosition = Int
79+type RowNumber = Int
80+data Row = Row { pos :: RowPosition, num :: RowNumber , txt :: Text } deriving (Eq, Show)
81+type Table = Map RowPosition Row
82+data Model = Model { rng :: RNG, table :: Table, nextNum :: RowNumber, selected :: Maybe Row } deriving Show
83+
84+{- Widgets -}
85+
86+titleW :: MonadWidget t m => m ()
87+titleW = text "Reflex-Dom"
88+
89+headW :: MonadWidget t m => m ()
90+headW = do
91+ el "title" titleW
92+ elAttr "link" ("href" =: "/css/currentStyle.css" <> "rel" =: "stylesheet") blank
93+
94+bodyW :: MonadWidget t m => Entropy -> m ()
95+bodyW seed = divClass "main" $ divClass "container" $ mdo
96+ let initial = Model { rng = mkStdGen seed, table = empty, nextNum = 1, selected = Nothing }
97+ dynModel <- foldDyn ($) initial $ mergeWith (.) $ rowEvents : buttonEvents
98+
99+ buttonEvents :: [Event t (Model -> Model)] <- divClass "jumbotron" $ divClass "row" $ do
100+ divClass "col-md-6" $ el "h1" titleW
101+ divClass "col-md-6" $ divClass "row" $ sequence [
102+ buttonW "run" "Create 1,000 rows" $ createRows 1000,
103+ buttonW "runlots" "Create 10,000 rows" $ createRows 10000,
104+ buttonW "add" "Append 1,000 rows" $ appendRows 1000,
105+ buttonW "update" "Update every 10th row" $ updateRows (\p -> mod p 10 == 0) (<> " !!!"),
106+ buttonW "clear" "Clear" $ clearRows,
107+ buttonW "swaprows" "Swap Rows" $ swapRows (4, 9)
108+ ]
109+
110+ rowEvents' <- tableW dynModel
111+ let rowEvents = foldl (.) id <$> rowEvents'
112+
113+ blank
114+
115+buttonW :: MonadWidget t m => Text -> Text -> a -> m (Event t a)
116+buttonW id txt val = divClass "col-sm-6 smallpad" $ buttonW' ("class" =: "btn btn-primary btn-block" <> "id" =: id)
117+ where
118+ buttonW' attrs = do
119+ (b, _) <- elAttr' "button" attrs $ text txt
120+ pure $ val <$ domEvent Click b
121+
122+tableW :: MonadWidget t m => Dynamic t Model -> m (Event t (Map RowPosition (Model -> Model)))
123+tableW dynM =
124+ elClass "table" "table table-hover table-striped test-data"
125+ $ el "tbody"
126+ $ listViewWithKey (table <$> dynM) (\_ dynRow -> rowW (selectedIs <$> dynM <*> dynRow) dynRow)
127+ where
128+ selectedIs m r = selected m == Just r
129+
130+rowW :: MonadWidget t m => Dynamic t Bool -> Dynamic t Row -> m (Event t (Model -> Model))
131+rowW dynSelected dynRow = elDynClass "tr" trClass $
132+ do
133+ elClass "td" "col-md-1". dynText $ pack . show . num <$> dynRow
134+ (sel, _) <- elClass' "td" "col-md-4". el "a" . dynText $ txt <$> dynRow
135+ (del, _) <- elClass' "td" "col-md-1" deleteW
136+ elClass "td" "col-md-6" blank
137+ pure $ mergeWith (.) $ zipWith tagClick [selectRow, deleteRow] [sel, del]
138+ where
139+ trClass = (\b -> if b then "danger" else "") <$> dynSelected
140+ tagClick f el = (tag . current) (f <$> dynRow) (domEvent Click el)
141+
142+
143+{- Domain logic -}
144+
145+clearRows :: Model -> Model
146+clearRows (Model {..}) = Model { table = empty, .. }
147+
148+updateRows :: (RowPosition -> Bool) -> (Text -> Text) -> Model -> Model
149+updateRows p f (Model {..}) = Model { table = (update <$> targets) <> table, .. }
150+ where
151+ targets = filterWithKey (const . p) table
152+ update = \(Row{..}) -> Row { txt = f txt, ..}
153+
154+swapRows :: (RowPosition, RowPosition) -> Model -> Model
155+swapRows (a,b) (Model {..}) = Model { table = (a =: val b) <> (b =: val a) <> table, .. }
156+ where val = (table !)
157+
158+selectRow, deleteRow :: Row -> Model -> Model
159+selectRow r m = m { selected = Just r }
160+deleteRow r (Model {..}) = Model { table = shifted table, .. }
161+ where
162+ shifted = fromList . zipWith update [0..] . elems . delete (pos r)
163+ update p (Row{..}) = (p, Row { pos = p, .. })
164+
165+createRows, appendRows :: Int -> Model -> Model
166+createRows = newRows False
167+appendRows = newRows True
168+
169+newRows :: Bool -> Int -> Model -> Model
170+newRows keepOld count (Model {..}) = Model { rng = rng', table = table', nextNum = nextNum', .. }
171+ where
172+ nextPos = if keepOld then length table else 0
173+ rowsST = sequence (rowST <$ [0..count-1])
174+ (rows, (nextPos', nextNum', rng')) = runState rowsST (nextPos, nextNum, rng)
175+ combine = if keepOld then (<>) else \_ new -> new
176+ table' = fromList . zip [0..] $ combine (elems table) rows
177+
178+rowST :: State (RowPosition, RowNumber, RNG) Row
179+rowST = state (\(p,n,g) -> let (e, g') = next g in (Row {pos = p, num = n, txt = randomName e}, (p+1,n+1,g')))
180+
181+randomName :: Entropy -> Text
182+randomName e = intercalate " " $ (!!% e) <$> [adjectives, colours, nouns]
183+ where xs !!% n = xs !! mod n (length xs)
184+
185+adjectives,colours,nouns :: [Text]
186+adjectives = ["pretty", "large", "big", "small", "tall", "short", "long", "handsome", "plain", "quaint", "clean", "elegant", "easy", "angry", "crazy", "helpful", "mushy", "odd", "unsightly", "adorable", "important", "inexpensive", "cheap", "expensive", "fancy"]
187+colours = ["red", "yellow", "blue", "green", "pink", "brown", "purple", "brown", "white", "black", "orange"]
188+nouns = ["table", "chair", "house", "bbq", "desk", "car", "pony", "cookie", "sandwich", "burger", "pizza", "mouse", "keyboard"]
189+
190+-}
reflex-dom/benchmarks/krausest.hsnew file+222
@@ -0,0 +1,222 @@
1+{-# LANGUAGE RecursiveDo #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE ScopedTypeVariables #-}
4+{-# LANGUAGE FlexibleContexts #-}
5+{-# OPTIONS_GHC -fmax-simplifier-iterations=5 -ddump-simpl -ddump-to-file -dsuppress-coercions -dsuppress-idinfo #-}
6+import Control.Monad.State
7+import Data.Monoid
8+import Data.IntMap (IntMap, assocs, elems, empty, fromList, size, singleton)
9+import Data.Text (Text)
10+import qualified Data.Text as T
11+import Data.Vector (Vector)
12+import qualified Data.Vector as Vector
13+import Reflex.Dom
14+import Data.FastMutableIntMap
15+import System.Random
16+
17+type RNG = StdGen
18+type Entropy = Int
19+type RowNumber = Int
20+type RowIndex = Int
21+data Row = Row { num :: RowNumber, txt :: Text, selected :: Bool } deriving (Eq, Show)
22+type Table = IntMap Row
23+data Model = Model { rng :: RNG, nextNum :: RowNumber, selection :: Maybe Row } deriving Show
24+type TableDiff = PatchIntMap Row
25+
26+main :: IO ()
27+main = do
28+ seed <- randomIO
29+ mainWidgetWithHead' (\_ -> headW, \_ -> bodyW seed)
30+
31+titleW :: DomBuilder t m => m ()
32+titleW = text "Reflex-dom keyed"
33+
34+headW :: DomBuilder t m => m ()
35+headW = do
36+ el "title" titleW
37+ elAttr "link" ("href" =: "/css/currentStyle.css" <> "rel" =: "stylesheet") blank
38+
39+bodyW :: forall t m. (MonadFix m, MonadHold t m, DomBuilder t m) => Entropy -> m ()
40+bodyW seed = divClass "main" $ divClass "container" $ mdo
41+ buttonEvents <- divClass "jumbotron" $ divClass "row" $ do
42+ divClass "col-md-6" $ el "h1" titleW
43+ divClass "col-md-6" $ divClass "row" $ sequence
44+ [ buttonW "run" "Create 1,000 rows" $ resetRows 1000
45+ , buttonW "runlots" "Create 10,000 rows" $ resetRows 10000
46+ , buttonW "add" "Append 1,000 rows" $ appendRows 1000
47+ , buttonW "update" "Update every 10th row" $ updateRows (\i -> mod i 10 == 0) (<> " !!!")
48+ , buttonW "clear" "Clear" $ clearRows
49+ , buttonW "swaprows" "Swap Rows" $ swapRows (1, 998)
50+ ]
51+
52+ let initial = Model { rng = mkStdGen seed, nextNum = 1, selection = Nothing }
53+ let events = leftmost $ fmap (foldl1 sequenceSteps) rowEvents : buttonEvents
54+
55+ rowEvents <- tableW dynMT
56+
57+ dynMT <- mapAccum_ step (initial, empty) events
58+
59+ elAttr "span" ("class" =: "preloadicon glyphicon glyphicon-remove" <> "aria-hidden" =: "true") blank
60+
61+ blank
62+
63+type Step = (Model, Table) -> (Model, TableDiff)
64+
65+sequenceSteps :: Step -> Step -> Step
66+sequenceSteps a b (m, t) =
67+ let (ma, tda) = a (m, t)
68+ ta = applyAlways tda t
69+ (mb, tdb) = b (ma, ta)
70+ in (mb, tdb <> tda)
71+
72+step :: (Model, Table) -> Step -> ((Model, Table), TableDiff)
73+step (m, t) f = ((m', t'), dt)
74+ where
75+ (m', dt) = f (m, t)
76+ t' = applyAlways dt t
77+
78+buttonW :: DomBuilder t m => Text -> Text -> a -> m (Event t a)
79+buttonW id txt val = divClass "col-sm-6 smallpad" $ buttonW' ("class" =: "btn btn-primary btn-block" <> "id" =: id)
80+ where
81+ buttonW' attrs = do
82+ (b, _) <- elAttr' "button" attrs $ text txt
83+ pure $ val <$ domEvent Click b
84+
85+tableW :: (MonadHold t m, DomBuilder t m) => Event t TableDiff -> m (Event t (IntMap Step))
86+tableW diff = do
87+ elClass "table" "table table-hover table-striped test-data" $ do
88+ el "tbody" $ do
89+ (v0, v') <- traverseIntMapWithKeyWithAdjust (\_ -> rowW) empty diff
90+ rowEvents <- holdIncremental v0 v'
91+ return $ mergeIntIncremental rowEvents
92+
93+rowW :: DomBuilder t m => Row -> m (Event t Step)
94+rowW row = elClass "tr" (if selected row then "danger" else "") $
95+ do
96+ elClass "td" "col-md-1" $ do
97+ text $ T.pack $ show $ num row
98+ (sel, _) <- elClass' "td" "col-md-4". el "a" . text $ txt row
99+ (del, _) <- elClass' "td" "col-md-1" deleteW
100+ elClass "td" "col-md-6" blank
101+ pure . leftmost $ zipWith tagClick [selectRow, deleteRow] [sel, del]
102+ where
103+ tagClick f el = f row <$ (domEvent Click el)
104+
105+deleteW :: DomBuilder t m => m ()
106+deleteW = el "a" $ elAttr "span" ("aria-hidden" =: "true" <> "class" =: "glyphicon glyphicon-remove") blank
107+
108+
109+{- Domain logic -}
110+clearRows :: (Model, Table) -> (Model, TableDiff)
111+clearRows (m, t) = (m { selection = Nothing }, PatchIntMap $ Nothing <$ t)
112+
113+updateRows :: (RowIndex -> Bool) -> (Text -> Text) -> (Model, Table) -> (Model, TableDiff)
114+updateRows p f (m, t) = (m, PatchIntMap $ Just . update <$> targets)
115+ where
116+ targets = fromList . filterByIndex p . assocs $ t
117+ update = \r -> r { txt = f $ txt r }
118+
119+filterByIndex :: (Int -> Bool) -> [a] -> [a]
120+filterByIndex p = map snd . filter (\(i, _) -> p i) . zip [0..]
121+
122+swapRows :: (RowIndex, RowIndex) -> (Model, Table) -> (Model, TableDiff)
123+swapRows (a, b) (m, t) = (m, PatchIntMap $ if max a b < length t then swap else empty)
124+ where
125+ swap = point a b <> point b a
126+ point x y = singleton (fst (val x)) $ Just $ snd $ val y
127+ val = (assocs t !!)
128+
129+selectRow :: Row -> (Model, Table) -> (Model, TableDiff)
130+selectRow r (m, t) = (m { selection = Just r}, PatchIntMap $ dr <> ds)
131+ where
132+ dr = sel True r
133+ ds = maybe empty (sel False) $ selection m
134+ sel b r' = singleton (num r') $ Just r' { selected = b }
135+
136+deleteRow :: Row -> (Model, Table) -> (Model, TableDiff)
137+deleteRow r (m, t) = (m { selection = mfilter (/= r) (selection m) }, PatchIntMap $ singleton (num r) Nothing)
138+
139+resetRows :: Int -> (Model, Table) -> (Model, TableDiff)
140+resetRows n (m, t) = (m'', dt <> dt')
141+ where
142+ (m', dt ) = addRows n (m, t)
143+ (m'', dt') = clearRows (m', t)
144+
145+appendRows :: Int -> (Model, Table) -> (Model, TableDiff)
146+appendRows n (m, t) = addRows n (m, t)
147+
148+addRows :: Int -> (Model, Table) -> (Model, TableDiff)
149+addRows count (m, t) = (m { rng = rng', nextNum = nextNum' }, PatchIntMap diff)
150+ where
151+ rowsST = sequence (rowST <$ [0..count-1])
152+ (rows, (nextNum', rng')) = runState rowsST (nextNum m, rng m)
153+ diff = fromList . fmap (\r -> (num r, Just r)) $ rows
154+
155+rowST :: State (RowNumber, RNG) Row
156+rowST = state (\(n, g) -> let (e, g') = next g in (Row {num = n, txt = randomName e, selected = False}, (n+1, g')))
157+
158+randomName :: Entropy -> Text
159+randomName e = T.intercalate " " $ (`modIndex` e) <$> [adjectives, colours, nouns]
160+
161+-- | Index into a Vector, modulo its length
162+--
163+-- WARNING: The vector must have length >= 1, and the index must be >= 0.
164+modIndex :: Vector a -> Int -> a
165+modIndex v n = Vector.unsafeIndex v $ n `mod` Vector.length v
166+
167+adjectives, colours, nouns :: Vector Text
168+adjectives = Vector.fromList
169+ [ "pretty"
170+ , "large"
171+ , "big"
172+ , "small"
173+ , "tall"
174+ , "short"
175+ , "long"
176+ , "handsome"
177+ , "plain"
178+ , "quaint"
179+ , "clean"
180+ , "elegant"
181+ , "easy"
182+ , "angry"
183+ , "crazy"
184+ , "helpful"
185+ , "mushy"
186+ , "odd"
187+ , "unsightly"
188+ , "adorable"
189+ , "important"
190+ , "inexpensive"
191+ , "cheap"
192+ , "expensive"
193+ , "fancy"
194+ ]
195+colours = Vector.fromList
196+ [ "red"
197+ , "yellow"
198+ , "blue"
199+ , "green"
200+ , "pink"
201+ , "brown"
202+ , "purple"
203+ , "brown"
204+ , "white"
205+ , "black"
206+ , "orange"
207+ ]
208+nouns = Vector.fromList
209+ [ "table"
210+ , "chair"
211+ , "house"
212+ , "bbq"
213+ , "desk"
214+ , "car"
215+ , "pony"
216+ , "cookie"
217+ , "sandwich"
218+ , "burger"
219+ , "pizza"
220+ , "mouse"
221+ , "keyboard"
222+ ]
reflex-dom/cbits/MainWidget.cnew file+89
@@ -0,0 +1,89 @@
1+#include <jni.h>
2+#include <assert.h>
3+#include <stdlib.h>
4+#include <android/log.h>
5+#include <HaskellActivity.h>
6+#include "MainWidget.h"
7+
8+jobject Reflex_Dom_Android_MainWidget_start(jobject activity, const char *url, const JSaddleCallbacks *jsaddleCallbacks) {
9+ assert(activity);
10+ assert(url);
11+
12+ JNIEnv *env;
13+ jint attachResult = (*HaskellActivity_jvm)->AttachCurrentThread(HaskellActivity_jvm, &env, NULL);
14+ assert(attachResult == JNI_OK);
15+
16+ jclass cls = (*env)->FindClass(env, "org/reflexfrp/reflexdom/MainWidget");
17+ assert(cls);
18+ jmethodID startMainWidget = (*env)->GetStaticMethodID(env, cls, "startMainWidget", "(Lsystems/obsidian/HaskellActivity;Ljava/lang/String;JLjava/lang/String;)Ljava/lang/Object;");
19+ assert(startMainWidget);
20+
21+ jstring jurl = (*env)->NewStringUTF(env, url);
22+ assert(jurl);
23+ jstring initialJS = (*env)->NewStringUTF(env, jsaddleCallbacks->jsaddleJsData);
24+ jobject result = (*env)->CallStaticObjectMethod(env, cls, startMainWidget, activity, jurl, (jlong)jsaddleCallbacks, initialJS);
25+ (*env)->DeleteLocalRef(env, initialJS);
26+ if((*env)->ExceptionOccurred(env)) {
27+ __android_log_write(ANDROID_LOG_DEBUG, "MainWidget", "startMainWidget exception");
28+ (*env)->ExceptionDescribe(env);
29+ }
30+ return (*env)->NewGlobalRef(env, result);
31+}
32+
33+void Reflex_Dom_Android_MainWidget_runJS(jobject jsExecutor, const char* js, size_t js_len) {
34+ JNIEnv *env;
35+ jint attachResult = (*HaskellActivity_jvm)->AttachCurrentThread(HaskellActivity_jvm, &env, NULL);
36+ assert (attachResult == JNI_OK);
37+
38+ (*env)->PushLocalFrame(env, 5);
39+
40+ //TODO: Don't search for this method every time
41+ jclass cls = (*env)->GetObjectClass(env, jsExecutor);
42+ assert(cls);
43+ jmethodID evaluateJavascript = (*env)->GetMethodID(env, cls, "evaluateJavascript", "([B)V");
44+ assert(evaluateJavascript);
45+ jbyteArray js_str = (*env)->NewByteArray(env, js_len);
46+ (*env)->SetByteArrayRegion(env, js_str, 0, js_len, (const jbyte*)js);
47+ (*env)->CallVoidMethod(env, jsExecutor, evaluateJavascript, js_str, 0);
48+ if((*env)->ExceptionOccurred(env)) {
49+ __android_log_write(ANDROID_LOG_DEBUG, "MainWidget", "runJS exception");
50+ (*env)->ExceptionDescribe(env);
51+ }
52+
53+ (*env)->PopLocalFrame(env, 0);
54+}
55+
56+JNIEXPORT void JNICALL Java_org_reflexfrp_reflexdom_MainWidget_00024JSaddleCallbacks_startProcessing (JNIEnv *env, jobject thisObj, jlong callbacksLong) {
57+ const JSaddleCallbacks *callbacks = (const JSaddleCallbacks *)callbacksLong;
58+ (*(callbacks->jsaddleStart))();
59+ return;
60+}
61+
62+JNIEXPORT void JNICALL Java_org_reflexfrp_reflexdom_MainWidget_00024JSaddleCallbacks_processMessage (JNIEnv *env, jobject thisObj, jlong callbacksLong, jbyteArray msg) {
63+ const JSaddleCallbacks *callbacks = (const JSaddleCallbacks *)callbacksLong;
64+
65+ jbyte *msg_str = (*env)->GetByteArrayElements(env, msg, NULL);
66+ jsize msg_str_len = (*env)->GetArrayLength(env, msg);
67+ (*(callbacks->jsaddleResult))(msg_str, msg_str_len);
68+ (*env)->ReleaseByteArrayElements(env, msg, msg_str, JNI_ABORT);
69+ return;
70+}
71+
72+JNIEXPORT jbyteArray JNICALL Java_org_reflexfrp_reflexdom_MainWidget_00024JSaddleCallbacks_processSyncMessage (JNIEnv *env, jobject thisObj, jlong callbacksLong, jbyteArray msg) {
73+ const JSaddleCallbacks *callbacks = (const JSaddleCallbacks *)callbacksLong;
74+
75+ char const *next_str;
76+ size_t next_str_len;
77+
78+ jbyte *msg_str = (*env)->GetByteArrayElements(env, msg, NULL);
79+ jsize msg_str_len = (*env)->GetArrayLength(env, msg);
80+ (*(callbacks->jsaddleSyncResult))(msg_str, msg_str_len, &next_str, &next_str_len);
81+ (*env)->ReleaseByteArrayElements(env, msg, msg_str, JNI_ABORT);
82+
83+ jbyteArray next_jstr = (*env)->NewByteArray(env, next_str_len);
84+ (*env)->SetByteArrayRegion(env, next_jstr, 0, next_str_len, next_str);
85+
86+ free(next_str);
87+
88+ return next_jstr;
89+}
reflex-dom/cbits/include/MainWidget.hnew file+13
@@ -0,0 +1,13 @@
1+#ifndef MAINWIDGET_H_INCLUDED
2+#define MAINWIDGET_H_INCLUDED
3+
4+#include <stddef.h>
5+
6+typedef struct JSaddleCallbacks {
7+ void (* jsaddleStart) ();
8+ void (* jsaddleResult) (const char *, size_t);
9+ void (* jsaddleSyncResult) (const char *, size_t, const char**, size_t*);
10+ char * jsaddleJsData;
11+} JSaddleCallbacks;
12+
13+#endif
reflex-dom/default.nixdeleted−18
@@ -1,18 +0,0 @@
1−{ mkDerivation, base, bytestring, jsaddle-webkit2gtk, jsaddle-wkwebview, reflex
2−, reflex-dom-core, stdenv, text, ghc
3−}:
4−mkDerivation {
5− pname = "reflex-dom";
6− version = "0.4";
7− src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
8− libraryHaskellDepends = [
9− base bytestring reflex reflex-dom-core text
10− ] ++ (if ghc.isGhcjs or false then [
11− ] else if stdenv.isDarwin then [
12− jsaddle-wkwebview
13− ] else [
14− jsaddle-webkit2gtk
15− ]);
16− description = "Functional Reactive Web Apps with Reflex";
17− license = stdenv.lib.licenses.bsd3;
18−}
examples/sortableList.hs → reflex-dom/examples/sortableList.hsrenamed+1−1
@@ -67,7 +67,7 @@ displayRedrawTime e = do
6767 text "Time: "
6868 dynText =<< holdDyn "not yet run" (T.pack . show <$> diff)
6969
70−simpleSortableList :: forall t m k v. (MonadHold t m, MonadFix m, MonadAdjust t m, Ord k) => (k -> v -> m ()) -> Map k v -> Event t (v -> v -> Ordering) -> Event t (v -> v -> Ordering) -> m ()
70+simpleSortableList :: forall t m k v. (MonadHold t m, MonadFix m, Adjustable t m, Ord k) => (k -> v -> m ()) -> Map k v -> Event t (v -> v -> Ordering) -> Event t (v -> v -> Ordering) -> m ()
7171simpleSortableList f m0 resortFunc resortSlowFunc = do
7272 rec let resortPatchFast = attachWith (flip patchThatSortsMapWith) (currentIncremental m) resortFunc
7373 redrawPatch :: Map k v -> (v -> v -> Ordering) -> PatchMapWithMove k v
reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.javanew file+195
@@ -0,0 +1,195 @@
1+package org.reflexfrp.reflexdom;
2+
3+import android.annotation.TargetApi;
4+import android.net.Uri;
5+import android.os.Build;
6+import android.os.Handler;
7+import android.util.Log;
8+import android.view.ViewGroup.LayoutParams;
9+import android.view.Window;
10+import android.webkit.CookieManager;
11+import android.webkit.GeolocationPermissions;
12+import android.webkit.JavascriptInterface;
13+import android.webkit.MimeTypeMap;
14+import android.webkit.PermissionRequest;
15+import android.webkit.WebChromeClient;
16+import android.webkit.WebResourceRequest;
17+import android.webkit.WebResourceResponse;
18+import android.webkit.WebSettings;
19+import android.webkit.WebView;
20+import android.webkit.WebViewClient;
21+import android.graphics.Bitmap;
22+import java.io.IOException;
23+import java.io.InputStream;
24+import android.content.Intent;
25+import android.content.ActivityNotFoundException;
26+import java.util.concurrent.atomic.AtomicBoolean;
27+
28+import java.nio.charset.StandardCharsets;
29+
30+import systems.obsidian.HaskellActivity;
31+
32+public class MainWidget {
33+ private static Object startMainWidget(final HaskellActivity a, String url, long jsaddleCallbacks, final String initialJS) {
34+ CookieManager.setAcceptFileSchemeCookies(true); //TODO: Can we do this just for our own WebView?
35+
36+ // Remove title and notification bars
37+ a.requestWindowFeature(Window.FEATURE_NO_TITLE);
38+
39+ final WebView wv = new WebView(a);
40+ wv.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
41+ a.setContentView(wv);
42+ final WebSettings ws = wv.getSettings();
43+ ws.setJavaScriptEnabled(true);
44+ ws.setAllowFileAccessFromFileURLs(true);
45+ ws.setAllowUniversalAccessFromFileURLs(true);
46+ ws.setDomStorageEnabled(true);
47+ wv.setWebContentsDebuggingEnabled(true);
48+ // allow video to play without user interaction
49+ wv.getSettings().setMediaPlaybackRequiresUserGesture(false);
50+ final AtomicBoolean jsaddleLoaded = new AtomicBoolean(false);
51+
52+ wv.setWebViewClient(new WebViewClient() {
53+ @Override
54+ public void onPageFinished(WebView _view, String _url) {
55+ Log.i("reflex", "onPageFinished");
56+ boolean alreadyLoaded = jsaddleLoaded.getAndSet(true);
57+ if(!alreadyLoaded) {
58+ Log.i("reflex", "loading jsaddle");
59+ wv.evaluateJavascript(initialJS, null);
60+ }
61+ }
62+
63+ // Re-route / to /android_asset
64+ @Override
65+ public WebResourceResponse shouldInterceptRequest (WebView view, WebResourceRequest request) {
66+ Uri uri = request.getUrl();
67+ if(!uri.getScheme().equals("file"))
68+ return null;
69+
70+ String path = uri.getPath();
71+ path = getAssetPath(path);
72+
73+ String mimeType = getMimeType(uri.toString());
74+ String encoding = "";
75+
76+ try {
77+ InputStream data = a.getApplicationContext().getAssets().open(path);
78+ return new WebResourceResponse(mimeType, encoding, data);
79+ }
80+ catch (IOException e) {
81+ Log.i("reflex", "Opening resource failed, Webview will handle the request ..");
82+ e.printStackTrace();
83+ }
84+
85+ return null;
86+ }
87+
88+ @Override
89+ public boolean shouldOverrideUrlLoading(WebView view, String url) {
90+ if( url != null && !url.startsWith("http://") && !url.startsWith("https://") && !url.startsWith("file://")) {
91+ try {
92+ view.getContext().startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
93+ }
94+ catch(ActivityNotFoundException e) {
95+ Log.e("reflex", "Starting activity for intent '" + url + "' failed!");
96+ }
97+ return true;
98+ } else {
99+ return false;
100+ }
101+ }
102+ });
103+
104+ wv.setWebChromeClient(new WebChromeClient() {
105+ // Need to accept permissions to use the camera and audio
106+ @Override
107+ public void onPermissionRequest(final PermissionRequest request) {
108+ if(request.getOrigin().toString().startsWith("file://")) {
109+ a.requestWebViewPermissions(request);
110+ }
111+ else {
112+ a.runOnUiThread(new Runnable() {
113+ @TargetApi(Build.VERSION_CODES.LOLLIPOP)
114+ @Override
115+ public void run() {
116+ request.deny();
117+ }
118+ });
119+ }
120+ }
121+
122+ @Override
123+ public Bitmap getDefaultVideoPoster() {
124+ return Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
125+ }
126+
127+ @Override
128+ public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) {
129+ callback.invoke(origin, true, false);
130+ }
131+ });
132+
133+ wv.addJavascriptInterface(new JSaddleCallbacks(jsaddleCallbacks), "jsaddle");
134+
135+ wv.loadUrl(url);
136+
137+ final Handler hnd = new Handler();
138+ return new Object() {
139+ public final void evaluateJavascript(final byte[] js) {
140+ final String jsStr = new String(js, StandardCharsets.UTF_8);
141+ hnd.post(new Runnable() {
142+ @Override
143+ public void run() {
144+ wv.evaluateJavascript(jsStr, null);
145+ }
146+ });
147+ }
148+ };
149+ }
150+
151+ private static String getMimeType(String url) {
152+ String type = "";
153+ String extension = MimeTypeMap.getFileExtensionFromUrl(url);
154+ if (extension != null) {
155+ type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
156+ }
157+ return type;
158+ }
159+
160+ /** Get the path of an asset. Strips leading / and leading /android_asset/ */
161+ private static String getAssetPath(String path) {
162+ path = path.startsWith("/android_asset") ? path.substring("/android_asset".length()) : path;
163+ path = path.startsWith("/") ? path.substring(1) : path;
164+ return path;
165+ }
166+
167+ private static class JSaddleCallbacks {
168+ private final long callbacks;
169+ private native void startProcessing(long callbacks);
170+ private native void processMessage(long callbacks, byte[] msg);
171+ private native byte[] processSyncMessage(long callbacks, byte[] msg);
172+
173+ public JSaddleCallbacks(long _callbacks) {
174+ callbacks = _callbacks;
175+ }
176+
177+ @JavascriptInterface
178+ public boolean postReady() {
179+ startProcessing(callbacks);
180+ return true;
181+ }
182+
183+ @JavascriptInterface
184+ public boolean postMessage(final String msg) {
185+ processMessage(callbacks, msg.getBytes(StandardCharsets.UTF_8));
186+ return true;
187+ }
188+
189+ @JavascriptInterface
190+ public String syncMessage(final String msg) {
191+ return new String(processSyncMessage(callbacks, msg.getBytes(StandardCharsets.UTF_8)),
192+ StandardCharsets.UTF_8);
193+ }
194+ }
195+}
reflex-dom/reflex-dom.cabal+160−20
@@ -1,7 +1,20 @@
1+cabal-version: 1.24
12Name: reflex-dom
2−Version: 0.4
3+Version: 0.6.1.0
34Synopsis: Functional Reactive Web Apps with Reflex
4−Description: Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine
5+Description:
6+ Web applications without callbacks or side-effects.
7+ Reflex-DOM brings the power of functional reactive programming (FRP) to the web.
8+ Build HTML and other Document Object Model (DOM) data with a pure functional interface.
9+ .
10+ Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine: <https://reflex-frp.org/>.
11+ .
12+ The @reflex-dom@ package is a small wrapper around the @reflex-dom-core@ package. It pulls in the
13+ correct set of dependencies for each target platform (GHCJS, WebKitGTK, WASM, mobile, etc.).
14+ Libraries should depend on @reflex-dom-core@ and executables will usually depend on @reflex-dom@.
15+ All of @reflex-dom-core@'s modules are re-exported by @reflex-dom@.
16+ .
17+ For Hackage documentation, please see: <https://hackage.haskell.org/package/reflex-dom-core>.
518License: BSD3
619License-file: LICENSE
720Author: Ryan Trinkle
@@ -9,45 +22,95 @@ Maintainer: ryan.trinkle@gmail.com
922Stability: Experimental
1023Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
1124Build-type: Simple
12−cabal-version: >=1.24
13−-- Deal with https://github.com/haskell/cabal/issues/2544 / https://github.com/haskell/cabal/issues/367
14−extra-source-files: src/Reflex/Dom/Xhr/Foreign.hs
15− src/Reflex/Dom/WebSocket/Foreign.hs
16− src/Reflex/Dom/Xhr/ResponseType.hs
17− src/Reflex/Dom/Xhr/Exception.hs
25+extra-source-files:
26+ java/org/reflexfrp/reflexdom/MainWidget.java
27+ ChangeLog.md
28+
29+flag use-warp
30+ description: Use jsaddle-warp server
31+ default: False
32+ manual: True
1833
1934flag webkit2gtk
2035 description: Use WebKit2 version of WebKitGTK.
2136 default: True
2237
38+flag use-reflex-optimizer
39+ description: Use the GHC plugin Reflex.Optimizer on some of the modules in the package. This is still experimental.
40+ default: False
41+ manual: True
42+
43+flag expose-all-unfoldings
44+ description: Build the library with -fexpose-all-unfoldings which can help client code specialize better
45+ default: False
46+ manual: True
47+
48+flag build-examples
49+ description: Build the executables in ./examples
50+ default: False
51+ manual: True
52+
53+flag wasm32
54+ description: Build for wasm32 architecture
55+ default: False
56+ manual: True
57+
2358library
2459 hs-source-dirs: src
60+ if os(android)
61+ hs-source-dirs: src-android
62+ other-modules: Reflex.Dom.Android.MainWidget
63+ build-depends:
64+ aeson >= 1.4 && < 1.6,
65+ android-activity == 0.1.*,
66+ data-default == 0.7.*,
67+ jsaddle >= 0.9.6 && < 0.10
68+ c-sources: cbits/MainWidget.c
69+ include-dirs: cbits/include
70+ install-includes: MainWidget.h
71+ cpp-options: -DANDROID
72+ build-tools: hsc2hs
2573 build-depends:
26− base >= 4.7 && < 4.11,
74+ base >= 4.7 && < 4.15,
2775 bytestring == 0.10.*,
28− reflex == 0.5.*,
29− reflex-dom-core >=0.4 && <0.5,
76+ reflex >= 0.8 && < 0.9,
77+ reflex-dom-core >= 0.6.1.0 && <0.7,
3078 text == 1.2.*
3179 if !impl(ghcjs)
32− if os(osx) || os(ios)
80+ if flag(use-warp) && (os(linux) || os(osx))
3381 build-depends:
34− jsaddle-wkwebview
82+ jsaddle >= 0.9.6 && < 0.10,
83+ jsaddle-warp >= 0.9.6 && < 0.10
3584 else
36− if flag(webkit2gtk)
85+ if os(osx) || os(ios)
3786 build-depends:
38− jsaddle-webkit2gtk
87+ data-default == 0.7.*,
88+ jsaddle >= 0.9.6 && < 0.10,
89+ jsaddle-wkwebview >= 0.9.6 && < 0.10
3990 else
40− build-depends:
41− jsaddle-webkitgtk
91+ if flag(wasm32)
92+ build-depends:
93+ jsaddle >= 0.9.6 && < 0.10,
94+ jsaddle-wasm >= 0.1 && < 0.2
95+ else
96+ if flag(webkit2gtk)
97+ build-depends:
98+ jsaddle-webkit2gtk >= 0.9.6 && < 0.10
99+ else
100+ if !os(android)
101+ build-depends:
102+ jsaddle-webkit2gtk >= 0.9.6 && < 0.10
42103
43104 exposed-modules:
44105 Reflex.Dom
45106 Reflex.Dom.Internal
46107 reexported-modules:
47− Foreign.JavaScript.TH
48− , Foreign.JavaScript.Orphans
108+ Foreign.JavaScript.Orphans
109+ , Foreign.JavaScript.TH
110+ , Foreign.JavaScript.Utils
49111 , Reflex.Dom.Builder.Class
50112 , Reflex.Dom.Builder.Class.Events
113+ , Reflex.Dom.Builder.Hydratable
51114 , Reflex.Dom.Builder.Immediate
52115 , Reflex.Dom.Builder.InputDisabled
53116 , Reflex.Dom.Builder.Static
@@ -55,17 +118,94 @@ library
55118 , Reflex.Dom.Core
56119 , Reflex.Dom.Location
57120 , Reflex.Dom.Main
121+ , Reflex.Dom.Modals.Class
58122 , Reflex.Dom.Old
123+ , Reflex.Dom.Prerender
59124 , Reflex.Dom.Time
60125 , Reflex.Dom.WebSocket
126+ , Reflex.Dom.WebSocket.Query
61127 , Reflex.Dom.Widget
62128 , Reflex.Dom.Widget.Basic
63129 , Reflex.Dom.Widget.Input
64130 , Reflex.Dom.Widget.Lazy
65131 , Reflex.Dom.Widget.Resize
66132 , Reflex.Dom.Xhr
67−
133+ , Reflex.Dom.Xhr.FormData
68134 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
135+ if flag(expose-all-unfoldings)
136+ ghc-options: -fexpose-all-unfoldings
137+ if flag(use-reflex-optimizer)
138+ ghc-options: -fplugin=Reflex.Optimizer
139+ default-language: Haskell2010
140+
141+executable sortableList
142+ build-depends: base
143+ , containers
144+ , dependent-map
145+ , lens
146+ , mtl
147+ , random
148+ , reflex
149+ , reflex-dom
150+ , text
151+ , time
152+ , transformers
153+ hs-source-dirs: examples
154+ main-is: sortableList.hs
155+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
156+ if !flag(build-examples)
157+ buildable: False
158+ if flag(expose-all-unfoldings)
159+ ghc-options: -fexpose-all-unfoldings
160+ if flag(use-reflex-optimizer)
161+ ghc-options: -fplugin=Reflex.Optimizer
162+ default-language: Haskell2010
163+
164+executable benchmark
165+ build-depends: base
166+ , containers
167+ , dependent-map
168+ , dependent-sum
169+ , ghc-prim
170+ , ghcjs-dom
171+ , mtl
172+ , prim-uniq
173+ , random
174+ , reflex
175+ , reflex-dom
176+ , text
177+ , transformers
178+ hs-source-dirs: .
179+ main-is: benchmark.hs
180+ ghc-options: -O2 -fspecialise-aggressively
181+ if !impl(ghcjs)
182+ buildable: False
183+ default-language: Haskell2010
184+
185+executable krausest
186+ build-depends: base
187+ , containers
188+ , dependent-map
189+ , dependent-sum
190+ , ghc-prim
191+ , ghcjs-dom
192+ , mtl
193+ , prim-uniq
194+ , random
195+ , reflex
196+ , reflex-dom
197+ , text
198+ , transformers
199+ , vector
200+ hs-source-dirs: benchmarks
201+ main-is: krausest.hs
202+ ghc-options: -O2 -fspecialise-aggressively
203+ if impl(ghcjs)
204+ ghcjs-options: -dedupe
205+ cpp-options: -DGHCJS_BROWSER -DGHCJS_GC_INTERVAL=60000
206+ else
207+ buildable: False
208+ default-language: Haskell2010
69209
70210source-repository head
71211 type: git
reflex-dom/src-android/Reflex/Dom/Android/MainWidget.hscnew file+117
@@ -0,0 +1,117 @@
1+{-# LANGUAGE ForeignFunctionInterface #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+module Reflex.Dom.Android.MainWidget
4+ ( startMainWidget
5+ ) where
6+
7+import Android.HaskellActivity
8+import Control.Concurrent
9+import Control.Monad
10+import Data.Aeson
11+import Data.ByteString (ByteString)
12+import qualified Data.ByteString as BS
13+import qualified Data.ByteString.Lazy as LBS
14+import qualified Data.ByteString.Unsafe as BSU
15+import Data.IORef
16+import Data.Monoid
17+import Foreign.C.String
18+import Foreign.C.Types
19+import Foreign.Marshal.Utils
20+import Foreign.Marshal.Array
21+import Foreign.Ptr
22+import Foreign.Storable
23+import Language.Javascript.JSaddle (JSM)
24+import Language.Javascript.JSaddle.Run (runJavaScript)
25+import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers)
26+
27+#include "MainWidget.h"
28+
29+
30+startMainWidget :: HaskellActivity -> ByteString -> JSM () -> IO ()
31+startMainWidget a url jsm = do
32+ --TODO: Find a way to eventually release this
33+ executorRef <- newIORef $ error "startMainWidget: executor not created yet"
34+ let go batch = do
35+ executor <- readIORef executorRef
36+ BSU.unsafeUseAsCStringLen (LBS.toStrict $ "runJSaddleBatch(" <> encode batch <> ");") $ \(cstr, len) -> do
37+ runJS executor cstr (fromIntegral len)
38+ (processResult, processSyncResult, start) <- runJavaScript go jsm
39+ callbacks <- new <=< jsaddleCallbacksToPtrs $ JSaddleCallbacks
40+ { _jsaddleCallbacks_jsaddleStart = void $ forkIO start
41+ , _jsaddleCallbacks_jsaddleResult = \s -> do
42+ case decode $ LBS.fromStrict s of
43+ Nothing -> error $ "jsaddle message decode failed: " <> show s
44+ Just r -> processResult r
45+ , _jsaddleCallbacks_jsaddleSyncResult = \s -> do
46+ case decode $ LBS.fromStrict s of
47+ Nothing -> error $ "jsaddle message decode failed: " <> show s
48+ Just r -> LBS.toStrict . encode <$> processSyncResult r
49+ , _jsaddleCallbacks_jsaddleJsData = LBS.toStrict $ ghcjsHelpers <> "\
50+ \runJSaddleBatch = (function() {\n\
51+ \ " <> initState <> "\n\
52+ \ return function(batch) {\n\
53+ \ " <> runBatch (\a -> "jsaddle.postMessage(JSON.stringify(" <> a <> "));")
54+ (Just (\a -> "JSON.parse(jsaddle.syncMessage(JSON.stringify(" <> a <> ")))")) <> "\
55+ \ };\n\
56+ \})();\n\
57+ \jsaddle.postReady();\n"
58+ }
59+ BS.useAsCString url $ \curl -> do
60+ writeIORef executorRef =<< startMainWidget_ a curl callbacks
61+
62+newtype JSExecutor = JSExecutor { unJSExecutor :: Ptr JSExecutor }
63+
64+foreign import ccall safe "Reflex_Dom_Android_MainWidget_start" startMainWidget_ :: HaskellActivity -> CString -> Ptr JSaddleCallbacksPtrs -> IO JSExecutor
65+
66+foreign import ccall safe "Reflex_Dom_Android_MainWidget_runJS" runJS :: JSExecutor -> CString -> CSize -> IO ()
67+
68+data JSaddleCallbacks = JSaddleCallbacks
69+ { _jsaddleCallbacks_jsaddleStart :: IO ()
70+ , _jsaddleCallbacks_jsaddleResult :: ByteString -> IO ()
71+ , _jsaddleCallbacks_jsaddleSyncResult :: ByteString -> IO ByteString
72+ , _jsaddleCallbacks_jsaddleJsData :: ByteString
73+ }
74+
75+data JSaddleCallbacksPtrs = JSaddleCallbacksPtrs
76+ { _jsaddleCallbacksPtrs_jsaddleStart :: !(FunPtr (IO ()))
77+ , _jsaddleCallbacksPtrs_jsaddleResult :: !(FunPtr (CString -> CSize -> IO ()))
78+ , _jsaddleCallbacksPtrs_jsaddleSyncResult :: !(FunPtr (CString -> CSize -> Ptr CString -> Ptr CSize -> IO ()))
79+ , _jsaddleCallbacksPtrs_jsaddleJsData :: !CString
80+ }
81+
82+foreign import ccall "wrapper" wrapIO :: IO () -> IO (FunPtr (IO ()))
83+foreign import ccall "wrapper" wrapCStringCSizeIO :: (CString -> CSize -> IO ()) -> IO (FunPtr (CString -> CSize -> IO ()))
84+foreign import ccall "wrapper" wrapCStringCSizeCStringCSizeIO :: (CString -> CSize -> Ptr CString -> Ptr CSize -> IO ()) -> IO (FunPtr (CString -> CSize -> Ptr CString -> Ptr CSize -> IO ()))
85+
86+newCStringFromByteString :: ByteString -> IO (CString, CSize)
87+newCStringFromByteString bs = BSU.unsafeUseAsCStringLen bs $ \(src, len) -> do
88+ dest <- mallocArray0 len
89+ copyArray dest src len
90+ poke (advancePtr dest len) 0
91+ return (dest, fromIntegral len)
92+
93+jsaddleCallbacksToPtrs :: JSaddleCallbacks -> IO JSaddleCallbacksPtrs
94+jsaddleCallbacksToPtrs jc = JSaddleCallbacksPtrs
95+ <$> wrapIO (_jsaddleCallbacks_jsaddleStart jc)
96+ <*> wrapCStringCSizeIO (\cstr len -> _jsaddleCallbacks_jsaddleResult jc =<< BS.packCStringLen (cstr, fromIntegral len))
97+ <*> wrapCStringCSizeCStringCSizeIO (\cstr len result resultLen -> do
98+ inStr <- BS.packCStringLen (cstr, fromIntegral len)
99+ outStr <- _jsaddleCallbacks_jsaddleSyncResult jc inStr
100+ (outStrBytes, outStrLen) <- newCStringFromByteString outStr
101+ poke result outStrBytes
102+ poke resultLen outStrLen)
103+ <*> (fst <$> newCStringFromByteString (_jsaddleCallbacks_jsaddleJsData jc))
104+
105+instance Storable JSaddleCallbacksPtrs where
106+ sizeOf _ = #{size JSaddleCallbacks}
107+ alignment _ = #{alignment JSaddleCallbacks}
108+ poke p jc = do
109+ #{poke JSaddleCallbacks, jsaddleStart} p $ _jsaddleCallbacksPtrs_jsaddleStart jc
110+ #{poke JSaddleCallbacks, jsaddleResult} p $ _jsaddleCallbacksPtrs_jsaddleResult jc
111+ #{poke JSaddleCallbacks, jsaddleSyncResult} p $ _jsaddleCallbacksPtrs_jsaddleSyncResult jc
112+ #{poke JSaddleCallbacks, jsaddleJsData} p $ _jsaddleCallbacksPtrs_jsaddleJsData jc
113+ peek p = JSaddleCallbacksPtrs
114+ <$> #{peek JSaddleCallbacks, jsaddleStart} p
115+ <*> #{peek JSaddleCallbacks, jsaddleResult} p
116+ <*> #{peek JSaddleCallbacks, jsaddleSyncResult} p
117+ <*> #{peek JSaddleCallbacks, jsaddleJsData} p
reflex-dom/src/Reflex/Dom.hs+8−4
@@ -1,7 +1,11 @@
1+-- Disable haddocks on this module due to a bug on haddocks when selectively
2+-- reexporting on ghc > 8.2.
3+-- https://github.com/haskell/haddock/issues/979
4+{-# OPTIONS_HADDOCK hide, prune, ignore-exports #-}
15module Reflex.Dom (module X) where
26
3−import Reflex.Dom.Core as X hiding
4− (mainWidget, mainWidgetWithHead, mainWidgetWithCss,
5− mainWidgetWithHead', mainWidgetInElementById, runApp')
7+import Foreign.JavaScript.Orphans ()
8+import Reflex.Dom.Core as X hiding (mainWidget, mainWidgetInElementById, mainWidgetWithCss,
9+ mainWidgetWithHead, mainWidgetWithHead', runApp',
10+ mainHydrationWidgetWithHead, mainHydrationWidgetWithHead')
611import Reflex.Dom.Internal as X
7−
reflex-dom/src/Reflex/Dom/Internal.hs+79−7
@@ -1,26 +1,90 @@
11{-# LANGUAGE CPP #-}
2+{-# LANGUAGE LambdaCase #-}
3+{-# LANGUAGE OverloadedStrings #-}
24{-# LANGUAGE RankNTypes #-}
35{-# LANGUAGE TypeFamilies #-}
46module Reflex.Dom.Internal
5− (module Main, run, mainWidget, mainWidgetWithHead, mainWidgetWithCss,
6− mainWidgetWithHead', mainWidgetInElementById, runApp') where
7+ ( module Main
8+ , run
9+ , mainWidget
10+ , mainWidgetWithHead, mainWidgetWithCss, mainWidgetWithHead', mainWidgetInElementById, runApp'
11+ , mainHydrationWidgetWithHead, mainHydrationWidgetWithHead'
12+ ) where
713
814import Data.ByteString (ByteString)
915import Data.Text (Text)
10−import Reflex.Spider (Spider)
1116import Reflex.Dom.Core (Widget)
1217import Reflex.Dom.Main as Main hiding
1318 (mainWidget, mainWidgetWithHead, mainWidgetWithCss,
14− mainWidgetWithHead', mainWidgetInElementById, runApp')
19+ mainWidgetWithHead', mainWidgetInElementById, runApp',
20+ mainHydrationWidgetWithHead, mainHydrationWidgetWithHead')
1521import qualified Reflex.Dom.Main as Main
1622 (mainWidget, mainWidgetWithHead, mainWidgetWithCss,
17− mainWidgetWithHead', mainWidgetInElementById, runApp')
23+ mainWidgetWithHead', mainWidgetInElementById, runApp',
24+ mainHydrationWidgetWithHead, mainHydrationWidgetWithHead')
1825
1926#if defined(ghcjs_HOST_OS)
2027run :: a -> a
2128run = id
29+#elif defined(MIN_VERSION_jsaddle_warp)
30+import Data.Maybe (maybe)
31+import Data.Monoid ((<>))
32+import Language.Javascript.JSaddle (JSM)
33+import qualified Language.Javascript.JSaddle.Warp as JW
34+import System.Environment (lookupEnv)
35+
36+run :: JSM () -> IO()
37+run jsm = do
38+ port <- maybe 3003 read <$> lookupEnv "JSADDLE_WARP_PORT"
39+ putStrLn $ "Running jsaddle-warp server on port " <> show port
40+ JW.run port jsm
2241#elif defined(MIN_VERSION_jsaddle_wkwebview)
42+#if defined(ios_HOST_OS)
43+import Data.Default
44+import Data.Monoid ((<>))
45+import Language.Javascript.JSaddle (JSM)
46+import Language.Javascript.JSaddle.WKWebView (run', mainBundleResourcePath)
47+import Language.Javascript.JSaddle.WKWebView.Internal (jsaddleMainHTMLWithBaseURL)
48+
49+-- TODO: upstream to jsaddle-wkwebview
50+run :: JSM () -> IO ()
51+run jsm = do
52+ let indexHtml = "<!DOCTYPE html><html><head></head><body></body></html>"
53+ baseUrl <- mainBundleResourcePath >>= \case
54+ Nothing -> do
55+ putStrLn "Reflex.Dom.run: unable to find main bundle resource path. Assets may not load properly."
56+ return ""
57+ Just p -> return $ "file://" <> p <> "/index.html"
58+ run' def $ jsaddleMainHTMLWithBaseURL indexHtml baseUrl jsm
59+#else
2360import Language.Javascript.JSaddle.WKWebView (run)
61+#endif
62+#elif defined(ANDROID)
63+import Android.HaskellActivity
64+import Control.Monad
65+import Control.Concurrent
66+import Data.Default
67+import Data.String
68+import Reflex.Dom.Android.MainWidget
69+import System.IO
70+import Language.Javascript.JSaddle (JSM)
71+
72+run :: JSM () -> IO ()
73+run jsm = do
74+ hSetBuffering stdout LineBuffering
75+ hSetBuffering stderr LineBuffering
76+ continueWithCallbacks $ def
77+ { _activityCallbacks_onCreate = \_ -> do
78+ a <- getHaskellActivity
79+ let startPage = fromString "file:///android_asset/index.html"
80+ startMainWidget a startPage jsm
81+ }
82+ forever $ threadDelay 1000000000
83+#elif defined(wasm32_HOST_ARCH)
84+import qualified Language.Javascript.JSaddle.Wasm as Wasm (run)
85+import Language.Javascript.JSaddle (JSM)
86+run :: JSM () -> IO ()
87+run = Wasm.run 0
2488#else
2589import Language.Javascript.JSaddle.WebKitGTK (run)
2690#endif
@@ -37,7 +101,7 @@ mainWidgetWithCss :: ByteString -> (forall x. Widget x ()) -> IO ()
37101mainWidgetWithCss css w = run $ Main.mainWidgetWithCss css w
38102{-# INLINE mainWidgetWithCss #-}
39103
40−mainWidgetWithHead' :: (forall x. (a -> Widget x b, b -> Widget x a)) -> IO ()
104+mainWidgetWithHead' :: (a -> Widget () b, b -> Widget () a) -> IO ()
41105mainWidgetWithHead' w = run $ Main.mainWidgetWithHead' w
42106{-# INLINE mainWidgetWithHead' #-}
43107
@@ -45,6 +109,14 @@ mainWidgetInElementById :: Text -> (forall x. Widget x ()) -> IO ()
45109mainWidgetInElementById eid w = run $ Main.mainWidgetInElementById eid w
46110{-# INLINE mainWidgetInElementById #-}
47111
48−runApp' :: (t ~ Spider) => (forall x. AppInput t -> Widget x (AppOutput t)) -> IO ()
112+runApp' :: (forall x. AppInput DomTimeline -> Widget x (AppOutput DomTimeline)) -> IO ()
49113runApp' app = run $ Main.runApp' app
50114{-# INLINE runApp' #-}
115+
116+mainHydrationWidgetWithHead :: (forall x. HydrationWidget x ()) -> (forall x. HydrationWidget x ()) -> IO ()
117+mainHydrationWidgetWithHead h b = run $ Main.mainHydrationWidgetWithHead h b
118+{-# INLINE mainHydrationWidgetWithHead #-}
119+
120+mainHydrationWidgetWithHead' :: HydrationWidget () () -> HydrationWidget () () -> IO ()
121+mainHydrationWidgetWithHead' h b = run $ Main.mainHydrationWidgetWithHead' h b
122+{-# INLINE mainHydrationWidgetWithHead' #-}
release.nixnew file+63
@@ -0,0 +1,63 @@
1+{ reflex-platform-fun ? import ./dep/reflex-platform
2+, supportedSystems ? ["x86_64-linux" "x86_64-darwin"]
3+}:
4+
5+let
6+ native-reflex-platform = reflex-platform-fun {};
7+ inherit (native-reflex-platform.nixpkgs) lib;
8+
9+ tests = system: import ./test { pkgs = (reflex-platform-fun { inherit system; }).nixpkgs; };
10+
11+ perPlatform = lib.genAttrs supportedSystems (system: let
12+ reflex-platform = reflex-platform-fun { inherit system; };
13+ compilers = [
14+ "ghc"
15+ "ghcjs"
16+ ] ++ lib.optionals (reflex-platform.androidSupport) [
17+ "ghcAndroidAarch64"
18+ "ghcAndroidAarch32"
19+ ] ++ lib.optionals (reflex-platform.iosSupport) [
20+ "ghcIosAarch64"
21+ ];
22+ compilerPkgs = lib.genAttrs compilers (ghc: let
23+ reflex-platform = reflex-platform-fun {
24+ inherit system;
25+ haskellOverlays = [
26+ # Use this package's source for reflex
27+ (self: super: {
28+ _dep = super._dep // {
29+ reflex-dom = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
30+ ".git"
31+ "dist"
32+ "dist-newstyle"
33+ ]) && !(builtins.elem path [
34+ ./CONTRIBUTING.md
35+ ./FAQ.md
36+ ./Quickref.md
37+ ./README.md
38+ ./release.nix
39+ ./test
40+ ])) ./.;
41+ };
42+ })
43+ ];
44+ };
45+ all = tests system // {
46+ inherit (reflex-platform.${ghc})
47+ reflex-dom-core
48+ reflex-dom
49+ ;
50+ };
51+ in all // {
52+ cache = reflex-platform.pinBuildInputs "reflex-${system}-${ghc}"
53+ (builtins.attrValues all);
54+ });
55+ in compilerPkgs // {
56+ cache = reflex-platform.pinBuildInputs "reflex-${system}"
57+ (map (a: a.cache) (builtins.attrValues compilerPkgs));
58+ });
59+
60+ metaCache = native-reflex-platform.pinBuildInputs "reflex-dom-everywhere"
61+ (map (a: a.cache) (builtins.attrValues perPlatform));
62+
63+in perPlatform // { inherit metaCache; }
test/default.nixnew file+10
@@ -0,0 +1,10 @@
1+{ pkgs ? (import ../dep/reflex-platform {}).nixpkgs }:
2+{
3+ test-reflex-dom-reexports = pkgs.runCommand "test-reflex-dom-reexports" {} (
4+ let
5+ ghc = pkgs.haskellPackages.ghcWithPackages (p: [p.Cabal]);
6+ in ''
7+ ${ghc}/bin/runhaskell ${./reflex-dom-reexports.hs} ${../reflex-dom/reflex-dom.cabal} ${../reflex-dom-core/reflex-dom-core.cabal}
8+ touch "$out"
9+ '');
10+}
test/reflex-dom-reexports.hsnew file+72
@@ -0,0 +1,72 @@
1+-- This tests that reflex-dom re-exports all of reflex-dom-core's modules.
2+-- Without this test they easily drift.
3+module Main where
4+
5+import Control.Monad (when)
6+import Data.List (intercalate)
7+import Data.Maybe (fromMaybe, isNothing, mapMaybe)
8+import qualified Data.Set as Set
9+import Distribution.Types.PackageName (mkPackageName)
10+import Distribution.Compiler (CompilerFlavor (GHC))
11+import Distribution.ModuleName (ModuleName, components)
12+import Distribution.PackageDescription.Parsec (parseGenericPackageDescription)
13+import qualified Distribution.Parsec.Common as Dist
14+import Distribution.Parsec.ParseResult (runParseResult)
15+import qualified Distribution.System as Dist
16+import Distribution.Types.BuildInfo (buildable, defaultExtensions, defaultLanguage, hsSourceDirs, options)
17+import Distribution.Types.CondTree (simplifyCondTree)
18+import Distribution.Types.GenericPackageDescription (ConfVar (Arch, Impl, OS), condLibrary)
19+import Distribution.Types.Library (exposedModules, libBuildInfo, reexportedModules)
20+import Distribution.Types.ModuleReexport (ModuleReexport, moduleReexportOriginalName, moduleReexportOriginalPackage)
21+import Distribution.Utils.Generic (toUTF8BS, readUTF8File)
22+import System.Environment (getArgs)
23+import qualified System.Info
24+
25+main :: IO ()
26+main = do
27+ [reflexDomFile, reflexDomCoreFile] <- getArgs
28+ (_, reflexDomReexports) <- parseCabalExports reflexDomFile
29+ (reflexDomCoreExports', _) <- parseCabalExports reflexDomCoreFile
30+
31+ let
32+ reflexDomCoreExports = Set.fromList reflexDomCoreExports'
33+ reflexDomCorePackageName = mkPackageName "reflex-dom-core"
34+ reflexDomReexportsFromCore
35+ = Set.fromList
36+ $ mapMaybe (\x -> if let origPackage = moduleReexportOriginalPackage x
37+ in isNothing origPackage || origPackage == Just reflexDomCorePackageName
38+ then Just $ moduleReexportOriginalName x
39+ else Nothing
40+ )
41+ reflexDomReexports
42+
43+ when (reflexDomCoreExports /= reflexDomReexportsFromCore) $ do
44+ error $ intercalate "\n\t"
45+ $ "reflex-dom does not re-export the following modules from reflex-dom-core:"
46+ : map
47+ (intercalate "." . components)
48+ (Set.toAscList $ reflexDomCoreExports `Set.difference` reflexDomReexportsFromCore)
49+
50+ putStrLn "Test passed."
51+
52+parseCabalExports :: FilePath -> IO ([ModuleName], [ModuleReexport])
53+parseCabalExports file = do
54+ contents <- readUTF8File file
55+ let
56+ (warnings, result) = runParseResult $ parseGenericPackageDescription $ toUTF8BS contents
57+ osConfVar = case System.Info.os of
58+ "linux" -> Just Dist.Linux
59+ "darwin" -> Just Dist.OSX
60+ _ -> error "Unrecognized System.Info.os"
61+ archConfVar = Just Dist.X86_64
62+ evalConfVar v = Right $ case v of
63+ OS osVar -> Just osVar == osConfVar
64+ Arch archVar -> Just archVar == archConfVar
65+ Impl GHC _ -> True
66+ _ -> False
67+ pure $ case condLibrary <$> result of
68+ Right (Just condLib) ->
69+ let (_, lib) = simplifyCondTree evalConfVar condLib
70+ in (exposedModules lib, reexportedModules lib)
71+ Right Nothing -> error $ "Haskell package has no library component: " <> file
72+ Left (_, errors) -> error $ "Failed to parse " <> file <> ":\n" <> unlines (map show errors)