on develop help sign in
.github/workflows/haskell.ymlnew file+47
since splitsnapshots
unifiedsplit
@@ -0,0 +1,47 @@
1+name: github-action
2+
3+on: [push, pull_request]
4+
5+jobs:
6+ build:
7+ strategy:
8+ matrix:
9+ ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.2']
10+ os: ['ubuntu-latest', 'macos-latest']
11+ exclude:
12+ # There are some linker warnings in 802 on darwin that
13+ # cause compilation to fail
14+ # See https://github.com/NixOS/nixpkgs/issues/25139
15+ - ghc: '8.0.2'
16+ os: 'macos-latest'
17+ runs-on: ${{ matrix.os }}
18+
19+ name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
20+ steps:
21+ - uses: actions/checkout@v2
22+ - uses: actions/setup-haskell@v1
23+ with:
24+ ghc-version: ${{ matrix.ghc }}
25+ - name: Cache
26+ uses: actions/cache@v1
27+ env:
28+ cache-name: cache-cabal
29+ with:
30+ path: ~/.cabal
31+ key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
32+ restore-keys: |
33+ ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
34+ ${{ runner.os }}-${{ matrix.ghc }}-build-
35+ ${{ runner.os }}-${{ matrix.ghc }}-
36+ ${{ runner.os }}
37+
38+ - name: Set up cabal project file to avoid webkit2gtk
39+ run: cp cabal.project-nogtk cabal.project
40+ - name: Install dependencies
41+ run: |
42+ cabal update
43+ cabal build --only-dependencies --enable-tests --enable-benchmarks all
44+ - name: Build
45+ run: cabal build --enable-tests --enable-benchmarks all
46+ - name: Run tests
47+ run: cabal test all
CONTRIBUTING.mdnew file+65
@@ -0,0 +1,65 @@
1+# Contribution Guide
2+
3+Contributions and issue reports are encouraged and appreciated!
4+
5+- [Opening Issues](#opening-issues)
6+- [Submitting Changes](#submitting-changes)
7+ - [Guidelines for Commit Messages](#guidelines-for-commit-messages)
8+ - [Guidelines for Pull Requests](#guidelines-for-pull-requests)
9+ - [Code Quality](#code-quality)
10+ - [Documentation](#documentation)
11+
12+## Opening Issues
13+
14+Before opening an issue, please check whether your issue has already been reported. Assuming it has not:
15+
16+* Describe the issue you're encountering or the suggestion you're making
17+* Include any relevant steps to reproduce or code samples you can. It's always easier for us to debug if we have something that demonstrates the error.
18+* Let us know what version of this project you were using. If you're using a github checkout, provide the git hash.
19+* Describe how you're building this project (i.e., via reflex-platform, cabal install, stack, obelisk, etc.). If you're using reflex-platform or obelisk, provide the git hash of your checkout.
20+
21+## Submitting Changes
22+
23+### Guidelines for Commit Messages
24+
25+#### Summary Line
26+The summary line of your commit message should summarize the changes being made. Commit messages should be written in the imperative mood and should describe what happens when the commit is applied.
27+
28+One way to think about it is that your commit message should be able to complete the sentence:
29+"When applied, this commit will..."
30+
31+#### Body
32+For breaking changes, new features, refactors, or other major changes, the body of the commit message should describe the motivation behind the change in greater detail and may include references to the issue tracker. The body shouldn't repeat code/comments from the diff.
33+
34+### Guidelines for Pull Requests
35+
36+Wherever possible, pull requests should add a single feature or fix a single bug. Pull requests should not bundle several unrelated changes.
37+
38+### Code Quality
39+
40+#### Warnings
41+
42+Your pull request should add no new warnings to the project. It should also generally not disable any warnings.
43+
44+#### Build and Test
45+
46+Make sure the project builds and that the tests pass! This will generally also be checked by CI before merge, but trying it yourself first means you'll catch problems earlier and your contribution can be merged that much sooner!
47+
48+### Documentation
49+
50+#### In the code
51+We're always striving to improve documentation. Please include [haddock](https://haskell-haddock.readthedocs.io/en/latest/index.html) documentation for any added code, and update the documentation for any code you modify.
52+
53+#### In the Changelog
54+Add an entry to the changelog when your PR:
55+* Adds a feature
56+* Deprecates something
57+* Includes a breaking change
58+* Makes any other change that will impact users
59+
60+You may need to add changelog entries to one or both of the changelogs in this repository:
61+* [reflex-dom-core's changelog](reflex-dom-core/ChangeLog.md)
62+* [reflex-dom's changelog](reflex-dom/ChangeLog.md)
63+
64+#### In the [Readme](README.md)
65+The readme is the first place a lot of people look for information about the repository. Update any parts of the readme that are affected by your PR.
FAQ.mdnew file+31
@@ -0,0 +1,31 @@
1+# Frequently Asked Questions
2+
3+### How do I configure DOM events with flags like `preventDefault` and `stopPropagation`?
4+
5+Using `element`, a low-level DOM builder function. Its second argument, `ElementConfig`, has a `_elementConfig_eventSpec` field that can be modified using `addEventSpecFlags`. It takes a `Proxy` that specifies the `DomSpace`, an event name, and a callback which takes the event result and returns an event flag, which can enable behavior like `preventDefault` and `stopPropagation`.
6+
7+The type signature on `def` is needed because the fields of the `ElementConfig` can change the type of the `ElementConfig`. GHC can probably figure out the type of the resulting `ElementConfig`, but it doesn't know what the type of `def` was before the modifications, since it never gets used with that configuration.
8+
9+For example:
10+
11+```haskell
12+{-# LANGUAGE OverloadedStrings #-}
13+{-# LANGUAGE ScopedTypeVariables #-}
14+
15+import Control.Lens ((&), (%~), (.~))
16+import Data.Proxy
17+import Reflex.Dom
18+
19+main :: IO ()
20+main = mainWidget $ do
21+ (click, ()) <- linkPreventDefault $ text "reflex-frp"
22+ display =<< count click
23+
24+linkPreventDefault :: forall t m a. DomBuilder t m => m a -> m (Event t (), a)
25+linkPreventDefault c = do
26+ let cfg = (def :: ElementConfig EventResult t (DomBuilderSpace m))
27+ & elementConfig_initialAttributes .~ ("href" =: "https://reflex-frp.org")
28+ & elementConfig_eventSpec %~ addEventSpecFlags (Proxy :: Proxy (DomBuilderSpace m)) Click (const preventDefault)
29+ (link, a) <- element "a" cfg c
30+ return (domEvent Click link, a)
31+```
LICENSEnew file+12
@@ -0,0 +1,12 @@
1+Copyright (c) 2020, Obsidian Systems LLC
2+All rights reserved.
3+
4+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
5+
6+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
7+
8+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
9+
10+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
11+
12+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
README.md+11−10
@@ -1,22 +1,23 @@
1## [Reflex-DOM](https://reflex-frp.org)
1## [Reflex-DOM](https://reflex-frp.org)
2−### A Framework for Functional Reactive Web Apps in Haskell
3
2
4−Reflex-DOM is a framework for building web applications in Haskell, based on the [Functional Reactive Programming](https://wiki.haskell.org/Functional_Reactive_Programming) library [Reflex](https://github.com/reflex-frp/reflex).
3+[![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/reflex-dom.svg)](https://hackage.haskell.org/package/reflex-dom) [![Hackage CI](https://matrix.hackage.haskell.org/api/v2/packages/reflex-dom/badge)](https://matrix.hackage.haskell.org/#/package/reflex-dom) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/reflex-frp/reflex-dom/blob/master/LICENSE)
5
4
6−A summary of Reflex-DOM functions is available in the [quick reference](Quickref.md).
5+Web applications without callbacks or side-effects. Reflex-DOM brings the power of [Functional Reactive Programming (FRP)](https://wiki.haskell.org/Functional_Reactive_Programming) to the web. Build [HTML](https://developer.mozilla.org/en-US/docs/Web/HTML) and other [Document Object Model (DOM)](https://developer.mozilla.org/en-US/docs/Web/API/Document_Object_Model) data with a pure functional interface.
6+
7+Reflex-DOM is a framework for building web applications in [Haskell](https://www.haskell.org/), based on the [Functional Reactive Programming](https://wiki.haskell.org/Functional_Reactive_Programming) library [Reflex](https://github.com/reflex-frp/reflex).
7
8
8**Visit https://reflex-frp.org/ for more information, tutorials, documentation and [examples](https://examples.reflex-frp.org/).**
9**Visit https://reflex-frp.org/ for more information, tutorials, documentation and [examples](https://examples.reflex-frp.org/).**
9
10
10### Additional resources
11### Additional resources
11−[Get started with Reflex](https://github.com/reflex-frp/reflex-platform)
12−
13−[/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
14−
15−[hackage](https://hackage.haskell.org/package/reflex)
16
12
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)
17−[irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
18+* [irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
18
19
19### Hacking
20### Hacking
20
21
21−Use the `./scripts/hack-on dep/reflex-dom` script in [Reflex Platform](https://github.com/reflex-frp/reflex-platform) to checkout the source code of `reflex-dom` locally in `./dep/reflex-dom` directory.
22+Use the `./scripts/hack-on haskell-overlays/reflex-packages/dep/reflex-dom` script in [Reflex Platform](https://github.com/reflex-frp/reflex-platform) to checkout the source code of `reflex-dom` locally in `./dep/reflex-dom` directory.
22Then do modifications to the source in place, and use the `./try-reflex` or `./scripts/work-on` scripts to create the shell to test your changes.
23Then do modifications to the source in place, and use the `./try-reflex` or `./scripts/work-on` scripts to create the shell to test your changes.
cabal.projectnew file+10
@@ -0,0 +1,10 @@
1+packages:
2+ reflex-dom-core/
3+ reflex-dom/
4+ chrome-test-utils/
5+ reflex-dom-test-selenium/
6+
7+source-repository-package
8+ type: git
9+ location: https://github.com/dfordivam/hspec-webdriver-clone
10+ tag: 0d748b7bb7cd74dce0a55a1ec86b01dbb8a71cd8
cabal.project-nogtknew file+14
@@ -0,0 +1,14 @@
1+packages:
2+ reflex-dom-core/
3+ reflex-dom/
4+
5+package reflex-dom-core
6+ flags: -hydration-tests -gc-tests
7+
8+package reflex-dom
9+ flags: +use-warp -webkit2gtk
10+
11+source-repository-package
12+ type: git
13+ location: https://github.com/dfordivam/hspec-webdriver-clone
14+ tag: 0d748b7bb7cd74dce0a55a1ec86b01dbb8a71cd8
chrome-test-utils/LICENSEnew file+12
@@ -0,0 +1,12 @@
1+Copyright (c) 2020, Obsidian Systems LLC
2+All rights reserved.
3+
4+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
5+
6+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
7+
8+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
9+
10+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
11+
12+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
chrome-test-utils/chrome-test-utils.cabalnew file+30
@@ -0,0 +1,30 @@
1+Name: chrome-test-utils
2+Version: 0.5
3+Synopsis: Utilities to write headless Chromium tests
4+License: BSD3
5+License-file: LICENSE
6+Author: Obsidian Systems LLC
7+Maintainer: maintainer@obsidian.systems
8+Stability: Experimental
9+Build-type: Simple
10+Cabal-version: >=1.9.2
11+
12+library
13+ hs-source-dirs: src
14+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
15+ build-depends: base
16+ , linux-namespaces
17+ , process
18+ , temporary
19+ , text
20+ , unix
21+ exposed-modules:
22+ Test.Util.UnshareNetwork
23+ Test.Util.ChromeFlags
24+ if !os(linux) || !arch(x86_64)
25+ buildable: False
26+
27+source-repository head
28+ type: git
29+ location: https://github.com/reflex-frp/reflex-dom
30+ subdir: chrome-test-utils
reflex-dom-core/src-chromedriver-utils/Test/Util/ChromeFlags.hs → chrome-test-utils/src/Test/Util/ChromeFlags.hsrenamed+1
@@ -1,6 +1,7 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2module Test.Util.ChromeFlags where
2module Test.Util.ChromeFlags where
3
3
4+import Data.Semigroup
4import Data.Text
5import Data.Text
5import System.IO.Temp
6import System.IO.Temp
6
7
reflex-dom-core/src-chromedriver-utils/Test/Util/UnshareNetwork.hs → chrome-test-utils/src/Test/Util/UnshareNetwork.hsrenamed+2−2
@@ -4,8 +4,8 @@ import System.Linux.Namespaces
4import System.Posix
4import System.Posix
5import System.Process
5import System.Process
6
6
7−unshareNetork :: IO ()
7+unshareNetwork :: IO ()
8−unshareNetork = do
8+unshareNetwork = do
9 uid <- getEffectiveUserID
9 uid <- getEffectiveUserID
10 unshare [User, Network]
10 unshare [User, Network]
11 writeUserMappings Nothing [UserMapping 0 uid 1]
11 writeUserMappings Nothing [UserMapping 0 uid 1]
default.nixdeleted−6
@@ -1,6 +0,0 @@
1−haskellPackages: nixpkgs: {
2− reflex-dom = haskellPackages.callPackage ./reflex-dom {};
3− reflex-dom-core = haskellPackages.callPackage ./reflex-dom-core {
4− inherit (nixpkgs) iproute chromium;
5− };
6−}
dep/reflex-platform/default.nixnew file+2
@@ -0,0 +1,2 @@
1+# DO NOT HAND-EDIT THIS FILE
2+import (import ./thunk.nix)
dep/reflex-platform/github.jsonnew file+8
@@ -0,0 +1,8 @@
1+{
2+ "owner": "reflex-frp",
3+ "repo": "reflex-platform",
4+ "branch": "aa-bump-some",
5+ "private": false,
6+ "rev": "fd5acecb50474f795734db9fb924cc3b2fd2b508",
7+ "sha256": "0wsdd67g42klsf9n3pxb3pndjdz36nzf8gp7pfm8j6nyyy2qribk"
8+}
dep/reflex-platform/thunk.nixnew file+9
@@ -0,0 +1,9 @@
1+# DO NOT HAND-EDIT THIS FILE
2+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
3+ if !fetchSubmodules && !private then builtins.fetchTarball {
4+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
5+ } else (import <nixpkgs> {}).fetchFromGitHub {
6+ inherit owner repo rev sha256 fetchSubmodules private;
7+ };
8+ json = builtins.fromJSON (builtins.readFile ./github.json);
9+in fetch json
hydra.jsondeleted−29
@@ -1,29 +0,0 @@
1−{
2− "enabled": 1,
3− "hidden": true,
4− "description": "Jobsets",
5− "nixexprinput": "src",
6− "nixexprpath": "jobsets.nix",
7− "checkinterval": 300,
8− "schedulingshares": 100,
9− "enableemail": false,
10− "emailoverride": "",
11− "keepnr": 10,
12− "inputs": {
13− "src": {
14− "type": "git",
15− "value": "https://github.com/reflex-frp/reflex-dom.git develop",
16− "emailresponsible": false
17− },
18− "nixpkgs": {
19− "type": "git",
20− "value": "https://github.com/NixOS/nixpkgs-channels nixos-unstable",
21− "emailresponsible": false
22− },
23− "prs": {
24− "type": "githubpulls",
25− "value": "reflex-frp reflex-dom",
26− "emailresponsible": false
27− }
28− }
29−}
jobsets.nixdeleted−70
@@ -1,70 +0,0 @@
1−{ prs }:
2−
3−let
4− pkgs = (import ./reflex-platform.nix {}).nixpkgs;
5− mkFetchGithub = value: {
6− inherit value;
7− type = "git";
8− emailresponsible = false;
9− };
10−in
11−with pkgs.lib;
12−let
13− defaults = jobs: {
14− inherit (jobs) description;
15− enabled = 1;
16− hidden = false;
17− keepnr = 10;
18− schedulingshares = 100;
19− checkinterval = 120;
20− enableemail = false;
21− emailoverride = "";
22− nixexprinput = "reflex-dom";
23− nixexprpath = "release.nix";
24− inputs = jobs.inputs // {
25− nixpkgs = {
26− type = "git";
27− value = "https://github.com/NixOS/nixpkgs-channels nixos-unstable";
28− emailresponsible = false;
29− };
30− config = {
31− type = "nix";
32− value = "{ android_sdk.accept_license = true; }";
33− emailresponsible = false;
34− };
35− };
36− };
37− branchJobset = branch: defaults {
38− description = "reflex-dom-${branch}";
39− inputs = {
40− reflex-dom = {
41− value = "https://github.com/reflex-frp/reflex-dom ${branch}";
42− type = "git";
43− emailresponsible = false;
44− };
45− };
46− };
47− makePr = num: info: {
48− name = "reflex-dom-pr-${num}";
49− value = defaults {
50− description = "#${num}: ${info.title}";
51− inputs = {
52− reflex-dom = {
53− #NOTE: This should really use "pull/${num}/merge"; however, GitHub's
54− #status checks only operate on PR heads. This creates a race
55− #condition, which can currently only be solved by requiring PRs to be
56− #up to date before they're merged. See
57− #https://github.com/isaacs/github/issues/1002
58− value = "https://github.com/reflex-frp/reflex-dom pull/${num}/head";
59− type = "git";
60− emailresponsible = false;
61− };
62− };
63− };
64− };
65− processedPrs = mapAttrs' makePr (builtins.fromJSON (builtins.readFile prs));
66− jobsetsAttrs = processedPrs //
67− genAttrs ["develop"] branchJobset;
68−in {
69− jobsets = pkgs.writeText "spec.json" (builtins.toJSON jobsetsAttrs);
70−}
reflex-dom-core/ChangeLog.mdnew file+94
@@ -0,0 +1,94 @@
1+# Revision history for reflex-dom-core
2+
3+## 0.6.2.1
4+
5+* Fix hlint complaints with newer GHC.
6+
7+## 0.6.2.0
8+
9+* ([#400](https://github.com/reflex-frp/reflex-dom/pull/400/files)) Set value of input elements in static renderer
10+
11+## 0.6.1.0
12+
13+* Bump version bounds
14+* Update for new dependent-map and dependent-sum version (after the "some" package split)
15+* Add `MonadAtomicRef` instance for `UnrunnableT`
16+* Fix ([#467](https://github.com/reflex-frp/reflex-dom/issues/467)): Prevent multiple firings of XHR response event
17+* Updates for GHC 8.10
18+* Move `HasSetValue` from Reflex.Dom.Widget.Input to Reflex.Dom.Builder.Class and add an instance for `TextAreaElementConfig`
19+* Add `now` to the `MonadHold` instance for `UnrunnableT`
20+
21+
22+## 0.6.0.0
23+
24+* ([#375](https://github.com/reflex-frp/reflex-dom/pull/375)) **(Breaking change)** Expose resized dimensions from `resizeDetector`, `resizeDetectorWithStyle`, and `resizeDetectorWithAttrs` from `Reflex.Dom.Widget.Resize`.
25+* ([#374](https://github.com/reflex-frp/reflex-dom/pull/374)) **(Breaking change)** Provide text clipboard data as value of `Paste` event.
26+* ([#348](https://github.com/reflex-frp/reflex-dom/pull/348)) **(Breaking change)** Make XHR response headers case insensitive by changing `_xhrResponse_headers :: Map Text Text` to `_xhrResponse_headers :: Map (CI Text) Text`.
27+* ([#225](https://github.com/reflex-frp/reflex-dom/pull/225)) **(Breaking change)** Add a functional dependency to `HasDomEvent`.
28+* ([#342](https://github.com/reflex-frp/reflex-dom/issues/342)) **(Breaking change)** The mouse wheel event is now a `WheelEventResult` rather than `()`. This provides information about the wheel's motion beyond the fact that it merely moved.
29+* ([#353](https://github.com/reflex-frp/reflex-dom/pull/353)) Support GHC 8.8.
30+* ([#358](https://github.com/reflex-frp/reflex-dom/pull/358)) Fix attribute support for explicitly namespaced elements.
31+* ([#363](https://github.com/reflex-frp/reflex-dom/pull/363)) Remove deprecation warnings for the following widgets in
32+ `Reflex.Dom.Widget.Basic`:
33+ * `Link`
34+ * `button`
35+ * `dtdd`
36+ * `linkClass`
37+ * `link`
38+ * `tabDisplay`
39+ * `tableDynAttr`
40+* ([#361](https://github.com/reflex-frp/reflex-dom/pull/361)) Fix bug in hydration causing the JavaScript to crash when dealing with unexpected HTML.
41+* ([#310](https://github.com/reflex-frp/reflex-dom/issues/310)) Fix the static rendering of which dropdown value is selected.
42+* ([#364](https://github.com/reflex-frp/reflex-dom/pull/364)) Export attributes used for controlling hydration at the element level:
43+ * "data-ssr" is now available as `Reflex.Dom.Builder.Immediate.hydratableAttribute`.
44+ * "data-hydration-skip" is now available as `Reflex.Dom.Builder.Immediate.skipHydrationAttribute`.
45+* ([#366](https://github.com/reflex-frp/reflex-dom/pull/366)) Bump bounds for `reflex` to include 0.7.
46+
47+## 0.5.3
48+
49+* Deprecate a number of old inflexible widget helpers in `Reflex.Dom.Widget.Basic`:
50+ * `Link`
51+ * `button`
52+ * `dtdd`
53+ * `linkClass`
54+ * `link`
55+ * `tabDisplay`
56+ * `tableDynAttr`
57+
58+ And in `Reflex.Dom.Widget.Input`:
59+ * `TextInput`
60+ * `TextAreaConfig`
61+ * `CheckboxConfig`
62+ * `FileInput`
63+* Add `< 0.7` upper bound for `reflex`.
64+
65+## 0.5.2
66+
67+* Update to use new dependent-sum/map packages and drop dependency on `*Tag` classes (e.g., `ShowTag`).
68+
69+* Update version bounds of base, containers, and stm
70+
71+* Update to use the newly split `these`/`semialign` packages. To use the pre-split `these` package, set the `split-these` flag to false.
72+
73+* Reintroduce "data-ssr": elements without this attribute are skipped during
74+ hydration.
75+
76+* Fix an issue in the hydration tests that prevented the test from finding the chromium executable
77+
78+* Relax constraints on `dyn` and `widgetHold` to match the ones in `networkView` and `networkHold` respectively
79+
80+* Fix prerender for RequesterT so that it doesn't accidentally discard a request that is made at the same moment as getPostBuild's Event fires
81+
82+## 0.5.1
83+
84+* Added support for marking elements with a "data-skip-hydration" attribute, which will cause hydration to ignore and skip over them.
85+
86+* Removed "data-ssr" attributes from statically rendered output.
87+
88+## 0.5
89+
90+* Add HydrationDomBuilderT to support hydration of statically rendered DOM nodes. See the note at the top of Reflex.Dom.Builder.Immediate.
91+
92+* As a result of the hydration changes, the Prerender class has changed, the type of `prerender` has changed and it is now a class method.
93+
94+* Add the Reflex.Dom.Xhr.FormData module to make posting formdata over xhr more convenient.
reflex-dom-core/LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2015, Obsidian Systems LLC
1+Copyright (c) 2020, Obsidian Systems LLC
2All rights reserved.
2All rights reserved.
3
3
4Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
reflex-dom-core/default.nixdeleted−58
@@ -1,58 +0,0 @@
1−{ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder
2−, bytestring, constraints, constraints-extras, containers
3−, contravariant, data-default, dependent-map, dependent-sum
4−, dependent-sum-template, directory, exception-transformers
5−, exceptions, filepath, ghcjs-dom, hlint, hspec, hspec-webdriver, http-types, HUnit
6−, jsaddle, jsaddle-warp, keycode, lens, lifted-base, linux-namespaces
7−, monad-control, mtl, network, network-uri, primitive, process
8−, random, ref-tf, reflex, semigroups, silently, stdenv, stm
9−, template-haskell, temporary, text, these, transformers, unix, wai
10−, wai-websockets, warp, webdriver, websockets, zenc
11−, ghc, iproute, chromium, hashable, selenium-server-standalone, which, fontconfig
12−}:
13−let addGcTestDepends = drv: if (stdenv.system != "x86_64-linux" || stdenv.hostPlatform != stdenv.buildPlatform || (ghc.isGhcjs or false)) then drv else drv // {
14− # The headless browser run as part of gc tests would hang/crash without this
15− preCheck = ''
16− export FONTCONFIG_PATH=${fontconfig.out}/etc/fonts
17− '';
18− testHaskellDepends = (drv.testHaskellDepends or []) ++ [ temporary jsaddle-warp process linux-namespaces ];
19− testSystemDepends = (drv.testSystemDepends or []) ++ [ chromium iproute ];
20− };
21−in mkDerivation (addGcTestDepends {
22− pname = "reflex-dom-core";
23− version = "0.4";
24− src = ./.;
25− libraryHaskellDepends = [
26− aeson base bifunctors bimap blaze-builder bytestring constraints
27− containers contravariant data-default dependent-map dependent-sum
28− dependent-sum-template directory exception-transformers ghcjs-dom
29− jsaddle keycode lens monad-control mtl network-uri primitive random
30− ref-tf reflex semigroups stm template-haskell text these
31− transformers unix zenc
32− ] ++ (if ghc.isGhcjs or false then [
33− hashable
34− ] else []);
35−
36− #TODO: Get hlint working for cross-compilation
37− doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
38−
39− # The headless browser run as part of the tests will exit without this
40− preBuild = ''
41− export HOME="$PWD"
42− '';
43−
44− # Show some output while running tests, so we might notice what's wrong
45− testTarget = "--show-details=streaming";
46−
47− testSystemDepends = [ selenium-server-standalone which ];
48− testHaskellDepends = [
49− aeson base bytestring constraints constraints-extras containers
50− dependent-map dependent-sum dependent-sum-template directory
51− exceptions filepath ghcjs-dom hlint hspec hspec-webdriver http-types HUnit jsaddle
52− jsaddle-warp lens lifted-base linux-namespaces network process random reflex
53− silently temporary text unix wai wai-websockets warp webdriver
54− websockets
55− ];
56− description = "Functional Reactive Web Apps with Reflex";
57− license = stdenv.lib.licenses.bsd3;
58−})
reflex-dom-core/reflex-dom-core.cabal+73−47
@@ -1,7 +1,18 @@
1+cabal-version: 1.24
1Name: reflex-dom-core
2Name: reflex-dom-core
2−Version: 0.4
3+Version: 0.6.2.1
3Synopsis: Functional Reactive Web Apps with Reflex
4Synopsis: Functional Reactive Web Apps with Reflex
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+ .
4−Description: Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine
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@.
5License: BSD3
16License: BSD3
6License-file: LICENSE
17License-file: LICENSE
7Author: Ryan Trinkle
18Author: Ryan Trinkle
@@ -9,7 +20,6 @@ Maintainer: ryan.trinkle@gmail.com
9Stability: Experimental
20Stability: Experimental
10Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
21Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
11Build-type: Simple
22Build-type: Simple
12−Cabal-version: >=1.9.2
13-- Deal with https://github.com/haskell/cabal/issues/2544 / https://github.com/haskell/cabal/issues/367
23-- Deal with https://github.com/haskell/cabal/issues/2544 / https://github.com/haskell/cabal/issues/367
14extra-source-files: src-ghc/Foreign/JavaScript/Internal/Utils.hs
24extra-source-files: src-ghc/Foreign/JavaScript/Internal/Utils.hs
15 src-ghcjs/Foreign/JavaScript/Internal/Utils.hs
25 src-ghcjs/Foreign/JavaScript/Internal/Utils.hs
@@ -17,6 +27,7 @@ extra-source-files: src-ghc/Foreign/JavaScript/Internal/Utils.hs
17 src/Reflex/Dom/WebSocket/Foreign.hs
27 src/Reflex/Dom/WebSocket/Foreign.hs
18 src/Reflex/Dom/Xhr/ResponseType.hs
28 src/Reflex/Dom/Xhr/ResponseType.hs
19 src/Reflex/Dom/Xhr/Exception.hs
29 src/Reflex/Dom/Xhr/Exception.hs
30+ ChangeLog.md
20
31
21flag use-template-haskell
32flag use-template-haskell
22 description: Use template haskell to generate lenses
33 description: Use template haskell to generate lenses
@@ -38,39 +49,54 @@ flag profile-reflex
38 default: False
49 default: False
39 manual: True
50 manual: True
40
51
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+
41library
67library
42 hs-source-dirs: src
68 hs-source-dirs: src
43 build-depends:
69 build-depends:
44− aeson >= 0.8 && < 1.4,
70+ aeson >= 0.8 && < 1.6,
45− base >= 4.7 && < 4.12,
71+ base >= 4.7 && < 4.15,
46 bifunctors >= 4.2 && < 6,
72 bifunctors >= 4.2 && < 6,
47− bimap >= 0.3 && < 0.4,
73+ bimap >= 0.3 && < 0.5,
48− blaze-builder,
74+ blaze-builder >= 0.4.1 && < 0.5,
49 bytestring == 0.10.*,
75 bytestring == 0.10.*,
76+ case-insensitive < 1.3,
50− containers == 0.5.*,
77+ containers >= 0.6 && < 0.7,
51− constraints >= 0.9 && < 0.11,
78+ constraints >= 0.9 && < 0.13,
52− contravariant >= 1.4 && < 1.5,
79+ contravariant >= 1.4 && < 1.6,
53 data-default >= 0.5 && < 0.8,
80 data-default >= 0.5 && < 0.8,
54− dependent-map == 0.2.*,
81+ dependent-map >= 0.3 && < 0.5,
55− dependent-sum >= 0.3 && < 0.5,
56− dependent-sum-template >= 0.0.0.4 && < 0.1,
82+ dependent-sum >= 0.6 && < 0.8,
83+ dependent-sum-template >= 0.1 && < 0.2,
57 directory >= 1.2 && < 1.4,
84 directory >= 1.2 && < 1.4,
58 exception-transformers == 0.4.*,
85 exception-transformers == 0.4.*,
59 ghcjs-dom >= 0.9.1.0 && < 0.10,
86 ghcjs-dom >= 0.9.1.0 && < 0.10,
60− jsaddle >=0.9.0.0 && <0.10,
87+ jsaddle >= 0.9.0.0 && < 0.10,
61 -- keycode-0.2 has a bug on firefox
88 -- keycode-0.2 has a bug on firefox
62 keycode >= 0.2.1 && < 0.3,
89 keycode >= 0.2.1 && < 0.3,
63 lens >= 4.7 && < 5,
90 lens >= 4.7 && < 5,
64 monad-control >= 1.0.1 && < 1.1,
91 monad-control >= 1.0.1 && < 1.1,
65 mtl >= 2.1 && < 2.3,
92 mtl >= 2.1 && < 2.3,
66− primitive >= 0.5 && < 0.7,
93+ primitive >= 0.5 && < 0.8,
67− random,
94+ random >= 1.1 && < 1.2,
68 ref-tf == 0.4.*,
95 ref-tf == 0.4.*,
69− reflex == 0.5.*,
96+ reflex >= 0.8 && < 0.9,
70− semigroups >= 0.16 && < 0.19,
97+ semigroups >= 0.16 && < 0.20,
71− stm == 2.4.*,
98+ stm >= 2.4 && < 2.6,
72 text == 1.2.*,
99 text == 1.2.*,
73− these >= 0.4 && < 0.8,
74 transformers >= 0.3 && < 0.6,
100 transformers >= 0.3 && < 0.6,
75 network-uri >= 2.6.1 && < 2.7,
101 network-uri >= 2.6.1 && < 2.7,
76 zenc == 0.1.*
102 zenc == 0.1.*
@@ -79,12 +105,20 @@ library
79 hs-source-dirs: src-ghcjs
105 hs-source-dirs: src-ghcjs
80 build-depends:
106 build-depends:
81 ghcjs-base,
107 ghcjs-base,
82− hashable == 1.2.*
108+ hashable >= 1.2 && < 1.4
83 else
109 else
84 hs-source-dirs: src-ghc
110 hs-source-dirs: src-ghc
85 if !os(windows)
111 if !os(windows)
86 build-depends: unix == 2.7.*
112 build-depends: unix == 2.7.*
87
113
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+
88 exposed-modules:
122 exposed-modules:
89 Foreign.JavaScript.TH
123 Foreign.JavaScript.TH
90 Foreign.JavaScript.Orphans
124 Foreign.JavaScript.Orphans
@@ -93,6 +127,7 @@ library
93 Reflex.Dom.Builder.Class.Events
127 Reflex.Dom.Builder.Class.Events
94 Reflex.Dom.Builder.Immediate
128 Reflex.Dom.Builder.Immediate
95 Reflex.Dom.Builder.InputDisabled
129 Reflex.Dom.Builder.InputDisabled
130+ Reflex.Dom.Builder.Hydratable
96 Reflex.Dom.Builder.Static
131 Reflex.Dom.Builder.Static
97 Reflex.Dom.Class
132 Reflex.Dom.Class
98 Reflex.Dom.Core
133 Reflex.Dom.Core
@@ -110,6 +145,7 @@ library
110 Reflex.Dom.Widget.Lazy
145 Reflex.Dom.Widget.Lazy
111 Reflex.Dom.Widget.Resize
146 Reflex.Dom.Widget.Resize
112 Reflex.Dom.Xhr
147 Reflex.Dom.Xhr
148+ Reflex.Dom.Xhr.FormData
113 other-modules:
149 other-modules:
114 Foreign.JavaScript.Internal.Utils
150 Foreign.JavaScript.Internal.Utils
115 Reflex.Dom.WebSocket.Foreign
151 Reflex.Dom.WebSocket.Foreign
@@ -117,6 +153,7 @@ library
117 Reflex.Dom.Xhr.ResponseType
153 Reflex.Dom.Xhr.ResponseType
118 Reflex.Dom.Xhr.Exception
154 Reflex.Dom.Xhr.Exception
119
155
156+ default-language: Haskell98
120 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
157 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
121 ghc-prof-options: -fprof-auto
158 ghc-prof-options: -fprof-auto
122
159
@@ -131,28 +168,28 @@ library
131
168
132 if flag(use-template-haskell)
169 if flag(use-template-haskell)
133 build-depends:
170 build-depends:
134− dependent-sum >= 0.3 && < 0.5,
171+ dependent-sum-template >= 0.1 && < 0.2,
135− dependent-sum-template >= 0.0.0.5 && < 0.1,
136− template-haskell
172+ template-haskell >= 2.12.0 && < 2.17
137 other-extensions: TemplateHaskell
173 other-extensions: TemplateHaskell
138 cpp-options: -DUSE_TEMPLATE_HASKELL
174 cpp-options: -DUSE_TEMPLATE_HASKELL
139 other-modules:
175 other-modules:
140 Reflex.Dom.Builder.Class.TH
176 Reflex.Dom.Builder.Class.TH
141− else
142− build-depends:
143− dependent-sum == 0.4.*
144
177
145test-suite hlint
178test-suite hlint
146− build-depends: base, hlint
179+ build-depends:
180+ base,
181+ hlint >= 2.0 && < 4.0
147 hs-source-dirs: test
182 hs-source-dirs: test
148 main-is: hlint.hs
183 main-is: hlint.hs
149 type: exitcode-stdio-1.0
184 type: exitcode-stdio-1.0
185+ default-language: Haskell98
150
186
151test-suite hydration
187test-suite hydration
152 build-depends: base
188 build-depends: base
153 , aeson
189 , aeson
190+ , async
154 , bytestring
191 , bytestring
155− , chromedriver-utils
192+ , chrome-test-utils
156 , constraints
193 , constraints
157 , constraints-extras
194 , constraints-extras
158 , containers
195 , containers
@@ -164,6 +201,7 @@ test-suite hydration
164 , filepath
201 , filepath
165 , ghcjs-dom
202 , ghcjs-dom
166 , hspec
203 , hspec
204+ , hspec-core
167 , hspec-webdriver
205 , hspec-webdriver
168 , http-types
206 , http-types
169 , HUnit
207 , HUnit
@@ -185,19 +223,21 @@ test-suite hydration
185 , warp
223 , warp
186 , webdriver
224 , webdriver
187 , websockets
225 , websockets
226+ , which
188 hs-source-dirs: test
227 hs-source-dirs: test
189 ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
228 ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
190 ghc-prof-options: -fprof-auto -optP-DPROFILING
229 ghc-prof-options: -fprof-auto -optP-DPROFILING
191 main-is: hydration.hs
230 main-is: hydration.hs
192 type: exitcode-stdio-1.0
231 type: exitcode-stdio-1.0
232+ default-language: Haskell98
193− if !os(linux) || !arch(x86_64)-- || impl(ghc >= 8.4.0)
233+ if !os(linux) || !arch(x86_64) || flag(profile-reflex) || !flag(hydration-tests)
194 buildable: False
234 buildable: False
195
235
196-- broken test on base 4.11 & ghc 8.4.3
236-- broken test on base 4.11 & ghc 8.4.3
197-- needs to be updated for changes in GHC.Stats
237-- needs to be updated for changes in GHC.Stats
198test-suite gc
238test-suite gc
199 build-depends: base
239 build-depends: base
200− , chromedriver-utils
240+ , chrome-test-utils
201 , jsaddle
241 , jsaddle
202 , jsaddle-warp
242 , jsaddle-warp
203 , process
243 , process
@@ -209,22 +249,8 @@ test-suite gc
209 ghc-prof-options: -fprof-auto -optP-DPROFILING
249 ghc-prof-options: -fprof-auto -optP-DPROFILING
210 main-is: gc.hs
250 main-is: gc.hs
211 type: exitcode-stdio-1.0
251 type: exitcode-stdio-1.0
252+ default-language: Haskell98
212− if !os(linux) || !arch(x86_64)
253+ if !os(linux) || !arch(x86_64) || !flag(gc-tests)
213− buildable: False
214−
215−library chromedriver-utils
216− hs-source-dirs: src-chromedriver-utils
217− ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
218− build-depends: base
219− , linux-namespaces
220− , process
221− , temporary
222− , text
223− , unix
224− exposed-modules:
225− Test.Util.UnshareNetwork
226− Test.Util.ChromeFlags
227− if !os(linux) || !arch(x86_64)
228 buildable: False
254 buildable: False
229
255
230source-repository head
256source-repository head
reflex-dom-core/src/Foreign/JavaScript/Orphans.hs+2
@@ -1,6 +1,8 @@
1{-# OPTIONS_HADDOCK hide #-}
1{-# OPTIONS_HADDOCK hide #-}
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE UndecidableInstances #-}
5+
4{-# OPTIONS_GHC -fno-warn-orphans #-}
6{-# OPTIONS_GHC -fno-warn-orphans #-}
5module Foreign.JavaScript.Orphans where
7module Foreign.JavaScript.Orphans where
6
8
reflex-dom-core/src/Foreign/JavaScript/TH.hs+2−4
@@ -6,11 +6,9 @@
6{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE FlexibleInstances #-}
7{-# LANGUAGE FunctionalDependencies #-}
7{-# LANGUAGE FunctionalDependencies #-}
8{-# LANGUAGE GeneralizedNewtypeDeriving #-}
8{-# LANGUAGE GeneralizedNewtypeDeriving #-}
9−{-# LANGUAGE MultiParamTypeClasses #-}
10{-# LANGUAGE RankNTypes #-}
9{-# LANGUAGE RankNTypes #-}
11{-# LANGUAGE StandaloneDeriving #-}
10{-# LANGUAGE StandaloneDeriving #-}
12{-# LANGUAGE TypeFamilies #-}
11{-# LANGUAGE TypeFamilies #-}
13−{-# LANGUAGE TypeSynonymInstances #-}
14{-# LANGUAGE UndecidableInstances #-}
12{-# LANGUAGE UndecidableInstances #-}
15#ifdef USE_TEMPLATE_HASKELL
13#ifdef USE_TEMPLATE_HASKELL
16{-# LANGUAGE TemplateHaskell #-}
14{-# LANGUAGE TemplateHaskell #-}
@@ -294,7 +292,7 @@ class Monad m => MonadJS x m | m -> x where
294#ifdef ghcjs_HOST_OS
292#ifdef ghcjs_HOST_OS
295
293
296data JSCtx_IO
294data JSCtx_IO
297−type HasJS' = HasJS JSCtx_IO
295+type JS' = JSCtx_IO
298
296
299instance MonadIO m => HasJS JSCtx_IO (WithJSContextSingleton x m) where
297instance MonadIO m => HasJS JSCtx_IO (WithJSContextSingleton x m) where
300 type JSX (WithJSContextSingleton x m) = IO
298 type JSX (WithJSContextSingleton x m) = IO
@@ -345,7 +343,7 @@ foreign import javascript unsafe "function(){ return $1(arguments); }" funWithAr
345#else
343#else
346
344
347data JSCtx_JavaScriptCore x
345data JSCtx_JavaScriptCore x
348−type HasJS' = HasJS (JSCtx_JavaScriptCore ())
346+type JS' = JSCtx_JavaScriptCore ()
349
347
350instance IsJSContext (JSCtx_JavaScriptCore x) where
348instance IsJSContext (JSCtx_JavaScriptCore x) where
351 newtype JSRef (JSCtx_JavaScriptCore x) = JSRef_JavaScriptCore { unJSRef_JavaScriptCore :: JSVal }
349 newtype JSRef (JSCtx_JavaScriptCore x) = JSRef_JavaScriptCore { unJSRef_JavaScriptCore :: JSVal }
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+13−5
@@ -9,12 +9,12 @@
9{-# LANGUAGE GeneralizedNewtypeDeriving #-}
9{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10#if !MIN_VERSION_base(4,9,0)
10#if !MIN_VERSION_base(4,9,0)
11{-# LANGUAGE ImpredicativeTypes #-}
11{-# LANGUAGE ImpredicativeTypes #-}
12+#else
13+{-# LANGUAGE Rank2Types #-} -- Implied by ImpredicativeTypes
12#endif
14#endif
13{-# LANGUAGE LambdaCase #-}
15{-# LANGUAGE LambdaCase #-}
14−{-# LANGUAGE MultiParamTypeClasses #-}
15{-# LANGUAGE OverloadedStrings #-}
16{-# LANGUAGE OverloadedStrings #-}
16{-# LANGUAGE PolyKinds #-}
17{-# LANGUAGE PolyKinds #-}
17−{-# LANGUAGE RankNTypes #-}
18{-# LANGUAGE RecursiveDo #-}
18{-# LANGUAGE RecursiveDo #-}
19{-# LANGUAGE ScopedTypeVariables #-}
19{-# LANGUAGE ScopedTypeVariables #-}
20{-# LANGUAGE StandaloneDeriving #-}
20{-# LANGUAGE StandaloneDeriving #-}
@@ -192,7 +192,7 @@ data CommentNodeConfig t
192 }
192 }
193
193
194#ifndef USE_TEMPLATE_HASKELL
194#ifndef USE_TEMPLATE_HASKELL
195−commentNodeConfig_initialContents :: Lens' (CommentNodeConfig t) Comment
195+commentNodeConfig_initialContents :: Lens' (CommentNodeConfig t) Text
196commentNodeConfig_initialContents f (CommentNodeConfig a b) = (\a' -> CommentNodeConfig a' b) <$> f a
196commentNodeConfig_initialContents f (CommentNodeConfig a b) = (\a' -> CommentNodeConfig a' b) <$> f a
197{-# INLINE commentNodeConfig_initialContents #-}
197{-# INLINE commentNodeConfig_initialContents #-}
198#endif
198#endif
@@ -618,7 +618,7 @@ instance (DomBuilder t m, MonadHold t m, MonadFix m, Semigroup w) => DomBuilder
618 placeRawElement = lift . placeRawElement
618 placeRawElement = lift . placeRawElement
619 wrapRawElement e = lift . wrapRawElement e
619 wrapRawElement e = lift . wrapRawElement e
620
620
621−instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive q) => DomBuilder t (QueryT t q m) where
621+instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive q, Eq q) => DomBuilder t (QueryT t q m) where
622 type DomBuilderSpace (QueryT t q m) = DomBuilderSpace m
622 type DomBuilderSpace (QueryT t q m) = DomBuilderSpace m
623 textNode = liftTextNode
623 textNode = liftTextNode
624 commentNode = liftCommentNode
624 commentNode = liftCommentNode
@@ -639,7 +639,7 @@ instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive
639
639
640-- * Convenience functions
640-- * Convenience functions
641
641
642−class HasDomEvent t target eventName where
642+class HasDomEvent t target eventName | target -> t where
643 type DomEventType target eventName :: *
643 type DomEventType target eventName :: *
644 domEvent :: EventName eventName -> target -> Event t (DomEventType target eventName)
644 domEvent :: EventName eventName -> target -> Event t (DomEventType target eventName)
645
645
@@ -745,3 +745,11 @@ instance HasDocument m => HasDocument (DynamicWriterT t w m)
745instance HasDocument m => HasDocument (PostBuildT t m)
745instance HasDocument m => HasDocument (PostBuildT t m)
746instance HasDocument m => HasDocument (RequesterT t request response m)
746instance HasDocument m => HasDocument (RequesterT t request response m)
747instance HasDocument m => HasDocument (QueryT t q m)
747instance HasDocument m => HasDocument (QueryT t q m)
748+
749+class HasSetValue a where
750+ type SetValue a :: *
751+ setValue :: Lens' a (SetValue a)
752+
753+instance Reflex t => HasSetValue (TextAreaElementConfig er t m) where
754+ type SetValue (TextAreaElementConfig er t m) = Event t Text
755+ setValue = textAreaElementConfig_setValue
reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs+13−3
@@ -1,7 +1,6 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE DataKinds #-}
2{-# LANGUAGE DataKinds #-}
3{-# LANGUAGE GADTs #-}
3{-# LANGUAGE GADTs #-}
4−{-# LANGUAGE KindSignatures #-}
5{-# LANGUAGE PolyKinds #-}
4{-# LANGUAGE PolyKinds #-}
6#ifdef USE_TEMPLATE_HASKELL
5#ifdef USE_TEMPLATE_HASKELL
7{-# LANGUAGE TemplateHaskell #-}
6{-# LANGUAGE TemplateHaskell #-}
@@ -15,6 +14,7 @@ import Data.GADT.Compare.TH
15import Data.GADT.Compare
14import Data.GADT.Compare
16 (GOrdering(..), (:~:)(..), GEq(..), GCompare(..))
15 (GOrdering(..), (:~:)(..), GEq(..), GCompare(..))
17#endif
16#endif
17+import Data.Text (Text)
18
18
19data EventTag
19data EventTag
20 = AbortTag
20 = AbortTag
@@ -152,7 +152,7 @@ type family EventResultType (en :: EventTag) :: * where
152 EventResultType 'BeforecopyTag = ()
152 EventResultType 'BeforecopyTag = ()
153 EventResultType 'CopyTag = ()
153 EventResultType 'CopyTag = ()
154 EventResultType 'BeforepasteTag = ()
154 EventResultType 'BeforepasteTag = ()
155− EventResultType 'PasteTag = ()
155+ EventResultType 'PasteTag = Maybe Text
156 EventResultType 'ResetTag = ()
156 EventResultType 'ResetTag = ()
157 EventResultType 'SearchTag = ()
157 EventResultType 'SearchTag = ()
158 EventResultType 'SelectstartTag = ()
158 EventResultType 'SelectstartTag = ()
@@ -160,7 +160,17 @@ type family EventResultType (en :: EventTag) :: * where
160 EventResultType 'TouchmoveTag = TouchEventResult
160 EventResultType 'TouchmoveTag = TouchEventResult
161 EventResultType 'TouchendTag = TouchEventResult
161 EventResultType 'TouchendTag = TouchEventResult
162 EventResultType 'TouchcancelTag = TouchEventResult
162 EventResultType 'TouchcancelTag = TouchEventResult
163− EventResultType 'WheelTag = ()
163+ EventResultType 'WheelTag = WheelEventResult
164+
165+data DeltaMode = DeltaPixel | DeltaLine | DeltaPage
166+ deriving (Show, Read, Eq, Ord, Bounded, Enum)
167+
168+data WheelEventResult = WheelEventResult
169+ { _wheelEventResult_deltaX :: Double
170+ , _wheelEventResult_deltaY :: Double
171+ , _wheelEventResult_deltaZ :: Double
172+ , _wheelEventResult_deltaMode :: DeltaMode
173+ } deriving (Show, Read, Eq, Ord)
164
174
165data TouchEventResult = TouchEventResult
175data TouchEventResult = TouchEventResult
166 { _touchEventResult_altKey :: Bool
176 { _touchEventResult_altKey :: Bool
reflex-dom-core/src/Reflex/Dom/Builder/Hydratable.hsnew file+116
@@ -0,0 +1,116 @@
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4+{-# LANGUAGE MultiParamTypeClasses #-}
5+{-# LANGUAGE OverloadedStrings #-}
6+{-# LANGUAGE StandaloneDeriving #-}
7+{-# LANGUAGE TypeFamilies #-}
8+{-# LANGUAGE UndecidableInstances #-}
9+module Reflex.Dom.Builder.Hydratable where
10+
11+import Control.Monad.Fix
12+import Control.Monad.Primitive
13+import Control.Monad.Ref
14+import Control.Monad.Trans
15+import Control.Monad.Trans.Control
16+import Data.Coerce
17+import qualified Data.Map as Map
18+import Foreign.JavaScript.TH
19+#ifndef ghcjs_HOST_OS
20+import GHCJS.DOM.Types (MonadJSM (..))
21+#endif
22+import Reflex
23+import Reflex.Dom.Builder.Class
24+import Reflex.Dom.Builder.Immediate (HasDocument (..), hydratableAttribute)
25+import Reflex.Host.Class
26+
27+-- | A DomBuilder transformer that adds an attribute to all elements such that the
28+-- hydration builder knows which bits of DOM were added by us, and which were
29+-- added by external scripts.
30+newtype HydratableT m a = HydratableT { runHydratableT :: m a } deriving (Functor, Applicative, Monad, MonadAtomicRef, MonadFix, MonadIO)
31+
32+#ifndef ghcjs_HOST_OS
33+instance MonadJSM m => MonadJSM (HydratableT m) where
34+ liftJSM' = HydratableT . liftJSM'
35+#endif
36+
37+deriving instance MonadSample t m => MonadSample t (HydratableT m)
38+deriving instance MonadHold t m => MonadHold t (HydratableT m)
39+
40+instance MonadTrans HydratableT where
41+ lift = HydratableT
42+
43+instance MonadTransControl HydratableT where
44+ type StT HydratableT a = a
45+ liftWith f = HydratableT $ f runHydratableT
46+ restoreT = HydratableT
47+
48+instance MonadRef m => MonadRef (HydratableT m) where
49+ type Ref (HydratableT m) = Ref m
50+ newRef = lift . newRef
51+ readRef = lift . readRef
52+ writeRef ref = lift . writeRef ref
53+
54+instance PerformEvent t m => PerformEvent t (HydratableT m) where
55+ type Performable (HydratableT m) = Performable m
56+ performEvent_ = lift . performEvent_
57+ performEvent = lift . performEvent
58+
59+instance PrimMonad m => PrimMonad (HydratableT m) where
60+ type PrimState (HydratableT m) = PrimState m
61+ primitive = lift . primitive
62+
63+makeHydratable :: Reflex t => ElementConfig er t m -> ElementConfig er t m
64+makeHydratable cfg = cfg
65+ { _elementConfig_initialAttributes = Map.insert hydratableAttribute "" $ _elementConfig_initialAttributes cfg
66+ , _elementConfig_modifyAttributes = fmap (Map.delete hydratableAttribute) <$> _elementConfig_modifyAttributes cfg
67+ }
68+
69+instance PostBuild t m => PostBuild t (HydratableT m) where
70+ getPostBuild = lift getPostBuild
71+
72+deriving instance TriggerEvent t m => TriggerEvent t (HydratableT m)
73+
74+instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydratableT m) where
75+ newEventWithTrigger = lift . newEventWithTrigger
76+ newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
77+
78+instance Adjustable t m => Adjustable t (HydratableT m) where
79+ runWithReplace a0 a' = HydratableT $ runWithReplace (coerce a0) (coerceEvent a')
80+ traverseDMapWithKeyWithAdjust f dm0 dm' = HydratableT $ traverseDMapWithKeyWithAdjust (\k v -> runHydratableT $ f k v) (coerce dm0) (coerceEvent dm')
81+ traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = HydratableT $ traverseDMapWithKeyWithAdjustWithMove (\k v -> runHydratableT $ f k v) (coerce dm0) (coerceEvent dm')
82+ traverseIntMapWithKeyWithAdjust f m0 m' = HydratableT $ traverseIntMapWithKeyWithAdjust (\k v -> runHydratableT $ f k v) (coerce m0) (coerceEvent m')
83+
84+instance NotReady t m => NotReady t (HydratableT m) where
85+ notReadyUntil = lift . notReadyUntil
86+ notReady = lift notReady
87+
88+instance DomBuilder t m => DomBuilder t (HydratableT m) where
89+ type DomBuilderSpace (HydratableT m) = DomBuilderSpace m
90+ element t cfg = lift . element t (makeHydratable cfg) . runHydratableT
91+ inputElement cfg = lift $ inputElement $ cfg
92+ { _inputElementConfig_elementConfig = makeHydratable $ _inputElementConfig_elementConfig cfg
93+ }
94+ textAreaElement cfg = lift $ textAreaElement $ cfg
95+ { _textAreaElementConfig_elementConfig = makeHydratable $ _textAreaElementConfig_elementConfig cfg
96+ }
97+ selectElement cfg child = do
98+ let cfg' = cfg
99+ { _selectElementConfig_elementConfig = makeHydratable $ _selectElementConfig_elementConfig cfg
100+ }
101+ lift $ selectElement cfg' $ runHydratableT child
102+
103+instance HasDocument m => HasDocument (HydratableT m)
104+
105+instance HasJSContext m => HasJSContext (HydratableT m) where
106+ type JSContextPhantom (HydratableT m) = JSContextPhantom m
107+ askJSContext = lift askJSContext
108+
109+instance HasJS js m => HasJS js (HydratableT m) where
110+ type JSX (HydratableT m) = JSX m
111+ liftJS = lift . liftJS
112+
113+instance DomRenderHook t m => DomRenderHook t (HydratableT m) where
114+ withRenderHook f = HydratableT . withRenderHook f . runHydratableT
115+ requestDomAction = HydratableT . requestDomAction
116+ requestDomAction_ = HydratableT . requestDomAction_
reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+225−133
@@ -2,7 +2,6 @@
2{-# LANGUAGE CPP #-}
2{-# LANGUAGE CPP #-}
3{-# LANGUAGE ConstraintKinds #-}
3{-# LANGUAGE ConstraintKinds #-}
4{-# LANGUAGE DataKinds #-}
4{-# LANGUAGE DataKinds #-}
5−{-# LANGUAGE DeriveFunctor #-}
6{-# LANGUAGE DeriveTraversable #-}
5{-# LANGUAGE DeriveTraversable #-}
7{-# LANGUAGE EmptyDataDecls #-}
6{-# LANGUAGE EmptyDataDecls #-}
8{-# LANGUAGE FlexibleContexts #-}
7{-# LANGUAGE FlexibleContexts #-}
@@ -49,6 +48,7 @@ module Reflex.Dom.Builder.Immediate
49 , HydrationMode (..)
48 , HydrationMode (..)
50 , HydrationRunnerT (..)
49 , HydrationRunnerT (..)
51 , runHydrationRunnerT
50 , runHydrationRunnerT
51+ , runHydrationRunnerTWithFailure
52 , ImmediateDomBuilderT
52 , ImmediateDomBuilderT
53 , runHydrationDomBuilderT
53 , runHydrationDomBuilderT
54 , getHydrationMode
54 , getHydrationMode
@@ -86,9 +86,6 @@ module Reflex.Dom.Builder.Immediate
86 , ghcjsEventSpec_filters
86 , ghcjsEventSpec_filters
87 , ghcjsEventSpec_handler
87 , ghcjsEventSpec_handler
88 , GhcjsEventHandler (..)
88 , GhcjsEventHandler (..)
89−#ifndef USE_TEMPLATE_HASKELL
90− , phantom2
91−#endif
92 , drawChildUpdate
89 , drawChildUpdate
93 , ChildReadyState (..)
90 , ChildReadyState (..)
94 , mkHasFocus
91 , mkHasFocus
@@ -110,6 +107,9 @@ module Reflex.Dom.Builder.Immediate
110 , WindowConfig (..)
107 , WindowConfig (..)
111 , Window (..)
108 , Window (..)
112 , wrapWindow
109 , wrapWindow
110+ -- * Attributes for controlling hydration
111+ , hydratableAttribute
112+ , skipHydrationAttribute
113 -- * Internal
113 -- * Internal
114 , traverseDMapWithKeyWithAdjust'
114 , traverseDMapWithKeyWithAdjust'
115 , hoistTraverseWithKeyWithAdjust
115 , hoistTraverseWithKeyWithAdjust
@@ -135,15 +135,20 @@ import Data.Functor.Compose
135import Data.Functor.Constant
135import Data.Functor.Constant
136import Data.Functor.Misc
136import Data.Functor.Misc
137import Data.Functor.Product
137import Data.Functor.Product
138+import Data.GADT.Compare (GCompare)
138import Data.IORef
139import Data.IORef
139import Data.IntMap.Strict (IntMap)
140import Data.IntMap.Strict (IntMap)
140import Data.Maybe
141import Data.Maybe
142+import Data.Monoid ((<>))
141import Data.Some (Some(..))
143import Data.Some (Some(..))
144+import Data.GADT.Compare (GCompare)
145+import Data.String (IsString)
142import Data.Text (Text)
146import Data.Text (Text)
143import Foreign.JavaScript.Internal.Utils
147import Foreign.JavaScript.Internal.Utils
144import Foreign.JavaScript.TH
148import Foreign.JavaScript.TH
149+import GHCJS.DOM.ClipboardEvent as ClipboardEvent
145import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode, createComment)
150import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode, createComment)
146−import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute, hasAttributeNS)
151+import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute)
147import GHCJS.DOM.EventM (EventM, event, on)
152import GHCJS.DOM.EventM (EventM, event, on)
148import GHCJS.DOM.KeyboardEvent as KeyboardEvent
153import GHCJS.DOM.KeyboardEvent as KeyboardEvent
149import GHCJS.DOM.MouseEvent
154import GHCJS.DOM.MouseEvent
@@ -162,6 +167,9 @@ import Reflex.PerformEvent.Base (PerformEventT)
162import Reflex.PerformEvent.Class
167import Reflex.PerformEvent.Class
163import Reflex.PostBuild.Base (PostBuildT)
168import Reflex.PostBuild.Base (PostBuildT)
164import Reflex.PostBuild.Class
169import Reflex.PostBuild.Class
170+#ifdef PROFILE_REFLEX
171+import Reflex.Profiled
172+#endif
165import Reflex.Requester.Base
173import Reflex.Requester.Base
166import Reflex.Requester.Class
174import Reflex.Requester.Class
167import Reflex.Spider (Spider, SpiderHost, Global)
175import Reflex.Spider (Spider, SpiderHost, Global)
@@ -174,6 +182,7 @@ import qualified Data.IntMap.Strict as IntMap
174import qualified Data.Map as Map
182import qualified Data.Map as Map
175import qualified Data.Text as T
183import qualified Data.Text as T
176import qualified GHCJS.DOM as DOM
184import qualified GHCJS.DOM as DOM
185+import qualified GHCJS.DOM.DataTransfer as DataTransfer
177import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
186import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
178import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
187import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
179import qualified GHCJS.DOM.Element as Element
188import qualified GHCJS.DOM.Element as Element
@@ -191,6 +200,7 @@ import qualified GHCJS.DOM.TouchEvent as TouchEvent
191import qualified GHCJS.DOM.TouchList as TouchList
200import qualified GHCJS.DOM.TouchList as TouchList
192import qualified GHCJS.DOM.Types as DOM
201import qualified GHCJS.DOM.Types as DOM
193import qualified GHCJS.DOM.Window as Window
202import qualified GHCJS.DOM.Window as Window
203+import qualified GHCJS.DOM.WheelEvent as WheelEvent
194import qualified Reflex.Patch.DMap as PatchDMap
204import qualified Reflex.Patch.DMap as PatchDMap
195import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
205import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
196import qualified Reflex.Patch.MapWithMove as PatchMapWithMove
206import qualified Reflex.Patch.MapWithMove as PatchMapWithMove
@@ -198,6 +208,7 @@ import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
198
208
199#ifndef USE_TEMPLATE_HASKELL
209#ifndef USE_TEMPLATE_HASKELL
200import Data.Functor.Contravariant (phantom)
210import Data.Functor.Contravariant (phantom)
211+import Control.Lens (Lens', Getter)
201#endif
212#endif
202
213
203#ifndef ghcjs_HOST_OS
214#ifndef ghcjs_HOST_OS
@@ -283,12 +294,21 @@ localRunner (HydrationRunnerT m) s parent = do
283runHydrationRunnerT
294runHydrationRunnerT
284 :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
295 :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
285 => HydrationRunnerT t m a -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
296 => HydrationRunnerT t m a -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
297+runHydrationRunnerT m = runHydrationRunnerTWithFailure m (pure ())
298+
299+{-# INLINABLE runHydrationRunnerTWithFailure #-}
300+runHydrationRunnerTWithFailure
301+ :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
302+ => HydrationRunnerT t m a -> IO () -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
286−runHydrationRunnerT (HydrationRunnerT m) s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do
303+runHydrationRunnerTWithFailure (HydrationRunnerT m) onFailure s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do
287 (a, s') <- runStateT m (HydrationState s False)
304 (a, s') <- runStateT m (HydrationState s False)
288 traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
305 traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
289 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."
306 when (_hydrationState_failed s') $ liftIO $ putStrLn "reflex-dom warning: hydration failed: the DOM was not as expected at switchover time. This may be due to invalid HTML which the browser has altered upon parsing, some external JS altering the DOM, or the page being served from an outdated cache."
307+ when (_hydrationState_failed s') $ liftIO onFailure
290 pure a
308 pure a
291
309
310+
311+
292instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where
312instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where
293 {-# INLINABLE newEventWithTrigger #-}
313 {-# INLINABLE newEventWithTrigger #-}
294 newEventWithTrigger = lift . newEventWithTrigger
314 newEventWithTrigger = lift . newEventWithTrigger
@@ -312,12 +332,11 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationRunnerT t m) where
312-- done *before* the switchover to immediate mode - this is most likely some
332-- done *before* the switchover to immediate mode - this is most likely some
313-- form of 'hold' which we want to remove after hydration is done
333-- form of 'hold' which we want to remove after hydration is done
314{-# INLINABLE addHydrationStepWithSetup #-}
334{-# INLINABLE addHydrationStepWithSetup #-}
315−addHydrationStepWithSetup :: (Adjustable t m, MonadIO m) => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
335+addHydrationStepWithSetup :: MonadIO m => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
316addHydrationStepWithSetup setup f = getHydrationMode >>= \case
336addHydrationStepWithSetup setup f = getHydrationMode >>= \case
317 HydrationMode_Immediate -> pure ()
337 HydrationMode_Immediate -> pure ()
318 HydrationMode_Hydrating -> do
338 HydrationMode_Hydrating -> do
319− switchover <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_switchover
339+ s <- lift setup
320− (s, _) <- lift $ runWithReplace setup $ return () <$ switchover
321 addHydrationStep (f s)
340 addHydrationStep (f s)
322
341
323-- | Add a hydration step
342-- | Add a hydration step
@@ -345,7 +364,7 @@ runDomRenderHookT (DomRenderHookT a) events = do
345 flip runTriggerEventT events $ do
364 flip runTriggerEventT events $ do
346 rec (result, req) <- runRequesterT a rsp
365 rec (result, req) <- runRequesterT a rsp
347 rsp <- performEventAsync $ ffor req $ \rm f -> liftJSM $ runInAnimationFrame f $
366 rsp <- performEventAsync $ ffor req $ \rm f -> liftJSM $ runInAnimationFrame f $
348− traverseRequesterData (\r -> Identity <$> r) rm
367+ traverseRequesterData (fmap Identity) rm
349 return result
368 return result
350 where
369 where
351 runInAnimationFrame f x = void . DOM.inAnimationFrame' $ \_ -> do
370 runInAnimationFrame f x = void . DOM.inAnimationFrame' $ \_ -> do
@@ -360,7 +379,7 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (DomRenderHookT t m) where
360 withRenderHook hook (DomRenderHookT a) = do
379 withRenderHook hook (DomRenderHookT a) = do
361 DomRenderHookT $ withRequesting $ \rsp -> do
380 DomRenderHookT $ withRequesting $ \rsp -> do
362 (x, req) <- lift $ runRequesterT a $ runIdentity <$> rsp
381 (x, req) <- lift $ runRequesterT a $ runIdentity <$> rsp
363− return (ffor req $ \rm -> hook $ traverseRequesterData (\r -> Identity <$> r) rm, x)
382+ return (ffor req $ \rm -> hook $ traverseRequesterData (fmap Identity) rm, x)
364 requestDomAction = DomRenderHookT . requestingIdentity
383 requestDomAction = DomRenderHookT . requestingIdentity
365 requestDomAction_ = DomRenderHookT . requesting_
384 requestDomAction_ = DomRenderHookT . requesting_
366
385
@@ -527,17 +546,17 @@ wrap events e cfg = do
527 return eventTriggerRefs
546 return eventTriggerRefs
528
547
529{-# SPECIALIZE wrap
548{-# SPECIALIZE wrap
530− :: Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
549+ :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
531 -> DOM.Element
550 -> DOM.Element
532− -> RawElementConfig er Spider HydrationDomSpace
551+ -> RawElementConfig er DomTimeline HydrationDomSpace
533− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (DMap EventName (EventFilterTriggerRef Spider er))
552+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
534 #-}
553 #-}
535
554
536{-# SPECIALIZE wrap
555{-# SPECIALIZE wrap
537− :: Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
556+ :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
538 -> DOM.Element
557 -> DOM.Element
539− -> RawElementConfig er Spider GhcjsDomSpace
558+ -> RawElementConfig er DomTimeline GhcjsDomSpace
540− -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (DMap EventName (EventFilterTriggerRef Spider er))
559+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
541 #-}
560 #-}
542
561
543{-# INLINE triggerBody #-}
562{-# INLINE triggerBody #-}
@@ -573,23 +592,23 @@ triggerBody ctx cfg events eventTriggerRefs e (WrapArg en) t = case DMap.lookup
573
592
574{-# SPECIALIZE triggerBody
593{-# SPECIALIZE triggerBody
575 :: DOM.JSContextRef
594 :: DOM.JSContextRef
576− -> RawElementConfig er Spider HydrationDomSpace
595+ -> RawElementConfig er DomTimeline HydrationDomSpace
577− -> Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
596+ -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
578− -> DMap EventName (EventFilterTriggerRef Spider er)
597+ -> DMap EventName (EventFilterTriggerRef DomTimeline er)
579 -> DOM.Element
598 -> DOM.Element
580 -> WrapArg er EventName x
599 -> WrapArg er EventName x
581− -> EventTrigger Spider x
600+ -> EventTrigger DomTimeline x
582 -> IO (IO ())
601 -> IO (IO ())
583 #-}
602 #-}
584
603
585{-# SPECIALIZE triggerBody
604{-# SPECIALIZE triggerBody
586 :: DOM.JSContextRef
605 :: DOM.JSContextRef
587− -> RawElementConfig er Spider GhcjsDomSpace
606+ -> RawElementConfig er DomTimeline GhcjsDomSpace
588− -> Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
607+ -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
589− -> DMap EventName (EventFilterTriggerRef Spider er)
608+ -> DMap EventName (EventFilterTriggerRef DomTimeline er)
590 -> DOM.Element
609 -> DOM.Element
591 -> WrapArg er EventName x
610 -> WrapArg er EventName x
592− -> EventTrigger Spider x
611+ -> EventTrigger DomTimeline x
593 -> IO (IO ())
612 -> IO (IO ())
594 #-}
613 #-}
595
614
@@ -638,15 +657,11 @@ data GhcjsEventSpec er = GhcjsEventSpec
638newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
657newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
639
658
640#ifndef USE_TEMPLATE_HASKELL
659#ifndef USE_TEMPLATE_HASKELL
641−phantom2 :: (Functor f, Contravariant f) => f a -> f b
642−phantom2 = phantom
643−{-# INLINE phantom2 #-}
644−
645ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
660ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
646ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
661ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
647{-# INLINE ghcjsEventSpec_filters #-}
662{-# INLINE ghcjsEventSpec_filters #-}
648ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
663ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
649−ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom2 (f b)
664+ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom (f b)
650{-# INLINE ghcjsEventSpec_handler #-}
665{-# INLINE ghcjsEventSpec_handler #-}
651#endif
666#endif
652
667
@@ -694,16 +709,16 @@ elementImmediate elementTag cfg child = do
694
709
695{-# SPECIALIZE elementImmediate
710{-# SPECIALIZE elementImmediate
696 :: Text
711 :: Text
697− -> ElementConfig er Spider HydrationDomSpace
712+ -> ElementConfig er DomTimeline HydrationDomSpace
698− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
713+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
699− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (Element er GhcjsDomSpace Spider, a)
714+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
700 #-}
715 #-}
701
716
702{-# SPECIALIZE elementImmediate
717{-# SPECIALIZE elementImmediate
703 :: Text
718 :: Text
704− -> ElementConfig er Spider GhcjsDomSpace
719+ -> ElementConfig er DomTimeline GhcjsDomSpace
705− -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM a
720+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM a
706− -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (Element er GhcjsDomSpace Spider, a)
721+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
707 #-}
722 #-}
708
723
709-- For specialisation
724-- For specialisation
@@ -740,11 +755,19 @@ elementInternal elementTag cfg child = getHydrationMode >>= \case
740
755
741{-# SPECIALIZE elementInternal
756{-# SPECIALIZE elementInternal
742 :: Text
757 :: Text
743− -> ElementConfig er Spider HydrationDomSpace
758+ -> ElementConfig er DomTimeline HydrationDomSpace
744− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
759+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
745− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (Element er HydrationDomSpace Spider, a)
760+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er HydrationDomSpace DomTimeline, a)
746 #-}
761 #-}
747
762
763+-- | An attribute which causes hydration to skip over an element completely.
764+skipHydrationAttribute :: IsString s => s
765+skipHydrationAttribute = "data-hydration-skip"
766+
767+-- | An attribute which signals that an element should be hydrated.
768+hydratableAttribute :: IsString s => s
769+hydratableAttribute = "data-ssr"
770+
748{-# INLINE hydrateElement #-}
771{-# INLINE hydrateElement #-}
749hydrateElement
772hydrateElement
750 :: forall er t m a. (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
773 :: forall er t m a. (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
@@ -766,11 +789,15 @@ hydrateElement elementTag cfg child = do
766 }
789 }
767 result <- HydrationDomBuilderT $ lift $ runReaderT (unHydrationDomBuilderT child) env'
790 result <- HydrationDomBuilderT $ lift $ runReaderT (unHydrationDomBuilderT child) env'
768 wrapResult <- liftIO newEmptyMVar
791 wrapResult <- liftIO newEmptyMVar
769− let ssrAttr = "data-ssr" :: DOM.JSString
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
770− hasSSRAttribute :: DOM.Element -> HydrationRunnerT t m Bool
796+ shouldSkip :: DOM.Element -> HydrationRunnerT t m Bool
771− hasSSRAttribute e = case cfg ^. namespace of
797+ shouldSkip e = do
772− Nothing -> hasAttribute e ssrAttr <* removeAttribute e ssrAttr
798+ skip <- hasAttribute e (skipHydrationAttribute :: DOM.JSString)
773− Just ns -> hasAttributeNS e (Just ns) ssrAttr <* removeAttributeNS e (Just ns) ssrAttr
799+ hydratable <- hasAttribute e (hydratableAttribute :: DOM.JSString)
800+ pure $ skip || not hydratable
774 childDom <- liftIO $ readIORef childDelayedRef
801 childDom <- liftIO $ readIORef childDelayedRef
775 let rawCfg = extractRawElementConfig cfg
802 let rawCfg = extractRawElementConfig cfg
776 doc <- askDocument
803 doc <- askDocument
@@ -785,9 +812,9 @@ hydrateElement elementTag cfg child = do
785 pure e
812 pure e
786 Just node -> DOM.castTo DOM.Element node >>= \case
813 Just node -> DOM.castTo DOM.Element node >>= \case
787 Nothing -> go (Just node) -- this node is not an element, skip
814 Nothing -> go (Just node) -- this node is not an element, skip
788− Just e -> hasSSRAttribute e >>= \case
815+ Just e -> shouldSkip e >>= \case
789− False -> go (Just node) -- this element was not added by the static renderer, skip
816+ True -> go (Just node) -- this element should be skipped by hydration
790− True -> do
817+ False -> do
791 t <- Element.getTagName e
818 t <- Element.getTagName e
792 -- TODO: check attributes?
819 -- TODO: check attributes?
793 if T.toCaseFold elementTag == T.toCaseFold t
820 if T.toCaseFold elementTag == T.toCaseFold t
@@ -830,9 +857,9 @@ hydrateElement elementTag cfg child = do
830
857
831{-# SPECIALIZE hydrateElement
858{-# SPECIALIZE hydrateElement
832 :: Text
859 :: Text
833− -> ElementConfig er Spider HydrationDomSpace
860+ -> ElementConfig er DomTimeline HydrationDomSpace
834− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
861+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
835− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM ((Element er HydrationDomSpace Spider, a), IORef DOM.Element)
862+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM ((Element er HydrationDomSpace DomTimeline, a), IORef DOM.Element)
836 #-}
863 #-}
837
864
838{-# INLINE inputElementImmediate #-}
865{-# INLINE inputElementImmediate #-}
@@ -910,14 +937,26 @@ inputElementInternal cfg = getHydrationMode >>= \case
910 doc <- askDocument
937 doc <- askDocument
911 -- Expected initial value from config
938 -- Expected initial value from config
912 let v0 = _inputElementConfig_initialValue cfg
939 let v0 = _inputElementConfig_initialValue cfg
913− addHydrationStep $ do
940+ c0 = _inputElementConfig_initialChecked cfg
941+ valuesAtSwitchover = do
942+ v <- maybe (pure $ pure v0) (hold v0) (_inputElementConfig_setValue cfg)
943+ c <- maybe (pure $ pure c0) (hold c0) (_inputElementConfig_setChecked cfg)
944+ pure (v, c)
945+ addHydrationStepWithSetup valuesAtSwitchover $ \(switchoverValue', switchoverChecked') -> do
946+ switchoverValue <- sample switchoverValue'
947+ switchoverChecked <- sample switchoverChecked'
914 domElement <- liftIO $ readIORef domElementRef
948 domElement <- liftIO $ readIORef domElementRef
915 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
949 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
916 getValue = Input.getValue domInputElement
950 getValue = Input.getValue domInputElement
917− -- The browser might have messed with the value, or the user could have
951+ -- When the value has been updated by setValue before switchover, we must
918− -- altered it before activation, so we set it if it isn't what we expect
952+ -- send an update here to remain in sync. This is because the later
919− liftJSM getValue >>= \v0' -> do
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.
920− when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
959+ liftJSM getValue >>= \realValue -> when (realValue /= switchoverValue) $ liftIO $ triggerChangeByUI realValue
921 -- Watch for user interaction and trigger event accordingly
960 -- Watch for user interaction and trigger event accordingly
922 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
961 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
923 for_ (_inputElementConfig_setValue cfg) $ \eSetValue ->
962 for_ (_inputElementConfig_setValue cfg) $ \eSetValue ->
@@ -931,7 +970,17 @@ inputElementInternal cfg = getHydrationMode >>= \case
931 ]
970 ]
932 liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
971 liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
933 requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
972 requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
934− Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
973+ -- When the checked state has been updated by setChecked before
974+ -- switchover, we must send an update here to remain in sync. This is
975+ -- because the later requestDomAction based on the setChecked event will not
976+ -- capture events happening before postBuild, because this code runs after
977+ -- switchover.
978+ when (c0 /= switchoverChecked) $ liftIO $ triggerCheckedChangedBySetChecked switchoverChecked
979+ -- The user could have clicked the checkbox before switchover, we only
980+ -- detect cases where they flipped the state. This must be triggered after
981+ -- the setValue one in order for the events to be in the correct order.
982+ liftJSM (Input.getChecked domInputElement) >>= \realChecked -> when (realChecked /= switchoverChecked) $
983+ liftIO $ triggerCheckedChangedByUI realChecked
935 _ <- liftJSM $ domInputElement `on` Events.click $ do
984 _ <- liftJSM $ domInputElement `on` Events.click $ do
936 liftIO . triggerCheckedChangedByUI =<< Input.getChecked domInputElement
985 liftIO . triggerCheckedChangedByUI =<< Input.getChecked domInputElement
937 for_ (_inputElementConfig_setChecked cfg) $ \eNewchecked ->
986 for_ (_inputElementConfig_setChecked cfg) $ \eNewchecked ->
@@ -944,7 +993,7 @@ inputElementInternal cfg = getHydrationMode >>= \case
944 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
993 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
945 liftIO . triggerFileChange =<< maybe (return []) getMyFiles mfiles
994 liftIO . triggerFileChange =<< maybe (return []) getMyFiles mfiles
946 return ()
995 return ()
947− checked' <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
996+ checked' <- holdDyn c0 $ leftmost
948 [ checkedChangedBySetChecked
997 [ checkedChangedBySetChecked
949 , checkedChangedByUI
998 , checkedChangedByUI
950 ]
999 ]
@@ -1016,14 +1065,21 @@ textAreaElementInternal cfg = getHydrationMode >>= \case
1016 doc <- askDocument
1065 doc <- askDocument
1017 -- Expected initial value from config
1066 -- Expected initial value from config
1018 let v0 = _textAreaElementConfig_initialValue cfg
1067 let v0 = _textAreaElementConfig_initialValue cfg
1019− addHydrationStep $ do
1068+ valueAtSwitchover = maybe (pure $ pure v0) (hold v0) (_textAreaElementConfig_setValue cfg)
1069+ addHydrationStepWithSetup valueAtSwitchover $ \switchoverValue' -> do
1070+ switchoverValue <- sample switchoverValue'
1020 domElement <- liftIO $ readIORef domElementRef
1071 domElement <- liftIO $ readIORef domElementRef
1021 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
1072 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
1022 getValue = TextArea.getValue domTextAreaElement
1073 getValue = TextArea.getValue domTextAreaElement
1023− -- The browser might have messed with the value, or the user could have
1074+ -- When the value has been updated by setValue before switchover, we must
1024− -- altered it before activation, so we set it if it isn't what we expect
1075+ -- send an update here to remain in sync. This is because the later
1025− liftJSM getValue >>= \v0' -> do
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.
1026− when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
1082+ liftJSM getValue >>= \realValue -> when (realValue /= switchoverValue) $ liftIO $ triggerChangeByUI realValue
1027 -- Watch for user interaction and trigger event accordingly
1083 -- Watch for user interaction and trigger event accordingly
1028 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
1084 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
1029 for_ (_textAreaElementConfig_setValue cfg) $ \eSetValue ->
1085 for_ (_textAreaElementConfig_setValue cfg) $ \eSetValue ->
@@ -1272,8 +1328,8 @@ hydrateComment doc t mSetContents = do
1272skipToAndReplaceComment
1328skipToAndReplaceComment
1273 :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
1329 :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
1274 => Text
1330 => Text
1275− -> IORef Text
1331+ -> IORef (Maybe Text)
1276− -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef Text)
1332+ -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef (Maybe Text))
1277skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
1333skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
1278 HydrationMode_Immediate -> do
1334 HydrationMode_Immediate -> do
1279 -- If we're in immediate mode, we don't try to replace an existing comment,
1335 -- If we're in immediate mode, we don't try to replace an existing comment,
@@ -1281,43 +1337,50 @@ skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
1281 t <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
1337 t <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
1282 append $ toNode t
1338 append $ toNode t
1283 textNodeRef <- liftIO $ newIORef t
1339 textNodeRef <- liftIO $ newIORef t
1284− keyRef <- liftIO $ newIORef ""
1340+ keyRef <- liftIO $ newIORef Nothing
1285 pure (pure (), textNodeRef, keyRef)
1341 pure (pure (), textNodeRef, keyRef)
1286 HydrationMode_Hydrating -> do
1342 HydrationMode_Hydrating -> do
1287 doc <- askDocument
1343 doc <- askDocument
1288 textNodeRef <- liftIO $ newIORef $ error "textNodeRef not yet initialized"
1344 textNodeRef <- liftIO $ newIORef $ error "textNodeRef not yet initialized"
1289 keyRef <- liftIO $ newIORef $ error "keyRef not yet initialized"
1345 keyRef <- liftIO $ newIORef $ error "keyRef not yet initialized"
1346+ let
1347+ go Nothing _ = do
1348+ tn <- createTextNode doc ("" :: Text)
1349+ insertAfterPreviousNode tn
1350+ HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1351+ pure (tn, Nothing)
1290− let go key0 mLastNode = do
1352+ go (Just key0) mLastNode = do
1291− parent <- askParent
1353+ parent <- askParent
1292− node <- maybe (Node.getFirstChildUnchecked parent) Node.getNextSiblingUnchecked mLastNode
1354+ maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
1355+ Nothing -> go Nothing Nothing
1293− DOM.castTo DOM.Comment node >>= \case
1356+ Just node -> DOM.castTo DOM.Comment node >>= \case
1294 Just comment -> do
1357 Just comment -> do
1295− commentText <- Node.getTextContentUnchecked comment
1358+ commentText <- fromMaybe (error "Cannot get text content of comment node") <$> Node.getTextContent comment
1296− case T.stripPrefix (prefix <> key0) commentText of
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.
1297 Just key -> do
1360 Just key -> do
1298 -- Replace the comment with an (invisible) text node
1361 -- Replace the comment with an (invisible) text node
1299 tn <- createTextNode doc ("" :: Text)
1362 tn <- createTextNode doc ("" :: Text)
1300 Node.replaceChild_ parent tn comment
1363 Node.replaceChild_ parent tn comment
1301− pure (tn, key)
1364+ pure (tn, Just key)
1302 Nothing -> do
1365 Nothing -> do
1303− go key0 (Just node)
1366+ go (Just key0) (Just node)
1304 Nothing -> do
1367 Nothing -> do
1305− go key0 (Just node)
1368+ go (Just key0) (Just node)
1306− switchComment = do
1369+ switchComment = do
1307− key0 <- liftIO $ readIORef key0Ref
1370+ key0 <- liftIO $ readIORef key0Ref
1308− (tn, key) <- go key0 =<< getPreviousNode
1371+ (tn, key) <- go key0 =<< getPreviousNode
1309− setPreviousNode $ Just $ toNode tn
1372+ setPreviousNode $ Just $ toNode tn
1310− liftIO $ do
1373+ liftIO $ do
1311− writeIORef textNodeRef tn
1374+ writeIORef textNodeRef tn
1312− writeIORef keyRef key
1375+ writeIORef keyRef key
1313 pure (switchComment, textNodeRef, keyRef)
1376 pure (switchComment, textNodeRef, keyRef)
1314
1377
1315{-# INLINABLE skipToReplaceStart #-}
1378{-# INLINABLE skipToReplaceStart #-}
1316−skipToReplaceStart :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef Text)
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))
1317−skipToReplaceStart = skipToAndReplaceComment "replace-start" =<< liftIO (newIORef "")
1380+skipToReplaceStart = skipToAndReplaceComment "replace-start" =<< liftIO (newIORef $ Just "") -- TODO: Don't rely on clever usage @""@ to make this work.
1318
1381
1319{-# INLINABLE skipToReplaceEnd #-}
1382{-# INLINABLE skipToReplaceEnd #-}
1320−skipToReplaceEnd :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => IORef Text -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text)
1383+skipToReplaceEnd :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => IORef (Maybe Text) -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text)
1321skipToReplaceEnd key = fmap (\(m,e,_) -> (m,e)) $ skipToAndReplaceComment "replace-end" key
1384skipToReplaceEnd key = fmap (\(m,e,_) -> (m,e)) $ skipToAndReplaceComment "replace-end" key
1322
1385
1323instance SupportsHydrationDomBuilder t m => NotReady t (HydrationDomBuilderT s t m) where
1386instance SupportsHydrationDomBuilder t m => NotReady t (HydrationDomBuilderT s t m) where
@@ -1557,13 +1620,13 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
1557 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1620 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1558 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
1621 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
1559 ChildReadyState_Unready _ -> do
1622 ChildReadyState_Unready _ -> do
1560− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
1623+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1561 return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)
1624 return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)
1562 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
1625 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
1563 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
1626 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
1564 deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)
1627 deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)
1565 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
1628 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
1566− writeIORef sRef $ ChildReadyState_Unready $ This <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
1629+ writeIORef sRef $ ChildReadyState_Unready $ Some <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
1567 return $ Constant ()
1630 return $ Constant ()
1568 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
1631 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
1569 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
1632 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
@@ -1573,8 +1636,8 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
1573 phsBefore <- liftIO $ readIORef placeholders
1636 phsBefore <- liftIO $ readIORef placeholders
1574 let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
1637 let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
1575 collectIfMoved k e = do
1638 collectIfMoved k e = do
1576− let mThisPlaceholder = Map.lookup (This k) phsBefore -- Will be Nothing if this element wasn't present before
1639+ let mThisPlaceholder = Map.lookup (Some k) phsBefore -- Will be Nothing if this element wasn't present before
1577− nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phsBefore
1640+ nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsBefore
1578 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
1641 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
1579 False -> do
1642 False -> do
1580 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
1643 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
@@ -1593,7 +1656,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
1593 PatchMapWithMove.From_Move k -> Just $ PatchMapWithMove.From_Move k
1656 PatchMapWithMove.From_Move k -> Just $ PatchMapWithMove.From_Move k
1594 let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant () a)
1657 let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant () a)
1595 placeFragment k e = do
1658 placeFragment k e = do
1596− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phsAfter
1659+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsAfter
1597 case PatchDMapWithMove._nodeInfo_from e of
1660 case PatchDMapWithMove._nodeInfo_from e of
1598 PatchDMapWithMove.From_Insert (Compose (TraverseChild x _)) -> case x of
1661 PatchDMapWithMove.From_Insert (Compose (TraverseChild x _)) -> case x of
1599 Left _ -> pure ()
1662 Left _ -> pure ()
@@ -1609,7 +1672,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
1609
1672
1610{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
1673{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
1611traverseDMapWithKeyWithAdjust'
1674traverseDMapWithKeyWithAdjust'
1612− :: forall s t m (k :: * -> *) v v'. (Adjustable t m, MonadHold t m, MonadFix m, MonadJSM m, PrimMonad m, DMap.GCompare k, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
1675+ :: forall s t m (k :: * -> *) v v'. (Adjustable t m, MonadHold t m, MonadFix m, MonadJSM m, PrimMonad m, GCompare k, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
1613 => (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
1676 => (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
1614 -> DMap k v
1677 -> DMap k v
1615 -> Event t (PatchDMap k v)
1678 -> Event t (PatchDMap k v)
@@ -1624,7 +1687,7 @@ traverseDMapWithKeyWithAdjust' = do
1624 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1687 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1625 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
1688 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
1626 ChildReadyState_Unready _ -> do
1689 ChildReadyState_Unready _ -> do
1627− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
1690+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1628 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
1691 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
1629 delete _ (Constant sRef) = do
1692 delete _ (Constant sRef) = do
1630 writeIORef sRef $ ChildReadyState_Unready Nothing
1693 writeIORef sRef $ ChildReadyState_Unready Nothing
@@ -1635,9 +1698,9 @@ traverseDMapWithKeyWithAdjust' = do
1635 hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholder (PatchDMap patch) -> do
1698 hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholder (PatchDMap patch) -> do
1636 phs <- liftIO $ readIORef placeholders
1699 phs <- liftIO $ readIORef placeholders
1637 forM_ (DMap.toList patch) $ \(k :=> ComposeMaybe mv) -> do
1700 forM_ (DMap.toList patch) $ \(k :=> ComposeMaybe mv) -> do
1638− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phs
1701+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phs
1639 -- Delete old node
1702 -- Delete old node
1640− forM_ (Map.lookup (This k) phs) $ \thisPlaceholder -> do
1703+ forM_ (Map.lookup (Some k) phs) $ \thisPlaceholder -> do
1641 thisPlaceholder `deleteUpTo` nextPlaceholder
1704 thisPlaceholder `deleteUpTo` nextPlaceholder
1642 -- Insert new node
1705 -- Insert new node
1643 forM_ mv $ \(Compose (TraverseChild e _)) -> case e of
1706 forM_ mv $ \(Compose (TraverseChild e _)) -> case e of
@@ -1699,17 +1762,17 @@ traverseIntMapWithKeyWithAdjust' = do
1699 liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
1762 liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
1700
1763
1701{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1764{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1702− :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM v')
1765+ :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
1703 -> IntMap v
1766 -> IntMap v
1704− -> Event Spider (PatchIntMap v)
1767+ -> Event DomTimeline (PatchIntMap v)
1705− -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
1768+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1706 #-}
1769 #-}
1707
1770
1708{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1771{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1709− :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM v')
1772+ :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
1710 -> IntMap v
1773 -> IntMap v
1711− -> Event Spider (PatchIntMap v)
1774+ -> Event DomTimeline (PatchIntMap v)
1712− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
1775+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1713 #-}
1776 #-}
1714
1777
1715data ChildReadyState a
1778data ChildReadyState a
@@ -1729,7 +1792,7 @@ hoistTraverseWithKeyWithAdjust
1729 ::
1792 ::
1730 ( Adjustable t m
1793 ( Adjustable t m
1731 , MonadHold t m
1794 , MonadHold t m
1732− , DMap.GCompare k
1795+ , GCompare k
1733 , MonadIO m
1796 , MonadIO m
1734 , MonadJSM m
1797 , MonadJSM m
1735 , PrimMonad m
1798 , PrimMonad m
@@ -1787,7 +1850,7 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
1787 liftIO $ writeIORef childReadyState ChildReadyState_Ready
1850 liftIO $ writeIORef childReadyState ChildReadyState_Ready
1788 case countedAt of
1851 case countedAt of
1789 Nothing -> return ()
1852 Nothing -> return ()
1790− Just (This k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
1853+ Just (Some k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
1791 (oldUnready, p) <- liftIO $ readIORef pendingChange
1854 (oldUnready, p) <- liftIO $ readIORef pendingChange
1792 when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
1855 when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
1793 let newUnready = DMap.delete k oldUnready
1856 let newUnready = DMap.delete k oldUnready
@@ -1802,7 +1865,7 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
1802 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1865 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
1803 ChildReadyState_Ready -> return Nothing
1866 ChildReadyState_Ready -> return Nothing
1804 ChildReadyState_Unready _ -> do
1867 ChildReadyState_Unready _ -> do
1805− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
1868+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1806 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
1869 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
1807 initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
1870 initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
1808 liftIO $ if DMap.null initialUnready
1871 liftIO $ if DMap.null initialUnready
@@ -1813,14 +1876,14 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
1813 getHydrationMode >>= \case
1876 getHydrationMode >>= \case
1814 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
1877 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
1815 dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children
1878 dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children
1816− phs <- traverse id $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
1879+ phs <- sequenceA $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
1817 liftIO $ writeIORef placeholders $! phs
1880 liftIO $ writeIORef placeholders $! phs
1818 insertAfterPreviousNode lastPlaceholder
1881 insertAfterPreviousNode lastPlaceholder
1819 HydrationMode_Immediate -> do
1882 HydrationMode_Immediate -> do
1820 let activate i = do
1883 let activate i = do
1821 append $ toNode $ _traverseChildImmediate_fragment i
1884 append $ toNode $ _traverseChildImmediate_fragment i
1822 pure $ _traverseChildImmediate_placeholder i
1885 pure $ _traverseChildImmediate_placeholder i
1823− phs <- traverse id $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
1886+ phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
1824 liftIO $ writeIORef placeholders $! phs
1887 liftIO $ writeIORef placeholders $! phs
1825 append $ toNode lastPlaceholder
1888 append $ toNode lastPlaceholder
1826 requestDomAction_ $ ffor children' $ \p -> do
1889 requestDomAction_ $ ffor children' $ \p -> do
@@ -1944,39 +2007,39 @@ hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_
1944 return (result0, result')
2007 return (result0, result')
1945
2008
1946{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2009{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
1947− :: ((IntMap.Key -> v -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM Int v'))
2010+ :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
1948 -> IntMap v
2011 -> IntMap v
1949− -> Event Spider (PatchIntMap v)
2012+ -> Event DomTimeline (PatchIntMap v)
1950− -> DomRenderHookT Spider HydrationM (IntMap (TraverseChild Spider HydrationM Int v'), Event Spider (PatchIntMap (TraverseChild Spider HydrationM Int v'))))
2013+ -> DomRenderHookT DomTimeline HydrationM (IntMap (TraverseChild DomTimeline HydrationM Int v'), Event DomTimeline (PatchIntMap (TraverseChild DomTimeline HydrationM Int v'))))
1951− -> (PatchIntMap (TraverseChild Spider HydrationM Int v')
2014+ -> (PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1952 -> IntMap (IORef (ChildReadyState Int))
2015 -> IntMap (IORef (ChildReadyState Int))
1953 -> IO (IntMap (IORef (ChildReadyState Int))))
2016 -> IO (IntMap (IORef (ChildReadyState Int))))
1954 -> (IORef (IntMap DOM.Text)
2017 -> (IORef (IntMap DOM.Text)
1955 -> DOM.Text
2018 -> DOM.Text
1956− -> PatchIntMap (TraverseChild Spider HydrationM Int v')
2019+ -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1957 -> JSM ())
2020 -> JSM ())
1958− -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM v')
2021+ -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
1959 -> IntMap v
2022 -> IntMap v
1960− -> Event Spider (PatchIntMap v)
2023+ -> Event DomTimeline (PatchIntMap v)
1961− -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
2024+ -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1962 #-}
2025 #-}
1963
2026
1964{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2027{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
1965− :: ((IntMap.Key -> v -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM Int v'))
2028+ :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
1966 -> IntMap v
2029 -> IntMap v
1967− -> Event Spider (PatchIntMap v)
2030+ -> Event DomTimeline (PatchIntMap v)
1968− -> DomRenderHookT Spider HydrationM (IntMap (TraverseChild Spider HydrationM Int v'), Event Spider (PatchIntMap (TraverseChild Spider HydrationM Int v'))))
2031+ -> DomRenderHookT DomTimeline HydrationM (IntMap (TraverseChild DomTimeline HydrationM Int v'), Event DomTimeline (PatchIntMap (TraverseChild DomTimeline HydrationM Int v'))))
1969− -> (PatchIntMap (TraverseChild Spider HydrationM Int v')
2032+ -> (PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1970 -> IntMap (IORef (ChildReadyState Int))
2033 -> IntMap (IORef (ChildReadyState Int))
1971 -> IO (IntMap (IORef (ChildReadyState Int))))
2034 -> IO (IntMap (IORef (ChildReadyState Int))))
1972 -> (IORef (IntMap DOM.Text)
2035 -> (IORef (IntMap DOM.Text)
1973 -> DOM.Text
2036 -> DOM.Text
1974− -> PatchIntMap (TraverseChild Spider HydrationM Int v')
2037+ -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1975 -> JSM ())
2038 -> JSM ())
1976− -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM v')
2039+ -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
1977 -> IntMap v
2040 -> IntMap v
1978− -> Event Spider (PatchIntMap v)
2041+ -> Event DomTimeline (PatchIntMap v)
1979− -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
2042+ -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1980 #-}
2043 #-}
1981
2044
1982data TraverseChildImmediate k = TraverseChildImmediate
2045data TraverseChildImmediate k = TraverseChildImmediate
@@ -2046,17 +2109,17 @@ drawChildUpdate initialEnv markReady child = do
2046 }
2109 }
2047
2110
2048{-# SPECIALIZE drawChildUpdate
2111{-# SPECIALIZE drawChildUpdate
2049− :: HydrationDomBuilderEnv Spider HydrationM
2112+ :: HydrationDomBuilderEnv DomTimeline HydrationM
2050 -> (IORef (ChildReadyState Int) -> JSM ())
2113 -> (IORef (ChildReadyState Int) -> JSM ())
2051− -> HydrationDomBuilderT s Spider HydrationM (Identity a)
2114+ -> HydrationDomBuilderT s DomTimeline HydrationM (Identity a)
2052− -> DomRenderHookT Spider HydrationM (Compose (TraverseChild Spider HydrationM Int) Identity a)
2115+ -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM Int) Identity a)
2053 #-}
2116 #-}
2054
2117
2055{-# SPECIALIZE drawChildUpdate
2118{-# SPECIALIZE drawChildUpdate
2056− :: HydrationDomBuilderEnv Spider HydrationM
2119+ :: HydrationDomBuilderEnv DomTimeline HydrationM
2057 -> (IORef (ChildReadyState (Some k)) -> JSM ())
2120 -> (IORef (ChildReadyState (Some k)) -> JSM ())
2058− -> HydrationDomBuilderT s Spider HydrationM (f a)
2121+ -> HydrationDomBuilderT s DomTimeline HydrationM (f a)
2059− -> DomRenderHookT Spider HydrationM (Compose (TraverseChild Spider HydrationM (Some k)) f a)
2122+ -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM (Some k)) f a)
2060 #-}
2123 #-}
2061
2124
2062{-# INLINABLE drawChildUpdateInt #-}
2125{-# INLINABLE drawChildUpdateInt #-}
@@ -2068,10 +2131,10 @@ drawChildUpdateInt :: (MonadIO m, MonadJSM m, Reflex t)
2068drawChildUpdateInt env mark m = fmap runIdentity . getCompose <$> drawChildUpdate env mark (Identity <$> m)
2131drawChildUpdateInt env mark m = fmap runIdentity . getCompose <$> drawChildUpdate env mark (Identity <$> m)
2069
2132
2070{-# SPECIALIZE drawChildUpdateInt
2133{-# SPECIALIZE drawChildUpdateInt
2071− :: HydrationDomBuilderEnv Spider HydrationM
2134+ :: HydrationDomBuilderEnv DomTimeline HydrationM
2072 -> (IORef (ChildReadyState k) -> JSM ())
2135 -> (IORef (ChildReadyState k) -> JSM ())
2073− -> HydrationDomBuilderT s Spider HydrationM v
2136+ -> HydrationDomBuilderT s DomTimeline HydrationM v
2074− -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM k v)
2137+ -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM k v)
2075 #-}
2138 #-}
2076
2139
2077{-# INLINE mkHasFocus #-}
2140{-# INLINE mkHasFocus #-}
@@ -2234,7 +2297,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
2234 Beforecopy -> return ()
2297 Beforecopy -> return ()
2235 Copy -> return ()
2298 Copy -> return ()
2236 Beforepaste -> return ()
2299 Beforepaste -> return ()
2237− Paste -> return ()
2300+ Paste -> getPasteData
2238 Reset -> return ()
2301 Reset -> return ()
2239 Search -> return ()
2302 Search -> return ()
2240 Selectstart -> return ()
2303 Selectstart -> return ()
@@ -2243,7 +2306,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
2243 Touchend -> getTouchEvent
2306 Touchend -> getTouchEvent
2244 Touchcancel -> getTouchEvent
2307 Touchcancel -> getTouchEvent
2245 Mousewheel -> return ()
2308 Mousewheel -> return ()
2246− Wheel -> return ()
2309+ Wheel -> getWheelEvent
2247
2310
2248{-# INLINABLE defaultDomWindowEventHandler #-}
2311{-# INLINABLE defaultDomWindowEventHandler #-}
2249defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
2312defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
@@ -2284,7 +2347,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
2284 Beforecopy -> return ()
2347 Beforecopy -> return ()
2285 Copy -> return ()
2348 Copy -> return ()
2286 Beforepaste -> return ()
2349 Beforepaste -> return ()
2287− Paste -> return ()
2350+ Paste -> getPasteData
2288 Reset -> return ()
2351 Reset -> return ()
2289 Search -> return ()
2352 Search -> return ()
2290 Selectstart -> return ()
2353 Selectstart -> return ()
@@ -2293,7 +2356,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
2293 Touchend -> getTouchEvent
2356 Touchend -> getTouchEvent
2294 Touchcancel -> getTouchEvent
2357 Touchcancel -> getTouchEvent
2295 Mousewheel -> return ()
2358 Mousewheel -> return ()
2296− Wheel -> return ()
2359+ Wheel -> getWheelEvent
2297
2360
2298{-# INLINABLE withIsEvent #-}
2361{-# INLINABLE withIsEvent #-}
2299withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
2362withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
@@ -2561,6 +2624,15 @@ getMouseEventCoords = do
2561 e <- event
2624 e <- event
2562 bisequence (getClientX e, getClientY e)
2625 bisequence (getClientX e, getClientY e)
2563
2626
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+
2564{-# INLINABLE getTouchEvent #-}
2636{-# INLINABLE getTouchEvent #-}
2565getTouchEvent :: EventM e TouchEvent TouchEventResult
2637getTouchEvent :: EventM e TouchEvent TouchEventResult
2566getTouchEvent = do
2638getTouchEvent = do
@@ -2602,6 +2674,26 @@ getTouchEvent = do
2602 , _touchEventResult_touches = touches
2674 , _touchEventResult_touches = touches
2603 }
2675 }
2604
2676
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+
2605instance MonadSample t m => MonadSample t (HydrationDomBuilderT s t m) where
2697instance MonadSample t m => MonadSample t (HydrationDomBuilderT s t m) where
2606 {-# INLINABLE sample #-}
2698 {-# INLINABLE sample #-}
2607 sample = lift . sample
2699 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
80 runWithReplace a0 a' = InputDisabledT $ runWithReplace (coerce a0) (coerceEvent a')
80 runWithReplace a0 a' = InputDisabledT $ runWithReplace (coerce a0) (coerceEvent a')
81 traverseDMapWithKeyWithAdjust f dm0 dm' = InputDisabledT $ traverseDMapWithKeyWithAdjust (\k v -> runInputDisabledT $ f k v) (coerce dm0) (coerceEvent dm')
81 traverseDMapWithKeyWithAdjust f dm0 dm' = InputDisabledT $ traverseDMapWithKeyWithAdjust (\k v -> runInputDisabledT $ f k v) (coerce dm0) (coerceEvent dm')
82 traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = InputDisabledT $ traverseDMapWithKeyWithAdjustWithMove (\k v -> runInputDisabledT $ f k v) (coerce dm0) (coerceEvent dm')
82 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')
83
84
84instance NotReady t m => NotReady t (InputDisabledT m) where
85instance NotReady t m => NotReady t (InputDisabledT m) where
85 notReadyUntil = lift . notReadyUntil
86 notReadyUntil = lift . notReadyUntil
@@ -108,3 +109,8 @@ instance HasJSContext m => HasJSContext (InputDisabledT m) where
108instance HasJS js m => HasJS js (InputDisabledT m) where
109instance HasJS js m => HasJS js (InputDisabledT m) where
109 type JSX (InputDisabledT m) = JSX m
110 type JSX (InputDisabledT m) = JSX m
110 liftJS = lift . liftJS
111 liftJS = lift . liftJS
112+
113+instance DomRenderHook t m => DomRenderHook t (InputDisabledT m) where
114+ withRenderHook f = InputDisabledT . withRenderHook f . runInputDisabledT
115+ requestDomAction = InputDisabledT . requestDomAction
116+ requestDomAction_ = InputDisabledT . requestDomAction_
reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+49−20
@@ -37,6 +37,8 @@ import Data.IntMap (IntMap)
37import qualified Data.IntMap as IntMap
37import qualified Data.IntMap as IntMap
38import qualified Data.Map as Map
38import qualified Data.Map as Map
39import Data.Map.Misc (applyMap)
39import Data.Map.Misc (applyMap)
40+import Data.Maybe (fromMaybe)
41+import Data.Monoid ((<>))
40import qualified Data.Set as Set
42import qualified Data.Set as Set
41import Data.Text (Text)
43import Data.Text (Text)
42import qualified Data.Text as T
44import qualified Data.Text as T
@@ -54,7 +56,6 @@ import Reflex.PerformEvent.Class
54import Reflex.PostBuild.Base
56import Reflex.PostBuild.Base
55import Reflex.PostBuild.Class
57import Reflex.PostBuild.Class
56import Reflex.TriggerEvent.Class
58import Reflex.TriggerEvent.Class
57−import System.Random (randomRIO)
58
59
59data StaticDomBuilderEnv t = StaticDomBuilderEnv
60data StaticDomBuilderEnv t = StaticDomBuilderEnv
60 { _staticDomBuilderEnv_shouldEscape :: Bool
61 { _staticDomBuilderEnv_shouldEscape :: Bool
@@ -63,6 +64,7 @@ data StaticDomBuilderEnv t = StaticDomBuilderEnv
63 -- We use this to add a "selected" attribute to the appropriate "option" child element.
64 -- We use this to add a "selected" attribute to the appropriate "option" child element.
64 -- This is not yet a perfect simulation of what the browser does, but it is much closer than doing nothing.
65 -- This is not yet a perfect simulation of what the browser does, but it is much closer than doing nothing.
65 -- TODO: Handle edge cases, e.g. setting to a value for which there is no option, then adding that option dynamically afterwards.
66 -- 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
66 }
68 }
67
69
68newtype StaticDomBuilderT t m a = StaticDomBuilderT
70newtype StaticDomBuilderT t m a = StaticDomBuilderT
@@ -163,7 +165,7 @@ instance (SupportsStaticDomBuilder t m, Monad m) => HasDocument (StaticDomBuilde
163instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m) => Adjustable t (StaticDomBuilderT t m) where
165instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m) => Adjustable t (StaticDomBuilderT t m) where
164 runWithReplace a0 a' = do
166 runWithReplace a0 a' = do
165 e <- StaticDomBuilderT ask
167 e <- StaticDomBuilderT ask
166− key <- replaceStart
168+ key <- replaceStart e
167 (result0, result') <- lift $ runWithReplace (runStaticDomBuilderT a0 e) (flip runStaticDomBuilderT e <$> a')
169 (result0, result') <- lift $ runWithReplace (runStaticDomBuilderT a0 e) (flip runStaticDomBuilderT e <$> a')
168 o <- hold (snd result0) $ fmapCheap snd result'
170 o <- hold (snd result0) $ fmapCheap snd result'
169 StaticDomBuilderT $ modify $ (:) $ join o
171 StaticDomBuilderT $ modify $ (:) $ join o
@@ -173,10 +175,9 @@ instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m)
173 traverseDMapWithKeyWithAdjust = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap
175 traverseDMapWithKeyWithAdjust = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap
174 traverseDMapWithKeyWithAdjustWithMove = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove
176 traverseDMapWithKeyWithAdjustWithMove = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove
175
177
176−-- TODO remove this?
177−replaceStart :: (DomBuilder t m, MonadIO m) => m Text
178+replaceStart :: (DomBuilder t m, MonadIO m) => StaticDomBuilderEnv t -> m Text
178−replaceStart = do
179+replaceStart env = do
179− str <- liftIO $ replicateM 8 $ randomRIO ('a', 'z')
180+ str <- show <$> liftIO (atomicModifyRef (_staticDomBuilderEnv_nextRunWithReplaceKey env) $ \k -> (succ k, k))
180 let key = "-" <> T.pack str
181 let key = "-" <> T.pack str
181 _ <- commentNode $ def { _commentNodeConfig_initialContents = "replace-start" <> key }
182 _ <- commentNode $ def { _commentNodeConfig_initialContents = "replace-start" <> key }
182 pure key
183 pure key
@@ -273,7 +274,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
273 --TODO: Do not escape quotation marks; see https://stackoverflow.com/questions/25612166/what-characters-must-be-escaped-in-html-5
274 --TODO: Do not escape quotation marks; see https://stackoverflow.com/questions/25612166/what-characters-must-be-escaped-in-html-5
274 shouldEscape <- asks _staticDomBuilderEnv_shouldEscape
275 shouldEscape <- asks _staticDomBuilderEnv_shouldEscape
275 let escape = if shouldEscape then fromHtmlEscapedText else byteString . encodeUtf8
276 let escape = if shouldEscape then fromHtmlEscapedText else byteString . encodeUtf8
276− modify . (:) =<< (\c -> "<!--" <> c <> "-->") <$> case mSetContents of
277+ (modify . (:)) . (\c -> "<!--" <> c <> "-->") =<< case mSetContents of
277 Nothing -> return (pure (escape initialContents))
278 Nothing -> return (pure (escape initialContents))
278 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on
279 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on
279 return $ CommentNode ()
280 return $ CommentNode ()
@@ -286,8 +287,9 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
286 es <- newFanEventWithTrigger $ \_ _ -> return (return ())
287 es <- newFanEventWithTrigger $ \_ _ -> return (return ())
287 StaticDomBuilderT $ do
288 StaticDomBuilderT $ do
288 let shouldEscape = elementTag `Set.notMember` noEscapeElements
289 let shouldEscape = elementTag `Set.notMember` noEscapeElements
290+ nextRunWithReplaceKey <- asks _staticDomBuilderEnv_nextRunWithReplaceKey
289− (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing
291+ (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing nextRunWithReplaceKey
290− attrs0 <- foldDyn applyMap (Map.insert "data-ssr" "" $ cfg ^. initialAttributes) (cfg ^. modifyAttributes)
292+ attrs0 <- foldDyn applyMap (cfg ^. initialAttributes) (cfg ^. modifyAttributes)
291 selectValue <- asks _staticDomBuilderEnv_selectValue
293 selectValue <- asks _staticDomBuilderEnv_selectValue
292 let addSelectedAttr attrs sel = case Map.lookup "value" attrs of
294 let addSelectedAttr attrs sel = case Map.lookup "value" attrs of
293 Just v | v == sel -> attrs <> Map.singleton "selected" ""
295 Just v | v == sel -> attrs <> Map.singleton "selected" ""
@@ -310,13 +312,32 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
310 return (e, result)
312 return (e, result)
311 {-# INLINABLE inputElement #-}
313 {-# INLINABLE inputElement #-}
312 inputElement cfg = do
314 inputElement cfg = do
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
313− (e, _result) <- element "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
330+ (e, _result) <- element "input" adjustedConfig $ return ()
331+ v <- case _inputElementConfig_setValue cfg of
332+ Nothing -> pure $ constDyn (cfg ^. inputElementConfig_initialValue)
314− let v0 = constDyn $ cfg ^. inputElementConfig_initialValue
333+ Just ev -> holdDyn (cfg ^. inputElementConfig_initialValue) ev
315− let c0 = constDyn $ cfg ^. inputElementConfig_initialChecked
334+ c <- case _inputElementConfig_setChecked cfg of
335+ Nothing -> pure $ constDyn $ _inputElementConfig_initialChecked cfg
336+ Just ev -> holdDyn (_inputElementConfig_initialChecked cfg) ev
316 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
337 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
317 return $ InputElement
338 return $ InputElement
318− { _inputElement_value = v0
339+ { _inputElement_value = v
319− , _inputElement_checked = c0
340+ , _inputElement_checked = c
320 , _inputElement_checkedChange = never
341 , _inputElement_checkedChange = never
321 , _inputElement_input = never
342 , _inputElement_input = never
322 , _inputElement_hasFocus = hasFocus
343 , _inputElement_hasFocus = hasFocus
@@ -326,12 +347,17 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
326 }
347 }
327 {-# INLINABLE textAreaElement #-}
348 {-# INLINABLE textAreaElement #-}
328 textAreaElement cfg = do
349 textAreaElement cfg = do
329− --TODO: Support setValue event
330− (e, _domElement) <- element "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
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)
331− let v0 = constDyn $ cfg ^. textAreaElementConfig_initialValue
357+ Just ev -> holdDyn (cfg ^. textAreaElementConfig_initialValue) ev
332 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
358 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
333 return $ TextAreaElement
359 return $ TextAreaElement
334− { _textAreaElement_value = v0
360+ { _textAreaElement_value = v
335 , _textAreaElement_input = never
361 , _textAreaElement_input = never
336 , _textAreaElement_hasFocus = hasFocus
362 , _textAreaElement_hasFocus = hasFocus
337 , _textAreaElement_element = e
363 , _textAreaElement_element = e
@@ -340,7 +366,9 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
340 selectElement cfg child = do
366 selectElement cfg child = do
341 v <- holdDyn (cfg ^. selectElementConfig_initialValue) (cfg ^. selectElementConfig_setValue)
367 v <- holdDyn (cfg ^. selectElementConfig_initialValue) (cfg ^. selectElementConfig_setValue)
342 (e, result) <- element "select" (_selectElementConfig_elementConfig cfg) $ do
368 (e, result) <- element "select" (_selectElementConfig_elementConfig cfg) $ do
369+ (a, innerHtml) <- StaticDomBuilderT $ do
370+ nextRunWithReplaceKey <- asks _staticDomBuilderEnv_nextRunWithReplaceKey
343− (a, innerHtml) <- StaticDomBuilderT $ lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv False $ Just (current v)
371+ lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv False (Just $ current v) nextRunWithReplaceKey
344 StaticDomBuilderT $ lift $ modify $ (:) innerHtml
372 StaticDomBuilderT $ lift $ modify $ (:) innerHtml
345 return a
373 return a
346 let wrapped = SelectElement
374 let wrapped = SelectElement
@@ -362,7 +390,8 @@ renderStatic :: StaticWidget x a -> IO (a, ByteString)
362renderStatic w = do
390renderStatic w = do
363 runDomHost $ do
391 runDomHost $ do
364 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
392 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
393+ nextRunWithReplaceKey <- newRef 0
365− let env0 = StaticDomBuilderEnv True Nothing
394+ let env0 = StaticDomBuilderEnv True Nothing nextRunWithReplaceKey
366 ((res, bs), FireCommand fire) <- hostPerformEventT $ runStaticDomBuilderT (runPostBuildT w postBuild) env0
395 ((res, bs), FireCommand fire) <- hostPerformEventT $ runStaticDomBuilderT (runPostBuildT w postBuild) env0
367 mPostBuildTrigger <- readRef postBuildTriggerRef
396 mPostBuildTrigger <- readRef postBuildTriggerRef
368 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
397 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
4 , module Web.KeyCode
4 , module Web.KeyCode
5 ) where
5 ) where
6
6
7−import Data.Map (Map)
7+import Control.Lens
8−import qualified Data.Map as Map
9import Reflex.Class
8import Reflex.Class
10import Web.KeyCode
9import Web.KeyCode
11
10
@@ -13,11 +12,9 @@ import Foreign.JavaScript.TH
13import Reflex.PerformEvent.Class
12import Reflex.PerformEvent.Class
14import Reflex.PostBuild.Class
13import Reflex.PostBuild.Class
15
14
16−import Prelude hiding (concat, mapM, mapM_, sequence)
17−
18−-- | Alias for Data.Map.singleton
15+-- | Previously an alias for 'Data.Map.singleton', but now generalised to 'At'
19−(=:) :: k -> a -> Map k a
16+(=:) :: (At m, Monoid m) => Index m -> IxValue m -> m
20−(=:) = Map.singleton
17+k =: a = at k ?~ a $ mempty
21infixr 7 =: -- Ought to bind tighter than <>, which is infixr 6
18infixr 7 =: -- Ought to bind tighter than <>, which is infixr 6
22
19
23{-# DEPRECATED keycodeEnter "Instead of `x == keycodeEnter`, use `keyCodeLookup x == Enter`" #-}
20{-# DEPRECATED keycodeEnter "Instead of `x == keycodeEnter`, use `keyCodeLookup x == Enter`" #-}
reflex-dom-core/src/Reflex/Dom/Core.hs+2
@@ -6,6 +6,7 @@ module Reflex.Dom.Core (module X) where
6
6
7import Reflex as X hiding (askEvents)
7import Reflex as X hiding (askEvents)
8import Reflex.Dom.Builder.Class as X
8import Reflex.Dom.Builder.Class as X
9+import Reflex.Dom.Builder.Hydratable as X
9import Reflex.Dom.Builder.Immediate as X
10import Reflex.Dom.Builder.Immediate as X
10import Reflex.Dom.Builder.InputDisabled as X
11import Reflex.Dom.Builder.InputDisabled as X
11import Reflex.Dom.Builder.Static as X
12import Reflex.Dom.Builder.Static as X
@@ -18,3 +19,4 @@ import Reflex.Dom.Prerender as X
18import Reflex.Dom.WebSocket as X
19import Reflex.Dom.WebSocket as X
19import Reflex.Dom.Widget as X
20import Reflex.Dom.Widget as X
20import Reflex.Dom.Xhr as X
21import Reflex.Dom.Xhr as X
22+import Reflex.Dom.Xhr.FormData as X
reflex-dom-core/src/Reflex/Dom/Main.hs+86−34
@@ -5,7 +5,6 @@
5{-# LANGUAGE GADTs #-}
5{-# LANGUAGE GADTs #-}
6{-# LANGUAGE MultiParamTypeClasses #-}
6{-# LANGUAGE MultiParamTypeClasses #-}
7{-# LANGUAGE NoMonomorphismRestriction #-}
7{-# LANGUAGE NoMonomorphismRestriction #-}
8−{-# LANGUAGE PatternSynonyms #-}
9{-# LANGUAGE RankNTypes #-}
8{-# LANGUAGE RankNTypes #-}
10{-# LANGUAGE RecursiveDo #-}
9{-# LANGUAGE RecursiveDo #-}
11{-# LANGUAGE ScopedTypeVariables #-}
10{-# LANGUAGE ScopedTypeVariables #-}
@@ -27,6 +26,9 @@ import Reflex.PostBuild.Base
27import Reflex.Spider (Global, Spider, SpiderHost, runSpiderHost)
26import Reflex.Spider (Global, Spider, SpiderHost, runSpiderHost)
28import Reflex.TriggerEvent.Base
27import Reflex.TriggerEvent.Base
29import Reflex.TriggerEvent.Class
28import Reflex.TriggerEvent.Class
29+#ifdef PROFILE_REFLEX
30+import Reflex.Profiled
31+#endif
30
32
31import Control.Concurrent
33import Control.Concurrent
32import Control.Lens
34import Control.Lens
@@ -70,8 +72,14 @@ mainHydrationWidgetWithSwitchoverAction = mainHydrationWidgetWithSwitchoverActio
70{-# INLINABLE mainHydrationWidgetWithSwitchoverAction' #-}
72{-# INLINABLE mainHydrationWidgetWithSwitchoverAction' #-}
71-- | Warning: `mainHydrationWidgetWithSwitchoverAction'` is provided only as performance tweak. It is expected to disappear in future releases.
73-- | Warning: `mainHydrationWidgetWithSwitchoverAction'` is provided only as performance tweak. It is expected to disappear in future releases.
72mainHydrationWidgetWithSwitchoverAction' :: JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()
74mainHydrationWidgetWithSwitchoverAction' :: JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()
73−mainHydrationWidgetWithSwitchoverAction' switchoverAction head' body = 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
74− runHydrationWidgetWithHeadAndBody switchoverAction $ \appendHead appendBody -> do
82+ runHydrationWidgetWithHeadAndBodyWithFailure onFailure switchoverAction $ \appendHead appendBody -> do
75 appendHead head'
83 appendHead head'
76 appendBody body
84 appendBody body
77
85
@@ -86,7 +94,21 @@ attachHydrationWidget
86 -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
94 -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
87 )
95 )
88 -> IO (a, FireCommand DomTimeline DomHost)
96 -> IO (a, FireCommand DomTimeline DomHost)
97+attachHydrationWidget = attachHydrationWidgetWithFailure (pure ())
98+
99+{-# INLINABLE attachHydrationWidgetWithFailure #-}
100+attachHydrationWidgetWithFailure
101+ :: IO ()
102+ -> JSM ()
103+ -> JSContextSingleton ()
104+ -> ( Event DomTimeline ()
105+ -> IORef HydrationMode
106+ -> Maybe (IORef [(Node, HydrationRunnerT DomTimeline (DomCoreWidget ()) ())])
107+ -> EventChannel
108+ -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
109+ )
110+ -> IO (a, FireCommand DomTimeline DomHost)
89−attachHydrationWidget switchoverAction jsSing w = do
111+attachHydrationWidgetWithFailure onFailure switchoverAction jsSing w = do
90 hydrationMode <- liftIO $ newIORef HydrationMode_Hydrating
112 hydrationMode <- liftIO $ newIORef HydrationMode_Hydrating
91 rootNodesRef <- liftIO $ newIORef []
113 rootNodesRef <- liftIO $ newIORef []
92 events <- newChan
114 events <- newChan
@@ -102,7 +124,7 @@ attachHydrationWidget switchoverAction jsSing w = do
102 rootNodes <- liftIO $ readIORef rootNodesRef
124 rootNodes <- liftIO $ readIORef rootNodesRef
103 let delayedAction = do
125 let delayedAction = do
104 for_ (reverse rootNodes) $ \(rootNode, runner) -> do
126 for_ (reverse rootNodes) $ \(rootNode, runner) -> do
105− let hydrate = runHydrationRunnerT runner Nothing rootNode events
127+ let hydrate = runHydrationRunnerTWithFailure runner onFailure Nothing rootNode events
106 void $ runWithJSContextSingleton (runPostBuildT hydrate never) jsSing
128 void $ runWithJSContextSingleton (runPostBuildT hydrate never) jsSing
107 liftIO $ writeIORef hydrationMode HydrationMode_Immediate
129 liftIO $ writeIORef hydrationMode HydrationMode_Immediate
108 runWithJSContextSingleton (DOM.liftJSM switchoverAction) jsSing
130 runWithJSContextSingleton (DOM.liftJSM switchoverAction) jsSing
@@ -118,16 +140,27 @@ type DomCoreWidget x = PostBuildT DomTimeline (WithJSContextSingleton x (Perform
118{-# INLINABLE runHydrationWidgetWithHeadAndBody #-}
140{-# INLINABLE runHydrationWidgetWithHeadAndBody #-}
119runHydrationWidgetWithHeadAndBody
141runHydrationWidgetWithHeadAndBody
120 :: JSM ()
142 :: JSM ()
121− -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head"
143+ -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once
122− -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body"
144+ -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body" --TODO: test invoking this more than once
123 -> FloatingWidget () ()
145 -> FloatingWidget () ()
124 )
146 )
125 -> JSM ()
147 -> JSM ()
148+runHydrationWidgetWithHeadAndBody = runHydrationWidgetWithHeadAndBodyWithFailure (pure ())
149+
150+{-# INLINABLE runHydrationWidgetWithHeadAndBodyWithFailure #-}
151+runHydrationWidgetWithHeadAndBodyWithFailure
152+ :: IO ()
153+ -> JSM ()
154+ -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once
155+ -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body" --TODO: test invoking this more than once
156+ -> FloatingWidget () ()
157+ )
158+ -> JSM ()
126−runHydrationWidgetWithHeadAndBody switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
159+runHydrationWidgetWithHeadAndBodyWithFailure onFailure switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
127 globalDoc <- currentDocumentUnchecked
160 globalDoc <- currentDocumentUnchecked
128 headElement <- getHeadUnchecked globalDoc
161 headElement <- getHeadUnchecked globalDoc
129 bodyElement <- getBodyUnchecked globalDoc
162 bodyElement <- getBodyUnchecked globalDoc
130− (events, fc) <- liftIO . attachHydrationWidget switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
163+ (events, fc) <- liftIO . attachHydrationWidgetWithFailure onFailure switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
131 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
164 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
132 let hydrateDom :: DOM.Node -> HydrationWidget () c -> FloatingWidget () c
165 let hydrateDom :: DOM.Node -> HydrationWidget () c -> FloatingWidget () c
133 hydrateDom n w = do
166 hydrateDom n w = do
@@ -209,39 +242,48 @@ type Widget x = ImmediateDomBuilderT DomTimeline (DomCoreWidget x)
209attachWidget :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> JSM a
242attachWidget :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> JSM a
210attachWidget rootElement wv w = fst <$> attachWidget' rootElement wv w
243attachWidget rootElement wv w = fst <$> attachWidget' rootElement wv w
211
244
212−-- | Warning: `mainWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.
245+{-# INLINABLE runImmediateWidgetWithHeadAndBody #-}
213−mainWidgetWithHead' :: (a -> Widget () b, b -> Widget () a) -> JSM ()
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 ()
214−mainWidgetWithHead' widgets = withJSContextSingletonMono $ \jsSing -> do
252+runImmediateWidgetWithHeadAndBody app = withJSContextSingletonMono $ \jsSing -> do
215− doc <- currentDocumentUnchecked
253+ globalDoc <- currentDocumentUnchecked
216− headElement <- getHeadUnchecked doc
254+ headElement <- getHeadUnchecked globalDoc
217− headFragment <- createDocumentFragment doc
218− bodyElement <- getBodyUnchecked doc
255+ bodyElement <- getBodyUnchecked globalDoc
256+ headFragment <- createDocumentFragment globalDoc
219− bodyFragment <- createDocumentFragment doc
257+ bodyFragment <- createDocumentFragment globalDoc
220− hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
221− (events, fc) <- liftIO . attachWidget'' $ \events -> do
258+ (events, fc) <- liftIO . attachImmediateWidget $ \hydrationMode events -> do
222− let (headWidget, bodyWidget) = widgets
223 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
259 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
224− let go :: forall c. Widget () c -> DOM.DocumentFragment -> PerformEventT DomTimeline DomHost c
260+ let go :: forall c. DOM.DocumentFragment -> Widget () c -> FloatingWidget () c
225− go w df = do
261+ go df w = do
226 unreadyChildren <- liftIO $ newIORef 0
262 unreadyChildren <- liftIO $ newIORef 0
227 delayed <- liftIO $ newIORef $ pure ()
263 delayed <- liftIO $ newIORef $ pure ()
228 let builderEnv = HydrationDomBuilderEnv
264 let builderEnv = HydrationDomBuilderEnv
229− { _hydrationDomBuilderEnv_document = toDocument doc
265+ { _hydrationDomBuilderEnv_document = globalDoc
230 , _hydrationDomBuilderEnv_parent = Left $ toNode df
266 , _hydrationDomBuilderEnv_parent = Left $ toNode df
231 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
267 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
232− , _hydrationDomBuilderEnv_commitAction = return () --TODO
268+ , _hydrationDomBuilderEnv_commitAction = pure () --TODO: possibly `replaceElementContents n f`
269+ , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
233 , _hydrationDomBuilderEnv_switchover = never
270 , _hydrationDomBuilderEnv_switchover = never
234 , _hydrationDomBuilderEnv_delayed = delayed
271 , _hydrationDomBuilderEnv_delayed = delayed
235− , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
236 }
272 }
237− runWithJSContextSingleton (runPostBuildT (runHydrationDomBuilderT w builderEnv events) postBuild) jsSing
273+ lift $ runHydrationDomBuilderT w builderEnv events
238− rec b <- go (headWidget a) headFragment
274+ runWithJSContextSingleton (runPostBuildT (runTriggerEventT (app (go headFragment) (go bodyFragment)) events) postBuild) jsSing
239− a <- go (bodyWidget b) bodyFragment
240 return (events, postBuildTriggerRef)
275 return (events, postBuildTriggerRef)
241 replaceElementContents headElement headFragment
276 replaceElementContents headElement headFragment
242 replaceElementContents bodyElement bodyFragment
277 replaceElementContents bodyElement bodyFragment
243 liftIO $ processAsyncEvents events fc
278 liftIO $ processAsyncEvents events fc
244
279
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+
245replaceElementContents :: DOM.IsElement e => e -> DOM.DocumentFragment -> JSM ()
287replaceElementContents :: DOM.IsElement e => e -> DOM.DocumentFragment -> JSM ()
246replaceElementContents e df = do
288replaceElementContents e df = do
247 setInnerHTML e ("" :: String)
289 setInnerHTML e ("" :: String)
@@ -253,8 +295,7 @@ attachWidget' :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> J
253attachWidget' rootElement jsSing w = do
295attachWidget' rootElement jsSing w = do
254 doc <- getOwnerDocumentUnchecked rootElement
296 doc <- getOwnerDocumentUnchecked rootElement
255 df <- createDocumentFragment doc
297 df <- createDocumentFragment doc
256− hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
257− ((a, events), fc) <- liftIO . attachWidget'' $ \events -> do
298+ ((a, events), fc) <- liftIO . attachImmediateWidget $ \hydrationMode events -> do
258 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
299 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
259 unreadyChildren <- liftIO $ newIORef 0
300 unreadyChildren <- liftIO $ newIORef 0
260 delayed <- liftIO $ newIORef $ pure ()
301 delayed <- liftIO $ newIORef $ pure ()
@@ -275,12 +316,18 @@ attachWidget' rootElement jsSing w = do
275
316
276type EventChannel = Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
317type EventChannel = Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
277
318
278−{-# INLINABLE attachWidget'' #-}
319+{-# INLINABLE attachImmediateWidget #-}
320+attachImmediateWidget
321+ :: ( IORef HydrationMode
322+ -> EventChannel
279−attachWidget'' :: (EventChannel -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))) -> IO (a, FireCommand DomTimeline DomHost)
323+ -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
280−attachWidget'' w = do
324+ )
325+ -> IO (a, FireCommand DomTimeline DomHost)
326+attachImmediateWidget w = do
327+ hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
281 events <- newChan
328 events <- newChan
282 runDomHost $ do
329 runDomHost $ do
283− ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w events
330+ ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w hydrationMode events
284 mPostBuildTrigger <- readRef postBuildTriggerRef
331 mPostBuildTrigger <- readRef postBuildTriggerRef
285 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
332 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
286 return (result, fc)
333 return (result, fc)
@@ -322,3 +369,8 @@ runApp' app = withJSContextSingleton $ \jsSing -> do
322 { _appInput_window = w
369 { _appInput_window = w
323 }
370 }
324 return ()
371 return ()
372+
373+{-# DEPRECATED attachWidget'' "Use 'attachImmediateWidget . const' instead" #-}
374+{-# INLINABLE attachWidget'' #-}
375+attachWidget'' :: (EventChannel -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))) -> IO (a, FireCommand DomTimeline DomHost)
376+attachWidget'' = attachImmediateWidget . const
reflex-dom-core/src/Reflex/Dom/Old.hs−1
@@ -1,6 +1,5 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2{-# LANGUAGE ConstraintKinds #-}
2{-# LANGUAGE ConstraintKinds #-}
3−{-# LANGUAGE ExplicitForAll #-}
4{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleContexts #-}
5{-# LANGUAGE FlexibleInstances #-}
4{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE MultiParamTypeClasses #-}
5{-# LANGUAGE MultiParamTypeClasses #-}
reflex-dom-core/src/Reflex/Dom/Prerender.hs+135−25
@@ -1,17 +1,18 @@
1{-# LANGUAGE ConstraintKinds #-}
1{-# LANGUAGE ConstraintKinds #-}
2−{-# LANGUAGE EmptyDataDecls #-}
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE EmptyCase #-}
3{-# LANGUAGE FlexibleContexts #-}
4{-# LANGUAGE FlexibleContexts #-}
4{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FunctionalDependencies #-}
6{-# LANGUAGE FunctionalDependencies #-}
7+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
6{-# LANGUAGE LambdaCase #-}
8{-# LANGUAGE LambdaCase #-}
7{-# LANGUAGE OverloadedStrings #-}
9{-# LANGUAGE OverloadedStrings #-}
8−{-# LANGUAGE MultiParamTypeClasses #-}
9{-# LANGUAGE Rank2Types #-}
10{-# LANGUAGE Rank2Types #-}
10{-# LANGUAGE RecursiveDo #-}
11{-# LANGUAGE RecursiveDo #-}
11{-# LANGUAGE ScopedTypeVariables #-}
12{-# LANGUAGE ScopedTypeVariables #-}
12{-# LANGUAGE TypeFamilies #-}
13{-# LANGUAGE TypeFamilies #-}
13−{-# LANGUAGE TypeSynonymInstances #-}
14{-# LANGUAGE UndecidableInstances #-}
14{-# LANGUAGE UndecidableInstances #-}
15+{-# LANGUAGE UndecidableSuperClasses #-}
15
16
16-- | Render the first widget on the server, and the second on the client.
17-- | Render the first widget on the server, and the second on the client.
17module Reflex.Dom.Prerender
18module Reflex.Dom.Prerender
@@ -21,20 +22,22 @@ module Reflex.Dom.Prerender
21 , PrerenderBaseConstraints
22 , PrerenderBaseConstraints
22 ) where
23 ) where
23
24
24−import Control.Monad.Primitive (PrimMonad)
25+import Control.Monad.Primitive (PrimMonad(..))
25import Control.Monad.Reader
26import Control.Monad.Reader
26−import Control.Monad.Ref (MonadRef(..))
27+import Control.Monad.Ref (MonadRef(..), MonadAtomicRef(..))
27import Data.IORef (IORef, newIORef)
28import Data.IORef (IORef, newIORef)
29+import Data.Semigroup (Semigroup)
28import Data.Text (Text)
30import Data.Text (Text)
31+import Data.Void
29import Foreign.JavaScript.TH
32import Foreign.JavaScript.TH
30import GHCJS.DOM.Types (MonadJSM)
33import GHCJS.DOM.Types (MonadJSM)
31import Reflex hiding (askEvents)
34import Reflex hiding (askEvents)
32import Reflex.Dom.Builder.Class
35import Reflex.Dom.Builder.Class
36+import Reflex.Dom.Builder.Hydratable
33import Reflex.Dom.Builder.Immediate
37import Reflex.Dom.Builder.Immediate
34import Reflex.Dom.Builder.InputDisabled
38import Reflex.Dom.Builder.InputDisabled
35import Reflex.Dom.Builder.Static
39import Reflex.Dom.Builder.Static
36import Reflex.Host.Class
40import Reflex.Host.Class
37−import Reflex.Requester.Base
38import Data.IntMap.Strict (IntMap)
41import Data.IntMap.Strict (IntMap)
39import qualified Data.IntMap.Strict as IntMap
42import qualified Data.IntMap.Strict as IntMap
40
43
@@ -48,7 +51,6 @@ type PrerenderClientConstraint js t m =
48 , DomRenderHook t m
51 , DomRenderHook t m
49 , HasDocument m
52 , HasDocument m
50 , TriggerEvent t m
53 , TriggerEvent t m
51− , Prerender js t m
52 , PrerenderBaseConstraints js t m
54 , PrerenderBaseConstraints js t m
53 )
55 )
54
56
@@ -76,16 +78,16 @@ type PrerenderBaseConstraints js t m =
76-- hydration builder will run *both* widgets.
78-- hydration builder will run *both* widgets.
77prerender_
79prerender_
78 :: (Functor m, Reflex t, Prerender js t m)
80 :: (Functor m, Reflex t, Prerender js t m)
79− => m () -> ((PrerenderClientConstraint js t (Client m)) => Client m ()) -> m ()
81+ => m () -> Client m () -> m ()
80prerender_ server client = void $ prerender server client
82prerender_ server client = void $ prerender server client
81
83
82−class Prerender js t m | m -> t js where
84+class (PrerenderClientConstraint js t (Client m), Client (Client m) ~ Client m, Prerender js t (Client m)) => Prerender js t m | m -> t js where
83 -- | Monad in which the client widget is built
85 -- | Monad in which the client widget is built
84 type Client m :: * -> *
86 type Client m :: * -> *
85 -- | Render the first widget on the server, and the second on the client. The
87 -- | Render the first widget on the server, and the second on the client. The
86 -- hydration builder will run *both* widgets, updating the result dynamic at
88 -- hydration builder will run *both* widgets, updating the result dynamic at
87 -- switchover time.
89 -- switchover time.
88− prerender :: m a -> ((PrerenderClientConstraint js t (Client m)) => Client m a) -> m (Dynamic t a)
90+ prerender :: m a -> Client m a -> m (Dynamic t a)
89
91
90instance (ReflexHost t, Adjustable t m, PrerenderBaseConstraints js t m) => Prerender js t (HydrationDomBuilderT GhcjsDomSpace t m) where
92instance (ReflexHost t, Adjustable t m, PrerenderBaseConstraints js t m) => Prerender js t (HydrationDomBuilderT GhcjsDomSpace t m) where
91 type Client (HydrationDomBuilderT GhcjsDomSpace t m) = HydrationDomBuilderT GhcjsDomSpace t m
93 type Client (HydrationDomBuilderT GhcjsDomSpace t m) = HydrationDomBuilderT GhcjsDomSpace t m
@@ -101,34 +103,138 @@ instance (Adjustable t m, PrerenderBaseConstraints js t m, ReflexHost t) => Prer
101 env <- HydrationDomBuilderT ask
103 env <- HydrationDomBuilderT ask
102 events <- askEvents
104 events <- askEvents
103 doc <- askDocument
105 doc <- askDocument
106+ serverDf <- Document.createDocumentFragment doc -- server dom should not be mounted in the window's doc in hydration
104 df <- Document.createDocumentFragment doc
107 df <- Document.createDocumentFragment doc
105 unreadyChildren <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_unreadyChildren
108 unreadyChildren <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_unreadyChildren
106− hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
109+ immediateMode <- liftIO $ newIORef HydrationMode_Immediate
107 delayed <- liftIO $ newIORef $ pure ()
110 delayed <- liftIO $ newIORef $ pure ()
111+ let clientEnv = env
112+ { _hydrationDomBuilderEnv_parent = Left $ DOM.toNode df
113+ , _hydrationDomBuilderEnv_hydrationMode = immediateMode
114+ }
108− let env' = HydrationDomBuilderEnv
115+ serverEnv = HydrationDomBuilderEnv
109 { _hydrationDomBuilderEnv_document = doc
116 { _hydrationDomBuilderEnv_document = doc
110− , _hydrationDomBuilderEnv_parent = Left $ DOM.toNode df
117+ , _hydrationDomBuilderEnv_parent = Left $ DOM.toNode serverDf
111 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
118 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
112 , _hydrationDomBuilderEnv_commitAction = pure ()
119 , _hydrationDomBuilderEnv_commitAction = pure ()
113 , _hydrationDomBuilderEnv_delayed = delayed
120 , _hydrationDomBuilderEnv_delayed = delayed
114− , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
121+ , _hydrationDomBuilderEnv_hydrationMode = immediateMode
115 , _hydrationDomBuilderEnv_switchover = never
122 , _hydrationDomBuilderEnv_switchover = never
116 }
123 }
117− a0 <- lift $ runHydrationDomBuilderT server (env { _hydrationDomBuilderEnv_delayed = delayed }) events
124+ a0 <- lift $ runHydrationDomBuilderT server serverEnv events
118 (a', trigger) <- newTriggerEvent
125 (a', trigger) <- newTriggerEvent
119 getHydrationMode >>= \case
126 getHydrationMode >>= \case
120 HydrationMode_Immediate -> do
127 HydrationMode_Immediate -> do
121− liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') env' events
128+ liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') clientEnv events
122 append $ DOM.toNode df
129 append $ DOM.toNode df
123 HydrationMode_Hydrating -> addHydrationStep $ do
130 HydrationMode_Hydrating -> addHydrationStep $ do
124− liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') env' events
131+ liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') clientEnv events
125 insertBefore df =<< deleteToPrerenderEnd doc
132 insertBefore df =<< deleteToPrerenderEnd doc
126 holdDyn a0 a'
133 holdDyn a0 a'
127
134
128−data NoJavaScript -- This type should never have a HasJS instance
135+newtype UnrunnableT js t m a = UnrunnableT (ReaderT Void m a)
136+ deriving (Functor, Applicative, Monad, MonadTrans)
137+
138+unrunnable :: UnrunnableT js t m a
139+unrunnable = UnrunnableT $ ReaderT $ \case {}
129
140
130−instance (js ~ NoJavaScript, SupportsStaticDomBuilder t m) => Prerender js t (StaticDomBuilderT t m) where
141+instance (Reflex t, Monad m) => DomBuilder t (UnrunnableT js t m) where
131− type Client (StaticDomBuilderT t m) = HydrationDomBuilderT GhcjsDomSpace t m
142+ type DomBuilderSpace (UnrunnableT js t m) = GhcjsDomSpace
143+ textNode _ = unrunnable
144+ commentNode _ = unrunnable
145+ element _ _ _ = unrunnable
146+ inputElement _ = unrunnable
147+ textAreaElement _ = unrunnable
148+ selectElement _ _ = unrunnable
149+ placeRawElement _ = unrunnable
150+ wrapRawElement _ _ = unrunnable
151+instance (Reflex t, Monad m) => NotReady t (UnrunnableT js t m) where
152+ notReadyUntil _ = unrunnable
153+ notReady = unrunnable
154+instance (Reflex t, Monad m) => Adjustable t (UnrunnableT js t m) where
155+ runWithReplace _ _ = unrunnable
156+ traverseIntMapWithKeyWithAdjust _ _ _ = unrunnable
157+ traverseDMapWithKeyWithAdjust _ _ _ = unrunnable
158+ traverseDMapWithKeyWithAdjustWithMove _ _ _ = unrunnable
159+instance (Reflex t, Monad m) => PerformEvent t (UnrunnableT js t m) where
160+ type Performable (UnrunnableT js t m) = UnrunnableT js t m
161+ performEvent _ = unrunnable
162+ performEvent_ _ = unrunnable
163+instance Monad m => MonadRef (UnrunnableT js t m) where
164+ type Ref (UnrunnableT js t m) = Ref IO
165+ newRef _ = unrunnable
166+ readRef _ = unrunnable
167+ writeRef _ _ = unrunnable
168+instance Monad m => MonadAtomicRef (UnrunnableT js t m) where
169+ atomicModifyRef _ _ = unrunnable
170+instance Monad m => HasDocument (UnrunnableT js t m) where
171+ askDocument = unrunnable
172+instance Monad m => HasJSContext (UnrunnableT js t m) where
173+ type JSContextPhantom (UnrunnableT js t m) = ()
174+ askJSContext = unrunnable
175+instance Monad m => HasJS JS' (UnrunnableT js t m) where
176+ type JSX (UnrunnableT js t m) = UnrunnableT js t m
177+ liftJS _ = unrunnable
178+instance Monad m => MonadJS JS' (UnrunnableT js t m) where
179+ runJS _ _ = unrunnable
180+ forkJS _ = unrunnable
181+ mkJSUndefined = unrunnable
182+ isJSNull _ = unrunnable
183+ isJSUndefined _ = unrunnable
184+ fromJSBool _ = unrunnable
185+ fromJSString _ = unrunnable
186+ fromJSArray _ = unrunnable
187+ fromJSUint8Array _ = unrunnable
188+ fromJSNumber _ = unrunnable
189+ withJSBool _ _ = unrunnable
190+ withJSString _ _ = unrunnable
191+ withJSNumber _ _ = unrunnable
192+ withJSArray _ _ = unrunnable
193+ withJSUint8Array _ _ = unrunnable
194+ mkJSFun _ = unrunnable
195+ freeJSFun _ = unrunnable
196+ setJSProp _ _ _ = unrunnable
197+ getJSProp _ _ = unrunnable
198+ withJSNode _ _ = unrunnable
199+instance Monad m => TriggerEvent t (UnrunnableT js t m) where
200+ newTriggerEvent = unrunnable
201+ newTriggerEventWithOnComplete = unrunnable
202+ newEventWithLazyTriggerWithOnComplete _ = unrunnable
203+instance Monad m => MonadReflexCreateTrigger t (UnrunnableT js t m) where
204+ newEventWithTrigger _ = unrunnable
205+ newFanEventWithTrigger _ = unrunnable
206+instance Monad m => MonadFix (UnrunnableT js t m) where
207+ mfix _ = unrunnable
208+instance (Monad m, MonadHold t m) => MonadHold t (UnrunnableT js t m) where
209+ hold _ _ = unrunnable
210+ holdDyn _ _ = unrunnable
211+ holdIncremental _ _ = unrunnable
212+ buildDynamic _ _ = unrunnable
213+ headE _ = unrunnable
214+ now = unrunnable
215+instance Monad m => MonadSample t (UnrunnableT js t m) where
216+ sample _ = unrunnable
217+instance Monad m => MonadIO (UnrunnableT js t m) where
218+ liftIO _ = unrunnable
219+#ifndef ghcjs_HOST_OS
220+instance Monad m => MonadJSM (UnrunnableT js t m) where
221+ liftJSM' _ = unrunnable
222+#endif
223+instance (Reflex t, Monad m) => PostBuild t (UnrunnableT js t m) where
224+ getPostBuild = unrunnable
225+instance Monad m => PrimMonad (UnrunnableT js t m) where
226+ type PrimState (UnrunnableT js t m) = PrimState IO
227+ primitive _ = unrunnable
228+instance (Reflex t, Monad m) => DomRenderHook t (UnrunnableT js t m) where
229+ withRenderHook _ _ = unrunnable
230+ requestDomAction _ = unrunnable
231+ requestDomAction_ _ = unrunnable
232+instance (Reflex t, Monad m, MonadHold t m) => Prerender JS' t (UnrunnableT js t m) where
233+ type Client (UnrunnableT js t m) = UnrunnableT js t m
234+ prerender _ _ = unrunnable
235+
236+instance (SupportsStaticDomBuilder t m) => Prerender JS' t (StaticDomBuilderT t m) where
237+ type Client (StaticDomBuilderT t m) = UnrunnableT JS' t m
132 prerender server _ = do
238 prerender server _ = do
133 _ <- commentNode $ CommentNodeConfig startMarker Nothing
239 _ <- commentNode $ CommentNodeConfig startMarker Nothing
134 a <- server
240 a <- server
@@ -168,10 +274,10 @@ instance (Prerender js t m, MonadFix m, Reflex t) => Prerender js t (RequesterT
168 (x, e) <- runRequesterT w (selectInt fannedResponses selector)
274 (x, e) <- runRequesterT w (selectInt fannedResponses selector)
169 pure (x, fmapCheap (IntMap.singleton selector) e)
275 pure (x, fmapCheap (IntMap.singleton selector) e)
170 (result, requestsDyn) <- fmap splitDynPure $ lift $ prerender (withFannedResponses server 0) (withFannedResponses client 1)
276 (result, requestsDyn) <- fmap splitDynPure $ lift $ prerender (withFannedResponses server 0) (withFannedResponses client 1)
171− responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switch $ current requestsDyn
277+ responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switchPromptlyDyn requestsDyn
172− pure result
278+ return result
173
279
174−instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Group q, Additive q, Query q) => Prerender js t (QueryT t q m) where
280+instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q) => Prerender js t (QueryT t q m) where
175 type Client (QueryT t q m) = QueryT t q (Client m)
281 type Client (QueryT t q m) = QueryT t q (Client m)
176 prerender server client = mdo
282 prerender server client = mdo
177 result <- queryDyn query
283 result <- queryDyn query
@@ -181,8 +287,12 @@ instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Group q, Additive q,
181 pure a
287 pure a
182
288
183instance (Prerender js t m, Monad m) => Prerender js t (InputDisabledT m) where
289instance (Prerender js t m, Monad m) => Prerender js t (InputDisabledT m) where
184− type Client (InputDisabledT m) = Client m
290+ type Client (InputDisabledT m) = InputDisabledT (Client m)
185− prerender (InputDisabledT server) client = InputDisabledT $ prerender server client
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
186
296
187instance (Prerender js t m, Monad m, ReflexHost t) => Prerender js t (PostBuildT t m) where
297instance (Prerender js t m, Monad m, ReflexHost t) => Prerender js t (PostBuildT t m) where
188 type Client (PostBuildT t m) = PostBuildT t (Client m)
298 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
60 , partitionMapBySetLT
60 , partitionMapBySetLT
61 ) where
61 ) where
62
62
63+import Reflex.Adjustable.Class
63import Reflex.Class
64import Reflex.Class
64import Reflex.Collection
65import Reflex.Collection
65import Reflex.Dom.Builder.Class
66import Reflex.Dom.Builder.Class
@@ -144,23 +145,25 @@ button t = do
144
145
145--TODO: Should this be renamed to 'widgetView' for consistency with 'widgetHold'?
146--TODO: Should this be renamed to 'widgetView' for consistency with 'widgetHold'?
146-- | Given a Dynamic of widget-creating actions, create a widget that is recreated whenever the Dynamic updates.
147-- | 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.
148-- 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').
151-- Note: Often, the type @a@ is an 'Event', in which case the return value is an Event-of-Events that would typically be flattened (via 'switchHold').
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)
150dyn = networkView
153dyn = networkView
151
154
152-- | Like 'dyn' but discards result.
155-- | 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 ()
154dyn_ = void . dyn
157dyn_ = void . dyn
155
158
156-- | Given an initial widget and an Event of widget-creating actions, create a widget that is recreated whenever the Event fires.
159-- | Given an initial widget and an Event of widget-creating actions, create a widget that is recreated whenever the Event fires.
157-- The returned Dynamic of widget results occurs when the Event does.
160-- The returned Dynamic of widget results occurs when the Event does.
158-- 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').
161-- Note: Often, the type 'a' is an Event, in which case the return value is a Dynamic-of-Events that would typically be flattened (via 'switchDyn').
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)
160widgetHold = networkHold
163widgetHold = networkHold
161
164
162-- | Like 'widgetHold' but discards result.
165-- | 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 ()
164widgetHold_ z = void . widgetHold z
167widgetHold_ z = void . widgetHold z
165
168
166-- | Create a DOM element
169-- | Create a DOM element
@@ -268,34 +271,10 @@ dynamicAttributesToModifyAttributesWithInitial attrs0 d = do
268 return $ if Map.null p then Nothing else Just p
271 return $ if Map.null p then Nothing else Just p
269 return modificationsNeeded
272 return modificationsNeeded
270
273
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−
293newtype Link t
274newtype Link t
294 = Link { _link_clicked :: Event t ()
275 = Link { _link_clicked :: Event t ()
295 }
276 }
296
277
297−-- | >>> linkClass "Click here" "link-class"
298−-- > <a class="link-class">Click here</a>
299linkClass :: DomBuilder t m => Text -> Text -> m (Link t)
278linkClass :: DomBuilder t m => Text -> Text -> m (Link t)
300linkClass s c = do
279linkClass s c = do
301 (l,_) <- elAttr' "a" ("class" =: c) $ text s
280 (l,_) <- elAttr' "a" ("class" =: c) $ text s
@@ -315,6 +294,7 @@ dtdd h w = do
315blank :: forall m. Monad m => m ()
294blank :: forall m. Monad m => m ()
316blank = return ()
295blank = return ()
317
296
297+-- TODO: Move to an example project.
318-- | A widget to display a table with static columns and dynamic rows.
298-- | A widget to display a table with static columns and dynamic rows.
319tableDynAttr :: forall t m r k v. (Ord k, DomBuilder t m, MonadHold t m, PostBuild t m, MonadFix m)
299tableDynAttr :: forall t m r k v. (Ord k, DomBuilder t m, MonadHold t m, PostBuild t m, MonadFix m)
320 => Text -- ^ Class applied to <table> element
300 => Text -- ^ Class applied to <table> element
@@ -331,6 +311,7 @@ tableDynAttr klass cols dRows rowAttrs = elAttr "div" (Map.singleton "style" "zo
331 dAttrs <- rowAttrs k
311 dAttrs <- rowAttrs k
332 elDynAttr' "tr" dAttrs $ mapM (\x -> el "td" $ snd x k r) cols)
312 elDynAttr' "tr" dAttrs $ mapM (\x -> el "td" $ snd x k r) cols)
333
313
314+-- TODO: Move to an example project.
334-- | A widget to construct a tabbed view that shows only one of its child widgets at a time.
315-- | A widget to construct a tabbed view that shows only one of its child widgets at a time.
335-- Creates a header bar containing a <ul> with one <li> per child; clicking a <li> displays
316-- Creates a header bar containing a <ul> with one <li> per child; clicking a <li> displays
336-- the corresponding child and hides all others.
317-- 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
54import qualified GHCJS.DOM.Event as Event
54import qualified GHCJS.DOM.Event as Event
55import qualified GHCJS.DOM.HTMLInputElement as Input
55import qualified GHCJS.DOM.HTMLInputElement as Input
56
56
57+{-# DEPRECATED TextInput, _textInput_element, TextInputConfig, textInput "Use 'inputElement' directly" #-}
57data TextInput t
58data TextInput t
58 = TextInput { _textInput_value :: Dynamic t Text
59 = TextInput { _textInput_value :: Dynamic t Text
59 , _textInput_input :: Event t Text
60 , _textInput_input :: Event t Text
@@ -161,6 +162,7 @@ rangeInput (RangeInputConfig initial eSetValue dAttrs) = do
161 , _rangeInput_element = _inputElement_raw i
162 , _rangeInput_element = _inputElement_raw i
162 }
163 }
163
164
165+{-# DEPRECATED TextAreaConfig, TextArea, textArea "Use 'textAreaElement' directly" #-}
164data TextAreaConfig t
166data TextAreaConfig t
165 = TextAreaConfig { _textAreaConfig_initialValue :: Text
167 = TextAreaConfig { _textAreaConfig_initialValue :: Text
166 , _textAreaConfig_setValue :: Event t Text
168 , _textAreaConfig_setValue :: Event t Text
@@ -198,6 +200,7 @@ textArea (TextAreaConfig initial eSet attrs) = do
198 , _textArea_element = _textAreaElement_raw i
200 , _textArea_element = _textAreaElement_raw i
199 }
201 }
200
202
203+{-# DEPRECATED CheckboxConfig, Checkbox, checkbox, checkboxView, CheckboxViewEventResultType, regularToCheckboxViewEventType, CheckboxViewEventResult "Use 'inputElement' directly" #-}
201data CheckboxConfig t
204data CheckboxConfig t
202 = CheckboxConfig { _checkboxConfig_setValue :: Event t Bool
205 = CheckboxConfig { _checkboxConfig_setValue :: Event t Bool
203 , _checkboxConfig_attributes :: Dynamic t (Map Text Text)
206 , _checkboxConfig_attributes :: Dynamic t (Map Text Text)
@@ -287,7 +290,7 @@ regularToCheckboxViewEventType en r = case en of
287
290
288newtype CheckboxViewEventResult en = CheckboxViewEventResult { unCheckboxViewEventResult :: CheckboxViewEventResultType en }
291newtype CheckboxViewEventResult en = CheckboxViewEventResult { unCheckboxViewEventResult :: CheckboxViewEventResultType en }
289
292
290−--TODO
293+-- | Create a view only checkbox
291{-# INLINABLE checkboxView #-}
294{-# INLINABLE checkboxView #-}
292checkboxView :: 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)
295checkboxView :: 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)
293checkboxView dAttrs dValue = do
296checkboxView dAttrs dValue = do
@@ -321,6 +324,7 @@ checkboxView dAttrs dValue = do
321 i <- inputElement inputElementConfig
324 i <- inputElement inputElementConfig
322 return $ unCheckboxViewEventResult <$> select (_element_events $ _inputElement_element i) (WrapArg Click)
325 return $ unCheckboxViewEventResult <$> select (_element_events $ _inputElement_element i) (WrapArg Click)
323
326
327+{-# DEPRECATED FileInput, FileInputConfig, fileInput "Use 'inputElement' directly" #-}
324data FileInput d t
328data FileInput d t
325 = FileInput { _fileInput_value :: Dynamic t [File]
329 = FileInput { _fileInput_value :: Dynamic t [File]
326 , _fileInput_element :: RawInputElement d
330 , _fileInput_element :: RawInputElement d
@@ -433,9 +437,12 @@ dropdown k0 options (DropdownConfig setK attrs) = do
433 let xs = fmap (\(ix, (k, v)) -> ((ix, k), ((ix, k), v))) $ zip [0::Int ..] $ Map.toList os
437 let xs = fmap (\(ix, (k, v)) -> ((ix, k), ((ix, k), v))) $ zip [0::Int ..] $ Map.toList os
434 in (Map.fromList $ map snd xs, Bimap.fromList $ map fst xs)
438 in (Map.fromList $ map snd xs, Bimap.fromList $ map fst xs)
435 modifyAttrs <- dynamicAttributesToModifyAttributes attrs
439 modifyAttrs <- dynamicAttributesToModifyAttributes attrs
440+ postBuild <- getPostBuild
441+ let setSelection = attachPromptlyDynWithMaybe (flip Bimap.lookupR) ixKeys $
442+ leftmost [setK, k0 <$ postBuild]
436 let cfg = def
443 let cfg = def
437 & selectElementConfig_elementConfig . elementConfig_modifyAttributes .~ fmap mapKeysToAttributeName modifyAttrs
444 & 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
439 (eRaw, _) <- selectElement cfg $ listWithKey indexedOptions $ \(ix, k) v -> do
446 (eRaw, _) <- selectElement cfg $ listWithKey indexedOptions $ \(ix, k) v -> do
440 let optionAttrs = fmap (\dk -> "value" =: T.pack (show ix) <> if dk == k then "selected" =: "selected" else mempty) defaultKey
447 let optionAttrs = fmap (\dk -> "value" =: T.pack (show ix) <> if dk == k then "selected" =: "selected" else mempty) defaultKey
441 elDynAttr "option" optionAttrs $ dynText v
448 elDynAttr "option" optionAttrs $ dynText v
@@ -622,9 +629,6 @@ instance HasAttributes (FileInputConfig t) where
622 type Attrs (FileInputConfig t) = Dynamic t (Map Text Text)
629 type Attrs (FileInputConfig t) = Dynamic t (Map Text Text)
623 attributes = fileInputConfig_attributes
630 attributes = fileInputConfig_attributes
624
631
625−class HasSetValue a where
626− type SetValue a :: *
627− setValue :: Lens' a (SetValue a)
628
632
629instance HasSetValue (TextAreaConfig t) where
633instance HasSetValue (TextAreaConfig t) where
630 type SetValue (TextAreaConfig t) = Event t Text
634 type SetValue (TextAreaConfig t) = Event t Text
@@ -681,41 +685,3 @@ instance HasValue (Dropdown t k) where
681instance HasValue (Checkbox t) where
685instance HasValue (Checkbox t) where
682 type Value (Checkbox t) = Dynamic t Bool
686 type Value (Checkbox t) = Dynamic t Bool
683 value = _checkbox_value
687 value = _checkbox_value
684−
685−{-
686−type family Controller sm t a where
687− Controller Edit t a = (a, Event t a) -- Initial value and setter
688− Controller View t a = Dynamic t a -- Value (always)
689−
690−type family Output sm t a where
691− Output Edit t a = Dynamic t a -- Value (always)
692− Output View t a = Event t a -- Requested changes
693−
694−data CheckboxConfig sm t
695− = CheckboxConfig { _checkbox_input :: Controller sm t Bool
696− , _checkbox_attributes :: Attributes
697− }
698−
699−instance Reflex t => Default (CheckboxConfig Edit t) where
700− def = CheckboxConfig (False, never) mempty
701−
702−data Checkbox sm t
703− = Checkbox { _checkbox_output :: Output sm t Bool
704− }
705−
706−data StateMode = Edit | View
707−
708−--TODO: There must be a more generic way to get this witness and allow us to case on the type-level StateMode
709−data StateModeWitness (sm :: StateMode) where
710− EditWitness :: StateModeWitness Edit
711− ViewWitness :: StateModeWitness View
712−
713−class HasStateModeWitness (sm :: StateMode) where
714− stateModeWitness :: StateModeWitness sm
715−
716−instance HasStateModeWitness Edit where
717− stateModeWitness = EditWitness
718−
719−instance HasStateModeWitness View where
720− stateModeWitness = ViewWitness
721−-}
reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+2−2
@@ -108,7 +108,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu
108 uniqWindow <- holdUniqDyn window
108 uniqWindow <- holdUniqDyn window
109 return (uniqWindow, result)
109 return (uniqWindow, result)
110 where
110 where
111− toStyleAttr m = "style" =: Map.foldWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
111+ toStyleAttr m = "style" =: Map.foldrWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
112 mkViewport h = toStyleAttr $ "overflow" =: "auto" <> "position" =: "absolute" <>
112 mkViewport h = toStyleAttr $ "overflow" =: "auto" <> "position" =: "absolute" <>
113 "left" =: "0" <> "right" =: "0" <> "height" =: (T.pack (show h) <> "px")
113 "left" =: "0" <> "right" =: "0" <> "height" =: (T.pack (show h) <> "px")
114 mkContainer h = toStyleAttr $ "position" =: "relative" <> "height" =: (T.pack (show h) <> "px")
114 mkContainer h = toStyleAttr $ "position" =: "relative" <> "height" =: (T.pack (show h) <> "px")
@@ -117,7 +117,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu
117 "overflow" =: "hidden" <>
117 "overflow" =: "hidden" <>
118 "position" =: "relative"
118 "position" =: "relative"
119 mkRow k = toStyleAttr $ "height" =: (T.pack (show rowPx) <> "px") <>
119 mkRow k = toStyleAttr $ "height" =: (T.pack (show rowPx) <> "px") <>
120− "top" =: ((<>"px") $ T.pack $ show $ keyToIndex k * rowPx) <>
120+ "top" =: (<> "px") (T.pack $ show $ keyToIndex k * rowPx) <>
121 "position" =: "absolute" <>
121 "position" =: "absolute" <>
122 "width" =: "100%"
122 "width" =: "100%"
123 findWindow sizeIncrement windowSize startingPosition =
123 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
33
33
34-- | A widget that wraps the given widget in a div and fires an event when resized.
34-- | A widget that wraps the given widget in a div and fires an event when resized.
35-- Adapted from @github.com\/marcj\/css-element-queries@
35-- Adapted from @github.com\/marcj\/css-element-queries@
36+--
37+-- This function can cause strange scrollbars to appear in some circumstances.
38+-- These can be hidden with pseudo selectors, for example, in webkit browsers:
39+-- .wrapper *::-webkit-scrollbar { width: 0px; background: transparent; }
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)
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)
37resizeDetector = resizeDetectorWithStyle ""
41resizeDetector = resizeDetectorWithStyle ""
38
42
39resizeDetectorWithStyle :: (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)
43resizeDetectorWithStyle :: (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)
40 => Text -- ^ A css style string. Warning: It should not contain the "position" style attribute.
44 => Text -- ^ A css style string. Warning: It should not contain the "position" style attribute.
41 -> m a -- ^ The embedded widget
45 -> 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
43resizeDetectorWithStyle styleString = resizeDetectorWithAttrs ("style" =: styleString)
47resizeDetectorWithStyle styleString = resizeDetectorWithAttrs ("style" =: styleString)
44
48
45resizeDetectorWithAttrs :: (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)
49resizeDetectorWithAttrs :: (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)
46 => Map Text Text -- ^ A map of attributes. Warning: It should not modify the "position" style attribute.
50 => Map Text Text -- ^ A map of attributes. Warning: It should not modify the "position" style attribute.
47 -> m a -- ^ The embedded widget
51 -> 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
49resizeDetectorWithAttrs attrs w = do
53resizeDetectorWithAttrs attrs w = do
50 let childStyle = "position: absolute; left: 0; top: 0;"
54 let childStyle = "position: absolute; left: 0; top: 0;"
51 containerAttrs = "style" =: "position: absolute; left: 0; top: 0; right: 0; bottom: 0; overflow: scroll; z-index: -1; visibility: hidden;"
55 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
87 size0 <- performEvent $ fmap (const $ liftJSM reset) pb
91 size0 <- performEvent $ fmap (const $ liftJSM reset) pb
88 rec resize <- performEventAsync $ fmap (\d cb -> (liftIO . cb) =<< liftJSM (resetIfChanged d)) $ tag (current dimensions) $ leftmost [expandScroll, shrinkScroll]
92 rec resize <- performEventAsync $ fmap (\d cb -> (liftIO . cb) =<< liftJSM (resetIfChanged d)) $ tag (current dimensions) $ leftmost [expandScroll, shrinkScroll]
89 dimensions <- holdDyn (Nothing, Nothing) $ leftmost [ size0, fmapMaybe id resize ]
93 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
159import Data.Aeson.Encode
159import Data.Aeson.Encode
160#endif
160#endif
161import qualified Data.ByteString.Lazy as BL
161import qualified Data.ByteString.Lazy as BL
162+import Data.CaseInsensitive (CI)
163+import qualified Data.CaseInsensitive as CI
162import Data.Default
164import Data.Default
163import qualified Data.List as L
165import qualified Data.List as L
164import Data.Map (Map)
166import Data.Map (Map)
@@ -198,12 +200,12 @@ data XhrResponse
198 , _xhrResponse_statusText :: Text
200 , _xhrResponse_statusText :: Text
199 , _xhrResponse_response :: Maybe XhrResponseBody
201 , _xhrResponse_response :: Maybe XhrResponseBody
200 , _xhrResponse_responseText :: Maybe Text
202 , _xhrResponse_responseText :: Maybe Text
201− , _xhrResponse_headers :: Map Text Text
203+ , _xhrResponse_headers :: Map (CI Text) Text
202 }
204 }
203 deriving (Typeable)
205 deriving (Typeable)
204
206
205data XhrResponseHeaders =
207data 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
207 | AllHeaders -- ^ Parse all headers from the XHR Response
209 | AllHeaders -- ^ Parse all headers from the XHR Response
208 deriving (Show, Read, Eq, Ord, Typeable)
210 deriving (Show, Read, Eq, Ord, Typeable)
209
211
@@ -275,7 +277,7 @@ newXMLHttpRequestWithError req cb = do
275 AllHeaders -> parseAllHeadersString <$>
277 AllHeaders -> parseAllHeadersString <$>
276 xmlHttpRequestGetAllResponseHeaders xhr
278 xmlHttpRequestGetAllResponseHeaders xhr
277 OnlyHeaders xs -> traverse (xmlHttpRequestGetResponseHeader xhr)
279 OnlyHeaders xs -> traverse (xmlHttpRequestGetResponseHeader xhr)
278− (Map.fromSet id xs)
280+ (Map.fromSet CI.original xs)
279 _ <- liftJSM $ cb $ Right
281 _ <- liftJSM $ cb $ Right
280 XhrResponse { _xhrResponse_status = status
282 XhrResponse { _xhrResponse_status = status
281 , _xhrResponse_statusText = statusText
283 , _xhrResponse_statusText = statusText
@@ -288,10 +290,10 @@ newXMLHttpRequestWithError req cb = do
288 return ()
290 return ()
289 return xhr
291 return xhr
290
292
291−parseAllHeadersString :: Text -> Map Text Text
293+parseAllHeadersString :: Text -> Map (CI Text) Text
292parseAllHeadersString s = Map.fromList $ fmap (stripBoth . T.span (/=':')) $
294parseAllHeadersString s = Map.fromList $ fmap (stripBoth . T.span (/=':')) $
293 L.dropWhileEnd T.null $ T.splitOn (T.pack "\r\n") s
295 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)
295
297
296newXMLHttpRequest :: (HasJSContext m, MonadJSM m, IsXhrPayload a) => XhrRequest a -> (XhrResponse -> JSM ()) -> m XMLHttpRequest
298newXMLHttpRequest :: (HasJSContext m, MonadJSM m, IsXhrPayload a) => XhrRequest a -> (XhrResponse -> JSM ()) -> m XMLHttpRequest
297newXMLHttpRequest req cb = newXMLHttpRequestWithError req $ mapM_ cb
299newXMLHttpRequest req cb = newXMLHttpRequestWithError req $ mapM_ cb
@@ -444,7 +446,7 @@ xhrResponse_responseText :: Lens' XhrResponse (Maybe Text)
444xhrResponse_responseText f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 y x5) <$> f x4
446xhrResponse_responseText f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 y x5) <$> f x4
445{-# INLINE xhrResponse_responseText #-}
447{-# INLINE xhrResponse_responseText #-}
446
448
447−xhrResponse_headers :: Lens' XhrResponse (Map Text Text)
449+xhrResponse_headers :: Lens' XhrResponse (Map (CI Text) Text)
448xhrResponse_headers f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 x4 y) <$> f x5
450xhrResponse_headers f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 x4 y) <$> f x5
449{-# INLINE xhrResponse_headers #-}
451{-# INLINE xhrResponse_headers #-}
450
452
reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs+2−3
@@ -1,7 +1,6 @@
1{-# LANGUAGE FlexibleInstances #-}
1{-# LANGUAGE FlexibleInstances #-}
2{-# LANGUAGE JavaScriptFFI #-}
2{-# LANGUAGE JavaScriptFFI #-}
3{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE TypeSynonymInstances #-}
5
4
6module Reflex.Dom.Xhr.Foreign (
5module Reflex.Dom.Xhr.Foreign (
7 XMLHttpRequest
6 XMLHttpRequest
@@ -16,7 +15,7 @@ import Data.Text (Text)
16import Data.ByteString (ByteString)
15import Data.ByteString (ByteString)
17import Foreign.JavaScript.Utils (bsFromMutableArrayBuffer, bsToArrayBuffer)
16import Foreign.JavaScript.Utils (bsFromMutableArrayBuffer, bsToArrayBuffer)
18import GHCJS.DOM.Enums
17import GHCJS.DOM.Enums
19−import GHCJS.DOM.EventM (EventM, on)
18+import GHCJS.DOM.EventM (EventM, on, onSync)
20import GHCJS.DOM.EventTarget (dispatchEvent)
19import GHCJS.DOM.EventTarget (dispatchEvent)
21import GHCJS.DOM.Types (MonadJSM, ToJSString, FormData, Document, Blob (..), ArrayBuffer (..), JSVal, JSM, IsEvent, XMLHttpRequestProgressEvent, ProgressEvent, Event, XMLHttpRequestUpload, FromJSString, ArrayBufferView (..), liftJSM, castTo)
20import GHCJS.DOM.Types (MonadJSM, ToJSString, FormData, Document, Blob (..), ArrayBuffer (..), JSVal, JSM, IsEvent, XMLHttpRequestProgressEvent, ProgressEvent, Event, XMLHttpRequestUpload, FromJSString, ArrayBufferView (..), liftJSM, castTo)
22import GHCJS.DOM.XMLHttpRequest
21import GHCJS.DOM.XMLHttpRequest
@@ -115,7 +114,7 @@ xmlHttpRequestOntimeout :: XMLHttpRequest -> EventM XMLHttpRequest ProgressEvent
115xmlHttpRequestOntimeout = (`on` timeout)
114xmlHttpRequestOntimeout = (`on` timeout)
116
115
117xmlHttpRequestOnreadystatechange :: XMLHttpRequest -> EventM XMLHttpRequest Event () -> JSM (JSM ())
116xmlHttpRequestOnreadystatechange :: XMLHttpRequest -> EventM XMLHttpRequest Event () -> JSM (JSM ())
118−xmlHttpRequestOnreadystatechange = (`on` readyStateChange)
117+xmlHttpRequestOnreadystatechange = (`onSync` readyStateChange)
119
118
120xmlHttpRequestSetTimeout :: MonadJSM m => XMLHttpRequest -> Word -> m ()
119xmlHttpRequestSetTimeout :: MonadJSM m => XMLHttpRequest -> Word -> m ()
121xmlHttpRequestSetTimeout = setTimeout
120xmlHttpRequestSetTimeout = setTimeout
reflex-dom-core/src/Reflex/Dom/Xhr/FormData.hsnew file+47
@@ -0,0 +1,47 @@
1+{-# LANGUAGE FlexibleContexts #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+module Reflex.Dom.Xhr.FormData
4+ ( postForms
5+ , FormValue (..)
6+ , fileToFormValue
7+ )
8+ where
9+
10+import Control.Lens
11+import Data.Default
12+import Data.Map (Map)
13+import Data.Text (Text)
14+import Data.Traversable
15+import qualified GHCJS.DOM.FormData as FD
16+import Foreign.JavaScript.TH
17+import GHCJS.DOM.File (getName)
18+import GHCJS.DOM.Types (File, IsBlob)
19+import Language.Javascript.JSaddle.Monad (MonadJSM, liftJSM)
20+import Reflex
21+import Reflex.Dom.Xhr
22+
23+-- | A FormData value may be a blob/file or a string. The file can optionally be provided with filename.
24+data FormValue blob = FormValue_Text Text
25+ | FormValue_File blob (Maybe Text) -- maybe filename
26+
27+-- | Performs a POST request with the provided FormData payload
28+postForms
29+ :: ( IsBlob blob, HasJSContext (Performable m), MonadJSM (Performable m)
30+ , PerformEvent t m, TriggerEvent t m
31+ , Traversable f)
32+ => Text -- ^ The target url
33+ -> Event t (f (Map Text (FormValue blob))) -- ^ Maps of text keys and values that will be sent as "FormData"
34+ -> m (Event t (f XhrResponse))
35+postForms url payload = do
36+ performMkRequestsAsync $ ffor payload $ \fs -> for fs $ \u -> liftJSM $ do
37+ fd <- FD.newFormData Nothing
38+ iforM_ u $ \k v -> case v of
39+ FormValue_Text t -> FD.append fd k t
40+ FormValue_File b fn -> FD.appendBlob fd k b fn
41+ return $ xhrRequest "POST" url $ def & xhrRequestConfig_sendData .~ fd
42+
43+-- | Converts a File (e.g., the output of a 'FileInput') into a 'FormValue'. The filename will be included if it is available.
44+fileToFormValue :: MonadJSM m => File -> m (FormValue File)
45+fileToFormValue f = do
46+ fn <- getName f
47+ return $ FormValue_File f $ Just fn
reflex-dom-core/test/gc.hs+3−3
@@ -8,7 +8,7 @@ import Control.Exception
8import Control.Monad
8import Control.Monad
9import Control.Monad.IO.Class
9import Control.Monad.IO.Class
10import Data.Int
10import Data.Int
11−import Data.Text
11+import Data.Text as T
12import Language.Javascript.JSaddle.Warp
12import Language.Javascript.JSaddle.Warp
13import Reflex.Dom.Core
13import Reflex.Dom.Core
14import Reflex.Time
14import Reflex.Time
@@ -47,12 +47,12 @@ failureLimit = 0
47
47
48main :: IO ()
48main :: IO ()
49main = do
49main = 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
51 withSandboxedChromeFlags True $ \chromeFlags -> do
51 withSandboxedChromeFlags True $ \chromeFlags -> do
52 mainThread <- myThreadId
52 mainThread <- myThreadId
53 browserProcess <- spawnCommand $ mconcat
53 browserProcess <- spawnCommand $ mconcat
54 [ "echo 'Starting Chromium' ; chromium "
54 [ "echo 'Starting Chromium' ; chromium "
55− , unpack $ intercalate " " chromeFlags
55+ , unpack $ T.unwords chromeFlags
56 , " http://localhost:3911 ; echo 'Chromium exited'"
56 , " http://localhost:3911 ; echo 'Chromium exited'"
57 ]
57 ]
58 let finishTest result = do
58 let finishTest result = do
reflex-dom-core/test/hlint.hs+3−1
@@ -1,4 +1,4 @@
1−import Language.Haskell.HLint3 (hlint)
1+import Language.Haskell.HLint (hlint)
2import System.Exit (exitFailure, exitSuccess)
2import System.Exit (exitFailure, exitSuccess)
3
3
4main :: IO ()
4main :: IO ()
@@ -16,9 +16,11 @@ main = do
16 , "--ignore=Use unless"
16 , "--ignore=Use unless"
17 , "--ignore=Use if"
17 , "--ignore=Use if"
18 , "--ignore=Use fewer imports"
18 , "--ignore=Use fewer imports"
19+ , "--ignore=Use list comprehension"
19 , "--ignore=Unnecessary hiding" -- Interferes with cross-version compatibility
20 , "--ignore=Unnecessary hiding" -- Interferes with cross-version compatibility
20 , "--ignore=Use <$>"
21 , "--ignore=Use <$>"
21 , "--ignore=Reduce duplication" --TODO: Re-enable this test
22 , "--ignore=Reduce duplication" --TODO: Re-enable this test
23+ , "--ignore=Use list comprehension"
22 , "--cpp-define=USE_TEMPLATE_HASKELL"
24 , "--cpp-define=USE_TEMPLATE_HASKELL"
23 ]
25 ]
24 if null ideas then exitSuccess else exitFailure
26 if null ideas then exitSuccess else exitFailure
reflex-dom-core/test/hydration.hs+541−136
@@ -1,12 +1,9 @@
1−{-# OPTIONS_GHC -fno-warn-orphans #-}
2{-# LANGUAGE BangPatterns #-}
1{-# LANGUAGE BangPatterns #-}
3−{-# LANGUAGE StandaloneDeriving #-}
4−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5−{-# LANGUAGE UndecidableInstances #-}
6{-# LANGUAGE ConstraintKinds #-}
2{-# LANGUAGE ConstraintKinds #-}
7−{-# LANGUAGE CPP #-}
8{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleContexts #-}
4+{-# LANGUAGE FlexibleInstances #-}
9{-# LANGUAGE GADTs #-}
5{-# LANGUAGE GADTs #-}
6+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10{-# LANGUAGE LambdaCase #-}
7{-# LANGUAGE LambdaCase #-}
11{-# LANGUAGE MultiParamTypeClasses #-}
8{-# LANGUAGE MultiParamTypeClasses #-}
12{-# LANGUAGE OverloadedStrings #-}
9{-# LANGUAGE OverloadedStrings #-}
@@ -14,26 +11,43 @@
14{-# LANGUAGE RankNTypes #-}
11{-# LANGUAGE RankNTypes #-}
15{-# LANGUAGE RecursiveDo #-}
12{-# LANGUAGE RecursiveDo #-}
16{-# LANGUAGE ScopedTypeVariables #-}
13{-# LANGUAGE ScopedTypeVariables #-}
14+{-# LANGUAGE StandaloneDeriving #-}
17{-# LANGUAGE TemplateHaskell #-}
15{-# LANGUAGE TemplateHaskell #-}
18{-# LANGUAGE TupleSections #-}
16{-# LANGUAGE TupleSections #-}
19{-# LANGUAGE TypeApplications #-}
17{-# LANGUAGE TypeApplications #-}
20{-# LANGUAGE TypeFamilies #-}
18{-# LANGUAGE TypeFamilies #-}
19+{-# LANGUAGE UndecidableInstances #-}
21
20
21+{-# OPTIONS_GHC -fno-warn-orphans #-}
22+
23+-- Notice to those working on this test suite:
24+-- It doesn't appear to be possible to use --match to run a particular test, in
25+-- this situation the test may hang before reaching our code. This seems to
26+-- happen when the test is not the first test in the block. As a workaround, you
27+-- can just comment out the other tests. Also, using `xit` will cause the same
28+-- issue. `xit` tests must be the last tests in the session, or the session will
29+-- hang in the following test.
30+
31+import Prelude hiding (fail)
22import Control.Concurrent
32import Control.Concurrent
33+import qualified Control.Concurrent.Async as Async
34+import Control.Lens.Operators
23−import Control.Monad
35+import Control.Monad hiding (fail)
24import Control.Monad.Catch
36import Control.Monad.Catch
37+import Control.Monad.Fail
25import Control.Monad.Fix
38import Control.Monad.Fix
26import Control.Monad.IO.Class
39import Control.Monad.IO.Class
27import Control.Monad.Ref
40import Control.Monad.Ref
28import Data.Constraint.Extras
41import Data.Constraint.Extras
29import Data.Constraint.Extras.TH
42import Data.Constraint.Extras.TH
30import Data.Dependent.Map (DMap)
43import Data.Dependent.Map (DMap)
31−import Data.Dependent.Sum (DSum(..), (==>), EqTag(..), ShowTag(..))
44+import Data.Dependent.Sum (DSum(..), (==>))
32import Data.Functor.Identity
45import Data.Functor.Identity
33import Data.Functor.Misc
46import Data.Functor.Misc
34import Data.GADT.Compare.TH
47import Data.GADT.Compare.TH
35import Data.GADT.Show.TH
48import Data.GADT.Show.TH
36import Data.IORef (IORef)
49import Data.IORef (IORef)
50+import Data.List (sort)
37import Data.Maybe
51import Data.Maybe
38import Data.Proxy
52import Data.Proxy
39import Data.Text (Text)
53import Data.Text (Text)
@@ -44,6 +58,7 @@ import Network.Socket
44import Network.Wai
58import Network.Wai
45import Network.WebSockets
59import Network.WebSockets
46import Reflex.Dom.Core
60import Reflex.Dom.Core
61+import Reflex.Dom.Widget.Input (dropdown)
47import Reflex.Patch.DMapWithMove
62import Reflex.Patch.DMapWithMove
48import System.Directory
63import System.Directory
49import System.Environment
64import System.Environment
@@ -51,12 +66,14 @@ import System.IO (stderr)
51import System.IO.Silently
66import System.IO.Silently
52import System.IO.Temp
67import System.IO.Temp
53import System.Process
68import System.Process
69+import System.Which (staticWhich)
54−import qualified Test.HUnit as HUnit (assertEqual, assertFailure)
70+import qualified Test.HUnit as HUnit
55import qualified Test.Hspec as H
71import qualified Test.Hspec as H
72+import qualified Test.Hspec.Core.Spec as H
56import Test.Hspec (xit)
73import Test.Hspec (xit)
57−import Test.Hspec.WebDriver hiding (runWD, click, uploadFile)
74+import Test.Hspec.WebDriver hiding (runWD, click, uploadFile, WD)
58import qualified Test.Hspec.WebDriver as WD
75import qualified Test.Hspec.WebDriver as WD
59−import Test.WebDriver (WD)
76+import Test.WebDriver (WD(..))
60
77
61import qualified Data.ByteString.Lazy as LBS
78import qualified Data.ByteString.Lazy as LBS
62import qualified Data.Dependent.Map as DMap
79import qualified Data.Dependent.Map as DMap
@@ -72,19 +89,32 @@ import qualified Test.WebDriver.Capabilities as WD
72import Test.Util.ChromeFlags
89import Test.Util.ChromeFlags
73import Test.Util.UnshareNetwork
90import Test.Util.UnshareNetwork
74
91
92+-- ORPHAN: https://github.com/kallisti-dev/hs-webdriver/pull/167
93+deriving instance MonadMask WD
94+
95+chromium :: FilePath
96+chromium = $(staticWhich "chromium")
97+
75seleniumPort, jsaddlePort :: PortNumber
98seleniumPort, jsaddlePort :: PortNumber
76seleniumPort = 8000
99seleniumPort = 8000
77jsaddlePort = 8001
100jsaddlePort = 8001
78
101
79-- TODO Remove orphan
102-- TODO Remove orphan
80−deriving instance MonadRef WD
103+instance MonadRef WD where
104+ type Ref WD = Ref IO
105+ newRef = WD . newRef
106+ readRef = WD . readRef
107+ writeRef r = WD . writeRef r
81
108
82assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
109assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
83−assertEqual a b = liftIO . HUnit.assertEqual a b
110+assertEqual msg a b = liftIO $ HUnit.assertEqual msg a b
84
111
85assertFailure :: MonadIO m => String -> m ()
112assertFailure :: MonadIO m => String -> m ()
86assertFailure = liftIO . HUnit.assertFailure
113assertFailure = liftIO . HUnit.assertFailure
87
114
115+assertBool :: (MonadIO m) => String -> Bool -> m ()
116+assertBool msg bool = liftIO $ HUnit.assertBool msg bool
117+
88chromeConfig :: Text -> [Text] -> WD.WDConfig
118chromeConfig :: Text -> [Text] -> WD.WDConfig
89chromeConfig fp flags = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags }) WD.defaultConfig
119chromeConfig fp flags = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags }) WD.defaultConfig
90
120
@@ -111,35 +141,26 @@ deriveGEq ''DKey
111deriveGCompare ''DKey
141deriveGCompare ''DKey
112deriveGShow ''DKey
142deriveGShow ''DKey
113
143
114−instance ShowTag DKey Identity where
144+deriving instance MonadFail WD
115− showTaggedPrec = \case
116− Key_Int -> showsPrec
117− Key_Char -> showsPrec
118− Key_Bool -> showsPrec
119−
120−instance EqTag DKey Identity where
121− eqTagged Key_Int Key_Int = (==)
122− eqTagged Key_Char Key_Char = (==)
123− eqTagged Key_Bool Key_Bool = (==)
124
145
125main :: IO ()
146main :: IO ()
126main = do
147main = do
127− unshareNetork
148+ unshareNetwork
128 isHeadless <- (== Nothing) <$> lookupEnv "NO_HEADLESS"
149 isHeadless <- (== Nothing) <$> lookupEnv "NO_HEADLESS"
129 withSandboxedChromeFlags isHeadless $ \chromeFlags -> do
150 withSandboxedChromeFlags isHeadless $ \chromeFlags -> do
130 withSeleniumServer $ \selenium -> do
151 withSeleniumServer $ \selenium -> do
131− browserPath <- liftIO $ T.strip . T.pack <$> readProcess "which" [ "chromium" ] ""
152+ let browserPath = T.strip $ T.pack chromium
132 when (T.null browserPath) $ fail "No browser found"
153 when (T.null browserPath) $ fail "No browser found"
133− withDebugging <- isJust <$> lookupEnv "DEBUG"
154+ withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"
134 let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
155 let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
135 chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
156 chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
136− hspec (tests withDebugging wdConfig [chromeCaps'] selenium) `finally` _selenium_stopServer selenium
157+ hspec (tests withDebugging wdConfig [(chromeCaps', "chrome")] selenium) `finally` _selenium_stopServer selenium
137
158
138−tests :: Bool -> WD.WDConfig -> [Capabilities] -> Selenium -> Spec
159+tests :: Bool -> WD.WDConfig -> [(Capabilities, String)] -> Selenium -> Spec
139tests withDebugging wdConfig caps _selenium = do
160tests withDebugging wdConfig caps _selenium = do
140 let putStrLnDebug :: MonadIO m => Text -> m ()
161 let putStrLnDebug :: MonadIO m => Text -> m ()
141 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
162 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
142− session' = sessionWith wdConfig "" . using (map (,"") caps)
163+ session' t = sessionWith wdConfig t . using caps
143 runWD m = runWDOptions (WdOptions False) $ do
164 runWD m = runWDOptions (WdOptions False) $ do
144 putStrLnDebug "before"
165 putStrLnDebug "before"
145 r <- m
166 r <- m
@@ -148,10 +169,10 @@ tests withDebugging wdConfig caps _selenium = do
148 testWidgetStatic :: WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
169 testWidgetStatic :: WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
149 testWidgetStatic = testWidgetStaticDebug withDebugging
170 testWidgetStatic = testWidgetStaticDebug withDebugging
150 testWidget :: WD () -> WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
171 testWidget :: WD () -> WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
151− testWidget = testWidgetDebug withDebugging
172+ testWidget = testWidgetDebug True withDebugging
152 testWidget' :: WD a -> (a -> WD b) -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
173 testWidget' :: WD a -> (a -> WD b) -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
153− testWidget' = testWidgetDebug' withDebugging
174+ testWidget' = testWidgetDebug' True withDebugging
154− describe "text" $ session' $ do
175+ session' "text" $ do
155 it "works" $ runWD $ do
176 it "works" $ runWD $ do
156 testWidgetStatic (checkBodyText "hello world") $ do
177 testWidgetStatic (checkBodyText "hello world") $ do
157 text "hello world"
178 text "hello world"
@@ -212,7 +233,7 @@ tests withDebugging wdConfig caps _selenium = do
212 click <- button ""
233 click <- button ""
213 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
234 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
214
235
215− describe "element" $ session' $ do
236+ session' "element" $ do
216 it "works with domEvent Click" $ runWD $ do
237 it "works with domEvent Click" $ runWD $ do
217 clickedRef <- liftIO $ newRef False
238 clickedRef <- liftIO $ newRef False
218 testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
239 testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
@@ -275,36 +296,86 @@ tests withDebugging wdConfig caps _selenium = do
275 (e, ()) <- element "div" conf $ text "hello world"
296 (e, ()) <- element "div" conf $ text "hello world"
276 let click = domEvent Click e
297 let click = domEvent Click e
277 return ()
298 return ()
278− -- TODO check this is the correct solution
279− it "has ssr attribute, removes ssr attribute" $ runWD $ do
280− let checkSSRAttr = do
281− e <- findElemWithRetry $ WD.ByTag "div"
282− assertAttr e "data-ssr" (Just "")
283− pure e
284− testWidget' checkSSRAttr (\e -> assertAttr e "data-ssr" Nothing) $ el "div" $ text "hello world"
285
299
286− describe "inputElement" $ 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 ()
287− describe "hydration" $ session' $ do
358+ describe "hydration" $ do
288 it "doesn't wipe user input when switching over" $ runWD $ do
359 it "doesn't wipe user input when switching over" $ runWD $ do
289− inputRef <- newRef ("" :: Text)
360+ inputRef <- newRef ("hello " :: Text)
290 testWidget'
361 testWidget'
291 (do
362 (do
292 e <- findElemWithRetry $ WD.ByTag "input"
363 e <- findElemWithRetry $ WD.ByTag "input"
293− WD.sendKeys "hello world" e
364+ WD.sendKeys "world" e
294 pure e)
365 pure e)
295 (\e -> do
366 (\e -> do
296 WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
367 WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
297− WD.click =<< (findElemWithRetry $ WD.ByTag "button")
368+ WD.click =<< findElemWithRetry (WD.ByTag "button")
298 readRef inputRef `shouldBeWithRetryM` "hello world"
369 readRef inputRef `shouldBeWithRetryM` "hello world"
299 ) $ do
370 ) $ do
300− e <- inputElement def
371+ e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
301 click <- button "save"
372 click <- button "save"
302 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
373 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
303 it "captures user input after switchover" $ runWD $ do
374 it "captures user input after switchover" $ runWD $ do
304 inputRef <- newRef ("" :: Text)
375 inputRef <- newRef ("" :: Text)
305 let checkValue = do
376 let checkValue = do
306− WD.sendKeys "hello world" =<< (findElemWithRetry $ WD.ByTag "input")
377+ WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
307− WD.click =<< (findElemWithRetry $ WD.ByTag "button")
378+ WD.click =<< findElemWithRetry (WD.ByTag "button")
308 readRef inputRef `shouldBeWithRetryM` "hello world"
379 readRef inputRef `shouldBeWithRetryM` "hello world"
309 testWidget (pure ()) checkValue $ do
380 testWidget (pure ()) checkValue $ do
310 e <- inputElement def
381 e <- inputElement def
@@ -354,31 +425,56 @@ tests withDebugging wdConfig caps _selenium = do
354 checkedByUIRef <- newRef False
425 checkedByUIRef <- newRef False
355 checkedRef <- newRef False
426 checkedRef <- newRef False
356 setCheckedChan <- liftIO newChan
427 setCheckedChan <- liftIO newChan
428+ let checkStatic = do
429+ e <- findElemWithRetry $ WD.ByTag "input"
430+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
431+ pure e
357− let checkValue = do
432+ checkValue e = do
358 readRef checkedByUIRef `shouldBeWithRetryM` False
433 readRef checkedByUIRef `shouldBeWithRetryM` False
359 readRef checkedRef `shouldBeWithRetryM` False
434 readRef checkedRef `shouldBeWithRetryM` False
360− e <- findElemWithRetry $ WD.ByTag "input"
435+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
361 WD.moveToCenter e
436 WD.moveToCenter e
362 WD.click e
437 WD.click e
363 readRef checkedByUIRef `shouldBeWithRetryM` True
438 readRef checkedByUIRef `shouldBeWithRetryM` True
364 readRef checkedRef `shouldBeWithRetryM` True
439 readRef checkedRef `shouldBeWithRetryM` True
440+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
365 liftIO $ writeChan setCheckedChan False
441 liftIO $ writeChan setCheckedChan False
366 readRef checkedByUIRef `shouldBeWithRetryM` True
442 readRef checkedByUIRef `shouldBeWithRetryM` True
367 readRef checkedRef `shouldBeWithRetryM` False
443 readRef checkedRef `shouldBeWithRetryM` False
444+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
368− testWidget (pure ()) checkValue $ do
445+ testWidget' checkStatic checkValue $ do
369 setChecked <- triggerEventWithChan setCheckedChan
446 setChecked <- triggerEventWithChan setCheckedChan
370 e <- inputElement $ def
447 e <- inputElement $ def
371 & initialAttributes .~ "type" =: "checkbox"
448 & initialAttributes .~ "type" =: "checkbox"
372 & inputElementConfig_setChecked .~ setChecked
449 & inputElementConfig_setChecked .~ setChecked
373 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
450 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
374 performEvent_ $ liftIO . writeRef checkedRef <$> updated (_inputElement_checked e)
451 performEvent_ $ liftIO . writeRef checkedRef <$> updated (_inputElement_checked e)
452+ it "respects user updates to checked which happen before hydration" $ runWD $ do
453+ checkedByUIRef <- newRef False
454+ checkedRef <- newRef False
455+ let checkStatic = do
456+ e <- findElemWithRetry $ WD.ByTag "input"
457+ WD.attr e "checked" `shouldBeWithRetryM` Nothing
458+ WD.moveToCenter e
459+ WD.click e
460+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
461+ pure e
462+ checkValue e = do
463+ WD.attr e "checked" `shouldBeWithRetryM` Just "true"
464+ readRef checkedByUIRef `shouldBeWithRetryM` True
465+ readRef checkedRef `shouldBeWithRetryM` True
466+ testWidget' checkStatic checkValue $ do
467+ e <- inputElement $ def
468+ & initialAttributes .~ "type" =: "checkbox"
469+ performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
470+ performEvent_ $ liftIO . writeRef checkedRef <$> updated (_inputElement_checked e)
375 it "captures file uploads" $ runWD $ do
471 it "captures file uploads" $ runWD $ do
376 filesRef :: IORef [Text] <- newRef []
472 filesRef :: IORef [Text] <- newRef []
377 let uploadFile = do
473 let uploadFile = do
378 e <- findElemWithRetry $ WD.ByTag "input"
474 e <- findElemWithRetry $ WD.ByTag "input"
379 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
475 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
380 WD.sendKeys (T.pack path) e
476 WD.sendKeys (T.pack path) e
381− WD.click =<< (findElemWithRetry $ WD.ByTag "button")
477+ WD.click =<< findElemWithRetry (WD.ByTag "button")
382 liftIO $ removeFile path
478 liftIO $ removeFile path
383 readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
479 readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
384 testWidget (pure ()) uploadFile $ do
480 testWidget (pure ()) uploadFile $ do
@@ -387,13 +483,122 @@ tests withDebugging wdConfig caps _selenium = do
387 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
483 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
388 names <- liftJSM $ traverse File.getName fs
484 names <- liftJSM $ traverse File.getName fs
389 liftIO $ writeRef filesRef names
485 liftIO $ writeRef filesRef names
390−
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
391− describe "hydration/immediate" $ session' $ do
596+ describe "hydration/immediate" $ do
392 it "captures user input after switchover" $ runWD $ do
597 it "captures user input after switchover" $ runWD $ do
393 inputRef :: IORef Text <- newRef ""
598 inputRef :: IORef Text <- newRef ""
394 let checkValue = do
599 let checkValue = do
395− WD.sendKeys "hello world" =<< (findElemWithRetry $ WD.ByTag "input")
600+ WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
396− WD.click =<< (findElemWithRetry $ WD.ByTag "button")
601+ WD.click =<< findElemWithRetry (WD.ByTag "button")
397 readRef inputRef `shouldBeWithRetryM` "hello world"
602 readRef inputRef `shouldBeWithRetryM` "hello world"
398 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
603 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
399 e <- inputElement def
604 e <- inputElement def
@@ -458,7 +663,7 @@ tests withDebugging wdConfig caps _selenium = do
458 e <- findElemWithRetry $ WD.ByTag "input"
663 e <- findElemWithRetry $ WD.ByTag "input"
459 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
664 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
460 WD.sendKeys (T.pack path) e
665 WD.sendKeys (T.pack path) e
461− WD.click =<< (findElemWithRetry $ WD.ByTag "button")
666+ WD.click =<< findElemWithRetry (WD.ByTag "button")
462 liftIO $ removeFile path
667 liftIO $ removeFile path
463 readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
668 readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
464 testWidget (pure ()) uploadFile $ prerender_ (pure ()) $ do
669 testWidget (pure ()) uploadFile $ prerender_ (pure ()) $ do
@@ -468,8 +673,31 @@ tests withDebugging wdConfig caps _selenium = do
468 names <- liftJSM $ traverse File.getName fs
673 names <- liftJSM $ traverse File.getName fs
469 liftIO $ writeRef filesRef names
674 liftIO $ writeRef filesRef names
470
675
471− describe "textAreaElement" $ do
676+ session' "textAreaElement" $ do
472− describe "hydration" $ session' $ 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
473 it "doesn't wipe user input when switching over" $ runWD $ do
701 it "doesn't wipe user input when switching over" $ runWD $ do
474 inputRef <- newRef ("" :: Text)
702 inputRef <- newRef ("" :: Text)
475 testWidget'
703 testWidget'
@@ -488,8 +716,8 @@ tests withDebugging wdConfig caps _selenium = do
488 it "captures user input after switchover" $ runWD $ do
716 it "captures user input after switchover" $ runWD $ do
489 inputRef <- newRef ("" :: Text)
717 inputRef <- newRef ("" :: Text)
490 let checkValue = do
718 let checkValue = do
491− WD.sendKeys "hello world" =<< (findElemWithRetry $ WD.ByTag "textarea")
719+ WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "textarea")
492− WD.click =<< (findElemWithRetry $ WD.ByTag "button")
720+ WD.click =<< findElemWithRetry (WD.ByTag "button")
493 readRef inputRef `shouldBeWithRetryM` "hello world"
721 readRef inputRef `shouldBeWithRetryM` "hello world"
494 testWidget (pure ()) checkValue $ do
722 testWidget (pure ()) checkValue $ do
495 e <- textAreaElement def
723 e <- textAreaElement def
@@ -535,8 +763,90 @@ tests withDebugging wdConfig caps _selenium = do
535 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
763 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
536 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
764 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
537 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
765 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
766+ it "fires _input event if the user altered the value before hydration" $ runWD $ do
767+ textarea <- newRef ("" :: Text)
768+ update <- newRef ("" :: Text)
769+ let checkStatic = do
770+ e <- findElemWithRetry $ WD.ByTag "textarea"
771+ WD.attr e "value" `shouldBeWithRetryM` Just ""
772+ WD.sendKeys "test" e
773+ WD.attr e "value" `shouldBeWithRetryM` Just "test"
774+ pure e
775+ checkHydrated e = do
776+ WD.attr e "value" `shouldBeWithRetryM` Just "test"
777+ readRef textarea `shouldBeWithRetryM` "test"
778+ readRef update `shouldBeWithRetryM` "test"
779+ testWidget' checkStatic checkHydrated $ do
780+ e <- textAreaElement def
781+ performEvent_ $ liftIO . writeRef textarea <$> _textAreaElement_input e
782+ performEvent_ $ liftIO . writeRef update <$> updated (_textAreaElement_value e)
783+ it "does not fire _input event when the value is updated at postBuild" $ runWD $ do
784+ textarea <- newRef (Nothing :: Maybe Text)
785+ let checkStatic = do
786+ e <- findElemWithRetry $ WD.ByTag "textarea"
787+ WD.attr e "value" `shouldBeWithRetryM` Just "pb"
788+ pure e
789+ checkHydrated e = do
790+ WD.attr e "value" `shouldBeWithRetryM` Just "pb"
791+ readRef textarea `shouldBeWithRetryM` Nothing
792+ testWidget' checkStatic checkHydrated $ do
793+ pb <- getPostBuild
794+ e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
795+ performEvent_ $ liftIO . writeRef textarea . Just <$> _textAreaElement_input e
796+ it "SSR produces correct DOM based on textAreaElement values when setValue happens at postBuild" $ runWD $ do
797+ let checkBoth = do
798+ textarea <- findElemWithRetry $ WD.ByTag "textarea"
799+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pb"
800+ p <- findElemWithRetry (WD.ByTag "p")
801+ shouldContainText "pb" p
802+ testWidget checkBoth checkBoth $ do
803+ pb <- getPostBuild
804+ e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
805+ el "p" $ dynText $ _textAreaElement_value e
806+ it "does not fail when both setValue AND user updated value happen before switchover" $ runWD $ do
807+ let checkStatic = do
808+ textarea <- findElemWithRetry $ WD.ByTag "textarea"
809+ h2_value <- findElemWithRetry (WD.ByTag "h2")
810+ h3_input <- findElemWithRetry (WD.ByTag "h3")
811+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pb"
812+ shouldContainText "pb" h2_value
813+ shouldContainText "" h3_input
814+ WD.sendKeys "abc" textarea
815+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
816+ shouldContainText "pb" h2_value
817+ shouldContainText "" h3_input
818+ pure (textarea, h2_value, h3_input)
819+ checkHydrated (textarea, h2_value, h3_input) = do
820+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
821+ shouldContainText "pbabc" h3_input
822+ shouldContainText "pbabc pb" h2_value
823+ pure ()
824+ testWidget' checkStatic checkHydrated $ do
825+ pb <- getPostBuild
826+ e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
827+ el "h1" $ dynText $ _textAreaElement_value e
828+ el "h2" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ updated $ _textAreaElement_value e
829+ el "h3" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ _textAreaElement_input e
830+ it "value is correct when both setValue AND user updated value happen before switchover" $ runWD $ do
831+ let checkStatic = do
832+ textarea <- findElemWithRetry $ WD.ByTag "textarea"
833+ p <- findElemWithRetry (WD.ByTag "p")
834+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pb"
835+ shouldContainText "pb" p
836+ WD.sendKeys "abc" textarea
837+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
838+ shouldContainText "pb" p -- It won't be updated yet
839+ pure (textarea, p)
840+ checkHydrated (textarea, p) = do
841+ WD.attr textarea "value" `shouldBeWithRetryM` Just "pbabc"
842+ shouldContainText "pbabc" p
843+ pure ()
844+ testWidget' checkStatic checkHydrated $ do
845+ pb <- getPostBuild
846+ e <- textAreaElement $ def & textAreaElementConfig_setValue .~ ("pb" <$ pb)
847+ el "p" $ dynText $ _textAreaElement_value e
538
848
539− describe "hydration/immediate" $ session' $ do
849+ describe "hydration/immediate" $ do
540 it "captures user input after switchover" $ runWD $ do
850 it "captures user input after switchover" $ runWD $ do
541 inputRef :: IORef Text <- newRef ""
851 inputRef :: IORef Text <- newRef ""
542 let checkValue = do
852 let checkValue = do
@@ -578,24 +888,24 @@ tests withDebugging wdConfig caps _selenium = do
578 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
888 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
579 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
889 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
580
890
581− describe "selectElement" $ do
891+ session' "selectElement" $ do
582 let options :: DomBuilder t m => m ()
892 let options :: DomBuilder t m => m ()
583 options = do
893 options = do
584 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
894 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
585 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
895 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
586 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
896 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
587− describe "hydration" $ session' $ do
897+ describe "hydration" $ do
588 it "sets initial value correctly" $ runWD $ do
898 it "sets initial value correctly" $ runWD $ do
589 inputRef <- newRef ("" :: Text)
899 inputRef <- newRef ("" :: Text)
590 let setup = do
900 let setup = do
591 e <- findElemWithRetry $ WD.ByTag "select"
901 e <- findElemWithRetry $ WD.ByTag "select"
592 assertAttr e "value" (Just "three")
902 assertAttr e "value" (Just "three")
593− WD.click =<< (findElemWithRetry $ WD.ById "two")
903+ WD.click =<< findElemWithRetry (WD.ById "two")
594 pure e
904 pure e
595 check e = do
905 check e = do
596 assertAttr e "value" (Just "two")
906 assertAttr e "value" (Just "two")
597 readRef inputRef `shouldBeWithRetryM` "three"
907 readRef inputRef `shouldBeWithRetryM` "three"
598− WD.click =<< (findElemWithRetry $ WD.ByTag "button")
908+ WD.click =<< findElemWithRetry (WD.ByTag "button")
599 assertAttr e "value" (Just "two")
909 assertAttr e "value" (Just "two")
600 readRef inputRef `shouldBeWithRetryM` "two"
910 readRef inputRef `shouldBeWithRetryM` "two"
601 testWidget' setup check $ do
911 testWidget' setup check $ do
@@ -608,9 +918,9 @@ tests withDebugging wdConfig caps _selenium = do
608 let checkValue = do
918 let checkValue = do
609 e <- findElemWithRetry $ WD.ByTag "select"
919 e <- findElemWithRetry $ WD.ByTag "select"
610 assertAttr e "value" (Just "one")
920 assertAttr e "value" (Just "one")
611− WD.click =<< (findElemWithRetry $ WD.ById "two")
921+ WD.click =<< findElemWithRetry (WD.ById "two")
612 assertAttr e "value" (Just "two")
922 assertAttr e "value" (Just "two")
613− WD.click =<< (findElemWithRetry $ WD.ByTag "button")
923+ WD.click =<< findElemWithRetry (WD.ByTag "button")
614 readRef inputRef `shouldBeWithRetryM` "two"
924 readRef inputRef `shouldBeWithRetryM` "two"
615 testWidget (pure ()) checkValue $ do
925 testWidget (pure ()) checkValue $ do
616 (e, ()) <- selectElement def options
926 (e, ()) <- selectElement def options
@@ -658,7 +968,7 @@ tests withDebugging wdConfig caps _selenium = do
658 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
968 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
659 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
969 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
660
970
661− describe "hydration/immediate" $ session' $ do
971+ describe "hydration/immediate" $ do
662 it "captures user input after switchover" $ runWD $ do
972 it "captures user input after switchover" $ runWD $ do
663 inputRef :: IORef Text <- newRef ""
973 inputRef :: IORef Text <- newRef ""
664 let checkValue = do
974 let checkValue = do
@@ -704,7 +1014,7 @@ tests withDebugging wdConfig caps _selenium = do
704 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
1014 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
705 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
1015 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
706
1016
707− describe "prerender" $ session' $ do
1017+ session' "prerender" $ do
708 it "works in simple case" $ runWD $ do
1018 it "works in simple case" $ runWD $ do
709 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
1019 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
710 prerender_ (text "One") (text "Two")
1020 prerender_ (text "One") (text "Two")
@@ -749,9 +1059,9 @@ tests withDebugging wdConfig caps _selenium = do
749 pb <- getPostBuild
1059 pb <- getPostBuild
750 performEvent_ $ liftIO (putMVar lock ()) <$ pb
1060 performEvent_ $ liftIO (putMVar lock ()) <$ pb
751 it "result Dynamic is updated *after* switchover" $ runWD $ do
1061 it "result Dynamic is updated *after* switchover" $ runWD $ do
752− let static = checkBodyText "PostBuild"
1062+ let preSwitchover = checkBodyText "PostBuild"
753 check = checkBodyText "Client"
1063 check = checkBodyText "Client"
754− testWidget static check $ void $ do
1064+ testWidget preSwitchover check $ void $ do
755 d <- prerender (pure "Initial") (pure "Client")
1065 d <- prerender (pure "Initial") (pure "Client")
756 pb <- getPostBuild
1066 pb <- getPostBuild
757 initial <- sample $ current d
1067 initial <- sample $ current d
@@ -759,21 +1069,30 @@ tests withDebugging wdConfig caps _selenium = do
759 -- This essentially checks that the client IO runs *after* switchover/postBuild,
1069 -- This essentially checks that the client IO runs *after* switchover/postBuild,
760 -- thus can't create conflicting DOM
1070 -- thus can't create conflicting DOM
761 it "can't exploit IO to break hydration" $ runWD $ do
1071 it "can't exploit IO to break hydration" $ runWD $ do
762− let static = checkBodyText "Initial"
1072+ let preSwitchover = checkBodyText "Initial"
763− testWidgetStatic static $ void $ do
1073+ testWidgetStatic preSwitchover $ void $ do
764 ref <- liftIO $ newRef "Initial"
1074 ref <- liftIO $ newRef "Initial"
765 prerender_ (pure ()) (liftIO $ writeRef ref "Client")
1075 prerender_ (pure ()) (liftIO $ writeRef ref "Client")
766 text <=< liftIO $ readRef ref
1076 text <=< liftIO $ readRef ref
767 -- As above, so below
1077 -- As above, so below
768 it "can't exploit triggerEvent to break hydration" $ runWD $ do
1078 it "can't exploit triggerEvent to break hydration" $ runWD $ do
769− let static = checkBodyText "Initial"
1079+ let preSwitchover = checkBodyText "Initial"
770 check = checkBodyText "Client"
1080 check = checkBodyText "Client"
771− testWidget static check $ void $ do
1081+ testWidget preSwitchover check $ void $ do
772 (e, trigger) <- newTriggerEvent
1082 (e, trigger) <- newTriggerEvent
773 prerender_ (pure ()) (liftIO $ trigger "Client")
1083 prerender_ (pure ()) (liftIO $ trigger "Client")
774 textNode $ TextNodeConfig "Initial" $ Just e
1084 textNode $ TextNodeConfig "Initial" $ Just e
775
1085
1086+ session' "namespaces" $ do
1087+ it "dyn can be nested in namespaced widget" $ runWD $ do
1088+ testWidget (pure ()) (checkTextInTag "svg" "one") $ do
1089+ let svgRootCfg = def
1090+ & (elementConfig_namespace ?~ "http://www.w3.org/2000/svg")
1091+ & (elementConfig_initialAttributes .~ ("width" =: "100%" <> "height" =: "100%" <> "viewBox" =: "0 0 1536 2048"))
1092+ void $ element "svg" svgRootCfg $ do
1093+ dyn_ $ text "one" <$ pure ()
1094+
776− describe "runWithReplace" $ session' $ do
1095+ session' "runWithReplace" $ do
777 it "works" $ runWD $ do
1096 it "works" $ runWD $ do
778 replaceChan :: Chan Text <- liftIO newChan
1097 replaceChan :: Chan Text <- liftIO newChan
779 let setup = findElemWithRetry $ WD.ByTag "div"
1098 let setup = findElemWithRetry $ WD.ByTag "div"
@@ -807,7 +1126,7 @@ tests withDebugging wdConfig caps _selenium = do
807 , el "span" . text <$> replace
1126 , el "span" . text <$> replace
808 ]
1127 ]
809 it "can be nested in postBuild widget" $ runWD $ do
1128 it "can be nested in postBuild widget" $ runWD $ do
810− replaceChan <- liftIO newChan
1129+ replaceChan :: Chan Text <- liftIO newChan
811 let setup = findElemWithRetry $ WD.ByTag "div"
1130 let setup = findElemWithRetry $ WD.ByTag "div"
812 check ssr = do
1131 check ssr = do
813 -- Check that the original element still exists and has the correct text
1132 -- Check that the original element still exists and has the correct text
@@ -840,7 +1159,7 @@ tests withDebugging wdConfig caps _selenium = do
840 replaceChan2 :: Chan Text <- liftIO newChan
1159 replaceChan2 :: Chan Text <- liftIO newChan
841 lock :: MVar () <- liftIO newEmptyMVar
1160 lock :: MVar () <- liftIO newEmptyMVar
842 let check = do
1161 let check = do
843− shouldContainText "" =<< (findElemWithRetry (WD.ByTag "body"))
1162+ shouldContainText "" =<< findElemWithRetry (WD.ByTag "body")
844 liftIO $ do
1163 liftIO $ do
845 writeChan replaceChan1 "one"
1164 writeChan replaceChan1 "one"
846 takeMVar lock
1165 takeMVar lock
@@ -917,7 +1236,61 @@ tests withDebugging wdConfig caps _selenium = do
917 , el "span" . text <$> replace
1236 , el "span" . text <$> replace
918 ]
1237 ]
919
1238
1239+ let checkInnerHtml t x = findElemWithRetry (WD.ByTag t) >>= (`attr` "innerHTML") >>= (`shouldBe` Just x)
1240+ it "removes bracketing comments" $ runWD $ do
1241+ replaceChan :: Chan () <- liftIO newChan
1242+ let
1243+ preSwitchover = checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0-->|after"
1244+ check () = do
1245+ liftIO $ writeChan replaceChan () -- trigger creation of p tag
1246+ _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1247+ checkInnerHtml "div" "before|<p>inner2</p>|after"
1248+ testWidget' preSwitchover check $ do
1249+ replace <- triggerEventWithChan replaceChan
1250+ el "div" $ do
1251+ text "before|"
1252+ _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1253+ text "|after"
1254+ it "ignores extra ending bracketing comment" $ runWD $ do
1255+ replaceChan :: Chan () <- liftIO newChan
1256+ let
1257+ preSwitchover = checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0--><!--replace-end-0-->|after"
1258+ check () = do
1259+ liftIO $ writeChan replaceChan () -- trigger creation of p tag
1260+ _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1261+ checkInnerHtml "div" "before|inner2|after"
1262+ testWidget' preSwitchover check $ do
1263+ replace <- triggerEventWithChan replaceChan
1264+ el "div" $ do
1265+ text "before|"
1266+ _ <- runWithReplace (text "inner1" *> comment "replace-end-0") $ text "inner2" <$ replace
1267+ text "|after"
1268+ void $ runWithReplace blank $ el "p" blank <$ replace -- Signal tag for end of test
1269+ -- TODO This test actually causes a hydration failure, but it wasn't
1270+ -- previously detected, so I've marked it pending
1271+ xit "ignores missing ending bracketing comments" $ runWD $ do
1272+ replaceChan :: Chan () <- liftIO newChan
1273+ let
1274+ preSwitchover = do
1275+ checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0-->|after"
1276+ divEl <- findElemWithRetry (WD.ByTag "div")
1277+ let wrongHtml = "<!--replace-start-0-->inner1"
1278+ actualHtml :: String <- WD.executeJS
1279+ [WD.JSArg divEl, WD.JSArg wrongHtml]
1280+ "arguments[0].innerHTML = arguments[1]; return arguments[0].innerHTML"
1281+ actualHtml `shouldBe` wrongHtml
1282+ check () = do
1283+ liftIO $ writeChan replaceChan () -- trigger creation of p tag
1284+ _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1285+ checkInnerHtml "div" "before|<p>inner2</p>|after"
1286+ testWidget' preSwitchover check $ do
1287+ replace <- triggerEventWithChan replaceChan
1288+ el "div" $ do
1289+ text "before|"
1290+ _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1291+ text "|after"
1292+
920− describe "traverseDMapWithKeyWithAdjust" $ session' $ do
1293+ session' "traverseDMapWithKeyWithAdjust" $ do
921 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
1294 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
922 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1295 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
923 elClass "span" "key" $ text $ textKey k
1296 elClass "span" "key" $ text $ textKey k
@@ -926,8 +1299,8 @@ tests withDebugging wdConfig caps _selenium = do
926 checkItem :: WD.Element -> Text -> Text -> WD ()
1299 checkItem :: WD.Element -> Text -> Text -> WD ()
927 checkItem li k v = do
1300 checkItem li k v = do
928 putStrLnDebug "checkItem"
1301 putStrLnDebug "checkItem"
929− shouldContainTextNoRetry k =<< (WD.findElemFrom li (WD.ByClass "key"))
1302+ shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
930− shouldContainTextNoRetry v =<< (WD.findElemFrom li (WD.ByClass "value"))
1303+ shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
931 checkInitialItems dm xs = do
1304 checkInitialItems dm xs = do
932 putStrLnDebug "checkInitialItems"
1305 putStrLnDebug "checkInitialItems"
933 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1306 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
@@ -957,26 +1330,26 @@ tests withDebugging wdConfig caps _selenium = do
957 postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
1330 postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
958 it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1331 it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
959 chan <- liftIO newChan
1332 chan <- liftIO newChan
960− let static :: WD [WD.Element]
1333+ let preSwitchover :: WD [WD.Element]
961− static = getAndCheckInitialItems keyMap
1334+ preSwitchover = getAndCheckInitialItems keyMap
962 check :: [WD.Element] -> WD ()
1335 check :: [WD.Element] -> WD ()
963 check xs = do
1336 check xs = do
964 checkInitialItems keyMap xs
1337 checkInitialItems keyMap xs
965 checkRemoval chan Key_Int
1338 checkRemoval chan Key_Int
966 checkReplace chan Key_Char 'B'
1339 checkReplace chan Key_Char 'B'
967 checkInsert chan Key_Bool True
1340 checkInsert chan Key_Bool True
968− testWidget' static check $ do
1341+ testWidget' preSwitchover check $ do
969 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
1342 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
970 liftIO $ dmap `H.shouldBe` keyMap
1343 liftIO $ dmap `H.shouldBe` keyMap
971 it "handles postBuild correctly" $ runWD $ do
1344 it "handles postBuild correctly" $ runWD $ do
972 chan <- liftIO newChan
1345 chan <- liftIO newChan
973− let static = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1346+ let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
974 check xs = do
1347 check xs = do
975 withRetry $ checkInitialItems (applyAlways postBuildPatch keyMap) xs
1348 withRetry $ checkInitialItems (applyAlways postBuildPatch keyMap) xs
976 checkRemoval chan Key_Int
1349 checkRemoval chan Key_Int
977 checkInsert chan Key_Char 'B'
1350 checkInsert chan Key_Char 'B'
978 checkReplace chan Key_Bool True
1351 checkReplace chan Key_Bool True
979− testWidget' static check $ void $ do
1352+ testWidget' preSwitchover check $ void $ do
980 pb <- getPostBuild
1353 pb <- getPostBuild
981 replace <- triggerEventWithChan chan
1354 replace <- triggerEventWithChan chan
982 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
1355 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1020,7 +1393,7 @@ tests withDebugging wdConfig caps _selenium = do
1020 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
1393 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
1021 liftIO $ dmap `H.shouldBe` keyMap
1394 liftIO $ dmap `H.shouldBe` keyMap
1022
1395
1023− describe "traverseIntMapWithKeyWithAdjust" $ session' $ do
1396+ session' "traverseIntMapWithKeyWithAdjust" $ do
1024 let textKeyInt k = "key" <> T.pack (show k)
1397 let textKeyInt k = "key" <> T.pack (show k)
1025 intMap = IntMap.fromList
1398 intMap = IntMap.fromList
1026 [ (1, "one")
1399 [ (1, "one")
@@ -1066,24 +1439,24 @@ tests withDebugging wdConfig caps _selenium = do
1066 postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
1439 postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
1067 xit "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1440 xit "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1068 chan <- liftIO newChan
1441 chan <- liftIO newChan
1069− let static = getAndCheckInitialItems intMap
1442+ let preSwitchover = getAndCheckInitialItems intMap
1070 check xs = do
1443 check xs = do
1071 checkInitialItems intMap xs
1444 checkInitialItems intMap xs
1072 checkRemoval chan 1
1445 checkRemoval chan 1
1073 checkReplace chan 2 "deux"
1446 checkReplace chan 2 "deux"
1074 checkInsert chan 4 "four"
1447 checkInsert chan 4 "four"
1075− testWidget' static check $ void $ do
1448+ testWidget' preSwitchover check $ void $ do
1076 (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
1449 (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
1077 liftIO $ im `H.shouldBe` intMap
1450 liftIO $ im `H.shouldBe` intMap
1078 xit "handles postBuild correctly" $ runWD $ do
1451 xit "handles postBuild correctly" $ runWD $ do
1079 chan <- liftIO newChan
1452 chan <- liftIO newChan
1080− let static = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1453+ let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1081 check xs = do
1454 check xs = do
1082 withRetry $ checkInitialItems (applyAlways postBuildPatch intMap) xs
1455 withRetry $ checkInitialItems (applyAlways postBuildPatch intMap) xs
1083 checkRemoval chan 1
1456 checkRemoval chan 1
1084 checkInsert chan 2 "deux"
1457 checkInsert chan 2 "deux"
1085 checkReplace chan 3 "trois"
1458 checkReplace chan 3 "trois"
1086− testWidget' static check $ void $ do
1459+ testWidget' preSwitchover check $ void $ do
1087 pb <- getPostBuild
1460 pb <- getPostBuild
1088 replace <- triggerEventWithChan chan
1461 replace <- triggerEventWithChan chan
1089 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
1462 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1127,7 +1500,7 @@ tests withDebugging wdConfig caps _selenium = do
1127 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
1500 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
1128 liftIO $ dmap `H.shouldBe` intMap
1501 liftIO $ dmap `H.shouldBe` intMap
1129
1502
1130− describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do
1503+ session' "traverseDMapWithKeyWithAdjustWithMove" $ do
1131 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
1504 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
1132 widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
1505 widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
1133 elClass "span" "key" $ text $ textKey2 k
1506 elClass "span" "key" $ text $ textKey2 k
@@ -1139,8 +1512,8 @@ tests withDebugging wdConfig caps _selenium = do
1139 Key2_Char c -> "c" <> T.pack [c]
1512 Key2_Char c -> "c" <> T.pack [c]
1140 checkItem :: WD.Element -> Text -> Text -> WD ()
1513 checkItem :: WD.Element -> Text -> Text -> WD ()
1141 checkItem li k v = do
1514 checkItem li k v = do
1142− shouldContainTextNoRetry k =<< (WD.findElemFrom li (WD.ByClass "key"))
1515+ shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1143− shouldContainTextNoRetry v =<< (WD.findElemFrom li (WD.ByClass "value"))
1516+ shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
1144 checkInitialItems dm xs = do
1517 checkInitialItems dm xs = do
1145 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1518 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1146 forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey2 k) (T.pack $ has @Show k $ show v)
1519 forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey2 k) (T.pack $ has @Show k $ show v)
@@ -1148,6 +1521,9 @@ tests withDebugging wdConfig caps _selenium = do
1148 xs <- WD.findElems (WD.ByTag "li")
1521 xs <- WD.findElems (WD.ByTag "li")
1149 checkInitialItems dm xs
1522 checkInitialItems dm xs
1150 pure xs
1523 pure xs
1524+ moveSpec
1525+ :: (DMap Key2 Identity -> (WD.Element -> Chan (PatchDMapWithMove Key2 Identity) -> WD ()) -> WD ())
1526+ -> H.SpecM (WdTestSession ()) ()
1151 moveSpec testMove = do
1527 moveSpec testMove = do
1152 it "can insert an item" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 3 ==> 3]) $ \body chan -> do
1528 it "can insert an item" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 3 ==> 3]) $ \body chan -> do
1153 shouldContainText (T.strip $ T.unlines ["i11","i33"]) body
1529 shouldContainText (T.strip $ T.unlines ["i11","i33"]) body
@@ -1175,19 +1551,19 @@ tests withDebugging wdConfig caps _selenium = do
1175
1551
1176 describe "hydration" $ moveSpec $ \initMap test -> do
1552 describe "hydration" $ moveSpec $ \initMap test -> do
1177 chan <- liftIO newChan
1553 chan <- liftIO newChan
1178− let static = getAndCheckInitialItems initMap
1554+ let preSwitchover = getAndCheckInitialItems initMap
1179 check xs = do
1555 check xs = do
1180 checkInitialItems initMap xs
1556 checkInitialItems initMap xs
1181 body <- getBody
1557 body <- getBody
1182 test body chan
1558 test body chan
1183− testWidget' static check $ void $ do
1559+ testWidget' preSwitchover check $ void $ do
1184 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
1560 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
1185 liftIO $ assertEqual "DMap" initMap dmap
1561 liftIO $ assertEqual "DMap" initMap dmap
1186
1562
1187 describe "hydration/immediate" $ moveSpec $ \initMap test -> do
1563 describe "hydration/immediate" $ moveSpec $ \initMap test -> do
1188 chan <- liftIO newChan
1564 chan <- liftIO newChan
1189 replace <- liftIO newChan
1565 replace <- liftIO newChan
1190− lock <- liftIO newEmptyMVar
1566+ lock :: MVar () <- liftIO newEmptyMVar
1191 let check = do
1567 let check = do
1192 liftIO $ do
1568 liftIO $ do
1193 writeChan replace ()
1569 writeChan replace ()
@@ -1204,12 +1580,14 @@ tests withDebugging wdConfig caps _selenium = do
1204 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
1580 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
1205 liftIO $ assertEqual "DMap" initMap dmap
1581 liftIO $ assertEqual "DMap" initMap dmap
1206
1582
1207− describe "hydrating invalid HTML" $ session' $ do
1583+ session' "hydrating invalid HTML" $ do
1208− it "can hydrate list in paragraph" $ runWD $ do
1584+ xit "can hydrate list in paragraph" $ runWD $ do
1209− let static = do
1585+ let preSwitchover = do
1210 checkBodyText "before\ninner\nafter"
1586 checkBodyText "before\ninner\nafter"
1211 -- Two <p> tags should be present
1587 -- Two <p> tags should be present
1212− [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)"
1213 ol <- findElemWithRetry (WD.ByTag "ol")
1591 ol <- findElemWithRetry (WD.ByTag "ol")
1214 shouldContainText "before" p1
1592 shouldContainText "before" p1
1215 shouldContainText "inner" ol
1593 shouldContainText "inner" ol
@@ -1220,7 +1598,8 @@ tests withDebugging wdConfig caps _selenium = do
1220 shouldContainText "before\ninner\nafter" p1
1598 shouldContainText "before\ninner\nafter" p1
1221 elementShouldBeRemoved ol
1599 elementShouldBeRemoved ol
1222 elementShouldBeRemoved p2
1600 elementShouldBeRemoved p2
1223− testWidget' static check $ do
1601+ -- Don't fail fatally when hydration encounters the invalid DOM
1602+ testWidgetDebug' False withDebugging preSwitchover check $ do
1224 -- This is deliberately invalid HTML, the browser will interpret it as
1603 -- This is deliberately invalid HTML, the browser will interpret it as
1225 -- <p>before</p><ol>inner</ol>after<p></p>
1604 -- <p>before</p><ol>inner</ol>after<p></p>
1226 el "p" $ do
1605 el "p" $ do
@@ -1228,6 +1607,29 @@ tests withDebugging wdConfig caps _selenium = do
1228 el "ol" $ text "inner"
1607 el "ol" $ text "inner"
1229 text "after"
1608 text "after"
1230
1609
1610+ -- TODO: This test presupposes the exact set of labels that "dropdown" places in the "value" fields to distinguish options.
1611+ -- This dependence on internal implementation details is undesirable in a test case, but seems fairly tricky to avoid.
1612+ -- It seems expedient for the time being to expect this test case to be updated, should those implementation details ever change.
1613+ session' "dropdown" $ do
1614+ let doTest expectedOpts (initialValue :: Text) = do
1615+ let doCheck = do
1616+ es <- findElemsWithRetry $ WD.ByTag "option"
1617+ opts <- mapM fetchElement es
1618+ assertEqual "missing/extra/incorrect option element(s)" expectedOpts (sort opts)
1619+ testWidget doCheck doCheck $ do
1620+ void $ dropdown initialValue (constDyn (("aa" :: Text) =: "aaa" <> "bb" =: "bbb")) def
1621+ fetchElement e = do
1622+ val <- WD.attr e "value"
1623+ sel <- WD.attr e "selected"
1624+ return (fromMaybe "" val, isJust sel)
1625+ -- The "aa" test case is important, but a good test implementation probably needs to avoid selenium, because HTML parsers will insert a "selected" attribute on the first "option" tag if no selected attributes are present; thus as written, this erroneously succeeds on the old implementation (but properly implemented, should fail)
1626+ -- Thus, it would appear that we do actually need a HTML5 or maybe XML parser for this test suite.
1627+ xit "statically renders initial values (on aa)" $ runWD $ do
1628+ doTest [("0",True),("1",False)] "aa"
1629+ -- These tests are currently marked "pending" (by using "xit" instead of "it") because this test has a high chance of non-deterministically failing, which is a problem elsewhere in this test suite as well
1630+ xit "statically renders initial values (on bb)" $ runWD $ do
1631+ doTest [("0",False),("1",True)] "bb"
1632+
1231data Selenium = Selenium
1633data Selenium = Selenium
1232 { _selenium_portNumber :: PortNumber
1634 { _selenium_portNumber :: PortNumber
1233 , _selenium_stopServer :: IO ()
1635 , _selenium_stopServer :: IO ()
@@ -1295,6 +1697,9 @@ checkTextInId i expected = do
1295findElemWithRetry :: Selector -> WD WD.Element
1697findElemWithRetry :: Selector -> WD WD.Element
1296findElemWithRetry = withRetry . WD.findElem
1698findElemWithRetry = withRetry . WD.findElem
1297
1699
1700+findElemsWithRetry :: Selector -> WD [WD.Element]
1701+findElemsWithRetry = withRetry . WD.findElems
1702+
1298getBody :: WD WD.Element
1703getBody :: WD WD.Element
1299getBody = WD.findElem $ WD.ByTag "body"
1704getBody = WD.findElem $ WD.ByTag "body"
1300
1705
@@ -1303,8 +1708,8 @@ withRetry a = wait 300
1303 where wait :: Int -> WD a
1708 where wait :: Int -> WD a
1304 wait 0 = a
1709 wait 0 = a
1305 wait n = try a >>= \case
1710 wait n = try a >>= \case
1306− Left (_ :: SomeException) -> do
1711+ Left (e :: SomeException) -> do
1307− liftIO $ threadDelay 100000
1712+ liftIO $ putStrLn ("(retrying due to " <> show e <> ")") *> threadDelay 100000
1308 wait $ n - 1
1713 wait $ n - 1
1309 Right v -> return v
1714 Right v -> return v
1310
1715
@@ -1320,11 +1725,12 @@ testWidgetStaticDebug
1320 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1725 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1321 -- ^ Widget we are testing
1726 -- ^ Widget we are testing
1322 -> WD b
1727 -> WD b
1323−testWidgetStaticDebug withDebugging w = testWidgetDebug withDebugging (void w) w
1728+testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
1324
1729
1325-- | TODO: do something about JSExceptions not causing tests to fail
1730-- | TODO: do something about JSExceptions not causing tests to fail
1326testWidgetDebug
1731testWidgetDebug
1327 :: Bool
1732 :: Bool
1733+ -> Bool
1328 -> WD ()
1734 -> WD ()
1329 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
1735 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
1330 -> WD b
1736 -> WD b
@@ -1332,12 +1738,16 @@ testWidgetDebug
1332 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1738 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1333 -- ^ Widget we are testing
1739 -- ^ Widget we are testing
1334 -> WD b
1740 -> WD b
1335−testWidgetDebug withDebugging beforeJS afterSwitchover =
1741+testWidgetDebug hardFailure withDebugging beforeJS afterSwitchover =
1336− testWidgetDebug' withDebugging beforeJS (const afterSwitchover)
1742+ testWidgetDebug' hardFailure withDebugging beforeJS (const afterSwitchover)
1743+
1744+data HydrationFailedException = HydrationFailedException deriving Show
1745+instance Exception HydrationFailedException
1337
1746
1338-- | TODO: do something about JSExceptions not causing tests to fail
1747-- | TODO: do something about JSExceptions not causing tests to fail
1339testWidgetDebug'
1748testWidgetDebug'
1340 :: Bool
1749 :: Bool
1750+ -> Bool
1341 -> WD a
1751 -> WD a
1342 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
1752 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
1343 -> (a -> WD b)
1753 -> (a -> WD b)
@@ -1345,7 +1755,7 @@ testWidgetDebug'
1345 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1755 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
1346 -- ^ Widget we are testing (contents of body)
1756 -- ^ Widget we are testing (contents of body)
1347 -> WD b
1757 -> WD b
1348−testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
1758+testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget = do
1349 let putStrLnDebug :: MonadIO m => Text -> m ()
1759 let putStrLnDebug :: MonadIO m => Text -> m ()
1350 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
1760 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
1351 staticApp = do
1761 staticApp = do
@@ -1354,9 +1764,10 @@ testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
1354 bodyWidget
1764 bodyWidget
1355 el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1765 el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1356 putStrLnDebug "rendering static"
1766 putStrLnDebug "rendering static"
1357− ((), html) <- liftIO $ renderStatic staticApp
1767+ ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
1358 putStrLnDebug "rendered static"
1768 putStrLnDebug "rendered static"
1359 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1769 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770+ onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
1360 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
1771 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
1361 let entryPoint = do
1772 let entryPoint = do
1362 putStrLnDebug "taking waitBeforeJS"
1773 putStrLnDebug "taking waitBeforeJS"
@@ -1368,7 +1779,7 @@ testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
1368 liftIO $ putMVar waitUntilSwitchover ()
1779 liftIO $ putMVar waitUntilSwitchover ()
1369 putStrLnDebug "put waitUntilSwitchover"
1780 putStrLnDebug "put waitUntilSwitchover"
1370 putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1781 putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1371− mainHydrationWidgetWithSwitchoverAction switchOverAction blank bodyWidget
1782+ mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget
1372 putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
1783 putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
1373 syncPoint
1784 syncPoint
1374 application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
1785 application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
@@ -1386,23 +1797,26 @@ testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
1386 ]
1797 ]
1387 -- hSilence to get rid of ConnectionClosed logs
1798 -- hSilence to get rid of ConnectionClosed logs
1388 silenceIfDebug = if withDebugging then id else hSilence [stderr]
1799 silenceIfDebug = if withDebugging then id else hSilence [stderr]
1389− jsaddleWarp = forkIO $ silenceIfDebug $ Warp.runSettings settings application
1800+ jsaddleWarp = silenceIfDebug $ Warp.runSettings settings application
1390− jsaddleTid <- liftIO jsaddleWarp
1801+ withAsync' jsaddleWarp $ do
1391− putStrLnDebug "taking waitJSaddle"
1802+ putStrLnDebug "taking waitJSaddle"
1392− liftIO $ takeMVar waitJSaddle
1803+ liftIO $ takeMVar waitJSaddle
1393− putStrLnDebug "opening page"
1804+ putStrLnDebug "opening page"
1394− WD.openPage $ "http://localhost:" <> show jsaddlePort
1805+ WD.openPage $ "http://localhost:" <> show jsaddlePort
1395− putStrLnDebug "running beforeJS"
1806+ putStrLnDebug "running beforeJS"
1396− a <- beforeJS
1807+ a <- beforeJS
1397− putStrLnDebug "putting waitBeforeJS"
1808+ putStrLnDebug "putting waitBeforeJS"
1398− liftIO $ putMVar waitBeforeJS ()
1809+ liftIO $ putMVar waitBeforeJS ()
1399− putStrLnDebug "taking waitUntilSwitchover"
1810+ putStrLnDebug "taking waitUntilSwitchover"
1400− liftIO $ takeMVar waitUntilSwitchover
1811+ liftIO $ takeMVar waitUntilSwitchover
1401− putStrLnDebug "running afterSwitchover"
1812+ putStrLnDebug "running afterSwitchover"
1402− b <- afterSwitchover a
1813+ afterSwitchover a
1403− putStrLnDebug "killing jsaddle thread"
1814+
1404− liftIO $ killThread jsaddleTid
1815+withAsync' :: (MonadIO m, MonadMask m) => IO a -> m b -> m b
1405− return b
1816+withAsync' f g = bracket
1817+ (liftIO $ Async.async f)
1818+ (liftIO . Async.uninterruptibleCancel)
1819+ (const g)
1406
1820
1407data Key2 a where
1821data Key2 a where
1408 Key2_Int :: Int -> Key2 Int
1822 Key2_Int :: Int -> Key2 Int
@@ -1412,12 +1826,3 @@ deriveGEq ''Key2
1412deriveGCompare ''Key2
1826deriveGCompare ''Key2
1413deriveGShow ''Key2
1827deriveGShow ''Key2
1414deriveArgDict ''Key2
1828deriveArgDict ''Key2
1415−
1416−instance ShowTag Key2 Identity where
1417− showTaggedPrec = \case
1418− Key2_Int _ -> showsPrec
1419− Key2_Char _ -> showsPrec
1420−
1421−instance EqTag Key2 Identity where
1422− eqTagged (Key2_Int _) (Key2_Int _) = (==)
1423− eqTagged (Key2_Char _) (Key2_Char _) = (==)
reflex-dom-test-selenium/CHANGELOG.mdnew file+5
@@ -0,0 +1,5 @@
1+# Revision history for reflex-dom-core-selenium
2+
3+## 0.1.0.0 -- YYYY-mm-dd
4+
5+* First version. Released on an unsuspecting world.
reflex-dom-test-selenium/LICENSEnew file+12
@@ -0,0 +1,12 @@
1+Copyright (c) 2020, Obsidian Systems LLC
2+All rights reserved.
3+
4+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
5+
6+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
7+
8+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
9+
10+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
11+
12+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
reflex-dom-test-selenium/Setup.hsnew file+2
@@ -0,0 +1,2 @@
1+import Distribution.Simple
2+main = defaultMain
reflex-dom-test-selenium/add-overrides.nixnew file+20
@@ -0,0 +1,20 @@
1+{ nixpkgs }: testPackage:
2+ nixpkgs.haskell.lib.overrideCabal testPackage
3+ (drv: {
4+
5+ # The headless browser run as part of the tests will exit without this
6+ preBuild = ''
7+ export HOME="$PWD"
8+ '';
9+
10+ testSystemDepends = with nixpkgs; (drv.testSystemDepends or []) ++ [
11+ selenium-server-standalone which
12+ chromium
13+ nixpkgs.iproute
14+ ];
15+
16+ # The headless browser run as part of gc tests would hang/crash without this
17+ preCheck = ''
18+ export FONTCONFIG_PATH=${nixpkgs.fontconfig.out}/etc/fonts
19+ '';
20+ })
reflex-dom-test-selenium/reflex-dom-test-selenium.cabalnew file+41
@@ -0,0 +1,41 @@
1+cabal-version: 1.24
2+Name: reflex-dom-test-selenium
3+Version: 0.0.0.1
4+Synopsis: Testing framework for selenium tests
5+Description:
6+License: BSD3
7+License-file: LICENSE
8+Author: Ryan Trinkle
9+Maintainer: ryan.trinkle@gmail.com
10+Stability: Experimental
11+Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
12+Build-type: Simple
13+
14+library
15+ hs-source-dirs: src
16+ build-depends:
17+ async,
18+ base >= 4.7 && < 4.15,
19+ bytestring == 0.10.*,
20+ chrome-test-utils,
21+ exceptions,
22+ hspec-core,
23+ hspec-webdriver >= 1.2.1,
24+ http-types,
25+ jsaddle >= 0.9.0.0 && < 0.10,
26+ jsaddle-warp,
27+ network,
28+ process,
29+ reflex-dom-core,
30+ silently,
31+ text == 1.2.*,
32+ wai,
33+ warp,
34+ webdriver,
35+ websockets
36+
37+ exposed-modules:
38+ Reflex.Dom.Test.Selenium
39+
40+ default-language: Haskell98
41+ ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
reflex-dom-test-selenium/src/Reflex/Dom/Test/Selenium.hsnew file+249
@@ -0,0 +1,249 @@
1+{-# LANGUAGE ConstraintKinds #-}
2+{-# LANGUAGE FlexibleContexts #-}
3+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4+{-# LANGUAGE OverloadedStrings #-}
5+{-# LANGUAGE RankNTypes #-}
6+{-# LANGUAGE ScopedTypeVariables #-}
7+{-# LANGUAGE StandaloneDeriving #-}
8+{-# LANGUAGE TemplateHaskell #-}
9+
10+{-# OPTIONS_GHC -fno-warn-orphans #-}
11+
12+-- | Utilities for testing reflex-dom widgets with Selenium.
13+--
14+-- Any uses of the 'testWidget' functions will start a jsaddle warp server and
15+-- serve the given widget in an otherwise empty page. Webdriver commands can run
16+-- on the statically rendered page, and on the hydrated page.
17+module Reflex.Dom.Test.Selenium
18+ ( TestWidget
19+ , TestWidgetConfig (..)
20+ , testWidget, testWidget', testWidgetStatic, testWidgetHydrated
21+ , withSeleniumSpec
22+ , embedSpec
23+ , SeleniumSetupConfig (..)
24+ ) where
25+
26+import Control.Concurrent (threadDelay, newEmptyMVar, takeMVar, putMVar)
27+import Control.Exception (throwIO)
28+import Control.Monad (when)
29+import Control.Monad.Catch (MonadMask, handle)
30+import Control.Monad.Fix (MonadFix)
31+import Control.Monad.IO.Class (MonadIO, liftIO)
32+import Data.Text (Text)
33+import Language.Javascript.JSaddle
34+import Language.Javascript.JSaddle.Warp
35+import Network.HTTP.Types (status200)
36+import Network.Socket (PortNumber)
37+import Network.Wai (responseLBS)
38+import Network.WebSockets (defaultConnectionOptions)
39+import Reflex.Dom.Core
40+import System.IO (stderr)
41+import System.IO.Silently (hSilence)
42+import System.Process (std_in, std_out, std_err, createProcess, proc, StdStream (..), terminateProcess)
43+import Test.Hspec.WebDriver (Spec, SpecWith, WdTestSession, sessionWith, using)
44+import Test.Util.ChromeFlags
45+import Test.Util.UnshareNetwork
46+import Test.WebDriver (WD)
47+
48+import qualified Control.Concurrent.Async as Async
49+import qualified Data.ByteString.Lazy as LBS
50+import qualified Data.Text as T
51+import qualified Data.Text.Encoding as TE
52+import qualified Network.Wai.Handler.Warp as Warp
53+import qualified Test.Hspec.Core.Spec as Hspec
54+import qualified Test.WebDriver as WD
55+import qualified Test.WebDriver.Capabilities as WD
56+
57+deriving instance MonadMask WD
58+
59+data SeleniumSetupConfig = SeleniumSetupConfig
60+ { _seleniumSetupConfig_chromiumPath :: FilePath
61+ -- ^ Path to the chromium executable
62+ , _seleniumSetupConfig_headless :: Bool
63+ -- ^ True means that the browser is invoked in headless mode, False means that
64+ -- the user can see the interaction happening on the browser (useful for debugging).
65+ , _seleniumSetupConfig_seleniumPort :: PortNumber
66+ -- ^ The port number used by selenium
67+ }
68+
69+-- | Setup a selenium server and use it to run some hspec tests.
70+--
71+-- withSeleniumSpec config $ \runSession -> hspec $ do
72+-- describe "tests using webdriver session" $ runSession $ do
73+-- webdriver tests here
74+withSeleniumSpec :: SeleniumSetupConfig -> ((forall multi. SpecWith (WdTestSession multi) -> Spec) -> IO a) -> IO a
75+withSeleniumSpec config runSpec = do
76+ liftIO $ handle (\(_ :: IOError) -> return ()) $ unshareNetork -- If we run into an exception with sandboxing, just don't bother
77+ withSandboxedChromeFlags (_seleniumSetupConfig_headless config) $ \chromeFlags -> do
78+ withSeleniumServer (_seleniumSetupConfig_seleniumPort config) $ do
79+ let browserPath = T.strip $ T.pack $ _seleniumSetupConfig_chromiumPath config
80+ when (T.null browserPath) $ fail "No browser found"
81+ let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _seleniumSetupConfig_seleniumPort config }
82+ chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
83+ runSpec $ sessionWith wdConfig "" . using [(chromeCaps', "chrome")]
84+
85+startSeleniumServer :: PortNumber -> IO (IO ())
86+startSeleniumServer port = do
87+ (_,_,_,ph) <- createProcess $ (proc "selenium-server" ["-port", show port])
88+ { std_in = NoStream
89+ , std_out = NoStream
90+ , std_err = NoStream
91+ }
92+ return $ terminateProcess ph
93+
94+withSeleniumServer :: PortNumber -> IO a -> IO a
95+withSeleniumServer port f = bracket (startSeleniumServer port) id $ \_ -> do
96+ threadDelay $ 1000 * 1000 * 2 -- TODO poll or wait on a a signal to block on
97+ f
98+
99+chromeConfig :: Text -> [Text] -> WD.WDConfig
100+chromeConfig fp flags =
101+ WD.useBrowser
102+ (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags })
103+ WD.defaultConfig
104+
105+--------------------------------------------------------------------------------
106+-- Function to test widgets
107+--------------------------------------------------------------------------------
108+
109+-- | The environment in which your widgets can be tested
110+type TestWidget js t m =
111+ (DomBuilder t m, MonadHold t m, PostBuild t m
112+ , Prerender js t m, PerformEvent t m, TriggerEvent t m
113+ , MonadFix m, MonadIO (Performable m), MonadIO m)
114+
115+-- | Configuration of individual tests
116+data TestWidgetConfig = TestWidgetConfig
117+ { _testWidgetConfig_debug :: Bool
118+ -- ^ If this flag is set to True, during the test we will emit debug messages
119+ , _testWidgetConfig_headWidget :: (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
120+ -- ^ We can add widgets here that will be included in the head of the page
121+ -- (useful for example to include external js libraries in the tests)
122+ , _testWidgetConfig_jsaddlePort :: PortNumber
123+ -- ^ Port used by the jsaddle server
124+ }
125+
126+-- | Test a widget by running some webdriver commands before and after
127+-- hydration.
128+testWidget
129+ :: TestWidgetConfig
130+ -> WD a
131+ -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
132+ -> WD b
133+ -- ^ Webdriver commands to run after hydration switchover
134+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
135+ -- ^ Widget we are testing (contents of body)
136+ -> WD b
137+testWidget cfg before after widget = testWidget' cfg before (const after) widget
138+
139+-- | Test a widget by running some webdriver commands before hydration (on the
140+-- statically rendered page).
141+testWidgetStatic
142+ :: TestWidgetConfig
143+ -> WD a
144+ -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
145+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
146+ -- ^ Widget we are testing (contents of body)
147+ -> WD a
148+testWidgetStatic cfg before widget = testWidget' cfg before pure widget
149+
150+-- | Test a widget by running some webdriver commands after hydration.
151+testWidgetHydrated
152+ :: TestWidgetConfig
153+ -> WD b
154+ -- ^ Webdriver commands to run after hydration switchover
155+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
156+ -- ^ Widget we are testing (contents of body)
157+ -> WD b
158+testWidgetHydrated cfg after widget = testWidget' cfg (pure ()) (const after) widget
159+
160+-- | Test a widget by running some webdriver commands before and after
161+-- hydration. Like 'testWidget', but you can use the result of the webdriver
162+-- commands from before hydration in the post hydration test.
163+testWidget'
164+ :: TestWidgetConfig
165+ -> WD a
166+ -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
167+ -> (a -> WD b)
168+ -- ^ Webdriver commands to run after hydration switchover
169+ -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
170+ -- ^ Widget we are testing (contents of body)
171+ -> WD b
172+testWidget' (TestWidgetConfig withDebugging headWidget jsaddlePort) beforeJS afterSwitchover bodyWidget = do
173+ let putStrLnDebug :: MonadIO m => Text -> m ()
174+ putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
175+ staticApp = do
176+ el "head" $ headWidget
177+ el "body" $ do
178+ bodyWidget
179+ el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
180+ putStrLnDebug "rendering static"
181+ ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
182+ putStrLnDebug "rendered static"
183+ waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
184+ waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
185+ let entryPoint = do
186+ putStrLnDebug "taking waitBeforeJS"
187+ liftIO $ takeMVar waitBeforeJS
188+ let switchOverAction = do
189+ putStrLnDebug "switchover syncPoint"
190+ syncPoint
191+ putStrLnDebug "putting waitUntilSwitchover"
192+ liftIO $ putMVar waitUntilSwitchover ()
193+ putStrLnDebug "put waitUntilSwitchover"
194+ putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
195+ mainHydrationWidgetWithSwitchoverAction switchOverAction blank bodyWidget
196+ putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
197+ syncPoint
198+ application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
199+ putStrLnDebug "sending response"
200+ r <- sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
201+ putStrLnDebug "sent response"
202+ return r
203+ waitJSaddle <- liftIO newEmptyMVar
204+ let settings = foldr ($) Warp.defaultSettings
205+ [ Warp.setPort $ fromIntegral $ toInteger jsaddlePort
206+ , Warp.setBeforeMainLoop $ do
207+ putStrLnDebug "putting waitJSaddle"
208+ putMVar waitJSaddle ()
209+ putStrLnDebug "put waitJSaddle"
210+ ]
211+ -- hSilence to get rid of ConnectionClosed logs
212+ silenceIfNotDebugging = if withDebugging then id else hSilence [stderr]
213+ jsaddleWarp = silenceIfNotDebugging $ Warp.runSettings settings application
214+ withAsync' jsaddleWarp $ do
215+ putStrLnDebug "taking waitJSaddle"
216+ liftIO $ takeMVar waitJSaddle
217+ putStrLnDebug "opening page"
218+ WD.openPage $ "http://localhost:" <> show jsaddlePort
219+ putStrLnDebug "running beforeJS"
220+ a <- beforeJS
221+ putStrLnDebug "putting waitBeforeJS"
222+ liftIO $ putMVar waitBeforeJS ()
223+ putStrLnDebug "taking waitUntilSwitchover"
224+ liftIO $ takeMVar waitUntilSwitchover
225+ putStrLnDebug "running afterSwitchover"
226+ afterSwitchover a
227+
228+--------------------------------------------------------------------------------
229+-- Utilities
230+--------------------------------------------------------------------------------
231+
232+-- | Embed a different spec type by evaluating it directly.
233+embedSpec :: (Hspec.Example a, MonadIO m) => Hspec.Arg a -> a -> m ()
234+embedSpec arg spec = liftIO $ do
235+ Hspec.Result _info status <- Hspec.evaluateExample
236+ spec
237+ Hspec.defaultParams
238+ (\actionWith -> actionWith arg)
239+ (\_ -> pure ())
240+ case status of
241+ Hspec.Success -> pure ()
242+ Hspec.Pending _ _ -> pure () -- should not happen
243+ failure -> throwIO failure
244+
245+withAsync' :: (MonadIO m, MonadMask m) => IO a -> m b -> m b
246+withAsync' f g = bracket
247+ (liftIO $ Async.async f)
248+ (liftIO . Async.uninterruptibleCancel)
249+ (const g)
reflex-dom/ChangeLog.mdnew file+42
@@ -0,0 +1,42 @@
1+# Revision history for reflex-dom
2+
3+## 0.6.1.0-r1
4+
5+* Loosen reflex-dom-core version bounds
6+
7+## 0.6.1.0
8+
9+* Update for new dependent-map and dependent-sum (after the "some" package split)
10+
11+## 0.6.0.0
12+
13+* ([#379](https://github.com/reflex-frp/reflex-dom/pull/379)) Re-export all modules from `reflex-dom-core`. The newly re-exported modules are:
14+ * `Foreign.JavaScript.Utils`
15+ * `Reflex.Dom.Builder.Hydratable`
16+ * `Reflex.Dom.Modals.Class`
17+ * `Reflex.Dom.Prerender`
18+ * `Reflex.Dom.Time`
19+ * `Reflex.Dom.WebSocket.Query`
20+ * `Reflex.Dom.Xhr.FormData`
21+* ([#366](https://github.com/reflex-frp/reflex-dom/pull/366)) Bump bounds for `reflex` to include 0.7.
22+
23+## 0.5.3
24+
25+* On Android, enable prompting the user for geolocation
26+ permissions on demand by default. See
27+ https://developer.android.com/reference/android/webkit/WebChromeClient.html#onGeolocationPermissionsShowPrompt(java.lang.String,%20android.webkit.GeolocationPermissions.Callback)
28+ for details.
29+
30+ * Add `< 0.7` upper bound for reflex
31+
32+## 0.5.2
33+
34+* The default jsaddle backend on macOS when built from nix
35+ is now jsaddle-wkwebview, matching the behaviour of cabal
36+ builds.
37+
38+## 0.5
39+
40+* Re-export new hydration widget "mainWidget" functions.
41+
42+* The use-warp flag now properly takes precedence on macOS.
reflex-dom/LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2015, Obsidian Systems LLC
1+Copyright (c) 2020, Obsidian Systems LLC
2All rights reserved.
2All rights reserved.
3
3
4Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4Redistribution 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
15import Reflex.Dom
15import Reflex.Dom
16import System.Random
16import System.Random
17import qualified Data.Map as Map
17import qualified Data.Map as Map
18−import Data.Dependent.Map (DMap (..), DSum (..))
18+import Data.Dependent.Map (DMap (..))
19import qualified Data.Dependent.Map as DMap
19import qualified Data.Dependent.Map as DMap
20+import Data.Dependent.Sum (DSum (..))
20import Data.Functor.Misc
21import Data.Functor.Misc
21import Data.Functor.Identity
22import Data.Functor.Identity
22import Data.Functor.Compose
23import Data.Functor.Compose
reflex-dom/default.nixdeleted−37
@@ -1,37 +0,0 @@
1−{ mkDerivation, base, bytestring, jsaddle-webkit2gtk, jsaddle-wkwebview, jsaddle-warp, reflex
2−, reflex-dom-core, stdenv, text, ghc, hostPlatform, jsaddle-clib, android-activity ? null
3−, ghcBackend ? if hostPlatform.isDarwin then "warp" else "webkit2gtk"
4−}:
5−assert (builtins.elem ghcBackend [ "warp" "webkit2gtk" ]);
6−let isAndroid = hostPlatform.libc == "bionic";
7− ghcBackendPackage = {
8− webkit2gtk = jsaddle-webkit2gtk;
9− warp = jsaddle-warp;
10− }.${ghcBackend};
11−in mkDerivation {
12− pname = "reflex-dom";
13− version = "0.4";
14− src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
15− libraryHaskellDepends = [
16− base bytestring reflex reflex-dom-core text
17− ] ++ (if ghc.isGhcjs or false then [
18− ] else if hostPlatform.isiOS then [
19− jsaddle-wkwebview
20− ] else if isAndroid then [
21− jsaddle-clib
22− android-activity
23− ] else if hostPlatform.isMacOS then [
24− jsaddle-wkwebview
25− ghcBackendPackage
26− ] else [
27− ghcBackendPackage
28− ]);
29− configureFlags = if isAndroid then [
30− "-fandroid"
31− ] else if ghcBackend == "warp" then [
32− "-fuse-warp"
33− ] else [
34− ];
35− description = "Functional Reactive Web Apps with Reflex";
36− license = stdenv.lib.licenses.bsd3;
37−}
reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java+14−1
@@ -8,6 +8,7 @@ import android.util.Log;
8import android.view.ViewGroup.LayoutParams;
8import android.view.ViewGroup.LayoutParams;
9import android.view.Window;
9import android.view.Window;
10import android.webkit.CookieManager;
10import android.webkit.CookieManager;
11+import android.webkit.GeolocationPermissions;
11import android.webkit.JavascriptInterface;
12import android.webkit.JavascriptInterface;
12import android.webkit.MimeTypeMap;
13import android.webkit.MimeTypeMap;
13import android.webkit.PermissionRequest;
14import android.webkit.PermissionRequest;
@@ -22,6 +23,7 @@ import java.io.IOException;
22import java.io.InputStream;
23import java.io.InputStream;
23import android.content.Intent;
24import android.content.Intent;
24import android.content.ActivityNotFoundException;
25import android.content.ActivityNotFoundException;
26+import java.util.concurrent.atomic.AtomicBoolean;
25
27
26import java.nio.charset.StandardCharsets;
28import java.nio.charset.StandardCharsets;
27
29
@@ -45,11 +47,17 @@ public class MainWidget {
45 wv.setWebContentsDebuggingEnabled(true);
47 wv.setWebContentsDebuggingEnabled(true);
46 // allow video to play without user interaction
48 // allow video to play without user interaction
47 wv.getSettings().setMediaPlaybackRequiresUserGesture(false);
49 wv.getSettings().setMediaPlaybackRequiresUserGesture(false);
50+ final AtomicBoolean jsaddleLoaded = new AtomicBoolean(false);
48
51
49 wv.setWebViewClient(new WebViewClient() {
52 wv.setWebViewClient(new WebViewClient() {
50 @Override
53 @Override
51 public void onPageFinished(WebView _view, String _url) {
54 public void onPageFinished(WebView _view, String _url) {
55+ Log.i("reflex", "onPageFinished");
56+ boolean alreadyLoaded = jsaddleLoaded.getAndSet(true);
57+ if(!alreadyLoaded) {
58+ Log.i("reflex", "loading jsaddle");
52− wv.evaluateJavascript(initialJS, null);
59+ wv.evaluateJavascript(initialJS, null);
60+ }
53 }
61 }
54
62
55 // Re-route / to /android_asset
63 // Re-route / to /android_asset
@@ -115,6 +123,11 @@ public class MainWidget {
115 public Bitmap getDefaultVideoPoster() {
123 public Bitmap getDefaultVideoPoster() {
116 return Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
124 return Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
117 }
125 }
126+
127+ @Override
128+ public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) {
129+ callback.invoke(origin, true, false);
130+ }
118 });
131 });
119
132
120 wv.addJavascriptInterface(new JSaddleCallbacks(jsaddleCallbacks), "jsaddle");
133 wv.addJavascriptInterface(new JSaddleCallbacks(jsaddleCallbacks), "jsaddle");
reflex-dom/reflex-dom.cabal+76−28
@@ -1,10 +1,20 @@
1+cabal-version: 1.24
1Name: reflex-dom
2Name: reflex-dom
2−Version: 0.4
3+Version: 0.6.1.0
3Synopsis: Functional Reactive Web Apps with Reflex
4Synopsis: Functional Reactive Web Apps with Reflex
4Description:
5Description:
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.
6 .
9 .
10+ Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine: <https://reflex-frp.org/>.
11+ .
12+ The @reflex-dom@ package is a small wrapper around the @reflex-dom-core@ package. It pulls in the
13+ correct set of dependencies for each target platform (GHCJS, WebKitGTK, WASM, mobile, etc.).
14+ Libraries should depend on @reflex-dom-core@ and executables will usually depend on @reflex-dom@.
15+ All of @reflex-dom-core@'s modules are re-exported by @reflex-dom@.
16+ .
7− For hackage documentation, please see: <https://hackage.haskell.org/package/reflex-dom-core>.
17+ For Hackage documentation, please see: <https://hackage.haskell.org/package/reflex-dom-core>.
8License: BSD3
18License: BSD3
9License-file: LICENSE
19License-file: LICENSE
10Author: Ryan Trinkle
20Author: Ryan Trinkle
@@ -12,8 +22,9 @@ Maintainer: ryan.trinkle@gmail.com
12Stability: Experimental
22Stability: Experimental
13Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
23Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
14Build-type: Simple
24Build-type: Simple
15−cabal-version: >=1.24
25+extra-source-files:
16−extra-source-files: java/org/reflexfrp/reflexdom/MainWidget.java
26+ java/org/reflexfrp/reflexdom/MainWidget.java
27+ ChangeLog.md
17
28
18flag use-warp
29flag use-warp
19 description: Use jsaddle-warp server
30 description: Use jsaddle-warp server
@@ -39,60 +50,67 @@ flag build-examples
39 default: False
50 default: False
40 manual: True
51 manual: True
41
52
42−flag android
53+flag wasm32
43− description: Build an Android app
54+ description: Build for wasm32 architecture
44 default: False
55 default: False
45 manual: True
56 manual: True
46
57
47library
58library
48 hs-source-dirs: src
59 hs-source-dirs: src
49− if flag(android)
60+ if os(android)
50 hs-source-dirs: src-android
61 hs-source-dirs: src-android
51 other-modules: Reflex.Dom.Android.MainWidget
62 other-modules: Reflex.Dom.Android.MainWidget
52 build-depends:
63 build-depends:
53− aeson,
64+ aeson >= 1.4 && < 1.6,
54 android-activity == 0.1.*,
65 android-activity == 0.1.*,
55 data-default == 0.7.*,
66 data-default == 0.7.*,
56− jsaddle
67+ jsaddle >= 0.9.6 && < 0.10
57 c-sources: cbits/MainWidget.c
68 c-sources: cbits/MainWidget.c
58 include-dirs: cbits/include
69 include-dirs: cbits/include
59 install-includes: MainWidget.h
70 install-includes: MainWidget.h
60 cpp-options: -DANDROID
71 cpp-options: -DANDROID
61 build-tools: hsc2hs
72 build-tools: hsc2hs
62 build-depends:
73 build-depends:
63− base >= 4.7 && < 4.12,
74+ base >= 4.7 && < 4.15,
64 bytestring == 0.10.*,
75 bytestring == 0.10.*,
65− reflex == 0.5.*,
76+ reflex >= 0.8 && < 0.9,
66− reflex-dom-core >=0.4 && <0.5,
77+ reflex-dom-core >= 0.6.1.0 && <0.7,
67 text == 1.2.*
78 text == 1.2.*
68 if !impl(ghcjs)
79 if !impl(ghcjs)
69− if os(osx) || os(ios)
80+ if flag(use-warp) && (os(linux) || os(osx))
70 build-depends:
81 build-depends:
71− data-default == 0.7.*,
82+ jsaddle >= 0.9.6 && < 0.10,
72− jsaddle,
73− jsaddle-wkwebview
83+ jsaddle-warp >= 0.9.6 && < 0.10
74 else
84 else
75− if flag(use-warp)
85+ if os(osx) || os(ios)
76 build-depends:
86 build-depends:
87+ data-default == 0.7.*,
77− jsaddle,
88+ jsaddle >= 0.9.6 && < 0.10,
78− jsaddle-warp
89+ jsaddle-wkwebview >= 0.9.6 && < 0.10
79 else
90 else
80− if flag(webkit2gtk)
91+ if flag(wasm32)
81 build-depends:
92 build-depends:
82− jsaddle-webkit2gtk
93+ jsaddle >= 0.9.6 && < 0.10,
94+ jsaddle-wasm >= 0.1 && < 0.2
83 else
95 else
84− if !flag(android)
96+ if flag(webkit2gtk)
85 build-depends:
97 build-depends:
86− jsaddle-webkit2gtk
98+ jsaddle-webkit2gtk >= 0.9.6 && < 0.10
99+ else
100+ if !os(android)
101+ build-depends:
102+ jsaddle-webkit2gtk >= 0.9.6 && < 0.10
87
103
88 exposed-modules:
104 exposed-modules:
89 Reflex.Dom
105 Reflex.Dom
90 Reflex.Dom.Internal
106 Reflex.Dom.Internal
91 reexported-modules:
107 reexported-modules:
92− Foreign.JavaScript.TH
108+ Foreign.JavaScript.Orphans
93− , Foreign.JavaScript.Orphans
109+ , Foreign.JavaScript.TH
110+ , Foreign.JavaScript.Utils
94 , Reflex.Dom.Builder.Class
111 , Reflex.Dom.Builder.Class
95 , Reflex.Dom.Builder.Class.Events
112 , Reflex.Dom.Builder.Class.Events
113+ , Reflex.Dom.Builder.Hydratable
96 , Reflex.Dom.Builder.Immediate
114 , Reflex.Dom.Builder.Immediate
97 , Reflex.Dom.Builder.InputDisabled
115 , Reflex.Dom.Builder.InputDisabled
98 , Reflex.Dom.Builder.Static
116 , Reflex.Dom.Builder.Static
@@ -100,14 +118,19 @@ library
100 , Reflex.Dom.Core
118 , Reflex.Dom.Core
101 , Reflex.Dom.Location
119 , Reflex.Dom.Location
102 , Reflex.Dom.Main
120 , Reflex.Dom.Main
121+ , Reflex.Dom.Modals.Class
103 , Reflex.Dom.Old
122 , Reflex.Dom.Old
123+ , Reflex.Dom.Prerender
124+ , Reflex.Dom.Time
104 , Reflex.Dom.WebSocket
125 , Reflex.Dom.WebSocket
126+ , Reflex.Dom.WebSocket.Query
105 , Reflex.Dom.Widget
127 , Reflex.Dom.Widget
106 , Reflex.Dom.Widget.Basic
128 , Reflex.Dom.Widget.Basic
107 , Reflex.Dom.Widget.Input
129 , Reflex.Dom.Widget.Input
108 , Reflex.Dom.Widget.Lazy
130 , Reflex.Dom.Widget.Lazy
109 , Reflex.Dom.Widget.Resize
131 , Reflex.Dom.Widget.Resize
110 , Reflex.Dom.Xhr
132 , Reflex.Dom.Xhr
133+ , Reflex.Dom.Xhr.FormData
111 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
134 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
112 if flag(expose-all-unfoldings)
135 if flag(expose-all-unfoldings)
113 ghc-options: -fexpose-all-unfoldings
136 ghc-options: -fexpose-all-unfoldings
@@ -139,7 +162,19 @@ executable sortableList
139 default-language: Haskell2010
162 default-language: Haskell2010
140
163
141executable benchmark
164executable benchmark
142− build-depends: base, reflex, reflex-dom, text, prim-uniq, dependent-map, containers, transformers, mtl, ghcjs-dom, ghc-prim, random, dependent-sum
165+ build-depends: base
166+ , containers
167+ , dependent-map
168+ , dependent-sum
169+ , ghc-prim
170+ , ghcjs-dom
171+ , mtl
172+ , prim-uniq
173+ , random
174+ , reflex
175+ , reflex-dom
176+ , text
177+ , transformers
143 hs-source-dirs: .
178 hs-source-dirs: .
144 main-is: benchmark.hs
179 main-is: benchmark.hs
145 ghc-options: -O2 -fspecialise-aggressively
180 ghc-options: -O2 -fspecialise-aggressively
@@ -148,7 +183,20 @@ executable benchmark
148 default-language: Haskell2010
183 default-language: Haskell2010
149
184
150executable krausest
185executable krausest
151− build-depends: base, reflex, reflex-dom, text, prim-uniq, dependent-map, containers, transformers, mtl, ghcjs-dom, ghc-prim, random, dependent-sum, vector
186+ build-depends: base
187+ , containers
188+ , dependent-map
189+ , dependent-sum
190+ , ghc-prim
191+ , ghcjs-dom
192+ , mtl
193+ , prim-uniq
194+ , random
195+ , reflex
196+ , reflex-dom
197+ , text
198+ , transformers
199+ , vector
152 hs-source-dirs: benchmarks
200 hs-source-dirs: benchmarks
153 main-is: krausest.hs
201 main-is: krausest.hs
154 ghc-options: -O2 -fspecialise-aggressively
202 ghc-options: -O2 -fspecialise-aggressively
reflex-dom/src/Reflex/Dom/Internal.hs+5
@@ -80,6 +80,11 @@ run jsm = do
80 startMainWidget a startPage jsm
80 startMainWidget a startPage jsm
81 }
81 }
82 forever $ threadDelay 1000000000
82 forever $ threadDelay 1000000000
83+#elif defined(wasm32_HOST_ARCH)
84+import qualified Language.Javascript.JSaddle.Wasm as Wasm (run)
85+import Language.Javascript.JSaddle (JSM)
86+run :: JSM () -> IO ()
87+run = Wasm.run 0
83#else
88#else
84import Language.Javascript.JSaddle.WebKitGTK (run)
89import Language.Javascript.JSaddle.WebKitGTK (run)
85#endif
90#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"]
2}:
3}:
4+
3let
5let
6+ native-reflex-platform = reflex-platform-fun {};
4− inherit (rp.nixpkgs) lib;
7+ inherit (native-reflex-platform.nixpkgs) lib;
5− systems = ["x86_64-linux" "x86_64-darwin"];
8+
6− compilers = ["ghc8_4" "ghc8_0" "ghcjs8_4" "ghcjs8_0"];
9+ tests = system: import ./test { pkgs = (reflex-platform-fun { inherit system; }).nixpkgs; };
7−in lib.genAttrs systems (system:
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+ ];
8− lib.genAttrs compilers (ghc: let
22+ compilerPkgs = lib.genAttrs compilers (ghc: let
9− reflex-platform = import ./reflex-platform.nix { inherit system; };
23+ reflex-platform = reflex-platform-fun {
10− hsPkgs = reflex-platform.${ghc};
24+ inherit system;
11− in { inherit (import ./. hsPkgs reflex-platform.nixpkgs) reflex-dom reflex-dom-core; })
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);
12−)
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)