on develop help sign in
57 files changed+1910−759
since splitsnapshots
unifiedsplit
.github/workflows/haskell.yml+47 CONTRIBUTING.md+5 FAQ.md+31 LICENSE+12 README.md+9−9 cabal.project+10 cabal.project-nogtk+14 chrome-test-utils/LICENSE+1−1 chrome-test-utils/chrome-test-utils.cabal+1−1 chrome-test-utils/src/Test/Util/UnshareNetwork.hs+2−2 default.nix−7 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+87 reflex-dom-core/LICENSE+1−1 reflex-dom-core/default.nix−63 reflex-dom-core/reflex-dom-core.cabal+67−29 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+11−2 reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs+13−2 reflex-dom-core/src/Reflex/Dom/Builder/Hydratable.hs+116 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+160−66 reflex-dom-core/src/Reflex/Dom/Builder/InputDisabled.hs+6 reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+48−20 reflex-dom-core/src/Reflex/Dom/Class.hs+4−7 reflex-dom-core/src/Reflex/Dom/Core.hs+1 reflex-dom-core/src/Reflex/Dom/Main.hs+83−34 reflex-dom-core/src/Reflex/Dom/Prerender.hs+15−7 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+1−1 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−2 reflex-dom-core/test/gc.hs+1−1 reflex-dom-core/test/hlint.hs+3−1 reflex-dom-core/test/hydration.hs+509−112 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+32 reflex-dom/LICENSE+1−1 reflex-dom/benchmark.hs+2−1 reflex-dom/default.nix−38 reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java+14−1 reflex-dom/reflex-dom.cabal+70−24 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.md+5
@@ -5,6 +5,7 @@ Contributions and issue reports are encouraged and appreciated!
55- [Opening Issues](#opening-issues)
66- [Submitting Changes](#submitting-changes)
77 - [Guidelines for Commit Messages](#guidelines-for-commit-messages)
8+ - [Guidelines for Pull Requests](#guidelines-for-pull-requests)
89 - [Code Quality](#code-quality)
910 - [Documentation](#documentation)
1011
@@ -30,6 +31,10 @@ One way to think about it is that your commit message should be able to complete
3031#### Body
3132For 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.
3233
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+
3338### Code Quality
3439
3540#### Warnings
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+9−9
@@ -1,21 +1,21 @@
11## [Reflex-DOM](https://reflex-frp.org)
22
3−[![Hackage](https://img.shields.io/hackage/v/reflex-dom.svg)](http://hackage.haskell.org/package/reflex-dom)
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)
44
5−### A Framework for Functional Reactive Web Apps in Haskell
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.
66
7−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).
8−
9−A summary of Reflex-DOM functions is available in the [quick reference](Quickref.md).
7+Reflex-DOM is a framework for building web applications in [Haskell](https://www.haskell.org/), based on the [Functional Reactive Programming](https://wiki.haskell.org/Functional_Reactive_Programming) library [Reflex](https://github.com/reflex-frp/reflex).
108
119**Visit https://reflex-frp.org/ for more information, tutorials, documentation and [examples](https://examples.reflex-frp.org/).**
1210
1311### Additional resources
14−[Get started with Reflex](https://github.com/reflex-frp/reflex-platform)
15−
16−[/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
1712
18−[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)
1919
2020### Hacking
2121
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/LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2019, 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:
chrome-test-utils/chrome-test-utils.cabal+1−1
@@ -1,5 +1,5 @@
11Name: chrome-test-utils
2−Version: 0.4
2+Version: 0.5
33Synopsis: Utilities to write headless Chromium tests
44License: BSD3
55License-file: LICENSE
chrome-test-utils/src/Test/Util/UnshareNetwork.hs+2−2
@@ -4,8 +4,8 @@ import System.Linux.Namespaces
44import System.Posix
55import System.Process
66
7−unshareNetork :: IO ()
8−unshareNetork = do
7+unshareNetwork :: IO ()
8+unshareNetwork = do
99 uid <- getEffectiveUserID
1010 unshare [User, Network]
1111 writeUserMappings Nothing [UserMapping 0 uid 1]
default.nixdeleted−7
@@ -1,7 +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− chrome-test-utils = haskellPackages.callCabal2nix "chrome-test-utils" ./chrome-test-utils {};
7−}
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.md+87
@@ -1,7 +1,94 @@
11# Revision history for reflex-dom-core
22
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+
388## 0.5
489
590* Add HydrationDomBuilderT to support hydration of statically rendered DOM nodes. See the note at the top of Reflex.Dom.Builder.Immediate.
91+
692* 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+
794* 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−63
@@ -1,63 +0,0 @@
1−{ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder
2−, bytestring, chrome-test-utils, 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
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 []) ++ [
19− temporary
20− jsaddle-warp
21− process
22− chrome-test-utils
23− ];
24− testSystemDepends = (drv.testSystemDepends or []) ++ [ chromium iproute ];
25− };
26−in mkDerivation (addGcTestDepends {
27− pname = "reflex-dom-core";
28− version = "0.5";
29− src = ./.;
30− libraryHaskellDepends = [
31− aeson base bifunctors bimap blaze-builder bytestring constraints
32− containers contravariant data-default dependent-map dependent-sum
33− dependent-sum-template directory exception-transformers ghcjs-dom
34− jsaddle keycode lens monad-control mtl network-uri primitive random
35− ref-tf reflex semigroups stm template-haskell text these
36− transformers unix zenc
37− ] ++ (if ghc.isGhcjs or false then [
38− hashable
39− ] else []);
40−
41− #TODO: Get hlint working for cross-compilation
42− doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
43−
44− # The headless browser run as part of the tests will exit without this
45− preBuild = ''
46− export HOME="$PWD"
47− '';
48−
49− # Show some output while running tests, so we might notice what's wrong
50− testTarget = "--show-details=streaming";
51−
52− testSystemDepends = [ selenium-server-standalone which ];
53− testHaskellDepends = [
54− aeson base bytestring constraints constraints-extras containers
55− dependent-map dependent-sum dependent-sum-template directory
56− exceptions filepath ghcjs-dom hlint hspec hspec-webdriver http-types HUnit jsaddle
57− jsaddle-warp lens lifted-base network process random reflex
58− silently temporary text unix wai wai-websockets warp webdriver
59− websockets
60− ];
61− description = "Functional Reactive Web Apps with Reflex";
62− license = stdenv.lib.licenses.bsd3;
63−})
reflex-dom-core/reflex-dom-core.cabal+67−29
@@ -1,7 +1,18 @@
1+cabal-version: 1.24
12Name: reflex-dom-core
2−Version: 0.5
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
@@ -39,39 +49,54 @@ flag profile-reflex
3949 default: False
4050 manual: True
4151
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+
4267library
4368 hs-source-dirs: src
4469 build-depends:
45− aeson >= 0.8 && < 1.5,
46− base >= 4.7 && < 4.12,
70+ aeson >= 0.8 && < 1.6,
71+ base >= 4.7 && < 4.15,
4772 bifunctors >= 4.2 && < 6,
48− bimap >= 0.3 && < 0.4,
49− blaze-builder,
73+ bimap >= 0.3 && < 0.5,
74+ blaze-builder >= 0.4.1 && < 0.5,
5075 bytestring == 0.10.*,
51− containers == 0.5.*,
52− constraints >= 0.9 && < 0.11,
76+ case-insensitive < 1.3,
77+ containers >= 0.6 && < 0.7,
78+ constraints >= 0.9 && < 0.13,
5379 contravariant >= 1.4 && < 1.6,
5480 data-default >= 0.5 && < 0.8,
55− dependent-map == 0.2.*,
56− dependent-sum >= 0.3 && < 0.7,
57− dependent-sum-template >= 0.0.0.4 && < 0.2,
81+ dependent-map >= 0.3 && < 0.5,
82+ dependent-sum >= 0.6 && < 0.8,
83+ dependent-sum-template >= 0.1 && < 0.2,
5884 directory >= 1.2 && < 1.4,
5985 exception-transformers == 0.4.*,
6086 ghcjs-dom >= 0.9.1.0 && < 0.10,
61− jsaddle >=0.9.0.0 && <0.10,
87+ jsaddle >= 0.9.0.0 && < 0.10,
6288 -- keycode-0.2 has a bug on firefox
6389 keycode >= 0.2.1 && < 0.3,
6490 lens >= 4.7 && < 5,
6591 monad-control >= 1.0.1 && < 1.1,
6692 mtl >= 2.1 && < 2.3,
67− primitive >= 0.5 && < 0.7,
68− random,
93+ primitive >= 0.5 && < 0.8,
94+ random >= 1.1 && < 1.2,
6995 ref-tf == 0.4.*,
70− reflex == 0.6.*,
71− semigroups >= 0.16 && < 0.19,
72− stm == 2.4.*,
96+ reflex >= 0.8 && < 0.9,
97+ semigroups >= 0.16 && < 0.20,
98+ stm >= 2.4 && < 2.6,
7399 text == 1.2.*,
74− these >= 0.4 && < 0.8,
75100 transformers >= 0.3 && < 0.6,
76101 network-uri >= 2.6.1 && < 2.7,
77102 zenc == 0.1.*
@@ -80,12 +105,20 @@ library
80105 hs-source-dirs: src-ghcjs
81106 build-depends:
82107 ghcjs-base,
83− hashable == 1.2.*
108+ hashable >= 1.2 && < 1.4
84109 else
85110 hs-source-dirs: src-ghc
86111 if !os(windows)
87112 build-depends: unix == 2.7.*
88113
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+
89122 exposed-modules:
90123 Foreign.JavaScript.TH
91124 Foreign.JavaScript.Orphans
@@ -94,6 +127,7 @@ library
94127 Reflex.Dom.Builder.Class.Events
95128 Reflex.Dom.Builder.Immediate
96129 Reflex.Dom.Builder.InputDisabled
130+ Reflex.Dom.Builder.Hydratable
97131 Reflex.Dom.Builder.Static
98132 Reflex.Dom.Class
99133 Reflex.Dom.Core
@@ -119,6 +153,7 @@ library
119153 Reflex.Dom.Xhr.ResponseType
120154 Reflex.Dom.Xhr.Exception
121155
156+ default-language: Haskell98
122157 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
123158 ghc-prof-options: -fprof-auto
124159
@@ -133,26 +168,26 @@ library
133168
134169 if flag(use-template-haskell)
135170 build-depends:
136− dependent-sum >= 0.3 && < 0.7,
137− dependent-sum-template >= 0.0.0.5 && < 0.2,
138− template-haskell
171+ dependent-sum-template >= 0.1 && < 0.2,
172+ template-haskell >= 2.12.0 && < 2.17
139173 other-extensions: TemplateHaskell
140174 cpp-options: -DUSE_TEMPLATE_HASKELL
141175 other-modules:
142176 Reflex.Dom.Builder.Class.TH
143− else
144− build-depends:
145− dependent-sum == 0.4.*
146177
147178test-suite hlint
148− build-depends: base, hlint
179+ build-depends:
180+ base,
181+ hlint >= 2.0 && < 4.0
149182 hs-source-dirs: test
150183 main-is: hlint.hs
151184 type: exitcode-stdio-1.0
185+ default-language: Haskell98
152186
153187test-suite hydration
154188 build-depends: base
155189 , aeson
190+ , async
156191 , bytestring
157192 , chrome-test-utils
158193 , constraints
@@ -188,12 +223,14 @@ test-suite hydration
188223 , warp
189224 , webdriver
190225 , websockets
226+ , which
191227 hs-source-dirs: test
192228 ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
193229 ghc-prof-options: -fprof-auto -optP-DPROFILING
194230 main-is: hydration.hs
195231 type: exitcode-stdio-1.0
196− if !os(linux) || !arch(x86_64) || flag(profile-reflex)
232+ default-language: Haskell98
233+ if !os(linux) || !arch(x86_64) || flag(profile-reflex) || !flag(hydration-tests)
197234 buildable: False
198235
199236-- broken test on base 4.11 & ghc 8.4.3
@@ -212,7 +249,8 @@ test-suite gc
212249 ghc-prof-options: -fprof-auto -optP-DPROFILING
213250 main-is: gc.hs
214251 type: exitcode-stdio-1.0
215− if !os(linux) || !arch(x86_64)
252+ default-language: Haskell98
253+ if !os(linux) || !arch(x86_64) || !flag(gc-tests)
216254 buildable: False
217255
218256source-repository head
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+11−2
@@ -9,11 +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 #-}
1416{-# LANGUAGE OverloadedStrings #-}
1517{-# LANGUAGE PolyKinds #-}
16−{-# LANGUAGE Rank2Types #-}
1718{-# LANGUAGE RecursiveDo #-}
1819{-# LANGUAGE ScopedTypeVariables #-}
1920{-# LANGUAGE StandaloneDeriving #-}
@@ -638,7 +639,7 @@ instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive
638639
639640-- * Convenience functions
640641
641−class HasDomEvent t target eventName where
642+class HasDomEvent t target eventName | target -> t where
642643 type DomEventType target eventName :: *
643644 domEvent :: EventName eventName -> target -> Event t (DomEventType target eventName)
644645
@@ -744,3 +745,11 @@ instance HasDocument m => HasDocument (DynamicWriterT t w m)
744745instance HasDocument m => HasDocument (PostBuildT t m)
745746instance HasDocument m => HasDocument (RequesterT t request response m)
746747instance 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−2
@@ -14,6 +14,7 @@ import Data.GADT.Compare.TH
1414import Data.GADT.Compare
1515 (GOrdering(..), (:~:)(..), GEq(..), GCompare(..))
1616#endif
17+import Data.Text (Text)
1718
1819data EventTag
1920 = AbortTag
@@ -151,7 +152,7 @@ type family EventResultType (en :: EventTag) :: * where
151152 EventResultType 'BeforecopyTag = ()
152153 EventResultType 'CopyTag = ()
153154 EventResultType 'BeforepasteTag = ()
154− EventResultType 'PasteTag = ()
155+ EventResultType 'PasteTag = Maybe Text
155156 EventResultType 'ResetTag = ()
156157 EventResultType 'SearchTag = ()
157158 EventResultType 'SelectstartTag = ()
@@ -159,7 +160,17 @@ type family EventResultType (en :: EventTag) :: * where
159160 EventResultType 'TouchmoveTag = TouchEventResult
160161 EventResultType 'TouchendTag = TouchEventResult
161162 EventResultType 'TouchcancelTag = TouchEventResult
162− 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)
163174
164175data TouchEventResult = TouchEventResult
165176 { _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+160−66
@@ -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
@@ -107,6 +107,9 @@ module Reflex.Dom.Builder.Immediate
107107 , WindowConfig (..)
108108 , Window (..)
109109 , wrapWindow
110+ -- * Attributes for controlling hydration
111+ , hydratableAttribute
112+ , skipHydrationAttribute
110113 -- * Internal
111114 , traverseDMapWithKeyWithAdjust'
112115 , hoistTraverseWithKeyWithAdjust
@@ -132,16 +135,20 @@ import Data.Functor.Compose
132135import Data.Functor.Constant
133136import Data.Functor.Misc
134137import Data.Functor.Product
138+import Data.GADT.Compare (GCompare)
135139import Data.IORef
136140import Data.IntMap.Strict (IntMap)
137141import Data.Maybe
138142import Data.Monoid ((<>))
139143import Data.Some (Some(..))
144+import Data.GADT.Compare (GCompare)
145+import Data.String (IsString)
140146import Data.Text (Text)
141147import Foreign.JavaScript.Internal.Utils
142148import Foreign.JavaScript.TH
149+import GHCJS.DOM.ClipboardEvent as ClipboardEvent
143150import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode, createComment)
144−import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute, hasAttributeNS)
151+import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute)
145152import GHCJS.DOM.EventM (EventM, event, on)
146153import GHCJS.DOM.KeyboardEvent as KeyboardEvent
147154import GHCJS.DOM.MouseEvent
@@ -175,6 +182,7 @@ import qualified Data.IntMap.Strict as IntMap
175182import qualified Data.Map as Map
176183import qualified Data.Text as T
177184import qualified GHCJS.DOM as DOM
185+import qualified GHCJS.DOM.DataTransfer as DataTransfer
178186import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
179187import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
180188import qualified GHCJS.DOM.Element as Element
@@ -192,6 +200,7 @@ import qualified GHCJS.DOM.TouchEvent as TouchEvent
192200import qualified GHCJS.DOM.TouchList as TouchList
193201import qualified GHCJS.DOM.Types as DOM
194202import qualified GHCJS.DOM.Window as Window
203+import qualified GHCJS.DOM.WheelEvent as WheelEvent
195204import qualified Reflex.Patch.DMap as PatchDMap
196205import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
197206import qualified Reflex.Patch.MapWithMove as PatchMapWithMove
@@ -285,12 +294,21 @@ localRunner (HydrationRunnerT m) s parent = do
285294runHydrationRunnerT
286295 :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
287296 => HydrationRunnerT t m a -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
288−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
289304 (a, s') <- runStateT m (HydrationState s False)
290305 traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
291306 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
292308 pure a
293309
310+
311+
294312instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where
295313 {-# INLINABLE newEventWithTrigger #-}
296314 newEventWithTrigger = lift . newEventWithTrigger
@@ -314,12 +332,11 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationRunnerT t m) where
314332-- done *before* the switchover to immediate mode - this is most likely some
315333-- form of 'hold' which we want to remove after hydration is done
316334{-# INLINABLE addHydrationStepWithSetup #-}
317−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 ()
318336addHydrationStepWithSetup setup f = getHydrationMode >>= \case
319337 HydrationMode_Immediate -> pure ()
320338 HydrationMode_Hydrating -> do
321− switchover <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_switchover
322− (s, _) <- lift $ runWithReplace setup $ return () <$ switchover
339+ s <- lift setup
323340 addHydrationStep (f s)
324341
325342-- | Add a hydration step
@@ -743,6 +760,14 @@ elementInternal elementTag cfg child = getHydrationMode >>= \case
743760 -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er HydrationDomSpace DomTimeline, a)
744761 #-}
745762
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+
746771{-# INLINE hydrateElement #-}
747772hydrateElement
748773 :: forall er t m a. (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
@@ -764,11 +789,15 @@ hydrateElement elementTag cfg child = do
764789 }
765790 result <- HydrationDomBuilderT $ lift $ runReaderT (unHydrationDomBuilderT child) env'
766791 wrapResult <- liftIO newEmptyMVar
767− let ssrAttr = "data-ssr" :: DOM.JSString
768− hasSSRAttribute :: DOM.Element -> HydrationRunnerT t m Bool
769− hasSSRAttribute e = case cfg ^. namespace of
770− Nothing -> hasAttribute e ssrAttr <* removeAttribute e ssrAttr
771− 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
772801 childDom <- liftIO $ readIORef childDelayedRef
773802 let rawCfg = extractRawElementConfig cfg
774803 doc <- askDocument
@@ -783,9 +812,9 @@ hydrateElement elementTag cfg child = do
783812 pure e
784813 Just node -> DOM.castTo DOM.Element node >>= \case
785814 Nothing -> go (Just node) -- this node is not an element, skip
786− Just e -> hasSSRAttribute e >>= \case
787− False -> go (Just node) -- this element was not added by the static renderer, skip
788− True -> do
815+ Just e -> shouldSkip e >>= \case
816+ True -> go (Just node) -- this element should be skipped by hydration
817+ False -> do
789818 t <- Element.getTagName e
790819 -- TODO: check attributes?
791820 if T.toCaseFold elementTag == T.toCaseFold t
@@ -908,14 +937,26 @@ inputElementInternal cfg = getHydrationMode >>= \case
908937 doc <- askDocument
909938 -- Expected initial value from config
910939 let v0 = _inputElementConfig_initialValue cfg
911− 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'
912948 domElement <- liftIO $ readIORef domElementRef
913949 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
914950 getValue = Input.getValue domInputElement
915− -- The browser might have messed with the value, or the user could have
916− -- altered it before activation, so we set it if it isn't what we expect
917− liftJSM getValue >>= \v0' -> do
918− 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
919960 -- Watch for user interaction and trigger event accordingly
920961 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
921962 for_ (_inputElementConfig_setValue cfg) $ \eSetValue ->
@@ -929,7 +970,17 @@ inputElementInternal cfg = getHydrationMode >>= \case
929970 ]
930971 liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
931972 requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
932− 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
933984 _ <- liftJSM $ domInputElement `on` Events.click $ do
934985 liftIO . triggerCheckedChangedByUI =<< Input.getChecked domInputElement
935986 for_ (_inputElementConfig_setChecked cfg) $ \eNewchecked ->
@@ -942,7 +993,7 @@ inputElementInternal cfg = getHydrationMode >>= \case
942993 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
943994 liftIO . triggerFileChange =<< maybe (return []) getMyFiles mfiles
944995 return ()
945− checked' <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
996+ checked' <- holdDyn c0 $ leftmost
946997 [ checkedChangedBySetChecked
947998 , checkedChangedByUI
948999 ]
@@ -1014,14 +1065,21 @@ textAreaElementInternal cfg = getHydrationMode >>= \case
10141065 doc <- askDocument
10151066 -- Expected initial value from config
10161067 let v0 = _textAreaElementConfig_initialValue cfg
1017− addHydrationStep $ do
1068+ valueAtSwitchover = maybe (pure $ pure v0) (hold v0) (_textAreaElementConfig_setValue cfg)
1069+ addHydrationStepWithSetup valueAtSwitchover $ \switchoverValue' -> do
1070+ switchoverValue <- sample switchoverValue'
10181071 domElement <- liftIO $ readIORef domElementRef
10191072 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
10201073 getValue = TextArea.getValue domTextAreaElement
1021− -- The browser might have messed with the value, or the user could have
1022− -- altered it before activation, so we set it if it isn't what we expect
1023− liftJSM getValue >>= \v0' -> do
1024− 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
10251083 -- Watch for user interaction and trigger event accordingly
10261084 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
10271085 for_ (_textAreaElementConfig_setValue cfg) $ \eSetValue ->
@@ -1270,8 +1328,8 @@ hydrateComment doc t mSetContents = do
12701328skipToAndReplaceComment
12711329 :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
12721330 => Text
1273− -> IORef Text
1274− -> 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))
12751333skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
12761334 HydrationMode_Immediate -> do
12771335 -- If we're in immediate mode, we don't try to replace an existing comment,
@@ -1279,43 +1337,50 @@ skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
12791337 t <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
12801338 append $ toNode t
12811339 textNodeRef <- liftIO $ newIORef t
1282− keyRef <- liftIO $ newIORef ""
1340+ keyRef <- liftIO $ newIORef Nothing
12831341 pure (pure (), textNodeRef, keyRef)
12841342 HydrationMode_Hydrating -> do
12851343 doc <- askDocument
12861344 textNodeRef <- liftIO $ newIORef $ error "textNodeRef not yet initialized"
12871345 keyRef <- liftIO $ newIORef $ error "keyRef not yet initialized"
1288− let go key0 mLastNode = do
1289− parent <- askParent
1290− node <- maybe (Node.getFirstChildUnchecked parent) Node.getNextSiblingUnchecked mLastNode
1291− 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
12921357 Just comment -> do
1293− commentText <- Node.getTextContentUnchecked comment
1294− 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.
12951360 Just key -> do
12961361 -- Replace the comment with an (invisible) text node
12971362 tn <- createTextNode doc ("" :: Text)
12981363 Node.replaceChild_ parent tn comment
1299− pure (tn, key)
1364+ pure (tn, Just key)
13001365 Nothing -> do
1301− go key0 (Just node)
1366+ go (Just key0) (Just node)
13021367 Nothing -> do
1303− go key0 (Just node)
1304− switchComment = do
1305− key0 <- liftIO $ readIORef key0Ref
1306− (tn, key) <- go key0 =<< getPreviousNode
1307− setPreviousNode $ Just $ toNode tn
1308− liftIO $ do
1309− writeIORef textNodeRef tn
1310− 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
13111376 pure (switchComment, textNodeRef, keyRef)
13121377
13131378{-# INLINABLE skipToReplaceStart #-}
1314−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)
1315−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.
13161381
13171382{-# INLINABLE skipToReplaceEnd #-}
1318−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)
13191384skipToReplaceEnd key = fmap (\(m,e,_) -> (m,e)) $ skipToAndReplaceComment "replace-end" key
13201385
13211386instance SupportsHydrationDomBuilder t m => NotReady t (HydrationDomBuilderT s t m) where
@@ -1555,13 +1620,13 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
15551620 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
15561621 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
15571622 ChildReadyState_Unready _ -> do
1558− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
1623+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
15591624 return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)
15601625 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
15611626 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
15621627 deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)
15631628 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
1564− 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
15651630 return $ Constant ()
15661631 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
15671632 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
@@ -1571,8 +1636,8 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
15711636 phsBefore <- liftIO $ readIORef placeholders
15721637 let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
15731638 collectIfMoved k e = do
1574− let mThisPlaceholder = Map.lookup (This k) phsBefore -- Will be Nothing if this element wasn't present before
1575− 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
15761641 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
15771642 False -> do
15781643 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
@@ -1591,7 +1656,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
15911656 PatchMapWithMove.From_Move k -> Just $ PatchMapWithMove.From_Move k
15921657 let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant () a)
15931658 placeFragment k e = do
1594− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phsAfter
1659+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsAfter
15951660 case PatchDMapWithMove._nodeInfo_from e of
15961661 PatchDMapWithMove.From_Insert (Compose (TraverseChild x _)) -> case x of
15971662 Left _ -> pure ()
@@ -1607,7 +1672,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16071672
16081673{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
16091674traverseDMapWithKeyWithAdjust'
1610− :: 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)
16111676 => (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
16121677 -> DMap k v
16131678 -> Event t (PatchDMap k v)
@@ -1622,7 +1687,7 @@ traverseDMapWithKeyWithAdjust' = do
16221687 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
16231688 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
16241689 ChildReadyState_Unready _ -> do
1625− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
1690+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
16261691 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
16271692 delete _ (Constant sRef) = do
16281693 writeIORef sRef $ ChildReadyState_Unready Nothing
@@ -1633,9 +1698,9 @@ traverseDMapWithKeyWithAdjust' = do
16331698 hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholder (PatchDMap patch) -> do
16341699 phs <- liftIO $ readIORef placeholders
16351700 forM_ (DMap.toList patch) $ \(k :=> ComposeMaybe mv) -> do
1636− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phs
1701+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phs
16371702 -- Delete old node
1638− forM_ (Map.lookup (This k) phs) $ \thisPlaceholder -> do
1703+ forM_ (Map.lookup (Some k) phs) $ \thisPlaceholder -> do
16391704 thisPlaceholder `deleteUpTo` nextPlaceholder
16401705 -- Insert new node
16411706 forM_ mv $ \(Compose (TraverseChild e _)) -> case e of
@@ -1727,7 +1792,7 @@ hoistTraverseWithKeyWithAdjust
17271792 ::
17281793 ( Adjustable t m
17291794 , MonadHold t m
1730− , DMap.GCompare k
1795+ , GCompare k
17311796 , MonadIO m
17321797 , MonadJSM m
17331798 , PrimMonad m
@@ -1785,7 +1850,7 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
17851850 liftIO $ writeIORef childReadyState ChildReadyState_Ready
17861851 case countedAt of
17871852 Nothing -> return ()
1788− 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
17891854 (oldUnready, p) <- liftIO $ readIORef pendingChange
17901855 when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
17911856 let newUnready = DMap.delete k oldUnready
@@ -1800,7 +1865,7 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18001865 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
18011866 ChildReadyState_Ready -> return Nothing
18021867 ChildReadyState_Unready _ -> do
1803− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
1868+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
18041869 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
18051870 initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
18061871 liftIO $ if DMap.null initialUnready
@@ -1811,14 +1876,14 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18111876 getHydrationMode >>= \case
18121877 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
18131878 dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children
1814− 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
18151880 liftIO $ writeIORef placeholders $! phs
18161881 insertAfterPreviousNode lastPlaceholder
18171882 HydrationMode_Immediate -> do
18181883 let activate i = do
18191884 append $ toNode $ _traverseChildImmediate_fragment i
18201885 pure $ _traverseChildImmediate_placeholder i
1821− phs <- traverse id $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
1886+ phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
18221887 liftIO $ writeIORef placeholders $! phs
18231888 append $ toNode lastPlaceholder
18241889 requestDomAction_ $ ffor children' $ \p -> do
@@ -2232,7 +2297,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
22322297 Beforecopy -> return ()
22332298 Copy -> return ()
22342299 Beforepaste -> return ()
2235− Paste -> return ()
2300+ Paste -> getPasteData
22362301 Reset -> return ()
22372302 Search -> return ()
22382303 Selectstart -> return ()
@@ -2241,7 +2306,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
22412306 Touchend -> getTouchEvent
22422307 Touchcancel -> getTouchEvent
22432308 Mousewheel -> return ()
2244− Wheel -> return ()
2309+ Wheel -> getWheelEvent
22452310
22462311{-# INLINABLE defaultDomWindowEventHandler #-}
22472312defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
@@ -2282,7 +2347,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
22822347 Beforecopy -> return ()
22832348 Copy -> return ()
22842349 Beforepaste -> return ()
2285− Paste -> return ()
2350+ Paste -> getPasteData
22862351 Reset -> return ()
22872352 Search -> return ()
22882353 Selectstart -> return ()
@@ -2291,7 +2356,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
22912356 Touchend -> getTouchEvent
22922357 Touchcancel -> getTouchEvent
22932358 Mousewheel -> return ()
2294− Wheel -> return ()
2359+ Wheel -> getWheelEvent
22952360
22962361{-# INLINABLE withIsEvent #-}
22972362withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
@@ -2559,6 +2624,15 @@ getMouseEventCoords = do
25592624 e <- event
25602625 bisequence (getClientX e, getClientY e)
25612626
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+
25622636{-# INLINABLE getTouchEvent #-}
25632637getTouchEvent :: EventM e TouchEvent TouchEventResult
25642638getTouchEvent = do
@@ -2600,6 +2674,26 @@ getTouchEvent = do
26002674 , _touchEventResult_touches = touches
26012675 }
26022676
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+
26032697instance MonadSample t m => MonadSample t (HydrationDomBuilderT s t m) where
26042698 {-# INLINABLE sample #-}
26052699 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+48−20
@@ -37,6 +37,7 @@ 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)
4041import Data.Monoid ((<>))
4142import qualified Data.Set as Set
4243import Data.Text (Text)
@@ -55,7 +56,6 @@ import Reflex.PerformEvent.Class
5556import Reflex.PostBuild.Base
5657import Reflex.PostBuild.Class
5758import Reflex.TriggerEvent.Class
58−import System.Random (randomRIO)
5959
6060data StaticDomBuilderEnv t = StaticDomBuilderEnv
6161 { _staticDomBuilderEnv_shouldEscape :: Bool
@@ -64,6 +64,7 @@ data StaticDomBuilderEnv t = StaticDomBuilderEnv
6464 -- We use this to add a "selected" attribute to the appropriate "option" child element.
6565 -- This is not yet a perfect simulation of what the browser does, but it is much closer than doing nothing.
6666 -- 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
6768 }
6869
6970newtype StaticDomBuilderT t m a = StaticDomBuilderT
@@ -164,7 +165,7 @@ instance (SupportsStaticDomBuilder t m, Monad m) => HasDocument (StaticDomBuilde
164165instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m) => Adjustable t (StaticDomBuilderT t m) where
165166 runWithReplace a0 a' = do
166167 e <- StaticDomBuilderT ask
167− key <- replaceStart
168+ key <- replaceStart e
168169 (result0, result') <- lift $ runWithReplace (runStaticDomBuilderT a0 e) (flip runStaticDomBuilderT e <$> a')
169170 o <- hold (snd result0) $ fmapCheap snd result'
170171 StaticDomBuilderT $ modify $ (:) $ join o
@@ -174,10 +175,9 @@ instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m)
174175 traverseDMapWithKeyWithAdjust = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap
175176 traverseDMapWithKeyWithAdjustWithMove = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove
176177
177−-- TODO remove this?
178−replaceStart :: (DomBuilder t m, MonadIO m) => m Text
179−replaceStart = do
180− 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))
181181 let key = "-" <> T.pack str
182182 _ <- commentNode $ def { _commentNodeConfig_initialContents = "replace-start" <> key }
183183 pure key
@@ -274,7 +274,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
274274 --TODO: Do not escape quotation marks; see https://stackoverflow.com/questions/25612166/what-characters-must-be-escaped-in-html-5
275275 shouldEscape <- asks _staticDomBuilderEnv_shouldEscape
276276 let escape = if shouldEscape then fromHtmlEscapedText else byteString . encodeUtf8
277− modify . (:) =<< (\c -> "<!--" <> c <> "-->") <$> case mSetContents of
277+ (modify . (:)) . (\c -> "<!--" <> c <> "-->") =<< case mSetContents of
278278 Nothing -> return (pure (escape initialContents))
279279 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on
280280 return $ CommentNode ()
@@ -287,8 +287,9 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
287287 es <- newFanEventWithTrigger $ \_ _ -> return (return ())
288288 StaticDomBuilderT $ do
289289 let shouldEscape = elementTag `Set.notMember` noEscapeElements
290− (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing
291− 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)
292293 selectValue <- asks _staticDomBuilderEnv_selectValue
293294 let addSelectedAttr attrs sel = case Map.lookup "value" attrs of
294295 Just v | v == sel -> attrs <> Map.singleton "selected" ""
@@ -311,13 +312,32 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
311312 return (e, result)
312313 {-# INLINABLE inputElement #-}
313314 inputElement cfg = do
314− (e, _result) <- element "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
315− let v0 = constDyn $ cfg ^. inputElementConfig_initialValue
316− 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
317337 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
318338 return $ InputElement
319− { _inputElement_value = v0
320− , _inputElement_checked = c0
339+ { _inputElement_value = v
340+ , _inputElement_checked = c
321341 , _inputElement_checkedChange = never
322342 , _inputElement_input = never
323343 , _inputElement_hasFocus = hasFocus
@@ -327,12 +347,17 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
327347 }
328348 {-# INLINABLE textAreaElement #-}
329349 textAreaElement cfg = do
330− --TODO: Support setValue event
331− (e, _domElement) <- element "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
332− 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
333358 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
334359 return $ TextAreaElement
335− { _textAreaElement_value = v0
360+ { _textAreaElement_value = v
336361 , _textAreaElement_input = never
337362 , _textAreaElement_hasFocus = hasFocus
338363 , _textAreaElement_element = e
@@ -341,7 +366,9 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
341366 selectElement cfg child = do
342367 v <- holdDyn (cfg ^. selectElementConfig_initialValue) (cfg ^. selectElementConfig_setValue)
343368 (e, result) <- element "select" (_selectElementConfig_elementConfig cfg) $ do
344− (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
345372 StaticDomBuilderT $ lift $ modify $ (:) innerHtml
346373 return a
347374 let wrapped = SelectElement
@@ -363,7 +390,8 @@ renderStatic :: StaticWidget x a -> IO (a, ByteString)
363390renderStatic w = do
364391 runDomHost $ do
365392 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
366− let env0 = StaticDomBuilderEnv True Nothing
393+ nextRunWithReplaceKey <- newRef 0
394+ let env0 = StaticDomBuilderEnv True Nothing nextRunWithReplaceKey
367395 ((res, bs), FireCommand fire) <- hostPerformEventT $ runStaticDomBuilderT (runPostBuildT w postBuild) env0
368396 mPostBuildTrigger <- readRef postBuildTriggerRef
369397 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+1
@@ -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
reflex-dom-core/src/Reflex/Dom/Main.hs+83−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 #-}
@@ -73,8 +72,14 @@ mainHydrationWidgetWithSwitchoverAction = mainHydrationWidgetWithSwitchoverActio
7372{-# INLINABLE mainHydrationWidgetWithSwitchoverAction' #-}
7473-- | Warning: `mainHydrationWidgetWithSwitchoverAction'` is provided only as performance tweak. It is expected to disappear in future releases.
7574mainHydrationWidgetWithSwitchoverAction' :: JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()
76−mainHydrationWidgetWithSwitchoverAction' switchoverAction head' body = do
77− 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
7883 appendHead head'
7984 appendBody body
8085
@@ -89,7 +94,21 @@ attachHydrationWidget
8994 -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
9095 )
9196 -> IO (a, FireCommand DomTimeline DomHost)
92−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
93112 hydrationMode <- liftIO $ newIORef HydrationMode_Hydrating
94113 rootNodesRef <- liftIO $ newIORef []
95114 events <- newChan
@@ -105,7 +124,7 @@ attachHydrationWidget switchoverAction jsSing w = do
105124 rootNodes <- liftIO $ readIORef rootNodesRef
106125 let delayedAction = do
107126 for_ (reverse rootNodes) $ \(rootNode, runner) -> do
108− let hydrate = runHydrationRunnerT runner Nothing rootNode events
127+ let hydrate = runHydrationRunnerTWithFailure runner onFailure Nothing rootNode events
109128 void $ runWithJSContextSingleton (runPostBuildT hydrate never) jsSing
110129 liftIO $ writeIORef hydrationMode HydrationMode_Immediate
111130 runWithJSContextSingleton (DOM.liftJSM switchoverAction) jsSing
@@ -121,16 +140,27 @@ type DomCoreWidget x = PostBuildT DomTimeline (WithJSContextSingleton x (Perform
121140{-# INLINABLE runHydrationWidgetWithHeadAndBody #-}
122141runHydrationWidgetWithHeadAndBody
123142 :: JSM ()
124− -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head"
125− -> (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
145+ -> FloatingWidget () ()
146+ )
147+ -> JSM ()
148+runHydrationWidgetWithHeadAndBody = runHydrationWidgetWithHeadAndBodyWithFailure (pure ())
149+
150+{-# INLINABLE runHydrationWidgetWithHeadAndBodyWithFailure #-}
151+runHydrationWidgetWithHeadAndBodyWithFailure
152+ :: IO ()
153+ -> JSM ()
154+ -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once
155+ -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body" --TODO: test invoking this more than once
126156 -> FloatingWidget () ()
127157 )
128158 -> JSM ()
129−runHydrationWidgetWithHeadAndBody switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
159+runHydrationWidgetWithHeadAndBodyWithFailure onFailure switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
130160 globalDoc <- currentDocumentUnchecked
131161 headElement <- getHeadUnchecked globalDoc
132162 bodyElement <- getBodyUnchecked globalDoc
133− (events, fc) <- liftIO . attachHydrationWidget switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
163+ (events, fc) <- liftIO . attachHydrationWidgetWithFailure onFailure switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
134164 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
135165 let hydrateDom :: DOM.Node -> HydrationWidget () c -> FloatingWidget () c
136166 hydrateDom n w = do
@@ -212,39 +242,48 @@ type Widget x = ImmediateDomBuilderT DomTimeline (DomCoreWidget x)
212242attachWidget :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> JSM a
213243attachWidget rootElement wv w = fst <$> attachWidget' rootElement wv w
214244
215−-- | Warning: `mainWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.
216−mainWidgetWithHead' :: (a -> Widget () b, b -> Widget () a) -> JSM ()
217−mainWidgetWithHead' widgets = withJSContextSingletonMono $ \jsSing -> do
218− doc <- currentDocumentUnchecked
219− headElement <- getHeadUnchecked doc
220− headFragment <- createDocumentFragment doc
221− bodyElement <- getBodyUnchecked doc
222− bodyFragment <- createDocumentFragment doc
223− hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
224− (events, fc) <- liftIO . attachWidget'' $ \events -> do
225− 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
226259 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
227− let go :: forall c. Widget () c -> DOM.DocumentFragment -> PerformEventT DomTimeline DomHost c
228− go w df = do
260+ let go :: forall c. DOM.DocumentFragment -> Widget () c -> FloatingWidget () c
261+ go df w = do
229262 unreadyChildren <- liftIO $ newIORef 0
230263 delayed <- liftIO $ newIORef $ pure ()
231264 let builderEnv = HydrationDomBuilderEnv
232− { _hydrationDomBuilderEnv_document = toDocument doc
265+ { _hydrationDomBuilderEnv_document = globalDoc
233266 , _hydrationDomBuilderEnv_parent = Left $ toNode df
234267 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
235− , _hydrationDomBuilderEnv_commitAction = return () --TODO
268+ , _hydrationDomBuilderEnv_commitAction = pure () --TODO: possibly `replaceElementContents n f`
269+ , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
236270 , _hydrationDomBuilderEnv_switchover = never
237271 , _hydrationDomBuilderEnv_delayed = delayed
238− , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
239272 }
240− runWithJSContextSingleton (runPostBuildT (runHydrationDomBuilderT w builderEnv events) postBuild) jsSing
241− rec b <- go (headWidget a) headFragment
242− a <- go (bodyWidget b) bodyFragment
273+ lift $ runHydrationDomBuilderT w builderEnv events
274+ runWithJSContextSingleton (runPostBuildT (runTriggerEventT (app (go headFragment) (go bodyFragment)) events) postBuild) jsSing
243275 return (events, postBuildTriggerRef)
244276 replaceElementContents headElement headFragment
245277 replaceElementContents bodyElement bodyFragment
246278 liftIO $ processAsyncEvents events fc
247279
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+
248287replaceElementContents :: DOM.IsElement e => e -> DOM.DocumentFragment -> JSM ()
249288replaceElementContents e df = do
250289 setInnerHTML e ("" :: String)
@@ -256,8 +295,7 @@ attachWidget' :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> J
256295attachWidget' rootElement jsSing w = do
257296 doc <- getOwnerDocumentUnchecked rootElement
258297 df <- createDocumentFragment doc
259− hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
260− ((a, events), fc) <- liftIO . attachWidget'' $ \events -> do
298+ ((a, events), fc) <- liftIO . attachImmediateWidget $ \hydrationMode events -> do
261299 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
262300 unreadyChildren <- liftIO $ newIORef 0
263301 delayed <- liftIO $ newIORef $ pure ()
@@ -278,12 +316,18 @@ attachWidget' rootElement jsSing w = do
278316
279317type EventChannel = Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
280318
281−{-# INLINABLE attachWidget'' #-}
282−attachWidget'' :: (EventChannel -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))) -> IO (a, FireCommand DomTimeline DomHost)
283−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
284328 events <- newChan
285329 runDomHost $ do
286− ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w events
330+ ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w hydrationMode events
287331 mPostBuildTrigger <- readRef postBuildTriggerRef
288332 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
289333 return (result, fc)
@@ -325,3 +369,8 @@ runApp' app = withJSContextSingleton $ \jsSing -> do
325369 { _appInput_window = w
326370 }
327371 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/Prerender.hs+15−7
@@ -24,7 +24,7 @@ module Reflex.Dom.Prerender
2424
2525import Control.Monad.Primitive (PrimMonad(..))
2626import Control.Monad.Reader
27−import Control.Monad.Ref (MonadRef(..))
27+import Control.Monad.Ref (MonadRef(..), MonadAtomicRef(..))
2828import Data.IORef (IORef, newIORef)
2929import Data.Semigroup (Semigroup)
3030import Data.Text (Text)
@@ -33,6 +33,7 @@ import Foreign.JavaScript.TH
3333import GHCJS.DOM.Types (MonadJSM)
3434import Reflex hiding (askEvents)
3535import Reflex.Dom.Builder.Class
36+import Reflex.Dom.Builder.Hydratable
3637import Reflex.Dom.Builder.Immediate
3738import Reflex.Dom.Builder.InputDisabled
3839import Reflex.Dom.Builder.Static
@@ -164,6 +165,8 @@ instance Monad m => MonadRef (UnrunnableT js t m) where
164165 newRef _ = unrunnable
165166 readRef _ = unrunnable
166167 writeRef _ _ = unrunnable
168+instance Monad m => MonadAtomicRef (UnrunnableT js t m) where
169+ atomicModifyRef _ _ = unrunnable
167170instance Monad m => HasDocument (UnrunnableT js t m) where
168171 askDocument = unrunnable
169172instance Monad m => HasJSContext (UnrunnableT js t m) where
@@ -202,12 +205,13 @@ instance Monad m => MonadReflexCreateTrigger t (UnrunnableT js t m) where
202205 newFanEventWithTrigger _ = unrunnable
203206instance Monad m => MonadFix (UnrunnableT js t m) where
204207 mfix _ = unrunnable
205−instance Monad m => MonadHold t (UnrunnableT js t m) where
208+instance (Monad m, MonadHold t m) => MonadHold t (UnrunnableT js t m) where
206209 hold _ _ = unrunnable
207210 holdDyn _ _ = unrunnable
208211 holdIncremental _ _ = unrunnable
209212 buildDynamic _ _ = unrunnable
210213 headE _ = unrunnable
214+ now = unrunnable
211215instance Monad m => MonadSample t (UnrunnableT js t m) where
212216 sample _ = unrunnable
213217instance Monad m => MonadIO (UnrunnableT js t m) where
@@ -225,7 +229,7 @@ instance (Reflex t, Monad m) => DomRenderHook t (UnrunnableT js t m) where
225229 withRenderHook _ _ = unrunnable
226230 requestDomAction _ = unrunnable
227231 requestDomAction_ _ = unrunnable
228−instance (Reflex t, Monad m) => Prerender JS' t (UnrunnableT js t m) where
232+instance (Reflex t, Monad m, MonadHold t m) => Prerender JS' t (UnrunnableT js t m) where
229233 type Client (UnrunnableT js t m) = UnrunnableT js t m
230234 prerender _ _ = unrunnable
231235
@@ -270,8 +274,8 @@ instance (Prerender js t m, MonadFix m, Reflex t) => Prerender js t (RequesterT
270274 (x, e) <- runRequesterT w (selectInt fannedResponses selector)
271275 pure (x, fmapCheap (IntMap.singleton selector) e)
272276 (result, requestsDyn) <- fmap splitDynPure $ lift $ prerender (withFannedResponses server 0) (withFannedResponses client 1)
273− responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switch $ current requestsDyn
274− pure result
277+ responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switchPromptlyDyn requestsDyn
278+ return result
275279
276280instance (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
277281 type Client (QueryT t q m) = QueryT t q (Client m)
@@ -283,8 +287,12 @@ instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Group q, Additive q,
283287 pure a
284288
285289instance (Prerender js t m, Monad m) => Prerender js t (InputDisabledT m) where
286− type Client (InputDisabledT m) = Client m
287− 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
288296
289297instance (Prerender js t m, Monad m, ReflexHost t) => Prerender js t (PostBuildT t m) where
290298 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+1−1
@@ -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−2
@@ -15,7 +15,7 @@ import Data.Text (Text)
1515import Data.ByteString (ByteString)
1616import Foreign.JavaScript.Utils (bsFromMutableArrayBuffer, bsToArrayBuffer)
1717import GHCJS.DOM.Enums
18−import GHCJS.DOM.EventM (EventM, on)
18+import GHCJS.DOM.EventM (EventM, on, onSync)
1919import GHCJS.DOM.EventTarget (dispatchEvent)
2020import GHCJS.DOM.Types (MonadJSM, ToJSString, FormData, Document, Blob (..), ArrayBuffer (..), JSVal, JSM, IsEvent, XMLHttpRequestProgressEvent, ProgressEvent, Event, XMLHttpRequestUpload, FromJSString, ArrayBufferView (..), liftJSM, castTo)
2121import GHCJS.DOM.XMLHttpRequest
@@ -114,7 +114,7 @@ xmlHttpRequestOntimeout :: XMLHttpRequest -> EventM XMLHttpRequest ProgressEvent
114114xmlHttpRequestOntimeout = (`on` timeout)
115115
116116xmlHttpRequestOnreadystatechange :: XMLHttpRequest -> EventM XMLHttpRequest Event () -> JSM (JSM ())
117−xmlHttpRequestOnreadystatechange = (`on` readyStateChange)
117+xmlHttpRequestOnreadystatechange = (`onSync` readyStateChange)
118118
119119xmlHttpRequestSetTimeout :: MonadJSM m => XMLHttpRequest -> Word -> m ()
120120xmlHttpRequestSetTimeout = setTimeout
reflex-dom-core/test/gc.hs+1−1
@@ -47,7 +47,7 @@ failureLimit = 0
4747
4848main :: IO ()
4949main = do
50− handle (\(_ :: IOError) -> return ()) $ unshareNetork -- If we run into an exception with sandboxing, just don't bother
50+ handle (\(_ :: IOError) -> return ()) $ unshareNetwork -- If we run into an exception with sandboxing, just don't bother
5151 withSandboxedChromeFlags True $ \chromeFlags -> do
5252 mainThread <- myThreadId
5353 browserProcess <- spawnCommand $ mconcat
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+509−112
@@ -1,12 +1,9 @@
1−{-# OPTIONS_GHC -fno-warn-orphans #-}
21{-# LANGUAGE BangPatterns #-}
3−{-# LANGUAGE StandaloneDeriving #-}
4−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5−{-# LANGUAGE UndecidableInstances #-}
62{-# LANGUAGE ConstraintKinds #-}
7−{-# LANGUAGE CPP #-}
83{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE FlexibleInstances #-}
95{-# LANGUAGE GADTs #-}
6+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
107{-# LANGUAGE LambdaCase #-}
118{-# LANGUAGE MultiParamTypeClasses #-}
129{-# LANGUAGE OverloadedStrings #-}
@@ -14,26 +11,43 @@
1411{-# LANGUAGE RankNTypes #-}
1512{-# LANGUAGE RecursiveDo #-}
1613{-# LANGUAGE ScopedTypeVariables #-}
14+{-# LANGUAGE StandaloneDeriving #-}
1715{-# LANGUAGE TemplateHaskell #-}
1816{-# LANGUAGE TupleSections #-}
1917{-# LANGUAGE TypeApplications #-}
2018{-# LANGUAGE TypeFamilies #-}
19+{-# LANGUAGE UndecidableInstances #-}
20+
21+{-# OPTIONS_GHC -fno-warn-orphans #-}
2122
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)
2232import Control.Concurrent
23−import Control.Monad
33+import qualified Control.Concurrent.Async as Async
34+import Control.Lens.Operators
35+import Control.Monad hiding (fail)
2436import Control.Monad.Catch
37+import Control.Monad.Fail
2538import Control.Monad.Fix
2639import Control.Monad.IO.Class
2740import Control.Monad.Ref
2841import Data.Constraint.Extras
2942import Data.Constraint.Extras.TH
3043import Data.Dependent.Map (DMap)
31−import Data.Dependent.Sum (DSum(..), (==>), EqTag(..), ShowTag(..))
44+import Data.Dependent.Sum (DSum(..), (==>))
3245import Data.Functor.Identity
3346import Data.Functor.Misc
3447import Data.GADT.Compare.TH
3548import Data.GADT.Show.TH
3649import Data.IORef (IORef)
50+import Data.List (sort)
3751import Data.Maybe
3852import Data.Proxy
3953import Data.Text (Text)
@@ -44,6 +58,7 @@ import Network.Socket
4458import Network.Wai
4559import Network.WebSockets
4660import Reflex.Dom.Core
61+import Reflex.Dom.Widget.Input (dropdown)
4762import Reflex.Patch.DMapWithMove
4863import System.Directory
4964import System.Environment
@@ -51,7 +66,8 @@ import System.IO (stderr)
5166import System.IO.Silently
5267import System.IO.Temp
5368import System.Process
54−import qualified Test.HUnit as HUnit (assertEqual, assertFailure)
69+import System.Which (staticWhich)
70+import qualified Test.HUnit as HUnit
5571import qualified Test.Hspec as H
5672import qualified Test.Hspec.Core.Spec as H
5773import Test.Hspec (xit)
@@ -73,6 +89,12 @@ import qualified Test.WebDriver.Capabilities as WD
7389import Test.Util.ChromeFlags
7490import Test.Util.UnshareNetwork
7591
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+
7698seleniumPort, jsaddlePort :: PortNumber
7799seleniumPort = 8000
78100jsaddlePort = 8001
@@ -85,11 +107,14 @@ instance MonadRef WD where
85107 writeRef r = WD . writeRef r
86108
87109assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
88−assertEqual a b = liftIO . HUnit.assertEqual a b
110+assertEqual msg a b = liftIO $ HUnit.assertEqual msg a b
89111
90112assertFailure :: MonadIO m => String -> m ()
91113assertFailure = liftIO . HUnit.assertFailure
92114
115+assertBool :: (MonadIO m) => String -> Bool -> m ()
116+assertBool msg bool = liftIO $ HUnit.assertBool msg bool
117+
93118chromeConfig :: Text -> [Text] -> WD.WDConfig
94119chromeConfig fp flags = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags }) WD.defaultConfig
95120
@@ -116,35 +141,26 @@ deriveGEq ''DKey
116141deriveGCompare ''DKey
117142deriveGShow ''DKey
118143
119−instance ShowTag DKey Identity where
120− showTaggedPrec = \case
121− Key_Int -> showsPrec
122− Key_Char -> showsPrec
123− Key_Bool -> showsPrec
124−
125−instance EqTag DKey Identity where
126− eqTagged Key_Int Key_Int = (==)
127− eqTagged Key_Char Key_Char = (==)
128− eqTagged Key_Bool Key_Bool = (==)
144+deriving instance MonadFail WD
129145
130146main :: IO ()
131147main = do
132− unshareNetork
148+ unshareNetwork
133149 isHeadless <- (== Nothing) <$> lookupEnv "NO_HEADLESS"
134150 withSandboxedChromeFlags isHeadless $ \chromeFlags -> do
135151 withSeleniumServer $ \selenium -> do
136− browserPath <- liftIO $ T.strip . T.pack <$> readProcess "which" [ "chromium" ] ""
152+ let browserPath = T.strip $ T.pack chromium
137153 when (T.null browserPath) $ fail "No browser found"
138154 withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"
139155 let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
140156 chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
141− hspec (tests withDebugging wdConfig [chromeCaps'] selenium) `finally` _selenium_stopServer selenium
157+ hspec (tests withDebugging wdConfig [(chromeCaps', "chrome")] selenium) `finally` _selenium_stopServer selenium
142158
143−tests :: Bool -> WD.WDConfig -> [Capabilities] -> Selenium -> Spec
159+tests :: Bool -> WD.WDConfig -> [(Capabilities, String)] -> Selenium -> Spec
144160tests withDebugging wdConfig caps _selenium = do
145161 let putStrLnDebug :: MonadIO m => Text -> m ()
146162 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
147− session' = sessionWith wdConfig "" . using (map (,"") caps)
163+ session' t = sessionWith wdConfig t . using caps
148164 runWD m = runWDOptions (WdOptions False) $ do
149165 putStrLnDebug "before"
150166 r <- m
@@ -153,10 +169,10 @@ tests withDebugging wdConfig caps _selenium = do
153169 testWidgetStatic :: WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
154170 testWidgetStatic = testWidgetStaticDebug withDebugging
155171 testWidget :: WD () -> WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
156− testWidget = testWidgetDebug withDebugging
172+ testWidget = testWidgetDebug True withDebugging
157173 testWidget' :: WD a -> (a -> WD b) -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
158− testWidget' = testWidgetDebug' withDebugging
159− describe "text" $ session' $ do
174+ testWidget' = testWidgetDebug' True withDebugging
175+ session' "text" $ do
160176 it "works" $ runWD $ do
161177 testWidgetStatic (checkBodyText "hello world") $ do
162178 text "hello world"
@@ -217,7 +233,7 @@ tests withDebugging wdConfig caps _selenium = do
217233 click <- button ""
218234 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
219235
220− describe "element" $ session' $ do
236+ session' "element" $ do
221237 it "works with domEvent Click" $ runWD $ do
222238 clickedRef <- liftIO $ newRef False
223239 testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
@@ -280,29 +296,79 @@ tests withDebugging wdConfig caps _selenium = do
280296 (e, ()) <- element "div" conf $ text "hello world"
281297 let click = domEvent Click e
282298 return ()
283− -- TODO check this is the correct solution
284− it "has ssr attribute, removes ssr attribute" $ runWD $ do
285− let checkSSRAttr = do
286− e <- findElemWithRetry $ WD.ByTag "div"
287− assertAttr e "data-ssr" (Just "")
288− pure e
289− testWidget' checkSSRAttr (\e -> assertAttr e "data-ssr" Nothing) $ el "div" $ text "hello world"
290299
291− describe "inputElement" $ do
292− 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
293359 it "doesn't wipe user input when switching over" $ runWD $ do
294− inputRef <- newRef ("" :: Text)
360+ inputRef <- newRef ("hello " :: Text)
295361 testWidget'
296362 (do
297363 e <- findElemWithRetry $ WD.ByTag "input"
298− WD.sendKeys "hello world" e
364+ WD.sendKeys "world" e
299365 pure e)
300366 (\e -> do
301367 WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
302368 WD.click =<< findElemWithRetry (WD.ByTag "button")
303369 readRef inputRef `shouldBeWithRetryM` "hello world"
304370 ) $ do
305− e <- inputElement def
371+ e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
306372 click <- button "save"
307373 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
308374 it "captures user input after switchover" $ runWD $ do
@@ -359,24 +425,49 @@ tests withDebugging wdConfig caps _selenium = do
359425 checkedByUIRef <- newRef False
360426 checkedRef <- newRef False
361427 setCheckedChan <- liftIO newChan
362− let checkValue = do
428+ let checkStatic = do
429+ e <- findElemWithRetry $ WD.ByTag "input"
430+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
431+ pure e
432+ checkValue e = do
363433 readRef checkedByUIRef `shouldBeWithRetryM` False
364434 readRef checkedRef `shouldBeWithRetryM` False
365− e <- findElemWithRetry $ WD.ByTag "input"
435+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
366436 WD.moveToCenter e
367437 WD.click e
368438 readRef checkedByUIRef `shouldBeWithRetryM` True
369439 readRef checkedRef `shouldBeWithRetryM` True
440+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
370441 liftIO $ writeChan setCheckedChan False
371442 readRef checkedByUIRef `shouldBeWithRetryM` True
372443 readRef checkedRef `shouldBeWithRetryM` False
373− testWidget (pure ()) checkValue $ do
444+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
445+ testWidget' checkStatic checkValue $ do
374446 setChecked <- triggerEventWithChan setCheckedChan
375447 e <- inputElement $ def
376448 & initialAttributes .~ "type" =: "checkbox"
377449 & inputElementConfig_setChecked .~ setChecked
378450 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
379451 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)
380471 it "captures file uploads" $ runWD $ do
381472 filesRef :: IORef [Text] <- newRef []
382473 let uploadFile = do
@@ -392,8 +483,117 @@ tests withDebugging wdConfig caps _selenium = do
392483 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
393484 names <- liftJSM $ traverse File.getName fs
394485 liftIO $ writeRef filesRef names
395−
396− 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
397597 it "captures user input after switchover" $ runWD $ do
398598 inputRef :: IORef Text <- newRef ""
399599 let checkValue = do
@@ -473,8 +673,31 @@ tests withDebugging wdConfig caps _selenium = do
473673 names <- liftJSM $ traverse File.getName fs
474674 liftIO $ writeRef filesRef names
475675
476− describe "textAreaElement" $ do
477− 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
478701 it "doesn't wipe user input when switching over" $ runWD $ do
479702 inputRef <- newRef ("" :: Text)
480703 testWidget'
@@ -540,8 +763,90 @@ tests withDebugging wdConfig caps _selenium = do
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
@@ -583,13 +888,13 @@ tests withDebugging wdConfig caps _selenium = do
583888 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
584889 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
585890
586− describe "selectElement" $ do
891+ session' "selectElement" $ do
587892 let options :: DomBuilder t m => m ()
588893 options = do
589894 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
590895 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
591896 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
592− describe "hydration" $ session' $ do
897+ describe "hydration" $ do
593898 it "sets initial value correctly" $ runWD $ do
594899 inputRef <- newRef ("" :: Text)
595900 let setup = do
@@ -663,7 +968,7 @@ tests withDebugging wdConfig caps _selenium = do
663968 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
664969 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
665970
666− describe "hydration/immediate" $ session' $ do
971+ describe "hydration/immediate" $ do
667972 it "captures user input after switchover" $ runWD $ do
668973 inputRef :: IORef Text <- newRef ""
669974 let checkValue = do
@@ -709,7 +1014,7 @@ tests withDebugging wdConfig caps _selenium = do
7091014 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
7101015 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
7111016
712− describe "prerender" $ session' $ do
1017+ session' "prerender" $ do
7131018 it "works in simple case" $ runWD $ do
7141019 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
7151020 prerender_ (text "One") (text "Two")
@@ -754,9 +1059,9 @@ tests withDebugging wdConfig caps _selenium = do
7541059 pb <- getPostBuild
7551060 performEvent_ $ liftIO (putMVar lock ()) <$ pb
7561061 it "result Dynamic is updated *after* switchover" $ runWD $ do
757− let static = checkBodyText "PostBuild"
1062+ let preSwitchover = checkBodyText "PostBuild"
7581063 check = checkBodyText "Client"
759− testWidget static check $ void $ do
1064+ testWidget preSwitchover check $ void $ do
7601065 d <- prerender (pure "Initial") (pure "Client")
7611066 pb <- getPostBuild
7621067 initial <- sample $ current d
@@ -764,21 +1069,30 @@ tests withDebugging wdConfig caps _selenium = do
7641069 -- This essentially checks that the client IO runs *after* switchover/postBuild,
7651070 -- thus can't create conflicting DOM
7661071 it "can't exploit IO to break hydration" $ runWD $ do
767− let static = checkBodyText "Initial"
768− testWidgetStatic static $ void $ do
1072+ let preSwitchover = checkBodyText "Initial"
1073+ testWidgetStatic preSwitchover $ void $ do
7691074 ref <- liftIO $ newRef "Initial"
7701075 prerender_ (pure ()) (liftIO $ writeRef ref "Client")
7711076 text <=< liftIO $ readRef ref
7721077 -- As above, so below
7731078 it "can't exploit triggerEvent to break hydration" $ runWD $ do
774− let static = checkBodyText "Initial"
1079+ let preSwitchover = checkBodyText "Initial"
7751080 check = checkBodyText "Client"
776− testWidget static check $ void $ do
1081+ testWidget preSwitchover check $ void $ do
7771082 (e, trigger) <- newTriggerEvent
7781083 prerender_ (pure ()) (liftIO $ trigger "Client")
7791084 textNode $ TextNodeConfig "Initial" $ Just e
7801085
781− 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
7821096 it "works" $ runWD $ do
7831097 replaceChan :: Chan Text <- liftIO newChan
7841098 let setup = findElemWithRetry $ WD.ByTag "div"
@@ -922,7 +1236,61 @@ tests withDebugging wdConfig caps _selenium = do
9221236 , el "span" . text <$> replace
9231237 ]
9241238
925− 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
9261294 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
9271295 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
9281296 elClass "span" "key" $ text $ textKey k
@@ -962,26 +1330,26 @@ tests withDebugging wdConfig caps _selenium = do
9621330 postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
9631331 it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
9641332 chan <- liftIO newChan
965− let static :: WD [WD.Element]
966− static = getAndCheckInitialItems keyMap
1333+ let preSwitchover :: WD [WD.Element]
1334+ preSwitchover = getAndCheckInitialItems keyMap
9671335 check :: [WD.Element] -> WD ()
9681336 check xs = do
9691337 checkInitialItems keyMap xs
9701338 checkRemoval chan Key_Int
9711339 checkReplace chan Key_Char 'B'
9721340 checkInsert chan Key_Bool True
973− testWidget' static check $ do
1341+ testWidget' preSwitchover check $ do
9741342 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
9751343 liftIO $ dmap `H.shouldBe` keyMap
9761344 it "handles postBuild correctly" $ runWD $ do
9771345 chan <- liftIO newChan
978− let static = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1346+ let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
9791347 check xs = do
9801348 withRetry $ checkInitialItems (applyAlways postBuildPatch keyMap) xs
9811349 checkRemoval chan Key_Int
9821350 checkInsert chan Key_Char 'B'
9831351 checkReplace chan Key_Bool True
984− testWidget' static check $ void $ do
1352+ testWidget' preSwitchover check $ void $ do
9851353 pb <- getPostBuild
9861354 replace <- triggerEventWithChan chan
9871355 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1025,7 +1393,7 @@ tests withDebugging wdConfig caps _selenium = do
10251393 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
10261394 liftIO $ dmap `H.shouldBe` keyMap
10271395
1028− describe "traverseIntMapWithKeyWithAdjust" $ session' $ do
1396+ session' "traverseIntMapWithKeyWithAdjust" $ do
10291397 let textKeyInt k = "key" <> T.pack (show k)
10301398 intMap = IntMap.fromList
10311399 [ (1, "one")
@@ -1071,24 +1439,24 @@ tests withDebugging wdConfig caps _selenium = do
10711439 postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
10721440 xit "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
10731441 chan <- liftIO newChan
1074− let static = getAndCheckInitialItems intMap
1442+ let preSwitchover = getAndCheckInitialItems intMap
10751443 check xs = do
10761444 checkInitialItems intMap xs
10771445 checkRemoval chan 1
10781446 checkReplace chan 2 "deux"
10791447 checkInsert chan 4 "four"
1080− testWidget' static check $ void $ do
1448+ testWidget' preSwitchover check $ void $ do
10811449 (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
10821450 liftIO $ im `H.shouldBe` intMap
10831451 xit "handles postBuild correctly" $ runWD $ do
10841452 chan <- liftIO newChan
1085− let static = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1453+ let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
10861454 check xs = do
10871455 withRetry $ checkInitialItems (applyAlways postBuildPatch intMap) xs
10881456 checkRemoval chan 1
10891457 checkInsert chan 2 "deux"
10901458 checkReplace chan 3 "trois"
1091− testWidget' static check $ void $ do
1459+ testWidget' preSwitchover check $ void $ do
10921460 pb <- getPostBuild
10931461 replace <- triggerEventWithChan chan
10941462 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1132,7 +1500,7 @@ tests withDebugging wdConfig caps _selenium = do
11321500 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
11331501 liftIO $ dmap `H.shouldBe` intMap
11341502
1135− describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do
1503+ session' "traverseDMapWithKeyWithAdjustWithMove" $ do
11361504 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
11371505 widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
11381506 elClass "span" "key" $ text $ textKey2 k
@@ -1183,12 +1551,12 @@ tests withDebugging wdConfig caps _selenium = do
11831551
11841552 describe "hydration" $ moveSpec $ \initMap test -> do
11851553 chan <- liftIO newChan
1186− let static = getAndCheckInitialItems initMap
1554+ let preSwitchover = getAndCheckInitialItems initMap
11871555 check xs = do
11881556 checkInitialItems initMap xs
11891557 body <- getBody
11901558 test body chan
1191− testWidget' static check $ void $ do
1559+ testWidget' preSwitchover check $ void $ do
11921560 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
11931561 liftIO $ assertEqual "DMap" initMap dmap
11941562
@@ -1212,12 +1580,14 @@ tests withDebugging wdConfig caps _selenium = do
12121580 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
12131581 liftIO $ assertEqual "DMap" initMap dmap
12141582
1215− describe "hydrating invalid HTML" $ session' $ do
1216− it "can hydrate list in paragraph" $ runWD $ do
1217− let static = do
1583+ session' "hydrating invalid HTML" $ do
1584+ xit "can hydrate list in paragraph" $ runWD $ do
1585+ let preSwitchover = do
12181586 checkBodyText "before\ninner\nafter"
12191587 -- Two <p> tags should be present
1220− [p1, p2] <- WD.findElems (WD.ByTag "p")
1588+ (p1, p2) <- WD.findElems (WD.ByTag "p") >>= \case
1589+ [p1, p2] -> pure (p1, p2)
1590+ _ -> error "Unexpected number of `p` tags (expected 2)"
12211591 ol <- findElemWithRetry (WD.ByTag "ol")
12221592 shouldContainText "before" p1
12231593 shouldContainText "inner" ol
@@ -1228,7 +1598,8 @@ tests withDebugging wdConfig caps _selenium = do
12281598 shouldContainText "before\ninner\nafter" p1
12291599 elementShouldBeRemoved ol
12301600 elementShouldBeRemoved p2
1231− testWidget' static check $ do
1601+ -- Don't fail fatally when hydration encounters the invalid DOM
1602+ testWidgetDebug' False withDebugging preSwitchover check $ do
12321603 -- This is deliberately invalid HTML, the browser will interpret it as
12331604 -- <p>before</p><ol>inner</ol>after<p></p>
12341605 el "p" $ do
@@ -1236,6 +1607,29 @@ tests withDebugging wdConfig caps _selenium = do
12361607 el "ol" $ text "inner"
12371608 text "after"
12381609
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+
12391633data Selenium = Selenium
12401634 { _selenium_portNumber :: PortNumber
12411635 , _selenium_stopServer :: IO ()
@@ -1303,6 +1697,9 @@ checkTextInId i expected = do
13031697findElemWithRetry :: Selector -> WD WD.Element
13041698findElemWithRetry = withRetry . WD.findElem
13051699
1700+findElemsWithRetry :: Selector -> WD [WD.Element]
1701+findElemsWithRetry = withRetry . WD.findElems
1702+
13061703getBody :: WD WD.Element
13071704getBody = WD.findElem $ WD.ByTag "body"
13081705
@@ -1311,8 +1708,8 @@ withRetry a = wait 300
13111708 where wait :: Int -> WD a
13121709 wait 0 = a
13131710 wait n = try a >>= \case
1314− Left (_ :: SomeException) -> do
1315− liftIO $ threadDelay 100000
1711+ Left (e :: SomeException) -> do
1712+ liftIO $ putStrLn ("(retrying due to " <> show e <> ")") *> threadDelay 100000
13161713 wait $ n - 1
13171714 Right v -> return v
13181715
@@ -1328,11 +1725,12 @@ testWidgetStaticDebug
13281725 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
13291726 -- ^ Widget we are testing
13301727 -> WD b
1331−testWidgetStaticDebug withDebugging w = testWidgetDebug withDebugging (void w) w
1728+testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
13321729
13331730-- | TODO: do something about JSExceptions not causing tests to fail
13341731testWidgetDebug
13351732 :: Bool
1733+ -> Bool
13361734 -> WD ()
13371735 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
13381736 -> WD b
@@ -1340,12 +1738,16 @@ testWidgetDebug
13401738 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
13411739 -- ^ Widget we are testing
13421740 -> WD b
1343−testWidgetDebug withDebugging beforeJS afterSwitchover =
1344− testWidgetDebug' withDebugging 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
13451746
13461747-- | TODO: do something about JSExceptions not causing tests to fail
13471748testWidgetDebug'
13481749 :: Bool
1750+ -> Bool
13491751 -> WD a
13501752 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
13511753 -> (a -> WD b)
@@ -1353,7 +1755,7 @@ testWidgetDebug'
13531755 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
13541756 -- ^ Widget we are testing (contents of body)
13551757 -> WD b
1356−testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
1758+testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget = do
13571759 let putStrLnDebug :: MonadIO m => Text -> m ()
13581760 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
13591761 staticApp = do
@@ -1362,9 +1764,10 @@ testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
13621764 bodyWidget
13631765 el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
13641766 putStrLnDebug "rendering static"
1365− ((), html) <- liftIO $ renderStatic staticApp
1767+ ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
13661768 putStrLnDebug "rendered static"
13671769 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770+ onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
13681771 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
13691772 let entryPoint = do
13701773 putStrLnDebug "taking waitBeforeJS"
@@ -1376,7 +1779,7 @@ testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
13761779 liftIO $ putMVar waitUntilSwitchover ()
13771780 putStrLnDebug "put waitUntilSwitchover"
13781781 putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1379− mainHydrationWidgetWithSwitchoverAction switchOverAction blank bodyWidget
1782+ mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget
13801783 putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
13811784 syncPoint
13821785 application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
@@ -1394,23 +1797,26 @@ testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
13941797 ]
13951798 -- hSilence to get rid of ConnectionClosed logs
13961799 silenceIfDebug = if withDebugging then id else hSilence [stderr]
1397− jsaddleWarp = forkIO $ silenceIfDebug $ Warp.runSettings settings application
1398− jsaddleTid <- liftIO jsaddleWarp
1399− putStrLnDebug "taking waitJSaddle"
1400− liftIO $ takeMVar waitJSaddle
1401− putStrLnDebug "opening page"
1402− WD.openPage $ "http://localhost:" <> show jsaddlePort
1403− putStrLnDebug "running beforeJS"
1404− a <- beforeJS
1405− putStrLnDebug "putting waitBeforeJS"
1406− liftIO $ putMVar waitBeforeJS ()
1407− putStrLnDebug "taking waitUntilSwitchover"
1408− liftIO $ takeMVar waitUntilSwitchover
1409− putStrLnDebug "running afterSwitchover"
1410− b <- afterSwitchover a
1411− putStrLnDebug "killing jsaddle thread"
1412− liftIO $ killThread jsaddleTid
1413− return b
1800+ jsaddleWarp = silenceIfDebug $ Warp.runSettings settings application
1801+ withAsync' jsaddleWarp $ do
1802+ putStrLnDebug "taking waitJSaddle"
1803+ liftIO $ takeMVar waitJSaddle
1804+ putStrLnDebug "opening page"
1805+ WD.openPage $ "http://localhost:" <> show jsaddlePort
1806+ putStrLnDebug "running beforeJS"
1807+ a <- beforeJS
1808+ putStrLnDebug "putting waitBeforeJS"
1809+ liftIO $ putMVar waitBeforeJS ()
1810+ putStrLnDebug "taking waitUntilSwitchover"
1811+ liftIO $ takeMVar waitUntilSwitchover
1812+ putStrLnDebug "running afterSwitchover"
1813+ afterSwitchover a
1814+
1815+withAsync' :: (MonadIO m, MonadMask m) => IO a -> m b -> m b
1816+withAsync' f g = bracket
1817+ (liftIO $ Async.async f)
1818+ (liftIO . Async.uninterruptibleCancel)
1819+ (const g)
14141820
14151821data Key2 a where
14161822 Key2_Int :: Int -> Key2 Int
@@ -1420,12 +1826,3 @@ deriveGEq ''Key2
14201826deriveGCompare ''Key2
14211827deriveGShow ''Key2
14221828deriveArgDict ''Key2
1423−
1424−instance ShowTag Key2 Identity where
1425− showTaggedPrec = \case
1426− Key2_Int _ -> showsPrec
1427− Key2_Char _ -> showsPrec
1428−
1429−instance EqTag Key2 Identity where
1430− eqTagged (Key2_Int _) (Key2_Int _) = (==)
1431− 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.md+32
@@ -1,5 +1,36 @@
11# Revision history for reflex-dom
22
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+
334* The default jsaddle backend on macOS when built from nix
435 is now jsaddle-wkwebview, matching the behaviour of cabal
536 builds.
@@ -7,4 +38,5 @@
738## 0.5
839
940* Re-export new hydration widget "mainWidget" functions.
41+
1042* 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−38
@@ -1,38 +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 "wkwebview" else "webkit2gtk"
4−}:
5−assert (builtins.elem ghcBackend [ "warp" "webkit2gtk" "wkwebview" ]);
6−let isAndroid = hostPlatform.libc == "bionic";
7− ghcBackendPackage = {
8− webkit2gtk = jsaddle-webkit2gtk;
9− warp = jsaddle-warp;
10− wkwebview = jsaddle-wkwebview;
11− }.${ghcBackend};
12−in mkDerivation {
13− pname = "reflex-dom";
14− version = "0.5";
15− src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
16− libraryHaskellDepends = [
17− base bytestring reflex reflex-dom-core text
18− ] ++ (if ghc.isGhcjs or false then [
19− ] else if hostPlatform.isiOS then [
20− jsaddle-wkwebview
21− ] else if isAndroid then [
22− jsaddle-clib
23− android-activity
24− ] else if hostPlatform.isMacOS then [
25− jsaddle-wkwebview
26− ghcBackendPackage
27− ] else [
28− ghcBackendPackage
29− ]);
30− configureFlags = if isAndroid then [
31− "-fandroid"
32− ] else if ghcBackend == "warp" then [
33− "-fuse-warp"
34− ] else [
35− ];
36− description = "Functional Reactive Web Apps with Reflex";
37− license = stdenv.lib.licenses.bsd3;
38−}
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+70−24
@@ -1,10 +1,20 @@
1+cabal-version: 1.24
12Name: reflex-dom
2−Version: 0.5
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,7 +22,6 @@ 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
1625extra-source-files:
1726 java/org/reflexfrp/reflexdom/MainWidget.java
1827 ChangeLog.md
@@ -41,60 +50,67 @@ flag build-examples
4150 default: False
4251 manual: True
4352
44−flag android
45− description: Build an Android app
53+flag wasm32
54+ description: Build for wasm32 architecture
4655 default: False
4756 manual: True
4857
4958library
5059 hs-source-dirs: src
51− if flag(android)
60+ if os(android)
5261 hs-source-dirs: src-android
5362 other-modules: Reflex.Dom.Android.MainWidget
5463 build-depends:
55− aeson,
64+ aeson >= 1.4 && < 1.6,
5665 android-activity == 0.1.*,
5766 data-default == 0.7.*,
58− jsaddle
67+ jsaddle >= 0.9.6 && < 0.10
5968 c-sources: cbits/MainWidget.c
6069 include-dirs: cbits/include
6170 install-includes: MainWidget.h
6271 cpp-options: -DANDROID
6372 build-tools: hsc2hs
6473 build-depends:
65− base >= 4.7 && < 4.12,
74+ base >= 4.7 && < 4.15,
6675 bytestring == 0.10.*,
67− reflex == 0.6.*,
68− reflex-dom-core >=0.5 && <0.6,
76+ reflex >= 0.8 && < 0.9,
77+ reflex-dom-core >= 0.6.1.0 && <0.7,
6978 text == 1.2.*
7079 if !impl(ghcjs)
7180 if flag(use-warp) && (os(linux) || os(osx))
7281 build-depends:
73− jsaddle,
74− jsaddle-warp
82+ jsaddle >= 0.9.6 && < 0.10,
83+ jsaddle-warp >= 0.9.6 && < 0.10
7584 else
7685 if os(osx) || os(ios)
7786 build-depends:
7887 data-default == 0.7.*,
79− jsaddle,
80− jsaddle-wkwebview
88+ jsaddle >= 0.9.6 && < 0.10,
89+ jsaddle-wkwebview >= 0.9.6 && < 0.10
8190 else
82− if flag(webkit2gtk)
91+ if flag(wasm32)
8392 build-depends:
84− jsaddle-webkit2gtk
93+ jsaddle >= 0.9.6 && < 0.10,
94+ jsaddle-wasm >= 0.1 && < 0.2
8595 else
86− if !flag(android)
96+ if flag(webkit2gtk)
8797 build-depends:
88− 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
89103
90104 exposed-modules:
91105 Reflex.Dom
92106 Reflex.Dom.Internal
93107 reexported-modules:
94− Foreign.JavaScript.TH
95− , Foreign.JavaScript.Orphans
108+ Foreign.JavaScript.Orphans
109+ , Foreign.JavaScript.TH
110+ , Foreign.JavaScript.Utils
96111 , Reflex.Dom.Builder.Class
97112 , Reflex.Dom.Builder.Class.Events
113+ , Reflex.Dom.Builder.Hydratable
98114 , Reflex.Dom.Builder.Immediate
99115 , Reflex.Dom.Builder.InputDisabled
100116 , Reflex.Dom.Builder.Static
@@ -102,14 +118,19 @@ library
102118 , Reflex.Dom.Core
103119 , Reflex.Dom.Location
104120 , Reflex.Dom.Main
121+ , Reflex.Dom.Modals.Class
105122 , Reflex.Dom.Old
123+ , Reflex.Dom.Prerender
124+ , Reflex.Dom.Time
106125 , Reflex.Dom.WebSocket
126+ , Reflex.Dom.WebSocket.Query
107127 , Reflex.Dom.Widget
108128 , Reflex.Dom.Widget.Basic
109129 , Reflex.Dom.Widget.Input
110130 , Reflex.Dom.Widget.Lazy
111131 , Reflex.Dom.Widget.Resize
112132 , Reflex.Dom.Xhr
133+ , Reflex.Dom.Xhr.FormData
113134 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
114135 if flag(expose-all-unfoldings)
115136 ghc-options: -fexpose-all-unfoldings
@@ -141,7 +162,19 @@ executable sortableList
141162 default-language: Haskell2010
142163
143164executable benchmark
144− 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
145178 hs-source-dirs: .
146179 main-is: benchmark.hs
147180 ghc-options: -O2 -fspecialise-aggressively
@@ -150,7 +183,20 @@ executable benchmark
150183 default-language: Haskell2010
151184
152185executable krausest
153− 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
154200 hs-source-dirs: benchmarks
155201 main-is: krausest.hs
156202 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)