on 14da2f1 help sign in
61 files changed+861−2209
since splitsnapshots
unifiedsplit
.github/workflows/haskell.yml−47 CONTRIBUTING.md−65 FAQ.md−31 LICENSE−12 README.md+10−11 cabal.project−10 cabal.project-nogtk−14 chrome-test-utils/LICENSE+1−1 chrome-test-utils/chrome-test-utils.cabal+1−1 chrome-test-utils/src/Test/Util/ChromeFlags.hs−1 chrome-test-utils/src/Test/Util/UnshareNetwork.hs+2−2 default.nix+7 dep/reflex-platform/default.nix−2 dep/reflex-platform/github.json−8 dep/reflex-platform/thunk.nix−9 hydra.json+29 jobsets.nix+70 reflex-dom-core/ChangeLog.md−94 reflex-dom-core/LICENSE+1−1 reflex-dom-core/default.nix+58 reflex-dom-core/reflex-dom-core.cabal+30−70 reflex-dom-core/src/Foreign/JavaScript/Orphans.hs−2 reflex-dom-core/src/Foreign/JavaScript/TH.hs+4−2 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+5−13 reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs+3−13 reflex-dom-core/src/Reflex/Dom/Builder/Hydratable.hs−116 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+133−225 reflex-dom-core/src/Reflex/Dom/Builder/InputDisabled.hs−6 reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+20−49 reflex-dom-core/src/Reflex/Dom/Class.hs+7−4 reflex-dom-core/src/Reflex/Dom/Core.hs−1 reflex-dom-core/src/Reflex/Dom/Main.hs+34−86 reflex-dom-core/src/Reflex/Dom/Old.hs+1 reflex-dom-core/src/Reflex/Dom/Prerender.hs+25−135 reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs+29−10 reflex-dom-core/src/Reflex/Dom/Widget/Input.hs+43−9 reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+2−2 reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+4−8 reflex-dom-core/src/Reflex/Dom/Xhr.hs+6−8 reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs+3−2 reflex-dom-core/test/gc.hs+1−1 reflex-dom-core/test/hlint.hs+1−3 reflex-dom-core/test/hydration.hs+118−523 reflex-dom-test-selenium/CHANGELOG.md−5 reflex-dom-test-selenium/LICENSE−12 reflex-dom-test-selenium/Setup.hs−2 reflex-dom-test-selenium/add-overrides.nix−20 reflex-dom-test-selenium/reflex-dom-test-selenium.cabal−41 reflex-dom-test-selenium/src/Reflex/Dom/Test/Selenium.hs−249 reflex-dom/ChangeLog.md−42 reflex-dom/LICENSE+1−1 reflex-dom/benchmark.hs+1−2 reflex-dom/default.nix+37 reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java+1−14 reflex-dom/reflex-dom.cabal+28−76 reflex-dom/src/Reflex/Dom/Internal.hs−5 reflex-platform.nix+8 release.nix+10−61 test/default.nix−10 test/prebuild.hs+127 test/reflex-dom-reexports.hs−72
.github/workflows/haskell.ymldeleted−47
@@ -1,47 +0,0 @@
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.mddeleted−65
@@ -1,65 +0,0 @@
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.mddeleted−31
@@ -1,31 +0,0 @@
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−```
LICENSEdeleted−12
@@ -1,12 +0,0 @@
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+10−11
@@ -1,23 +1,22 @@
11## [Reflex-DOM](https://reflex-frp.org)
2+### A Framework for Functional Reactive Web Apps in Haskell
23
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)
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).
45
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).
6+A summary of Reflex-DOM functions is available in the [quick reference](Quickref.md).
87
98**Visit https://reflex-frp.org/ for more information, tutorials, documentation and [examples](https://examples.reflex-frp.org/).**
109
1110### 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)
1216
13−* [Official Website](https://reflex-frp.org/)
14−* [Quick Reference](Quickref.md)
15−* [Obelisk](https://github.com/obsidiansystems/obelisk#obelisk): A framework built on Reflex and Reflex-DOM for functional reactive web and mobile applications, with batteries included.
16−* [Get started with Reflex](https://github.com/reflex-frp/reflex-platform)
17−* [/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
18−* [irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
17+[irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
1918
2019### Hacking
2120
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.
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.
2322Then 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.projectdeleted−10
@@ -1,10 +0,0 @@
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-nogtkdeleted−14
@@ -1,14 +0,0 @@
1−packages:
2− reflex-dom-core/
3− reflex-dom/
4−
5−package reflex-dom-core
6− flags: -hydration-tests -gc-tests
7−
8−package reflex-dom
9− flags: +use-warp -webkit2gtk
10−
11−source-repository-package
12− type: git
13− location: https://github.com/dfordivam/hspec-webdriver-clone
14− tag: 0d748b7bb7cd74dce0a55a1ec86b01dbb8a71cd8
chrome-test-utils/LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2020, Obsidian Systems LLC
1+Copyright (c) 2019, Obsidian Systems LLC
22All rights reserved.
33
44Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
chrome-test-utils/chrome-test-utils.cabal+1−1
@@ -1,5 +1,5 @@
11Name: chrome-test-utils
2−Version: 0.5
2+Version: 0.4
33Synopsis: Utilities to write headless Chromium tests
44License: BSD3
55License-file: LICENSE
chrome-test-utils/src/Test/Util/ChromeFlags.hs−1
@@ -1,7 +1,6 @@
11{-# LANGUAGE OverloadedStrings #-}
22module Test.Util.ChromeFlags where
33
4−import Data.Semigroup
54import Data.Text
65import System.IO.Temp
76
chrome-test-utils/src/Test/Util/UnshareNetwork.hs+2−2
@@ -4,8 +4,8 @@ import System.Linux.Namespaces
44import System.Posix
55import System.Process
66
7−unshareNetwork :: IO ()
8−unshareNetwork = do
7+unshareNetork :: IO ()
8+unshareNetork = do
99 uid <- getEffectiveUserID
1010 unshare [User, Network]
1111 writeUserMappings Nothing [UserMapping 0 uid 1]
default.nixnew file+7
@@ -0,0 +1,7 @@
1+haskellPackages: nixpkgs: {
2+ reflex-dom = haskellPackages.callPackage ./reflex-dom {};
3+ reflex-dom-core = haskellPackages.callPackage ./reflex-dom-core {
4+ inherit (nixpkgs) iproute chromium;
5+ };
6+ chrome-test-utils = haskellPackages.callCabal2nix "chrome-test-utils" ./chrome-test-utils {};
7+}
dep/reflex-platform/default.nixdeleted−2
@@ -1,2 +0,0 @@
1−# DO NOT HAND-EDIT THIS FILE
2−import (import ./thunk.nix)
dep/reflex-platform/github.jsondeleted−8
@@ -1,8 +0,0 @@
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.nixdeleted−9
@@ -1,9 +0,0 @@
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.jsonnew file+29
@@ -0,0 +1,29 @@
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.nixnew file+70
@@ -0,0 +1,70 @@
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.mddeleted−94
@@ -1,94 +0,0 @@
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) 2020, Obsidian Systems LLC
1+Copyright (c) 2015, Obsidian Systems LLC
22All rights reserved.
33
44Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
reflex-dom-core/default.nixnew file+58
@@ -0,0 +1,58 @@
1+{ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder
2+, bytestring, chrome-test-utils, constraints, constraints-extras, containers
3+, contravariant, data-default, dependent-map, dependent-sum
4+, dependent-sum-template, directory, exception-transformers
5+, exceptions, filepath, ghcjs-dom, hlint, hspec, hspec-webdriver, http-types, HUnit
6+, jsaddle, jsaddle-warp, keycode, lens, lifted-base
7+, monad-control, mtl, network, network-uri, primitive, process
8+, random, ref-tf, reflex, semigroups, silently, stdenv, stm
9+, template-haskell, temporary, text, these, transformers, unix, wai
10+, wai-websockets, warp, webdriver, websockets, zenc
11+, ghc, iproute, chromium, hashable, selenium-server-standalone, which, fontconfig
12+}:
13+let addGcTestDepends = drv: if (stdenv.system != "x86_64-linux" || stdenv.hostPlatform != stdenv.buildPlatform || (ghc.isGhcjs or false)) then drv else drv // {
14+ # The headless browser run as part of gc tests would hang/crash without this
15+ preCheck = ''
16+ export FONTCONFIG_PATH=${fontconfig.out}/etc/fonts
17+ '';
18+ testHaskellDepends = (drv.testHaskellDepends or []) ++ [ temporary jsaddle-warp process ];
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 chrome-test-utils 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 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+30−70
@@ -1,18 +1,7 @@
1−cabal-version: 1.24
21Name: reflex-dom-core
3−Version: 0.6.2.1
2+Version: 0.4
43Synopsis: 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− .
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@.
4+Description: Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine
165License: BSD3
176License-file: LICENSE
187Author: Ryan Trinkle
@@ -20,6 +9,7 @@ Maintainer: ryan.trinkle@gmail.com
209Stability: Experimental
2110Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
2211Build-type: Simple
12+Cabal-version: >=1.9.2
2313-- Deal with https://github.com/haskell/cabal/issues/2544 / https://github.com/haskell/cabal/issues/367
2414extra-source-files: src-ghc/Foreign/JavaScript/Internal/Utils.hs
2515 src-ghcjs/Foreign/JavaScript/Internal/Utils.hs
@@ -27,7 +17,6 @@ extra-source-files: src-ghc/Foreign/JavaScript/Internal/Utils.hs
2717 src/Reflex/Dom/WebSocket/Foreign.hs
2818 src/Reflex/Dom/Xhr/ResponseType.hs
2919 src/Reflex/Dom/Xhr/Exception.hs
30− ChangeLog.md
3120
3221flag use-template-haskell
3322 description: Use template haskell to generate lenses
@@ -49,54 +38,39 @@ flag profile-reflex
4938 default: False
5039 manual: True
5140
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−
6741library
6842 hs-source-dirs: src
6943 build-depends:
70− aeson >= 0.8 && < 1.6,
71− base >= 4.7 && < 4.15,
44+ aeson >= 0.8 && < 1.4,
45+ base >= 4.7 && < 4.12,
7246 bifunctors >= 4.2 && < 6,
73− bimap >= 0.3 && < 0.5,
74− blaze-builder >= 0.4.1 && < 0.5,
47+ bimap >= 0.3 && < 0.4,
48+ blaze-builder,
7549 bytestring == 0.10.*,
76− case-insensitive < 1.3,
77− containers >= 0.6 && < 0.7,
78− constraints >= 0.9 && < 0.13,
79− contravariant >= 1.4 && < 1.6,
50+ containers == 0.5.*,
51+ constraints >= 0.9 && < 0.11,
52+ contravariant >= 1.4 && < 1.5,
8053 data-default >= 0.5 && < 0.8,
81− dependent-map >= 0.3 && < 0.5,
82− dependent-sum >= 0.6 && < 0.8,
83− dependent-sum-template >= 0.1 && < 0.2,
54+ dependent-map == 0.2.*,
55+ dependent-sum >= 0.3 && < 0.5,
56+ dependent-sum-template >= 0.0.0.4 && < 0.1,
8457 directory >= 1.2 && < 1.4,
8558 exception-transformers == 0.4.*,
8659 ghcjs-dom >= 0.9.1.0 && < 0.10,
87− jsaddle >= 0.9.0.0 && < 0.10,
60+ jsaddle >=0.9.0.0 && <0.10,
8861 -- keycode-0.2 has a bug on firefox
8962 keycode >= 0.2.1 && < 0.3,
9063 lens >= 4.7 && < 5,
9164 monad-control >= 1.0.1 && < 1.1,
9265 mtl >= 2.1 && < 2.3,
93− primitive >= 0.5 && < 0.8,
94− random >= 1.1 && < 1.2,
66+ primitive >= 0.5 && < 0.7,
67+ random,
9568 ref-tf == 0.4.*,
96− reflex >= 0.8 && < 0.9,
97− semigroups >= 0.16 && < 0.20,
98− stm >= 2.4 && < 2.6,
69+ reflex == 0.5.*,
70+ semigroups >= 0.16 && < 0.19,
71+ stm == 2.4.*,
9972 text == 1.2.*,
73+ these >= 0.4 && < 0.8,
10074 transformers >= 0.3 && < 0.6,
10175 network-uri >= 2.6.1 && < 2.7,
10276 zenc == 0.1.*
@@ -105,20 +79,12 @@ library
10579 hs-source-dirs: src-ghcjs
10680 build-depends:
10781 ghcjs-base,
108− hashable >= 1.2 && < 1.4
82+ hashable == 1.2.*
10983 else
11084 hs-source-dirs: src-ghc
11185 if !os(windows)
11286 build-depends: unix == 2.7.*
11387
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−
12288 exposed-modules:
12389 Foreign.JavaScript.TH
12490 Foreign.JavaScript.Orphans
@@ -127,7 +93,6 @@ library
12793 Reflex.Dom.Builder.Class.Events
12894 Reflex.Dom.Builder.Immediate
12995 Reflex.Dom.Builder.InputDisabled
130− Reflex.Dom.Builder.Hydratable
13196 Reflex.Dom.Builder.Static
13297 Reflex.Dom.Class
13398 Reflex.Dom.Core
@@ -153,7 +118,6 @@ library
153118 Reflex.Dom.Xhr.ResponseType
154119 Reflex.Dom.Xhr.Exception
155120
156− default-language: Haskell98
157121 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
158122 ghc-prof-options: -fprof-auto
159123
@@ -168,26 +132,26 @@ library
168132
169133 if flag(use-template-haskell)
170134 build-depends:
171− dependent-sum-template >= 0.1 && < 0.2,
172− template-haskell >= 2.12.0 && < 2.17
135+ dependent-sum >= 0.3 && < 0.5,
136+ dependent-sum-template >= 0.0.0.5 && < 0.1,
137+ template-haskell
173138 other-extensions: TemplateHaskell
174139 cpp-options: -DUSE_TEMPLATE_HASKELL
175140 other-modules:
176141 Reflex.Dom.Builder.Class.TH
142+ else
143+ build-depends:
144+ dependent-sum == 0.4.*
177145
178146test-suite hlint
179− build-depends:
180− base,
181− hlint >= 2.0 && < 4.0
147+ build-depends: base, hlint
182148 hs-source-dirs: test
183149 main-is: hlint.hs
184150 type: exitcode-stdio-1.0
185− default-language: Haskell98
186151
187152test-suite hydration
188153 build-depends: base
189154 , aeson
190− , async
191155 , bytestring
192156 , chrome-test-utils
193157 , constraints
@@ -201,7 +165,6 @@ test-suite hydration
201165 , filepath
202166 , ghcjs-dom
203167 , hspec
204− , hspec-core
205168 , hspec-webdriver
206169 , http-types
207170 , HUnit
@@ -223,14 +186,12 @@ test-suite hydration
223186 , warp
224187 , webdriver
225188 , websockets
226− , which
227189 hs-source-dirs: test
228190 ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
229191 ghc-prof-options: -fprof-auto -optP-DPROFILING
230192 main-is: hydration.hs
231193 type: exitcode-stdio-1.0
232− default-language: Haskell98
233− if !os(linux) || !arch(x86_64) || flag(profile-reflex) || !flag(hydration-tests)
194+ if !os(linux) || !arch(x86_64)-- || impl(ghc >= 8.4.0)
234195 buildable: False
235196
236197-- broken test on base 4.11 & ghc 8.4.3
@@ -249,8 +210,7 @@ test-suite gc
249210 ghc-prof-options: -fprof-auto -optP-DPROFILING
250211 main-is: gc.hs
251212 type: exitcode-stdio-1.0
252− default-language: Haskell98
253− if !os(linux) || !arch(x86_64) || !flag(gc-tests)
213+ if !os(linux) || !arch(x86_64)
254214 buildable: False
255215
256216source-repository head
reflex-dom-core/src/Foreign/JavaScript/Orphans.hs−2
@@ -1,8 +1,6 @@
11{-# OPTIONS_HADDOCK hide #-}
22{-# LANGUAGE CPP #-}
33{-# LANGUAGE FlexibleContexts #-}
4−{-# LANGUAGE UndecidableInstances #-}
5−
64{-# OPTIONS_GHC -fno-warn-orphans #-}
75module Foreign.JavaScript.Orphans where
86
reflex-dom-core/src/Foreign/JavaScript/TH.hs+4−2
@@ -6,9 +6,11 @@
66{-# LANGUAGE FlexibleInstances #-}
77{-# LANGUAGE FunctionalDependencies #-}
88{-# LANGUAGE GeneralizedNewtypeDeriving #-}
9+{-# LANGUAGE MultiParamTypeClasses #-}
910{-# LANGUAGE RankNTypes #-}
1011{-# LANGUAGE StandaloneDeriving #-}
1112{-# LANGUAGE TypeFamilies #-}
13+{-# LANGUAGE TypeSynonymInstances #-}
1214{-# LANGUAGE UndecidableInstances #-}
1315#ifdef USE_TEMPLATE_HASKELL
1416{-# LANGUAGE TemplateHaskell #-}
@@ -292,7 +294,7 @@ class Monad m => MonadJS x m | m -> x where
292294#ifdef ghcjs_HOST_OS
293295
294296data JSCtx_IO
295−type JS' = JSCtx_IO
297+type HasJS' = HasJS JSCtx_IO
296298
297299instance MonadIO m => HasJS JSCtx_IO (WithJSContextSingleton x m) where
298300 type JSX (WithJSContextSingleton x m) = IO
@@ -343,7 +345,7 @@ foreign import javascript unsafe "function(){ return $1(arguments); }" funWithAr
343345#else
344346
345347data JSCtx_JavaScriptCore x
346−type JS' = JSCtx_JavaScriptCore ()
348+type HasJS' = HasJS (JSCtx_JavaScriptCore ())
347349
348350instance IsJSContext (JSCtx_JavaScriptCore x) where
349351 newtype JSRef (JSCtx_JavaScriptCore x) = JSRef_JavaScriptCore { unJSRef_JavaScriptCore :: JSVal }
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+5−13
@@ -9,12 +9,12 @@
99{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1010#if !MIN_VERSION_base(4,9,0)
1111{-# LANGUAGE ImpredicativeTypes #-}
12−#else
13−{-# LANGUAGE Rank2Types #-} -- Implied by ImpredicativeTypes
1412#endif
1513{-# LANGUAGE LambdaCase #-}
14+{-# LANGUAGE MultiParamTypeClasses #-}
1615{-# LANGUAGE OverloadedStrings #-}
1716{-# LANGUAGE PolyKinds #-}
17+{-# LANGUAGE RankNTypes #-}
1818{-# LANGUAGE RecursiveDo #-}
1919{-# LANGUAGE ScopedTypeVariables #-}
2020{-# LANGUAGE StandaloneDeriving #-}
@@ -192,7 +192,7 @@ data CommentNodeConfig t
192192 }
193193
194194#ifndef USE_TEMPLATE_HASKELL
195−commentNodeConfig_initialContents :: Lens' (CommentNodeConfig t) Text
195+commentNodeConfig_initialContents :: Lens' (CommentNodeConfig t) Comment
196196commentNodeConfig_initialContents f (CommentNodeConfig a b) = (\a' -> CommentNodeConfig a' b) <$> f a
197197{-# INLINE commentNodeConfig_initialContents #-}
198198#endif
@@ -618,7 +618,7 @@ instance (DomBuilder t m, MonadHold t m, MonadFix m, Semigroup w) => DomBuilder
618618 placeRawElement = lift . placeRawElement
619619 wrapRawElement e = lift . wrapRawElement e
620620
621−instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive q, Eq q) => DomBuilder t (QueryT t q m) where
621+instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive q) => DomBuilder t (QueryT t q m) where
622622 type DomBuilderSpace (QueryT t q m) = DomBuilderSpace m
623623 textNode = liftTextNode
624624 commentNode = liftCommentNode
@@ -639,7 +639,7 @@ instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive
639639
640640-- * Convenience functions
641641
642−class HasDomEvent t target eventName | target -> t where
642+class HasDomEvent t target eventName where
643643 type DomEventType target eventName :: *
644644 domEvent :: EventName eventName -> target -> Event t (DomEventType target eventName)
645645
@@ -745,11 +745,3 @@ instance HasDocument m => HasDocument (DynamicWriterT t w m)
745745instance HasDocument m => HasDocument (PostBuildT t m)
746746instance HasDocument m => HasDocument (RequesterT t request response m)
747747instance HasDocument m => HasDocument (QueryT t q m)
748−
749−class HasSetValue a where
750− type SetValue a :: *
751− setValue :: Lens' a (SetValue a)
752−
753−instance Reflex t => HasSetValue (TextAreaElementConfig er t m) where
754− type SetValue (TextAreaElementConfig er t m) = Event t Text
755− setValue = textAreaElementConfig_setValue
reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs+3−13
@@ -1,6 +1,7 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE DataKinds #-}
33{-# LANGUAGE GADTs #-}
4+{-# LANGUAGE KindSignatures #-}
45{-# LANGUAGE PolyKinds #-}
56#ifdef USE_TEMPLATE_HASKELL
67{-# LANGUAGE TemplateHaskell #-}
@@ -14,7 +15,6 @@ import Data.GADT.Compare.TH
1415import Data.GADT.Compare
1516 (GOrdering(..), (:~:)(..), GEq(..), GCompare(..))
1617#endif
17−import Data.Text (Text)
1818
1919data EventTag
2020 = AbortTag
@@ -152,7 +152,7 @@ type family EventResultType (en :: EventTag) :: * where
152152 EventResultType 'BeforecopyTag = ()
153153 EventResultType 'CopyTag = ()
154154 EventResultType 'BeforepasteTag = ()
155− EventResultType 'PasteTag = Maybe Text
155+ EventResultType 'PasteTag = ()
156156 EventResultType 'ResetTag = ()
157157 EventResultType 'SearchTag = ()
158158 EventResultType 'SelectstartTag = ()
@@ -160,17 +160,7 @@ type family EventResultType (en :: EventTag) :: * where
160160 EventResultType 'TouchmoveTag = TouchEventResult
161161 EventResultType 'TouchendTag = TouchEventResult
162162 EventResultType 'TouchcancelTag = TouchEventResult
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)
163+ EventResultType 'WheelTag = ()
174164
175165data TouchEventResult = TouchEventResult
176166 { _touchEventResult_altKey :: Bool
reflex-dom-core/src/Reflex/Dom/Builder/Hydratable.hsdeleted−116
@@ -1,116 +0,0 @@
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+133−225
@@ -2,6 +2,7 @@
22{-# LANGUAGE CPP #-}
33{-# LANGUAGE ConstraintKinds #-}
44{-# LANGUAGE DataKinds #-}
5+{-# LANGUAGE DeriveFunctor #-}
56{-# LANGUAGE DeriveTraversable #-}
67{-# LANGUAGE EmptyDataDecls #-}
78{-# LANGUAGE FlexibleContexts #-}
@@ -48,7 +49,6 @@ module Reflex.Dom.Builder.Immediate
4849 , HydrationMode (..)
4950 , HydrationRunnerT (..)
5051 , runHydrationRunnerT
51− , runHydrationRunnerTWithFailure
5252 , ImmediateDomBuilderT
5353 , runHydrationDomBuilderT
5454 , getHydrationMode
@@ -86,6 +86,9 @@ module Reflex.Dom.Builder.Immediate
8686 , ghcjsEventSpec_filters
8787 , ghcjsEventSpec_handler
8888 , GhcjsEventHandler (..)
89+#ifndef USE_TEMPLATE_HASKELL
90+ , phantom2
91+#endif
8992 , drawChildUpdate
9093 , ChildReadyState (..)
9194 , mkHasFocus
@@ -107,9 +110,6 @@ module Reflex.Dom.Builder.Immediate
107110 , WindowConfig (..)
108111 , Window (..)
109112 , wrapWindow
110− -- * Attributes for controlling hydration
111− , hydratableAttribute
112− , skipHydrationAttribute
113113 -- * Internal
114114 , traverseDMapWithKeyWithAdjust'
115115 , hoistTraverseWithKeyWithAdjust
@@ -135,20 +135,15 @@ import Data.Functor.Compose
135135import Data.Functor.Constant
136136import Data.Functor.Misc
137137import Data.Functor.Product
138−import Data.GADT.Compare (GCompare)
139138import Data.IORef
140139import Data.IntMap.Strict (IntMap)
141140import Data.Maybe
142−import Data.Monoid ((<>))
143141import Data.Some (Some(..))
144−import Data.GADT.Compare (GCompare)
145−import Data.String (IsString)
146142import Data.Text (Text)
147143import Foreign.JavaScript.Internal.Utils
148144import Foreign.JavaScript.TH
149−import GHCJS.DOM.ClipboardEvent as ClipboardEvent
150145import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode, createComment)
151−import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute)
146+import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute, hasAttributeNS)
152147import GHCJS.DOM.EventM (EventM, event, on)
153148import GHCJS.DOM.KeyboardEvent as KeyboardEvent
154149import GHCJS.DOM.MouseEvent
@@ -167,9 +162,6 @@ import Reflex.PerformEvent.Base (PerformEventT)
167162import Reflex.PerformEvent.Class
168163import Reflex.PostBuild.Base (PostBuildT)
169164import Reflex.PostBuild.Class
170−#ifdef PROFILE_REFLEX
171−import Reflex.Profiled
172−#endif
173165import Reflex.Requester.Base
174166import Reflex.Requester.Class
175167import Reflex.Spider (Spider, SpiderHost, Global)
@@ -182,7 +174,6 @@ import qualified Data.IntMap.Strict as IntMap
182174import qualified Data.Map as Map
183175import qualified Data.Text as T
184176import qualified GHCJS.DOM as DOM
185−import qualified GHCJS.DOM.DataTransfer as DataTransfer
186177import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
187178import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
188179import qualified GHCJS.DOM.Element as Element
@@ -200,7 +191,6 @@ import qualified GHCJS.DOM.TouchEvent as TouchEvent
200191import qualified GHCJS.DOM.TouchList as TouchList
201192import qualified GHCJS.DOM.Types as DOM
202193import qualified GHCJS.DOM.Window as Window
203−import qualified GHCJS.DOM.WheelEvent as WheelEvent
204194import qualified Reflex.Patch.DMap as PatchDMap
205195import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
206196import qualified Reflex.Patch.MapWithMove as PatchMapWithMove
@@ -208,7 +198,6 @@ import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
208198
209199#ifndef USE_TEMPLATE_HASKELL
210200import Data.Functor.Contravariant (phantom)
211−import Control.Lens (Lens', Getter)
212201#endif
213202
214203#ifndef ghcjs_HOST_OS
@@ -294,21 +283,12 @@ localRunner (HydrationRunnerT m) s parent = do
294283runHydrationRunnerT
295284 :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
296285 => HydrationRunnerT t m a -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
297−runHydrationRunnerT m = runHydrationRunnerTWithFailure m (pure ())
298−
299−{-# INLINABLE runHydrationRunnerTWithFailure #-}
300−runHydrationRunnerTWithFailure
301− :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
302− => HydrationRunnerT t m a -> IO () -> Maybe Node -> Node -> Chan [DSum (EventTriggerRef t) TriggerInvocation] -> m a
303−runHydrationRunnerTWithFailure (HydrationRunnerT m) onFailure s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do
286+runHydrationRunnerT (HydrationRunnerT m) s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do
304287 (a, s') <- runStateT m (HydrationState s False)
305288 traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
306289 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
308290 pure a
309291
310−
311−
312292instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where
313293 {-# INLINABLE newEventWithTrigger #-}
314294 newEventWithTrigger = lift . newEventWithTrigger
@@ -332,11 +312,12 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationRunnerT t m) where
332312-- done *before* the switchover to immediate mode - this is most likely some
333313-- form of 'hold' which we want to remove after hydration is done
334314{-# INLINABLE addHydrationStepWithSetup #-}
335−addHydrationStepWithSetup :: MonadIO m => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
315+addHydrationStepWithSetup :: (Adjustable t m, MonadIO m) => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
336316addHydrationStepWithSetup setup f = getHydrationMode >>= \case
337317 HydrationMode_Immediate -> pure ()
338318 HydrationMode_Hydrating -> do
339− s <- lift setup
319+ switchover <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_switchover
320+ (s, _) <- lift $ runWithReplace setup $ return () <$ switchover
340321 addHydrationStep (f s)
341322
342323-- | Add a hydration step
@@ -364,7 +345,7 @@ runDomRenderHookT (DomRenderHookT a) events = do
364345 flip runTriggerEventT events $ do
365346 rec (result, req) <- runRequesterT a rsp
366347 rsp <- performEventAsync $ ffor req $ \rm f -> liftJSM $ runInAnimationFrame f $
367− traverseRequesterData (fmap Identity) rm
348+ traverseRequesterData (\r -> Identity <$> r) rm
368349 return result
369350 where
370351 runInAnimationFrame f x = void . DOM.inAnimationFrame' $ \_ -> do
@@ -379,7 +360,7 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (DomRenderHookT t m) where
379360 withRenderHook hook (DomRenderHookT a) = do
380361 DomRenderHookT $ withRequesting $ \rsp -> do
381362 (x, req) <- lift $ runRequesterT a $ runIdentity <$> rsp
382− return (ffor req $ \rm -> hook $ traverseRequesterData (fmap Identity) rm, x)
363+ return (ffor req $ \rm -> hook $ traverseRequesterData (\r -> Identity <$> r) rm, x)
383364 requestDomAction = DomRenderHookT . requestingIdentity
384365 requestDomAction_ = DomRenderHookT . requesting_
385366
@@ -546,17 +527,17 @@ wrap events e cfg = do
546527 return eventTriggerRefs
547528
548529{-# SPECIALIZE wrap
549− :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
530+ :: Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
550531 -> DOM.Element
551− -> RawElementConfig er DomTimeline HydrationDomSpace
552− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
532+ -> RawElementConfig er Spider HydrationDomSpace
533+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (DMap EventName (EventFilterTriggerRef Spider er))
553534 #-}
554535
555536{-# SPECIALIZE wrap
556− :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
537+ :: Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
557538 -> DOM.Element
558− -> RawElementConfig er DomTimeline GhcjsDomSpace
559− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
539+ -> RawElementConfig er Spider GhcjsDomSpace
540+ -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (DMap EventName (EventFilterTriggerRef Spider er))
560541 #-}
561542
562543{-# INLINE triggerBody #-}
@@ -592,23 +573,23 @@ triggerBody ctx cfg events eventTriggerRefs e (WrapArg en) t = case DMap.lookup
592573
593574{-# SPECIALIZE triggerBody
594575 :: DOM.JSContextRef
595− -> RawElementConfig er DomTimeline HydrationDomSpace
596− -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
597− -> DMap EventName (EventFilterTriggerRef DomTimeline er)
576+ -> RawElementConfig er Spider HydrationDomSpace
577+ -> Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
578+ -> DMap EventName (EventFilterTriggerRef Spider er)
598579 -> DOM.Element
599580 -> WrapArg er EventName x
600− -> EventTrigger DomTimeline x
581+ -> EventTrigger Spider x
601582 -> IO (IO ())
602583 #-}
603584
604585{-# SPECIALIZE triggerBody
605586 :: DOM.JSContextRef
606− -> RawElementConfig er DomTimeline GhcjsDomSpace
607− -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
608− -> DMap EventName (EventFilterTriggerRef DomTimeline er)
587+ -> RawElementConfig er Spider GhcjsDomSpace
588+ -> Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
589+ -> DMap EventName (EventFilterTriggerRef Spider er)
609590 -> DOM.Element
610591 -> WrapArg er EventName x
611− -> EventTrigger DomTimeline x
592+ -> EventTrigger Spider x
612593 -> IO (IO ())
613594 #-}
614595
@@ -657,11 +638,15 @@ data GhcjsEventSpec er = GhcjsEventSpec
657638newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
658639
659640#ifndef USE_TEMPLATE_HASKELL
641+phantom2 :: (Functor f, Contravariant f) => f a -> f b
642+phantom2 = phantom
643+{-# INLINE phantom2 #-}
644+
660645ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
661646ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
662647{-# INLINE ghcjsEventSpec_filters #-}
663648ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
664−ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom (f b)
649+ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom2 (f b)
665650{-# INLINE ghcjsEventSpec_handler #-}
666651#endif
667652
@@ -709,16 +694,16 @@ elementImmediate elementTag cfg child = do
709694
710695{-# SPECIALIZE elementImmediate
711696 :: Text
712− -> ElementConfig er DomTimeline HydrationDomSpace
713− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
714− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
697+ -> ElementConfig er Spider HydrationDomSpace
698+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
699+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (Element er GhcjsDomSpace Spider, a)
715700 #-}
716701
717702{-# SPECIALIZE elementImmediate
718703 :: Text
719− -> ElementConfig er DomTimeline GhcjsDomSpace
720− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM a
721− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
704+ -> ElementConfig er Spider GhcjsDomSpace
705+ -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM a
706+ -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (Element er GhcjsDomSpace Spider, a)
722707 #-}
723708
724709-- For specialisation
@@ -755,19 +740,11 @@ elementInternal elementTag cfg child = getHydrationMode >>= \case
755740
756741{-# SPECIALIZE elementInternal
757742 :: Text
758− -> ElementConfig er DomTimeline HydrationDomSpace
759− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
760− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er HydrationDomSpace DomTimeline, a)
743+ -> ElementConfig er Spider HydrationDomSpace
744+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
745+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (Element er HydrationDomSpace Spider, a)
761746 #-}
762747
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−
771748{-# INLINE hydrateElement #-}
772749hydrateElement
773750 :: forall er t m a. (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
@@ -789,15 +766,11 @@ hydrateElement elementTag cfg child = do
789766 }
790767 result <- HydrationDomBuilderT $ lift $ runReaderT (unHydrationDomBuilderT child) env'
791768 wrapResult <- liftIO newEmptyMVar
792− let -- Determine if we should skip an element. We currently skip elements for
793− -- two reasons:
794− -- 1) it was not produced by a static builder which supports hydration
795− -- 2) it is explicitly marked to be skipped
796− shouldSkip :: DOM.Element -> HydrationRunnerT t m Bool
797− shouldSkip e = do
798− skip <- hasAttribute e (skipHydrationAttribute :: DOM.JSString)
799− hydratable <- hasAttribute e (hydratableAttribute :: DOM.JSString)
800− pure $ skip || not hydratable
769+ let ssrAttr = "data-ssr" :: DOM.JSString
770+ hasSSRAttribute :: DOM.Element -> HydrationRunnerT t m Bool
771+ hasSSRAttribute e = case cfg ^. namespace of
772+ Nothing -> hasAttribute e ssrAttr <* removeAttribute e ssrAttr
773+ Just ns -> hasAttributeNS e (Just ns) ssrAttr <* removeAttributeNS e (Just ns) ssrAttr
801774 childDom <- liftIO $ readIORef childDelayedRef
802775 let rawCfg = extractRawElementConfig cfg
803776 doc <- askDocument
@@ -812,9 +785,9 @@ hydrateElement elementTag cfg child = do
812785 pure e
813786 Just node -> DOM.castTo DOM.Element node >>= \case
814787 Nothing -> go (Just node) -- this node is not an element, skip
815− Just e -> shouldSkip e >>= \case
816− True -> go (Just node) -- this element should be skipped by hydration
817− False -> do
788+ Just e -> hasSSRAttribute e >>= \case
789+ False -> go (Just node) -- this element was not added by the static renderer, skip
790+ True -> do
818791 t <- Element.getTagName e
819792 -- TODO: check attributes?
820793 if T.toCaseFold elementTag == T.toCaseFold t
@@ -857,9 +830,9 @@ hydrateElement elementTag cfg child = do
857830
858831{-# SPECIALIZE hydrateElement
859832 :: Text
860− -> ElementConfig er DomTimeline HydrationDomSpace
861− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
862− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM ((Element er HydrationDomSpace DomTimeline, a), IORef DOM.Element)
833+ -> ElementConfig er Spider HydrationDomSpace
834+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
835+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM ((Element er HydrationDomSpace Spider, a), IORef DOM.Element)
863836 #-}
864837
865838{-# INLINE inputElementImmediate #-}
@@ -937,26 +910,14 @@ inputElementInternal cfg = getHydrationMode >>= \case
937910 doc <- askDocument
938911 -- Expected initial value from config
939912 let v0 = _inputElementConfig_initialValue cfg
940− c0 = _inputElementConfig_initialChecked cfg
941− valuesAtSwitchover = do
942− v <- maybe (pure $ pure v0) (hold v0) (_inputElementConfig_setValue cfg)
943− c <- maybe (pure $ pure c0) (hold c0) (_inputElementConfig_setChecked cfg)
944− pure (v, c)
945− addHydrationStepWithSetup valuesAtSwitchover $ \(switchoverValue', switchoverChecked') -> do
946− switchoverValue <- sample switchoverValue'
947− switchoverChecked <- sample switchoverChecked'
913+ addHydrationStep $ do
948914 domElement <- liftIO $ readIORef domElementRef
949915 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
950916 getValue = Input.getValue domInputElement
951− -- When the value has been updated by setValue before switchover, we must
952− -- send an update here to remain in sync. This is because the later
953− -- requestDomAction based on the setValue event will not capture events
954− -- happening before postBuild, because this code runs after switchover.
955− when (v0 /= switchoverValue) $ liftIO $ triggerChangeBySetValue switchoverValue
956− -- The user could have altered the value before switchover. This must be
957− -- triggered after the setValue one in order for the events to be in the
958− -- correct order.
959− liftJSM getValue >>= \realValue -> when (realValue /= switchoverValue) $ liftIO $ triggerChangeByUI realValue
917+ -- The browser might have messed with the value, or the user could have
918+ -- altered it before activation, so we set it if it isn't what we expect
919+ liftJSM getValue >>= \v0' -> do
920+ when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
960921 -- Watch for user interaction and trigger event accordingly
961922 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
962923 for_ (_inputElementConfig_setValue cfg) $ \eSetValue ->
@@ -970,17 +931,7 @@ inputElementInternal cfg = getHydrationMode >>= \case
970931 ]
971932 liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
972933 requestDomAction_ $ liftIO . triggerFocusChange <$> focusChange'
973− -- When the checked state has been updated by setChecked before
974− -- switchover, we must send an update here to remain in sync. This is
975− -- because the later requestDomAction based on the setChecked event will not
976− -- capture events happening before postBuild, because this code runs after
977− -- switchover.
978− when (c0 /= switchoverChecked) $ liftIO $ triggerCheckedChangedBySetChecked switchoverChecked
979− -- The user could have clicked the checkbox before switchover, we only
980− -- detect cases where they flipped the state. This must be triggered after
981− -- the setValue one in order for the events to be in the correct order.
982− liftJSM (Input.getChecked domInputElement) >>= \realChecked -> when (realChecked /= switchoverChecked) $
983− liftIO $ triggerCheckedChangedByUI realChecked
934+ Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
984935 _ <- liftJSM $ domInputElement `on` Events.click $ do
985936 liftIO . triggerCheckedChangedByUI =<< Input.getChecked domInputElement
986937 for_ (_inputElementConfig_setChecked cfg) $ \eNewchecked ->
@@ -993,7 +944,7 @@ inputElementInternal cfg = getHydrationMode >>= \case
993944 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
994945 liftIO . triggerFileChange =<< maybe (return []) getMyFiles mfiles
995946 return ()
996− checked' <- holdDyn c0 $ leftmost
947+ checked' <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
997948 [ checkedChangedBySetChecked
998949 , checkedChangedByUI
999950 ]
@@ -1065,21 +1016,14 @@ textAreaElementInternal cfg = getHydrationMode >>= \case
10651016 doc <- askDocument
10661017 -- Expected initial value from config
10671018 let v0 = _textAreaElementConfig_initialValue cfg
1068− valueAtSwitchover = maybe (pure $ pure v0) (hold v0) (_textAreaElementConfig_setValue cfg)
1069− addHydrationStepWithSetup valueAtSwitchover $ \switchoverValue' -> do
1070− switchoverValue <- sample switchoverValue'
1019+ addHydrationStep $ do
10711020 domElement <- liftIO $ readIORef domElementRef
10721021 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
10731022 getValue = TextArea.getValue domTextAreaElement
1074− -- When the value has been updated by setValue before switchover, we must
1075− -- send an update here to remain in sync. This is because the later
1076− -- requestDomAction based on the setValue event will not capture events
1077− -- happening before postBuild, because this code runs after switchover.
1078− when (v0 /= switchoverValue) $ liftIO $ triggerChangeBySetValue switchoverValue
1079− -- The user could have altered the value before switchover. This must be
1080− -- triggered after the setValue one in order for the events to be in the
1081− -- correct order.
1082− liftJSM getValue >>= \realValue -> when (realValue /= switchoverValue) $ liftIO $ triggerChangeByUI realValue
1023+ -- The browser might have messed with the value, or the user could have
1024+ -- altered it before activation, so we set it if it isn't what we expect
1025+ liftJSM getValue >>= \v0' -> do
1026+ when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
10831027 -- Watch for user interaction and trigger event accordingly
10841028 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
10851029 for_ (_textAreaElementConfig_setValue cfg) $ \eSetValue ->
@@ -1328,8 +1272,8 @@ hydrateComment doc t mSetContents = do
13281272skipToAndReplaceComment
13291273 :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
13301274 => Text
1331− -> IORef (Maybe Text)
1332− -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef (Maybe Text))
1275+ -> IORef Text
1276+ -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef Text)
13331277skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
13341278 HydrationMode_Immediate -> do
13351279 -- If we're in immediate mode, we don't try to replace an existing comment,
@@ -1337,50 +1281,43 @@ skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
13371281 t <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
13381282 append $ toNode t
13391283 textNodeRef <- liftIO $ newIORef t
1340− keyRef <- liftIO $ newIORef Nothing
1284+ keyRef <- liftIO $ newIORef ""
13411285 pure (pure (), textNodeRef, keyRef)
13421286 HydrationMode_Hydrating -> do
13431287 doc <- askDocument
13441288 textNodeRef <- liftIO $ newIORef $ error "textNodeRef not yet initialized"
13451289 keyRef <- liftIO $ newIORef $ error "keyRef not yet initialized"
1346− let
1347− go Nothing _ = do
1348− tn <- createTextNode doc ("" :: Text)
1349− insertAfterPreviousNode tn
1350− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
1351− pure (tn, Nothing)
1352− go (Just key0) mLastNode = do
1353− parent <- askParent
1354− maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
1355− Nothing -> go Nothing Nothing
1356− Just node -> DOM.castTo DOM.Comment node >>= \case
1290+ let go key0 mLastNode = do
1291+ parent <- askParent
1292+ node <- maybe (Node.getFirstChildUnchecked parent) Node.getNextSiblingUnchecked mLastNode
1293+ DOM.castTo DOM.Comment node >>= \case
13571294 Just comment -> do
1358− commentText <- fromMaybe (error "Cannot get text content of comment node") <$> Node.getTextContent comment
1359− case T.stripPrefix (prefix <> key0) commentText of -- 'key0' may be @""@ in which case we're just finding the actual key; TODO: Don't be clever.
1295+ commentText <- Node.getTextContentUnchecked comment
1296+ case T.stripPrefix (prefix <> key0) commentText of
13601297 Just key -> do
13611298 -- Replace the comment with an (invisible) text node
13621299 tn <- createTextNode doc ("" :: Text)
13631300 Node.replaceChild_ parent tn comment
1364− pure (tn, Just key)
1301+ pure (tn, key)
13651302 Nothing -> do
1366− go (Just key0) (Just node)
1303+ go key0 (Just node)
13671304 Nothing -> do
1368− go (Just key0) (Just node)
1369− switchComment = do
1370− key0 <- liftIO $ readIORef key0Ref
1371− (tn, key) <- go key0 =<< getPreviousNode
1372− setPreviousNode $ Just $ toNode tn
1373− liftIO $ do
1374− writeIORef textNodeRef tn
1375− writeIORef keyRef key
1305+ go key0 (Just node)
1306+ switchComment = do
1307+ key0 <- liftIO $ readIORef key0Ref
1308+ (tn, key) <- go key0 =<< getPreviousNode
1309+ setPreviousNode $ Just $ toNode tn
1310+ liftIO $ do
1311+ writeIORef textNodeRef tn
1312+ writeIORef keyRef key
13761313 pure (switchComment, textNodeRef, keyRef)
13771314
13781315{-# INLINABLE skipToReplaceStart #-}
1379−skipToReplaceStart :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef (Maybe Text))
1380−skipToReplaceStart = skipToAndReplaceComment "replace-start" =<< liftIO (newIORef $ Just "") -- TODO: Don't rely on clever usage @""@ to make this work.
1316+skipToReplaceStart :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef Text)
1317+skipToReplaceStart = skipToAndReplaceComment "replace-start" =<< liftIO (newIORef "")
13811318
13821319{-# INLINABLE skipToReplaceEnd #-}
1383−skipToReplaceEnd :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => IORef (Maybe Text) -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text)
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)
13841321skipToReplaceEnd key = fmap (\(m,e,_) -> (m,e)) $ skipToAndReplaceComment "replace-end" key
13851322
13861323instance SupportsHydrationDomBuilder t m => NotReady t (HydrationDomBuilderT s t m) where
@@ -1620,13 +1557,13 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16201557 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
16211558 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
16221559 ChildReadyState_Unready _ -> do
1623− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1560+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
16241561 return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)
16251562 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
16261563 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
16271564 deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)
16281565 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
1629− writeIORef sRef $ ChildReadyState_Unready $ Some <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
1566+ writeIORef sRef $ ChildReadyState_Unready $ This <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
16301567 return $ Constant ()
16311568 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
16321569 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
@@ -1636,8 +1573,8 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16361573 phsBefore <- liftIO $ readIORef placeholders
16371574 let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
16381575 collectIfMoved k e = do
1639− let mThisPlaceholder = Map.lookup (Some k) phsBefore -- Will be Nothing if this element wasn't present before
1640− nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsBefore
1576+ let mThisPlaceholder = Map.lookup (This k) phsBefore -- Will be Nothing if this element wasn't present before
1577+ nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phsBefore
16411578 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
16421579 False -> do
16431580 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
@@ -1656,7 +1593,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16561593 PatchMapWithMove.From_Move k -> Just $ PatchMapWithMove.From_Move k
16571594 let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant () a)
16581595 placeFragment k e = do
1659− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsAfter
1596+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phsAfter
16601597 case PatchDMapWithMove._nodeInfo_from e of
16611598 PatchDMapWithMove.From_Insert (Compose (TraverseChild x _)) -> case x of
16621599 Left _ -> pure ()
@@ -1672,7 +1609,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16721609
16731610{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
16741611traverseDMapWithKeyWithAdjust'
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)
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)
16761613 => (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
16771614 -> DMap k v
16781615 -> Event t (PatchDMap k v)
@@ -1687,7 +1624,7 @@ traverseDMapWithKeyWithAdjust' = do
16871624 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
16881625 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
16891626 ChildReadyState_Unready _ -> do
1690− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1627+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
16911628 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
16921629 delete _ (Constant sRef) = do
16931630 writeIORef sRef $ ChildReadyState_Unready Nothing
@@ -1698,9 +1635,9 @@ traverseDMapWithKeyWithAdjust' = do
16981635 hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholder (PatchDMap patch) -> do
16991636 phs <- liftIO $ readIORef placeholders
17001637 forM_ (DMap.toList patch) $ \(k :=> ComposeMaybe mv) -> do
1701− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phs
1638+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phs
17021639 -- Delete old node
1703− forM_ (Map.lookup (Some k) phs) $ \thisPlaceholder -> do
1640+ forM_ (Map.lookup (This k) phs) $ \thisPlaceholder -> do
17041641 thisPlaceholder `deleteUpTo` nextPlaceholder
17051642 -- Insert new node
17061643 forM_ mv $ \(Compose (TraverseChild e _)) -> case e of
@@ -1762,17 +1699,17 @@ traverseIntMapWithKeyWithAdjust' = do
17621699 liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
17631700
17641701{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1765− :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
1702+ :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM v')
17661703 -> IntMap v
1767− -> Event DomTimeline (PatchIntMap v)
1768− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1704+ -> Event Spider (PatchIntMap v)
1705+ -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
17691706 #-}
17701707
17711708{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1772− :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
1709+ :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM v')
17731710 -> IntMap v
1774− -> Event DomTimeline (PatchIntMap v)
1775− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1711+ -> Event Spider (PatchIntMap v)
1712+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
17761713 #-}
17771714
17781715data ChildReadyState a
@@ -1792,7 +1729,7 @@ hoistTraverseWithKeyWithAdjust
17921729 ::
17931730 ( Adjustable t m
17941731 , MonadHold t m
1795− , GCompare k
1732+ , DMap.GCompare k
17961733 , MonadIO m
17971734 , MonadJSM m
17981735 , PrimMonad m
@@ -1850,7 +1787,7 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18501787 liftIO $ writeIORef childReadyState ChildReadyState_Ready
18511788 case countedAt of
18521789 Nothing -> return ()
1853− Just (Some k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
1790+ Just (This k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
18541791 (oldUnready, p) <- liftIO $ readIORef pendingChange
18551792 when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
18561793 let newUnready = DMap.delete k oldUnready
@@ -1865,7 +1802,7 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18651802 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
18661803 ChildReadyState_Ready -> return Nothing
18671804 ChildReadyState_Unready _ -> do
1868− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1805+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
18691806 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
18701807 initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
18711808 liftIO $ if DMap.null initialUnready
@@ -1876,14 +1813,14 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18761813 getHydrationMode >>= \case
18771814 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
18781815 dm :: DMap k (Compose (TraverseChild t m (Some k)) v') <- sample $ currentIncremental children
1879− phs <- sequenceA $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
1816+ phs <- traverse id $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
18801817 liftIO $ writeIORef placeholders $! phs
18811818 insertAfterPreviousNode lastPlaceholder
18821819 HydrationMode_Immediate -> do
18831820 let activate i = do
18841821 append $ toNode $ _traverseChildImmediate_fragment i
18851822 pure $ _traverseChildImmediate_placeholder i
1886− phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
1823+ phs <- traverse id $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
18871824 liftIO $ writeIORef placeholders $! phs
18881825 append $ toNode lastPlaceholder
18891826 requestDomAction_ $ ffor children' $ \p -> do
@@ -2007,39 +1944,39 @@ hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_
20071944 return (result0, result')
20081945
20091946{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2010− :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
1947+ :: ((IntMap.Key -> v -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM Int v'))
20111948 -> IntMap v
2012− -> Event DomTimeline (PatchIntMap v)
2013− -> DomRenderHookT DomTimeline HydrationM (IntMap (TraverseChild DomTimeline HydrationM Int v'), Event DomTimeline (PatchIntMap (TraverseChild DomTimeline HydrationM Int v'))))
2014− -> (PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1949+ -> Event Spider (PatchIntMap v)
1950+ -> DomRenderHookT Spider HydrationM (IntMap (TraverseChild Spider HydrationM Int v'), Event Spider (PatchIntMap (TraverseChild Spider HydrationM Int v'))))
1951+ -> (PatchIntMap (TraverseChild Spider HydrationM Int v')
20151952 -> IntMap (IORef (ChildReadyState Int))
20161953 -> IO (IntMap (IORef (ChildReadyState Int))))
20171954 -> (IORef (IntMap DOM.Text)
20181955 -> DOM.Text
2019− -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1956+ -> PatchIntMap (TraverseChild Spider HydrationM Int v')
20201957 -> JSM ())
2021− -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
1958+ -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM v')
20221959 -> IntMap v
2023− -> Event DomTimeline (PatchIntMap v)
2024− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1960+ -> Event Spider (PatchIntMap v)
1961+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
20251962 #-}
20261963
20271964{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2028− :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
1965+ :: ((IntMap.Key -> v -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM Int v'))
20291966 -> IntMap v
2030− -> Event DomTimeline (PatchIntMap v)
2031− -> DomRenderHookT DomTimeline HydrationM (IntMap (TraverseChild DomTimeline HydrationM Int v'), Event DomTimeline (PatchIntMap (TraverseChild DomTimeline HydrationM Int v'))))
2032− -> (PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1967+ -> Event Spider (PatchIntMap v)
1968+ -> DomRenderHookT Spider HydrationM (IntMap (TraverseChild Spider HydrationM Int v'), Event Spider (PatchIntMap (TraverseChild Spider HydrationM Int v'))))
1969+ -> (PatchIntMap (TraverseChild Spider HydrationM Int v')
20331970 -> IntMap (IORef (ChildReadyState Int))
20341971 -> IO (IntMap (IORef (ChildReadyState Int))))
20351972 -> (IORef (IntMap DOM.Text)
20361973 -> DOM.Text
2037− -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1974+ -> PatchIntMap (TraverseChild Spider HydrationM Int v')
20381975 -> JSM ())
2039− -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
1976+ -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM v')
20401977 -> IntMap v
2041− -> Event DomTimeline (PatchIntMap v)
2042− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1978+ -> Event Spider (PatchIntMap v)
1979+ -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
20431980 #-}
20441981
20451982data TraverseChildImmediate k = TraverseChildImmediate
@@ -2109,17 +2046,17 @@ drawChildUpdate initialEnv markReady child = do
21092046 }
21102047
21112048{-# SPECIALIZE drawChildUpdate
2112− :: HydrationDomBuilderEnv DomTimeline HydrationM
2049+ :: HydrationDomBuilderEnv Spider HydrationM
21132050 -> (IORef (ChildReadyState Int) -> JSM ())
2114− -> HydrationDomBuilderT s DomTimeline HydrationM (Identity a)
2115− -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM Int) Identity a)
2051+ -> HydrationDomBuilderT s Spider HydrationM (Identity a)
2052+ -> DomRenderHookT Spider HydrationM (Compose (TraverseChild Spider HydrationM Int) Identity a)
21162053 #-}
21172054
21182055{-# SPECIALIZE drawChildUpdate
2119− :: HydrationDomBuilderEnv DomTimeline HydrationM
2056+ :: HydrationDomBuilderEnv Spider HydrationM
21202057 -> (IORef (ChildReadyState (Some k)) -> JSM ())
2121− -> HydrationDomBuilderT s DomTimeline HydrationM (f a)
2122− -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM (Some k)) f a)
2058+ -> HydrationDomBuilderT s Spider HydrationM (f a)
2059+ -> DomRenderHookT Spider HydrationM (Compose (TraverseChild Spider HydrationM (Some k)) f a)
21232060 #-}
21242061
21252062{-# INLINABLE drawChildUpdateInt #-}
@@ -2131,10 +2068,10 @@ drawChildUpdateInt :: (MonadIO m, MonadJSM m, Reflex t)
21312068drawChildUpdateInt env mark m = fmap runIdentity . getCompose <$> drawChildUpdate env mark (Identity <$> m)
21322069
21332070{-# SPECIALIZE drawChildUpdateInt
2134− :: HydrationDomBuilderEnv DomTimeline HydrationM
2071+ :: HydrationDomBuilderEnv Spider HydrationM
21352072 -> (IORef (ChildReadyState k) -> JSM ())
2136− -> HydrationDomBuilderT s DomTimeline HydrationM v
2137− -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM k v)
2073+ -> HydrationDomBuilderT s Spider HydrationM v
2074+ -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM k v)
21382075 #-}
21392076
21402077{-# INLINE mkHasFocus #-}
@@ -2297,7 +2234,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
22972234 Beforecopy -> return ()
22982235 Copy -> return ()
22992236 Beforepaste -> return ()
2300− Paste -> getPasteData
2237+ Paste -> return ()
23012238 Reset -> return ()
23022239 Search -> return ()
23032240 Selectstart -> return ()
@@ -2306,7 +2243,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
23062243 Touchend -> getTouchEvent
23072244 Touchcancel -> getTouchEvent
23082245 Mousewheel -> return ()
2309− Wheel -> getWheelEvent
2246+ Wheel -> return ()
23102247
23112248{-# INLINABLE defaultDomWindowEventHandler #-}
23122249defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
@@ -2347,7 +2284,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
23472284 Beforecopy -> return ()
23482285 Copy -> return ()
23492286 Beforepaste -> return ()
2350− Paste -> getPasteData
2287+ Paste -> return ()
23512288 Reset -> return ()
23522289 Search -> return ()
23532290 Selectstart -> return ()
@@ -2356,7 +2293,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
23562293 Touchend -> getTouchEvent
23572294 Touchcancel -> getTouchEvent
23582295 Mousewheel -> return ()
2359− Wheel -> getWheelEvent
2296+ Wheel -> return ()
23602297
23612298{-# INLINABLE withIsEvent #-}
23622299withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
@@ -2624,15 +2561,6 @@ getMouseEventCoords = do
26242561 e <- event
26252562 bisequence (getClientX e, getClientY e)
26262563
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−
26362564{-# INLINABLE getTouchEvent #-}
26372565getTouchEvent :: EventM e TouchEvent TouchEventResult
26382566getTouchEvent = do
@@ -2674,26 +2602,6 @@ getTouchEvent = do
26742602 , _touchEventResult_touches = touches
26752603 }
26762604
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−
26972605instance MonadSample t m => MonadSample t (HydrationDomBuilderT s t m) where
26982606 {-# INLINABLE sample #-}
26992607 sample = lift . sample
reflex-dom-core/src/Reflex/Dom/Builder/InputDisabled.hs−6
@@ -80,7 +80,6 @@ instance Adjustable t m => Adjustable t (InputDisabledT m) where
8080 runWithReplace a0 a' = InputDisabledT $ runWithReplace (coerce a0) (coerceEvent a')
8181 traverseDMapWithKeyWithAdjust f dm0 dm' = InputDisabledT $ traverseDMapWithKeyWithAdjust (\k v -> runInputDisabledT $ f k v) (coerce dm0) (coerceEvent dm')
8282 traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = InputDisabledT $ traverseDMapWithKeyWithAdjustWithMove (\k v -> runInputDisabledT $ f k v) (coerce dm0) (coerceEvent dm')
83− traverseIntMapWithKeyWithAdjust f m0 m' = InputDisabledT $ traverseIntMapWithKeyWithAdjust (\k v -> runInputDisabledT $ f k v) (coerce m0) (coerceEvent m')
8483
8584instance NotReady t m => NotReady t (InputDisabledT m) where
8685 notReadyUntil = lift . notReadyUntil
@@ -109,8 +108,3 @@ instance HasJSContext m => HasJSContext (InputDisabledT m) where
109108instance HasJS js m => HasJS js (InputDisabledT m) where
110109 type JSX (InputDisabledT m) = JSX m
111110 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+20−49
@@ -37,8 +37,6 @@ import Data.IntMap (IntMap)
3737import qualified Data.IntMap as IntMap
3838import qualified Data.Map as Map
3939import Data.Map.Misc (applyMap)
40−import Data.Maybe (fromMaybe)
41−import Data.Monoid ((<>))
4240import qualified Data.Set as Set
4341import Data.Text (Text)
4442import qualified Data.Text as T
@@ -56,6 +54,7 @@ import Reflex.PerformEvent.Class
5654import Reflex.PostBuild.Base
5755import Reflex.PostBuild.Class
5856import Reflex.TriggerEvent.Class
57+import System.Random (randomRIO)
5958
6059data StaticDomBuilderEnv t = StaticDomBuilderEnv
6160 { _staticDomBuilderEnv_shouldEscape :: Bool
@@ -64,7 +63,6 @@ data StaticDomBuilderEnv t = StaticDomBuilderEnv
6463 -- We use this to add a "selected" attribute to the appropriate "option" child element.
6564 -- This is not yet a perfect simulation of what the browser does, but it is much closer than doing nothing.
6665 -- 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
6866 }
6967
7068newtype StaticDomBuilderT t m a = StaticDomBuilderT
@@ -165,7 +163,7 @@ instance (SupportsStaticDomBuilder t m, Monad m) => HasDocument (StaticDomBuilde
165163instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m) => Adjustable t (StaticDomBuilderT t m) where
166164 runWithReplace a0 a' = do
167165 e <- StaticDomBuilderT ask
168− key <- replaceStart e
166+ key <- replaceStart
169167 (result0, result') <- lift $ runWithReplace (runStaticDomBuilderT a0 e) (flip runStaticDomBuilderT e <$> a')
170168 o <- hold (snd result0) $ fmapCheap snd result'
171169 StaticDomBuilderT $ modify $ (:) $ join o
@@ -175,9 +173,10 @@ instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m)
175173 traverseDMapWithKeyWithAdjust = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap
176174 traverseDMapWithKeyWithAdjustWithMove = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove
177175
178−replaceStart :: (DomBuilder t m, MonadIO m) => StaticDomBuilderEnv t -> m Text
179−replaceStart env = do
180− str <- show <$> liftIO (atomicModifyRef (_staticDomBuilderEnv_nextRunWithReplaceKey env) $ \k -> (succ k, k))
176+-- TODO remove this?
177+replaceStart :: (DomBuilder t m, MonadIO m) => m Text
178+replaceStart = do
179+ str <- liftIO $ replicateM 8 $ randomRIO ('a', 'z')
181180 let key = "-" <> T.pack str
182181 _ <- commentNode $ def { _commentNodeConfig_initialContents = "replace-start" <> key }
183182 pure key
@@ -274,7 +273,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
274273 --TODO: Do not escape quotation marks; see https://stackoverflow.com/questions/25612166/what-characters-must-be-escaped-in-html-5
275274 shouldEscape <- asks _staticDomBuilderEnv_shouldEscape
276275 let escape = if shouldEscape then fromHtmlEscapedText else byteString . encodeUtf8
277− (modify . (:)) . (\c -> "<!--" <> c <> "-->") =<< case mSetContents of
276+ modify . (:) =<< (\c -> "<!--" <> c <> "-->") <$> case mSetContents of
278277 Nothing -> return (pure (escape initialContents))
279278 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on
280279 return $ CommentNode ()
@@ -287,9 +286,8 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
287286 es <- newFanEventWithTrigger $ \_ _ -> return (return ())
288287 StaticDomBuilderT $ do
289288 let shouldEscape = elementTag `Set.notMember` noEscapeElements
290− nextRunWithReplaceKey <- asks _staticDomBuilderEnv_nextRunWithReplaceKey
291− (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing nextRunWithReplaceKey
292− attrs0 <- foldDyn applyMap (cfg ^. initialAttributes) (cfg ^. modifyAttributes)
289+ (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing
290+ attrs0 <- foldDyn applyMap (Map.insert "data-ssr" "" $ cfg ^. initialAttributes) (cfg ^. modifyAttributes)
293291 selectValue <- asks _staticDomBuilderEnv_selectValue
294292 let addSelectedAttr attrs sel = case Map.lookup "value" attrs of
295293 Just v | v == sel -> attrs <> Map.singleton "selected" ""
@@ -312,32 +310,13 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
312310 return (e, result)
313311 {-# INLINABLE inputElement #-}
314312 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
330− (e, _result) <- element "input" adjustedConfig $ return ()
331− v <- case _inputElementConfig_setValue cfg of
332− Nothing -> pure $ constDyn (cfg ^. inputElementConfig_initialValue)
333− Just ev -> holdDyn (cfg ^. inputElementConfig_initialValue) ev
334− c <- case _inputElementConfig_setChecked cfg of
335− Nothing -> pure $ constDyn $ _inputElementConfig_initialChecked cfg
336− Just ev -> holdDyn (_inputElementConfig_initialChecked cfg) ev
313+ (e, _result) <- element "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
314+ let v0 = constDyn $ cfg ^. inputElementConfig_initialValue
315+ let c0 = constDyn $ cfg ^. inputElementConfig_initialChecked
337316 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
338317 return $ InputElement
339− { _inputElement_value = v
340− , _inputElement_checked = c
318+ { _inputElement_value = v0
319+ , _inputElement_checked = c0
341320 , _inputElement_checkedChange = never
342321 , _inputElement_input = never
343322 , _inputElement_hasFocus = hasFocus
@@ -347,17 +326,12 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
347326 }
348327 {-# INLINABLE textAreaElement #-}
349328 textAreaElement cfg = do
350− (e, _domElement) <- element "textarea" (_textAreaElementConfig_elementConfig cfg) $ do
351− -- Set the initial value
352− void $ textNode $ def
353− & textNodeConfig_initialContents .~ _textAreaElementConfig_initialValue cfg
354− & textNodeConfig_setContents .~ fromMaybe never (_textAreaElementConfig_setValue cfg)
355− v <- case _textAreaElementConfig_setValue cfg of
356− Nothing -> pure $ constDyn (cfg ^. textAreaElementConfig_initialValue)
357− Just ev -> holdDyn (cfg ^. textAreaElementConfig_initialValue) ev
329+ --TODO: Support setValue event
330+ (e, _domElement) <- element "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
331+ let v0 = constDyn $ cfg ^. textAreaElementConfig_initialValue
358332 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
359333 return $ TextAreaElement
360− { _textAreaElement_value = v
334+ { _textAreaElement_value = v0
361335 , _textAreaElement_input = never
362336 , _textAreaElement_hasFocus = hasFocus
363337 , _textAreaElement_element = e
@@ -366,9 +340,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
366340 selectElement cfg child = do
367341 v <- holdDyn (cfg ^. selectElementConfig_initialValue) (cfg ^. selectElementConfig_setValue)
368342 (e, result) <- element "select" (_selectElementConfig_elementConfig cfg) $ do
369− (a, innerHtml) <- StaticDomBuilderT $ do
370− nextRunWithReplaceKey <- asks _staticDomBuilderEnv_nextRunWithReplaceKey
371− lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv False (Just $ current v) nextRunWithReplaceKey
343+ (a, innerHtml) <- StaticDomBuilderT $ lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv False $ Just (current v)
372344 StaticDomBuilderT $ lift $ modify $ (:) innerHtml
373345 return a
374346 let wrapped = SelectElement
@@ -390,8 +362,7 @@ renderStatic :: StaticWidget x a -> IO (a, ByteString)
390362renderStatic w = do
391363 runDomHost $ do
392364 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
393− nextRunWithReplaceKey <- newRef 0
394− let env0 = StaticDomBuilderEnv True Nothing nextRunWithReplaceKey
365+ let env0 = StaticDomBuilderEnv True Nothing
395366 ((res, bs), FireCommand fire) <- hostPerformEventT $ runStaticDomBuilderT (runPostBuildT w postBuild) env0
396367 mPostBuildTrigger <- readRef postBuildTriggerRef
397368 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
reflex-dom-core/src/Reflex/Dom/Class.hs+7−4
@@ -4,7 +4,8 @@ module Reflex.Dom.Class ( module Reflex.Dom.Class
44 , module Web.KeyCode
55 ) where
66
7−import Control.Lens
7+import Data.Map (Map)
8+import qualified Data.Map as Map
89import Reflex.Class
910import Web.KeyCode
1011
@@ -12,9 +13,11 @@ import Foreign.JavaScript.TH
1213import Reflex.PerformEvent.Class
1314import Reflex.PostBuild.Class
1415
15−-- | Previously an alias for 'Data.Map.singleton', but now generalised to 'At'
16−(=:) :: (At m, Monoid m) => Index m -> IxValue m -> m
17−k =: a = at k ?~ a $ mempty
16+import Prelude hiding (concat, mapM, mapM_, sequence)
17+
18+-- | Alias for Data.Map.singleton
19+(=:) :: k -> a -> Map k a
20+(=:) = Map.singleton
1821infixr 7 =: -- Ought to bind tighter than <>, which is infixr 6
1922
2023{-# DEPRECATED keycodeEnter "Instead of `x == keycodeEnter`, use `keyCodeLookup x == Enter`" #-}
reflex-dom-core/src/Reflex/Dom/Core.hs−1
@@ -6,7 +6,6 @@ module Reflex.Dom.Core (module X) where
66
77import Reflex as X hiding (askEvents)
88import Reflex.Dom.Builder.Class as X
9−import Reflex.Dom.Builder.Hydratable as X
109import Reflex.Dom.Builder.Immediate as X
1110import Reflex.Dom.Builder.InputDisabled as X
1211import Reflex.Dom.Builder.Static as X
reflex-dom-core/src/Reflex/Dom/Main.hs+34−86
@@ -5,6 +5,7 @@
55{-# LANGUAGE GADTs #-}
66{-# LANGUAGE MultiParamTypeClasses #-}
77{-# LANGUAGE NoMonomorphismRestriction #-}
8+{-# LANGUAGE PatternSynonyms #-}
89{-# LANGUAGE RankNTypes #-}
910{-# LANGUAGE RecursiveDo #-}
1011{-# LANGUAGE ScopedTypeVariables #-}
@@ -26,9 +27,6 @@ import Reflex.PostBuild.Base
2627import Reflex.Spider (Global, Spider, SpiderHost, runSpiderHost)
2728import Reflex.TriggerEvent.Base
2829import Reflex.TriggerEvent.Class
29−#ifdef PROFILE_REFLEX
30−import Reflex.Profiled
31−#endif
3230
3331import Control.Concurrent
3432import Control.Lens
@@ -72,14 +70,8 @@ mainHydrationWidgetWithSwitchoverAction = mainHydrationWidgetWithSwitchoverActio
7270{-# INLINABLE mainHydrationWidgetWithSwitchoverAction' #-}
7371-- | Warning: `mainHydrationWidgetWithSwitchoverAction'` is provided only as performance tweak. It is expected to disappear in future releases.
7472mainHydrationWidgetWithSwitchoverAction' :: JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()
75−mainHydrationWidgetWithSwitchoverAction' = mainHydrationWidgetWithSwitchoverActionWithFailure' (pure ())
76−
77−
78−{-# INLINABLE mainHydrationWidgetWithSwitchoverActionWithFailure' #-}
79−-- | Warning: `mainHydrationWidgetWithSwitchoverActionWithFaiilure'` is provided only as performance tweak. It is expected to disappear in future releases.
80−mainHydrationWidgetWithSwitchoverActionWithFailure' :: IO () -> JSM () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()
81−mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchoverAction head' body = do
82− runHydrationWidgetWithHeadAndBodyWithFailure onFailure switchoverAction $ \appendHead appendBody -> do
73+mainHydrationWidgetWithSwitchoverAction' switchoverAction head' body = do
74+ runHydrationWidgetWithHeadAndBody switchoverAction $ \appendHead appendBody -> do
8375 appendHead head'
8476 appendBody body
8577
@@ -94,21 +86,7 @@ attachHydrationWidget
9486 -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
9587 )
9688 -> IO (a, FireCommand DomTimeline DomHost)
97−attachHydrationWidget = attachHydrationWidgetWithFailure (pure ())
98−
99−{-# INLINABLE attachHydrationWidgetWithFailure #-}
100−attachHydrationWidgetWithFailure
101− :: IO ()
102− -> JSM ()
103− -> JSContextSingleton ()
104− -> ( Event DomTimeline ()
105− -> IORef HydrationMode
106− -> Maybe (IORef [(Node, HydrationRunnerT DomTimeline (DomCoreWidget ()) ())])
107− -> EventChannel
108− -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
109− )
110− -> IO (a, FireCommand DomTimeline DomHost)
111−attachHydrationWidgetWithFailure onFailure switchoverAction jsSing w = do
89+attachHydrationWidget switchoverAction jsSing w = do
11290 hydrationMode <- liftIO $ newIORef HydrationMode_Hydrating
11391 rootNodesRef <- liftIO $ newIORef []
11492 events <- newChan
@@ -124,7 +102,7 @@ attachHydrationWidgetWithFailure onFailure switchoverAction jsSing w = do
124102 rootNodes <- liftIO $ readIORef rootNodesRef
125103 let delayedAction = do
126104 for_ (reverse rootNodes) $ \(rootNode, runner) -> do
127− let hydrate = runHydrationRunnerTWithFailure runner onFailure Nothing rootNode events
105+ let hydrate = runHydrationRunnerT runner Nothing rootNode events
128106 void $ runWithJSContextSingleton (runPostBuildT hydrate never) jsSing
129107 liftIO $ writeIORef hydrationMode HydrationMode_Immediate
130108 runWithJSContextSingleton (DOM.liftJSM switchoverAction) jsSing
@@ -140,27 +118,16 @@ type DomCoreWidget x = PostBuildT DomTimeline (WithJSContextSingleton x (Perform
140118{-# INLINABLE runHydrationWidgetWithHeadAndBody #-}
141119runHydrationWidgetWithHeadAndBody
142120 :: JSM ()
143− -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once
144− -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body" --TODO: test invoking this more than once
121+ -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head"
122+ -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body"
145123 -> FloatingWidget () ()
146124 )
147125 -> JSM ()
148−runHydrationWidgetWithHeadAndBody = runHydrationWidgetWithHeadAndBodyWithFailure (pure ())
149−
150−{-# INLINABLE runHydrationWidgetWithHeadAndBodyWithFailure #-}
151−runHydrationWidgetWithHeadAndBodyWithFailure
152− :: IO ()
153− -> JSM ()
154− -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once
155− -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body" --TODO: test invoking this more than once
156− -> FloatingWidget () ()
157− )
158− -> JSM ()
159−runHydrationWidgetWithHeadAndBodyWithFailure onFailure switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
126+runHydrationWidgetWithHeadAndBody switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
160127 globalDoc <- currentDocumentUnchecked
161128 headElement <- getHeadUnchecked globalDoc
162129 bodyElement <- getBodyUnchecked globalDoc
163− (events, fc) <- liftIO . attachHydrationWidgetWithFailure onFailure switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
130+ (events, fc) <- liftIO . attachHydrationWidget switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
164131 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
165132 let hydrateDom :: DOM.Node -> HydrationWidget () c -> FloatingWidget () c
166133 hydrateDom n w = do
@@ -242,48 +209,39 @@ type Widget x = ImmediateDomBuilderT DomTimeline (DomCoreWidget x)
242209attachWidget :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> JSM a
243210attachWidget rootElement wv w = fst <$> attachWidget' rootElement wv w
244211
245−{-# INLINABLE runImmediateWidgetWithHeadAndBody #-}
246−runImmediateWidgetWithHeadAndBody
247− :: ( (forall c. Widget () c -> FloatingWidget () c) -- "Append to head"
248− -> (forall c. Widget () c -> FloatingWidget () c) -- "Append to body"
249− -> FloatingWidget () ()
250− )
251− -> JSM ()
252−runImmediateWidgetWithHeadAndBody app = withJSContextSingletonMono $ \jsSing -> do
253− globalDoc <- currentDocumentUnchecked
254− headElement <- getHeadUnchecked globalDoc
255− bodyElement <- getBodyUnchecked globalDoc
256− headFragment <- createDocumentFragment globalDoc
257− bodyFragment <- createDocumentFragment globalDoc
258− (events, fc) <- liftIO . attachImmediateWidget $ \hydrationMode events -> do
212+-- | Warning: `mainWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.
213+mainWidgetWithHead' :: (a -> Widget () b, b -> Widget () a) -> JSM ()
214+mainWidgetWithHead' widgets = withJSContextSingletonMono $ \jsSing -> do
215+ doc <- currentDocumentUnchecked
216+ headElement <- getHeadUnchecked doc
217+ headFragment <- createDocumentFragment doc
218+ bodyElement <- getBodyUnchecked doc
219+ bodyFragment <- createDocumentFragment doc
220+ hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
221+ (events, fc) <- liftIO . attachWidget'' $ \events -> do
222+ let (headWidget, bodyWidget) = widgets
259223 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
260− let go :: forall c. DOM.DocumentFragment -> Widget () c -> FloatingWidget () c
261− go df w = do
224+ let go :: forall c. Widget () c -> DOM.DocumentFragment -> PerformEventT DomTimeline DomHost c
225+ go w df = do
262226 unreadyChildren <- liftIO $ newIORef 0
263227 delayed <- liftIO $ newIORef $ pure ()
264228 let builderEnv = HydrationDomBuilderEnv
265− { _hydrationDomBuilderEnv_document = globalDoc
229+ { _hydrationDomBuilderEnv_document = toDocument doc
266230 , _hydrationDomBuilderEnv_parent = Left $ toNode df
267231 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
268− , _hydrationDomBuilderEnv_commitAction = pure () --TODO: possibly `replaceElementContents n f`
269− , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
232+ , _hydrationDomBuilderEnv_commitAction = return () --TODO
270233 , _hydrationDomBuilderEnv_switchover = never
271234 , _hydrationDomBuilderEnv_delayed = delayed
235+ , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
272236 }
273− lift $ runHydrationDomBuilderT w builderEnv events
274− runWithJSContextSingleton (runPostBuildT (runTriggerEventT (app (go headFragment) (go bodyFragment)) events) postBuild) jsSing
237+ runWithJSContextSingleton (runPostBuildT (runHydrationDomBuilderT w builderEnv events) postBuild) jsSing
238+ rec b <- go (headWidget a) headFragment
239+ a <- go (bodyWidget b) bodyFragment
275240 return (events, postBuildTriggerRef)
276241 replaceElementContents headElement headFragment
277242 replaceElementContents bodyElement bodyFragment
278243 liftIO $ processAsyncEvents events fc
279244
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−
287245replaceElementContents :: DOM.IsElement e => e -> DOM.DocumentFragment -> JSM ()
288246replaceElementContents e df = do
289247 setInnerHTML e ("" :: String)
@@ -295,7 +253,8 @@ attachWidget' :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> J
295253attachWidget' rootElement jsSing w = do
296254 doc <- getOwnerDocumentUnchecked rootElement
297255 df <- createDocumentFragment doc
298− ((a, events), fc) <- liftIO . attachImmediateWidget $ \hydrationMode events -> do
256+ hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
257+ ((a, events), fc) <- liftIO . attachWidget'' $ \events -> do
299258 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
300259 unreadyChildren <- liftIO $ newIORef 0
301260 delayed <- liftIO $ newIORef $ pure ()
@@ -316,18 +275,12 @@ attachWidget' rootElement jsSing w = do
316275
317276type EventChannel = Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
318277
319−{-# INLINABLE attachImmediateWidget #-}
320−attachImmediateWidget
321− :: ( IORef HydrationMode
322− -> EventChannel
323− -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
324− )
325− -> IO (a, FireCommand DomTimeline DomHost)
326−attachImmediateWidget w = do
327− hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
278+{-# INLINABLE attachWidget'' #-}
279+attachWidget'' :: (EventChannel -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))) -> IO (a, FireCommand DomTimeline DomHost)
280+attachWidget'' w = do
328281 events <- newChan
329282 runDomHost $ do
330− ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w hydrationMode events
283+ ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w events
331284 mPostBuildTrigger <- readRef postBuildTriggerRef
332285 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
333286 return (result, fc)
@@ -369,8 +322,3 @@ runApp' app = withJSContextSingleton $ \jsSing -> do
369322 { _appInput_window = w
370323 }
371324 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,5 +1,6 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE ExplicitForAll #-}
34{-# LANGUAGE FlexibleContexts #-}
45{-# LANGUAGE FlexibleInstances #-}
56{-# LANGUAGE MultiParamTypeClasses #-}
reflex-dom-core/src/Reflex/Dom/Prerender.hs+25−135
@@ -1,18 +1,17 @@
11{-# LANGUAGE ConstraintKinds #-}
2−{-# LANGUAGE CPP #-}
3−{-# LANGUAGE EmptyCase #-}
2+{-# LANGUAGE EmptyDataDecls #-}
43{-# LANGUAGE FlexibleContexts #-}
54{-# LANGUAGE FlexibleInstances #-}
65{-# LANGUAGE FunctionalDependencies #-}
7−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
86{-# LANGUAGE LambdaCase #-}
97{-# LANGUAGE OverloadedStrings #-}
8+{-# LANGUAGE MultiParamTypeClasses #-}
109{-# LANGUAGE Rank2Types #-}
1110{-# LANGUAGE RecursiveDo #-}
1211{-# LANGUAGE ScopedTypeVariables #-}
1312{-# LANGUAGE TypeFamilies #-}
13+{-# LANGUAGE TypeSynonymInstances #-}
1414{-# LANGUAGE UndecidableInstances #-}
15−{-# LANGUAGE UndecidableSuperClasses #-}
1615
1716-- | Render the first widget on the server, and the second on the client.
1817module Reflex.Dom.Prerender
@@ -22,22 +21,20 @@ module Reflex.Dom.Prerender
2221 , PrerenderBaseConstraints
2322 ) where
2423
25−import Control.Monad.Primitive (PrimMonad(..))
24+import Control.Monad.Primitive (PrimMonad)
2625import Control.Monad.Reader
27−import Control.Monad.Ref (MonadRef(..), MonadAtomicRef(..))
26+import Control.Monad.Ref (MonadRef(..))
2827import Data.IORef (IORef, newIORef)
29−import Data.Semigroup (Semigroup)
3028import Data.Text (Text)
31−import Data.Void
3229import Foreign.JavaScript.TH
3330import GHCJS.DOM.Types (MonadJSM)
3431import Reflex hiding (askEvents)
3532import Reflex.Dom.Builder.Class
36−import Reflex.Dom.Builder.Hydratable
3733import Reflex.Dom.Builder.Immediate
3834import Reflex.Dom.Builder.InputDisabled
3935import Reflex.Dom.Builder.Static
4036import Reflex.Host.Class
37+import Reflex.Requester.Base
4138import Data.IntMap.Strict (IntMap)
4239import qualified Data.IntMap.Strict as IntMap
4340
@@ -51,6 +48,7 @@ type PrerenderClientConstraint js t m =
5148 , DomRenderHook t m
5249 , HasDocument m
5350 , TriggerEvent t m
51+ , Prerender js t m
5452 , PrerenderBaseConstraints js t m
5553 )
5654
@@ -78,16 +76,16 @@ type PrerenderBaseConstraints js t m =
7876-- hydration builder will run *both* widgets.
7977prerender_
8078 :: (Functor m, Reflex t, Prerender js t m)
81− => m () -> Client m () -> m ()
79+ => m () -> ((PrerenderClientConstraint js t (Client m)) => Client m ()) -> m ()
8280prerender_ server client = void $ prerender server client
8381
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
82+class Prerender js t m | m -> t js where
8583 -- | Monad in which the client widget is built
8684 type Client m :: * -> *
8785 -- | Render the first widget on the server, and the second on the client. The
8886 -- hydration builder will run *both* widgets, updating the result dynamic at
8987 -- switchover time.
90− prerender :: m a -> Client m a -> m (Dynamic t a)
88+ prerender :: m a -> ((PrerenderClientConstraint js t (Client m)) => Client m a) -> m (Dynamic t a)
9189
9290instance (ReflexHost t, Adjustable t m, PrerenderBaseConstraints js t m) => Prerender js t (HydrationDomBuilderT GhcjsDomSpace t m) where
9391 type Client (HydrationDomBuilderT GhcjsDomSpace t m) = HydrationDomBuilderT GhcjsDomSpace t m
@@ -103,138 +101,34 @@ instance (Adjustable t m, PrerenderBaseConstraints js t m, ReflexHost t) => Prer
103101 env <- HydrationDomBuilderT ask
104102 events <- askEvents
105103 doc <- askDocument
106− serverDf <- Document.createDocumentFragment doc -- server dom should not be mounted in the window's doc in hydration
107104 df <- Document.createDocumentFragment doc
108105 unreadyChildren <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_unreadyChildren
109− immediateMode <- liftIO $ newIORef HydrationMode_Immediate
106+ hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
110107 delayed <- liftIO $ newIORef $ pure ()
111− let clientEnv = env
112− { _hydrationDomBuilderEnv_parent = Left $ DOM.toNode df
113− , _hydrationDomBuilderEnv_hydrationMode = immediateMode
114− }
115− serverEnv = HydrationDomBuilderEnv
108+ let env' = HydrationDomBuilderEnv
116109 { _hydrationDomBuilderEnv_document = doc
117− , _hydrationDomBuilderEnv_parent = Left $ DOM.toNode serverDf
110+ , _hydrationDomBuilderEnv_parent = Left $ DOM.toNode df
118111 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
119112 , _hydrationDomBuilderEnv_commitAction = pure ()
120113 , _hydrationDomBuilderEnv_delayed = delayed
121− , _hydrationDomBuilderEnv_hydrationMode = immediateMode
114+ , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
122115 , _hydrationDomBuilderEnv_switchover = never
123116 }
124− a0 <- lift $ runHydrationDomBuilderT server serverEnv events
117+ a0 <- lift $ runHydrationDomBuilderT server (env { _hydrationDomBuilderEnv_delayed = delayed }) events
125118 (a', trigger) <- newTriggerEvent
126119 getHydrationMode >>= \case
127120 HydrationMode_Immediate -> do
128− liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') clientEnv events
121+ liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') env' events
129122 append $ DOM.toNode df
130123 HydrationMode_Hydrating -> addHydrationStep $ do
131− liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') clientEnv events
124+ liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') env' events
132125 insertBefore df =<< deleteToPrerenderEnd doc
133126 holdDyn a0 a'
134127
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 {}
128+data NoJavaScript -- This type should never have a HasJS instance
140129
141−instance (Reflex t, Monad m) => DomBuilder t (UnrunnableT js t m) where
142− type DomBuilderSpace (UnrunnableT js t m) = GhcjsDomSpace
143− textNode _ = unrunnable
144− commentNode _ = unrunnable
145− element _ _ _ = unrunnable
146− inputElement _ = unrunnable
147− textAreaElement _ = unrunnable
148− selectElement _ _ = unrunnable
149− placeRawElement _ = unrunnable
150− wrapRawElement _ _ = unrunnable
151−instance (Reflex t, Monad m) => NotReady t (UnrunnableT js t m) where
152− notReadyUntil _ = unrunnable
153− notReady = unrunnable
154−instance (Reflex t, Monad m) => Adjustable t (UnrunnableT js t m) where
155− runWithReplace _ _ = unrunnable
156− traverseIntMapWithKeyWithAdjust _ _ _ = unrunnable
157− traverseDMapWithKeyWithAdjust _ _ _ = unrunnable
158− traverseDMapWithKeyWithAdjustWithMove _ _ _ = unrunnable
159−instance (Reflex t, Monad m) => PerformEvent t (UnrunnableT js t m) where
160− type Performable (UnrunnableT js t m) = UnrunnableT js t m
161− performEvent _ = unrunnable
162− performEvent_ _ = unrunnable
163−instance Monad m => MonadRef (UnrunnableT js t m) where
164− type Ref (UnrunnableT js t m) = Ref IO
165− newRef _ = unrunnable
166− readRef _ = unrunnable
167− writeRef _ _ = unrunnable
168−instance Monad m => MonadAtomicRef (UnrunnableT js t m) where
169− atomicModifyRef _ _ = unrunnable
170−instance Monad m => HasDocument (UnrunnableT js t m) where
171− askDocument = unrunnable
172−instance Monad m => HasJSContext (UnrunnableT js t m) where
173− type JSContextPhantom (UnrunnableT js t m) = ()
174− askJSContext = unrunnable
175−instance Monad m => HasJS JS' (UnrunnableT js t m) where
176− type JSX (UnrunnableT js t m) = UnrunnableT js t m
177− liftJS _ = unrunnable
178−instance Monad m => MonadJS JS' (UnrunnableT js t m) where
179− runJS _ _ = unrunnable
180− forkJS _ = unrunnable
181− mkJSUndefined = unrunnable
182− isJSNull _ = unrunnable
183− isJSUndefined _ = unrunnable
184− fromJSBool _ = unrunnable
185− fromJSString _ = unrunnable
186− fromJSArray _ = unrunnable
187− fromJSUint8Array _ = unrunnable
188− fromJSNumber _ = unrunnable
189− withJSBool _ _ = unrunnable
190− withJSString _ _ = unrunnable
191− withJSNumber _ _ = unrunnable
192− withJSArray _ _ = unrunnable
193− withJSUint8Array _ _ = unrunnable
194− mkJSFun _ = unrunnable
195− freeJSFun _ = unrunnable
196− setJSProp _ _ _ = unrunnable
197− getJSProp _ _ = unrunnable
198− withJSNode _ _ = unrunnable
199−instance Monad m => TriggerEvent t (UnrunnableT js t m) where
200− newTriggerEvent = unrunnable
201− newTriggerEventWithOnComplete = unrunnable
202− newEventWithLazyTriggerWithOnComplete _ = unrunnable
203−instance Monad m => MonadReflexCreateTrigger t (UnrunnableT js t m) where
204− newEventWithTrigger _ = unrunnable
205− newFanEventWithTrigger _ = unrunnable
206−instance Monad m => MonadFix (UnrunnableT js t m) where
207− mfix _ = unrunnable
208−instance (Monad m, MonadHold t m) => MonadHold t (UnrunnableT js t m) where
209− hold _ _ = unrunnable
210− holdDyn _ _ = unrunnable
211− holdIncremental _ _ = unrunnable
212− buildDynamic _ _ = unrunnable
213− headE _ = unrunnable
214− now = unrunnable
215−instance Monad m => MonadSample t (UnrunnableT js t m) where
216− sample _ = unrunnable
217−instance Monad m => MonadIO (UnrunnableT js t m) where
218− liftIO _ = unrunnable
219−#ifndef ghcjs_HOST_OS
220−instance Monad m => MonadJSM (UnrunnableT js t m) where
221− liftJSM' _ = unrunnable
222−#endif
223−instance (Reflex t, Monad m) => PostBuild t (UnrunnableT js t m) where
224− getPostBuild = unrunnable
225−instance Monad m => PrimMonad (UnrunnableT js t m) where
226− type PrimState (UnrunnableT js t m) = PrimState IO
227− primitive _ = unrunnable
228−instance (Reflex t, Monad m) => DomRenderHook t (UnrunnableT js t m) where
229− withRenderHook _ _ = unrunnable
230− requestDomAction _ = unrunnable
231− requestDomAction_ _ = unrunnable
232−instance (Reflex t, Monad m, MonadHold t m) => Prerender JS' t (UnrunnableT js t m) where
233− type Client (UnrunnableT js t m) = UnrunnableT js t m
234− prerender _ _ = unrunnable
235−
236−instance (SupportsStaticDomBuilder t m) => Prerender JS' t (StaticDomBuilderT t m) where
237− type Client (StaticDomBuilderT t m) = UnrunnableT JS' t m
130+instance (js ~ NoJavaScript, SupportsStaticDomBuilder t m) => Prerender js t (StaticDomBuilderT t m) where
131+ type Client (StaticDomBuilderT t m) = HydrationDomBuilderT GhcjsDomSpace t m
238132 prerender server _ = do
239133 _ <- commentNode $ CommentNodeConfig startMarker Nothing
240134 a <- server
@@ -274,10 +168,10 @@ instance (Prerender js t m, MonadFix m, Reflex t) => Prerender js t (RequesterT
274168 (x, e) <- runRequesterT w (selectInt fannedResponses selector)
275169 pure (x, fmapCheap (IntMap.singleton selector) e)
276170 (result, requestsDyn) <- fmap splitDynPure $ lift $ prerender (withFannedResponses server 0) (withFannedResponses client 1)
277− responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switchPromptlyDyn requestsDyn
278− return result
171+ responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switch $ current requestsDyn
172+ pure result
279173
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
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
281175 type Client (QueryT t q m) = QueryT t q (Client m)
282176 prerender server client = mdo
283177 result <- queryDyn query
@@ -287,12 +181,8 @@ instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Group q, Additive q,
287181 pure a
288182
289183instance (Prerender js t m, Monad m) => Prerender js t (InputDisabledT m) where
290− type Client (InputDisabledT m) = InputDisabledT (Client m)
291− prerender (InputDisabledT server) (InputDisabledT client) = InputDisabledT $ prerender server client
292−
293−instance (Prerender js t m, Monad m) => Prerender js t (HydratableT m) where
294− type Client (HydratableT m) = HydratableT (Client m)
295− prerender (HydratableT server) (HydratableT client) = HydratableT $ prerender server client
184+ type Client (InputDisabledT m) = Client m
185+ prerender (InputDisabledT server) client = InputDisabledT $ prerender server client
296186
297187instance (Prerender js t m, Monad m, ReflexHost t) => Prerender js t (PostBuildT t m) where
298188 type Client (PostBuildT t m) = PostBuildT t (Client m)
reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs+29−10
@@ -60,7 +60,6 @@ module Reflex.Dom.Widget.Basic
6060 , partitionMapBySetLT
6161 ) where
6262
63−import Reflex.Adjustable.Class
6463import Reflex.Class
6564import Reflex.Collection
6665import Reflex.Dom.Builder.Class
@@ -145,25 +144,23 @@ button t = do
145144
146145--TODO: Should this be renamed to 'widgetView' for consistency with 'widgetHold'?
147146-- | Given a Dynamic of widget-creating actions, create a widget that is recreated whenever the Dynamic updates.
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.
147+-- The returned Event of widget results occurs when the Dynamic does.
151148-- Note: Often, the type @a@ is an 'Event', in which case the return value is an Event-of-Events that would typically be flattened (via 'switchHold').
152−dyn :: (Adjustable t m, NotReady t m, PostBuild t m) => Dynamic t (m a) -> m (Event t a)
149+dyn :: (DomBuilder t m, PostBuild t m) => Dynamic t (m a) -> m (Event t a)
153150dyn = networkView
154151
155152-- | Like 'dyn' but discards result.
156−dyn_ :: (Adjustable t m, NotReady t m, PostBuild t m) => Dynamic t (m a) -> m ()
153+dyn_ :: (DomBuilder t m, PostBuild t m) => Dynamic t (m a) -> m ()
157154dyn_ = void . dyn
158155
159156-- | Given an initial widget and an Event of widget-creating actions, create a widget that is recreated whenever the Event fires.
160157-- The returned Dynamic of widget results occurs when the Event does.
161158-- Note: Often, the type 'a' is an Event, in which case the return value is a Dynamic-of-Events that would typically be flattened (via 'switchDyn').
162−widgetHold :: (Adjustable t m, MonadHold t m) => m a -> Event t (m a) -> m (Dynamic t a)
159+widgetHold :: (DomBuilder t m, MonadHold t m) => m a -> Event t (m a) -> m (Dynamic t a)
163160widgetHold = networkHold
164161
165162-- | Like 'widgetHold' but discards result.
166−widgetHold_ :: (Adjustable t m, MonadHold t m) => m a -> Event t (m a) -> m ()
163+widgetHold_ :: (DomBuilder t m, MonadHold t m) => m a -> Event t (m a) -> m ()
167164widgetHold_ z = void . widgetHold z
168165
169166-- | Create a DOM element
@@ -271,10 +268,34 @@ dynamicAttributesToModifyAttributesWithInitial attrs0 d = do
271268 return $ if Map.null p then Nothing else Just p
272269 return modificationsNeeded
273270
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+
274293newtype Link t
275294 = Link { _link_clicked :: Event t ()
276295 }
277296
297+-- | >>> linkClass "Click here" "link-class"
298+-- > <a class="link-class">Click here</a>
278299linkClass :: DomBuilder t m => Text -> Text -> m (Link t)
279300linkClass s c = do
280301 (l,_) <- elAttr' "a" ("class" =: c) $ text s
@@ -294,7 +315,6 @@ dtdd h w = do
294315blank :: forall m. Monad m => m ()
295316blank = return ()
296317
297−-- TODO: Move to an example project.
298318-- | A widget to display a table with static columns and dynamic rows.
299319tableDynAttr :: forall t m r k v. (Ord k, DomBuilder t m, MonadHold t m, PostBuild t m, MonadFix m)
300320 => Text -- ^ Class applied to <table> element
@@ -311,7 +331,6 @@ tableDynAttr klass cols dRows rowAttrs = elAttr "div" (Map.singleton "style" "zo
311331 dAttrs <- rowAttrs k
312332 elDynAttr' "tr" dAttrs $ mapM (\x -> el "td" $ snd x k r) cols)
313333
314−-- TODO: Move to an example project.
315334-- | A widget to construct a tabbed view that shows only one of its child widgets at a time.
316335-- Creates a header bar containing a <ul> with one <li> per child; clicking a <li> displays
317336-- the corresponding child and hides all others.
reflex-dom-core/src/Reflex/Dom/Widget/Input.hs+43−9
@@ -54,7 +54,6 @@ import qualified Text.Read as T
5454import qualified GHCJS.DOM.Event as Event
5555import qualified GHCJS.DOM.HTMLInputElement as Input
5656
57−{-# DEPRECATED TextInput, _textInput_element, TextInputConfig, textInput "Use 'inputElement' directly" #-}
5857data TextInput t
5958 = TextInput { _textInput_value :: Dynamic t Text
6059 , _textInput_input :: Event t Text
@@ -162,7 +161,6 @@ rangeInput (RangeInputConfig initial eSetValue dAttrs) = do
162161 , _rangeInput_element = _inputElement_raw i
163162 }
164163
165−{-# DEPRECATED TextAreaConfig, TextArea, textArea "Use 'textAreaElement' directly" #-}
166164data TextAreaConfig t
167165 = TextAreaConfig { _textAreaConfig_initialValue :: Text
168166 , _textAreaConfig_setValue :: Event t Text
@@ -200,7 +198,6 @@ textArea (TextAreaConfig initial eSet attrs) = do
200198 , _textArea_element = _textAreaElement_raw i
201199 }
202200
203−{-# DEPRECATED CheckboxConfig, Checkbox, checkbox, checkboxView, CheckboxViewEventResultType, regularToCheckboxViewEventType, CheckboxViewEventResult "Use 'inputElement' directly" #-}
204201data CheckboxConfig t
205202 = CheckboxConfig { _checkboxConfig_setValue :: Event t Bool
206203 , _checkboxConfig_attributes :: Dynamic t (Map Text Text)
@@ -290,7 +287,7 @@ regularToCheckboxViewEventType en r = case en of
290287
291288newtype CheckboxViewEventResult en = CheckboxViewEventResult { unCheckboxViewEventResult :: CheckboxViewEventResultType en }
292289
293−-- | Create a view only checkbox
290+--TODO
294291{-# INLINABLE checkboxView #-}
295292checkboxView :: 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)
296293checkboxView dAttrs dValue = do
@@ -324,7 +321,6 @@ checkboxView dAttrs dValue = do
324321 i <- inputElement inputElementConfig
325322 return $ unCheckboxViewEventResult <$> select (_element_events $ _inputElement_element i) (WrapArg Click)
326323
327−{-# DEPRECATED FileInput, FileInputConfig, fileInput "Use 'inputElement' directly" #-}
328324data FileInput d t
329325 = FileInput { _fileInput_value :: Dynamic t [File]
330326 , _fileInput_element :: RawInputElement d
@@ -437,12 +433,9 @@ dropdown k0 options (DropdownConfig setK attrs) = do
437433 let xs = fmap (\(ix, (k, v)) -> ((ix, k), ((ix, k), v))) $ zip [0::Int ..] $ Map.toList os
438434 in (Map.fromList $ map snd xs, Bimap.fromList $ map fst xs)
439435 modifyAttrs <- dynamicAttributesToModifyAttributes attrs
440− postBuild <- getPostBuild
441− let setSelection = attachPromptlyDynWithMaybe (flip Bimap.lookupR) ixKeys $
442− leftmost [setK, k0 <$ postBuild]
443436 let cfg = def
444437 & selectElementConfig_elementConfig . elementConfig_modifyAttributes .~ fmap mapKeysToAttributeName modifyAttrs
445− & selectElementConfig_setValue .~ fmap (T.pack . show) setSelection
438+ & selectElementConfig_setValue .~ fmap (T.pack . show) (attachPromptlyDynWithMaybe (flip Bimap.lookupR) ixKeys setK)
446439 (eRaw, _) <- selectElement cfg $ listWithKey indexedOptions $ \(ix, k) v -> do
447440 let optionAttrs = fmap (\dk -> "value" =: T.pack (show ix) <> if dk == k then "selected" =: "selected" else mempty) defaultKey
448441 elDynAttr "option" optionAttrs $ dynText v
@@ -629,6 +622,9 @@ instance HasAttributes (FileInputConfig t) where
629622 type Attrs (FileInputConfig t) = Dynamic t (Map Text Text)
630623 attributes = fileInputConfig_attributes
631624
625+class HasSetValue a where
626+ type SetValue a :: *
627+ setValue :: Lens' a (SetValue a)
632628
633629instance HasSetValue (TextAreaConfig t) where
634630 type SetValue (TextAreaConfig t) = Event t Text
@@ -685,3 +681,41 @@ instance HasValue (Dropdown t k) where
685681instance HasValue (Checkbox t) where
686682 type Value (Checkbox t) = Dynamic t Bool
687683 value = _checkbox_value
684+
685+{-
686+type family Controller sm t a where
687+ Controller Edit t a = (a, Event t a) -- Initial value and setter
688+ Controller View t a = Dynamic t a -- Value (always)
689+
690+type family Output sm t a where
691+ Output Edit t a = Dynamic t a -- Value (always)
692+ Output View t a = Event t a -- Requested changes
693+
694+data CheckboxConfig sm t
695+ = CheckboxConfig { _checkbox_input :: Controller sm t Bool
696+ , _checkbox_attributes :: Attributes
697+ }
698+
699+instance Reflex t => Default (CheckboxConfig Edit t) where
700+ def = CheckboxConfig (False, never) mempty
701+
702+data Checkbox sm t
703+ = Checkbox { _checkbox_output :: Output sm t Bool
704+ }
705+
706+data StateMode = Edit | View
707+
708+--TODO: There must be a more generic way to get this witness and allow us to case on the type-level StateMode
709+data StateModeWitness (sm :: StateMode) where
710+ EditWitness :: StateModeWitness Edit
711+ ViewWitness :: StateModeWitness View
712+
713+class HasStateModeWitness (sm :: StateMode) where
714+ stateModeWitness :: StateModeWitness sm
715+
716+instance HasStateModeWitness Edit where
717+ stateModeWitness = EditWitness
718+
719+instance HasStateModeWitness View where
720+ stateModeWitness = ViewWitness
721+-}
reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+2−2
@@ -108,7 +108,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu
108108 uniqWindow <- holdUniqDyn window
109109 return (uniqWindow, result)
110110 where
111− toStyleAttr m = "style" =: Map.foldrWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
111+ toStyleAttr m = "style" =: Map.foldWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
112112 mkViewport h = toStyleAttr $ "overflow" =: "auto" <> "position" =: "absolute" <>
113113 "left" =: "0" <> "right" =: "0" <> "height" =: (T.pack (show h) <> "px")
114114 mkContainer h = toStyleAttr $ "position" =: "relative" <> "height" =: (T.pack (show h) <> "px")
@@ -117,7 +117,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu
117117 "overflow" =: "hidden" <>
118118 "position" =: "relative"
119119 mkRow k = toStyleAttr $ "height" =: (T.pack (show rowPx) <> "px") <>
120− "top" =: (<> "px") (T.pack $ show $ keyToIndex k * rowPx) <>
120+ "top" =: ((<>"px") $ T.pack $ show $ keyToIndex k * rowPx) <>
121121 "position" =: "absolute" <>
122122 "width" =: "100%"
123123 findWindow sizeIncrement windowSize startingPosition =
reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+4−8
@@ -33,23 +33,19 @@ import qualified GHCJS.DOM.Types as DOM
3333
3434-- | A widget that wraps the given widget in a div and fires an event when resized.
3535-- Adapted from @github.com\/marcj\/css-element-queries@
36−--
37−-- This function can cause strange scrollbars to appear in some circumstances.
38−-- These can be hidden with pseudo selectors, for example, in webkit browsers:
39−-- .wrapper *::-webkit-scrollbar { width: 0px; background: transparent; }
40−resizeDetector :: (MonadJSM m, DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadJSM (Performable m), MonadFix m) => m a -> m (Event t (Maybe Double, Maybe Double), a)
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)
4137resizeDetector = resizeDetectorWithStyle ""
4238
4339resizeDetectorWithStyle :: (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)
4440 => Text -- ^ A css style string. Warning: It should not contain the "position" style attribute.
4541 -> m a -- ^ 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
42+ -> m (Event t (), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget
4743resizeDetectorWithStyle styleString = resizeDetectorWithAttrs ("style" =: styleString)
4844
4945resizeDetectorWithAttrs :: (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)
5046 => Map Text Text -- ^ A map of attributes. Warning: It should not modify the "position" style attribute.
5147 -> m a -- ^ 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
48+ -> m (Event t (), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget
5349resizeDetectorWithAttrs attrs w = do
5450 let childStyle = "position: absolute; left: 0; top: 0;"
5551 containerAttrs = "style" =: "position: absolute; left: 0; top: 0; right: 0; bottom: 0; overflow: scroll; z-index: -1; visibility: hidden;"
@@ -91,4 +87,4 @@ resizeDetectorWithAttrs attrs w = do
9187 size0 <- performEvent $ fmap (const $ liftJSM reset) pb
9288 rec resize <- performEventAsync $ fmap (\d cb -> (liftIO . cb) =<< liftJSM (resetIfChanged d)) $ tag (current dimensions) $ leftmost [expandScroll, shrinkScroll]
9389 dimensions <- holdDyn (Nothing, Nothing) $ leftmost [ size0, fmapMaybe id resize ]
94− return (updated dimensions, w')
90+ return (fmapMaybe void resize, w')
reflex-dom-core/src/Reflex/Dom/Xhr.hs+6−8
@@ -159,8 +159,6 @@ import Data.Aeson.Text
159159import Data.Aeson.Encode
160160#endif
161161import qualified Data.ByteString.Lazy as BL
162−import Data.CaseInsensitive (CI)
163−import qualified Data.CaseInsensitive as CI
164162import Data.Default
165163import qualified Data.List as L
166164import Data.Map (Map)
@@ -200,12 +198,12 @@ data XhrResponse
200198 , _xhrResponse_statusText :: Text
201199 , _xhrResponse_response :: Maybe XhrResponseBody
202200 , _xhrResponse_responseText :: Maybe Text
203− , _xhrResponse_headers :: Map (CI Text) Text
201+ , _xhrResponse_headers :: Map Text Text
204202 }
205203 deriving (Typeable)
206204
207205data XhrResponseHeaders =
208− OnlyHeaders (Set.Set (CI Text)) -- ^ Parse a subset of headers from the XHR Response
206+ OnlyHeaders (Set.Set Text) -- ^ Parse a subset of headers from the XHR Response
209207 | AllHeaders -- ^ Parse all headers from the XHR Response
210208 deriving (Show, Read, Eq, Ord, Typeable)
211209
@@ -277,7 +275,7 @@ newXMLHttpRequestWithError req cb = do
277275 AllHeaders -> parseAllHeadersString <$>
278276 xmlHttpRequestGetAllResponseHeaders xhr
279277 OnlyHeaders xs -> traverse (xmlHttpRequestGetResponseHeader xhr)
280− (Map.fromSet CI.original xs)
278+ (Map.fromSet id xs)
281279 _ <- liftJSM $ cb $ Right
282280 XhrResponse { _xhrResponse_status = status
283281 , _xhrResponse_statusText = statusText
@@ -290,10 +288,10 @@ newXMLHttpRequestWithError req cb = do
290288 return ()
291289 return xhr
292290
293−parseAllHeadersString :: Text -> Map (CI Text) Text
291+parseAllHeadersString :: Text -> Map Text Text
294292parseAllHeadersString s = Map.fromList $ fmap (stripBoth . T.span (/=':')) $
295293 L.dropWhileEnd T.null $ T.splitOn (T.pack "\r\n") s
296− where stripBoth (txt1, txt2) = (CI.mk $ T.strip txt1, T.strip $ T.drop 1 txt2)
294+ where stripBoth (txt1, txt2) = (T.strip txt1, T.strip $ T.drop 1 txt2)
297295
298296newXMLHttpRequest :: (HasJSContext m, MonadJSM m, IsXhrPayload a) => XhrRequest a -> (XhrResponse -> JSM ()) -> m XMLHttpRequest
299297newXMLHttpRequest req cb = newXMLHttpRequestWithError req $ mapM_ cb
@@ -446,7 +444,7 @@ xhrResponse_responseText :: Lens' XhrResponse (Maybe Text)
446444xhrResponse_responseText f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 y x5) <$> f x4
447445{-# INLINE xhrResponse_responseText #-}
448446
449−xhrResponse_headers :: Lens' XhrResponse (Map (CI Text) Text)
447+xhrResponse_headers :: Lens' XhrResponse (Map Text Text)
450448xhrResponse_headers f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 x4 y) <$> f x5
451449{-# INLINE xhrResponse_headers #-}
452450
reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs+3−2
@@ -1,6 +1,7 @@
11{-# LANGUAGE FlexibleInstances #-}
22{-# LANGUAGE JavaScriptFFI #-}
33{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE TypeSynonymInstances #-}
45
56module Reflex.Dom.Xhr.Foreign (
67 XMLHttpRequest
@@ -15,7 +16,7 @@ import Data.Text (Text)
1516import Data.ByteString (ByteString)
1617import Foreign.JavaScript.Utils (bsFromMutableArrayBuffer, bsToArrayBuffer)
1718import GHCJS.DOM.Enums
18−import GHCJS.DOM.EventM (EventM, on, onSync)
19+import GHCJS.DOM.EventM (EventM, on)
1920import GHCJS.DOM.EventTarget (dispatchEvent)
2021import GHCJS.DOM.Types (MonadJSM, ToJSString, FormData, Document, Blob (..), ArrayBuffer (..), JSVal, JSM, IsEvent, XMLHttpRequestProgressEvent, ProgressEvent, Event, XMLHttpRequestUpload, FromJSString, ArrayBufferView (..), liftJSM, castTo)
2122import GHCJS.DOM.XMLHttpRequest
@@ -114,7 +115,7 @@ xmlHttpRequestOntimeout :: XMLHttpRequest -> EventM XMLHttpRequest ProgressEvent
114115xmlHttpRequestOntimeout = (`on` timeout)
115116
116117xmlHttpRequestOnreadystatechange :: XMLHttpRequest -> EventM XMLHttpRequest Event () -> JSM (JSM ())
117−xmlHttpRequestOnreadystatechange = (`onSync` readyStateChange)
118+xmlHttpRequestOnreadystatechange = (`on` readyStateChange)
118119
119120xmlHttpRequestSetTimeout :: MonadJSM m => XMLHttpRequest -> Word -> m ()
120121xmlHttpRequestSetTimeout = setTimeout
reflex-dom-core/test/gc.hs+1−1
@@ -47,7 +47,7 @@ failureLimit = 0
4747
4848main :: IO ()
4949main = do
50− handle (\(_ :: IOError) -> return ()) $ unshareNetwork -- If we run into an exception with sandboxing, just don't bother
50+ handle (\(_ :: IOError) -> return ()) $ unshareNetork -- If we run into an exception with sandboxing, just don't bother
5151 withSandboxedChromeFlags True $ \chromeFlags -> do
5252 mainThread <- myThreadId
5353 browserProcess <- spawnCommand $ mconcat
reflex-dom-core/test/hlint.hs+1−3
@@ -1,4 +1,4 @@
1−import Language.Haskell.HLint (hlint)
1+import Language.Haskell.HLint3 (hlint)
22import System.Exit (exitFailure, exitSuccess)
33
44main :: IO ()
@@ -16,11 +16,9 @@ main = do
1616 , "--ignore=Use unless"
1717 , "--ignore=Use if"
1818 , "--ignore=Use fewer imports"
19− , "--ignore=Use list comprehension"
2019 , "--ignore=Unnecessary hiding" -- Interferes with cross-version compatibility
2120 , "--ignore=Use <$>"
2221 , "--ignore=Reduce duplication" --TODO: Re-enable this test
23− , "--ignore=Use list comprehension"
2422 , "--cpp-define=USE_TEMPLATE_HASKELL"
2523 ]
2624 if null ideas then exitSuccess else exitFailure
reflex-dom-core/test/hydration.hs+118−523
@@ -1,9 +1,12 @@
1+{-# OPTIONS_GHC -fno-warn-orphans #-}
12{-# LANGUAGE BangPatterns #-}
3+{-# LANGUAGE StandaloneDeriving #-}
4+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5+{-# LANGUAGE UndecidableInstances #-}
26{-# LANGUAGE ConstraintKinds #-}
7+{-# LANGUAGE CPP #-}
38{-# LANGUAGE FlexibleContexts #-}
4−{-# LANGUAGE FlexibleInstances #-}
59{-# LANGUAGE GADTs #-}
6−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
710{-# LANGUAGE LambdaCase #-}
811{-# LANGUAGE MultiParamTypeClasses #-}
912{-# LANGUAGE OverloadedStrings #-}
@@ -11,43 +14,26 @@
1114{-# LANGUAGE RankNTypes #-}
1215{-# LANGUAGE RecursiveDo #-}
1316{-# LANGUAGE ScopedTypeVariables #-}
14−{-# LANGUAGE StandaloneDeriving #-}
1517{-# LANGUAGE TemplateHaskell #-}
1618{-# LANGUAGE TupleSections #-}
1719{-# LANGUAGE TypeApplications #-}
1820{-# LANGUAGE TypeFamilies #-}
19−{-# LANGUAGE UndecidableInstances #-}
20−
21−{-# OPTIONS_GHC -fno-warn-orphans #-}
2221
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)
3222import Control.Concurrent
33−import qualified Control.Concurrent.Async as Async
34−import Control.Lens.Operators
35−import Control.Monad hiding (fail)
23+import Control.Monad
3624import Control.Monad.Catch
37−import Control.Monad.Fail
3825import Control.Monad.Fix
3926import Control.Monad.IO.Class
4027import Control.Monad.Ref
4128import Data.Constraint.Extras
4229import Data.Constraint.Extras.TH
4330import Data.Dependent.Map (DMap)
44−import Data.Dependent.Sum (DSum(..), (==>))
31+import Data.Dependent.Sum (DSum(..), (==>), EqTag(..), ShowTag(..))
4532import Data.Functor.Identity
4633import Data.Functor.Misc
4734import Data.GADT.Compare.TH
4835import Data.GADT.Show.TH
4936import Data.IORef (IORef)
50−import Data.List (sort)
5137import Data.Maybe
5238import Data.Proxy
5339import Data.Text (Text)
@@ -58,7 +44,6 @@ import Network.Socket
5844import Network.Wai
5945import Network.WebSockets
6046import Reflex.Dom.Core
61−import Reflex.Dom.Widget.Input (dropdown)
6247import Reflex.Patch.DMapWithMove
6348import System.Directory
6449import System.Environment
@@ -66,14 +51,12 @@ import System.IO (stderr)
6651import System.IO.Silently
6752import System.IO.Temp
6853import System.Process
69−import System.Which (staticWhich)
70−import qualified Test.HUnit as HUnit
54+import qualified Test.HUnit as HUnit (assertEqual, assertFailure)
7155import qualified Test.Hspec as H
72−import qualified Test.Hspec.Core.Spec as H
7356import Test.Hspec (xit)
74−import Test.Hspec.WebDriver hiding (runWD, click, uploadFile, WD)
57+import Test.Hspec.WebDriver hiding (runWD, click, uploadFile)
7558import qualified Test.Hspec.WebDriver as WD
76−import Test.WebDriver (WD(..))
59+import Test.WebDriver (WD)
7760
7861import qualified Data.ByteString.Lazy as LBS
7962import qualified Data.Dependent.Map as DMap
@@ -89,32 +72,19 @@ import qualified Test.WebDriver.Capabilities as WD
8972import Test.Util.ChromeFlags
9073import Test.Util.UnshareNetwork
9174
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−
9875seleniumPort, jsaddlePort :: PortNumber
9976seleniumPort = 8000
10077jsaddlePort = 8001
10178
10279-- TODO Remove orphan
103−instance MonadRef WD where
104− type Ref WD = Ref IO
105− newRef = WD . newRef
106− readRef = WD . readRef
107− writeRef r = WD . writeRef r
80+deriving instance MonadRef WD
10881
10982assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
110−assertEqual msg a b = liftIO $ HUnit.assertEqual msg a b
83+assertEqual a b = liftIO . HUnit.assertEqual a b
11184
11285assertFailure :: MonadIO m => String -> m ()
11386assertFailure = liftIO . HUnit.assertFailure
11487
115−assertBool :: (MonadIO m) => String -> Bool -> m ()
116−assertBool msg bool = liftIO $ HUnit.assertBool msg bool
117−
11888chromeConfig :: Text -> [Text] -> WD.WDConfig
11989chromeConfig fp flags = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags }) WD.defaultConfig
12090
@@ -141,26 +111,35 @@ deriveGEq ''DKey
141111deriveGCompare ''DKey
142112deriveGShow ''DKey
143113
144−deriving instance MonadFail WD
114+instance ShowTag DKey Identity where
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 = (==)
145124
146125main :: IO ()
147126main = do
148− unshareNetwork
127+ unshareNetork
149128 isHeadless <- (== Nothing) <$> lookupEnv "NO_HEADLESS"
150129 withSandboxedChromeFlags isHeadless $ \chromeFlags -> do
151130 withSeleniumServer $ \selenium -> do
152− let browserPath = T.strip $ T.pack chromium
131+ browserPath <- liftIO $ T.strip . T.pack <$> readProcess "which" [ "chromium" ] ""
153132 when (T.null browserPath) $ fail "No browser found"
154− withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"
133+ withDebugging <- isJust <$> lookupEnv "DEBUG"
155134 let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
156135 chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
157− hspec (tests withDebugging wdConfig [(chromeCaps', "chrome")] selenium) `finally` _selenium_stopServer selenium
136+ hspec (tests withDebugging wdConfig [chromeCaps'] selenium) `finally` _selenium_stopServer selenium
158137
159−tests :: Bool -> WD.WDConfig -> [(Capabilities, String)] -> Selenium -> Spec
138+tests :: Bool -> WD.WDConfig -> [Capabilities] -> Selenium -> Spec
160139tests withDebugging wdConfig caps _selenium = do
161140 let putStrLnDebug :: MonadIO m => Text -> m ()
162141 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
163− session' t = sessionWith wdConfig t . using caps
142+ session' = sessionWith wdConfig "" . using (map (,"") caps)
164143 runWD m = runWDOptions (WdOptions False) $ do
165144 putStrLnDebug "before"
166145 r <- m
@@ -169,10 +148,10 @@ tests withDebugging wdConfig caps _selenium = do
169148 testWidgetStatic :: WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
170149 testWidgetStatic = testWidgetStaticDebug withDebugging
171150 testWidget :: WD () -> WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
172− testWidget = testWidgetDebug True withDebugging
151+ testWidget = testWidgetDebug withDebugging
173152 testWidget' :: WD a -> (a -> WD b) -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
174− testWidget' = testWidgetDebug' True withDebugging
175− session' "text" $ do
153+ testWidget' = testWidgetDebug' withDebugging
154+ describe "text" $ session' $ do
176155 it "works" $ runWD $ do
177156 testWidgetStatic (checkBodyText "hello world") $ do
178157 text "hello world"
@@ -233,7 +212,7 @@ tests withDebugging wdConfig caps _selenium = do
233212 click <- button ""
234213 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
235214
236− session' "element" $ do
215+ describe "element" $ session' $ do
237216 it "works with domEvent Click" $ runWD $ do
238217 clickedRef <- liftIO $ newRef False
239218 testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
@@ -296,79 +275,29 @@ tests withDebugging wdConfig caps _selenium = do
296275 (e, ()) <- element "div" conf $ text "hello world"
297276 let click = domEvent Click e
298277 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"
299285
300− session' "inputElement" $ do
301− describe "static renderer" $ do
302− it "sets value attribute" $ runWD $ do
303− let checkStatic = do
304− e <- findElemWithRetry $ WD.ByTag "input"
305− WD.attr e "value" `shouldBeWithRetryM` Just "test"
306− pure e
307− checkHydrated e = do
308− WD.attr e "value" `shouldBeWithRetryM` Just "test"
309− testWidget' checkStatic checkHydrated $ void $ inputElement $ def
310− & inputElementConfig_initialValue .~ "test"
311− it "updates value attribute at postBuild" $ runWD $ do
312− let checkStatic = do
313− e <- findElemWithRetry $ WD.ByTag "input"
314− WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
315− pure e
316− checkHydrated e = do
317− WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
318− testWidget' checkStatic checkHydrated $ do
319− pb <- getPostBuild
320− _ <- inputElement $ def
321− & inputElementConfig_initialValue .~ "test"
322− & inputElementConfig_setValue .~ ("test-updated" <$ pb)
323− pure ()
324− it "sets checked attr appropriately" $ runWD $ do
325− setCheckedChan <- liftIO newChan
326− let checkStatic = do
327− e <- findElemWithRetry $ WD.ByTag "input"
328− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
329− pure e
330− checkValue e = do
331− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
332− WD.moveToCenter e
333− WD.click e -- Click to uncheck
334− WD.attr e "checked" `shouldBeWithRetryM` Nothing
335− liftIO $ writeChan setCheckedChan True -- Programatically check the checkbox
336− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
337− testWidget' checkStatic checkValue $ do
338− setChecked <- triggerEventWithChan setCheckedChan
339− _ <- inputElement $ def
340− & initialAttributes .~ "type" =: "checkbox"
341− & inputElementConfig_initialChecked .~ True
342− & inputElementConfig_setChecked .~ setChecked
343− pure ()
344− it "sets checked attr appropriately at postbuild" $ runWD $ do
345− let checkStatic = do
346− e <- findElemWithRetry $ WD.ByTag "input"
347− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
348− pure e
349− checkValue e = do
350− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
351− testWidget' checkStatic checkValue $ do
352− pb <- getPostBuild
353− _ <- inputElement $ def
354− & initialAttributes .~ "type" =: "checkbox"
355− & inputElementConfig_initialChecked .~ False
356− & inputElementConfig_setChecked .~ (True <$ pb)
357− pure ()
358− describe "hydration" $ do
286+ describe "inputElement" $ do
287+ describe "hydration" $ session' $ do
359288 it "doesn't wipe user input when switching over" $ runWD $ do
360− inputRef <- newRef ("hello " :: Text)
289+ inputRef <- newRef ("" :: Text)
361290 testWidget'
362291 (do
363292 e <- findElemWithRetry $ WD.ByTag "input"
364− WD.sendKeys "world" e
293+ WD.sendKeys "hello world" e
365294 pure e)
366295 (\e -> do
367296 WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
368297 WD.click =<< findElemWithRetry (WD.ByTag "button")
369298 readRef inputRef `shouldBeWithRetryM` "hello world"
370299 ) $ do
371− e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
300+ e <- inputElement def
372301 click <- button "save"
373302 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
374303 it "captures user input after switchover" $ runWD $ do
@@ -425,49 +354,24 @@ tests withDebugging wdConfig caps _selenium = do
425354 checkedByUIRef <- newRef False
426355 checkedRef <- newRef False
427356 setCheckedChan <- liftIO newChan
428− let checkStatic = do
429− e <- findElemWithRetry $ WD.ByTag "input"
430− WD.attr e "checked" `shouldBeWithRetryM` Nothing
431− pure e
432− checkValue e = do
357+ let checkValue = do
433358 readRef checkedByUIRef `shouldBeWithRetryM` False
434359 readRef checkedRef `shouldBeWithRetryM` False
435− WD.attr e "checked" `shouldBeWithRetryM` Nothing
360+ e <- findElemWithRetry $ WD.ByTag "input"
436361 WD.moveToCenter e
437362 WD.click e
438363 readRef checkedByUIRef `shouldBeWithRetryM` True
439364 readRef checkedRef `shouldBeWithRetryM` True
440− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
441365 liftIO $ writeChan setCheckedChan False
442366 readRef checkedByUIRef `shouldBeWithRetryM` True
443367 readRef checkedRef `shouldBeWithRetryM` False
444− WD.attr e "checked" `shouldBeWithRetryM` Nothing
445− testWidget' checkStatic checkValue $ do
368+ testWidget (pure ()) checkValue $ do
446369 setChecked <- triggerEventWithChan setCheckedChan
447370 e <- inputElement $ def
448371 & initialAttributes .~ "type" =: "checkbox"
449372 & inputElementConfig_setChecked .~ setChecked
450373 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
451374 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)
471375 it "captures file uploads" $ runWD $ do
472376 filesRef :: IORef [Text] <- newRef []
473377 let uploadFile = do
@@ -483,117 +387,8 @@ tests withDebugging wdConfig caps _selenium = do
483387 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
484388 names <- liftJSM $ traverse File.getName fs
485389 liftIO $ writeRef filesRef names
486− it "fires _input event if the user altered the value before hydration" $ runWD $ do
487− input <- newRef ("" :: Text)
488− update <- newRef ("" :: Text)
489− let checkStatic = do
490− e <- findElemWithRetry $ WD.ByTag "input"
491− WD.attr e "value" `shouldBeWithRetryM` Just ""
492− WD.sendKeys "test" e
493− WD.attr e "value" `shouldBeWithRetryM` Just "test"
494− pure e
495− checkHydrated e = do
496− WD.attr e "value" `shouldBeWithRetryM` Just "test"
497− readRef input `shouldBeWithRetryM` "test"
498− readRef update `shouldBeWithRetryM` "test"
499− testWidget' checkStatic checkHydrated $ do
500− e <- inputElement def
501− performEvent_ $ liftIO . writeRef input <$> _inputElement_input e
502− performEvent_ $ liftIO . writeRef update <$> updated (_inputElement_value e)
503− it "does not fire _input event when the value is updated at postBuild" $ runWD $ do
504− input <- newRef (Nothing :: Maybe Text)
505− let checkStatic = do
506− e <- findElemWithRetry $ WD.ByTag "input"
507− WD.attr e "value" `shouldBeWithRetryM` Just "pb"
508− pure e
509− checkHydrated e = do
510− WD.attr e "value" `shouldBeWithRetryM` Just "pb"
511− readRef input `shouldBeWithRetryM` Nothing
512− testWidget' checkStatic checkHydrated $ do
513− pb <- getPostBuild
514− e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
515− performEvent_ $ liftIO . writeRef input . Just <$> _inputElement_input e
516− it "SSR produces correct DOM based on inputElement values when setValue happens at postBuild" $ runWD $ do
517− let checkBoth = do
518− input <- findElemWithRetry $ WD.ByTag "input"
519− WD.attr input "value" `shouldBeWithRetryM` Just "pb"
520− p <- findElemWithRetry (WD.ByTag "p")
521− shouldContainText "pb" p
522− testWidget checkBoth checkBoth $ do
523− pb <- getPostBuild
524− e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
525− el "p" $ dynText $ _inputElement_value e
526− it "does not fail when both setValue AND user updated value happen before switchover" $ runWD $ do
527− let checkStatic = do
528− input <- findElemWithRetry $ WD.ByTag "input"
529− h2_value <- findElemWithRetry (WD.ByTag "h2")
530− h3_input <- findElemWithRetry (WD.ByTag "h3")
531− WD.attr input "value" `shouldBeWithRetryM` Just "pb"
532− shouldContainText "pb" h2_value
533− shouldContainText "" h3_input
534− WD.sendKeys "abc" input
535− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
536− shouldContainText "pb" h2_value
537− shouldContainText "" h3_input
538− pure (input, h2_value, h3_input)
539− checkHydrated (input, h2_value, h3_input) = do
540− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
541− shouldContainText "pbabc" h3_input
542− shouldContainText "pbabc pb" h2_value
543− pure ()
544− testWidget' checkStatic checkHydrated $ do
545− pb <- getPostBuild
546− e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
547− el "h1" $ dynText $ _inputElement_value e
548− el "h2" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ updated $ _inputElement_value e
549− el "h3" $ dynText . fmap T.unwords <=< foldDyn (:) [] $ _inputElement_input e
550− it "value is correct when both setValue AND user updated value happen before switchover" $ runWD $ do
551− let checkStatic = do
552− input <- findElemWithRetry $ WD.ByTag "input"
553− p <- findElemWithRetry (WD.ByTag "p")
554− WD.attr input "value" `shouldBeWithRetryM` Just "pb"
555− shouldContainText "pb" p
556− WD.sendKeys "abc" input
557− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
558− shouldContainText "pb" p -- It won't be updated yet
559− pure (input, p)
560− checkHydrated (input, p) = do
561− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
562− shouldContainText "pbabc" p
563− pure ()
564− testWidget' checkStatic checkHydrated $ do
565− pb <- getPostBuild
566− e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
567− el "p" $ dynText $ _inputElement_value e
568− it "input event and (updated value) fire correctly when both setValue AND user updated value happen before switchover" $ runWD $ do
569− valRef <- newRef ([] :: [Text])
570− inputRef <- newRef ([] :: [Text])
571− let consRef ref a = liftIO $ atomicModifyRef ref $ \as -> (a:as, ())
572− checkStatic = do
573− input <- findElemWithRetry $ WD.ByTag "input"
574− p <- findElemWithRetry (WD.ByTag "p")
575− WD.attr input "value" `shouldBeWithRetryM` Just "pb"
576− shouldContainText "pb" p
577− WD.sendKeys "abc" input
578− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
579− shouldContainText "pb" p -- It won't be updated yet
580− readRef inputRef `shouldBeWithRetryM` [] -- Should never fire input ref during SSR
581− readRef valRef `shouldBeWithRetryM` ["pb"]
582− pure (input, p)
583− checkHydrated (input, p) = do
584− readRef inputRef `shouldBeWithRetryM` ["pbabc"]
585− readRef valRef `shouldBeWithRetryM` ["pbabc", "pb"]
586− WD.attr input "value" `shouldBeWithRetryM` Just "pbabc"
587− shouldContainText "pbabc" p
588− pure ()
589− testWidget' checkStatic checkHydrated $ do
590− liftIO $ writeRef valRef []
591− pb <- getPostBuild
592− e <- inputElement $ def & inputElementConfig_setValue .~ ("pb" <$ pb)
593− el "p" $ dynText $ _inputElement_value e
594− performEvent_ $ consRef valRef <$> updated (_inputElement_value e)
595− performEvent_ $ consRef inputRef <$> _inputElement_input e
596− describe "hydration/immediate" $ do
390+
391+ describe "hydration/immediate" $ session' $ do
597392 it "captures user input after switchover" $ runWD $ do
598393 inputRef :: IORef Text <- newRef ""
599394 let checkValue = do
@@ -673,31 +468,8 @@ tests withDebugging wdConfig caps _selenium = do
673468 names <- liftJSM $ traverse File.getName fs
674469 liftIO $ writeRef filesRef names
675470
676− session' "textAreaElement" $ do
677− describe "static renderer" $ do
678− it "sets value attribute" $ runWD $ do
679− let checkStatic = do
680− e <- findElemWithRetry $ WD.ByTag "textarea"
681− WD.attr e "value" `shouldBeWithRetryM` Just "test"
682− pure e
683− checkHydrated e = do
684− WD.attr e "value" `shouldBeWithRetryM` Just "test"
685− testWidget' checkStatic checkHydrated $ void $ textAreaElement $ def
686− & textAreaElementConfig_initialValue .~ "test"
687− it "updates value attribute at postBuild" $ runWD $ do
688− let checkStatic = do
689− e <- findElemWithRetry $ WD.ByTag "textarea"
690− WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
691− pure e
692− checkHydrated e = do
693− WD.attr e "value" `shouldBeWithRetryM` Just "test-updated"
694− testWidget' checkStatic checkHydrated $ do
695− pb <- getPostBuild
696− _ <- textAreaElement $ def
697− & textAreaElementConfig_initialValue .~ "test"
698− & textAreaElementConfig_setValue .~ ("test-updated" <$ pb)
699− pure ()
700− describe "hydration" $ do
471+ describe "textAreaElement" $ do
472+ describe "hydration" $ session' $ do
701473 it "doesn't wipe user input when switching over" $ runWD $ do
702474 inputRef <- newRef ("" :: Text)
703475 testWidget'
@@ -763,90 +535,8 @@ tests withDebugging wdConfig caps _selenium = do
763535 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
764536 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
765537 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
848538
849− describe "hydration/immediate" $ do
539+ describe "hydration/immediate" $ session' $ do
850540 it "captures user input after switchover" $ runWD $ do
851541 inputRef :: IORef Text <- newRef ""
852542 let checkValue = do
@@ -888,13 +578,13 @@ tests withDebugging wdConfig caps _selenium = do
888578 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
889579 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
890580
891− session' "selectElement" $ do
581+ describe "selectElement" $ do
892582 let options :: DomBuilder t m => m ()
893583 options = do
894584 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
895585 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
896586 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
897− describe "hydration" $ do
587+ describe "hydration" $ session' $ do
898588 it "sets initial value correctly" $ runWD $ do
899589 inputRef <- newRef ("" :: Text)
900590 let setup = do
@@ -968,7 +658,7 @@ tests withDebugging wdConfig caps _selenium = do
968658 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
969659 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
970660
971− describe "hydration/immediate" $ do
661+ describe "hydration/immediate" $ session' $ do
972662 it "captures user input after switchover" $ runWD $ do
973663 inputRef :: IORef Text <- newRef ""
974664 let checkValue = do
@@ -1014,7 +704,7 @@ tests withDebugging wdConfig caps _selenium = do
1014704 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
1015705 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
1016706
1017− session' "prerender" $ do
707+ describe "prerender" $ session' $ do
1018708 it "works in simple case" $ runWD $ do
1019709 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
1020710 prerender_ (text "One") (text "Two")
@@ -1059,9 +749,9 @@ tests withDebugging wdConfig caps _selenium = do
1059749 pb <- getPostBuild
1060750 performEvent_ $ liftIO (putMVar lock ()) <$ pb
1061751 it "result Dynamic is updated *after* switchover" $ runWD $ do
1062− let preSwitchover = checkBodyText "PostBuild"
752+ let static = checkBodyText "PostBuild"
1063753 check = checkBodyText "Client"
1064− testWidget preSwitchover check $ void $ do
754+ testWidget static check $ void $ do
1065755 d <- prerender (pure "Initial") (pure "Client")
1066756 pb <- getPostBuild
1067757 initial <- sample $ current d
@@ -1069,30 +759,21 @@ tests withDebugging wdConfig caps _selenium = do
1069759 -- This essentially checks that the client IO runs *after* switchover/postBuild,
1070760 -- thus can't create conflicting DOM
1071761 it "can't exploit IO to break hydration" $ runWD $ do
1072− let preSwitchover = checkBodyText "Initial"
1073− testWidgetStatic preSwitchover $ void $ do
762+ let static = checkBodyText "Initial"
763+ testWidgetStatic static $ void $ do
1074764 ref <- liftIO $ newRef "Initial"
1075765 prerender_ (pure ()) (liftIO $ writeRef ref "Client")
1076766 text <=< liftIO $ readRef ref
1077767 -- As above, so below
1078768 it "can't exploit triggerEvent to break hydration" $ runWD $ do
1079− let preSwitchover = checkBodyText "Initial"
769+ let static = checkBodyText "Initial"
1080770 check = checkBodyText "Client"
1081− testWidget preSwitchover check $ void $ do
771+ testWidget static check $ void $ do
1082772 (e, trigger) <- newTriggerEvent
1083773 prerender_ (pure ()) (liftIO $ trigger "Client")
1084774 textNode $ TextNodeConfig "Initial" $ Just e
1085775
1086− session' "namespaces" $ do
1087− it "dyn can be nested in namespaced widget" $ runWD $ do
1088− testWidget (pure ()) (checkTextInTag "svg" "one") $ do
1089− let svgRootCfg = def
1090− & (elementConfig_namespace ?~ "http://www.w3.org/2000/svg")
1091− & (elementConfig_initialAttributes .~ ("width" =: "100%" <> "height" =: "100%" <> "viewBox" =: "0 0 1536 2048"))
1092− void $ element "svg" svgRootCfg $ do
1093− dyn_ $ text "one" <$ pure ()
1094−
1095− session' "runWithReplace" $ do
776+ describe "runWithReplace" $ session' $ do
1096777 it "works" $ runWD $ do
1097778 replaceChan :: Chan Text <- liftIO newChan
1098779 let setup = findElemWithRetry $ WD.ByTag "div"
@@ -1126,7 +807,7 @@ tests withDebugging wdConfig caps _selenium = do
1126807 , el "span" . text <$> replace
1127808 ]
1128809 it "can be nested in postBuild widget" $ runWD $ do
1129− replaceChan :: Chan Text <- liftIO newChan
810+ replaceChan <- liftIO newChan
1130811 let setup = findElemWithRetry $ WD.ByTag "div"
1131812 check ssr = do
1132813 -- Check that the original element still exists and has the correct text
@@ -1236,61 +917,7 @@ tests withDebugging wdConfig caps _selenium = do
1236917 , el "span" . text <$> replace
1237918 ]
1238919
1239− let checkInnerHtml t x = findElemWithRetry (WD.ByTag t) >>= (`attr` "innerHTML") >>= (`shouldBe` Just x)
1240− it "removes bracketing comments" $ runWD $ do
1241− replaceChan :: Chan () <- liftIO newChan
1242− let
1243− preSwitchover = checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0-->|after"
1244− check () = do
1245− liftIO $ writeChan replaceChan () -- trigger creation of p tag
1246− _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1247− checkInnerHtml "div" "before|<p>inner2</p>|after"
1248− testWidget' preSwitchover check $ do
1249− replace <- triggerEventWithChan replaceChan
1250− el "div" $ do
1251− text "before|"
1252− _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1253− text "|after"
1254− it "ignores extra ending bracketing comment" $ runWD $ do
1255− replaceChan :: Chan () <- liftIO newChan
1256− let
1257− preSwitchover = checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0--><!--replace-end-0-->|after"
1258− check () = do
1259− liftIO $ writeChan replaceChan () -- trigger creation of p tag
1260− _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1261− checkInnerHtml "div" "before|inner2|after"
1262− testWidget' preSwitchover check $ do
1263− replace <- triggerEventWithChan replaceChan
1264− el "div" $ do
1265− text "before|"
1266− _ <- runWithReplace (text "inner1" *> comment "replace-end-0") $ text "inner2" <$ replace
1267− text "|after"
1268− void $ runWithReplace blank $ el "p" blank <$ replace -- Signal tag for end of test
1269− -- TODO This test actually causes a hydration failure, but it wasn't
1270− -- previously detected, so I've marked it pending
1271− xit "ignores missing ending bracketing comments" $ runWD $ do
1272− replaceChan :: Chan () <- liftIO newChan
1273− let
1274− preSwitchover = do
1275− checkInnerHtml "div" "before|<!--replace-start-0-->inner1<!--replace-end-0-->|after"
1276− divEl <- findElemWithRetry (WD.ByTag "div")
1277− let wrongHtml = "<!--replace-start-0-->inner1"
1278− actualHtml :: String <- WD.executeJS
1279− [WD.JSArg divEl, WD.JSArg wrongHtml]
1280− "arguments[0].innerHTML = arguments[1]; return arguments[0].innerHTML"
1281− actualHtml `shouldBe` wrongHtml
1282− check () = do
1283− liftIO $ writeChan replaceChan () -- trigger creation of p tag
1284− _ <- findElemWithRetry $ WD.ByTag "p" -- wait till p tag is created
1285− checkInnerHtml "div" "before|<p>inner2</p>|after"
1286− testWidget' preSwitchover check $ do
1287− replace <- triggerEventWithChan replaceChan
1288− el "div" $ do
1289− text "before|"
1290− _ <- runWithReplace (text "inner1") $ el "p" (text "inner2") <$ replace
1291− text "|after"
1292−
1293− session' "traverseDMapWithKeyWithAdjust" $ do
920+ describe "traverseDMapWithKeyWithAdjust" $ session' $ do
1294921 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
1295922 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1296923 elClass "span" "key" $ text $ textKey k
@@ -1330,26 +957,26 @@ tests withDebugging wdConfig caps _selenium = do
1330957 postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
1331958 it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1332959 chan <- liftIO newChan
1333− let preSwitchover :: WD [WD.Element]
1334− preSwitchover = getAndCheckInitialItems keyMap
960+ let static :: WD [WD.Element]
961+ static = getAndCheckInitialItems keyMap
1335962 check :: [WD.Element] -> WD ()
1336963 check xs = do
1337964 checkInitialItems keyMap xs
1338965 checkRemoval chan Key_Int
1339966 checkReplace chan Key_Char 'B'
1340967 checkInsert chan Key_Bool True
1341− testWidget' preSwitchover check $ do
968+ testWidget' static check $ do
1342969 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
1343970 liftIO $ dmap `H.shouldBe` keyMap
1344971 it "handles postBuild correctly" $ runWD $ do
1345972 chan <- liftIO newChan
1346− let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
973+ let static = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1347974 check xs = do
1348975 withRetry $ checkInitialItems (applyAlways postBuildPatch keyMap) xs
1349976 checkRemoval chan Key_Int
1350977 checkInsert chan Key_Char 'B'
1351978 checkReplace chan Key_Bool True
1352− testWidget' preSwitchover check $ void $ do
979+ testWidget' static check $ void $ do
1353980 pb <- getPostBuild
1354981 replace <- triggerEventWithChan chan
1355982 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1393,7 +1020,7 @@ tests withDebugging wdConfig caps _selenium = do
13931020 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
13941021 liftIO $ dmap `H.shouldBe` keyMap
13951022
1396− session' "traverseIntMapWithKeyWithAdjust" $ do
1023+ describe "traverseIntMapWithKeyWithAdjust" $ session' $ do
13971024 let textKeyInt k = "key" <> T.pack (show k)
13981025 intMap = IntMap.fromList
13991026 [ (1, "one")
@@ -1439,24 +1066,24 @@ tests withDebugging wdConfig caps _selenium = do
14391066 postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
14401067 xit "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
14411068 chan <- liftIO newChan
1442− let preSwitchover = getAndCheckInitialItems intMap
1069+ let static = getAndCheckInitialItems intMap
14431070 check xs = do
14441071 checkInitialItems intMap xs
14451072 checkRemoval chan 1
14461073 checkReplace chan 2 "deux"
14471074 checkInsert chan 4 "four"
1448− testWidget' preSwitchover check $ void $ do
1075+ testWidget' static check $ void $ do
14491076 (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
14501077 liftIO $ im `H.shouldBe` intMap
14511078 xit "handles postBuild correctly" $ runWD $ do
14521079 chan <- liftIO newChan
1453− let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1080+ let static = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
14541081 check xs = do
14551082 withRetry $ checkInitialItems (applyAlways postBuildPatch intMap) xs
14561083 checkRemoval chan 1
14571084 checkInsert chan 2 "deux"
14581085 checkReplace chan 3 "trois"
1459− testWidget' preSwitchover check $ void $ do
1086+ testWidget' static check $ void $ do
14601087 pb <- getPostBuild
14611088 replace <- triggerEventWithChan chan
14621089 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1500,7 +1127,7 @@ tests withDebugging wdConfig caps _selenium = do
15001127 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
15011128 liftIO $ dmap `H.shouldBe` intMap
15021129
1503− session' "traverseDMapWithKeyWithAdjustWithMove" $ do
1130+ describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do
15041131 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
15051132 widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
15061133 elClass "span" "key" $ text $ textKey2 k
@@ -1521,9 +1148,6 @@ tests withDebugging wdConfig caps _selenium = do
15211148 xs <- WD.findElems (WD.ByTag "li")
15221149 checkInitialItems dm xs
15231150 pure xs
1524− moveSpec
1525− :: (DMap Key2 Identity -> (WD.Element -> Chan (PatchDMapWithMove Key2 Identity) -> WD ()) -> WD ())
1526− -> H.SpecM (WdTestSession ()) ()
15271151 moveSpec testMove = do
15281152 it "can insert an item" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 3 ==> 3]) $ \body chan -> do
15291153 shouldContainText (T.strip $ T.unlines ["i11","i33"]) body
@@ -1551,19 +1175,19 @@ tests withDebugging wdConfig caps _selenium = do
15511175
15521176 describe "hydration" $ moveSpec $ \initMap test -> do
15531177 chan <- liftIO newChan
1554− let preSwitchover = getAndCheckInitialItems initMap
1178+ let static = getAndCheckInitialItems initMap
15551179 check xs = do
15561180 checkInitialItems initMap xs
15571181 body <- getBody
15581182 test body chan
1559− testWidget' preSwitchover check $ void $ do
1183+ testWidget' static check $ void $ do
15601184 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
15611185 liftIO $ assertEqual "DMap" initMap dmap
15621186
15631187 describe "hydration/immediate" $ moveSpec $ \initMap test -> do
15641188 chan <- liftIO newChan
15651189 replace <- liftIO newChan
1566− lock :: MVar () <- liftIO newEmptyMVar
1190+ lock <- liftIO newEmptyMVar
15671191 let check = do
15681192 liftIO $ do
15691193 writeChan replace ()
@@ -1580,14 +1204,12 @@ tests withDebugging wdConfig caps _selenium = do
15801204 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
15811205 liftIO $ assertEqual "DMap" initMap dmap
15821206
1583− session' "hydrating invalid HTML" $ do
1584− xit "can hydrate list in paragraph" $ runWD $ do
1585− let preSwitchover = do
1207+ describe "hydrating invalid HTML" $ session' $ do
1208+ it "can hydrate list in paragraph" $ runWD $ do
1209+ let static = do
15861210 checkBodyText "before\ninner\nafter"
15871211 -- Two <p> tags should be present
1588− (p1, p2) <- WD.findElems (WD.ByTag "p") >>= \case
1589− [p1, p2] -> pure (p1, p2)
1590− _ -> error "Unexpected number of `p` tags (expected 2)"
1212+ [p1, p2] <- WD.findElems (WD.ByTag "p")
15911213 ol <- findElemWithRetry (WD.ByTag "ol")
15921214 shouldContainText "before" p1
15931215 shouldContainText "inner" ol
@@ -1598,8 +1220,7 @@ tests withDebugging wdConfig caps _selenium = do
15981220 shouldContainText "before\ninner\nafter" p1
15991221 elementShouldBeRemoved ol
16001222 elementShouldBeRemoved p2
1601− -- Don't fail fatally when hydration encounters the invalid DOM
1602− testWidgetDebug' False withDebugging preSwitchover check $ do
1223+ testWidget' static check $ do
16031224 -- This is deliberately invalid HTML, the browser will interpret it as
16041225 -- <p>before</p><ol>inner</ol>after<p></p>
16051226 el "p" $ do
@@ -1607,29 +1228,6 @@ tests withDebugging wdConfig caps _selenium = do
16071228 el "ol" $ text "inner"
16081229 text "after"
16091230
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−
16331231data Selenium = Selenium
16341232 { _selenium_portNumber :: PortNumber
16351233 , _selenium_stopServer :: IO ()
@@ -1697,9 +1295,6 @@ checkTextInId i expected = do
16971295findElemWithRetry :: Selector -> WD WD.Element
16981296findElemWithRetry = withRetry . WD.findElem
16991297
1700−findElemsWithRetry :: Selector -> WD [WD.Element]
1701−findElemsWithRetry = withRetry . WD.findElems
1702−
17031298getBody :: WD WD.Element
17041299getBody = WD.findElem $ WD.ByTag "body"
17051300
@@ -1708,8 +1303,8 @@ withRetry a = wait 300
17081303 where wait :: Int -> WD a
17091304 wait 0 = a
17101305 wait n = try a >>= \case
1711− Left (e :: SomeException) -> do
1712− liftIO $ putStrLn ("(retrying due to " <> show e <> ")") *> threadDelay 100000
1306+ Left (_ :: SomeException) -> do
1307+ liftIO $ threadDelay 100000
17131308 wait $ n - 1
17141309 Right v -> return v
17151310
@@ -1725,12 +1320,11 @@ testWidgetStaticDebug
17251320 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17261321 -- ^ Widget we are testing
17271322 -> WD b
1728−testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
1323+testWidgetStaticDebug withDebugging w = testWidgetDebug withDebugging (void w) w
17291324
17301325-- | TODO: do something about JSExceptions not causing tests to fail
17311326testWidgetDebug
17321327 :: Bool
1733− -> Bool
17341328 -> WD ()
17351329 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17361330 -> WD b
@@ -1738,16 +1332,12 @@ testWidgetDebug
17381332 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17391333 -- ^ Widget we are testing
17401334 -> WD b
1741−testWidgetDebug hardFailure withDebugging beforeJS afterSwitchover =
1742− testWidgetDebug' hardFailure withDebugging beforeJS (const afterSwitchover)
1743−
1744−data HydrationFailedException = HydrationFailedException deriving Show
1745−instance Exception HydrationFailedException
1335+testWidgetDebug withDebugging beforeJS afterSwitchover =
1336+ testWidgetDebug' withDebugging beforeJS (const afterSwitchover)
17461337
17471338-- | TODO: do something about JSExceptions not causing tests to fail
17481339testWidgetDebug'
17491340 :: Bool
1750− -> Bool
17511341 -> WD a
17521342 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17531343 -> (a -> WD b)
@@ -1755,7 +1345,7 @@ testWidgetDebug'
17551345 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17561346 -- ^ Widget we are testing (contents of body)
17571347 -> WD b
1758−testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget = do
1348+testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
17591349 let putStrLnDebug :: MonadIO m => Text -> m ()
17601350 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
17611351 staticApp = do
@@ -1764,10 +1354,9 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17641354 bodyWidget
17651355 el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
17661356 putStrLnDebug "rendering static"
1767− ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
1357+ ((), html) <- liftIO $ renderStatic staticApp
17681358 putStrLnDebug "rendered static"
17691359 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770− onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
17711360 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
17721361 let entryPoint = do
17731362 putStrLnDebug "taking waitBeforeJS"
@@ -1779,7 +1368,7 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17791368 liftIO $ putMVar waitUntilSwitchover ()
17801369 putStrLnDebug "put waitUntilSwitchover"
17811370 putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1782− mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget
1371+ mainHydrationWidgetWithSwitchoverAction switchOverAction blank bodyWidget
17831372 putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
17841373 syncPoint
17851374 application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
@@ -1797,26 +1386,23 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17971386 ]
17981387 -- hSilence to get rid of ConnectionClosed logs
17991388 silenceIfDebug = if withDebugging then id else hSilence [stderr]
1800− jsaddleWarp = silenceIfDebug $ Warp.runSettings settings application
1801− withAsync' jsaddleWarp $ do
1802− putStrLnDebug "taking waitJSaddle"
1803− liftIO $ takeMVar waitJSaddle
1804− putStrLnDebug "opening page"
1805− WD.openPage $ "http://localhost:" <> show jsaddlePort
1806− putStrLnDebug "running beforeJS"
1807− a <- beforeJS
1808− putStrLnDebug "putting waitBeforeJS"
1809− liftIO $ putMVar waitBeforeJS ()
1810− putStrLnDebug "taking waitUntilSwitchover"
1811− liftIO $ takeMVar waitUntilSwitchover
1812− putStrLnDebug "running afterSwitchover"
1813− afterSwitchover a
1814−
1815−withAsync' :: (MonadIO m, MonadMask m) => IO a -> m b -> m b
1816−withAsync' f g = bracket
1817− (liftIO $ Async.async f)
1818− (liftIO . Async.uninterruptibleCancel)
1819− (const g)
1389+ jsaddleWarp = forkIO $ silenceIfDebug $ Warp.runSettings settings application
1390+ jsaddleTid <- liftIO jsaddleWarp
1391+ putStrLnDebug "taking waitJSaddle"
1392+ liftIO $ takeMVar waitJSaddle
1393+ putStrLnDebug "opening page"
1394+ WD.openPage $ "http://localhost:" <> show jsaddlePort
1395+ putStrLnDebug "running beforeJS"
1396+ a <- beforeJS
1397+ putStrLnDebug "putting waitBeforeJS"
1398+ liftIO $ putMVar waitBeforeJS ()
1399+ putStrLnDebug "taking waitUntilSwitchover"
1400+ liftIO $ takeMVar waitUntilSwitchover
1401+ putStrLnDebug "running afterSwitchover"
1402+ b <- afterSwitchover a
1403+ putStrLnDebug "killing jsaddle thread"
1404+ liftIO $ killThread jsaddleTid
1405+ return b
18201406
18211407data Key2 a where
18221408 Key2_Int :: Int -> Key2 Int
@@ -1826,3 +1412,12 @@ deriveGEq ''Key2
18261412deriveGCompare ''Key2
18271413deriveGShow ''Key2
18281414deriveArgDict ''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.mddeleted−5
@@ -1,5 +0,0 @@
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/LICENSEdeleted−12
@@ -1,12 +0,0 @@
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.hsdeleted−2
@@ -1,2 +0,0 @@
1−import Distribution.Simple
2−main = defaultMain
reflex-dom-test-selenium/add-overrides.nixdeleted−20
@@ -1,20 +0,0 @@
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.cabaldeleted−41
@@ -1,41 +0,0 @@
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.hsdeleted−249
@@ -1,249 +0,0 @@
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.mddeleted−42
@@ -1,42 +0,0 @@
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) 2020, Obsidian Systems LLC
1+Copyright (c) 2015, Obsidian Systems LLC
22All rights reserved.
33
44Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
reflex-dom/benchmark.hs+1−2
@@ -15,9 +15,8 @@ import qualified Data.Text as T
1515import Reflex.Dom
1616import System.Random
1717import qualified Data.Map as Map
18−import Data.Dependent.Map (DMap (..))
18+import Data.Dependent.Map (DMap (..), DSum (..))
1919import qualified Data.Dependent.Map as DMap
20−import Data.Dependent.Sum (DSum (..))
2120import Data.Functor.Misc
2221import Data.Functor.Identity
2322import Data.Functor.Compose
reflex-dom/default.nixnew file+37
@@ -0,0 +1,37 @@
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+1−14
@@ -8,7 +8,6 @@ import android.util.Log;
88import android.view.ViewGroup.LayoutParams;
99import android.view.Window;
1010import android.webkit.CookieManager;
11−import android.webkit.GeolocationPermissions;
1211import android.webkit.JavascriptInterface;
1312import android.webkit.MimeTypeMap;
1413import android.webkit.PermissionRequest;
@@ -23,7 +22,6 @@ import java.io.IOException;
2322import java.io.InputStream;
2423import android.content.Intent;
2524import android.content.ActivityNotFoundException;
26−import java.util.concurrent.atomic.AtomicBoolean;
2725
2826import java.nio.charset.StandardCharsets;
2927
@@ -47,17 +45,11 @@ public class MainWidget {
4745 wv.setWebContentsDebuggingEnabled(true);
4846 // allow video to play without user interaction
4947 wv.getSettings().setMediaPlaybackRequiresUserGesture(false);
50− final AtomicBoolean jsaddleLoaded = new AtomicBoolean(false);
5148
5249 wv.setWebViewClient(new WebViewClient() {
5350 @Override
5451 public void onPageFinished(WebView _view, String _url) {
55− Log.i("reflex", "onPageFinished");
56− boolean alreadyLoaded = jsaddleLoaded.getAndSet(true);
57− if(!alreadyLoaded) {
58− Log.i("reflex", "loading jsaddle");
59− wv.evaluateJavascript(initialJS, null);
60− }
52+ wv.evaluateJavascript(initialJS, null);
6153 }
6254
6355 // Re-route / to /android_asset
@@ -123,11 +115,6 @@ public class MainWidget {
123115 public Bitmap getDefaultVideoPoster() {
124116 return Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
125117 }
126−
127− @Override
128− public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) {
129− callback.invoke(origin, true, false);
130− }
131118 });
132119
133120 wv.addJavascriptInterface(new JSaddleCallbacks(jsaddleCallbacks), "jsaddle");
reflex-dom/reflex-dom.cabal+28−76
@@ -1,20 +1,10 @@
1−cabal-version: 1.24
21Name: reflex-dom
3−Version: 0.6.1.0
2+Version: 0.4
43Synopsis: Functional Reactive Web Apps with Reflex
54Description:
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.
5+ Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine.
96 .
10− Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine: <https://reflex-frp.org/>.
11− .
12− The @reflex-dom@ package is a small wrapper around the @reflex-dom-core@ package. It pulls in the
13− correct set of dependencies for each target platform (GHCJS, WebKitGTK, WASM, mobile, etc.).
14− Libraries should depend on @reflex-dom-core@ and executables will usually depend on @reflex-dom@.
15− All of @reflex-dom-core@'s modules are re-exported by @reflex-dom@.
16− .
17− For Hackage documentation, please see: <https://hackage.haskell.org/package/reflex-dom-core>.
7+ For hackage documentation, please see: <https://hackage.haskell.org/package/reflex-dom-core>.
188License: BSD3
199License-file: LICENSE
2010Author: Ryan Trinkle
@@ -22,9 +12,8 @@ Maintainer: ryan.trinkle@gmail.com
2212Stability: Experimental
2313Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
2414Build-type: Simple
25−extra-source-files:
26− java/org/reflexfrp/reflexdom/MainWidget.java
27− ChangeLog.md
15+cabal-version: >=1.24
16+extra-source-files: java/org/reflexfrp/reflexdom/MainWidget.java
2817
2918flag use-warp
3019 description: Use jsaddle-warp server
@@ -50,67 +39,60 @@ flag build-examples
5039 default: False
5140 manual: True
5241
53−flag wasm32
54− description: Build for wasm32 architecture
42+flag android
43+ description: Build an Android app
5544 default: False
5645 manual: True
5746
5847library
5948 hs-source-dirs: src
60− if os(android)
49+ if flag(android)
6150 hs-source-dirs: src-android
6251 other-modules: Reflex.Dom.Android.MainWidget
6352 build-depends:
64− aeson >= 1.4 && < 1.6,
53+ aeson,
6554 android-activity == 0.1.*,
6655 data-default == 0.7.*,
67− jsaddle >= 0.9.6 && < 0.10
56+ jsaddle
6857 c-sources: cbits/MainWidget.c
6958 include-dirs: cbits/include
7059 install-includes: MainWidget.h
7160 cpp-options: -DANDROID
7261 build-tools: hsc2hs
7362 build-depends:
74− base >= 4.7 && < 4.15,
63+ base >= 4.7 && < 4.12,
7564 bytestring == 0.10.*,
76− reflex >= 0.8 && < 0.9,
77− reflex-dom-core >= 0.6.1.0 && <0.7,
65+ reflex == 0.5.*,
66+ reflex-dom-core >=0.4 && <0.5,
7867 text == 1.2.*
7968 if !impl(ghcjs)
80− if flag(use-warp) && (os(linux) || os(osx))
69+ if os(osx) || os(ios)
8170 build-depends:
82− jsaddle >= 0.9.6 && < 0.10,
83− jsaddle-warp >= 0.9.6 && < 0.10
71+ data-default == 0.7.*,
72+ jsaddle,
73+ jsaddle-wkwebview
8474 else
85− if os(osx) || os(ios)
75+ if flag(use-warp)
8676 build-depends:
87− data-default == 0.7.*,
88− jsaddle >= 0.9.6 && < 0.10,
89− jsaddle-wkwebview >= 0.9.6 && < 0.10
77+ jsaddle,
78+ jsaddle-warp
9079 else
91− if flag(wasm32)
80+ if flag(webkit2gtk)
9281 build-depends:
93− jsaddle >= 0.9.6 && < 0.10,
94− jsaddle-wasm >= 0.1 && < 0.2
82+ jsaddle-webkit2gtk
9583 else
96− if flag(webkit2gtk)
84+ if !flag(android)
9785 build-depends:
98− jsaddle-webkit2gtk >= 0.9.6 && < 0.10
99− else
100− if !os(android)
101− build-depends:
102− jsaddle-webkit2gtk >= 0.9.6 && < 0.10
86+ jsaddle-webkit2gtk
10387
10488 exposed-modules:
10589 Reflex.Dom
10690 Reflex.Dom.Internal
10791 reexported-modules:
108− Foreign.JavaScript.Orphans
109− , Foreign.JavaScript.TH
110− , Foreign.JavaScript.Utils
92+ Foreign.JavaScript.TH
93+ , Foreign.JavaScript.Orphans
11194 , Reflex.Dom.Builder.Class
11295 , Reflex.Dom.Builder.Class.Events
113− , Reflex.Dom.Builder.Hydratable
11496 , Reflex.Dom.Builder.Immediate
11597 , Reflex.Dom.Builder.InputDisabled
11698 , Reflex.Dom.Builder.Static
@@ -118,19 +100,14 @@ library
118100 , Reflex.Dom.Core
119101 , Reflex.Dom.Location
120102 , Reflex.Dom.Main
121− , Reflex.Dom.Modals.Class
122103 , Reflex.Dom.Old
123− , Reflex.Dom.Prerender
124− , Reflex.Dom.Time
125104 , Reflex.Dom.WebSocket
126− , Reflex.Dom.WebSocket.Query
127105 , Reflex.Dom.Widget
128106 , Reflex.Dom.Widget.Basic
129107 , Reflex.Dom.Widget.Input
130108 , Reflex.Dom.Widget.Lazy
131109 , Reflex.Dom.Widget.Resize
132110 , Reflex.Dom.Xhr
133− , Reflex.Dom.Xhr.FormData
134111 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
135112 if flag(expose-all-unfoldings)
136113 ghc-options: -fexpose-all-unfoldings
@@ -162,19 +139,7 @@ executable sortableList
162139 default-language: Haskell2010
163140
164141executable benchmark
165− build-depends: base
166− , containers
167− , dependent-map
168− , dependent-sum
169− , ghc-prim
170− , ghcjs-dom
171− , mtl
172− , prim-uniq
173− , random
174− , reflex
175− , reflex-dom
176− , text
177− , transformers
142+ build-depends: base, reflex, reflex-dom, text, prim-uniq, dependent-map, containers, transformers, mtl, ghcjs-dom, ghc-prim, random, dependent-sum
178143 hs-source-dirs: .
179144 main-is: benchmark.hs
180145 ghc-options: -O2 -fspecialise-aggressively
@@ -183,20 +148,7 @@ executable benchmark
183148 default-language: Haskell2010
184149
185150executable krausest
186− build-depends: base
187− , containers
188− , dependent-map
189− , dependent-sum
190− , ghc-prim
191− , ghcjs-dom
192− , mtl
193− , prim-uniq
194− , random
195− , reflex
196− , reflex-dom
197− , text
198− , transformers
199− , vector
151+ build-depends: base, reflex, reflex-dom, text, prim-uniq, dependent-map, containers, transformers, mtl, ghcjs-dom, ghc-prim, random, dependent-sum, vector
200152 hs-source-dirs: benchmarks
201153 main-is: krausest.hs
202154 ghc-options: -O2 -fspecialise-aggressively
reflex-dom/src/Reflex/Dom/Internal.hs−5
@@ -80,11 +80,6 @@ run jsm = do
8080 startMainWidget a startPage jsm
8181 }
8282 forever $ threadDelay 1000000000
83−#elif defined(wasm32_HOST_ARCH)
84−import qualified Language.Javascript.JSaddle.Wasm as Wasm (run)
85−import Language.Javascript.JSaddle (JSM)
86−run :: JSM () -> IO ()
87−run = Wasm.run 0
8883#else
8984import Language.Javascript.JSaddle.WebKitGTK (run)
9085#endif
reflex-platform.nixnew file+8
@@ -0,0 +1,8 @@
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+10−61
@@ -1,63 +1,12 @@
1−{ reflex-platform-fun ? import ./dep/reflex-platform
2−, supportedSystems ? ["x86_64-linux" "x86_64-darwin"]
1+{ rp ? import ./reflex-platform.nix {}
32}:
4−
53let
6− native-reflex-platform = reflex-platform-fun {};
7− inherit (native-reflex-platform.nixpkgs) lib;
8−
9− tests = system: import ./test { pkgs = (reflex-platform-fun { inherit system; }).nixpkgs; };
10−
11− perPlatform = lib.genAttrs supportedSystems (system: let
12− reflex-platform = reflex-platform-fun { inherit system; };
13− compilers = [
14− "ghc"
15− "ghcjs"
16− ] ++ lib.optionals (reflex-platform.androidSupport) [
17− "ghcAndroidAarch64"
18− "ghcAndroidAarch32"
19− ] ++ lib.optionals (reflex-platform.iosSupport) [
20− "ghcIosAarch64"
21− ];
22− compilerPkgs = lib.genAttrs compilers (ghc: let
23− reflex-platform = reflex-platform-fun {
24− inherit system;
25− haskellOverlays = [
26− # Use this package's source for reflex
27− (self: super: {
28− _dep = super._dep // {
29− reflex-dom = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
30− ".git"
31− "dist"
32− "dist-newstyle"
33− ]) && !(builtins.elem path [
34− ./CONTRIBUTING.md
35− ./FAQ.md
36− ./Quickref.md
37− ./README.md
38− ./release.nix
39− ./test
40− ])) ./.;
41− };
42− })
43− ];
44− };
45− all = tests system // {
46− inherit (reflex-platform.${ghc})
47− reflex-dom-core
48− reflex-dom
49− ;
50− };
51− in all // {
52− cache = reflex-platform.pinBuildInputs "reflex-${system}-${ghc}"
53− (builtins.attrValues all);
54− });
55− in compilerPkgs // {
56− cache = reflex-platform.pinBuildInputs "reflex-${system}"
57− (map (a: a.cache) (builtins.attrValues compilerPkgs));
58− });
59−
60− metaCache = native-reflex-platform.pinBuildInputs "reflex-dom-everywhere"
61− (map (a: a.cache) (builtins.attrValues perPlatform));
62−
63−in perPlatform // { inherit metaCache; }
4+ inherit (rp.nixpkgs) lib;
5+ systems = ["x86_64-linux" "x86_64-darwin"];
6+ compilers = ["ghc8_4" "ghc8_0" "ghcjs8_4" "ghcjs8_0"];
7+in lib.genAttrs systems (system:
8+ lib.genAttrs compilers (ghc: let
9+ reflex-platform = import ./reflex-platform.nix { inherit system; };
10+ hsPkgs = reflex-platform.${ghc};
11+ in { inherit (import ./. hsPkgs reflex-platform.nixpkgs) reflex-dom reflex-dom-core; })
12+)
test/default.nixdeleted−10
@@ -1,10 +0,0 @@
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.hsnew file+127
@@ -0,0 +1,127 @@
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.hsdeleted−72
@@ -1,72 +0,0 @@
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)