on develop help sign in
62 files changed+2660−1211
since splitsnapshots
unifiedsplit
.github/workflows/haskell.yml+47 CONTRIBUTING.md+65 FAQ.md+31 LICENSE+12 README.md+11−10 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 hydra.json−29 jobsets.nix−70 reflex-dom-core/ChangeLog.md+94 reflex-dom-core/LICENSE+1−1 reflex-dom-core/default.nix−58 reflex-dom-core/reflex-dom-core.cabal+77−36 reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+2 reflex-dom-core/src/Foreign/JavaScript/TH.hs+2−4 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+13−5 reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs+13−3 reflex-dom-core/src/Reflex/Dom/Builder/Hydratable.hs+116 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+225−133 reflex-dom-core/src/Reflex/Dom/Builder/InputDisabled.hs+6 reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+49−20 reflex-dom-core/src/Reflex/Dom/Class.hs+4−7 reflex-dom-core/src/Reflex/Dom/Core.hs+2 reflex-dom-core/src/Reflex/Dom/Main.hs+86−34 reflex-dom-core/src/Reflex/Dom/Old.hs−1 reflex-dom-core/src/Reflex/Dom/Prerender.hs+135−25 reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs+10−29 reflex-dom-core/src/Reflex/Dom/Widget/Input.hs+9−43 reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+2−2 reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+8−4 reflex-dom-core/src/Reflex/Dom/Xhr.hs+8−6 reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs+2−3 reflex-dom-core/src/Reflex/Dom/Xhr/FormData.hs+47 reflex-dom-core/test/gc.hs+12−11 reflex-dom-core/test/hlint.hs+3−1 reflex-dom-core/test/hydration.hs+842−457 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+2−1 reflex-dom/default.nix−37 reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java+14−1 reflex-dom/reflex-dom.cabal+76−28 reflex-dom/src/Reflex/Dom/Internal.hs+5 reflex-platform.nix−8 release.nix+61−10 test/default.nix+10 test/prebuild.hs−127 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.
README.md+11−10
@@ -1,22 +1,23 @@
11## [Reflex-DOM](https://reflex-frp.org)
2−### A Framework for Functional Reactive Web Apps in Haskell
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−A summary of Reflex-DOM functions is available in the [quick reference](Quickref.md).
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.
6+
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).
78
89**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)
12−
13−[/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
14−
15−[hackage](https://hackage.haskell.org/package/reflex)
1612
17−[irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
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)
1819
1920### Hacking
2021
21−Use the `./scripts/hack-on 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.
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.
2223Then 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) iproute 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
hydra.jsondeleted−29
@@ -1,29 +0,0 @@
1−{
2− "enabled": 1,
3− "hidden": true,
4− "description": "Jobsets",
5− "nixexprinput": "src",
6− "nixexprpath": "jobsets.nix",
7− "checkinterval": 300,
8− "schedulingshares": 100,
9− "enableemail": false,
10− "emailoverride": "",
11− "keepnr": 10,
12− "inputs": {
13− "src": {
14− "type": "git",
15− "value": "https://github.com/reflex-frp/reflex-dom.git develop",
16− "emailresponsible": false
17− },
18− "nixpkgs": {
19− "type": "git",
20− "value": "https://github.com/NixOS/nixpkgs-channels nixos-unstable",
21− "emailresponsible": false
22− },
23− "prs": {
24− "type": "githubpulls",
25− "value": "reflex-frp reflex-dom",
26− "emailresponsible": false
27− }
28− }
29−}
jobsets.nixdeleted−70
@@ -1,70 +0,0 @@
1−{ prs }:
2−
3−let
4− pkgs = (import ./reflex-platform.nix {}).nixpkgs;
5− mkFetchGithub = value: {
6− inherit value;
7− type = "git";
8− emailresponsible = false;
9− };
10−in
11−with pkgs.lib;
12−let
13− defaults = jobs: {
14− inherit (jobs) description;
15− enabled = 1;
16− hidden = false;
17− keepnr = 10;
18− schedulingshares = 100;
19− checkinterval = 120;
20− enableemail = false;
21− emailoverride = "";
22− nixexprinput = "reflex-dom";
23− nixexprpath = "release.nix";
24− inputs = jobs.inputs // {
25− nixpkgs = {
26− type = "git";
27− value = "https://github.com/NixOS/nixpkgs-channels nixos-unstable";
28− emailresponsible = false;
29− };
30− config = {
31− type = "nix";
32− value = "{ android_sdk.accept_license = true; }";
33− emailresponsible = false;
34− };
35− };
36− };
37− branchJobset = branch: defaults {
38− description = "reflex-dom-${branch}";
39− inputs = {
40− reflex-dom = {
41− value = "https://github.com/reflex-frp/reflex-dom ${branch}";
42− type = "git";
43− emailresponsible = false;
44− };
45− };
46− };
47− makePr = num: info: {
48− name = "reflex-dom-pr-${num}";
49− value = defaults {
50− description = "#${num}: ${info.title}";
51− inputs = {
52− reflex-dom = {
53− #NOTE: This should really use "pull/${num}/merge"; however, GitHub's
54− #status checks only operate on PR heads. This creates a race
55− #condition, which can currently only be solved by requiring PRs to be
56− #up to date before they're merged. See
57− #https://github.com/isaacs/github/issues/1002
58− value = "https://github.com/reflex-frp/reflex-dom pull/${num}/head";
59− type = "git";
60− emailresponsible = false;
61− };
62− };
63− };
64− };
65− processedPrs = mapAttrs' makePr (builtins.fromJSON (builtins.readFile prs));
66− jobsetsAttrs = processedPrs //
67− genAttrs ["develop"] branchJobset;
68−in {
69− jobsets = pkgs.writeText "spec.json" (builtins.toJSON jobsetsAttrs);
70−}
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−58
@@ -1,58 +0,0 @@
1−{ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder
2−, bytestring, constraints, constraints-extras, containers
3−, contravariant, data-default, dependent-map, dependent-sum
4−, dependent-sum-template, directory, exception-transformers
5−, exceptions, filepath, ghcjs-dom, hlint, hspec, hspec-webdriver, http-types, HUnit
6−, jsaddle, jsaddle-warp, keycode, lens, lifted-base, linux-namespaces
7−, monad-control, mtl, network, network-uri, primitive, process
8−, random, ref-tf, reflex, semigroups, silently, stdenv, stm
9−, template-haskell, temporary, text, these, transformers, unix, wai
10−, wai-websockets, warp, webdriver, websockets, zenc
11−, ghc, iproute, chromium, hashable, selenium-server-standalone, which, fontconfig
12−}:
13−let addGcTestDepends = drv: if (stdenv.system != "x86_64-linux" || stdenv.hostPlatform != stdenv.buildPlatform || (ghc.isGhcjs or false)) then drv else drv // {
14− # The headless browser run as part of gc tests would hang/crash without this
15− preCheck = ''
16− export FONTCONFIG_PATH=${fontconfig.out}/etc/fonts
17− '';
18− testHaskellDepends = (drv.testHaskellDepends or []) ++ [ temporary jsaddle-warp process linux-namespaces ];
19− testSystemDepends = (drv.testSystemDepends or []) ++ [ chromium iproute ];
20− };
21−in mkDerivation (addGcTestDepends {
22− pname = "reflex-dom-core";
23− version = "0.4";
24− src = ./.;
25− libraryHaskellDepends = [
26− aeson base bifunctors bimap blaze-builder bytestring constraints
27− containers contravariant data-default dependent-map dependent-sum
28− dependent-sum-template directory exception-transformers ghcjs-dom
29− jsaddle keycode lens monad-control mtl network-uri primitive random
30− ref-tf reflex semigroups stm template-haskell text these
31− transformers unix zenc
32− ] ++ (if ghc.isGhcjs or false then [
33− hashable
34− ] else []);
35−
36− #TODO: Get hlint working for cross-compilation
37− doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
38−
39− # The headless browser run as part of the tests will exit without this
40− preBuild = ''
41− export HOME="$PWD"
42− '';
43−
44− # Show some output while running tests, so we might notice what's wrong
45− testTarget = "--show-details=streaming";
46−
47− testSystemDepends = [ selenium-server-standalone which ];
48− testHaskellDepends = [
49− aeson base bytestring constraints constraints-extras containers
50− dependent-map dependent-sum dependent-sum-template directory
51− exceptions filepath ghcjs-dom hlint hspec hspec-webdriver http-types HUnit jsaddle
52− jsaddle-warp lens lifted-base linux-namespaces network process random reflex
53− silently temporary text unix wai wai-websockets warp webdriver
54− websockets
55− ];
56− description = "Functional Reactive Web Apps with Reflex";
57− license = stdenv.lib.licenses.bsd3;
58−})
reflex-dom-core/reflex-dom-core.cabal+77−36
@@ -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,7 +20,6 @@ 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
1424extra-source-files: src-ghc/Foreign/JavaScript/Internal/Utils.hs
1525 src-ghcjs/Foreign/JavaScript/Internal/Utils.hs
@@ -17,6 +27,7 @@ extra-source-files: src-ghc/Foreign/JavaScript/Internal/Utils.hs
1727 src/Reflex/Dom/WebSocket/Foreign.hs
1828 src/Reflex/Dom/Xhr/ResponseType.hs
1929 src/Reflex/Dom/Xhr/Exception.hs
30+ ChangeLog.md
2031
2132flag use-template-haskell
2233 description: Use template haskell to generate lenses
@@ -38,39 +49,54 @@ flag profile-reflex
3849 default: False
3950 manual: True
4051
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+
4167library
4268 hs-source-dirs: src
4369 build-depends:
44− aeson >= 0.8 && < 1.4,
45− base >= 4.7 && < 4.12,
70+ aeson >= 0.8 && < 1.6,
71+ base >= 4.7 && < 4.15,
4672 bifunctors >= 4.2 && < 6,
47− bimap >= 0.3 && < 0.4,
48− blaze-builder,
73+ bimap >= 0.3 && < 0.5,
74+ blaze-builder >= 0.4.1 && < 0.5,
4975 bytestring == 0.10.*,
50− containers == 0.5.*,
51− constraints >= 0.9 && < 0.11,
52− 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,
5380 data-default >= 0.5 && < 0.8,
54− dependent-map == 0.2.*,
55− dependent-sum >= 0.3 && < 0.5,
56− 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,
5784 directory >= 1.2 && < 1.4,
5885 exception-transformers == 0.4.*,
5986 ghcjs-dom >= 0.9.1.0 && < 0.10,
60− jsaddle >=0.9.0.0 && <0.10,
87+ jsaddle >= 0.9.0.0 && < 0.10,
6188 -- keycode-0.2 has a bug on firefox
6289 keycode >= 0.2.1 && < 0.3,
6390 lens >= 4.7 && < 5,
6491 monad-control >= 1.0.1 && < 1.1,
6592 mtl >= 2.1 && < 2.3,
66− primitive >= 0.5 && < 0.7,
67− random,
93+ primitive >= 0.5 && < 0.8,
94+ random >= 1.1 && < 1.2,
6895 ref-tf == 0.4.*,
69− reflex == 0.5.*,
70− semigroups >= 0.16 && < 0.19,
71− stm == 2.4.*,
96+ reflex >= 0.8 && < 0.9,
97+ semigroups >= 0.16 && < 0.20,
98+ stm >= 2.4 && < 2.6,
7299 text == 1.2.*,
73− these >= 0.4 && < 0.8,
74100 transformers >= 0.3 && < 0.6,
75101 network-uri >= 2.6.1 && < 2.7,
76102 zenc == 0.1.*
@@ -79,12 +105,20 @@ library
79105 hs-source-dirs: src-ghcjs
80106 build-depends:
81107 ghcjs-base,
82− hashable == 1.2.*
108+ hashable >= 1.2 && < 1.4
83109 else
84110 hs-source-dirs: src-ghc
85111 if !os(windows)
86112 build-depends: unix == 2.7.*
87113
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+
88122 exposed-modules:
89123 Foreign.JavaScript.TH
90124 Foreign.JavaScript.Orphans
@@ -93,6 +127,7 @@ library
93127 Reflex.Dom.Builder.Class.Events
94128 Reflex.Dom.Builder.Immediate
95129 Reflex.Dom.Builder.InputDisabled
130+ Reflex.Dom.Builder.Hydratable
96131 Reflex.Dom.Builder.Static
97132 Reflex.Dom.Class
98133 Reflex.Dom.Core
@@ -110,6 +145,7 @@ library
110145 Reflex.Dom.Widget.Lazy
111146 Reflex.Dom.Widget.Resize
112147 Reflex.Dom.Xhr
148+ Reflex.Dom.Xhr.FormData
113149 other-modules:
114150 Foreign.JavaScript.Internal.Utils
115151 Reflex.Dom.WebSocket.Foreign
@@ -117,6 +153,7 @@ library
117153 Reflex.Dom.Xhr.ResponseType
118154 Reflex.Dom.Xhr.Exception
119155
156+ default-language: Haskell98
120157 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
121158 ghc-prof-options: -fprof-auto
122159
@@ -131,27 +168,28 @@ library
131168
132169 if flag(use-template-haskell)
133170 build-depends:
134− dependent-sum >= 0.3 && < 0.5,
135− dependent-sum-template >= 0.0.0.5 && < 0.1,
136− template-haskell
171+ dependent-sum-template >= 0.1 && < 0.2,
172+ template-haskell >= 2.12.0 && < 2.17
137173 other-extensions: TemplateHaskell
138174 cpp-options: -DUSE_TEMPLATE_HASKELL
139175 other-modules:
140176 Reflex.Dom.Builder.Class.TH
141− else
142− build-depends:
143− dependent-sum == 0.4.*
144177
145178test-suite hlint
146− build-depends: base, hlint
179+ build-depends:
180+ base,
181+ hlint >= 2.0 && < 4.0
147182 hs-source-dirs: test
148183 main-is: hlint.hs
149184 type: exitcode-stdio-1.0
185+ default-language: Haskell98
150186
151187test-suite hydration
152188 build-depends: base
153189 , aeson
190+ , async
154191 , bytestring
192+ , chrome-test-utils
155193 , constraints
156194 , constraints-extras
157195 , containers
@@ -163,6 +201,7 @@ test-suite hydration
163201 , filepath
164202 , ghcjs-dom
165203 , hspec
204+ , hspec-core
166205 , hspec-webdriver
167206 , http-types
168207 , HUnit
@@ -184,32 +223,34 @@ test-suite hydration
184223 , warp
185224 , webdriver
186225 , websockets
226+ , which
187227 hs-source-dirs: test
188− ghc-options: -threaded -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
228+ ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
189229 ghc-prof-options: -fprof-auto -optP-DPROFILING
190230 main-is: hydration.hs
191231 type: exitcode-stdio-1.0
192− if !os(linux) || !arch(x86_64)-- || impl(ghc >= 8.4.0)
232+ default-language: Haskell98
233+ if !os(linux) || !arch(x86_64) || flag(profile-reflex) || !flag(hydration-tests)
193234 buildable: False
194235
195236-- broken test on base 4.11 & ghc 8.4.3
196237-- needs to be updated for changes in GHC.Stats
197238test-suite gc
198239 build-depends: base
199− , reflex
200− , reflex-dom-core
240+ , chrome-test-utils
201241 , jsaddle
202242 , jsaddle-warp
203− , linux-namespaces
204243 , process
205− , temporary
206− , unix
244+ , reflex
245+ , reflex-dom-core
246+ , text
207247 hs-source-dirs: test
208248 ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
209249 ghc-prof-options: -fprof-auto -optP-DPROFILING
210250 main-is: gc.hs
211251 type: exitcode-stdio-1.0
212− if !os(linux) || !arch(x86_64)
252+ default-language: Haskell98
253+ if !os(linux) || !arch(x86_64) || !flag(gc-tests)
213254 buildable: False
214255
215256source-repository head
reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+2
@@ -1,6 +1,8 @@
11{-# OPTIONS_HADDOCK hide #-}
22{-# LANGUAGE CPP #-}
33{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE UndecidableInstances #-}
5+
46{-# OPTIONS_GHC -fno-warn-orphans #-}
57module Foreign.JavaScript.Orphans where
68
reflex-dom-core/src/Foreign/JavaScript/TH.hs+2−4
@@ -6,11 +6,9 @@
66{-# LANGUAGE FlexibleInstances #-}
77{-# LANGUAGE FunctionalDependencies #-}
88{-# LANGUAGE GeneralizedNewtypeDeriving #-}
9−{-# LANGUAGE MultiParamTypeClasses #-}
109{-# LANGUAGE RankNTypes #-}
1110{-# LANGUAGE StandaloneDeriving #-}
1211{-# LANGUAGE TypeFamilies #-}
13−{-# LANGUAGE TypeSynonymInstances #-}
1412{-# LANGUAGE UndecidableInstances #-}
1513#ifdef USE_TEMPLATE_HASKELL
1614{-# LANGUAGE TemplateHaskell #-}
@@ -294,7 +292,7 @@ class Monad m => MonadJS x m | m -> x where
294292#ifdef ghcjs_HOST_OS
295293
296294data JSCtx_IO
297−type HasJS' = HasJS JSCtx_IO
295+type JS' = JSCtx_IO
298296
299297instance MonadIO m => HasJS JSCtx_IO (WithJSContextSingleton x m) where
300298 type JSX (WithJSContextSingleton x m) = IO
@@ -345,7 +343,7 @@ foreign import javascript unsafe "function(){ return $1(arguments); }" funWithAr
345343#else
346344
347345data JSCtx_JavaScriptCore x
348−type HasJS' = HasJS (JSCtx_JavaScriptCore ())
346+type JS' = JSCtx_JavaScriptCore ()
349347
350348instance IsJSContext (JSCtx_JavaScriptCore x) where
351349 newtype JSRef (JSCtx_JavaScriptCore x) = JSRef_JavaScriptCore { unJSRef_JavaScriptCore :: JSVal }
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+13−5
@@ -9,12 +9,12 @@
99{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1010#if !MIN_VERSION_base(4,9,0)
1111{-# LANGUAGE ImpredicativeTypes #-}
12+#else
13+{-# LANGUAGE Rank2Types #-} -- Implied by ImpredicativeTypes
1214#endif
1315{-# LANGUAGE LambdaCase #-}
14−{-# LANGUAGE MultiParamTypeClasses #-}
1516{-# LANGUAGE OverloadedStrings #-}
1617{-# LANGUAGE PolyKinds #-}
17−{-# LANGUAGE RankNTypes #-}
1818{-# LANGUAGE RecursiveDo #-}
1919{-# LANGUAGE ScopedTypeVariables #-}
2020{-# LANGUAGE StandaloneDeriving #-}
@@ -192,7 +192,7 @@ data CommentNodeConfig t
192192 }
193193
194194#ifndef USE_TEMPLATE_HASKELL
195−commentNodeConfig_initialContents :: Lens' (CommentNodeConfig t) Comment
195+commentNodeConfig_initialContents :: Lens' (CommentNodeConfig t) Text
196196commentNodeConfig_initialContents f (CommentNodeConfig a b) = (\a' -> CommentNodeConfig a' b) <$> f a
197197{-# INLINE commentNodeConfig_initialContents #-}
198198#endif
@@ -618,7 +618,7 @@ instance (DomBuilder t m, MonadHold t m, MonadFix m, Semigroup w) => DomBuilder
618618 placeRawElement = lift . placeRawElement
619619 wrapRawElement e = lift . wrapRawElement e
620620
621−instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive q) => DomBuilder t (QueryT t q m) where
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
622622 type DomBuilderSpace (QueryT t q m) = DomBuilderSpace m
623623 textNode = liftTextNode
624624 commentNode = liftCommentNode
@@ -639,7 +639,7 @@ instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive
639639
640640-- * Convenience functions
641641
642−class HasDomEvent t target eventName where
642+class HasDomEvent t target eventName | target -> t where
643643 type DomEventType target eventName :: *
644644 domEvent :: EventName eventName -> target -> Event t (DomEventType target eventName)
645645
@@ -745,3 +745,11 @@ instance HasDocument m => HasDocument (DynamicWriterT t w m)
745745instance HasDocument m => HasDocument (PostBuildT t m)
746746instance HasDocument m => HasDocument (RequesterT t request response m)
747747instance 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+13−3
@@ -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 #-}
@@ -15,6 +14,7 @@ import Data.GADT.Compare.TH
1514import Data.GADT.Compare
1615 (GOrdering(..), (:~:)(..), GEq(..), GCompare(..))
1716#endif
17+import Data.Text (Text)
1818
1919data EventTag
2020 = AbortTag
@@ -152,7 +152,7 @@ type family EventResultType (en :: EventTag) :: * where
152152 EventResultType 'BeforecopyTag = ()
153153 EventResultType 'CopyTag = ()
154154 EventResultType 'BeforepasteTag = ()
155− EventResultType 'PasteTag = ()
155+ EventResultType 'PasteTag = Maybe Text
156156 EventResultType 'ResetTag = ()
157157 EventResultType 'SearchTag = ()
158158 EventResultType 'SelectstartTag = ()
@@ -160,7 +160,17 @@ type family EventResultType (en :: EventTag) :: * where
160160 EventResultType 'TouchmoveTag = TouchEventResult
161161 EventResultType 'TouchendTag = TouchEventResult
162162 EventResultType 'TouchcancelTag = TouchEventResult
163− 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)
164174
165175data TouchEventResult = TouchEventResult
166176 { _touchEventResult_altKey :: Bool
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+225−133
@@ -2,7 +2,6 @@
22{-# LANGUAGE CPP #-}
33{-# LANGUAGE ConstraintKinds #-}
44{-# LANGUAGE DataKinds #-}
5−{-# LANGUAGE DeriveFunctor #-}
65{-# LANGUAGE DeriveTraversable #-}
76{-# LANGUAGE EmptyDataDecls #-}
87{-# LANGUAGE FlexibleContexts #-}
@@ -49,6 +48,7 @@ module Reflex.Dom.Builder.Immediate
4948 , HydrationMode (..)
5049 , HydrationRunnerT (..)
5150 , runHydrationRunnerT
51+ , runHydrationRunnerTWithFailure
5252 , ImmediateDomBuilderT
5353 , runHydrationDomBuilderT
5454 , getHydrationMode
@@ -86,9 +86,6 @@ module Reflex.Dom.Builder.Immediate
8686 , ghcjsEventSpec_filters
8787 , ghcjsEventSpec_handler
8888 , GhcjsEventHandler (..)
89−#ifndef USE_TEMPLATE_HASKELL
90− , phantom2
91−#endif
9289 , drawChildUpdate
9390 , ChildReadyState (..)
9491 , mkHasFocus
@@ -110,6 +107,9 @@ module Reflex.Dom.Builder.Immediate
110107 , WindowConfig (..)
111108 , Window (..)
112109 , wrapWindow
110+ -- * Attributes for controlling hydration
111+ , hydratableAttribute
112+ , skipHydrationAttribute
113113 -- * Internal
114114 , traverseDMapWithKeyWithAdjust'
115115 , hoistTraverseWithKeyWithAdjust
@@ -135,15 +135,20 @@ import Data.Functor.Compose
135135import Data.Functor.Constant
136136import Data.Functor.Misc
137137import Data.Functor.Product
138+import Data.GADT.Compare (GCompare)
138139import Data.IORef
139140import Data.IntMap.Strict (IntMap)
140141import Data.Maybe
142+import Data.Monoid ((<>))
141143import Data.Some (Some(..))
144+import Data.GADT.Compare (GCompare)
145+import Data.String (IsString)
142146import Data.Text (Text)
143147import Foreign.JavaScript.Internal.Utils
144148import Foreign.JavaScript.TH
149+import GHCJS.DOM.ClipboardEvent as ClipboardEvent
145150import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode, createComment)
146−import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute, hasAttributeNS)
151+import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute)
147152import GHCJS.DOM.EventM (EventM, event, on)
148153import GHCJS.DOM.KeyboardEvent as KeyboardEvent
149154import GHCJS.DOM.MouseEvent
@@ -162,6 +167,9 @@ import Reflex.PerformEvent.Base (PerformEventT)
162167import Reflex.PerformEvent.Class
163168import Reflex.PostBuild.Base (PostBuildT)
164169import Reflex.PostBuild.Class
170+#ifdef PROFILE_REFLEX
171+import Reflex.Profiled
172+#endif
165173import Reflex.Requester.Base
166174import Reflex.Requester.Class
167175import Reflex.Spider (Spider, SpiderHost, Global)
@@ -174,6 +182,7 @@ import qualified Data.IntMap.Strict as IntMap
174182import qualified Data.Map as Map
175183import qualified Data.Text as T
176184import qualified GHCJS.DOM as DOM
185+import qualified GHCJS.DOM.DataTransfer as DataTransfer
177186import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
178187import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
179188import qualified GHCJS.DOM.Element as Element
@@ -191,6 +200,7 @@ import qualified GHCJS.DOM.TouchEvent as TouchEvent
191200import qualified GHCJS.DOM.TouchList as TouchList
192201import qualified GHCJS.DOM.Types as DOM
193202import qualified GHCJS.DOM.Window as Window
203+import qualified GHCJS.DOM.WheelEvent as WheelEvent
194204import qualified Reflex.Patch.DMap as PatchDMap
195205import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
196206import qualified Reflex.Patch.MapWithMove as PatchMapWithMove
@@ -198,6 +208,7 @@ import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
198208
199209#ifndef USE_TEMPLATE_HASKELL
200210import Data.Functor.Contravariant (phantom)
211+import Control.Lens (Lens', Getter)
201212#endif
202213
203214#ifndef ghcjs_HOST_OS
@@ -283,12 +294,21 @@ localRunner (HydrationRunnerT m) s parent = do
283294runHydrationRunnerT
284295 :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
285296 => HydrationRunnerT t m a -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
286−runHydrationRunnerT (HydrationRunnerT m) s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do
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
287304 (a, s') <- runStateT m (HydrationState s False)
288305 traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
289306 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
290308 pure a
291309
310+
311+
292312instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where
293313 {-# INLINABLE newEventWithTrigger #-}
294314 newEventWithTrigger = lift . newEventWithTrigger
@@ -312,12 +332,11 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationRunnerT t m) where
312332-- done *before* the switchover to immediate mode - this is most likely some
313333-- form of 'hold' which we want to remove after hydration is done
314334{-# INLINABLE addHydrationStepWithSetup #-}
315−addHydrationStepWithSetup :: (Adjustable t m, MonadIO m) => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
335+addHydrationStepWithSetup :: MonadIO m => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
316336addHydrationStepWithSetup setup f = getHydrationMode >>= \case
317337 HydrationMode_Immediate -> pure ()
318338 HydrationMode_Hydrating -> do
319− switchover <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_switchover
320− (s, _) <- lift $ runWithReplace setup $ return () <$ switchover
339+ s <- lift setup
321340 addHydrationStep (f s)
322341
323342-- | Add a hydration step
@@ -345,7 +364,7 @@ runDomRenderHookT (DomRenderHookT a) events = do
345364 flip runTriggerEventT events $ do
346365 rec (result, req) <- runRequesterT a rsp
347366 rsp <- performEventAsync $ ffor req $ \rm f -> liftJSM $ runInAnimationFrame f $
348− traverseRequesterData (\r -> Identity <$> r) rm
367+ traverseRequesterData (fmap Identity) rm
349368 return result
350369 where
351370 runInAnimationFrame f x = void . DOM.inAnimationFrame' $ \_ -> do
@@ -360,7 +379,7 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (DomRenderHookT t m) where
360379 withRenderHook hook (DomRenderHookT a) = do
361380 DomRenderHookT $ withRequesting $ \rsp -> do
362381 (x, req) <- lift $ runRequesterT a $ runIdentity <$> rsp
363− return (ffor req $ \rm -> hook $ traverseRequesterData (\r -> Identity <$> r) rm, x)
382+ return (ffor req $ \rm -> hook $ traverseRequesterData (fmap Identity) rm, x)
364383 requestDomAction = DomRenderHookT . requestingIdentity
365384 requestDomAction_ = DomRenderHookT . requesting_
366385
@@ -527,17 +546,17 @@ wrap events e cfg = do
527546 return eventTriggerRefs
528547
529548{-# SPECIALIZE wrap
530− :: Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
549+ :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
531550 -> DOM.Element
532− -> RawElementConfig er Spider HydrationDomSpace
533− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (DMap EventName (EventFilterTriggerRef Spider er))
551+ -> RawElementConfig er DomTimeline HydrationDomSpace
552+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
534553 #-}
535554
536555{-# SPECIALIZE wrap
537− :: Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
556+ :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
538557 -> DOM.Element
539− -> RawElementConfig er Spider GhcjsDomSpace
540− -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (DMap EventName (EventFilterTriggerRef Spider er))
558+ -> RawElementConfig er DomTimeline GhcjsDomSpace
559+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
541560 #-}
542561
543562{-# INLINE triggerBody #-}
@@ -573,23 +592,23 @@ triggerBody ctx cfg events eventTriggerRefs e (WrapArg en) t = case DMap.lookup
573592
574593{-# SPECIALIZE triggerBody
575594 :: DOM.JSContextRef
576− -> RawElementConfig er Spider HydrationDomSpace
577− -> Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
578− -> DMap EventName (EventFilterTriggerRef Spider er)
595+ -> RawElementConfig er DomTimeline HydrationDomSpace
596+ -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
597+ -> DMap EventName (EventFilterTriggerRef DomTimeline er)
579598 -> DOM.Element
580599 -> WrapArg er EventName x
581− -> EventTrigger Spider x
600+ -> EventTrigger DomTimeline x
582601 -> IO (IO ())
583602 #-}
584603
585604{-# SPECIALIZE triggerBody
586605 :: DOM.JSContextRef
587− -> RawElementConfig er Spider GhcjsDomSpace
588− -> Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
589− -> DMap EventName (EventFilterTriggerRef Spider er)
606+ -> RawElementConfig er DomTimeline GhcjsDomSpace
607+ -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
608+ -> DMap EventName (EventFilterTriggerRef DomTimeline er)
590609 -> DOM.Element
591610 -> WrapArg er EventName x
592− -> EventTrigger Spider x
611+ -> EventTrigger DomTimeline x
593612 -> IO (IO ())
594613 #-}
595614
@@ -638,15 +657,11 @@ data GhcjsEventSpec er = GhcjsEventSpec
638657newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
639658
640659#ifndef USE_TEMPLATE_HASKELL
641−phantom2 :: (Functor f, Contravariant f) => f a -> f b
642−phantom2 = phantom
643−{-# INLINE phantom2 #-}
644−
645660ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
646661ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
647662{-# INLINE ghcjsEventSpec_filters #-}
648663ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
649−ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom2 (f b)
664+ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom (f b)
650665{-# INLINE ghcjsEventSpec_handler #-}
651666#endif
652667
@@ -694,16 +709,16 @@ elementImmediate elementTag cfg child = do
694709
695710{-# SPECIALIZE elementImmediate
696711 :: Text
697− -> ElementConfig er Spider HydrationDomSpace
698− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
699− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (Element er GhcjsDomSpace Spider, a)
712+ -> ElementConfig er DomTimeline HydrationDomSpace
713+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
714+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
700715 #-}
701716
702717{-# SPECIALIZE elementImmediate
703718 :: Text
704− -> ElementConfig er Spider GhcjsDomSpace
705− -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM a
706− -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (Element er GhcjsDomSpace Spider, a)
719+ -> ElementConfig er DomTimeline GhcjsDomSpace
720+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM a
721+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
707722 #-}
708723
709724-- For specialisation
@@ -740,11 +755,19 @@ elementInternal elementTag cfg child = getHydrationMode >>= \case
740755
741756{-# SPECIALIZE elementInternal
742757 :: Text
743− -> ElementConfig er Spider HydrationDomSpace
744− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
745− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (Element er HydrationDomSpace Spider, a)
758+ -> ElementConfig er DomTimeline HydrationDomSpace
759+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
760+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er HydrationDomSpace DomTimeline, a)
746761 #-}
747762
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+
748771{-# INLINE hydrateElement #-}
749772hydrateElement
750773 :: forall er t m a. (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
@@ -766,11 +789,15 @@ hydrateElement elementTag cfg child = do
766789 }
767790 result <- HydrationDomBuilderT $ lift $ runReaderT (unHydrationDomBuilderT child) env'
768791 wrapResult <- liftIO newEmptyMVar
769− let ssrAttr = "data-ssr" :: DOM.JSString
770− hasSSRAttribute :: DOM.Element -> HydrationRunnerT t m Bool
771− hasSSRAttribute e = case cfg ^. namespace of
772− Nothing -> hasAttribute e ssrAttr <* removeAttribute e ssrAttr
773− Just ns -> hasAttributeNS e (Just ns) ssrAttr <* removeAttributeNS e (Just ns) ssrAttr
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
774801 childDom <- liftIO $ readIORef childDelayedRef
775802 let rawCfg = extractRawElementConfig cfg
776803 doc <- askDocument
@@ -785,9 +812,9 @@ hydrateElement elementTag cfg child = do
785812 pure e
786813 Just node -> DOM.castTo DOM.Element node >>= \case
787814 Nothing -> go (Just node) -- this node is not an element, skip
788− Just e -> hasSSRAttribute e >>= \case
789− False -> go (Just node) -- this element was not added by the static renderer, skip
790− True -> do
815+ Just e -> shouldSkip e >>= \case
816+ True -> go (Just node) -- this element should be skipped by hydration
817+ False -> do
791818 t <- Element.getTagName e
792819 -- TODO: check attributes?
793820 if T.toCaseFold elementTag == T.toCaseFold t
@@ -830,9 +857,9 @@ hydrateElement elementTag cfg child = do
830857
831858{-# SPECIALIZE hydrateElement
832859 :: Text
833− -> ElementConfig er Spider HydrationDomSpace
834− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
835− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM ((Element er HydrationDomSpace Spider, a), IORef DOM.Element)
860+ -> ElementConfig er DomTimeline HydrationDomSpace
861+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
862+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM ((Element er HydrationDomSpace DomTimeline, a), IORef DOM.Element)
836863 #-}
837864
838865{-# INLINE inputElementImmediate #-}
@@ -910,14 +937,26 @@ inputElementInternal cfg = getHydrationMode >>= \case
910937 doc <- askDocument
911938 -- Expected initial value from config
912939 let v0 = _inputElementConfig_initialValue cfg
913− addHydrationStep $ do
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'
914948 domElement <- liftIO $ readIORef domElementRef
915949 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
916950 getValue = Input.getValue domInputElement
917− -- The browser might have messed with the value, or the user could have
918− -- altered it before activation, so we set it if it isn't what we expect
919− liftJSM getValue >>= \v0' -> do
920− when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
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
921960 -- Watch for user interaction and trigger event accordingly
922961 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
923962 for_ (_inputElementConfig_setValue cfg) $ \eSetValue ->
@@ -931,7 +970,17 @@ inputElementInternal cfg = getHydrationMode >>= \case
931970 ]
932971 liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
933972 requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
934− Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
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
935984 _ <- liftJSM $ domInputElement `on` Events.click $ do
936985 liftIO . triggerCheckedChangedByUI =<< Input.getChecked domInputElement
937986 for_ (_inputElementConfig_setChecked cfg) $ \eNewchecked ->
@@ -944,7 +993,7 @@ inputElementInternal cfg = getHydrationMode >>= \case
944993 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
945994 liftIO . triggerFileChange =<< maybe (return []) getMyFiles mfiles
946995 return ()
947− checked' <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
996+ checked' <- holdDyn c0 $ leftmost
948997 [ checkedChangedBySetChecked
949998 , checkedChangedByUI
950999 ]
@@ -1016,14 +1065,21 @@ textAreaElementInternal cfg = getHydrationMode >>= \case
10161065 doc <- askDocument
10171066 -- Expected initial value from config
10181067 let v0 = _textAreaElementConfig_initialValue cfg
1019− addHydrationStep $ do
1068+ valueAtSwitchover = maybe (pure $ pure v0) (hold v0) (_textAreaElementConfig_setValue cfg)
1069+ addHydrationStepWithSetup valueAtSwitchover $ \switchoverValue' -> do
1070+ switchoverValue <- sample switchoverValue'
10201071 domElement <- liftIO $ readIORef domElementRef
10211072 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
10221073 getValue = TextArea.getValue domTextAreaElement
1023− -- The browser might have messed with the value, or the user could have
1024− -- altered it before activation, so we set it if it isn't what we expect
1025− liftJSM getValue >>= \v0' -> do
1026− when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
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
10271083 -- Watch for user interaction and trigger event accordingly
10281084 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
10291085 for_ (_textAreaElementConfig_setValue cfg) $ \eSetValue ->
@@ -1272,8 +1328,8 @@ hydrateComment doc t mSetContents = do
12721328skipToAndReplaceComment
12731329 :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
12741330 => Text
1275− -> IORef Text
1276− -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef Text)
1331+ -> IORef (Maybe Text)
1332+ -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef (Maybe Text))
12771333skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
12781334 HydrationMode_Immediate -> do
12791335 -- If we're in immediate mode, we don't try to replace an existing comment,
@@ -1281,43 +1337,50 @@ skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
12811337 t <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
12821338 append $ toNode t
12831339 textNodeRef <- liftIO $ newIORef t
1284− keyRef <- liftIO $ newIORef ""
1340+ keyRef <- liftIO $ newIORef Nothing
12851341 pure (pure (), textNodeRef, keyRef)
12861342 HydrationMode_Hydrating -> do
12871343 doc <- askDocument
12881344 textNodeRef <- liftIO $ newIORef $ error "textNodeRef not yet initialized"
12891345 keyRef <- liftIO $ newIORef $ error "keyRef not yet initialized"
1290− let go key0 mLastNode = do
1291− parent <- askParent
1292− node <- maybe (Node.getFirstChildUnchecked parent) Node.getNextSiblingUnchecked mLastNode
1293− DOM.castTo DOM.Comment node >>= \case
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
12941357 Just comment -> do
1295− commentText <- Node.getTextContentUnchecked comment
1296− case T.stripPrefix (prefix <> key0) commentText of
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.
12971360 Just key -> do
12981361 -- Replace the comment with an (invisible) text node
12991362 tn <- createTextNode doc ("" :: Text)
13001363 Node.replaceChild_ parent tn comment
1301− pure (tn, key)
1364+ pure (tn, Just key)
13021365 Nothing -> do
1303− go key0 (Just node)
1366+ go (Just key0) (Just node)
13041367 Nothing -> do
1305− go key0 (Just node)
1306− switchComment = do
1307− key0 <- liftIO $ readIORef key0Ref
1308− (tn, key) <- go key0 =<< getPreviousNode
1309− setPreviousNode $ Just $ toNode tn
1310− liftIO $ do
1311− writeIORef textNodeRef tn
1312− writeIORef keyRef key
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
13131376 pure (switchComment, textNodeRef, keyRef)
13141377
13151378{-# INLINABLE skipToReplaceStart #-}
1316−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 Text)
1317−skipToReplaceStart = skipToAndReplaceComment "replace-start" =<< liftIO (newIORef "")
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.
13181381
13191382{-# INLINABLE skipToReplaceEnd #-}
1320−skipToReplaceEnd :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => IORef Text -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text)
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)
13211384skipToReplaceEnd key = fmap (\(m,e,_) -> (m,e)) $ skipToAndReplaceComment "replace-end" key
13221385
13231386instance SupportsHydrationDomBuilder t m => NotReady t (HydrationDomBuilderT s t m) where
@@ -1557,13 +1620,13 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
15571620 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
15581621 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
15591622 ChildReadyState_Unready _ -> do
1560− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
1623+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
15611624 return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)
15621625 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
15631626 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
15641627 deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)
15651628 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
1566− writeIORef sRef $ ChildReadyState_Unready $ This <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
1629+ writeIORef sRef $ ChildReadyState_Unready $ Some <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
15671630 return $ Constant ()
15681631 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
15691632 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
@@ -1573,8 +1636,8 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
15731636 phsBefore <- liftIO $ readIORef placeholders
15741637 let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
15751638 collectIfMoved k e = do
1576− let mThisPlaceholder = Map.lookup (This k) phsBefore -- Will be Nothing if this element wasn't present before
1577− nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phsBefore
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
15781641 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
15791642 False -> do
15801643 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
@@ -1593,7 +1656,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
15931656 PatchMapWithMove.From_Move k -> Just $ PatchMapWithMove.From_Move k
15941657 let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant () a)
15951658 placeFragment k e = do
1596− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phsAfter
1659+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsAfter
15971660 case PatchDMapWithMove._nodeInfo_from e of
15981661 PatchDMapWithMove.From_Insert (Compose (TraverseChild x _)) -> case x of
15991662 Left _ -> pure ()
@@ -1609,7 +1672,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16091672
16101673{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
16111674traverseDMapWithKeyWithAdjust'
1612− :: forall s t m (k :: * -> *) v v'. (Adjustable t m, MonadHold t m, MonadFix m, MonadJSM m, PrimMonad m, DMap.GCompare k, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
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)
16131676 => (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
16141677 -> DMap k v
16151678 -> Event t (PatchDMap k v)
@@ -1624,7 +1687,7 @@ traverseDMapWithKeyWithAdjust' = do
16241687 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
16251688 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
16261689 ChildReadyState_Unready _ -> do
1627− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
1690+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
16281691 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
16291692 delete _ (Constant sRef) = do
16301693 writeIORef sRef $ ChildReadyState_Unready Nothing
@@ -1635,9 +1698,9 @@ traverseDMapWithKeyWithAdjust' = do
16351698 hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholder (PatchDMap patch) -> do
16361699 phs <- liftIO $ readIORef placeholders
16371700 forM_ (DMap.toList patch) $ \(k :=> ComposeMaybe mv) -> do
1638− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phs
1701+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phs
16391702 -- Delete old node
1640− forM_ (Map.lookup (This k) phs) $ \thisPlaceholder -> do
1703+ forM_ (Map.lookup (Some k) phs) $ \thisPlaceholder -> do
16411704 thisPlaceholder `deleteUpTo` nextPlaceholder
16421705 -- Insert new node
16431706 forM_ mv $ \(Compose (TraverseChild e _)) -> case e of
@@ -1699,17 +1762,17 @@ traverseIntMapWithKeyWithAdjust' = do
16991762 liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
17001763
17011764{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1702− :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM v')
1765+ :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
17031766 -> IntMap v
1704− -> Event Spider (PatchIntMap v)
1705− -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
1767+ -> Event DomTimeline (PatchIntMap v)
1768+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
17061769 #-}
17071770
17081771{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1709− :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM v')
1772+ :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
17101773 -> IntMap v
1711− -> Event Spider (PatchIntMap v)
1712− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
1774+ -> Event DomTimeline (PatchIntMap v)
1775+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
17131776 #-}
17141777
17151778data ChildReadyState a
@@ -1729,7 +1792,7 @@ hoistTraverseWithKeyWithAdjust
17291792 ::
17301793 ( Adjustable t m
17311794 , MonadHold t m
1732− , DMap.GCompare k
1795+ , GCompare k
17331796 , MonadIO m
17341797 , MonadJSM m
17351798 , PrimMonad m
@@ -1787,7 +1850,7 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
17871850 liftIO $ writeIORef childReadyState ChildReadyState_Ready
17881851 case countedAt of
17891852 Nothing -> return ()
1790− Just (This k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
1853+ Just (Some k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
17911854 (oldUnready, p) <- liftIO $ readIORef pendingChange
17921855 when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
17931856 let newUnready = DMap.delete k oldUnready
@@ -1802,7 +1865,7 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18021865 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
18031866 ChildReadyState_Ready -> return Nothing
18041867 ChildReadyState_Unready _ -> do
1805− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
1868+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
18061869 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
18071870 initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
18081871 liftIO $ if DMap.null initialUnready
@@ -1813,14 +1876,14 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18131876 getHydrationMode >>= \case
18141877 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
18151878 dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children
1816− phs <- traverse id $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
1879+ phs <- sequenceA $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
18171880 liftIO $ writeIORef placeholders $! phs
18181881 insertAfterPreviousNode lastPlaceholder
18191882 HydrationMode_Immediate -> do
18201883 let activate i = do
18211884 append $ toNode $ _traverseChildImmediate_fragment i
18221885 pure $ _traverseChildImmediate_placeholder i
1823− phs <- traverse id $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
1886+ phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
18241887 liftIO $ writeIORef placeholders $! phs
18251888 append $ toNode lastPlaceholder
18261889 requestDomAction_ $ ffor children' $ \p -> do
@@ -1944,39 +2007,39 @@ hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_
19442007 return (result0, result')
19452008
19462009{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
1947− :: ((IntMap.Key -> v -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM Int v'))
2010+ :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
19482011 -> IntMap v
1949− -> Event Spider (PatchIntMap v)
1950− -> DomRenderHookT Spider HydrationM (IntMap (TraverseChild Spider HydrationM Int v'), Event Spider (PatchIntMap (TraverseChild Spider HydrationM Int v'))))
1951− -> (PatchIntMap (TraverseChild Spider HydrationM Int 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')
19522015 -> IntMap (IORef (ChildReadyState Int))
19532016 -> IO (IntMap (IORef (ChildReadyState Int))))
19542017 -> (IORef (IntMap DOM.Text)
19552018 -> DOM.Text
1956− -> PatchIntMap (TraverseChild Spider HydrationM Int v')
2019+ -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
19572020 -> JSM ())
1958− -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM v')
2021+ -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
19592022 -> IntMap v
1960− -> Event Spider (PatchIntMap v)
1961− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
2023+ -> Event DomTimeline (PatchIntMap v)
2024+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
19622025 #-}
19632026
19642027{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
1965− :: ((IntMap.Key -> v -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM Int v'))
2028+ :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
19662029 -> IntMap v
1967− -> Event Spider (PatchIntMap v)
1968− -> DomRenderHookT Spider HydrationM (IntMap (TraverseChild Spider HydrationM Int v'), Event Spider (PatchIntMap (TraverseChild Spider HydrationM Int v'))))
1969− -> (PatchIntMap (TraverseChild Spider HydrationM Int 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')
19702033 -> IntMap (IORef (ChildReadyState Int))
19712034 -> IO (IntMap (IORef (ChildReadyState Int))))
19722035 -> (IORef (IntMap DOM.Text)
19732036 -> DOM.Text
1974− -> PatchIntMap (TraverseChild Spider HydrationM Int v')
2037+ -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
19752038 -> JSM ())
1976− -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM v')
2039+ -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
19772040 -> IntMap v
1978− -> Event Spider (PatchIntMap v)
1979− -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
2041+ -> Event DomTimeline (PatchIntMap v)
2042+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
19802043 #-}
19812044
19822045data TraverseChildImmediate k = TraverseChildImmediate
@@ -2046,17 +2109,17 @@ drawChildUpdate initialEnv markReady child = do
20462109 }
20472110
20482111{-# SPECIALIZE drawChildUpdate
2049− :: HydrationDomBuilderEnv Spider HydrationM
2112+ :: HydrationDomBuilderEnv DomTimeline HydrationM
20502113 -> (IORef (ChildReadyState Int) -> JSM ())
2051− -> HydrationDomBuilderT s Spider HydrationM (Identity a)
2052− -> DomRenderHookT Spider HydrationM (Compose (TraverseChild Spider HydrationM Int) Identity a)
2114+ -> HydrationDomBuilderT s DomTimeline HydrationM (Identity a)
2115+ -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM Int) Identity a)
20532116 #-}
20542117
20552118{-# SPECIALIZE drawChildUpdate
2056− :: HydrationDomBuilderEnv Spider HydrationM
2119+ :: HydrationDomBuilderEnv DomTimeline HydrationM
20572120 -> (IORef (ChildReadyState (Some k)) -> JSM ())
2058− -> HydrationDomBuilderT s Spider HydrationM (f a)
2059− -> DomRenderHookT Spider HydrationM (Compose (TraverseChild Spider HydrationM (Some k)) f a)
2121+ -> HydrationDomBuilderT s DomTimeline HydrationM (f a)
2122+ -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM (Some k)) f a)
20602123 #-}
20612124
20622125{-# INLINABLE drawChildUpdateInt #-}
@@ -2068,10 +2131,10 @@ drawChildUpdateInt :: (MonadIO m, MonadJSM m, Reflex t)
20682131drawChildUpdateInt env mark m = fmap runIdentity . getCompose <$> drawChildUpdate env mark (Identity <$> m)
20692132
20702133{-# SPECIALIZE drawChildUpdateInt
2071− :: HydrationDomBuilderEnv Spider HydrationM
2134+ :: HydrationDomBuilderEnv DomTimeline HydrationM
20722135 -> (IORef (ChildReadyState k) -> JSM ())
2073− -> HydrationDomBuilderT s Spider HydrationM v
2074− -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM k v)
2136+ -> HydrationDomBuilderT s DomTimeline HydrationM v
2137+ -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM k v)
20752138 #-}
20762139
20772140{-# INLINE mkHasFocus #-}
@@ -2234,7 +2297,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
22342297 Beforecopy -> return ()
22352298 Copy -> return ()
22362299 Beforepaste -> return ()
2237− Paste -> return ()
2300+ Paste -> getPasteData
22382301 Reset -> return ()
22392302 Search -> return ()
22402303 Selectstart -> return ()
@@ -2243,7 +2306,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
22432306 Touchend -> getTouchEvent
22442307 Touchcancel -> getTouchEvent
22452308 Mousewheel -> return ()
2246− Wheel -> return ()
2309+ Wheel -> getWheelEvent
22472310
22482311{-# INLINABLE defaultDomWindowEventHandler #-}
22492312defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
@@ -2284,7 +2347,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
22842347 Beforecopy -> return ()
22852348 Copy -> return ()
22862349 Beforepaste -> return ()
2287− Paste -> return ()
2350+ Paste -> getPasteData
22882351 Reset -> return ()
22892352 Search -> return ()
22902353 Selectstart -> return ()
@@ -2293,7 +2356,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
22932356 Touchend -> getTouchEvent
22942357 Touchcancel -> getTouchEvent
22952358 Mousewheel -> return ()
2296− Wheel -> return ()
2359+ Wheel -> getWheelEvent
22972360
22982361{-# INLINABLE withIsEvent #-}
22992362withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
@@ -2561,6 +2624,15 @@ getMouseEventCoords = do
25612624 e <- event
25622625 bisequence (getClientX e, getClientY e)
25632626
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+
25642636{-# INLINABLE getTouchEvent #-}
25652637getTouchEvent :: EventM e TouchEvent TouchEventResult
25662638getTouchEvent = do
@@ -2602,6 +2674,26 @@ getTouchEvent = do
26022674 , _touchEventResult_touches = touches
26032675 }
26042676
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+
26052697instance MonadSample t m => MonadSample t (HydrationDomBuilderT s t m) where
26062698 {-# INLINABLE sample #-}
26072699 sample = lift . sample
reflex-dom-core/src/Reflex/Dom/Builder/InputDisabled.hs+6
@@ -80,6 +80,7 @@ instance Adjustable t m => Adjustable t (InputDisabledT m) where
8080 runWithReplace a0 a' = InputDisabledT $ runWithReplace (coerce a0) (coerceEvent a')
8181 traverseDMapWithKeyWithAdjust f dm0 dm' = InputDisabledT $ traverseDMapWithKeyWithAdjust (\k v -> runInputDisabledT $ f k v) (coerce dm0) (coerceEvent dm')
8282 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')
8384
8485instance NotReady t m => NotReady t (InputDisabledT m) where
8586 notReadyUntil = lift . notReadyUntil
@@ -108,3 +109,8 @@ instance HasJSContext m => HasJSContext (InputDisabledT m) where
108109instance HasJS js m => HasJS js (InputDisabledT m) where
109110 type JSX (InputDisabledT m) = JSX m
110111 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+49−20
@@ -37,6 +37,8 @@ import Data.IntMap (IntMap)
3737import qualified Data.IntMap as IntMap
3838import qualified Data.Map as Map
3939import Data.Map.Misc (applyMap)
40+import Data.Maybe (fromMaybe)
41+import Data.Monoid ((<>))
4042import qualified Data.Set as Set
4143import Data.Text (Text)
4244import qualified Data.Text as T
@@ -54,7 +56,6 @@ import Reflex.PerformEvent.Class
5456import Reflex.PostBuild.Base
5557import Reflex.PostBuild.Class
5658import Reflex.TriggerEvent.Class
57−import System.Random (randomRIO)
5859
5960data StaticDomBuilderEnv t = StaticDomBuilderEnv
6061 { _staticDomBuilderEnv_shouldEscape :: Bool
@@ -63,6 +64,7 @@ data StaticDomBuilderEnv t = StaticDomBuilderEnv
6364 -- We use this to add a "selected" attribute to the appropriate "option" child element.
6465 -- This is not yet a perfect simulation of what the browser does, but it is much closer than doing nothing.
6566 -- 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
6668 }
6769
6870newtype StaticDomBuilderT t m a = StaticDomBuilderT
@@ -163,7 +165,7 @@ instance (SupportsStaticDomBuilder t m, Monad m) => HasDocument (StaticDomBuilde
163165instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m) => Adjustable t (StaticDomBuilderT t m) where
164166 runWithReplace a0 a' = do
165167 e <- StaticDomBuilderT ask
166− key <- replaceStart
168+ key <- replaceStart e
167169 (result0, result') <- lift $ runWithReplace (runStaticDomBuilderT a0 e) (flip runStaticDomBuilderT e <$> a')
168170 o <- hold (snd result0) $ fmapCheap snd result'
169171 StaticDomBuilderT $ modify $ (:) $ join o
@@ -173,10 +175,9 @@ instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m)
173175 traverseDMapWithKeyWithAdjust = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap
174176 traverseDMapWithKeyWithAdjustWithMove = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove
175177
176−-- TODO remove this?
177−replaceStart :: (DomBuilder t m, MonadIO m) => m Text
178−replaceStart = do
179− str <- liftIO $ replicateM 8 $ randomRIO ('a', 'z')
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))
180181 let key = "-" <> T.pack str
181182 _ <- commentNode $ def { _commentNodeConfig_initialContents = "replace-start" <> key }
182183 pure key
@@ -273,7 +274,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
273274 --TODO: Do not escape quotation marks; see https://stackoverflow.com/questions/25612166/what-characters-must-be-escaped-in-html-5
274275 shouldEscape <- asks _staticDomBuilderEnv_shouldEscape
275276 let escape = if shouldEscape then fromHtmlEscapedText else byteString . encodeUtf8
276− modify . (:) =<< (\c -> "<!--" <> c <> "-->") <$> case mSetContents of
277+ (modify . (:)) . (\c -> "<!--" <> c <> "-->") =<< case mSetContents of
277278 Nothing -> return (pure (escape initialContents))
278279 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on
279280 return $ CommentNode ()
@@ -286,8 +287,9 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
286287 es <- newFanEventWithTrigger $ \_ _ -> return (return ())
287288 StaticDomBuilderT $ do
288289 let shouldEscape = elementTag `Set.notMember` noEscapeElements
289− (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing
290− attrs0 <- foldDyn applyMap (Map.insert "data-ssr" "" $ cfg ^. initialAttributes) (cfg ^. modifyAttributes)
290+ nextRunWithReplaceKey <- asks _staticDomBuilderEnv_nextRunWithReplaceKey
291+ (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing nextRunWithReplaceKey
292+ attrs0 <- foldDyn applyMap (cfg ^. initialAttributes) (cfg ^. modifyAttributes)
291293 selectValue <- asks _staticDomBuilderEnv_selectValue
292294 let addSelectedAttr attrs sel = case Map.lookup "value" attrs of
293295 Just v | v == sel -> attrs <> Map.singleton "selected" ""
@@ -310,13 +312,32 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
310312 return (e, result)
311313 {-# INLINABLE inputElement #-}
312314 inputElement cfg = do
313− (e, _result) <- element "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
314− let v0 = constDyn $ cfg ^. inputElementConfig_initialValue
315− 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
316337 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
317338 return $ InputElement
318− { _inputElement_value = v0
319− , _inputElement_checked = c0
339+ { _inputElement_value = v
340+ , _inputElement_checked = c
320341 , _inputElement_checkedChange = never
321342 , _inputElement_input = never
322343 , _inputElement_hasFocus = hasFocus
@@ -326,12 +347,17 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
326347 }
327348 {-# INLINABLE textAreaElement #-}
328349 textAreaElement cfg = do
329− --TODO: Support setValue event
330− (e, _domElement) <- element "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
331− 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
332358 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
333359 return $ TextAreaElement
334− { _textAreaElement_value = v0
360+ { _textAreaElement_value = v
335361 , _textAreaElement_input = never
336362 , _textAreaElement_hasFocus = hasFocus
337363 , _textAreaElement_element = e
@@ -340,7 +366,9 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
340366 selectElement cfg child = do
341367 v <- holdDyn (cfg ^. selectElementConfig_initialValue) (cfg ^. selectElementConfig_setValue)
342368 (e, result) <- element "select" (_selectElementConfig_elementConfig cfg) $ do
343− (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
344372 StaticDomBuilderT $ lift $ modify $ (:) innerHtml
345373 return a
346374 let wrapped = SelectElement
@@ -362,7 +390,8 @@ renderStatic :: StaticWidget x a -> IO (a, ByteString)
362390renderStatic w = do
363391 runDomHost $ do
364392 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
365− let env0 = StaticDomBuilderEnv True Nothing
393+ nextRunWithReplaceKey <- newRef 0
394+ let env0 = StaticDomBuilderEnv True Nothing nextRunWithReplaceKey
366395 ((res, bs), FireCommand fire) <- hostPerformEventT $ runStaticDomBuilderT (runPostBuildT w postBuild) env0
367396 mPostBuildTrigger <- readRef postBuildTriggerRef
368397 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+2
@@ -6,6 +6,7 @@ module Reflex.Dom.Core (module X) where
66
77import Reflex as X hiding (askEvents)
88import Reflex.Dom.Builder.Class as X
9+import Reflex.Dom.Builder.Hydratable as X
910import Reflex.Dom.Builder.Immediate as X
1011import Reflex.Dom.Builder.InputDisabled as X
1112import Reflex.Dom.Builder.Static as X
@@ -18,3 +19,4 @@ import Reflex.Dom.Prerender as X
1819import Reflex.Dom.WebSocket as X
1920import Reflex.Dom.Widget as X
2021import Reflex.Dom.Xhr as X
22+import Reflex.Dom.Xhr.FormData as X
reflex-dom-core/src/Reflex/Dom/Main.hs+86−34
@@ -5,7 +5,6 @@
55{-# LANGUAGE GADTs #-}
66{-# LANGUAGE MultiParamTypeClasses #-}
77{-# LANGUAGE NoMonomorphismRestriction #-}
8−{-# LANGUAGE PatternSynonyms #-}
98{-# LANGUAGE RankNTypes #-}
109{-# LANGUAGE RecursiveDo #-}
1110{-# LANGUAGE ScopedTypeVariables #-}
@@ -27,6 +26,9 @@ import Reflex.PostBuild.Base
2726import Reflex.Spider (Global, Spider, SpiderHost, runSpiderHost)
2827import Reflex.TriggerEvent.Base
2928import Reflex.TriggerEvent.Class
29+#ifdef PROFILE_REFLEX
30+import Reflex.Profiled
31+#endif
3032
3133import Control.Concurrent
3234import Control.Lens
@@ -70,8 +72,14 @@ mainHydrationWidgetWithSwitchoverAction = mainHydrationWidgetWithSwitchoverActio
7072{-# INLINABLE mainHydrationWidgetWithSwitchoverAction' #-}
7173-- | Warning: `mainHydrationWidgetWithSwitchoverAction'` is provided only as performance tweak. It is expected to disappear in future releases.
7274mainHydrationWidgetWithSwitchoverAction' :: JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()
73−mainHydrationWidgetWithSwitchoverAction' switchoverAction head' body = do
74− runHydrationWidgetWithHeadAndBody switchoverAction $ \appendHead appendBody -> do
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
7583 appendHead head'
7684 appendBody body
7785
@@ -86,7 +94,21 @@ attachHydrationWidget
8694 -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
8795 )
8896 -> IO (a, FireCommand DomTimeline DomHost)
89−attachHydrationWidget switchoverAction jsSing w = do
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
90112 hydrationMode <- liftIO $ newIORef HydrationMode_Hydrating
91113 rootNodesRef <- liftIO $ newIORef []
92114 events <- newChan
@@ -102,7 +124,7 @@ attachHydrationWidget switchoverAction jsSing w = do
102124 rootNodes <- liftIO $ readIORef rootNodesRef
103125 let delayedAction = do
104126 for_ (reverse rootNodes) $ \(rootNode, runner) -> do
105− let hydrate = runHydrationRunnerT runner Nothing rootNode events
127+ let hydrate = runHydrationRunnerTWithFailure runner onFailure Nothing rootNode events
106128 void $ runWithJSContextSingleton (runPostBuildT hydrate never) jsSing
107129 liftIO $ writeIORef hydrationMode HydrationMode_Immediate
108130 runWithJSContextSingleton (DOM.liftJSM switchoverAction) jsSing
@@ -118,16 +140,27 @@ type DomCoreWidget x = PostBuildT DomTimeline (WithJSContextSingleton x (Perform
118140{-# INLINABLE runHydrationWidgetWithHeadAndBody #-}
119141runHydrationWidgetWithHeadAndBody
120142 :: JSM ()
121− -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head"
122− -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body"
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
123145 -> FloatingWidget () ()
124146 )
125147 -> JSM ()
126−runHydrationWidgetWithHeadAndBody switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
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
127160 globalDoc <- currentDocumentUnchecked
128161 headElement <- getHeadUnchecked globalDoc
129162 bodyElement <- getBodyUnchecked globalDoc
130− (events, fc) <- liftIO . attachHydrationWidget switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
163+ (events, fc) <- liftIO . attachHydrationWidgetWithFailure onFailure switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
131164 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
132165 let hydrateDom :: DOM.Node -> HydrationWidget () c -> FloatingWidget () c
133166 hydrateDom n w = do
@@ -209,39 +242,48 @@ type Widget x = ImmediateDomBuilderT DomTimeline (DomCoreWidget x)
209242attachWidget :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> JSM a
210243attachWidget rootElement wv w = fst <$> attachWidget' rootElement wv w
211244
212−-- | Warning: `mainWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.
213−mainWidgetWithHead' :: (a -> Widget () b, b -> Widget () a) -> JSM ()
214−mainWidgetWithHead' widgets = withJSContextSingletonMono $ \jsSing -> do
215− doc <- currentDocumentUnchecked
216− headElement <- getHeadUnchecked doc
217− headFragment <- createDocumentFragment doc
218− bodyElement <- getBodyUnchecked doc
219− bodyFragment <- createDocumentFragment doc
220− hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
221− (events, fc) <- liftIO . attachWidget'' $ \events -> do
222− 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
223259 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
224− let go :: forall c. Widget () c -> DOM.DocumentFragment -> PerformEventT DomTimeline DomHost c
225− go w df = do
260+ let go :: forall c. DOM.DocumentFragment -> Widget () c -> FloatingWidget () c
261+ go df w = do
226262 unreadyChildren <- liftIO $ newIORef 0
227263 delayed <- liftIO $ newIORef $ pure ()
228264 let builderEnv = HydrationDomBuilderEnv
229− { _hydrationDomBuilderEnv_document = toDocument doc
265+ { _hydrationDomBuilderEnv_document = globalDoc
230266 , _hydrationDomBuilderEnv_parent = Left $ toNode df
231267 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
232− , _hydrationDomBuilderEnv_commitAction = return () --TODO
268+ , _hydrationDomBuilderEnv_commitAction = pure () --TODO: possibly `replaceElementContents n f`
269+ , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
233270 , _hydrationDomBuilderEnv_switchover = never
234271 , _hydrationDomBuilderEnv_delayed = delayed
235− , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
236272 }
237− runWithJSContextSingleton (runPostBuildT (runHydrationDomBuilderT w builderEnv events) postBuild) jsSing
238− rec b <- go (headWidget a) headFragment
239− a <- go (bodyWidget b) bodyFragment
273+ lift $ runHydrationDomBuilderT w builderEnv events
274+ runWithJSContextSingleton (runPostBuildT (runTriggerEventT (app (go headFragment) (go bodyFragment)) events) postBuild) jsSing
240275 return (events, postBuildTriggerRef)
241276 replaceElementContents headElement headFragment
242277 replaceElementContents bodyElement bodyFragment
243278 liftIO $ processAsyncEvents events fc
244279
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+
245287replaceElementContents :: DOM.IsElement e => e -> DOM.DocumentFragment -> JSM ()
246288replaceElementContents e df = do
247289 setInnerHTML e ("" :: String)
@@ -253,8 +295,7 @@ attachWidget' :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> J
253295attachWidget' rootElement jsSing w = do
254296 doc <- getOwnerDocumentUnchecked rootElement
255297 df <- createDocumentFragment doc
256− hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
257− ((a, events), fc) <- liftIO . attachWidget'' $ \events -> do
298+ ((a, events), fc) <- liftIO . attachImmediateWidget $ \hydrationMode events -> do
258299 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
259300 unreadyChildren <- liftIO $ newIORef 0
260301 delayed <- liftIO $ newIORef $ pure ()
@@ -275,12 +316,18 @@ attachWidget' rootElement jsSing w = do
275316
276317type EventChannel = Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
277318
278−{-# INLINABLE attachWidget'' #-}
279−attachWidget'' :: (EventChannel -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))) -> IO (a, FireCommand DomTimeline DomHost)
280−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
281328 events <- newChan
282329 runDomHost $ do
283− ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w events
330+ ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w hydrationMode events
284331 mPostBuildTrigger <- readRef postBuildTriggerRef
285332 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
286333 return (result, fc)
@@ -322,3 +369,8 @@ runApp' app = withJSContextSingleton $ \jsSing -> do
322369 { _appInput_window = w
323370 }
324371 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/Old.hs−1
@@ -1,6 +1,5 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE ConstraintKinds #-}
3−{-# LANGUAGE ExplicitForAll #-}
43{-# LANGUAGE FlexibleContexts #-}
54{-# LANGUAGE FlexibleInstances #-}
65{-# LANGUAGE MultiParamTypeClasses #-}
reflex-dom-core/src/Reflex/Dom/Prerender.hs+135−25
@@ -1,17 +1,18 @@
11{-# LANGUAGE ConstraintKinds #-}
2−{-# LANGUAGE EmptyDataDecls #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE EmptyCase #-}
34{-# LANGUAGE FlexibleContexts #-}
45{-# LANGUAGE FlexibleInstances #-}
56{-# LANGUAGE FunctionalDependencies #-}
7+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
68{-# LANGUAGE LambdaCase #-}
79{-# LANGUAGE OverloadedStrings #-}
8−{-# LANGUAGE MultiParamTypeClasses #-}
910{-# LANGUAGE Rank2Types #-}
1011{-# LANGUAGE RecursiveDo #-}
1112{-# LANGUAGE ScopedTypeVariables #-}
1213{-# LANGUAGE TypeFamilies #-}
13−{-# LANGUAGE TypeSynonymInstances #-}
1414{-# LANGUAGE UndecidableInstances #-}
15+{-# LANGUAGE UndecidableSuperClasses #-}
1516
1617-- | Render the first widget on the server, and the second on the client.
1718module Reflex.Dom.Prerender
@@ -21,20 +22,22 @@ module Reflex.Dom.Prerender
2122 , PrerenderBaseConstraints
2223 ) where
2324
24−import Control.Monad.Primitive (PrimMonad)
25+import Control.Monad.Primitive (PrimMonad(..))
2526import Control.Monad.Reader
26−import Control.Monad.Ref (MonadRef(..))
27+import Control.Monad.Ref (MonadRef(..), MonadAtomicRef(..))
2728import Data.IORef (IORef, newIORef)
29+import Data.Semigroup (Semigroup)
2830import Data.Text (Text)
31+import Data.Void
2932import Foreign.JavaScript.TH
3033import GHCJS.DOM.Types (MonadJSM)
3134import Reflex hiding (askEvents)
3235import Reflex.Dom.Builder.Class
36+import Reflex.Dom.Builder.Hydratable
3337import Reflex.Dom.Builder.Immediate
3438import Reflex.Dom.Builder.InputDisabled
3539import Reflex.Dom.Builder.Static
3640import Reflex.Host.Class
37−import Reflex.Requester.Base
3841import Data.IntMap.Strict (IntMap)
3942import qualified Data.IntMap.Strict as IntMap
4043
@@ -48,7 +51,6 @@ type PrerenderClientConstraint js t m =
4851 , DomRenderHook t m
4952 , HasDocument m
5053 , TriggerEvent t m
51− , Prerender js t m
5254 , PrerenderBaseConstraints js t m
5355 )
5456
@@ -76,16 +78,16 @@ type PrerenderBaseConstraints js t m =
7678-- hydration builder will run *both* widgets.
7779prerender_
7880 :: (Functor m, Reflex t, Prerender js t m)
79− => m () -> ((PrerenderClientConstraint js t (Client m)) => Client m ()) -> m ()
81+ => m () -> Client m () -> m ()
8082prerender_ server client = void $ prerender server client
8183
82−class Prerender js t m | m -> t js where
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
8385 -- | Monad in which the client widget is built
8486 type Client m :: * -> *
8587 -- | Render the first widget on the server, and the second on the client. The
8688 -- hydration builder will run *both* widgets, updating the result dynamic at
8789 -- switchover time.
88− prerender :: m a -> ((PrerenderClientConstraint js t (Client m)) => Client m a) -> m (Dynamic t a)
90+ prerender :: m a -> Client m a -> m (Dynamic t a)
8991
9092instance (ReflexHost t, Adjustable t m, PrerenderBaseConstraints js t m) => Prerender js t (HydrationDomBuilderT GhcjsDomSpace t m) where
9193 type Client (HydrationDomBuilderT GhcjsDomSpace t m) = HydrationDomBuilderT GhcjsDomSpace t m
@@ -101,34 +103,138 @@ instance (Adjustable t m, PrerenderBaseConstraints js t m, ReflexHost t) => Prer
101103 env <- HydrationDomBuilderT ask
102104 events <- askEvents
103105 doc <- askDocument
106+ serverDf <- Document.createDocumentFragment doc -- server dom should not be mounted in the window's doc in hydration
104107 df <- Document.createDocumentFragment doc
105108 unreadyChildren <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_unreadyChildren
106− hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
109+ immediateMode <- liftIO $ newIORef HydrationMode_Immediate
107110 delayed <- liftIO $ newIORef $ pure ()
108− let env' = HydrationDomBuilderEnv
111+ let clientEnv = env
112+ { _hydrationDomBuilderEnv_parent = Left $ DOM.toNode df
113+ , _hydrationDomBuilderEnv_hydrationMode = immediateMode
114+ }
115+ serverEnv = HydrationDomBuilderEnv
109116 { _hydrationDomBuilderEnv_document = doc
110− , _hydrationDomBuilderEnv_parent = Left $ DOM.toNode df
117+ , _hydrationDomBuilderEnv_parent = Left $ DOM.toNode serverDf
111118 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
112119 , _hydrationDomBuilderEnv_commitAction = pure ()
113120 , _hydrationDomBuilderEnv_delayed = delayed
114− , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
121+ , _hydrationDomBuilderEnv_hydrationMode = immediateMode
115122 , _hydrationDomBuilderEnv_switchover = never
116123 }
117− a0 <- lift $ runHydrationDomBuilderT server (env { _hydrationDomBuilderEnv_delayed = delayed }) events
124+ a0 <- lift $ runHydrationDomBuilderT server serverEnv events
118125 (a', trigger) <- newTriggerEvent
119126 getHydrationMode >>= \case
120127 HydrationMode_Immediate -> do
121− liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') env' events
128+ liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') clientEnv events
122129 append $ DOM.toNode df
123130 HydrationMode_Hydrating -> addHydrationStep $ do
124− liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') env' events
131+ liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') clientEnv events
125132 insertBefore df =<< deleteToPrerenderEnd doc
126133 holdDyn a0 a'
127134
128−data NoJavaScript -- This type should never have a HasJS instance
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 {}
129140
130−instance (js ~ NoJavaScript, SupportsStaticDomBuilder t m) => Prerender js t (StaticDomBuilderT t m) where
131− type Client (StaticDomBuilderT t m) = HydrationDomBuilderT GhcjsDomSpace t m
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
132238 prerender server _ = do
133239 _ <- commentNode $ CommentNodeConfig startMarker Nothing
134240 a <- server
@@ -168,10 +274,10 @@ instance (Prerender js t m, MonadFix m, Reflex t) => Prerender js t (RequesterT
168274 (x, e) <- runRequesterT w (selectInt fannedResponses selector)
169275 pure (x, fmapCheap (IntMap.singleton selector) e)
170276 (result, requestsDyn) <- fmap splitDynPure $ lift $ prerender (withFannedResponses server 0) (withFannedResponses client 1)
171− responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switch $ current requestsDyn
172− pure result
277+ responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switchPromptlyDyn requestsDyn
278+ return result
173279
174−instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Group q, Additive q, Query q) => Prerender js t (QueryT t q m) where
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
175281 type Client (QueryT t q m) = QueryT t q (Client m)
176282 prerender server client = mdo
177283 result <- queryDyn query
@@ -181,8 +287,12 @@ instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Group q, Additive q,
181287 pure a
182288
183289instance (Prerender js t m, Monad m) => Prerender js t (InputDisabledT m) where
184− type Client (InputDisabledT m) = Client m
185− prerender (InputDisabledT server) client = InputDisabledT $ prerender server client
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
186296
187297instance (Prerender js t m, Monad m, ReflexHost t) => Prerender js t (PostBuildT t m) where
188298 type Client (PostBuildT t m) = PostBuildT t (Client m)
reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs+10−29
@@ -60,6 +60,7 @@ module Reflex.Dom.Widget.Basic
6060 , partitionMapBySetLT
6161 ) where
6262
63+import Reflex.Adjustable.Class
6364import Reflex.Class
6465import Reflex.Collection
6566import Reflex.Dom.Builder.Class
@@ -144,23 +145,25 @@ button t = do
144145
145146--TODO: Should this be renamed to 'widgetView' for consistency with 'widgetHold'?
146147-- | Given a Dynamic of widget-creating actions, create a widget that is recreated whenever the Dynamic updates.
147−-- The returned Event of widget results occurs when the Dynamic does.
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.
148151-- 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').
149−dyn :: (DomBuilder t m, PostBuild t m) => Dynamic t (m a) -> m (Event t a)
152+dyn :: (Adjustable t m, NotReady t m, PostBuild t m) => Dynamic t (m a) -> m (Event t a)
150153dyn = networkView
151154
152155-- | Like 'dyn' but discards result.
153−dyn_ :: (DomBuilder t m, PostBuild t m) => Dynamic t (m a) -> m ()
156+dyn_ :: (Adjustable t m, NotReady t m, PostBuild t m) => Dynamic t (m a) -> m ()
154157dyn_ = void . dyn
155158
156159-- | Given an initial widget and an Event of widget-creating actions, create a widget that is recreated whenever the Event fires.
157160-- The returned Dynamic of widget results occurs when the Event does.
158161-- 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').
159−widgetHold :: (DomBuilder t m, MonadHold t m) => m a -> Event t (m a) -> m (Dynamic t a)
162+widgetHold :: (Adjustable t m, MonadHold t m) => m a -> Event t (m a) -> m (Dynamic t a)
160163widgetHold = networkHold
161164
162165-- | Like 'widgetHold' but discards result.
163−widgetHold_ :: (DomBuilder t m, MonadHold t m) => m a -> Event t (m a) -> m ()
166+widgetHold_ :: (Adjustable t m, MonadHold t m) => m a -> Event t (m a) -> m ()
164167widgetHold_ z = void . widgetHold z
165168
166169-- | Create a DOM element
@@ -268,34 +271,10 @@ dynamicAttributesToModifyAttributesWithInitial attrs0 d = do
268271 return $ if Map.null p then Nothing else Just p
269272 return modificationsNeeded
270273
271−--------------------------------------------------------------------------------
272−-- Copied and pasted from Reflex.Widget.Class
273−--------------------------------------------------------------------------------
274−
275−{-
276−schedulePostBuild x = performEvent_ . (x <$) =<< getPostBuild
277−
278−elDynHtml' :: DomBuilder t m => Text -> Dynamic t Text -> m (El t)
279−elDynHtml' elementTag html = do
280− e <- buildEmptyElement elementTag (Map.empty :: Map Text Text)
281− schedulePostBuild $ setInnerHTML e . Just =<< sample (current html)
282− performEvent_ $ fmap (setInnerHTML e . Just) $ updated html
283− wrapElement defaultDomEventHandler e
284−
285−elDynHtmlAttr' :: DomBuilder t m => Text -> Map Text Text -> Dynamic t Text -> m (El t)
286−elDynHtmlAttr' elementTag attrs html = do
287− e <- buildEmptyElement elementTag attrs
288− schedulePostBuild $ setInnerHTML e . Just =<< sample (current html)
289− performEvent_ $ fmap (setInnerHTML e . Just) $ updated html
290− wrapElement defaultDomEventHandler e
291−-}
292−
293274newtype Link t
294275 = Link { _link_clicked :: Event t ()
295276 }
296277
297−-- | >>> linkClass "Click here" "link-class"
298−-- > <a class="link-class">Click here</a>
299278linkClass :: DomBuilder t m => Text -> Text -> m (Link t)
300279linkClass s c = do
301280 (l,_) <- elAttr' "a" ("class" =: c) $ text s
@@ -315,6 +294,7 @@ dtdd h w = do
315294blank :: forall m. Monad m => m ()
316295blank = return ()
317296
297+-- TODO: Move to an example project.
318298-- | A widget to display a table with static columns and dynamic rows.
319299tableDynAttr :: forall t m r k v. (Ord k, DomBuilder t m, MonadHold t m, PostBuild t m, MonadFix m)
320300 => Text -- ^ Class applied to <table> element
@@ -331,6 +311,7 @@ tableDynAttr klass cols dRows rowAttrs = elAttr "div" (Map.singleton "style" "zo
331311 dAttrs <- rowAttrs k
332312 elDynAttr' "tr" dAttrs $ mapM (\x -> el "td" $ snd x k r) cols)
333313
314+-- TODO: Move to an example project.
334315-- | A widget to construct a tabbed view that shows only one of its child widgets at a time.
335316-- Creates a header bar containing a <ul> with one <li> per child; clicking a <li> displays
336317-- the corresponding child and hides all others.
reflex-dom-core/src/Reflex/Dom/Widget/Input.hs+9−43
@@ -54,6 +54,7 @@ import qualified Text.Read as T
5454import qualified GHCJS.DOM.Event as Event
5555import qualified GHCJS.DOM.HTMLInputElement as Input
5656
57+{-# DEPRECATED TextInput, _textInput_element, TextInputConfig, textInput "Use 'inputElement' directly" #-}
5758data TextInput t
5859 = TextInput { _textInput_value :: Dynamic t Text
5960 , _textInput_input :: Event t Text
@@ -161,6 +162,7 @@ rangeInput (RangeInputConfig initial eSetValue dAttrs) = do
161162 , _rangeInput_element = _inputElement_raw i
162163 }
163164
165+{-# DEPRECATED TextAreaConfig, TextArea, textArea "Use 'textAreaElement' directly" #-}
164166data TextAreaConfig t
165167 = TextAreaConfig { _textAreaConfig_initialValue :: Text
166168 , _textAreaConfig_setValue :: Event t Text
@@ -198,6 +200,7 @@ textArea (TextAreaConfig initial eSet attrs) = do
198200 , _textArea_element = _textAreaElement_raw i
199201 }
200202
203+{-# DEPRECATED CheckboxConfig, Checkbox, checkbox, checkboxView, CheckboxViewEventResultType, regularToCheckboxViewEventType, CheckboxViewEventResult "Use 'inputElement' directly" #-}
201204data CheckboxConfig t
202205 = CheckboxConfig { _checkboxConfig_setValue :: Event t Bool
203206 , _checkboxConfig_attributes :: Dynamic t (Map Text Text)
@@ -287,7 +290,7 @@ regularToCheckboxViewEventType en r = case en of
287290
288291newtype CheckboxViewEventResult en = CheckboxViewEventResult { unCheckboxViewEventResult :: CheckboxViewEventResultType en }
289292
290−--TODO
293+-- | Create a view only checkbox
291294{-# INLINABLE checkboxView #-}
292295checkboxView :: 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)
293296checkboxView dAttrs dValue = do
@@ -321,6 +324,7 @@ checkboxView dAttrs dValue = do
321324 i <- inputElement inputElementConfig
322325 return $ unCheckboxViewEventResult <$> select (_element_events $ _inputElement_element i) (WrapArg Click)
323326
327+{-# DEPRECATED FileInput, FileInputConfig, fileInput "Use 'inputElement' directly" #-}
324328data FileInput d t
325329 = FileInput { _fileInput_value :: Dynamic t [File]
326330 , _fileInput_element :: RawInputElement d
@@ -433,9 +437,12 @@ dropdown k0 options (DropdownConfig setK attrs) = do
433437 let xs = fmap (\(ix, (k, v)) -> ((ix, k), ((ix, k), v))) $ zip [0::Int ..] $ Map.toList os
434438 in (Map.fromList $ map snd xs, Bimap.fromList $ map fst xs)
435439 modifyAttrs <- dynamicAttributesToModifyAttributes attrs
440+ postBuild <- getPostBuild
441+ let setSelection = attachPromptlyDynWithMaybe (flip Bimap.lookupR) ixKeys $
442+ leftmost [setK, k0 <$ postBuild]
436443 let cfg = def
437444 & selectElementConfig_elementConfig . elementConfig_modifyAttributes .~ fmap mapKeysToAttributeName modifyAttrs
438− & selectElementConfig_setValue .~ fmap (T.pack . show) (attachPromptlyDynWithMaybe (flip Bimap.lookupR) ixKeys setK)
445+ & selectElementConfig_setValue .~ fmap (T.pack . show) setSelection
439446 (eRaw, _) <- selectElement cfg $ listWithKey indexedOptions $ \(ix, k) v -> do
440447 let optionAttrs = fmap (\dk -> "value" =: T.pack (show ix) <> if dk == k then "selected" =: "selected" else mempty) defaultKey
441448 elDynAttr "option" optionAttrs $ dynText v
@@ -622,9 +629,6 @@ instance HasAttributes (FileInputConfig t) where
622629 type Attrs (FileInputConfig t) = Dynamic t (Map Text Text)
623630 attributes = fileInputConfig_attributes
624631
625−class HasSetValue a where
626− type SetValue a :: *
627− setValue :: Lens' a (SetValue a)
628632
629633instance HasSetValue (TextAreaConfig t) where
630634 type SetValue (TextAreaConfig t) = Event t Text
@@ -681,41 +685,3 @@ instance HasValue (Dropdown t k) where
681685instance HasValue (Checkbox t) where
682686 type Value (Checkbox t) = Dynamic t Bool
683687 value = _checkbox_value
684−
685−{-
686−type family Controller sm t a where
687− Controller Edit t a = (a, Event t a) -- Initial value and setter
688− Controller View t a = Dynamic t a -- Value (always)
689−
690−type family Output sm t a where
691− Output Edit t a = Dynamic t a -- Value (always)
692− Output View t a = Event t a -- Requested changes
693−
694−data CheckboxConfig sm t
695− = CheckboxConfig { _checkbox_input :: Controller sm t Bool
696− , _checkbox_attributes :: Attributes
697− }
698−
699−instance Reflex t => Default (CheckboxConfig Edit t) where
700− def = CheckboxConfig (False, never) mempty
701−
702−data Checkbox sm t
703− = Checkbox { _checkbox_output :: Output sm t Bool
704− }
705−
706−data StateMode = Edit | View
707−
708−--TODO: There must be a more generic way to get this witness and allow us to case on the type-level StateMode
709−data StateModeWitness (sm :: StateMode) where
710− EditWitness :: StateModeWitness Edit
711− ViewWitness :: StateModeWitness View
712−
713−class HasStateModeWitness (sm :: StateMode) where
714− stateModeWitness :: StateModeWitness sm
715−
716−instance HasStateModeWitness Edit where
717− stateModeWitness = EditWitness
718−
719−instance HasStateModeWitness View where
720− stateModeWitness = ViewWitness
721−-}
reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+2−2
@@ -108,7 +108,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu
108108 uniqWindow <- holdUniqDyn window
109109 return (uniqWindow, result)
110110 where
111− 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
112112 mkViewport h = toStyleAttr $ "overflow" =: "auto" <> "position" =: "absolute" <>
113113 "left" =: "0" <> "right" =: "0" <> "height" =: (T.pack (show h) <> "px")
114114 mkContainer h = toStyleAttr $ "position" =: "relative" <> "height" =: (T.pack (show h) <> "px")
@@ -117,7 +117,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu
117117 "overflow" =: "hidden" <>
118118 "position" =: "relative"
119119 mkRow k = toStyleAttr $ "height" =: (T.pack (show rowPx) <> "px") <>
120− "top" =: ((<>"px") $ T.pack $ show $ keyToIndex k * rowPx) <>
120+ "top" =: (<> "px") (T.pack $ show $ keyToIndex k * rowPx) <>
121121 "position" =: "absolute" <>
122122 "width" =: "100%"
123123 findWindow sizeIncrement windowSize startingPosition =
reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+8−4
@@ -33,19 +33,23 @@ import qualified GHCJS.DOM.Types as DOM
3333
3434-- | A widget that wraps the given widget in a div and fires an event when resized.
3535-- Adapted from @github.com\/marcj\/css-element-queries@
36−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)
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)
3741resizeDetector = resizeDetectorWithStyle ""
3842
3943resizeDetectorWithStyle :: (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)
4044 => Text -- ^ A css style string. Warning: It should not contain the "position" style attribute.
4145 -> m a -- ^ The embedded widget
42− -> 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
4347resizeDetectorWithStyle styleString = resizeDetectorWithAttrs ("style" =: styleString)
4448
4549resizeDetectorWithAttrs :: (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)
4650 => Map Text Text -- ^ A map of attributes. Warning: It should not modify the "position" style attribute.
4751 -> m a -- ^ The embedded widget
48− -> 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
4953resizeDetectorWithAttrs attrs w = do
5054 let childStyle = "position: absolute; left: 0; top: 0;"
5155 containerAttrs = "style" =: "position: absolute; left: 0; top: 0; right: 0; bottom: 0; overflow: scroll; z-index: -1; visibility: hidden;"
@@ -87,4 +91,4 @@ resizeDetectorWithAttrs attrs w = do
8791 size0 <- performEvent $ fmap (const $ liftJSM reset) pb
8892 rec resize <- performEventAsync $ fmap (\d cb -> (liftIO . cb) =<< liftJSM (resetIfChanged d)) $ tag (current dimensions) $ leftmost [expandScroll, shrinkScroll]
8993 dimensions <- holdDyn (Nothing, Nothing) $ leftmost [ size0, fmapMaybe id resize ]
90− return (fmapMaybe void resize, w')
94+ return (updated dimensions, w')
reflex-dom-core/src/Reflex/Dom/Xhr.hs+8−6
@@ -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
@@ -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
@@ -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+2−3
@@ -1,7 +1,6 @@
11{-# LANGUAGE FlexibleInstances #-}
22{-# LANGUAGE JavaScriptFFI #-}
33{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE TypeSynonymInstances #-}
54
65module Reflex.Dom.Xhr.Foreign (
76 XMLHttpRequest
@@ -16,7 +15,7 @@ import Data.Text (Text)
1615import Data.ByteString (ByteString)
1716import 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)
2120import GHCJS.DOM.Types (MonadJSM, ToJSString, FormData, Document, Blob (..), ArrayBuffer (..), JSVal, JSM, IsEvent, XMLHttpRequestProgressEvent, ProgressEvent, Event, XMLHttpRequestUpload, FromJSString, ArrayBufferView (..), liftJSM, castTo)
2221import GHCJS.DOM.XMLHttpRequest
@@ -115,7 +114,7 @@ xmlHttpRequestOntimeout :: XMLHttpRequest -> EventM XMLHttpRequest ProgressEvent
115114xmlHttpRequestOntimeout = (`on` timeout)
116115
117116xmlHttpRequestOnreadystatechange :: XMLHttpRequest -> EventM XMLHttpRequest Event () -> JSM (JSM ())
118−xmlHttpRequestOnreadystatechange = (`on` readyStateChange)
117+xmlHttpRequestOnreadystatechange = (`onSync` readyStateChange)
119118
120119xmlHttpRequestSetTimeout :: MonadJSM m => XMLHttpRequest -> Word -> m ()
121120xmlHttpRequestSetTimeout = setTimeout
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/test/gc.hs+12−11
@@ -8,16 +8,17 @@ import Control.Exception
88import Control.Monad
99import Control.Monad.IO.Class
1010import Data.Int
11+import Data.Text as T
1112import Language.Javascript.JSaddle.Warp
1213import Reflex.Dom.Core
1314import Reflex.Time
1415import System.Exit
15−import System.IO.Temp
16−import System.Linux.Namespaces
1716import System.Mem
18−import System.Posix
1917import System.Process
2018
19+import Test.Util.ChromeFlags
20+import Test.Util.UnshareNetwork
21+
2122#if MIN_VERSION_base(4,11,0)
2223import GHC.Stats (getRTSStatsEnabled, getRTSStats, RTSStats(..), gcdetails_live_bytes, gc)
2324currentBytesUsed :: RTSStats -> Int64
@@ -46,14 +47,14 @@ failureLimit = 0
4647
4748main :: IO ()
4849main = do
49− uid <- getEffectiveUserID
50− handle (\(_ :: IOError) -> return ()) $ do -- If we run into an exception with sandboxing, just don't bother
51− unshare [User, Network]
52− writeUserMappings Nothing [UserMapping 0 uid 1]
53− callCommand "ip link set lo up ; ip addr"
54− mainThread <- myThreadId
55− withSystemTempDirectory "reflex-dom-core_test_gc" $ \tmp -> do
56− browserProcess <- spawnCommand $ "echo 'Starting Chromium' ; chromium --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 --user-data-dir=" ++ tmp ++ " http://localhost:3911 ; echo 'Chromium exited'"
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+ ]
5758 let finishTest result = do
5859 interruptProcessGroupOf browserProcess
5960 throwTo mainThread result
reflex-dom-core/test/hlint.hs+3−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 ()
@@ -16,9 +16,11 @@ main = do
1616 , "--ignore=Use unless"
1717 , "--ignore=Use if"
1818 , "--ignore=Use fewer imports"
19+ , "--ignore=Use list comprehension"
1920 , "--ignore=Unnecessary hiding" -- Interferes with cross-version compatibility
2021 , "--ignore=Use <$>"
2122 , "--ignore=Reduce duplication" --TODO: Re-enable this test
23+ , "--ignore=Use list comprehension"
2224 , "--cpp-define=USE_TEMPLATE_HASKELL"
2325 ]
2426 if null ideas then exitSuccess else exitFailure
reflex-dom-core/test/hydration.hs+842−457
@@ -1,11 +1,9 @@
11{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE StandaloneDeriving #-}
3−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4−{-# LANGUAGE UndecidableInstances #-}
52{-# LANGUAGE ConstraintKinds #-}
6−{-# LANGUAGE CPP #-}
73{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE FlexibleInstances #-}
85{-# LANGUAGE GADTs #-}
6+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
97{-# LANGUAGE LambdaCase #-}
108{-# LANGUAGE MultiParamTypeClasses #-}
119{-# LANGUAGE OverloadedStrings #-}
@@ -13,29 +11,44 @@
1311{-# LANGUAGE RankNTypes #-}
1412{-# LANGUAGE RecursiveDo #-}
1513{-# LANGUAGE ScopedTypeVariables #-}
14+{-# LANGUAGE StandaloneDeriving #-}
1615{-# LANGUAGE TemplateHaskell #-}
1716{-# LANGUAGE TupleSections #-}
1817{-# LANGUAGE TypeApplications #-}
1918{-# LANGUAGE TypeFamilies #-}
19+{-# LANGUAGE UndecidableInstances #-}
20+
21+{-# OPTIONS_GHC -fno-warn-orphans #-}
2022
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)
2132import Control.Concurrent
22−import Control.Monad
33+import qualified Control.Concurrent.Async as Async
34+import Control.Lens.Operators
35+import Control.Monad hiding (fail)
2336import Control.Monad.Catch
37+import Control.Monad.Fail
2438import Control.Monad.Fix
2539import Control.Monad.IO.Class
2640import Control.Monad.Ref
27−import Data.Constraint (Dict(..))
2841import Data.Constraint.Extras
2942import Data.Constraint.Extras.TH
3043import Data.Dependent.Map (DMap)
31−import Data.Dependent.Sum (DSum(..), (==>), EqTag(..), ShowTag(..))
32−import Data.Foldable (traverse_)
44+import Data.Dependent.Sum (DSum(..), (==>))
3345import Data.Functor.Identity
3446import Data.Functor.Misc
3547import Data.GADT.Compare.TH
3648import Data.GADT.Show.TH
3749import Data.IORef (IORef)
38−import Data.Maybe (fromMaybe, fromJust)
50+import Data.List (sort)
51+import Data.Maybe
3952import Data.Proxy
4053import Data.Text (Text)
4154import Language.Javascript.JSaddle (syncPoint, liftJSM)
@@ -45,18 +58,22 @@ import Network.Socket
4558import Network.Wai
4659import Network.WebSockets
4760import Reflex.Dom.Core
61+import Reflex.Dom.Widget.Input (dropdown)
4862import Reflex.Patch.DMapWithMove
4963import System.Directory
64+import System.Environment
5065import System.IO (stderr)
5166import System.IO.Silently
5267import System.IO.Temp
5368import System.Process
54−import System.Timeout.Lifted
55−import qualified Test.HUnit as HUnit (assertEqual, assertFailure)
69+import System.Which (staticWhich)
70+import qualified Test.HUnit as HUnit
5671import qualified Test.Hspec as H
57−import Test.Hspec.WebDriver hiding (runWD)
72+import qualified Test.Hspec.Core.Spec as H
73+import Test.Hspec (xit)
74+import Test.Hspec.WebDriver hiding (runWD, click, uploadFile, WD)
5875import qualified Test.Hspec.WebDriver as WD
59−import Test.WebDriver (WD)
76+import Test.WebDriver (WD(..))
6077
6178import qualified Data.ByteString.Lazy as LBS
6279import qualified Data.Dependent.Map as DMap
@@ -69,20 +86,37 @@ import qualified System.FilePath as FilePath
6986import qualified Test.WebDriver as WD
7087import qualified Test.WebDriver.Capabilities as WD
7188
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+
72102-- TODO Remove orphan
73−deriving instance MonadRef WD
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
74108
75109assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
76−assertEqual a b = liftIO . HUnit.assertEqual a b
110+assertEqual msg a b = liftIO $ HUnit.assertEqual msg a b
77111
78112assertFailure :: MonadIO m => String -> m ()
79113assertFailure = liftIO . HUnit.assertFailure
80114
81−testTimeLimit :: Int
82−testTimeLimit = 5 * 1000 * 1000
115+assertBool :: (MonadIO m) => String -> Bool -> m ()
116+assertBool msg bool = liftIO $ HUnit.assertBool msg bool
83117
84−chromeConfig :: Text -> WD.WDConfig
85−chromeConfig fp = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = ["--headless"] }) WD.defaultConfig
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
86120
87121keyMap :: DMap DKey Identity
88122keyMap = DMap.fromList
@@ -107,30 +141,38 @@ deriveGEq ''DKey
107141deriveGCompare ''DKey
108142deriveGShow ''DKey
109143
110−instance ShowTag DKey Identity where
111− showTaggedPrec = \case
112− Key_Int -> showsPrec
113− Key_Char -> showsPrec
114− Key_Bool -> showsPrec
115−
116−instance EqTag DKey Identity where
117− eqTagged Key_Int Key_Int = (==)
118− eqTagged Key_Char Key_Char = (==)
119− eqTagged Key_Bool Key_Bool = (==)
144+deriving instance MonadFail WD
120145
121146main :: IO ()
122−main = withSeleniumServer $ \selenium -> do
123− browserPath <- liftIO $ T.strip . T.pack <$> readProcess "which" [ "chromium" ] ""
124− when (T.null browserPath) $ fail "No browser found"
125− let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
126− chromeCaps' = WD.getCaps $ chromeConfig browserPath
127− hspec (tests wdConfig [chromeCaps'] selenium) `finally` _selenium_stopServer selenium
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
128158
129−tests :: WD.WDConfig -> [Capabilities] -> Selenium -> Spec
130−tests wdConfig caps _selenium = do
131− let session' = sessionWith wdConfig "" . using (map (,"") caps)
132− runWD = runWDOptions (WdOptions False)
133− describe "text" $ session' $ do
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
134176 it "works" $ runWD $ do
135177 testWidgetStatic (checkBodyText "hello world") $ do
136178 text "hello world"
@@ -185,27 +227,25 @@ tests wdConfig caps _selenium = do
185227 it "updates in immediate mode" $ runWD $ do
186228 let checkUpdated = do
187229 checkBodyText "initial"
188− WD.click =<< WD.findElem (WD.ByTag "button")
189− liftIO $ threadDelay 100000 -- wait for update
230+ WD.click =<< findElemWithRetry (WD.ByTag "button")
190231 checkBodyText "after"
191232 testWidget (pure ()) checkUpdated $ prerender_ (pure ()) $ do
192233 click <- button ""
193234 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
194235
195− describe "element" $ session' $ do
236+ session' "element" $ do
196237 it "works with domEvent Click" $ runWD $ do
197238 clickedRef <- liftIO $ newRef False
198− testWidget' (WD.findElem $ WD.ByTag "div") WD.click $ do
239+ testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
199240 (e, _) <- el' "div" $ text "hello world"
200241 performEvent_ $ liftIO (writeRef clickedRef True) <$ domEvent Click e
201− clicked <- liftIO $ readRef clickedRef
202− liftIO $ assertEqual "Not clicked" True clicked
242+ readRef clickedRef `shouldBeWithRetryM` True
203243 it "works with eventFlags stopPropagation" $ runWD $ do
204244 firstClickedRef <- newRef False
205245 secondClickedRef <- newRef False
206246 let clickBoth = do
207− WD.findElem (WD.ById "first") >>= WD.click
208− WD.findElem (WD.ById "second") >>= WD.click
247+ findElemWithRetry (WD.ById "first") >>= WD.click
248+ findElemWithRetry (WD.ById "second") >>= WD.click
209249 testWidget (pure ()) clickBoth $ do
210250 (firstDivEl, _) <- el' "div" $ prerender_ (pure ()) $ do
211251 void $ elAttr "span" ("id" =: "first") $ text "hello world"
@@ -222,7 +262,7 @@ tests wdConfig caps _selenium = do
222262 assertEqual "Click propagated when it should have stopped" (True, False) (firstClicked, secondClicked)
223263 it "works with eventFlags preventDefault" $ runWD $ do
224264 let click = do
225− e <- WD.findElem $ WD.ByTag "input"
265+ e <- findElemWithRetry $ WD.ByTag "input"
226266 s0 <- WD.isSelected e
227267 WD.click e
228268 s1 <- WD.isSelected e
@@ -236,7 +276,7 @@ tests wdConfig caps _selenium = do
236276 assertEqual "Click not prevented" (False, False) clicked
237277 it "can add/update/remove attributes" $ runWD $ do
238278 let checkInitialAttrs = do
239− e <- WD.findElem $ WD.ByTag "div"
279+ e <- findElemWithRetry $ WD.ByTag "div"
240280 assertAttr e "const" (Just "const")
241281 assertAttr e "delete" (Just "delete")
242282 assertAttr e "init" (Just "init")
@@ -244,11 +284,11 @@ tests wdConfig caps _selenium = do
244284 pure e
245285 checkModifyAttrs e = do
246286 WD.click e
247− liftIO $ threadDelay 100000
248− assertAttr e "const" (Just "const")
249− assertAttr e "delete" Nothing
250− assertAttr e "init" (Just "click")
251− assertAttr e "click" (Just "click")
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")
252292 testWidget' checkInitialAttrs checkModifyAttrs $ mdo
253293 let conf = def
254294 & initialAttributes .~ "const" =: "const" <> "delete" =: "delete" <> "init" =: "init"
@@ -256,40 +296,87 @@ tests wdConfig caps _selenium = do
256296 (e, ()) <- element "div" conf $ text "hello world"
257297 let click = domEvent Click e
258298 return ()
259− -- TODO check this is the correct solution
260− it "has ssr attribute, removes ssr attribute" $ runWD $ do
261− let checkSSRAttr = do
262− e <- WD.findElem $ WD.ByTag "div"
263− assertAttr e "data-ssr" (Just "")
264− pure e
265− testWidget' checkSSRAttr (\e -> assertAttr e "data-ssr" Nothing) $ el "div" $ text "hello world"
266299
267− describe "inputElement" $ do
268− describe "hydration" $ session' $ do
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
269359 it "doesn't wipe user input when switching over" $ runWD $ do
270− inputRef <- newRef ("" :: Text)
360+ inputRef <- newRef ("hello " :: Text)
271361 testWidget'
272362 (do
273− e <- WD.findElem $ WD.ByTag "input"
274− WD.sendKeys "hello world" e
363+ e <- findElemWithRetry $ WD.ByTag "input"
364+ WD.sendKeys "world" e
275365 pure e)
276366 (\e -> do
277− t <- WD.attr e "value"
278− t `shouldBe` Just "hello world"
279− WD.click <=< WD.findElem $ WD.ByTag "button"
280− input <- liftIO $ readRef inputRef
281− input `shouldBe` "hello world"
367+ WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
368+ WD.click =<< findElemWithRetry (WD.ByTag "button")
369+ readRef inputRef `shouldBeWithRetryM` "hello world"
282370 ) $ do
283− e <- inputElement def
371+ e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
284372 click <- button "save"
285373 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
286374 it "captures user input after switchover" $ runWD $ do
287375 inputRef <- newRef ("" :: Text)
288376 let checkValue = do
289− WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "input"
290− WD.click <=< WD.findElem $ WD.ByTag "button"
291− input <- liftIO $ readRef inputRef
292− input `shouldBe` "hello world"
377+ WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
378+ WD.click =<< findElemWithRetry (WD.ByTag "button")
379+ readRef inputRef `shouldBeWithRetryM` "hello world"
293380 testWidget (pure ()) checkValue $ do
294381 e <- inputElement def
295382 click <- button "save"
@@ -297,23 +384,21 @@ tests wdConfig caps _selenium = do
297384 it "sets focus appropriately" $ runWD $ do
298385 focusRef <- newRef False
299386 let checkValue = do
300− readRef focusRef >>= flip shouldBe False
301− e <- WD.findElem $ WD.ByTag "input"
387+ readRef focusRef `shouldBeWithRetryM` False
388+ e <- findElemWithRetry $ WD.ByTag "input"
302389 WD.click e
303− liftIO $ threadDelay 100000
304− readRef focusRef >>= flip shouldBe True
390+ readRef focusRef `shouldBeWithRetryM` True
305391 testWidget (pure ()) checkValue $ do
306392 e <- inputElement def
307393 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
308394 it "sets focus when focus occurs before hydration" $ runWD $ do
309395 focusRef <- newRef False
310396 let setup = do
311− e <- WD.findElem $ WD.ByTag "input"
397+ e <- findElemWithRetry $ WD.ByTag "input"
312398 WD.click e
313− hasFocus <- (== e) <$> WD.activeElem
314− hasFocus `shouldBe` True
315− readRef focusRef >>= flip shouldBe False
316− check = readRef focusRef >>= flip shouldBe True
399+ ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
400+ readRef focusRef `shouldBeWithRetryM` False
401+ check = readRef focusRef `shouldBeWithRetryM` True
317402 testWidget setup check $ do
318403 e <- inputElement def
319404 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
@@ -322,17 +407,15 @@ tests wdConfig caps _selenium = do
322407 valueRef <- newRef ("" :: Text)
323408 setValueChan :: Chan Text <- liftIO newChan
324409 let checkValue = do
325− readRef valueByUIRef >>= flip shouldBe ""
326− readRef valueRef >>= flip shouldBe ""
327− e <- WD.findElem $ WD.ByTag "input"
410+ readRef valueByUIRef `shouldBeWithRetryM` ""
411+ readRef valueRef `shouldBeWithRetryM` ""
412+ e <- findElemWithRetry $ WD.ByTag "input"
328413 WD.sendKeys "hello" e
329− liftIO $ threadDelay 100000
330− readRef valueByUIRef >>= flip shouldBe "hello"
331− readRef valueRef >>= flip shouldBe "hello"
414+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
415+ readRef valueRef `shouldBeWithRetryM` "hello"
332416 liftIO $ writeChan setValueChan "world"
333− liftIO $ threadDelay 100000
334− readRef valueByUIRef >>= flip shouldBe "hello"
335− readRef valueRef >>= flip shouldBe "world"
417+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
418+ readRef valueRef `shouldBeWithRetryM` "world"
336419 testWidget (pure ()) checkValue $ do
337420 update <- triggerEventWithChan setValueChan
338421 e <- inputElement $ def & inputElementConfig_setValue .~ update
@@ -342,51 +425,181 @@ tests wdConfig caps _selenium = do
342425 checkedByUIRef <- newRef False
343426 checkedRef <- newRef False
344427 setCheckedChan <- liftIO newChan
345− let checkValue = do
346− readRef checkedByUIRef >>= flip shouldBe False
347− readRef checkedRef >>= flip shouldBe False
348− e <- WD.findElem $ WD.ByTag "input"
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
349436 WD.moveToCenter e
350437 WD.click e
351− liftIO $ threadDelay 100000
352− readRef checkedByUIRef >>= flip shouldBe True
353− readRef checkedRef >>= flip shouldBe True
438+ readRef checkedByUIRef `shouldBeWithRetryM` True
439+ readRef checkedRef `shouldBeWithRetryM` True
440+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
354441 liftIO $ writeChan setCheckedChan False
355− liftIO $ threadDelay 100000
356− readRef checkedByUIRef >>= flip shouldBe True
357− readRef checkedRef >>= flip shouldBe False
358− testWidget (pure ()) checkValue $ do
442+ readRef checkedByUIRef `shouldBeWithRetryM` True
443+ readRef checkedRef `shouldBeWithRetryM` False
444+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
445+ testWidget' checkStatic checkValue $ do
359446 setChecked <- triggerEventWithChan setCheckedChan
360447 e <- inputElement $ def
361448 & initialAttributes .~ "type" =: "checkbox"
362449 & inputElementConfig_setChecked .~ setChecked
363450 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
364451 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)
365471 it "captures file uploads" $ runWD $ do
366472 filesRef :: IORef [Text] <- newRef []
367473 let uploadFile = do
368− e <- WD.findElem $ WD.ByTag "input"
474+ e <- findElemWithRetry $ WD.ByTag "input"
369475 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
370476 WD.sendKeys (T.pack path) e
371− WD.click <=< WD.findElem $ WD.ByTag "button"
477+ WD.click =<< findElemWithRetry (WD.ByTag "button")
372478 liftIO $ removeFile path
373− input <- readRef filesRef
374− input `shouldBe` [T.pack $ FilePath.takeFileName path]
479+ readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
375480 testWidget (pure ()) uploadFile $ do
376481 e <- inputElement $ def & initialAttributes .~ "type" =: "file"
377482 click <- button "save"
378483 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
379484 names <- liftJSM $ traverse File.getName fs
380485 liftIO $ writeRef filesRef names
381−
382− describe "hydration/immediate" $ session' $ do
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
383597 it "captures user input after switchover" $ runWD $ do
384598 inputRef :: IORef Text <- newRef ""
385599 let checkValue = do
386− WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "input"
387− WD.click <=< WD.findElem $ WD.ByTag "button"
388− input <- readRef inputRef
389− input `shouldBe` "hello world"
600+ WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
601+ WD.click =<< findElemWithRetry (WD.ByTag "button")
602+ readRef inputRef `shouldBeWithRetryM` "hello world"
390603 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
391604 e <- inputElement def
392605 click <- button "save"
@@ -394,11 +607,10 @@ tests wdConfig caps _selenium = do
394607 it "sets focus appropriately" $ runWD $ do
395608 focusRef <- newRef False
396609 let checkValue = do
397− readRef focusRef >>= flip shouldBe False
398− e <- WD.findElem $ WD.ByTag "input"
610+ readRef focusRef `shouldBeWithRetryM` False
611+ e <- findElemWithRetry $ WD.ByTag "input"
399612 WD.click e
400− liftIO $ threadDelay 100000
401− readRef focusRef >>= flip shouldBe True
613+ readRef focusRef `shouldBeWithRetryM` True
402614 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
403615 e <- inputElement def
404616 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
@@ -407,17 +619,15 @@ tests wdConfig caps _selenium = do
407619 valueRef :: IORef Text <- newRef ""
408620 setValueChan :: Chan Text <- liftIO newChan
409621 let checkValue = do
410− readRef valueByUIRef >>= flip shouldBe ""
411− readRef valueRef >>= flip shouldBe ""
412− e <- WD.findElem $ WD.ByTag "input"
622+ readRef valueByUIRef `shouldBeWithRetryM` ""
623+ readRef valueRef `shouldBeWithRetryM` ""
624+ e <- findElemWithRetry $ WD.ByTag "input"
413625 WD.sendKeys "hello" e
414− liftIO $ threadDelay 100000
415− readRef valueByUIRef >>= flip shouldBe "hello"
416− readRef valueRef >>= flip shouldBe "hello"
626+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
627+ readRef valueRef `shouldBeWithRetryM` "hello"
417628 liftIO $ writeChan setValueChan "world"
418− liftIO $ threadDelay 100000
419− readRef valueByUIRef >>= flip shouldBe "hello"
420− readRef valueRef >>= flip shouldBe "world"
629+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
630+ readRef valueRef `shouldBeWithRetryM` "world"
421631 testWidget (pure ()) checkValue $ do
422632 update <- triggerEventWithChan setValueChan
423633 prerender_ (pure ()) $ do
@@ -429,18 +639,16 @@ tests wdConfig caps _selenium = do
429639 checkedRef <- newRef False
430640 setCheckedChan <- liftIO newChan
431641 let checkValue = do
432− readRef checkedByUIRef >>= flip shouldBe False
433− readRef checkedRef >>= flip shouldBe False
434− e <- WD.findElem $ WD.ByTag "input"
642+ readRef checkedByUIRef `shouldBeWithRetryM` False
643+ readRef checkedRef `shouldBeWithRetryM` False
644+ e <- findElemWithRetry $ WD.ByTag "input"
435645 WD.moveToCenter e
436646 WD.click e
437− liftIO $ threadDelay 100000
438− readRef checkedByUIRef >>= flip shouldBe True
439− readRef checkedRef >>= flip shouldBe True
647+ readRef checkedByUIRef `shouldBeWithRetryM` True
648+ readRef checkedRef `shouldBeWithRetryM` True
440649 liftIO $ writeChan setCheckedChan False
441− liftIO $ threadDelay 100000
442− readRef checkedByUIRef >>= flip shouldBe True
443− readRef checkedRef >>= flip shouldBe False
650+ readRef checkedByUIRef `shouldBeWithRetryM` True
651+ readRef checkedRef `shouldBeWithRetryM` False
444652 testWidget (pure ()) checkValue $ do
445653 setChecked <- triggerEventWithChan setCheckedChan
446654 prerender_ (pure ()) $ do
@@ -452,13 +660,12 @@ tests wdConfig caps _selenium = do
452660 it "captures file uploads" $ runWD $ do
453661 filesRef :: IORef [Text] <- newRef []
454662 let uploadFile = do
455− e <- WD.findElem $ WD.ByTag "input"
663+ e <- findElemWithRetry $ WD.ByTag "input"
456664 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
457665 WD.sendKeys (T.pack path) e
458− WD.click <=< WD.findElem $ WD.ByTag "button"
666+ WD.click =<< findElemWithRetry (WD.ByTag "button")
459667 liftIO $ removeFile path
460− input <- liftIO $ readRef filesRef
461− input `shouldBe` [T.pack $ FilePath.takeFileName path]
668+ readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
462669 testWidget (pure ()) uploadFile $ prerender_ (pure ()) $ do
463670 e <- inputElement $ def & initialAttributes .~ "type" =: "file"
464671 click <- button "save"
@@ -466,21 +673,42 @@ tests wdConfig caps _selenium = do
466673 names <- liftJSM $ traverse File.getName fs
467674 liftIO $ writeRef filesRef names
468675
469− describe "textAreaElement" $ do
470− describe "hydration" $ session' $ do
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
471701 it "doesn't wipe user input when switching over" $ runWD $ do
472702 inputRef <- newRef ("" :: Text)
473703 testWidget'
474704 (do
475− e <- WD.findElem $ WD.ByTag "textarea"
705+ e <- findElemWithRetry $ WD.ByTag "textarea"
476706 WD.sendKeys "hello world" e
477707 pure e)
478708 (\e -> do
479− t <- WD.attr e "value"
480− t `shouldBe` Just "hello world"
481− WD.click <=< WD.findElem $ WD.ByTag "button"
482− input <- readRef inputRef
483− input `shouldBe` "hello world"
709+ WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
710+ WD.click <=< findElemWithRetry $ WD.ByTag "button"
711+ readRef inputRef `shouldBeWithRetryM` "hello world"
484712 ) $ do
485713 e <- textAreaElement def
486714 click <- button "save"
@@ -488,10 +716,9 @@ tests wdConfig caps _selenium = do
488716 it "captures user input after switchover" $ runWD $ do
489717 inputRef <- newRef ("" :: Text)
490718 let checkValue = do
491− WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "textarea"
492− WD.click <=< WD.findElem $ WD.ByTag "button"
493− input <- readRef inputRef
494− input `shouldBe` "hello world"
719+ WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "textarea")
720+ WD.click =<< findElemWithRetry (WD.ByTag "button")
721+ readRef inputRef `shouldBeWithRetryM` "hello world"
495722 testWidget (pure ()) checkValue $ do
496723 e <- textAreaElement def
497724 click <- button "save"
@@ -499,23 +726,21 @@ tests wdConfig caps _selenium = do
499726 it "sets focus appropriately" $ runWD $ do
500727 focusRef <- newRef False
501728 let checkValue = do
502− readRef focusRef >>= flip shouldBe False
503− e <- WD.findElem $ WD.ByTag "textarea"
729+ readRef focusRef `shouldBeWithRetryM` False
730+ e <- findElemWithRetry $ WD.ByTag "textarea"
504731 WD.click e
505− liftIO $ threadDelay 100000
506− readRef focusRef >>= flip shouldBe True
732+ readRef focusRef `shouldBeWithRetryM` True
507733 testWidget (pure ()) checkValue $ do
508734 e <- textAreaElement def
509735 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
510736 it "sets focus when focus occurs before hydration" $ runWD $ do
511737 focusRef <- newRef False
512738 let setup = do
513− e <- WD.findElem $ WD.ByTag "textarea"
739+ e <- findElemWithRetry $ WD.ByTag "textarea"
514740 WD.click e
515− hasFocus <- (== e) <$> WD.activeElem
516− hasFocus `shouldBe` True
517− readRef focusRef >>= flip shouldBe False
518− check = readRef focusRef >>= flip shouldBe True
741+ ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
742+ readRef focusRef `shouldBeWithRetryM` False
743+ check = readRef focusRef `shouldBeWithRetryM` True
519744 testWidget setup check $ do
520745 e <- textAreaElement def
521746 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
@@ -524,31 +749,110 @@ tests wdConfig caps _selenium = do
524749 valueRef <- newRef ("" :: Text)
525750 setValueChan :: Chan Text <- liftIO newChan
526751 let checkValue = do
527− readRef valueByUIRef >>= flip shouldBe ""
528− readRef valueRef >>= flip shouldBe ""
529− e <- WD.findElem $ WD.ByTag "textarea"
752+ readRef valueByUIRef `shouldBeWithRetryM` ""
753+ readRef valueRef `shouldBeWithRetryM` ""
754+ e <- findElemWithRetry $ WD.ByTag "textarea"
530755 WD.sendKeys "hello" e
531− liftIO $ threadDelay 100000
532− readRef valueByUIRef >>= flip shouldBe "hello"
533− readRef valueRef >>= flip shouldBe "hello"
756+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
757+ readRef valueRef `shouldBeWithRetryM` "hello"
534758 liftIO $ writeChan setValueChan "world"
535− liftIO $ threadDelay 100000
536− readRef valueByUIRef >>= flip shouldBe "hello"
537− readRef valueRef >>= flip shouldBe "world"
759+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
760+ readRef valueRef `shouldBeWithRetryM` "world"
538761 testWidget (pure ()) checkValue $ do
539762 setValue' <- triggerEventWithChan setValueChan
540763 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
541764 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
542765 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
543848
544− describe "hydration/immediate" $ session' $ do
849+ describe "hydration/immediate" $ do
545850 it "captures user input after switchover" $ runWD $ do
546851 inputRef :: IORef Text <- newRef ""
547852 let checkValue = do
548− WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "textarea"
549− WD.click <=< WD.findElem $ WD.ByTag "button"
550− input <- liftIO $ readRef inputRef
551− input `shouldBe` "hello world"
853+ WD.sendKeys "hello world" <=< findElemWithRetry $ WD.ByTag "textarea"
854+ WD.click <=< findElemWithRetry $ WD.ByTag "button"
855+ readRef inputRef `shouldBeWithRetryM` "hello world"
552856 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
553857 e <- textAreaElement def
554858 click <- button "save"
@@ -556,11 +860,10 @@ tests wdConfig caps _selenium = do
556860 it "sets focus appropriately" $ runWD $ do
557861 focusRef <- newRef False
558862 let checkValue = do
559− readRef focusRef >>= flip shouldBe False
560− e <- WD.findElem $ WD.ByTag "textarea"
863+ readRef focusRef `shouldBeWithRetryM` False
864+ e <- findElemWithRetry $ WD.ByTag "textarea"
561865 WD.click e
562− liftIO $ threadDelay 100000
563− readRef focusRef >>= flip shouldBe True
866+ readRef focusRef `shouldBeWithRetryM` True
564867 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
565868 e <- textAreaElement def
566869 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
@@ -569,17 +872,15 @@ tests wdConfig caps _selenium = do
569872 valueRef :: IORef Text <- newRef ""
570873 setValueChan :: Chan Text <- liftIO newChan
571874 let checkValue = do
572− readRef valueByUIRef >>= flip shouldBe ""
573− readRef valueRef >>= flip shouldBe ""
574− e <- WD.findElem $ WD.ByTag "textarea"
875+ readRef valueByUIRef `shouldBeWithRetryM` ""
876+ readRef valueRef `shouldBeWithRetryM` ""
877+ e <- findElemWithRetry $ WD.ByTag "textarea"
575878 WD.sendKeys "hello" e
576− liftIO $ threadDelay 100000
577− readRef valueByUIRef >>= flip shouldBe "hello"
578− readRef valueRef >>= flip shouldBe "hello"
879+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
880+ readRef valueRef `shouldBeWithRetryM` "hello"
579881 liftIO $ writeChan setValueChan "world"
580− liftIO $ threadDelay 100000
581− readRef valueByUIRef >>= flip shouldBe "hello"
582− readRef valueRef >>= flip shouldBe "world"
882+ readRef valueByUIRef `shouldBeWithRetryM` "hello"
883+ readRef valueRef `shouldBeWithRetryM` "world"
583884 testWidget (pure ()) checkValue $ do
584885 setValue' <- triggerEventWithChan setValueChan
585886 prerender_ (pure ()) $ do
@@ -587,26 +888,26 @@ tests wdConfig caps _selenium = do
587888 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
588889 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
589890
590− describe "selectElement" $ do
891+ session' "selectElement" $ do
591892 let options :: DomBuilder t m => m ()
592893 options = do
593894 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
594895 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
595896 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
596− describe "hydration" $ session' $ do
897+ describe "hydration" $ do
597898 it "sets initial value correctly" $ runWD $ do
598899 inputRef <- newRef ("" :: Text)
599900 let setup = do
600− e <- WD.findElem $ WD.ByTag "select"
901+ e <- findElemWithRetry $ WD.ByTag "select"
601902 assertAttr e "value" (Just "three")
602− WD.click <=< WD.findElem $ WD.ById "two"
903+ WD.click =<< findElemWithRetry (WD.ById "two")
603904 pure e
604905 check e = do
605906 assertAttr e "value" (Just "two")
606− readRef inputRef >>= (`shouldBe` "three")
607− WD.click <=< WD.findElem $ WD.ByTag "button"
907+ readRef inputRef `shouldBeWithRetryM` "three"
908+ WD.click =<< findElemWithRetry (WD.ByTag "button")
608909 assertAttr e "value" (Just "two")
609− readRef inputRef >>= (`shouldBe` "two")
910+ readRef inputRef `shouldBeWithRetryM` "two"
610911 testWidget' setup check $ do
611912 (e, ()) <- selectElement (def { _selectElementConfig_initialValue = "three" }) options
612913 click <- button "save"
@@ -615,12 +916,12 @@ tests wdConfig caps _selenium = do
615916 it "captures user input after switchover" $ runWD $ do
616917 inputRef <- newRef ("" :: Text)
617918 let checkValue = do
618− e <- WD.findElem $ WD.ByTag "select"
919+ e <- findElemWithRetry $ WD.ByTag "select"
619920 assertAttr e "value" (Just "one")
620− WD.click <=< WD.findElem $ WD.ById "two"
921+ WD.click =<< findElemWithRetry (WD.ById "two")
621922 assertAttr e "value" (Just "two")
622− WD.click <=< WD.findElem $ WD.ByTag "button"
623− readRef inputRef >>= (`shouldBe` "two")
923+ WD.click =<< findElemWithRetry (WD.ByTag "button")
924+ readRef inputRef `shouldBeWithRetryM` "two"
624925 testWidget (pure ()) checkValue $ do
625926 (e, ()) <- selectElement def options
626927 click <- button "save"
@@ -628,23 +929,21 @@ tests wdConfig caps _selenium = do
628929 it "sets focus appropriately" $ runWD $ do
629930 focusRef <- newRef False
630931 let checkValue = do
631− readRef focusRef >>= flip shouldBe False
632− e <- WD.findElem $ WD.ByTag "select"
932+ readRef focusRef `shouldBeWithRetryM` False
933+ e <- findElemWithRetry $ WD.ByTag "select"
633934 WD.click e
634− liftIO $ threadDelay 100000
635− readRef focusRef >>= flip shouldBe True
935+ readRef focusRef `shouldBeWithRetryM` True
636936 testWidget (pure ()) checkValue $ do
637937 (e, ()) <- selectElement def options
638938 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
639939 it "sets focus when focus occurs before hydration" $ runWD $ do
640940 focusRef <- newRef False
641941 let setup = do
642− e <- WD.findElem $ WD.ByTag "select"
942+ e <- findElemWithRetry $ WD.ByTag "select"
643943 WD.click e
644− hasFocus <- (== e) <$> WD.activeElem
645− hasFocus `shouldBe` True
646− readRef focusRef >>= flip shouldBe False
647− check = readRef focusRef >>= flip shouldBe True
944+ ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
945+ readRef focusRef `shouldBeWithRetryM` False
946+ check = readRef focusRef `shouldBeWithRetryM` True
648947 testWidget setup check $ do
649948 (e, ()) <- selectElement def options
650949 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
@@ -653,31 +952,29 @@ tests wdConfig caps _selenium = do
653952 valueRef <- newRef ("" :: Text)
654953 setValueChan :: Chan Text <- liftIO newChan
655954 let checkValue = do
656− e <- WD.findElem $ WD.ByTag "select"
955+ e <- findElemWithRetry $ WD.ByTag "select"
657956 assertAttr e "value" (Just "one")
658− readRef valueByUIRef >>= flip shouldBe "one"
659− readRef valueRef >>= flip shouldBe "one"
660− WD.click <=< WD.findElem $ WD.ById "two"
661− liftIO $ threadDelay 100000
662− readRef valueByUIRef >>= flip shouldBe "two"
663− readRef valueRef >>= flip shouldBe "two"
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"
664962 liftIO $ writeChan setValueChan "three"
665− liftIO $ threadDelay 100000
666− readRef valueByUIRef >>= flip shouldBe "two"
667− readRef valueRef >>= flip shouldBe "three"
963+ readRef valueByUIRef `shouldBeWithRetryM` "two"
964+ readRef valueRef `shouldBeWithRetryM` "three"
668965 testWidget (pure ()) checkValue $ do
669966 setValue' <- triggerEventWithChan setValueChan
670967 (e, ()) <- selectElement def { _selectElementConfig_setValue = Just setValue' } options
671968 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
672969 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
673970
674− describe "hydration/immediate" $ session' $ do
971+ describe "hydration/immediate" $ do
675972 it "captures user input after switchover" $ runWD $ do
676973 inputRef :: IORef Text <- newRef ""
677974 let checkValue = do
678− WD.click <=< WD.findElem $ WD.ById "two"
679− WD.click <=< WD.findElem $ WD.ByTag "button"
680− readRef inputRef >>= flip shouldBe "two"
975+ WD.click <=< findElemWithRetry $ WD.ById "two"
976+ WD.click <=< findElemWithRetry $ WD.ByTag "button"
977+ readRef inputRef `shouldBeWithRetryM` "two"
681978 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
682979 (e, ()) <- selectElement def options
683980 click <- button "save"
@@ -685,17 +982,16 @@ tests wdConfig caps _selenium = do
685982 it "sets focus appropriately" $ runWD $ do
686983 focusRef <- newRef False
687984 let checkValue = do
688− readRef focusRef >>= flip shouldBe False
689− e <- WD.findElem $ WD.ByTag "select"
985+ readRef focusRef `shouldBeWithRetryM` False
986+ e <- findElemWithRetry $ WD.ByTag "select"
690987 WD.click e
691− liftIO $ threadDelay 100000
692− readRef focusRef >>= flip shouldBe True
988+ readRef focusRef `shouldBeWithRetryM` True
693989 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
694990 (e, ()) <- selectElement def options
695991 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
696992 it "has correct initial value" $ runWD $ do
697993 valueRef :: IORef Text <- newRef ""
698− let checkValue = readRef valueRef >>= flip shouldBe "one"
994+ let checkValue = readRef valueRef `shouldBeWithRetryM` "one"
699995 testWidget (pure ()) checkValue $ do
700996 prerender_ (pure ()) $ do
701997 (e, ()) <- selectElement def { _selectElementConfig_initialValue = "one" } options
@@ -705,14 +1001,12 @@ tests wdConfig caps _selenium = do
7051001 valueRef :: IORef Text <- newRef ""
7061002 setValueChan :: Chan Text <- liftIO newChan
7071003 let checkValue = do
708− WD.click <=< WD.findElem $ WD.ById "two"
709− liftIO $ threadDelay 100000
710− readRef valueByUIRef >>= flip shouldBe "two"
711− readRef valueRef >>= flip shouldBe "two"
1004+ WD.click =<< findElemWithRetry (WD.ById "two")
1005+ readRef valueByUIRef `shouldBeWithRetryM` "two"
1006+ readRef valueRef `shouldBeWithRetryM` "two"
7121007 liftIO $ writeChan setValueChan "three"
713− liftIO $ threadDelay 100000
714− readRef valueByUIRef >>= flip shouldBe "two"
715− readRef valueRef >>= flip shouldBe "three"
1008+ readRef valueByUIRef `shouldBeWithRetryM` "two"
1009+ readRef valueRef `shouldBeWithRetryM` "three"
7161010 testWidget (pure ()) checkValue $ do
7171011 setValue' <- triggerEventWithChan setValueChan
7181012 prerender_ (pure ()) $ do
@@ -720,12 +1014,12 @@ tests wdConfig caps _selenium = do
7201014 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
7211015 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
7221016
723− describe "prerender" $ session' $ do
1017+ session' "prerender" $ do
7241018 it "works in simple case" $ runWD $ do
7251019 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
7261020 prerender_ (text "One") (text "Two")
7271021 it "removes element correctly" $ runWD $ do
728− testWidget' (WD.findElem $ WD.ByTag "span") elementShouldBeRemoved $ do
1022+ testWidget' (findElemWithRetry $ WD.ByTag "span") elementShouldBeRemoved $ do
7291023 prerender_ (el "span" $ text "One") (text "Two")
7301024 it "can be nested in server widget" $ runWD $ do
7311025 testWidget (checkBodyText "One") (checkBodyText "Three") $ do
@@ -765,9 +1059,9 @@ tests wdConfig caps _selenium = do
7651059 pb <- getPostBuild
7661060 performEvent_ $ liftIO (putMVar lock ()) <$ pb
7671061 it "result Dynamic is updated *after* switchover" $ runWD $ do
768− let static = shouldContainText "PostBuild" =<< WD.findElem (WD.ByTag "body")
769− check = shouldContainText "Client" =<< WD.findElem (WD.ByTag "body")
770− testWidget static check $ void $ do
1062+ let preSwitchover = checkBodyText "PostBuild"
1063+ check = checkBodyText "Client"
1064+ testWidget preSwitchover check $ void $ do
7711065 d <- prerender (pure "Initial") (pure "Client")
7721066 pb <- getPostBuild
7731067 initial <- sample $ current d
@@ -775,32 +1069,39 @@ tests wdConfig caps _selenium = do
7751069 -- This essentially checks that the client IO runs *after* switchover/postBuild,
7761070 -- thus can't create conflicting DOM
7771071 it "can't exploit IO to break hydration" $ runWD $ do
778− let static = shouldContainText "Initial" =<< WD.findElem (WD.ByTag "body")
779− testWidgetStatic static $ void $ do
1072+ let preSwitchover = checkBodyText "Initial"
1073+ testWidgetStatic preSwitchover $ void $ do
7801074 ref <- liftIO $ newRef "Initial"
7811075 prerender_ (pure ()) (liftIO $ writeRef ref "Client")
7821076 text <=< liftIO $ readRef ref
7831077 -- As above, so below
7841078 it "can't exploit triggerEvent to break hydration" $ runWD $ do
785− let static = shouldContainText "Initial" =<< WD.findElem (WD.ByTag "body")
786− check = shouldContainText "Client" =<< WD.findElem (WD.ByTag "body")
787− testWidget static check $ void $ do
1079+ let preSwitchover = checkBodyText "Initial"
1080+ check = checkBodyText "Client"
1081+ testWidget preSwitchover check $ void $ do
7881082 (e, trigger) <- newTriggerEvent
7891083 prerender_ (pure ()) (liftIO $ trigger "Client")
7901084 textNode $ TextNodeConfig "Initial" $ Just e
7911085
792− describe "runWithReplace" $ session' $ do
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
7931096 it "works" $ runWD $ do
7941097 replaceChan :: Chan Text <- liftIO newChan
795− let setup = WD.findElem $ WD.ByTag "div"
1098+ let setup = findElemWithRetry $ WD.ByTag "div"
7961099 check ssr = do
7971100 -- Check that the original element still exists and has the correct text
798− WD.getText ssr >>= flip shouldBe "two"
799− liftIO $ do
800− writeChan replaceChan "three"
801− threadDelay 100000
1101+ shouldContainText "two" ssr
1102+ liftIO $ writeChan replaceChan "three"
8021103 elementShouldBeRemoved ssr
803− shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1104+ shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
8041105 testWidget' setup check $ do
8051106 replace <- triggerEventWithChan replaceChan
8061107 pb <- getPostBuild
@@ -810,15 +1111,13 @@ tests wdConfig caps _selenium = do
8101111 ]
8111112 it "can be nested in initial widget" $ runWD $ do
8121113 replaceChan :: Chan Text <- liftIO newChan
813− let setup = WD.findElem $ WD.ByTag "div"
1114+ let setup = findElemWithRetry $ WD.ByTag "div"
8141115 check ssr = do
8151116 -- Check that the original element still exists and has the correct text
816− WD.getText ssr >>= flip shouldBe "two"
817− liftIO $ do
818− writeChan replaceChan "three"
819− threadDelay 100000
1117+ shouldContainText "two" ssr
1118+ liftIO $ writeChan replaceChan "three"
8201119 elementShouldBeRemoved ssr
821− shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1120+ shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
8221121 testWidget' setup check $ void $ flip runWithReplace never $ do
8231122 replace <- triggerEventWithChan replaceChan
8241123 pb <- getPostBuild
@@ -827,16 +1126,14 @@ tests wdConfig caps _selenium = do
8271126 , el "span" . text <$> replace
8281127 ]
8291128 it "can be nested in postBuild widget" $ runWD $ do
830− replaceChan <- liftIO newChan
831− let setup = WD.findElem $ WD.ByTag "div"
1129+ replaceChan :: Chan Text <- liftIO newChan
1130+ let setup = findElemWithRetry $ WD.ByTag "div"
8321131 check ssr = do
8331132 -- Check that the original element still exists and has the correct text
834− WD.getText ssr >>= flip shouldBe "two"
835− liftIO $ do
836− writeChan replaceChan "three"
837− threadDelay 100000
1133+ shouldContainText "two" ssr
1134+ liftIO $ writeChan replaceChan "three"
8381135 elementShouldBeRemoved ssr
839− shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1136+ shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
8401137 testWidget' setup check $ void $ do
8411138 pb <- getPostBuild
8421139 runWithReplace (pure ()) $ ffor pb $ \() -> do
@@ -862,17 +1159,15 @@ tests wdConfig caps _selenium = do
8621159 replaceChan2 :: Chan Text <- liftIO newChan
8631160 lock :: MVar () <- liftIO newEmptyMVar
8641161 let check = do
865− shouldContainText "" =<< WD.findElem (WD.ByTag "body")
1162+ shouldContainText "" =<< findElemWithRetry (WD.ByTag "body")
8661163 liftIO $ do
8671164 writeChan replaceChan1 "one"
8681165 takeMVar lock
869− one <- WD.findElem $ WD.ByTag "div"
870− WD.getText one >>= flip shouldBe "pb"
871− liftIO $ do
872− writeChan replaceChan2 "two"
873− threadDelay 100000
1166+ one <- findElemWithRetry $ WD.ByTag "div"
1167+ shouldContainText "pb" one
1168+ liftIO $ writeChan replaceChan2 "two"
8741169 elementShouldBeRemoved one
875− shouldContainText "two" =<< WD.findElem (WD.ByTag "span")
1170+ shouldContainText "two" =<< findElemWithRetry (WD.ByTag "span")
8761171 testWidget (pure ()) check $ void $ do
8771172 replace1 <- triggerEventWithChan replaceChan1
8781173 runWithReplace (pure ()) $ ffor replace1 $ \r1 -> do
@@ -913,14 +1208,12 @@ tests wdConfig caps _selenium = do
9131208 it "works in immediate mode (RHS of prerender)" $ runWD $ do
9141209 replaceChan :: Chan Text <- liftIO newChan
9151210 let check = do
916− one <- WD.findElem $ WD.ByTag "div"
917− shouldContainText "one" =<< WD.findElem (WD.ByTag "body")
918− WD.getText one >>= flip shouldBe "one"
919− liftIO $ do
920− writeChan replaceChan "pb"
921− threadDelay 100000
1211+ checkBodyText "one"
1212+ one <- findElemWithRetry $ WD.ByTag "div"
1213+ shouldContainText "one" one
1214+ liftIO $ writeChan replaceChan "pb"
9221215 elementShouldBeRemoved one
923− shouldContainText "pb" =<< WD.findElem (WD.ByTag "span")
1216+ shouldContainText "pb" =<< findElemWithRetry (WD.ByTag "span")
9241217 testWidget (pure ()) check $ void $ do
9251218 replace <- triggerEventWithChan replaceChan
9261219 prerender_ blank $ do
@@ -928,14 +1221,12 @@ tests wdConfig caps _selenium = do
9281221 it "works with postBuild in immediate mode (RHS of prerender)" $ runWD $ do
9291222 replaceChan :: Chan Text <- liftIO newChan
9301223 let check = do
931− two <- WD.findElem $ WD.ByTag "div"
932− shouldContainText "two" =<< WD.findElem (WD.ByTag "body")
933− WD.getText two >>= flip shouldBe "two"
934− liftIO $ do
935− writeChan replaceChan "three"
936− threadDelay 100000
1224+ checkBodyText "two"
1225+ two <- findElemWithRetry $ WD.ByTag "div"
1226+ shouldContainText "two" two
1227+ liftIO $ writeChan replaceChan "three"
9371228 elementShouldBeRemoved two
938− shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1229+ shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
9391230 testWidget (pure ()) check $ void $ do
9401231 replace <- triggerEventWithChan replaceChan
9411232 prerender_ blank $ do
@@ -945,7 +1236,61 @@ tests wdConfig caps _selenium = do
9451236 , el "span" . text <$> replace
9461237 ]
9471238
948− describe "traverseDMapWithKeyWithAdjust" $ session' $ do
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
9491294 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
9501295 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
9511296 elClass "span" "key" $ text $ textKey k
@@ -953,58 +1298,58 @@ tests wdConfig caps _selenium = do
9531298 pure (Identity v)
9541299 checkItem :: WD.Element -> Text -> Text -> WD ()
9551300 checkItem li k v = do
956− shouldContainText k =<< WD.findElemFrom li (WD.ByClass "key")
957− shouldContainText v =<< WD.findElemFrom li (WD.ByClass "value")
1301+ putStrLnDebug "checkItem"
1302+ shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1303+ shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
9581304 checkInitialItems dm xs = do
1305+ putStrLnDebug "checkInitialItems"
9591306 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
9601307 forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey k) (T.pack $ has @Show k $ show v)
961− getAndCheckInitialItems dm = do
1308+ getAndCheckInitialItems dm = withRetry $ do
1309+ putStrLnDebug "getAndCheckInitialItems"
9621310 xs <- WD.findElems (WD.ByTag "li")
9631311 checkInitialItems dm xs
9641312 pure xs
9651313 checkRemoval chan k = do
966− e <- WD.findElem (WD.ById $ textKey k)
967− liftIO $ do
968− writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe Nothing)
969− threadDelay 100000
1314+ putStrLnDebug "checkRemoval"
1315+ e <- findElemWithRetry (WD.ById $ textKey k)
1316+ liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe Nothing)
9701317 elementShouldBeRemoved e
9711318 checkReplace chan k v = do
972− e <- WD.findElem (WD.ById $ textKey k)
973− liftIO $ do
974− writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
975− threadDelay 100000
1319+ putStrLnDebug "checkReplace"
1320+ e <- findElemWithRetry (WD.ById $ textKey k)
1321+ liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
9761322 elementShouldBeRemoved e
977− e' <- WD.findElem (WD.ById $ textKey k)
1323+ e' <- findElemWithRetry $ WD.ById $ textKey k
9781324 checkItem e' (textKey k) (T.pack $ show v)
9791325 checkInsert chan k v = do
980− liftIO $ do
981− writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
982− threadDelay 100000
983− e <- WD.findElem (WD.ById $ textKey k)
1326+ putStrLnDebug "checkInsert"
1327+ liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
1328+ e <- findElemWithRetry (WD.ById $ textKey k)
9841329 checkItem e (textKey k) (T.pack $ show v)
9851330 postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
9861331 it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
9871332 chan <- liftIO newChan
988− let static :: WD [WD.Element]
989− static = getAndCheckInitialItems keyMap
1333+ let preSwitchover :: WD [WD.Element]
1334+ preSwitchover = getAndCheckInitialItems keyMap
9901335 check :: [WD.Element] -> WD ()
9911336 check xs = do
9921337 checkInitialItems keyMap xs
9931338 checkRemoval chan Key_Int
9941339 checkReplace chan Key_Char 'B'
9951340 checkInsert chan Key_Bool True
996− testWidget' static check $ do
1341+ testWidget' preSwitchover check $ do
9971342 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
9981343 liftIO $ dmap `H.shouldBe` keyMap
9991344 it "handles postBuild correctly" $ runWD $ do
10001345 chan <- liftIO newChan
1001− let static = getAndCheckInitialItems (fromJust $ apply postBuildPatch keyMap)
1346+ let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
10021347 check xs = do
1003− checkInitialItems (fromMaybe undefined $ apply postBuildPatch keyMap) xs
1348+ withRetry $ checkInitialItems (applyAlways postBuildPatch keyMap) xs
10041349 checkRemoval chan Key_Int
10051350 checkInsert chan Key_Char 'B'
10061351 checkReplace chan Key_Bool True
1007− testWidget' static check $ void $ do
1352+ testWidget' preSwitchover check $ void $ do
10081353 pb <- getPostBuild
10091354 replace <- triggerEventWithChan chan
10101355 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1037,7 +1382,7 @@ tests wdConfig caps _selenium = do
10371382 it "handles postBuild correctly in prerender" $ runWD $ do
10381383 chan <- liftIO newChan
10391384 let check = do
1040− _ <- getAndCheckInitialItems (fromJust $ apply postBuildPatch keyMap)
1385+ _ <- getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
10411386 checkRemoval chan Key_Int
10421387 checkInsert chan Key_Char 'B'
10431388 checkReplace chan Key_Bool True
@@ -1048,7 +1393,7 @@ tests wdConfig caps _selenium = do
10481393 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
10491394 liftIO $ dmap `H.shouldBe` keyMap
10501395
1051− describe "traverseIntMapWithKeyWithAdjust" $ session' $ do
1396+ session' "traverseIntMapWithKeyWithAdjust" $ do
10521397 let textKeyInt k = "key" <> T.pack (show k)
10531398 intMap = IntMap.fromList
10541399 [ (1, "one")
@@ -1062,89 +1407,89 @@ tests wdConfig caps _selenium = do
10621407 pure v
10631408 checkItem :: WD.Element -> Text -> Text -> WD ()
10641409 checkItem li k v = do
1065− shouldContainText k =<< WD.findElemFrom li (WD.ByClass "key")
1066− shouldContainText v =<< WD.findElemFrom li (WD.ByClass "value")
1410+ putStrLnDebug "checkItem"
1411+ shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1412+ shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
10671413 checkInitialItems dm xs = do
1414+ putStrLnDebug "checkInitialItems"
10681415 liftIO $ assertEqual "Wrong amount of items in DOM" (IntMap.size dm) (length xs)
10691416 forM_ (zip xs (IntMap.toList dm)) $ \(e, (k, v)) -> checkItem e (textKeyInt k) v
1070− getAndCheckInitialItems dm = do
1417+ getAndCheckInitialItems dm = withRetry $ do
1418+ putStrLnDebug "getAndCheckInitialItems"
10711419 xs <- WD.findElems (WD.ByTag "li")
10721420 checkInitialItems dm xs
10731421 pure xs
10741422 checkRemoval chan k = do
1075− e <- WD.findElem (WD.ById $ textKeyInt k)
1076− liftIO $ do
1077− writeChan chan $ PatchIntMap $ IntMap.singleton k Nothing
1078− threadDelay 100000
1423+ putStrLnDebug "checkRemoval"
1424+ e <- findElemWithRetry (WD.ById $ textKeyInt k)
1425+ liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k Nothing
10791426 elementShouldBeRemoved e
10801427 checkReplace chan k v = do
1081− e <- WD.findElem (WD.ById $ textKeyInt k)
1082− liftIO $ do
1083− writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1084− threadDelay 100000
1428+ putStrLnDebug "checkReplace"
1429+ e <- findElemWithRetry (WD.ById $ textKeyInt k)
1430+ liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
10851431 elementShouldBeRemoved e
1086− e' <- WD.findElem (WD.ById $ textKeyInt k)
1087− checkItem e' (textKeyInt k) v
1432+ e' <- findElemWithRetry (WD.ById $ textKeyInt k)
1433+ withRetry $ checkItem e' (textKeyInt k) v
10881434 checkInsert chan k v = do
1089− liftIO $ do
1090− writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1091− threadDelay 100000
1092− e <- WD.findElem (WD.ById $ textKeyInt k)
1435+ putStrLnDebug "checkInsert"
1436+ liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1437+ e <- findElemWithRetry (WD.ById $ textKeyInt k)
10931438 checkItem e (textKeyInt k) v
10941439 postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
1095− it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1440+ xit "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
10961441 chan <- liftIO newChan
1097− let static = getAndCheckInitialItems intMap
1442+ let preSwitchover = getAndCheckInitialItems intMap
10981443 check xs = do
10991444 checkInitialItems intMap xs
11001445 checkRemoval chan 1
11011446 checkReplace chan 2 "deux"
11021447 checkInsert chan 4 "four"
1103− testWidget' static check $ void $ do
1448+ testWidget' preSwitchover check $ void $ do
11041449 (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
11051450 liftIO $ im `H.shouldBe` intMap
1106− it "handles postBuild correctly" $ runWD $ do
1451+ xit "handles postBuild correctly" $ runWD $ do
11071452 chan <- liftIO newChan
1108− let static = getAndCheckInitialItems (fromJust $ apply postBuildPatch intMap)
1453+ let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
11091454 check xs = do
1110− checkInitialItems (fromMaybe undefined $ apply postBuildPatch intMap) xs
1455+ withRetry $ checkInitialItems (applyAlways postBuildPatch intMap) xs
11111456 checkRemoval chan 1
11121457 checkInsert chan 2 "deux"
11131458 checkReplace chan 3 "trois"
1114− testWidget' static check $ void $ do
1459+ testWidget' preSwitchover check $ void $ do
11151460 pb <- getPostBuild
11161461 replace <- triggerEventWithChan chan
11171462 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
11181463 liftIO $ dmap `H.shouldBe` intMap
1119− it "can delete/update/insert when built in prerender" $ runWD $ do
1464+ xit "can delete/update/insert when built in prerender" $ runWD $ do
11201465 chan <- liftIO newChan
11211466 let check = do
11221467 _ <- getAndCheckInitialItems intMap
11231468 checkRemoval chan 1
11241469 checkReplace chan 2 "deux"
1125− checkInsert chan 3 "trois"
1470+ checkInsert chan 4 "quatre"
11261471 testWidget (pure ()) check $ do
11271472 replace <- triggerEventWithChan chan
11281473 prerender_ (pure ()) $ do
11291474 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap replace
11301475 liftIO $ dmap `H.shouldBe` intMap
1131− it "can delete/update/insert when built in immediate mode" $ runWD $ do
1476+ xit "can delete/update/insert when built in immediate mode" $ runWD $ do
11321477 chan <- liftIO newChan
11331478 let check = do
11341479 _ <- getAndCheckInitialItems intMap
11351480 checkRemoval chan 1
11361481 checkReplace chan 2 "deux"
1137− checkInsert chan 3 "trois"
1482+ checkInsert chan 4 "quatre"
11381483 testWidget (pure ()) check $ void $ do
11391484 pb <- getPostBuild
11401485 runWithReplace (pure ()) $ ffor pb $ \() -> void $ do
11411486 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
11421487 liftIO $ dmap `H.shouldBe` intMap
11431488 -- Should be fixed by prerender changes!
1144− it "handles postBuild correctly in prerender" $ runWD $ do
1489+ xit "handles postBuild correctly in prerender" $ runWD $ do
11451490 chan <- liftIO newChan
11461491 let check = do
1147− _ <- getAndCheckInitialItems (fromJust $ apply postBuildPatch intMap)
1492+ _ <- getAndCheckInitialItems $ applyAlways postBuildPatch intMap
11481493 checkRemoval chan 1
11491494 checkInsert chan 2 "deux"
11501495 checkReplace chan 3 "trois"
@@ -1155,47 +1500,30 @@ tests wdConfig caps _selenium = do
11551500 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
11561501 liftIO $ dmap `H.shouldBe` intMap
11571502
1158− describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do
1503+ session' "traverseDMapWithKeyWithAdjustWithMove" $ do
11591504 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
1160− widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1161− elClass "span" "key" $ text $ textKey k
1505+ widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
1506+ elClass "span" "key" $ text $ textKey2 k
11621507 elClass "span" "value" $ text $ T.pack $ has @Show k $ show v
11631508 pure (Identity v)
1164− textKey :: Key2 a -> Text
1165− textKey = \case
1509+ textKey2 :: Key2 a -> Text
1510+ textKey2 = \case
11661511 Key2_Int i -> "i" <> T.pack (show i)
11671512 Key2_Char c -> "c" <> T.pack [c]
11681513 checkItem :: WD.Element -> Text -> Text -> WD ()
11691514 checkItem li k v = do
1170− shouldContainText k =<< WD.findElemFrom li (WD.ByClass "key")
1171− shouldContainText v =<< WD.findElemFrom li (WD.ByClass "value")
1515+ shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1516+ shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
11721517 checkInitialItems dm xs = do
11731518 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1174− forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey k) (T.pack $ has @Show k $ show v)
1175− getAndCheckInitialItems dm = do
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
11761521 xs <- WD.findElems (WD.ByTag "li")
11771522 checkInitialItems dm xs
11781523 pure xs
1179− checkRemoval chan k = do
1180− e <- WD.findElem (WD.ById $ textKey k)
1181− liftIO $ do
1182− writeChan chan $ deleteDMapKey k
1183− threadDelay 100000
1184− elementShouldBeRemoved e
1185− checkReplace chan k v = do
1186− e <- WD.findElem (WD.ById $ textKey k)
1187− liftIO $ do
1188− writeChan chan $ insertDMapKey k (Identity v)
1189− threadDelay 100000
1190− elementShouldBeRemoved e
1191− e' <- WD.findElem (WD.ById $ textKey k)
1192− checkItem e' (textKey k) (T.pack $ show v)
1193− checkInsert chan k v = do
1194− liftIO $ do
1195− writeChan chan $ insertDMapKey k (Identity v)
1196− threadDelay 100000
1197− e <- WD.findElem (WD.ById $ textKey k)
1198− checkItem e (textKey k) (T.pack $ show v)
1524+ moveSpec
1525+ :: (DMap Key2 Identity -> (WD.Element -> Chan (PatchDMapWithMove Key2 Identity) -> WD ()) -> WD ())
1526+ -> H.SpecM (WdTestSession ()) ()
11991527 moveSpec testMove = do
12001528 it "can insert an item" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 3 ==> 3]) $ \body chan -> do
12011529 shouldContainText (T.strip $ T.unlines ["i11","i33"]) body
@@ -1223,26 +1551,26 @@ tests wdConfig caps _selenium = do
12231551
12241552 describe "hydration" $ moveSpec $ \initMap test -> do
12251553 chan <- liftIO newChan
1226− let static = getAndCheckInitialItems initMap
1554+ let preSwitchover = getAndCheckInitialItems initMap
12271555 check xs = do
12281556 checkInitialItems initMap xs
1229− body <- WD.findElem (WD.ByTag "body")
1557+ body <- getBody
12301558 test body chan
1231− testWidget' static check $ void $ do
1559+ testWidget' preSwitchover check $ void $ do
12321560 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
12331561 liftIO $ assertEqual "DMap" initMap dmap
12341562
12351563 describe "hydration/immediate" $ moveSpec $ \initMap test -> do
12361564 chan <- liftIO newChan
12371565 replace <- liftIO newChan
1238− lock <- liftIO newEmptyMVar
1566+ lock :: MVar () <- liftIO newEmptyMVar
12391567 let check = do
12401568 liftIO $ do
12411569 writeChan replace ()
12421570 takeMVar lock
12431571 xs <- getAndCheckInitialItems initMap
12441572 checkInitialItems initMap xs
1245− body <- WD.findElem (WD.ByTag "body")
1573+ body <- getBody
12461574 test body chan
12471575 testWidget (pure ()) check $ void $ do
12481576 e <- triggerEventWithChan replace
@@ -1252,24 +1580,26 @@ tests wdConfig caps _selenium = do
12521580 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
12531581 liftIO $ assertEqual "DMap" initMap dmap
12541582
1255− describe "hydrating invalid HTML" $ session' $ do
1256− it "can hydrate list in paragraph" $ runWD $ do
1257− let static = do
1258− body <- WD.findElem (WD.ByTag "body")
1259− shouldContainText "before\ninner\nafter" body
1583+ session' "hydrating invalid HTML" $ do
1584+ xit "can hydrate list in paragraph" $ runWD $ do
1585+ let preSwitchover = do
1586+ checkBodyText "before\ninner\nafter"
12601587 -- Two <p> tags should be present
1261− [p1, p2] <- WD.findElems (WD.ByTag "p")
1262− ol <- WD.findElem (WD.ByTag "ol")
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")
12631592 shouldContainText "before" p1
12641593 shouldContainText "inner" ol
12651594 shouldContainText "" p2
1266− pure (body, p1, ol, p2)
1267− check (body, p1, ol, p2) = do
1268− shouldContainText "before\ninner\nafter" body
1595+ pure (p1, ol, p2)
1596+ check (p1, ol, p2) = do
1597+ checkBodyText "before\ninner\nafter"
12691598 shouldContainText "before\ninner\nafter" p1
12701599 elementShouldBeRemoved ol
12711600 elementShouldBeRemoved p2
1272− testWidget' static check $ do
1601+ -- Don't fail fatally when hydration encounters the invalid DOM
1602+ testWidgetDebug' False withDebugging preSwitchover check $ do
12731603 -- This is deliberately invalid HTML, the browser will interpret it as
12741604 -- <p>before</p><ol>inner</ol>after<p></p>
12751605 el "p" $ do
@@ -1277,6 +1607,29 @@ tests wdConfig caps _selenium = do
12771607 el "ol" $ text "inner"
12781608 text "after"
12791609
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+
12801633data Selenium = Selenium
12811634 { _selenium_portNumber :: PortNumber
12821635 , _selenium_stopServer :: IO ()
@@ -1293,11 +1646,10 @@ startSeleniumServer port = do
12931646
12941647withSeleniumServer :: (Selenium -> IO ()) -> IO ()
12951648withSeleniumServer f = do
1296− port <- getFreePort
1297− stopServer <- startSeleniumServer port
1649+ stopServer <- startSeleniumServer seleniumPort
12981650 threadDelay $ 1000 * 1000 * 2 -- TODO poll or wait on a a signal to block on
12991651 f $ Selenium
1300− { _selenium_portNumber = port
1652+ { _selenium_portNumber = seleniumPort
13011653 , _selenium_stopServer = stopServer
13021654 }
13031655
@@ -1308,121 +1660,163 @@ triggerEventWithChan chan = do
13081660 prerender_ (pure ()) $ void $ liftIO $ forkIO $ forever $ trigger =<< readChan chan
13091661 pure e
13101662
1663+shouldBeWithRetryM :: (Eq a, Show a) => WD a -> a -> WD ()
1664+shouldBeWithRetryM m expected = withRetry $ do
1665+ got <- m
1666+ got `shouldBe` expected
1667+
13111668assertAttr :: WD.Element -> Text -> Maybe Text -> WD ()
13121669assertAttr e k v = liftIO . assertEqual "Incorrect attribute value" v =<< WD.attr e k
13131670
13141671elementShouldBeRemoved :: WD.Element -> WD ()
1315−elementShouldBeRemoved e = do
1672+elementShouldBeRemoved e = withRetry $ do
13161673 try (WD.getText e) >>= \case
13171674 Left (WD.FailedCommand WD.StaleElementReference _) -> return ()
13181675 Left err -> throwM err
13191676 Right !_ -> liftIO $ assertFailure "Expected element to be removed, but it still exists"
13201677
13211678shouldContainText :: Text -> WD.Element -> WD ()
1322−shouldContainText t = flip shouldBe t <=< WD.getText
1679+shouldContainText t = withRetry . shouldContainTextNoRetry t
1680+
1681+shouldContainTextNoRetry :: Text -> WD.Element -> WD ()
1682+shouldContainTextNoRetry t = flip shouldBe t <=< WD.getText
13231683
13241684checkBodyText :: Text -> WD ()
13251685checkBodyText = checkTextInTag "body"
13261686
13271687checkTextInTag :: Text -> Text -> WD ()
1328−checkTextInTag t expected = WD.findElem (WD.ByTag t) >>= shouldContainText expected
1688+checkTextInTag t expected = do
1689+ e <- findElemWithRetry (WD.ByTag t)
1690+ shouldContainText expected e
13291691
13301692checkTextInId :: Text -> Text -> WD ()
1331−checkTextInId i expected = WD.findElem (WD.ById i) >>= shouldContainText expected
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
13321715
13331716divId :: DomBuilder t m => Text -> m a -> m a
13341717divId i = elAttr "div" ("id" =: i)
13351718
13361719type 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)
13371720
1338−testWidgetStatic
1339− :: WD b
1721+testWidgetStaticDebug
1722+ :: Bool
1723+ -> WD b
13401724 -- ^ Webdriver commands to run before JS runs and after hydration switchover
13411725 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
13421726 -- ^ Widget we are testing
13431727 -> WD b
1344−testWidgetStatic w = testWidget (void w) w
1728+testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
13451729
13461730-- | TODO: do something about JSExceptions not causing tests to fail
1347−testWidget
1348− :: WD ()
1731+testWidgetDebug
1732+ :: Bool
1733+ -> Bool
1734+ -> WD ()
13491735 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
13501736 -> WD b
13511737 -- ^ Webdriver commands to run after hydration switchover
13521738 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
13531739 -- ^ Widget we are testing
13541740 -> WD b
1355−testWidget beforeJS afterSwitchover = testWidget' beforeJS (const afterSwitchover)
1741+testWidgetDebug hardFailure withDebugging beforeJS afterSwitchover =
1742+ testWidgetDebug' hardFailure withDebugging beforeJS (const afterSwitchover)
1743+
1744+data HydrationFailedException = HydrationFailedException deriving Show
1745+instance Exception HydrationFailedException
13561746
13571747-- | TODO: do something about JSExceptions not causing tests to fail
1358−testWidget'
1359− :: WD a
1748+testWidgetDebug'
1749+ :: Bool
1750+ -> Bool
1751+ -> WD a
13601752 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
13611753 -> (a -> WD b)
13621754 -- ^ Webdriver commands to run after hydration switchover
13631755 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
13641756 -- ^ Widget we are testing (contents of body)
13651757 -> WD b
1366−testWidget' beforeJS afterSwitchover bodyWidget = maybe (error "test timed out") pure <=< timeout testTimeLimit $ do
1367− let staticApp = do
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
13681762 el "head" $ pure ()
13691763 el "body" $ do
13701764 bodyWidget
13711765 el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1372− ((), html) <- liftIO $ renderStatic staticApp
1766+ putStrLnDebug "rendering static"
1767+ ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
1768+ putStrLnDebug "rendered static"
13731769 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770+ onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
13741771 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
13751772 let entryPoint = do
1773+ putStrLnDebug "taking waitBeforeJS"
13761774 liftIO $ takeMVar waitBeforeJS
1377− mainHydrationWidgetWithSwitchoverAction (liftIO $ putMVar waitUntilSwitchover ()) (pure ()) bodyWidget
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"
13781784 syncPoint
1379− application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse ->
1380− sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
1381− port <- getFreePort
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
13821790 waitJSaddle <- liftIO newEmptyMVar
13831791 let settings = foldr ($) Warp.defaultSettings
1384− [ Warp.setPort $ fromIntegral (toInteger port)
1385− , Warp.setBeforeMainLoop $ putMVar waitJSaddle ()
1792+ [ Warp.setPort $ fromIntegral $ toInteger jsaddlePort
1793+ , Warp.setBeforeMainLoop $ do
1794+ putStrLnDebug "putting waitJSaddle"
1795+ putMVar waitJSaddle ()
1796+ putStrLnDebug "put waitJSaddle"
13861797 ]
13871798 -- hSilence to get rid of ConnectionClosed logs
1388− jsaddleWarp = forkIO $ hSilence [stderr] $ Warp.runSettings settings application
1389− jsaddleTid <- liftIO jsaddleWarp
1390− liftIO $ takeMVar waitJSaddle
1391− WD.openPage $ "http://localhost:" <> show port
1392− a <- beforeJS
1393− liftIO $ putMVar waitBeforeJS ()
1394− liftIO $ takeMVar waitUntilSwitchover
1395− liftIO $ threadDelay 100000 -- wait a bit
1396− b <- afterSwitchover a
1397− liftIO $ killThread jsaddleTid
1398− return b
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
13991814
1400−
1401−-- TODO: Should this be part of more widely used module?
1402−-- TODO: Ensure port is not taken
1403−getFreePort :: MonadIO m => m PortNumber
1404−getFreePort = liftIO $ withSocketsDo $ do
1405− addr:_ <- getAddrInfo (Just defaultHints) (Just "127.0.0.1") (Just "0")
1406− bracket (open addr) close socketPort
1407− where
1408− open addr = do
1409− sock <- socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr)
1410− bind sock (addrAddress addr)
1411− return sock
1412−
1413−testWidgetDebug :: MonadIO n => (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> n ()
1414−testWidgetDebug bodyWidget = liftIO $ do
1415− let staticApp = do
1416− el "head" $ pure ()
1417− el "body" $ do
1418− bodyWidget
1419− el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1420− ((), html) <- renderStatic staticApp
1421− let entryPoint = do
1422− mainHydrationWidgetWithSwitchoverAction (pure ()) (pure ()) bodyWidget
1423− syncPoint
1424− application <- jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
1425− Warp.runSettings (Warp.setPort 3911 Warp.defaultSettings) application
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)
14261820
14271821data Key2 a where
14281822 Key2_Int :: Int -> Key2 Int
@@ -1432,12 +1826,3 @@ deriveGEq ''Key2
14321826deriveGCompare ''Key2
14331827deriveGShow ''Key2
14341828deriveArgDict ''Key2
1435−
1436−instance ShowTag Key2 Identity where
1437− showTaggedPrec = \case
1438− Key2_Int _ -> showsPrec
1439− Key2_Char _ -> showsPrec
1440−
1441−instance EqTag Key2 Identity where
1442− eqTagged (Key2_Int _) (Key2_Int _) = (==)
1443− eqTagged (Key2_Char _) (Key2_Char _) = (==)
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.hs+2−1
@@ -15,8 +15,9 @@ import qualified Data.Text as T
1515import Reflex.Dom
1616import System.Random
1717import qualified Data.Map as Map
18−import Data.Dependent.Map (DMap (..), DSum (..))
18+import Data.Dependent.Map (DMap (..))
1919import qualified Data.Dependent.Map as DMap
20+import Data.Dependent.Sum (DSum (..))
2021import Data.Functor.Misc
2122import Data.Functor.Identity
2223import Data.Functor.Compose
reflex-dom/default.nixdeleted−37
@@ -1,37 +0,0 @@
1−{ mkDerivation, base, bytestring, jsaddle-webkit2gtk, jsaddle-wkwebview, jsaddle-warp, reflex
2−, reflex-dom-core, stdenv, text, ghc, hostPlatform, jsaddle-clib, android-activity ? null
3−, ghcBackend ? if hostPlatform.isDarwin then "warp" else "webkit2gtk"
4−}:
5−assert (builtins.elem ghcBackend [ "warp" "webkit2gtk" ]);
6−let isAndroid = hostPlatform.libc == "bionic";
7− ghcBackendPackage = {
8− webkit2gtk = jsaddle-webkit2gtk;
9− warp = jsaddle-warp;
10− }.${ghcBackend};
11−in mkDerivation {
12− pname = "reflex-dom";
13− version = "0.4";
14− src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
15− libraryHaskellDepends = [
16− base bytestring reflex reflex-dom-core text
17− ] ++ (if ghc.isGhcjs or false then [
18− ] else if hostPlatform.isiOS then [
19− jsaddle-wkwebview
20− ] else if isAndroid then [
21− jsaddle-clib
22− android-activity
23− ] else if hostPlatform.isMacOS then [
24− jsaddle-wkwebview
25− ghcBackendPackage
26− ] else [
27− ghcBackendPackage
28− ]);
29− configureFlags = if isAndroid then [
30− "-fandroid"
31− ] else if ghcBackend == "warp" then [
32− "-fuse-warp"
33− ] else [
34− ];
35− description = "Functional Reactive Web Apps with Reflex";
36− license = stdenv.lib.licenses.bsd3;
37−}
reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java+14−1
@@ -8,6 +8,7 @@ import android.util.Log;
88import android.view.ViewGroup.LayoutParams;
99import android.view.Window;
1010import android.webkit.CookieManager;
11+import android.webkit.GeolocationPermissions;
1112import android.webkit.JavascriptInterface;
1213import android.webkit.MimeTypeMap;
1314import android.webkit.PermissionRequest;
@@ -22,6 +23,7 @@ import java.io.IOException;
2223import java.io.InputStream;
2324import android.content.Intent;
2425import android.content.ActivityNotFoundException;
26+import java.util.concurrent.atomic.AtomicBoolean;
2527
2628import java.nio.charset.StandardCharsets;
2729
@@ -45,11 +47,17 @@ public class MainWidget {
4547 wv.setWebContentsDebuggingEnabled(true);
4648 // allow video to play without user interaction
4749 wv.getSettings().setMediaPlaybackRequiresUserGesture(false);
50+ final AtomicBoolean jsaddleLoaded = new AtomicBoolean(false);
4851
4952 wv.setWebViewClient(new WebViewClient() {
5053 @Override
5154 public void onPageFinished(WebView _view, String _url) {
52− wv.evaluateJavascript(initialJS, null);
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+ }
5361 }
5462
5563 // Re-route / to /android_asset
@@ -115,6 +123,11 @@ public class MainWidget {
115123 public Bitmap getDefaultVideoPoster() {
116124 return Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
117125 }
126+
127+ @Override
128+ public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) {
129+ callback.invoke(origin, true, false);
130+ }
118131 });
119132
120133 wv.addJavascriptInterface(new JSaddleCallbacks(jsaddleCallbacks), "jsaddle");
reflex-dom/reflex-dom.cabal+76−28
@@ -1,10 +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
45Description:
5− Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine.
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.
69 .
7− For hackage documentation, please see: <https://hackage.haskell.org/package/reflex-dom-core>.
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>.
818License: BSD3
919License-file: LICENSE
1020Author: Ryan Trinkle
@@ -12,8 +22,9 @@ Maintainer: ryan.trinkle@gmail.com
1222Stability: Experimental
1323Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
1424Build-type: Simple
15−cabal-version: >=1.24
16−extra-source-files: java/org/reflexfrp/reflexdom/MainWidget.java
25+extra-source-files:
26+ java/org/reflexfrp/reflexdom/MainWidget.java
27+ ChangeLog.md
1728
1829flag use-warp
1930 description: Use jsaddle-warp server
@@ -39,60 +50,67 @@ flag build-examples
3950 default: False
4051 manual: True
4152
42−flag android
43− description: Build an Android app
53+flag wasm32
54+ description: Build for wasm32 architecture
4455 default: False
4556 manual: True
4657
4758library
4859 hs-source-dirs: src
49− if flag(android)
60+ if os(android)
5061 hs-source-dirs: src-android
5162 other-modules: Reflex.Dom.Android.MainWidget
5263 build-depends:
53− aeson,
64+ aeson >= 1.4 && < 1.6,
5465 android-activity == 0.1.*,
5566 data-default == 0.7.*,
56− jsaddle
67+ jsaddle >= 0.9.6 && < 0.10
5768 c-sources: cbits/MainWidget.c
5869 include-dirs: cbits/include
5970 install-includes: MainWidget.h
6071 cpp-options: -DANDROID
6172 build-tools: hsc2hs
6273 build-depends:
63− base >= 4.7 && < 4.12,
74+ base >= 4.7 && < 4.15,
6475 bytestring == 0.10.*,
65− reflex == 0.5.*,
66− reflex-dom-core >=0.4 && <0.5,
76+ reflex >= 0.8 && < 0.9,
77+ reflex-dom-core >= 0.6.1.0 && <0.7,
6778 text == 1.2.*
6879 if !impl(ghcjs)
69− if os(osx) || os(ios)
80+ if flag(use-warp) && (os(linux) || os(osx))
7081 build-depends:
71− data-default == 0.7.*,
72− jsaddle,
73− jsaddle-wkwebview
82+ jsaddle >= 0.9.6 && < 0.10,
83+ jsaddle-warp >= 0.9.6 && < 0.10
7484 else
75− if flag(use-warp)
85+ if os(osx) || os(ios)
7686 build-depends:
77− jsaddle,
78− jsaddle-warp
87+ data-default == 0.7.*,
88+ jsaddle >= 0.9.6 && < 0.10,
89+ jsaddle-wkwebview >= 0.9.6 && < 0.10
7990 else
80− if flag(webkit2gtk)
91+ if flag(wasm32)
8192 build-depends:
82− jsaddle-webkit2gtk
93+ jsaddle >= 0.9.6 && < 0.10,
94+ jsaddle-wasm >= 0.1 && < 0.2
8395 else
84− if !flag(android)
96+ if flag(webkit2gtk)
8597 build-depends:
86− jsaddle-webkit2gtk
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
87103
88104 exposed-modules:
89105 Reflex.Dom
90106 Reflex.Dom.Internal
91107 reexported-modules:
92− Foreign.JavaScript.TH
93− , Foreign.JavaScript.Orphans
108+ Foreign.JavaScript.Orphans
109+ , Foreign.JavaScript.TH
110+ , Foreign.JavaScript.Utils
94111 , Reflex.Dom.Builder.Class
95112 , Reflex.Dom.Builder.Class.Events
113+ , Reflex.Dom.Builder.Hydratable
96114 , Reflex.Dom.Builder.Immediate
97115 , Reflex.Dom.Builder.InputDisabled
98116 , Reflex.Dom.Builder.Static
@@ -100,14 +118,19 @@ library
100118 , Reflex.Dom.Core
101119 , Reflex.Dom.Location
102120 , Reflex.Dom.Main
121+ , Reflex.Dom.Modals.Class
103122 , Reflex.Dom.Old
123+ , Reflex.Dom.Prerender
124+ , Reflex.Dom.Time
104125 , Reflex.Dom.WebSocket
126+ , Reflex.Dom.WebSocket.Query
105127 , Reflex.Dom.Widget
106128 , Reflex.Dom.Widget.Basic
107129 , Reflex.Dom.Widget.Input
108130 , Reflex.Dom.Widget.Lazy
109131 , Reflex.Dom.Widget.Resize
110132 , Reflex.Dom.Xhr
133+ , Reflex.Dom.Xhr.FormData
111134 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
112135 if flag(expose-all-unfoldings)
113136 ghc-options: -fexpose-all-unfoldings
@@ -139,7 +162,19 @@ executable sortableList
139162 default-language: Haskell2010
140163
141164executable benchmark
142− build-depends: base, reflex, reflex-dom, text, prim-uniq, dependent-map, containers, transformers, mtl, ghcjs-dom, ghc-prim, random, dependent-sum
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
143178 hs-source-dirs: .
144179 main-is: benchmark.hs
145180 ghc-options: -O2 -fspecialise-aggressively
@@ -148,7 +183,20 @@ executable benchmark
148183 default-language: Haskell2010
149184
150185executable krausest
151− build-depends: base, reflex, reflex-dom, text, prim-uniq, dependent-map, containers, transformers, mtl, ghcjs-dom, ghc-prim, random, dependent-sum, vector
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
152200 hs-source-dirs: benchmarks
153201 main-is: krausest.hs
154202 ghc-options: -O2 -fspecialise-aggressively
reflex-dom/src/Reflex/Dom/Internal.hs+5
@@ -80,6 +80,11 @@ run jsm = do
8080 startMainWidget a startPage jsm
8181 }
8282 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
8388#else
8489import Language.Javascript.JSaddle.WebKitGTK (run)
8590#endif
reflex-platform.nixdeleted−8
@@ -1,8 +0,0 @@
1−let
2− reflex-platform-src = (import <nixpkgs> {}).fetchFromGitHub {
3− owner = "reflex-frp";
4− repo = "reflex-platform";
5− rev = "384cd850f3adf1d404bced2424b5f6efb0f415f2";
6− sha256 = "1ws77prqx8khmp8j6br1ij4k2v4dlgv170r9fmg0p1jivfbn8y9d";
7− };
8−in import reflex-platform-src
release.nix+61−10
@@ -1,12 +1,63 @@
1−{ rp ? import ./reflex-platform.nix {}
1+{ reflex-platform-fun ? import ./dep/reflex-platform
2+, supportedSystems ? ["x86_64-linux" "x86_64-darwin"]
23}:
4+
35let
4− inherit (rp.nixpkgs) lib;
5− systems = ["x86_64-linux" "x86_64-darwin"];
6− compilers = ["ghc8_4" "ghc8_0" "ghcjs8_4" "ghcjs8_0"];
7−in lib.genAttrs systems (system:
8− lib.genAttrs compilers (ghc: let
9− reflex-platform = import ./reflex-platform.nix { inherit system; };
10− hsPkgs = reflex-platform.${ghc};
11− in { inherit (import ./. hsPkgs reflex-platform.nixpkgs) reflex-dom reflex-dom-core; })
12−)
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/prebuild.hsdeleted−127
@@ -1,127 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE ScopedTypeVariables #-}
4−{-# LANGUAGE TypeFamilies #-}
5−{-# LANGUAGE LambdaCase #-}
6−{-# LANGUAGE FlexibleInstances #-}
7−{-# LANGUAGE MultiParamTypeClasses #-}
8−import Control.Monad
9−import Control.Monad.Identity
10−import Control.Monad.Trans
11−import Reflex.Dom
12−import qualified Data.Text as T
13−import Control.Concurrent
14−
15−import Control.Monad.State.Strict
16−import Data.Functor.Misc
17−import Data.Monoid
18−import Data.Word
19−import qualified Data.Map as Map
20−import qualified Data.Dependent.Map as DMap
21−import Data.Dependent.Sum
22−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
23−
24−main :: IO ()
25−main = mainWidget w
26−
27−w :: forall t m. (MonadWidget t m, DomRenderHook t m, MountableDomBuilder t m) => m ()
28−w = do
29− let slow :: forall m'. (MonadWidget t m', DomRenderHook t m') => m' ()
30− {-
31− performEventChain = do
32− postBuild <- delay 0 =<< getPostBuild
33− rec let maxN = 10000
34− n = leftmost [0 <$ postBuild, ffilter (<=maxN) $ succ <$> n']
35− n' <- performEvent $ return <$> n
36− pausedUntil $ ffilter (==maxN) n'
37− _ <- widgetHold (text "Starting") $ text . T.pack . show <$> n
38− return ()
39− -}
40−-- {- Many dyns
41− slow = elAttr "div" ("style" =: "position:relative;width:256px;height:256px") $ go maxDepth
42− where maxDepth = 6 :: Int
43− go 0 = blank
44− go n = void $ dyn $ pure $ do
45− let bgcolor = "rgba(0,0,0," <> T.pack (show (1 - (fromIntegral n / fromIntegral maxDepth) :: Double)) <> ")"
46− s pos = pos <> ";position:absolute;border:1px solid white;background-color:" <> bgcolor
47− elAttr "div" ("style" =: s "left:0;right:50%;top:0;bottom:50%") $ go $ pred n
48− elAttr "div" ("style" =: s "left:50%;right:0;top:0;bottom:50%") $ go $ pred n
49− elAttr "div" ("style" =: s "left:50%;right:0;top:50%;bottom:0") $ go $ pred n
50− elAttr "div" ("style" =: s "left:0;right:50%;top:50%;bottom:0") $ go $ pred n
51−-- -}
52− {- Many elDynAttrs
53− slow = do
54− let size = 64
55− replicateM_ size $ elAttr "div" ("style" =: ("height:4px;width:" <> T.pack (show (size*4)) <> "px;line-height:0;background-color:gray")) $ do
56− replicateM_ size $ elDynAttr "div" (pure $ "style" =: "display:inline-block;width:4px;height:4px;background-color:black") blank
57− -}
58− {- Many dynTexts
59− slow = el "table" $ do
60− let size = 64
61− replicateM_ size $ el "tr" $ do
62− replicateM_ size $ el "td" $ do
63− dynText $ pure "."
64− -}
65− {- Many simultaneous performEvents
66− slow = do
67− postBuild <- getPostBuild
68− replicateM_ ((2 :: Int) ^ (14 :: Int)) $ performEvent_ $ return () <$ postBuild
69− done <- performEvent $ return () <$ postBuild
70− _ <- widgetHold (text "Doing performEvent") $ text "Done" <$ done
71− return ()
72− -}
73− {-
74− slow = do
75− postBuild <- getPostBuild
76− postBuild' <- performEvent . (return () <$) =<< performEvent . (return () <$) =<< getPostBuild
77− let f x = Map.fromList [(n, x) | n <- [1 :: Int .. 4096]]
78− listHoldWithKey (f False) (f (Just True) <$ postBuild') $ \k -> \case
79− False -> do
80− text "X "
81− notReadyUntil =<< getPostBuild
82− True -> do
83− text ". "
84− return ()
85− -}
86− {-
87− slow = do
88− let f :: forall a. EitherTag () () a -> Const2 () () a -> m' (Const2 () () a)
89− f _ (Const2 ()) = do
90− notReadyUntil =<< delay 0.5 =<< getPostBuild
91− text "Done"
92− return $ Const2 ()
93− postBuild <- getPostBuild
94− traverseDMapWithKeyWithAdjustWithMove f (DMap.singleton LeftTag $ Const2 ()) $ (PatchDMapWithMove.moveDMapKey LeftTag RightTag) <$ postBuild
95− return ()
96− -}
97− {-
98− slow = do
99− let h x = do
100− liftIO $ putStrLn "render hook"
101− result <- x
102− liftIO $ putStrLn "render hook done"
103− return result
104− f :: forall a. Const2 () () a -> Identity a -> m' (Identity a)
105− f (Const2 ()) (Identity ()) = do
106− liftIO $ putStrLn "f"
107− widgetHold notReady . (blank <$) =<< delay 0.1 =<< getPostBuild
108− liftIO $ putStrLn "f done"
109− return $ Identity ()
110− withRenderHook h $ do
111− postBuild <- getPostBuild
112− _ <- traverseDMapWithKeyWithAdjust f mempty $ PatchDMap (DMap.singleton (Const2 () :: Const2 () () ()) (ComposeMaybe $ Just $ Identity ())) <$ postBuild
113− return ()
114− -}
115− el "div" $ do
116− draw <- button "Draw"
117− widgetHold blank $ ffor draw $ \_ -> do
118− _ <- untilReady (text "Loading...") slow
119− return ()
120− return ()
121−
122−#ifdef EXPERIMENTAL_DEPENDENT_SUM_INSTANCES
123−instance {-# INCOHERENT #-} (Show (f a), Show (f b)) => ShowTag (EitherTag a b) f where
124− showTagToShow e _ = case e of
125− LeftTag -> id
126− RightTag -> id
127−#endif
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)