on 8214a67 help sign in
57 files changed+681−1800
since splitsnapshots
unifiedsplit
.github/workflows/haskell.yml−47 CONTRIBUTING.md−5 FAQ.md−31 LICENSE−12 README.md+9−9 cabal.project−10 cabal.project-nogtk−14 chrome-test-utils/LICENSE+1−1 chrome-test-utils/chrome-test-utils.cabal+1−1 chrome-test-utils/src/Test/Util/UnshareNetwork.hs+2−2 default.nix+7 dep/reflex-platform/default.nix−2 dep/reflex-platform/github.json−8 dep/reflex-platform/thunk.nix−9 hydra.json+29 jobsets.nix+70 reflex-dom-core/ChangeLog.md+2−78 reflex-dom-core/LICENSE+1−1 reflex-dom-core/default.nix+64 reflex-dom-core/reflex-dom-core.cabal+28−54 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+2−11 reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs+2−13 reflex-dom-core/src/Reflex/Dom/Builder/Hydratable.hs−116 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+55−149 reflex-dom-core/src/Reflex/Dom/Builder/InputDisabled.hs−6 reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+20−48 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+7−37 reflex-dom-core/src/Reflex/Dom/Prerender.hs+7−15 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+1−1 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+2−2 reflex-dom-core/test/gc.hs+1−1 reflex-dom-core/test/hlint.hs+1−2 reflex-dom-core/test/hydration.hs+70−488 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+1−31 reflex-dom/LICENSE+1−1 reflex-dom/benchmark.hs+1−2 reflex-dom/default.nix+38 reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java−6 reflex-dom/reflex-dom.cabal+24−70 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.md−5
@@ -5,7 +5,6 @@ Contributions and issue reports are encouraged and appreciated!
55- [Opening Issues](#opening-issues)
66- [Submitting Changes](#submitting-changes)
77 - [Guidelines for Commit Messages](#guidelines-for-commit-messages)
8− - [Guidelines for Pull Requests](#guidelines-for-pull-requests)
98 - [Code Quality](#code-quality)
109 - [Documentation](#documentation)
1110
@@ -31,10 +30,6 @@ One way to think about it is that your commit message should be able to complete
3130#### Body
3231For 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.
3332
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−
3833### Code Quality
3934
4035#### Warnings
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+9−9
@@ -1,21 +1,21 @@
11## [Reflex-DOM](https://reflex-frp.org)
22
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)
3+[![Hackage](https://img.shields.io/hackage/v/reflex-dom.svg)](http://hackage.haskell.org/package/reflex-dom)
44
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.
5+### A Framework for Functional Reactive Web Apps in Haskell
66
7−Reflex-DOM is a framework for building web applications in [Haskell](https://www.haskell.org/), based on the [Functional Reactive Programming](https://wiki.haskell.org/Functional_Reactive_Programming) library [Reflex](https://github.com/reflex-frp/reflex).
7+Reflex-DOM is a framework for building web applications in Haskell, based on the [Functional Reactive Programming](https://wiki.haskell.org/Functional_Reactive_Programming) library [Reflex](https://github.com/reflex-frp/reflex).
8+
9+A summary of Reflex-DOM functions is available in the [quick reference](Quickref.md).
810
911**Visit https://reflex-frp.org/ for more information, tutorials, documentation and [examples](https://examples.reflex-frp.org/).**
1012
1113### Additional resources
14+[Get started with Reflex](https://github.com/reflex-frp/reflex-platform)
15+
16+[/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
1217
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)
18+[irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
1919
2020### Hacking
2121
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/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.md+2−78
@@ -1,94 +1,18 @@
11# Revision history for reflex-dom-core
22
3−## 0.6.2.1
4−
5−* Fix hlint complaints with newer GHC.
6−
7−## 0.6.2.0
8−
9−* ([#400](https://github.com/reflex-frp/reflex-dom/pull/400/files)) Set value of input elements in static renderer
10−
11−## 0.6.1.0
12−
13−* Bump version bounds
14−* Update for new dependent-map and dependent-sum version (after the "some" package split)
15−* Add `MonadAtomicRef` instance for `UnrunnableT`
16−* Fix ([#467](https://github.com/reflex-frp/reflex-dom/issues/467)): Prevent multiple firings of XHR response event
17−* Updates for GHC 8.10
18−* Move `HasSetValue` from Reflex.Dom.Widget.Input to Reflex.Dom.Builder.Class and add an instance for `TextAreaElementConfig`
19−* Add `now` to the `MonadHold` instance for `UnrunnableT`
20−
21−
22−## 0.6.0.0
23−
24−* ([#375](https://github.com/reflex-frp/reflex-dom/pull/375)) **(Breaking change)** Expose resized dimensions from `resizeDetector`, `resizeDetectorWithStyle`, and `resizeDetectorWithAttrs` from `Reflex.Dom.Widget.Resize`.
25−* ([#374](https://github.com/reflex-frp/reflex-dom/pull/374)) **(Breaking change)** Provide text clipboard data as value of `Paste` event.
26−* ([#348](https://github.com/reflex-frp/reflex-dom/pull/348)) **(Breaking change)** Make XHR response headers case insensitive by changing `_xhrResponse_headers :: Map Text Text` to `_xhrResponse_headers :: Map (CI Text) Text`.
27−* ([#225](https://github.com/reflex-frp/reflex-dom/pull/225)) **(Breaking change)** Add a functional dependency to `HasDomEvent`.
28−* ([#342](https://github.com/reflex-frp/reflex-dom/issues/342)) **(Breaking change)** The mouse wheel event is now a `WheelEventResult` rather than `()`. This provides information about the wheel's motion beyond the fact that it merely moved.
29−* ([#353](https://github.com/reflex-frp/reflex-dom/pull/353)) Support GHC 8.8.
30−* ([#358](https://github.com/reflex-frp/reflex-dom/pull/358)) Fix attribute support for explicitly namespaced elements.
31−* ([#363](https://github.com/reflex-frp/reflex-dom/pull/363)) Remove deprecation warnings for the following widgets in
32− `Reflex.Dom.Widget.Basic`:
33− * `Link`
34− * `button`
35− * `dtdd`
36− * `linkClass`
37− * `link`
38− * `tabDisplay`
39− * `tableDynAttr`
40−* ([#361](https://github.com/reflex-frp/reflex-dom/pull/361)) Fix bug in hydration causing the JavaScript to crash when dealing with unexpected HTML.
41−* ([#310](https://github.com/reflex-frp/reflex-dom/issues/310)) Fix the static rendering of which dropdown value is selected.
42−* ([#364](https://github.com/reflex-frp/reflex-dom/pull/364)) Export attributes used for controlling hydration at the element level:
43− * "data-ssr" is now available as `Reflex.Dom.Builder.Immediate.hydratableAttribute`.
44− * "data-hydration-skip" is now available as `Reflex.Dom.Builder.Immediate.skipHydrationAttribute`.
45−* ([#366](https://github.com/reflex-frp/reflex-dom/pull/366)) Bump bounds for `reflex` to include 0.7.
46−
47−## 0.5.3
48−
49−* Deprecate a number of old inflexible widget helpers in `Reflex.Dom.Widget.Basic`:
50− * `Link`
51− * `button`
52− * `dtdd`
53− * `linkClass`
54− * `link`
55− * `tabDisplay`
56− * `tableDynAttr`
57−
58− And in `Reflex.Dom.Widget.Input`:
59− * `TextInput`
60− * `TextAreaConfig`
61− * `CheckboxConfig`
62− * `FileInput`
63−* Add `< 0.7` upper bound for `reflex`.
64−
653## 0.5.2
664
675* Update to use new dependent-sum/map packages and drop dependency on `*Tag` classes (e.g., `ShowTag`).
68−
696* 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
7+* Update to use split these/semialign packages
818
829## 0.5.1
8310
8411* 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.
12+* Removed "data-ssr" attributes from statically rendered output.:q
8713
8814## 0.5
8915
9016* Add HydrationDomBuilderT to support hydration of statically rendered DOM nodes. See the note at the top of Reflex.Dom.Builder.Immediate.
91−
9217* 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−
9418* 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+64
@@ -0,0 +1,64 @@
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+, semialign ? null
13+, splitThese ? (semialign != null)
14+}:
15+let addGcTestDepends = drv: if (stdenv.system != "x86_64-linux" || stdenv.hostPlatform != stdenv.buildPlatform || (ghc.isGhcjs or false)) then drv else drv // {
16+ # The headless browser run as part of gc tests would hang/crash without this
17+ preCheck = ''
18+ export FONTCONFIG_PATH=${fontconfig.out}/etc/fonts
19+ '';
20+ testHaskellDepends = (drv.testHaskellDepends or []) ++ [
21+ temporary
22+ jsaddle-warp
23+ process
24+ chrome-test-utils
25+ ];
26+ testSystemDepends = (drv.testSystemDepends or []) ++ [ chromium iproute ];
27+ };
28+in mkDerivation (addGcTestDepends {
29+ pname = "reflex-dom-core";
30+ version = "0.5.2";
31+ src = ./.;
32+ libraryHaskellDepends = [
33+ aeson base bifunctors bimap blaze-builder bytestring constraints
34+ containers contravariant data-default dependent-map dependent-sum
35+ dependent-sum-template directory exception-transformers ghcjs-dom
36+ jsaddle keycode lens monad-control mtl network-uri primitive random
37+ ref-tf reflex semigroups stm template-haskell text these
38+ transformers unix zenc
39+ ] ++ (if ghc.isGhcjs or false then [ hashable ] else [])
40+ ++ (if splitThese then [ semialign ] else []);
41+
42+ #TODO: Get hlint working for cross-compilation
43+ doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
44+
45+ # The headless browser run as part of the tests will exit without this
46+ preBuild = ''
47+ export HOME="$PWD"
48+ '';
49+
50+ # Show some output while running tests, so we might notice what's wrong
51+ testTarget = "--show-details=streaming";
52+
53+ testSystemDepends = [ selenium-server-standalone which ];
54+ testHaskellDepends = [
55+ aeson base bytestring constraints constraints-extras containers
56+ dependent-map dependent-sum dependent-sum-template directory
57+ exceptions filepath ghcjs-dom hlint hspec hspec-webdriver http-types HUnit jsaddle
58+ jsaddle-warp lens lifted-base network process random reflex
59+ silently temporary text unix wai wai-websockets warp webdriver
60+ websockets
61+ ];
62+ description = "Functional Reactive Web Apps with Reflex";
63+ license = stdenv.lib.licenses.bsd3;
64+})
reflex-dom-core/reflex-dom-core.cabal+28−54
@@ -1,18 +1,7 @@
1−cabal-version: 1.24
21Name: reflex-dom-core
3−Version: 0.6.2.1
2+Version: 0.5.2.0
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
@@ -54,48 +44,37 @@ flag split-these
5444 manual: False
5545 default: True
5646
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−
6747library
6848 hs-source-dirs: src
6949 build-depends:
70− aeson >= 0.8 && < 1.6,
71− base >= 4.7 && < 4.15,
50+ aeson >= 0.8 && < 1.5,
51+ base >= 4.7 && < 4.13,
7252 bifunctors >= 4.2 && < 6,
73− bimap >= 0.3 && < 0.5,
74− blaze-builder >= 0.4.1 && < 0.5,
53+ bimap >= 0.3 && < 0.4,
54+ blaze-builder,
7555 bytestring == 0.10.*,
76− case-insensitive < 1.3,
77− containers >= 0.6 && < 0.7,
78− constraints >= 0.9 && < 0.13,
56+ containers == 0.6.*,
57+ constraints >= 0.9 && < 0.11,
7958 contravariant >= 1.4 && < 1.6,
8059 data-default >= 0.5 && < 0.8,
81− dependent-map >= 0.3 && < 0.5,
82− dependent-sum >= 0.6 && < 0.8,
60+ dependent-map >= 0.3 && < 0.4,
61+ dependent-sum >= 0.6 && < 0.7,
8362 dependent-sum-template >= 0.1 && < 0.2,
8463 directory >= 1.2 && < 1.4,
8564 exception-transformers == 0.4.*,
8665 ghcjs-dom >= 0.9.1.0 && < 0.10,
87− jsaddle >= 0.9.0.0 && < 0.10,
66+ jsaddle >=0.9.0.0 && <0.10,
8867 -- keycode-0.2 has a bug on firefox
8968 keycode >= 0.2.1 && < 0.3,
9069 lens >= 4.7 && < 5,
9170 monad-control >= 1.0.1 && < 1.1,
9271 mtl >= 2.1 && < 2.3,
93− primitive >= 0.5 && < 0.8,
94− random >= 1.1 && < 1.2,
72+ primitive >= 0.5 && < 0.7,
73+ random,
9574 ref-tf == 0.4.*,
96− reflex >= 0.8 && < 0.9,
97− semigroups >= 0.16 && < 0.20,
98− stm >= 2.4 && < 2.6,
75+ reflex >= 0.6.2,
76+ semigroups >= 0.16 && < 0.19,
77+ stm == 2.5.*,
9978 text == 1.2.*,
10079 transformers >= 0.3 && < 0.6,
10180 network-uri >= 2.6.1 && < 2.7,
@@ -105,7 +84,7 @@ library
10584 hs-source-dirs: src-ghcjs
10685 build-depends:
10786 ghcjs-base,
108− hashable >= 1.2 && < 1.4
87+ hashable == 1.2.*
10988 else
11089 hs-source-dirs: src-ghc
11190 if !os(windows)
@@ -113,8 +92,8 @@ library
11392
11493 if flag(split-these)
11594 build-depends:
116− semialign >= 1 && < 1.2,
117− these >= 1 && < 1.2
95+ semialign >= 1 && < 1.1,
96+ these >= 1 && < 1.1
11897 else
11998 build-depends:
12099 these >= 0.4 && < 0.9
@@ -127,7 +106,6 @@ library
127106 Reflex.Dom.Builder.Class.Events
128107 Reflex.Dom.Builder.Immediate
129108 Reflex.Dom.Builder.InputDisabled
130− Reflex.Dom.Builder.Hydratable
131109 Reflex.Dom.Builder.Static
132110 Reflex.Dom.Class
133111 Reflex.Dom.Core
@@ -153,7 +131,6 @@ library
153131 Reflex.Dom.Xhr.ResponseType
154132 Reflex.Dom.Xhr.Exception
155133
156− default-language: Haskell98
157134 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
158135 ghc-prof-options: -fprof-auto
159136
@@ -168,26 +145,26 @@ library
168145
169146 if flag(use-template-haskell)
170147 build-depends:
148+ dependent-sum >= 0.6,
171149 dependent-sum-template >= 0.1 && < 0.2,
172− template-haskell >= 2.12.0 && < 2.17
150+ template-haskell
173151 other-extensions: TemplateHaskell
174152 cpp-options: -DUSE_TEMPLATE_HASKELL
175153 other-modules:
176154 Reflex.Dom.Builder.Class.TH
155+ else
156+ build-depends:
157+ dependent-sum == 0.6.*
177158
178159test-suite hlint
179− build-depends:
180− base,
181− hlint >= 2.0 && < 4.0
160+ build-depends: base, hlint
182161 hs-source-dirs: test
183162 main-is: hlint.hs
184163 type: exitcode-stdio-1.0
185− default-language: Haskell98
186164
187165test-suite hydration
188166 build-depends: base
189167 , aeson
190− , async
191168 , bytestring
192169 , chrome-test-utils
193170 , constraints
@@ -223,14 +200,12 @@ test-suite hydration
223200 , warp
224201 , webdriver
225202 , websockets
226− , which
227203 hs-source-dirs: test
228204 ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
229205 ghc-prof-options: -fprof-auto -optP-DPROFILING
230206 main-is: hydration.hs
231207 type: exitcode-stdio-1.0
232− default-language: Haskell98
233− if !os(linux) || !arch(x86_64) || flag(profile-reflex) || !flag(hydration-tests)
208+ if !os(linux) || !arch(x86_64) || flag(profile-reflex)
234209 buildable: False
235210
236211-- broken test on base 4.11 & ghc 8.4.3
@@ -249,8 +224,7 @@ test-suite gc
249224 ghc-prof-options: -fprof-auto -optP-DPROFILING
250225 main-is: gc.hs
251226 type: exitcode-stdio-1.0
252− default-language: Haskell98
253− if !os(linux) || !arch(x86_64) || !flag(gc-tests)
227+ if !os(linux) || !arch(x86_64)
254228 buildable: False
255229
256230source-repository head
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+2−11
@@ -9,12 +9,11 @@
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 #-}
1614{-# LANGUAGE OverloadedStrings #-}
1715{-# LANGUAGE PolyKinds #-}
16+{-# LANGUAGE Rank2Types #-}
1817{-# LANGUAGE RecursiveDo #-}
1918{-# LANGUAGE ScopedTypeVariables #-}
2019{-# LANGUAGE StandaloneDeriving #-}
@@ -639,7 +638,7 @@ instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive
639638
640639-- * Convenience functions
641640
642−class HasDomEvent t target eventName | target -> t where
641+class HasDomEvent t target eventName where
643642 type DomEventType target eventName :: *
644643 domEvent :: EventName eventName -> target -> Event t (DomEventType target eventName)
645644
@@ -745,11 +744,3 @@ instance HasDocument m => HasDocument (DynamicWriterT t w m)
745744instance HasDocument m => HasDocument (PostBuildT t m)
746745instance HasDocument m => HasDocument (RequesterT t request response m)
747746instance 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+2−13
@@ -14,7 +14,6 @@ import Data.GADT.Compare.TH
1414import Data.GADT.Compare
1515 (GOrdering(..), (:~:)(..), GEq(..), GCompare(..))
1616#endif
17−import Data.Text (Text)
1817
1918data EventTag
2019 = AbortTag
@@ -152,7 +151,7 @@ type family EventResultType (en :: EventTag) :: * where
152151 EventResultType 'BeforecopyTag = ()
153152 EventResultType 'CopyTag = ()
154153 EventResultType 'BeforepasteTag = ()
155− EventResultType 'PasteTag = Maybe Text
154+ EventResultType 'PasteTag = ()
156155 EventResultType 'ResetTag = ()
157156 EventResultType 'SearchTag = ()
158157 EventResultType 'SelectstartTag = ()
@@ -160,17 +159,7 @@ type family EventResultType (en :: EventTag) :: * where
160159 EventResultType 'TouchmoveTag = TouchEventResult
161160 EventResultType 'TouchendTag = TouchEventResult
162161 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)
162+ EventResultType 'WheelTag = ()
174163
175164data TouchEventResult = TouchEventResult
176165 { _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+55−149
@@ -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
@@ -107,9 +107,6 @@ module Reflex.Dom.Builder.Immediate
107107 , WindowConfig (..)
108108 , Window (..)
109109 , wrapWindow
110− -- * Attributes for controlling hydration
111− , hydratableAttribute
112− , skipHydrationAttribute
113110 -- * Internal
114111 , traverseDMapWithKeyWithAdjust'
115112 , hoistTraverseWithKeyWithAdjust
@@ -135,20 +132,16 @@ import Data.Functor.Compose
135132import Data.Functor.Constant
136133import Data.Functor.Misc
137134import Data.Functor.Product
138−import Data.GADT.Compare (GCompare)
139135import Data.IORef
140136import Data.IntMap.Strict (IntMap)
141137import Data.Maybe
142138import Data.Monoid ((<>))
143139import Data.Some (Some(..))
144−import Data.GADT.Compare (GCompare)
145−import Data.String (IsString)
146140import Data.Text (Text)
147141import Foreign.JavaScript.Internal.Utils
148142import Foreign.JavaScript.TH
149−import GHCJS.DOM.ClipboardEvent as ClipboardEvent
150143import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode, createComment)
151−import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute)
144+import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute, hasAttributeNS)
152145import GHCJS.DOM.EventM (EventM, event, on)
153146import GHCJS.DOM.KeyboardEvent as KeyboardEvent
154147import GHCJS.DOM.MouseEvent
@@ -182,7 +175,6 @@ import qualified Data.IntMap.Strict as IntMap
182175import qualified Data.Map as Map
183176import qualified Data.Text as T
184177import qualified GHCJS.DOM as DOM
185−import qualified GHCJS.DOM.DataTransfer as DataTransfer
186178import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
187179import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
188180import qualified GHCJS.DOM.Element as Element
@@ -200,7 +192,6 @@ import qualified GHCJS.DOM.TouchEvent as TouchEvent
200192import qualified GHCJS.DOM.TouchList as TouchList
201193import qualified GHCJS.DOM.Types as DOM
202194import qualified GHCJS.DOM.Window as Window
203−import qualified GHCJS.DOM.WheelEvent as WheelEvent
204195import qualified Reflex.Patch.DMap as PatchDMap
205196import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
206197import qualified Reflex.Patch.MapWithMove as PatchMapWithMove
@@ -294,21 +285,12 @@ localRunner (HydrationRunnerT m) s parent = do
294285runHydrationRunnerT
295286 :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
296287 => 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
288+runHydrationRunnerT (HydrationRunnerT m) s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do
304289 (a, s') <- runStateT m (HydrationState s False)
305290 traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
306291 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
308292 pure a
309293
310−
311−
312294instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where
313295 {-# INLINABLE newEventWithTrigger #-}
314296 newEventWithTrigger = lift . newEventWithTrigger
@@ -332,11 +314,12 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationRunnerT t m) where
332314-- done *before* the switchover to immediate mode - this is most likely some
333315-- form of 'hold' which we want to remove after hydration is done
334316{-# INLINABLE addHydrationStepWithSetup #-}
335−addHydrationStepWithSetup :: MonadIO m => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
317+addHydrationStepWithSetup :: (Adjustable t m, MonadIO m) => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
336318addHydrationStepWithSetup setup f = getHydrationMode >>= \case
337319 HydrationMode_Immediate -> pure ()
338320 HydrationMode_Hydrating -> do
339− s <- lift setup
321+ switchover <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_switchover
322+ (s, _) <- lift $ runWithReplace setup $ return () <$ switchover
340323 addHydrationStep (f s)
341324
342325-- | Add a hydration step
@@ -760,14 +743,6 @@ elementInternal elementTag cfg child = getHydrationMode >>= \case
760743 -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er HydrationDomSpace DomTimeline, a)
761744 #-}
762745
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−
771746{-# INLINE hydrateElement #-}
772747hydrateElement
773748 :: forall er t m a. (MonadJSM m, Reflex t, MonadReflexCreateTrigger t m, MonadFix m)
@@ -789,15 +764,11 @@ hydrateElement elementTag cfg child = do
789764 }
790765 result <- HydrationDomBuilderT $ lift $ runReaderT (unHydrationDomBuilderT child) env'
791766 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
767+ let skipAttr = "data-hydration-skip" :: DOM.JSString
768+ hasSkipAttribute :: DOM.Element -> HydrationRunnerT t m Bool
769+ hasSkipAttribute e = case cfg ^. namespace of
770+ Nothing -> hasAttribute e skipAttr
771+ Just ns -> hasAttributeNS e (Just ns) skipAttr
801772 childDom <- liftIO $ readIORef childDelayedRef
802773 let rawCfg = extractRawElementConfig cfg
803774 doc <- askDocument
@@ -812,8 +783,8 @@ hydrateElement elementTag cfg child = do
812783 pure e
813784 Just node -> DOM.castTo DOM.Element node >>= \case
814785 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
786+ Just e -> hasSkipAttribute e >>= \case
787+ True -> go (Just node) -- this element is explicitly marked for being skipped by hydration
817788 False -> do
818789 t <- Element.getTagName e
819790 -- TODO: check attributes?
@@ -937,26 +908,14 @@ inputElementInternal cfg = getHydrationMode >>= \case
937908 doc <- askDocument
938909 -- Expected initial value from config
939910 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'
911+ addHydrationStep $ do
948912 domElement <- liftIO $ readIORef domElementRef
949913 let domInputElement = uncheckedCastTo DOM.HTMLInputElement domElement
950914 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
915+ -- The browser might have messed with the value, or the user could have
916+ -- altered it before activation, so we set it if it isn't what we expect
917+ liftJSM getValue >>= \v0' -> do
918+ when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
960919 -- Watch for user interaction and trigger event accordingly
961920 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
962921 for_ (_inputElementConfig_setValue cfg) $ \eSetValue ->
@@ -970,17 +929,7 @@ inputElementInternal cfg = getHydrationMode >>= \case
970929 ]
971930 liftIO . triggerFocusChange =<< Node.isSameNode (toNode domElement) . fmap toNode =<< Document.getActiveElement doc
972931 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
932+ Input.setChecked domInputElement $ _inputElementConfig_initialChecked cfg
984933 _ <- liftJSM $ domInputElement `on` Events.click $ do
985934 liftIO . triggerCheckedChangedByUI =<< Input.getChecked domInputElement
986935 for_ (_inputElementConfig_setChecked cfg) $ \eNewchecked ->
@@ -993,7 +942,7 @@ inputElementInternal cfg = getHydrationMode >>= \case
993942 let getMyFiles xs = fmap catMaybes . mapM (FileList.item xs) . flip take [0..] . fromIntegral =<< FileList.getLength xs
994943 liftIO . triggerFileChange =<< maybe (return []) getMyFiles mfiles
995944 return ()
996− checked' <- holdDyn c0 $ leftmost
945+ checked' <- holdDyn (_inputElementConfig_initialChecked cfg) $ leftmost
997946 [ checkedChangedBySetChecked
998947 , checkedChangedByUI
999948 ]
@@ -1065,21 +1014,14 @@ textAreaElementInternal cfg = getHydrationMode >>= \case
10651014 doc <- askDocument
10661015 -- Expected initial value from config
10671016 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'
1017+ addHydrationStep $ do
10711018 domElement <- liftIO $ readIORef domElementRef
10721019 let domTextAreaElement = uncheckedCastTo DOM.HTMLTextAreaElement domElement
10731020 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
1021+ -- The browser might have messed with the value, or the user could have
1022+ -- altered it before activation, so we set it if it isn't what we expect
1023+ liftJSM getValue >>= \v0' -> do
1024+ when (v0' /= v0) $ liftIO $ triggerChangeByUI v0'
10831025 -- Watch for user interaction and trigger event accordingly
10841026 requestDomAction_ $ (liftJSM getValue >>= liftIO . triggerChangeByUI) <$ Reflex.select (_element_events e) (WrapArg Input)
10851027 for_ (_textAreaElementConfig_setValue cfg) $ \eSetValue ->
@@ -1328,8 +1270,8 @@ hydrateComment doc t mSetContents = do
13281270skipToAndReplaceComment
13291271 :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
13301272 => Text
1331− -> IORef (Maybe Text)
1332− -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef (Maybe Text))
1273+ -> IORef Text
1274+ -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef Text)
13331275skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
13341276 HydrationMode_Immediate -> do
13351277 -- If we're in immediate mode, we don't try to replace an existing comment,
@@ -1337,50 +1279,43 @@ skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
13371279 t <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
13381280 append $ toNode t
13391281 textNodeRef <- liftIO $ newIORef t
1340− keyRef <- liftIO $ newIORef Nothing
1282+ keyRef <- liftIO $ newIORef ""
13411283 pure (pure (), textNodeRef, keyRef)
13421284 HydrationMode_Hydrating -> do
13431285 doc <- askDocument
13441286 textNodeRef <- liftIO $ newIORef $ error "textNodeRef not yet initialized"
13451287 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
1288+ let go key0 mLastNode = do
1289+ parent <- askParent
1290+ node <- maybe (Node.getFirstChildUnchecked parent) Node.getNextSiblingUnchecked mLastNode
1291+ DOM.castTo DOM.Comment node >>= \case
13571292 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.
1293+ commentText <- Node.getTextContentUnchecked comment
1294+ case T.stripPrefix (prefix <> key0) commentText of
13601295 Just key -> do
13611296 -- Replace the comment with an (invisible) text node
13621297 tn <- createTextNode doc ("" :: Text)
13631298 Node.replaceChild_ parent tn comment
1364− pure (tn, Just key)
1299+ pure (tn, key)
13651300 Nothing -> do
1366− go (Just key0) (Just node)
1301+ go key0 (Just node)
13671302 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
1303+ go key0 (Just node)
1304+ switchComment = do
1305+ key0 <- liftIO $ readIORef key0Ref
1306+ (tn, key) <- go key0 =<< getPreviousNode
1307+ setPreviousNode $ Just $ toNode tn
1308+ liftIO $ do
1309+ writeIORef textNodeRef tn
1310+ writeIORef keyRef key
13761311 pure (switchComment, textNodeRef, keyRef)
13771312
13781313{-# 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.
1314+skipToReplaceStart :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef Text)
1315+skipToReplaceStart = skipToAndReplaceComment "replace-start" =<< liftIO (newIORef "")
13811316
13821317{-# 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)
1318+skipToReplaceEnd :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document) => IORef Text -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text)
13841319skipToReplaceEnd key = fmap (\(m,e,_) -> (m,e)) $ skipToAndReplaceComment "replace-end" key
13851320
13861321instance SupportsHydrationDomBuilder t m => NotReady t (HydrationDomBuilderT s t m) where
@@ -1672,7 +1607,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16721607
16731608{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
16741609traverseDMapWithKeyWithAdjust'
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)
1610+ :: forall s t m (k :: * -> *) v v'. (Adjustable t m, MonadHold t m, MonadFix m, MonadJSM m, PrimMonad m, DMap.GCompare k, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
16761611 => (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
16771612 -> DMap k v
16781613 -> Event t (PatchDMap k v)
@@ -1792,7 +1727,7 @@ hoistTraverseWithKeyWithAdjust
17921727 ::
17931728 ( Adjustable t m
17941729 , MonadHold t m
1795− , GCompare k
1730+ , DMap.GCompare k
17961731 , MonadIO m
17971732 , MonadJSM m
17981733 , PrimMonad m
@@ -1876,14 +1811,14 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18761811 getHydrationMode >>= \case
18771812 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
18781813 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
1814+ phs <- traverse id $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
18801815 liftIO $ writeIORef placeholders $! phs
18811816 insertAfterPreviousNode lastPlaceholder
18821817 HydrationMode_Immediate -> do
18831818 let activate i = do
18841819 append $ toNode $ _traverseChildImmediate_fragment i
18851820 pure $ _traverseChildImmediate_placeholder i
1886− phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
1821+ phs <- traverse id $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
18871822 liftIO $ writeIORef placeholders $! phs
18881823 append $ toNode lastPlaceholder
18891824 requestDomAction_ $ ffor children' $ \p -> do
@@ -2297,7 +2232,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
22972232 Beforecopy -> return ()
22982233 Copy -> return ()
22992234 Beforepaste -> return ()
2300− Paste -> getPasteData
2235+ Paste -> return ()
23012236 Reset -> return ()
23022237 Search -> return ()
23032238 Selectstart -> return ()
@@ -2306,7 +2241,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
23062241 Touchend -> getTouchEvent
23072242 Touchcancel -> getTouchEvent
23082243 Mousewheel -> return ()
2309− Wheel -> getWheelEvent
2244+ Wheel -> return ()
23102245
23112246{-# INLINABLE defaultDomWindowEventHandler #-}
23122247defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
@@ -2347,7 +2282,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
23472282 Beforecopy -> return ()
23482283 Copy -> return ()
23492284 Beforepaste -> return ()
2350− Paste -> getPasteData
2285+ Paste -> return ()
23512286 Reset -> return ()
23522287 Search -> return ()
23532288 Selectstart -> return ()
@@ -2356,7 +2291,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
23562291 Touchend -> getTouchEvent
23572292 Touchcancel -> getTouchEvent
23582293 Mousewheel -> return ()
2359− Wheel -> getWheelEvent
2294+ Wheel -> return ()
23602295
23612296{-# INLINABLE withIsEvent #-}
23622297withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
@@ -2624,15 +2559,6 @@ getMouseEventCoords = do
26242559 e <- event
26252560 bisequence (getClientX e, getClientY e)
26262561
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−
26362562{-# INLINABLE getTouchEvent #-}
26372563getTouchEvent :: EventM e TouchEvent TouchEventResult
26382564getTouchEvent = do
@@ -2674,26 +2600,6 @@ getTouchEvent = do
26742600 , _touchEventResult_touches = touches
26752601 }
26762602
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−
26972603instance MonadSample t m => MonadSample t (HydrationDomBuilderT s t m) where
26982604 {-# INLINABLE sample #-}
26992605 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−48
@@ -37,7 +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)
4140import Data.Monoid ((<>))
4241import qualified Data.Set as Set
4342import Data.Text (Text)
@@ -56,6 +55,7 @@ import Reflex.PerformEvent.Class
5655import Reflex.PostBuild.Base
5756import Reflex.PostBuild.Class
5857import Reflex.TriggerEvent.Class
58+import System.Random (randomRIO)
5959
6060data StaticDomBuilderEnv t = StaticDomBuilderEnv
6161 { _staticDomBuilderEnv_shouldEscape :: Bool
@@ -64,7 +64,6 @@ data StaticDomBuilderEnv t = StaticDomBuilderEnv
6464 -- We use this to add a "selected" attribute to the appropriate "option" child element.
6565 -- This is not yet a perfect simulation of what the browser does, but it is much closer than doing nothing.
6666 -- TODO: Handle edge cases, e.g. setting to a value for which there is no option, then adding that option dynamically afterwards.
67− , _staticDomBuilderEnv_nextRunWithReplaceKey :: IORef Int
6867 }
6968
7069newtype StaticDomBuilderT t m a = StaticDomBuilderT
@@ -165,7 +164,7 @@ instance (SupportsStaticDomBuilder t m, Monad m) => HasDocument (StaticDomBuilde
165164instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m) => Adjustable t (StaticDomBuilderT t m) where
166165 runWithReplace a0 a' = do
167166 e <- StaticDomBuilderT ask
168− key <- replaceStart e
167+ key <- replaceStart
169168 (result0, result') <- lift $ runWithReplace (runStaticDomBuilderT a0 e) (flip runStaticDomBuilderT e <$> a')
170169 o <- hold (snd result0) $ fmapCheap snd result'
171170 StaticDomBuilderT $ modify $ (:) $ join o
@@ -175,9 +174,10 @@ instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m)
175174 traverseDMapWithKeyWithAdjust = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap
176175 traverseDMapWithKeyWithAdjustWithMove = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove
177176
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))
177+-- TODO remove this?
178+replaceStart :: (DomBuilder t m, MonadIO m) => m Text
179+replaceStart = do
180+ str <- liftIO $ replicateM 8 $ randomRIO ('a', 'z')
181181 let key = "-" <> T.pack str
182182 _ <- commentNode $ def { _commentNodeConfig_initialContents = "replace-start" <> key }
183183 pure key
@@ -274,7 +274,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
274274 --TODO: Do not escape quotation marks; see https://stackoverflow.com/questions/25612166/what-characters-must-be-escaped-in-html-5
275275 shouldEscape <- asks _staticDomBuilderEnv_shouldEscape
276276 let escape = if shouldEscape then fromHtmlEscapedText else byteString . encodeUtf8
277− (modify . (:)) . (\c -> "<!--" <> c <> "-->") =<< case mSetContents of
277+ modify . (:) =<< (\c -> "<!--" <> c <> "-->") <$> case mSetContents of
278278 Nothing -> return (pure (escape initialContents))
279279 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on
280280 return $ CommentNode ()
@@ -287,9 +287,8 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
287287 es <- newFanEventWithTrigger $ \_ _ -> return (return ())
288288 StaticDomBuilderT $ do
289289 let shouldEscape = elementTag `Set.notMember` noEscapeElements
290− nextRunWithReplaceKey <- asks _staticDomBuilderEnv_nextRunWithReplaceKey
291− (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing nextRunWithReplaceKey
292− attrs0 <- foldDyn applyMap (cfg ^. initialAttributes) (cfg ^. modifyAttributes)
290+ (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing
291+ attrs0 <- foldDyn applyMap (Map.insert "data-ssr" "" $ cfg ^. initialAttributes) (cfg ^. modifyAttributes)
293292 selectValue <- asks _staticDomBuilderEnv_selectValue
294293 let addSelectedAttr attrs sel = case Map.lookup "value" attrs of
295294 Just v | v == sel -> attrs <> Map.singleton "selected" ""
@@ -312,32 +311,13 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
312311 return (e, result)
313312 {-# INLINABLE inputElement #-}
314313 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
314+ (e, _result) <- element "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
315+ let v0 = constDyn $ cfg ^. inputElementConfig_initialValue
316+ let c0 = constDyn $ cfg ^. inputElementConfig_initialChecked
337317 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
338318 return $ InputElement
339− { _inputElement_value = v
340− , _inputElement_checked = c
319+ { _inputElement_value = v0
320+ , _inputElement_checked = c0
341321 , _inputElement_checkedChange = never
342322 , _inputElement_input = never
343323 , _inputElement_hasFocus = hasFocus
@@ -347,17 +327,12 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
347327 }
348328 {-# INLINABLE textAreaElement #-}
349329 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
330+ --TODO: Support setValue event
331+ (e, _domElement) <- element "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
332+ let v0 = constDyn $ cfg ^. textAreaElementConfig_initialValue
358333 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
359334 return $ TextAreaElement
360− { _textAreaElement_value = v
335+ { _textAreaElement_value = v0
361336 , _textAreaElement_input = never
362337 , _textAreaElement_hasFocus = hasFocus
363338 , _textAreaElement_element = e
@@ -366,9 +341,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
366341 selectElement cfg child = do
367342 v <- holdDyn (cfg ^. selectElementConfig_initialValue) (cfg ^. selectElementConfig_setValue)
368343 (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
344+ (a, innerHtml) <- StaticDomBuilderT $ lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv False $ Just (current v)
372345 StaticDomBuilderT $ lift $ modify $ (:) innerHtml
373346 return a
374347 let wrapped = SelectElement
@@ -390,8 +363,7 @@ renderStatic :: StaticWidget x a -> IO (a, ByteString)
390363renderStatic w = do
391364 runDomHost $ do
392365 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
393− nextRunWithReplaceKey <- newRef 0
394− let env0 = StaticDomBuilderEnv True Nothing nextRunWithReplaceKey
366+ let env0 = StaticDomBuilderEnv True Nothing
395367 ((res, bs), FireCommand fire) <- hostPerformEventT $ runStaticDomBuilderT (runPostBuildT w postBuild) env0
396368 mPostBuildTrigger <- readRef postBuildTriggerRef
397369 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+7−37
@@ -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 #-}
@@ -72,14 +73,8 @@ mainHydrationWidgetWithSwitchoverAction = mainHydrationWidgetWithSwitchoverActio
7273{-# INLINABLE mainHydrationWidgetWithSwitchoverAction' #-}
7374-- | Warning: `mainHydrationWidgetWithSwitchoverAction'` is provided only as performance tweak. It is expected to disappear in future releases.
7475mainHydrationWidgetWithSwitchoverAction' :: 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
76+mainHydrationWidgetWithSwitchoverAction' switchoverAction head' body = do
77+ runHydrationWidgetWithHeadAndBody switchoverAction $ \appendHead appendBody -> do
8378 appendHead head'
8479 appendBody body
8580
@@ -94,21 +89,7 @@ attachHydrationWidget
9489 -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
9590 )
9691 -> 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
92+attachHydrationWidget switchoverAction jsSing w = do
11293 hydrationMode <- liftIO $ newIORef HydrationMode_Hydrating
11394 rootNodesRef <- liftIO $ newIORef []
11495 events <- newChan
@@ -124,7 +105,7 @@ attachHydrationWidgetWithFailure onFailure switchoverAction jsSing w = do
124105 rootNodes <- liftIO $ readIORef rootNodesRef
125106 let delayedAction = do
126107 for_ (reverse rootNodes) $ \(rootNode, runner) -> do
127− let hydrate = runHydrationRunnerTWithFailure runner onFailure Nothing rootNode events
108+ let hydrate = runHydrationRunnerT runner Nothing rootNode events
128109 void $ runWithJSContextSingleton (runPostBuildT hydrate never) jsSing
129110 liftIO $ writeIORef hydrationMode HydrationMode_Immediate
130111 runWithJSContextSingleton (DOM.liftJSM switchoverAction) jsSing
@@ -145,22 +126,11 @@ runHydrationWidgetWithHeadAndBody
145126 -> FloatingWidget () ()
146127 )
147128 -> 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
129+runHydrationWidgetWithHeadAndBody switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
160130 globalDoc <- currentDocumentUnchecked
161131 headElement <- getHeadUnchecked globalDoc
162132 bodyElement <- getBodyUnchecked globalDoc
163− (events, fc) <- liftIO . attachHydrationWidgetWithFailure onFailure switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
133+ (events, fc) <- liftIO . attachHydrationWidget switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
164134 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
165135 let hydrateDom :: DOM.Node -> HydrationWidget () c -> FloatingWidget () c
166136 hydrateDom n w = do
reflex-dom-core/src/Reflex/Dom/Prerender.hs+7−15
@@ -24,7 +24,7 @@ module Reflex.Dom.Prerender
2424
2525import Control.Monad.Primitive (PrimMonad(..))
2626import Control.Monad.Reader
27−import Control.Monad.Ref (MonadRef(..), MonadAtomicRef(..))
27+import Control.Monad.Ref (MonadRef(..))
2828import Data.IORef (IORef, newIORef)
2929import Data.Semigroup (Semigroup)
3030import Data.Text (Text)
@@ -33,7 +33,6 @@ import Foreign.JavaScript.TH
3333import GHCJS.DOM.Types (MonadJSM)
3434import Reflex hiding (askEvents)
3535import Reflex.Dom.Builder.Class
36−import Reflex.Dom.Builder.Hydratable
3736import Reflex.Dom.Builder.Immediate
3837import Reflex.Dom.Builder.InputDisabled
3938import Reflex.Dom.Builder.Static
@@ -165,8 +164,6 @@ instance Monad m => MonadRef (UnrunnableT js t m) where
165164 newRef _ = unrunnable
166165 readRef _ = unrunnable
167166 writeRef _ _ = unrunnable
168−instance Monad m => MonadAtomicRef (UnrunnableT js t m) where
169− atomicModifyRef _ _ = unrunnable
170167instance Monad m => HasDocument (UnrunnableT js t m) where
171168 askDocument = unrunnable
172169instance Monad m => HasJSContext (UnrunnableT js t m) where
@@ -205,13 +202,12 @@ instance Monad m => MonadReflexCreateTrigger t (UnrunnableT js t m) where
205202 newFanEventWithTrigger _ = unrunnable
206203instance Monad m => MonadFix (UnrunnableT js t m) where
207204 mfix _ = unrunnable
208−instance (Monad m, MonadHold t m) => MonadHold t (UnrunnableT js t m) where
205+instance Monad m => MonadHold t (UnrunnableT js t m) where
209206 hold _ _ = unrunnable
210207 holdDyn _ _ = unrunnable
211208 holdIncremental _ _ = unrunnable
212209 buildDynamic _ _ = unrunnable
213210 headE _ = unrunnable
214− now = unrunnable
215211instance Monad m => MonadSample t (UnrunnableT js t m) where
216212 sample _ = unrunnable
217213instance Monad m => MonadIO (UnrunnableT js t m) where
@@ -229,7 +225,7 @@ instance (Reflex t, Monad m) => DomRenderHook t (UnrunnableT js t m) where
229225 withRenderHook _ _ = unrunnable
230226 requestDomAction _ = unrunnable
231227 requestDomAction_ _ = unrunnable
232−instance (Reflex t, Monad m, MonadHold t m) => Prerender JS' t (UnrunnableT js t m) where
228+instance (Reflex t, Monad m) => Prerender JS' t (UnrunnableT js t m) where
233229 type Client (UnrunnableT js t m) = UnrunnableT js t m
234230 prerender _ _ = unrunnable
235231
@@ -274,8 +270,8 @@ instance (Prerender js t m, MonadFix m, Reflex t) => Prerender js t (RequesterT
274270 (x, e) <- runRequesterT w (selectInt fannedResponses selector)
275271 pure (x, fmapCheap (IntMap.singleton selector) e)
276272 (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
273+ responses <- fmap (fmapCheap unMultiEntry) $ requesting' $ fmapCheap multiEntry $ switch $ current requestsDyn
274+ pure result
279275
280276instance (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
281277 type Client (QueryT t q m) = QueryT t q (Client m)
@@ -287,12 +283,8 @@ instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Group q, Additive q,
287283 pure a
288284
289285instance (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
286+ type Client (InputDisabledT m) = Client m
287+ prerender (InputDisabledT server) client = InputDisabledT $ prerender server client
296288
297289instance (Prerender js t m, Monad m, ReflexHost t) => Prerender js t (PostBuildT t m) where
298290 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+1−1
@@ -117,7 +117,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu
117117 "overflow" =: "hidden" <>
118118 "position" =: "relative"
119119 mkRow k = toStyleAttr $ "height" =: (T.pack (show rowPx) <> "px") <>
120− "top" =: (<> "px") (T.pack $ show $ keyToIndex k * rowPx) <>
120+ "top" =: ((<>"px") $ T.pack $ show $ keyToIndex k * rowPx) <>
121121 "position" =: "absolute" <>
122122 "width" =: "100%"
123123 findWindow sizeIncrement windowSize startingPosition =
reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+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+2−2
@@ -15,7 +15,7 @@ import Data.Text (Text)
1515import Data.ByteString (ByteString)
1616import Foreign.JavaScript.Utils (bsFromMutableArrayBuffer, bsToArrayBuffer)
1717import GHCJS.DOM.Enums
18−import GHCJS.DOM.EventM (EventM, on, onSync)
18+import GHCJS.DOM.EventM (EventM, on)
1919import GHCJS.DOM.EventTarget (dispatchEvent)
2020import GHCJS.DOM.Types (MonadJSM, ToJSString, FormData, Document, Blob (..), ArrayBuffer (..), JSVal, JSM, IsEvent, XMLHttpRequestProgressEvent, ProgressEvent, Event, XMLHttpRequestUpload, FromJSString, ArrayBufferView (..), liftJSM, castTo)
2121import GHCJS.DOM.XMLHttpRequest
@@ -114,7 +114,7 @@ xmlHttpRequestOntimeout :: XMLHttpRequest -> EventM XMLHttpRequest ProgressEvent
114114xmlHttpRequestOntimeout = (`on` timeout)
115115
116116xmlHttpRequestOnreadystatechange :: XMLHttpRequest -> EventM XMLHttpRequest Event () -> JSM (JSM ())
117−xmlHttpRequestOnreadystatechange = (`onSync` readyStateChange)
117+xmlHttpRequestOnreadystatechange = (`on` readyStateChange)
118118
119119xmlHttpRequestSetTimeout :: MonadJSM m => XMLHttpRequest -> Word -> m ()
120120xmlHttpRequestSetTimeout = setTimeout
reflex-dom-core/test/gc.hs+1−1
@@ -47,7 +47,7 @@ failureLimit = 0
4747
4848main :: IO ()
4949main = do
50− handle (\(_ :: IOError) -> return ()) $ 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−2
@@ -1,4 +1,4 @@
1−import Language.Haskell.HLint (hlint)
1+import Language.Haskell.HLint3 (hlint)
22import System.Exit (exitFailure, exitSuccess)
33
44main :: IO ()
@@ -20,7 +20,6 @@ main = do
2020 , "--ignore=Unnecessary hiding" -- Interferes with cross-version compatibility
2121 , "--ignore=Use <$>"
2222 , "--ignore=Reduce duplication" --TODO: Re-enable this test
23− , "--ignore=Use list comprehension"
2423 , "--cpp-define=USE_TEMPLATE_HASKELL"
2524 ]
2625 if null ideas then exitSuccess else exitFailure
reflex-dom-core/test/hydration.hs+70−488
@@ -1,9 +1,13 @@
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 #-}
49{-# LANGUAGE FlexibleInstances #-}
510{-# LANGUAGE GADTs #-}
6−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
711{-# LANGUAGE LambdaCase #-}
812{-# LANGUAGE MultiParamTypeClasses #-}
913{-# LANGUAGE OverloadedStrings #-}
@@ -11,27 +15,13 @@
1115{-# LANGUAGE RankNTypes #-}
1216{-# LANGUAGE RecursiveDo #-}
1317{-# LANGUAGE ScopedTypeVariables #-}
14−{-# LANGUAGE StandaloneDeriving #-}
1518{-# LANGUAGE TemplateHaskell #-}
1619{-# LANGUAGE TupleSections #-}
1720{-# LANGUAGE TypeApplications #-}
1821{-# LANGUAGE TypeFamilies #-}
19−{-# LANGUAGE UndecidableInstances #-}
20−
21−{-# OPTIONS_GHC -fno-warn-orphans #-}
22−
23−-- Notice to those working on this test suite:
24−-- It doesn't appear to be possible to use --match to run a particular test, in
25−-- this situation the test may hang before reaching our code. This seems to
26−-- happen when the test is not the first test in the block. As a workaround, you
27−-- can just comment out the other tests. Also, using `xit` will cause the same
28−-- issue. `xit` tests must be the last tests in the session, or the session will
29−-- hang in the following test.
3022
3123import Prelude hiding (fail)
3224import Control.Concurrent
33−import qualified Control.Concurrent.Async as Async
34−import Control.Lens.Operators
3525import Control.Monad hiding (fail)
3626import Control.Monad.Catch
3727import Control.Monad.Fail
@@ -41,13 +31,12 @@ import Control.Monad.Ref
4131import Data.Constraint.Extras
4232import Data.Constraint.Extras.TH
4333import Data.Dependent.Map (DMap)
44−import Data.Dependent.Sum (DSum(..), (==>))
34+import Data.Dependent.Sum (DSum(..), (==>), EqTag(..), ShowTag(..))
4535import Data.Functor.Identity
4636import Data.Functor.Misc
4737import Data.GADT.Compare.TH
4838import Data.GADT.Show.TH
4939import Data.IORef (IORef)
50−import Data.List (sort)
5140import Data.Maybe
5241import Data.Proxy
5342import Data.Text (Text)
@@ -58,7 +47,6 @@ import Network.Socket
5847import Network.Wai
5948import Network.WebSockets
6049import Reflex.Dom.Core
61−import Reflex.Dom.Widget.Input (dropdown)
6250import Reflex.Patch.DMapWithMove
6351import System.Directory
6452import System.Environment
@@ -66,14 +54,14 @@ import System.IO (stderr)
6654import System.IO.Silently
6755import System.IO.Temp
6856import System.Process
69−import System.Which (staticWhich)
70−import qualified Test.HUnit as HUnit
57+import qualified Test.HUnit as HUnit (assertEqual, assertFailure)
7158import qualified Test.Hspec as H
7259import qualified Test.Hspec.Core.Spec as H
7360import Test.Hspec (xit)
7461import Test.Hspec.WebDriver hiding (runWD, click, uploadFile, WD)
7562import qualified Test.Hspec.WebDriver as WD
7663import Test.WebDriver (WD(..))
64+import Test.WebDriver.Exceptions (ServerError(..))
7765
7866import qualified Data.ByteString.Lazy as LBS
7967import qualified Data.Dependent.Map as DMap
@@ -89,12 +77,6 @@ import qualified Test.WebDriver.Capabilities as WD
8977import Test.Util.ChromeFlags
9078import Test.Util.UnshareNetwork
9179
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−
9880seleniumPort, jsaddlePort :: PortNumber
9981seleniumPort = 8000
10082jsaddlePort = 8001
@@ -107,14 +89,11 @@ instance MonadRef WD where
10789 writeRef r = WD . writeRef r
10890
10991assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
110−assertEqual msg a b = liftIO $ HUnit.assertEqual msg a b
92+assertEqual a b = liftIO . HUnit.assertEqual a b
11193
11294assertFailure :: MonadIO m => String -> m ()
11395assertFailure = liftIO . HUnit.assertFailure
11496
115−assertBool :: (MonadIO m) => String -> Bool -> m ()
116−assertBool msg bool = liftIO $ HUnit.assertBool msg bool
117−
11897chromeConfig :: Text -> [Text] -> WD.WDConfig
11998chromeConfig fp flags = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags }) WD.defaultConfig
12099
@@ -145,22 +124,22 @@ deriving instance MonadFail WD
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"
154133 withDebugging <- isNothing <$> lookupEnv "NO_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
@@ -297,78 +276,21 @@ tests withDebugging wdConfig caps _selenium = do
297276 let click = domEvent Click e
298277 return ()
299278
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
279+ describe "inputElement" $ do
280+ describe "hydration" $ session' $ do
359281 it "doesn't wipe user input when switching over" $ runWD $ do
360− inputRef <- newRef ("hello " :: Text)
282+ inputRef <- newRef ("" :: Text)
361283 testWidget'
362284 (do
363285 e <- findElemWithRetry $ WD.ByTag "input"
364− WD.sendKeys "world" e
286+ WD.sendKeys "hello world" e
365287 pure e)
366288 (\e -> do
367289 WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
368290 WD.click =<< findElemWithRetry (WD.ByTag "button")
369291 readRef inputRef `shouldBeWithRetryM` "hello world"
370292 ) $ do
371− e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
293+ e <- inputElement def
372294 click <- button "save"
373295 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
374296 it "captures user input after switchover" $ runWD $ do
@@ -425,49 +347,24 @@ tests withDebugging wdConfig caps _selenium = do
425347 checkedByUIRef <- newRef False
426348 checkedRef <- newRef False
427349 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
350+ let checkValue = do
433351 readRef checkedByUIRef `shouldBeWithRetryM` False
434352 readRef checkedRef `shouldBeWithRetryM` False
435− WD.attr e "checked" `shouldBeWithRetryM` Nothing
353+ e <- findElemWithRetry $ WD.ByTag "input"
436354 WD.moveToCenter e
437355 WD.click e
438356 readRef checkedByUIRef `shouldBeWithRetryM` True
439357 readRef checkedRef `shouldBeWithRetryM` True
440− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
441358 liftIO $ writeChan setCheckedChan False
442359 readRef checkedByUIRef `shouldBeWithRetryM` True
443360 readRef checkedRef `shouldBeWithRetryM` False
444− WD.attr e "checked" `shouldBeWithRetryM` Nothing
445− testWidget' checkStatic checkValue $ do
361+ testWidget (pure ()) checkValue $ do
446362 setChecked <- triggerEventWithChan setCheckedChan
447363 e <- inputElement $ def
448364 & initialAttributes .~ "type" =: "checkbox"
449365 & inputElementConfig_setChecked .~ setChecked
450366 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
451367 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)
471368 it "captures file uploads" $ runWD $ do
472369 filesRef :: IORef [Text] <- newRef []
473370 let uploadFile = do
@@ -483,117 +380,8 @@ tests withDebugging wdConfig caps _selenium = do
483380 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
484381 names <- liftJSM $ traverse File.getName fs
485382 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
383+
384+ describe "hydration/immediate" $ session' $ do
597385 it "captures user input after switchover" $ runWD $ do
598386 inputRef :: IORef Text <- newRef ""
599387 let checkValue = do
@@ -673,31 +461,8 @@ tests withDebugging wdConfig caps _selenium = do
673461 names <- liftJSM $ traverse File.getName fs
674462 liftIO $ writeRef filesRef names
675463
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
464+ describe "textAreaElement" $ do
465+ describe "hydration" $ session' $ do
701466 it "doesn't wipe user input when switching over" $ runWD $ do
702467 inputRef <- newRef ("" :: Text)
703468 testWidget'
@@ -763,90 +528,8 @@ tests withDebugging wdConfig caps _selenium = do
763528 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
764529 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
765530 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
848531
849− describe "hydration/immediate" $ do
532+ describe "hydration/immediate" $ session' $ do
850533 it "captures user input after switchover" $ runWD $ do
851534 inputRef :: IORef Text <- newRef ""
852535 let checkValue = do
@@ -888,13 +571,13 @@ tests withDebugging wdConfig caps _selenium = do
888571 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
889572 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
890573
891− session' "selectElement" $ do
574+ describe "selectElement" $ do
892575 let options :: DomBuilder t m => m ()
893576 options = do
894577 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
895578 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
896579 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
897− describe "hydration" $ do
580+ describe "hydration" $ session' $ do
898581 it "sets initial value correctly" $ runWD $ do
899582 inputRef <- newRef ("" :: Text)
900583 let setup = do
@@ -968,7 +651,7 @@ tests withDebugging wdConfig caps _selenium = do
968651 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
969652 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
970653
971− describe "hydration/immediate" $ do
654+ describe "hydration/immediate" $ session' $ do
972655 it "captures user input after switchover" $ runWD $ do
973656 inputRef :: IORef Text <- newRef ""
974657 let checkValue = do
@@ -1014,7 +697,7 @@ tests withDebugging wdConfig caps _selenium = do
1014697 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
1015698 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
1016699
1017− session' "prerender" $ do
700+ describe "prerender" $ session' $ do
1018701 it "works in simple case" $ runWD $ do
1019702 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
1020703 prerender_ (text "One") (text "Two")
@@ -1083,16 +766,7 @@ tests withDebugging wdConfig caps _selenium = do
1083766 prerender_ (pure ()) (liftIO $ trigger "Client")
1084767 textNode $ TextNodeConfig "Initial" $ Just e
1085768
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
769+ describe "runWithReplace" $ session' $ do
1096770 it "works" $ runWD $ do
1097771 replaceChan :: Chan Text <- liftIO newChan
1098772 let setup = findElemWithRetry $ WD.ByTag "div"
@@ -1236,61 +910,7 @@ tests withDebugging wdConfig caps _selenium = do
1236910 , el "span" . text <$> replace
1237911 ]
1238912
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
913+ describe "traverseDMapWithKeyWithAdjust" $ session' $ do
1294914 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
1295915 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1296916 elClass "span" "key" $ text $ textKey k
@@ -1393,7 +1013,7 @@ tests withDebugging wdConfig caps _selenium = do
13931013 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
13941014 liftIO $ dmap `H.shouldBe` keyMap
13951015
1396− session' "traverseIntMapWithKeyWithAdjust" $ do
1016+ describe "traverseIntMapWithKeyWithAdjust" $ session' $ do
13971017 let textKeyInt k = "key" <> T.pack (show k)
13981018 intMap = IntMap.fromList
13991019 [ (1, "one")
@@ -1500,7 +1120,7 @@ tests withDebugging wdConfig caps _selenium = do
15001120 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
15011121 liftIO $ dmap `H.shouldBe` intMap
15021122
1503− session' "traverseDMapWithKeyWithAdjustWithMove" $ do
1123+ describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do
15041124 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
15051125 widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
15061126 elClass "span" "key" $ text $ textKey2 k
@@ -1580,14 +1200,12 @@ tests withDebugging wdConfig caps _selenium = do
15801200 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
15811201 liftIO $ assertEqual "DMap" initMap dmap
15821202
1583− session' "hydrating invalid HTML" $ do
1584− xit "can hydrate list in paragraph" $ runWD $ do
1203+ describe "hydrating invalid HTML" $ session' $ do
1204+ it "can hydrate list in paragraph" $ runWD $ do
15851205 let preSwitchover = do
15861206 checkBodyText "before\ninner\nafter"
15871207 -- 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)"
1208+ [p1, p2] <- WD.findElems (WD.ByTag "p")
15911209 ol <- findElemWithRetry (WD.ByTag "ol")
15921210 shouldContainText "before" p1
15931211 shouldContainText "inner" ol
@@ -1598,8 +1216,7 @@ tests withDebugging wdConfig caps _selenium = do
15981216 shouldContainText "before\ninner\nafter" p1
15991217 elementShouldBeRemoved ol
16001218 elementShouldBeRemoved p2
1601− -- Don't fail fatally when hydration encounters the invalid DOM
1602− testWidgetDebug' False withDebugging preSwitchover check $ do
1219+ testWidget' preSwitchover check $ do
16031220 -- This is deliberately invalid HTML, the browser will interpret it as
16041221 -- <p>before</p><ol>inner</ol>after<p></p>
16051222 el "p" $ do
@@ -1607,29 +1224,6 @@ tests withDebugging wdConfig caps _selenium = do
16071224 el "ol" $ text "inner"
16081225 text "after"
16091226
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−
16331227data Selenium = Selenium
16341228 { _selenium_portNumber :: PortNumber
16351229 , _selenium_stopServer :: IO ()
@@ -1697,9 +1291,6 @@ checkTextInId i expected = do
16971291findElemWithRetry :: Selector -> WD WD.Element
16981292findElemWithRetry = withRetry . WD.findElem
16991293
1700−findElemsWithRetry :: Selector -> WD [WD.Element]
1701−findElemsWithRetry = withRetry . WD.findElems
1702−
17031294getBody :: WD WD.Element
17041295getBody = WD.findElem $ WD.ByTag "body"
17051296
@@ -1708,8 +1299,8 @@ withRetry a = wait 300
17081299 where wait :: Int -> WD a
17091300 wait 0 = a
17101301 wait n = try a >>= \case
1711− Left (e :: SomeException) -> do
1712− liftIO $ putStrLn ("(retrying due to " <> show e <> ")") *> threadDelay 100000
1302+ Left (_ :: SomeException) -> do
1303+ liftIO $ threadDelay 100000
17131304 wait $ n - 1
17141305 Right v -> return v
17151306
@@ -1725,12 +1316,11 @@ testWidgetStaticDebug
17251316 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17261317 -- ^ Widget we are testing
17271318 -> WD b
1728−testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
1319+testWidgetStaticDebug withDebugging w = testWidgetDebug withDebugging (void w) w
17291320
17301321-- | TODO: do something about JSExceptions not causing tests to fail
17311322testWidgetDebug
17321323 :: Bool
1733− -> Bool
17341324 -> WD ()
17351325 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17361326 -> WD b
@@ -1738,16 +1328,12 @@ testWidgetDebug
17381328 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17391329 -- ^ Widget we are testing
17401330 -> 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
1331+testWidgetDebug withDebugging beforeJS afterSwitchover =
1332+ testWidgetDebug' withDebugging beforeJS (const afterSwitchover)
17461333
17471334-- | TODO: do something about JSExceptions not causing tests to fail
17481335testWidgetDebug'
17491336 :: Bool
1750− -> Bool
17511337 -> WD a
17521338 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17531339 -> (a -> WD b)
@@ -1755,7 +1341,7 @@ testWidgetDebug'
17551341 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17561342 -- ^ Widget we are testing (contents of body)
17571343 -> WD b
1758−testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget = do
1344+testWidgetDebug' withDebugging beforeJS afterSwitchover bodyWidget = do
17591345 let putStrLnDebug :: MonadIO m => Text -> m ()
17601346 putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
17611347 staticApp = do
@@ -1763,11 +1349,10 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17631349 el "body" $ do
17641350 bodyWidget
17651351 el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1766− putStrLnDebug "rendering static"
1767− ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
1768− putStrLnDebug "rendered static"
1352+ putStrLnDebug "rendering preSwitchover"
1353+ ((), html) <- liftIO $ renderStatic staticApp
1354+ putStrLnDebug "rendered preSwitchover"
17691355 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770− onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
17711356 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
17721357 let entryPoint = do
17731358 putStrLnDebug "taking waitBeforeJS"
@@ -1779,7 +1364,7 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17791364 liftIO $ putMVar waitUntilSwitchover ()
17801365 putStrLnDebug "put waitUntilSwitchover"
17811366 putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1782− mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget
1367+ mainHydrationWidgetWithSwitchoverAction switchOverAction blank bodyWidget
17831368 putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
17841369 syncPoint
17851370 application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
@@ -1797,26 +1382,23 @@ testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget =
17971382 ]
17981383 -- hSilence to get rid of ConnectionClosed logs
17991384 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)
1385+ jsaddleWarp = forkIO $ silenceIfDebug $ Warp.runSettings settings application
1386+ jsaddleTid <- liftIO jsaddleWarp
1387+ putStrLnDebug "taking waitJSaddle"
1388+ liftIO $ takeMVar waitJSaddle
1389+ putStrLnDebug "opening page"
1390+ WD.openPage $ "http://localhost:" <> show jsaddlePort
1391+ putStrLnDebug "running beforeJS"
1392+ a <- beforeJS
1393+ putStrLnDebug "putting waitBeforeJS"
1394+ liftIO $ putMVar waitBeforeJS ()
1395+ putStrLnDebug "taking waitUntilSwitchover"
1396+ liftIO $ takeMVar waitUntilSwitchover
1397+ putStrLnDebug "running afterSwitchover"
1398+ b <- afterSwitchover a
1399+ putStrLnDebug "killing jsaddle thread"
1400+ liftIO $ killThread jsaddleTid
1401+ return b
18201402
18211403data Key2 a where
18221404 Key2_Int :: Int -> Key2 Int
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.md+1−31
@@ -1,35 +1,6 @@
11# Revision history for reflex-dom
22
3−## 0.6.1.0-r1
4−
5−* Loosen reflex-dom-core version bounds
6−
7−## 0.6.1.0
8−
9−* Update for new dependent-map and dependent-sum (after the "some" package split)
10−
11−## 0.6.0.0
12−
13−* ([#379](https://github.com/reflex-frp/reflex-dom/pull/379)) Re-export all modules from `reflex-dom-core`. The newly re-exported modules are:
14− * `Foreign.JavaScript.Utils`
15− * `Reflex.Dom.Builder.Hydratable`
16− * `Reflex.Dom.Modals.Class`
17− * `Reflex.Dom.Prerender`
18− * `Reflex.Dom.Time`
19− * `Reflex.Dom.WebSocket.Query`
20− * `Reflex.Dom.Xhr.FormData`
21−* ([#366](https://github.com/reflex-frp/reflex-dom/pull/366)) Bump bounds for `reflex` to include 0.7.
22−
23−## 0.5.3
24−
25−* On Android, enable prompting the user for geolocation
26− permissions on demand by default. See
27− https://developer.android.com/reference/android/webkit/WebChromeClient.html#onGeolocationPermissionsShowPrompt(java.lang.String,%20android.webkit.GeolocationPermissions.Callback)
28− for details.
29−
30− * Add `< 0.7` upper bound for reflex
31−
32−## 0.5.2
3+## 0.5.1
334
345* The default jsaddle backend on macOS when built from nix
356 is now jsaddle-wkwebview, matching the behaviour of cabal
@@ -38,5 +9,4 @@
389## 0.5
3910
4011* Re-export new hydration widget "mainWidget" functions.
41−
4212* 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+38
@@ -0,0 +1,38 @@
1+{ mkDerivation, base, bytestring, jsaddle-webkit2gtk, jsaddle-wkwebview, jsaddle-warp, reflex
2+, reflex-dom-core, stdenv, text, ghc, hostPlatform, jsaddle-clib, android-activity ? null
3+, ghcBackend ? if hostPlatform.isDarwin then "wkwebview" else "webkit2gtk"
4+}:
5+assert (builtins.elem ghcBackend [ "warp" "webkit2gtk" "wkwebview" ]);
6+let isAndroid = hostPlatform.libc == "bionic";
7+ ghcBackendPackage = {
8+ webkit2gtk = jsaddle-webkit2gtk;
9+ warp = jsaddle-warp;
10+ wkwebview = jsaddle-wkwebview;
11+ }.${ghcBackend};
12+in mkDerivation {
13+ pname = "reflex-dom";
14+ version = "0.5.2";
15+ src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
16+ libraryHaskellDepends = [
17+ base bytestring reflex reflex-dom-core text
18+ ] ++ (if ghc.isGhcjs or false then [
19+ ] else if hostPlatform.isiOS then [
20+ jsaddle-wkwebview
21+ ] else if isAndroid then [
22+ jsaddle-clib
23+ android-activity
24+ ] else if hostPlatform.isMacOS then [
25+ jsaddle-wkwebview
26+ ghcBackendPackage
27+ ] else [
28+ ghcBackendPackage
29+ ]);
30+ configureFlags = if isAndroid then [
31+ "-fandroid"
32+ ] else if ghcBackend == "warp" then [
33+ "-fuse-warp"
34+ ] else [
35+ ];
36+ description = "Functional Reactive Web Apps with Reflex";
37+ license = stdenv.lib.licenses.bsd3;
38+}
reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java−6
@@ -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;
@@ -123,11 +122,6 @@ public class MainWidget {
123122 public Bitmap getDefaultVideoPoster() {
124123 return Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
125124 }
126−
127− @Override
128− public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) {
129− callback.invoke(origin, true, false);
130− }
131125 });
132126
133127 wv.addJavascriptInterface(new JSaddleCallbacks(jsaddleCallbacks), "jsaddle");
reflex-dom/reflex-dom.cabal+24−70
@@ -1,20 +1,10 @@
1−cabal-version: 1.24
21Name: reflex-dom
3−Version: 0.6.1.0
2+Version: 0.5.2
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,6 +12,7 @@ Maintainer: ryan.trinkle@gmail.com
2212Stability: Experimental
2313Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
2414Build-type: Simple
15+cabal-version: >=1.24
2516extra-source-files:
2617 java/org/reflexfrp/reflexdom/MainWidget.java
2718 ChangeLog.md
@@ -50,67 +41,60 @@ flag build-examples
5041 default: False
5142 manual: True
5243
53−flag wasm32
54− description: Build for wasm32 architecture
44+flag android
45+ description: Build an Android app
5546 default: False
5647 manual: True
5748
5849library
5950 hs-source-dirs: src
60− if os(android)
51+ if flag(android)
6152 hs-source-dirs: src-android
6253 other-modules: Reflex.Dom.Android.MainWidget
6354 build-depends:
64− aeson >= 1.4 && < 1.6,
55+ aeson,
6556 android-activity == 0.1.*,
6657 data-default == 0.7.*,
67− jsaddle >= 0.9.6 && < 0.10
58+ jsaddle
6859 c-sources: cbits/MainWidget.c
6960 include-dirs: cbits/include
7061 install-includes: MainWidget.h
7162 cpp-options: -DANDROID
7263 build-tools: hsc2hs
7364 build-depends:
74− base >= 4.7 && < 4.15,
65+ base >= 4.7 && < 4.13,
7566 bytestring == 0.10.*,
76− reflex >= 0.8 && < 0.9,
77− reflex-dom-core >= 0.6.1.0 && <0.7,
67+ reflex >= 0.6.2,
68+ reflex-dom-core >=0.5.2 && <0.6,
7869 text == 1.2.*
7970 if !impl(ghcjs)
8071 if flag(use-warp) && (os(linux) || os(osx))
8172 build-depends:
82− jsaddle >= 0.9.6 && < 0.10,
83− jsaddle-warp >= 0.9.6 && < 0.10
73+ jsaddle,
74+ jsaddle-warp
8475 else
8576 if os(osx) || os(ios)
8677 build-depends:
8778 data-default == 0.7.*,
88− jsaddle >= 0.9.6 && < 0.10,
89− jsaddle-wkwebview >= 0.9.6 && < 0.10
79+ jsaddle,
80+ jsaddle-wkwebview
9081 else
91− if flag(wasm32)
82+ if flag(webkit2gtk)
9283 build-depends:
93− jsaddle >= 0.9.6 && < 0.10,
94− jsaddle-wasm >= 0.1 && < 0.2
84+ jsaddle-webkit2gtk
9585 else
96− if flag(webkit2gtk)
86+ if !flag(android)
9787 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
88+ jsaddle-webkit2gtk
10389
10490 exposed-modules:
10591 Reflex.Dom
10692 Reflex.Dom.Internal
10793 reexported-modules:
108− Foreign.JavaScript.Orphans
109− , Foreign.JavaScript.TH
110− , Foreign.JavaScript.Utils
94+ Foreign.JavaScript.TH
95+ , Foreign.JavaScript.Orphans
11196 , Reflex.Dom.Builder.Class
11297 , Reflex.Dom.Builder.Class.Events
113− , Reflex.Dom.Builder.Hydratable
11498 , Reflex.Dom.Builder.Immediate
11599 , Reflex.Dom.Builder.InputDisabled
116100 , Reflex.Dom.Builder.Static
@@ -118,19 +102,14 @@ library
118102 , Reflex.Dom.Core
119103 , Reflex.Dom.Location
120104 , Reflex.Dom.Main
121− , Reflex.Dom.Modals.Class
122105 , Reflex.Dom.Old
123− , Reflex.Dom.Prerender
124− , Reflex.Dom.Time
125106 , Reflex.Dom.WebSocket
126− , Reflex.Dom.WebSocket.Query
127107 , Reflex.Dom.Widget
128108 , Reflex.Dom.Widget.Basic
129109 , Reflex.Dom.Widget.Input
130110 , Reflex.Dom.Widget.Lazy
131111 , Reflex.Dom.Widget.Resize
132112 , Reflex.Dom.Xhr
133− , Reflex.Dom.Xhr.FormData
134113 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
135114 if flag(expose-all-unfoldings)
136115 ghc-options: -fexpose-all-unfoldings
@@ -162,19 +141,7 @@ executable sortableList
162141 default-language: Haskell2010
163142
164143executable 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
144+ build-depends: base, reflex, reflex-dom, text, prim-uniq, dependent-map, containers, transformers, mtl, ghcjs-dom, ghc-prim, random, dependent-sum
178145 hs-source-dirs: .
179146 main-is: benchmark.hs
180147 ghc-options: -O2 -fspecialise-aggressively
@@ -183,20 +150,7 @@ executable benchmark
183150 default-language: Haskell2010
184151
185152executable 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
153+ build-depends: base, reflex, reflex-dom, text, prim-uniq, dependent-map, containers, transformers, mtl, ghcjs-dom, ghc-prim, random, dependent-sum, vector
200154 hs-source-dirs: benchmarks
201155 main-is: krausest.hs
202156 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)