on a88909c help sign in
63 files changed+1435−2845
since splitsnapshots
unifiedsplit
.github/workflows/haskell.yml−47 CONTRIBUTING.md−65 FAQ.md−31 LICENSE−12 Quickref.md+1−1 README.md+9−15 cabal.project−10 cabal.project-nogtk−14 chrome-test-utils/LICENSE−12 chrome-test-utils/chrome-test-utils.cabal−30 chrome-test-utils/src/Test/Util/ChromeFlags.hs−17 chrome-test-utils/src/Test/Util/UnshareNetwork.hs−12 default.nix+6 dep/reflex-platform/default.nix−2 dep/reflex-platform/github.json−8 dep/reflex-platform/thunk.nix−9 reflex-dom-core/ChangeLog.md−94 reflex-dom-core/LICENSE+1−1 reflex-dom-core/default.nix+58 reflex-dom-core/reflex-dom-core.cabal+37−77 reflex-dom-core/src/Foreign/JavaScript/Orphans.hs−3 reflex-dom-core/src/Foreign/JavaScript/TH.hs+4−2 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+5−16 reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs+3−13 reflex-dom-core/src/Reflex/Dom/Builder/Hydratable.hs−116 reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+135−231 reflex-dom-core/src/Reflex/Dom/Builder/InputDisabled.hs−6 reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+20−49 reflex-dom-core/src/Reflex/Dom/Class.hs+7−4 reflex-dom-core/src/Reflex/Dom/Core.hs+1−2 reflex-dom-core/src/Reflex/Dom/Main.hs+37−89 reflex-dom-core/src/Reflex/Dom/Modals/Base.hs+199 reflex-dom-core/src/Reflex/Dom/Old.hs+1 reflex-dom-core/src/Reflex/Dom/Prerender.hs+84−208 reflex-dom-core/src/Reflex/Dom/WebSocket.hs+4−12 reflex-dom-core/src/Reflex/Dom/WebSocket/Foreign.hs+23−37 reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs+43−33 reflex-dom-core/src/Reflex/Dom/Widget/Input.hs+52−12 reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+3−3 reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+5−9 reflex-dom-core/src/Reflex/Dom/Xhr.hs+6−8 reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs+3−2 reflex-dom-core/src/Reflex/Dom/Xhr/FormData.hs−47 reflex-dom-core/test/gc.hs+11−12 reflex-dom-core/test/hlint.hs+1−3 reflex-dom-core/test/hydration.hs+473−848 reflex-dom-test-selenium/CHANGELOG.md−5 reflex-dom-test-selenium/LICENSE−12 reflex-dom-test-selenium/Setup.hs−2 reflex-dom-test-selenium/add-overrides.nix−20 reflex-dom-test-selenium/reflex-dom-test-selenium.cabal−41 reflex-dom-test-selenium/src/Reflex/Dom/Test/Selenium.hs−249 reflex-dom/ChangeLog.md−42 reflex-dom/LICENSE+1−1 reflex-dom/benchmark.hs+1−2 reflex-dom/default.nix+37 reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java+1−14 reflex-dom/reflex-dom.cabal+36−85 reflex-dom/src/Reflex/Dom/Internal.hs−5 release.nix−63 test/default.nix−10 test/prebuild.hs+127 test/reflex-dom-reexports.hs−72
.github/workflows/haskell.ymldeleted−47
@@ -1,47 +0,0 @@
1−name: github-action
2−
3−on: [push, pull_request]
4−
5−jobs:
6− build:
7− strategy:
8− matrix:
9− ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.2']
10− os: ['ubuntu-latest', 'macos-latest']
11− exclude:
12− # There are some linker warnings in 802 on darwin that
13− # cause compilation to fail
14− # See https://github.com/NixOS/nixpkgs/issues/25139
15− - ghc: '8.0.2'
16− os: 'macos-latest'
17− runs-on: ${{ matrix.os }}
18−
19− name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
20− steps:
21− - uses: actions/checkout@v2
22− - uses: actions/setup-haskell@v1
23− with:
24− ghc-version: ${{ matrix.ghc }}
25− - name: Cache
26− uses: actions/cache@v1
27− env:
28− cache-name: cache-cabal
29− with:
30− path: ~/.cabal
31− key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
32− restore-keys: |
33− ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
34− ${{ runner.os }}-${{ matrix.ghc }}-build-
35− ${{ runner.os }}-${{ matrix.ghc }}-
36− ${{ runner.os }}
37−
38− - name: Set up cabal project file to avoid webkit2gtk
39− run: cp cabal.project-nogtk cabal.project
40− - name: Install dependencies
41− run: |
42− cabal update
43− cabal build --only-dependencies --enable-tests --enable-benchmarks all
44− - name: Build
45− run: cabal build --enable-tests --enable-benchmarks all
46− - name: Run tests
47− run: cabal test all
CONTRIBUTING.mddeleted−65
@@ -1,65 +0,0 @@
1−# Contribution Guide
2−
3−Contributions and issue reports are encouraged and appreciated!
4−
5−- [Opening Issues](#opening-issues)
6−- [Submitting Changes](#submitting-changes)
7− - [Guidelines for Commit Messages](#guidelines-for-commit-messages)
8− - [Guidelines for Pull Requests](#guidelines-for-pull-requests)
9− - [Code Quality](#code-quality)
10− - [Documentation](#documentation)
11−
12−## Opening Issues
13−
14−Before opening an issue, please check whether your issue has already been reported. Assuming it has not:
15−
16−* Describe the issue you're encountering or the suggestion you're making
17−* Include any relevant steps to reproduce or code samples you can. It's always easier for us to debug if we have something that demonstrates the error.
18−* Let us know what version of this project you were using. If you're using a github checkout, provide the git hash.
19−* Describe how you're building this project (i.e., via reflex-platform, cabal install, stack, obelisk, etc.). If you're using reflex-platform or obelisk, provide the git hash of your checkout.
20−
21−## Submitting Changes
22−
23−### Guidelines for Commit Messages
24−
25−#### Summary Line
26−The summary line of your commit message should summarize the changes being made. Commit messages should be written in the imperative mood and should describe what happens when the commit is applied.
27−
28−One way to think about it is that your commit message should be able to complete the sentence:
29−"When applied, this commit will..."
30−
31−#### Body
32−For breaking changes, new features, refactors, or other major changes, the body of the commit message should describe the motivation behind the change in greater detail and may include references to the issue tracker. The body shouldn't repeat code/comments from the diff.
33−
34−### Guidelines for Pull Requests
35−
36−Wherever possible, pull requests should add a single feature or fix a single bug. Pull requests should not bundle several unrelated changes.
37−
38−### Code Quality
39−
40−#### Warnings
41−
42−Your pull request should add no new warnings to the project. It should also generally not disable any warnings.
43−
44−#### Build and Test
45−
46−Make sure the project builds and that the tests pass! This will generally also be checked by CI before merge, but trying it yourself first means you'll catch problems earlier and your contribution can be merged that much sooner!
47−
48−### Documentation
49−
50−#### In the code
51−We're always striving to improve documentation. Please include [haddock](https://haskell-haddock.readthedocs.io/en/latest/index.html) documentation for any added code, and update the documentation for any code you modify.
52−
53−#### In the Changelog
54−Add an entry to the changelog when your PR:
55−* Adds a feature
56−* Deprecates something
57−* Includes a breaking change
58−* Makes any other change that will impact users
59−
60−You may need to add changelog entries to one or both of the changelogs in this repository:
61−* [reflex-dom-core's changelog](reflex-dom-core/ChangeLog.md)
62−* [reflex-dom's changelog](reflex-dom/ChangeLog.md)
63−
64−#### In the [Readme](README.md)
65−The readme is the first place a lot of people look for information about the repository. Update any parts of the readme that are affected by your PR.
FAQ.mddeleted−31
@@ -1,31 +0,0 @@
1−# Frequently Asked Questions
2−
3−### How do I configure DOM events with flags like `preventDefault` and `stopPropagation`?
4−
5−Using `element`, a low-level DOM builder function. Its second argument, `ElementConfig`, has a `_elementConfig_eventSpec` field that can be modified using `addEventSpecFlags`. It takes a `Proxy` that specifies the `DomSpace`, an event name, and a callback which takes the event result and returns an event flag, which can enable behavior like `preventDefault` and `stopPropagation`.
6−
7−The type signature on `def` is needed because the fields of the `ElementConfig` can change the type of the `ElementConfig`. GHC can probably figure out the type of the resulting `ElementConfig`, but it doesn't know what the type of `def` was before the modifications, since it never gets used with that configuration.
8−
9−For example:
10−
11−```haskell
12−{-# LANGUAGE OverloadedStrings #-}
13−{-# LANGUAGE ScopedTypeVariables #-}
14−
15−import Control.Lens ((&), (%~), (.~))
16−import Data.Proxy
17−import Reflex.Dom
18−
19−main :: IO ()
20−main = mainWidget $ do
21− (click, ()) <- linkPreventDefault $ text "reflex-frp"
22− display =<< count click
23−
24−linkPreventDefault :: forall t m a. DomBuilder t m => m a -> m (Event t (), a)
25−linkPreventDefault c = do
26− let cfg = (def :: ElementConfig EventResult t (DomBuilderSpace m))
27− & elementConfig_initialAttributes .~ ("href" =: "https://reflex-frp.org")
28− & elementConfig_eventSpec %~ addEventSpecFlags (Proxy :: Proxy (DomBuilderSpace m)) Click (const preventDefault)
29− (link, a) <- element "a" cfg c
30− return (domEvent Click link, a)
31−```
LICENSEdeleted−12
@@ -1,12 +0,0 @@
1−Copyright (c) 2020, Obsidian Systems LLC
2−All rights reserved.
3−
4−Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
5−
6−1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
7−
8−2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
9−
10−3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
11−
12−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Quickref.md+1−1
@@ -28,7 +28,7 @@ Widgets may return any type (this is 'a' in many of the functions below). Often
2828-- This version returns the 'El' as well.
2929[W] el' :: Text -> m a -> m (El, a)
3030
31−-- These two additionally apply attributes to the element, such as ("class" =: "blah"). (=:) is 'Map.singleton'
31+-- These two additionally apply attributes to the element, such as ("class" =: "blah")
3232[W] elAttr :: Text -> Map Text Text -> m a -> m a
3333[W] elAttr' :: Text -> Map Text Text -> m a -> m (El, a)
3434
README.md+9−15
@@ -1,23 +1,17 @@
1−## [Reflex-DOM](https://reflex-frp.org)
1+## Reflex-DOM
2+### A Framework for Functional Reactive Web Apps in Haskell
23
3−[![Haskell](https://img.shields.io/badge/language-Haskell-orange.svg)](https://haskell.org) [![Hackage](https://img.shields.io/hackage/v/reflex-dom.svg)](https://hackage.haskell.org/package/reflex-dom) [![Hackage CI](https://matrix.hackage.haskell.org/api/v2/packages/reflex-dom/badge)](https://matrix.hackage.haskell.org/#/package/reflex-dom) [![BSD3 License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://github.com/reflex-frp/reflex-dom/blob/master/LICENSE)
4+Reflex-DOM is a framework for building web applications in Haskell, based on the [Functional Reactive Programming](https://wiki.haskell.org/Functional_Reactive_Programming) library [Reflex](https://github.com/reflex-frp/reflex).
45
5−Web applications without callbacks or side-effects. Reflex-DOM brings the power of [Functional Reactive Programming (FRP)](https://wiki.haskell.org/Functional_Reactive_Programming) to the web. Build [HTML](https://developer.mozilla.org/en-US/docs/Web/HTML) and other [Document Object Model (DOM)](https://developer.mozilla.org/en-US/docs/Web/API/Document_Object_Model) data with a pure functional interface.
6+Comprehensive documentation is still a work in progress, but a [demo](https://github.com/reflex-frp/reflex-platform) is available and an introductory talk is available at [Part 1](https://www.youtube.com/watch?v=mYvkcskJbc4) / [Part 2](https://www.youtube.com/watch?v=3qfc9XFVo2c) ([Slides](https://obsidian.systems/reflex-nyhug/)).
67
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).
8−
9−**Visit https://reflex-frp.org/ for more information, tutorials, documentation and [examples](https://examples.reflex-frp.org/).**
8+A summary of Reflex-DOM functions is available in the [quick reference](Quickref.md).
109
1110### Additional resources
11+[Get started with Reflex](https://github.com/reflex-frp/reflex-platform)
1212
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)
13+[/r/reflexfrp](https://www.reddit.com/r/reflexfrp)
1914
20−### Hacking
15+[hackage](https://hackage.haskell.org/package/reflex)
2116
22−Use the `./scripts/hack-on haskell-overlays/reflex-packages/dep/reflex-dom` script in [Reflex Platform](https://github.com/reflex-frp/reflex-platform) to checkout the source code of `reflex-dom` locally in `./dep/reflex-dom` directory.
23−Then do modifications to the source in place, and use the `./try-reflex` or `./scripts/work-on` scripts to create the shell to test your changes.
17+[irc.freenode.net #reflex-frp](http://webchat.freenode.net?channels=%23reflex-frp&uio=d4)
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/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.
chrome-test-utils/chrome-test-utils.cabaldeleted−30
@@ -1,30 +0,0 @@
1−Name: chrome-test-utils
2−Version: 0.5
3−Synopsis: Utilities to write headless Chromium tests
4−License: BSD3
5−License-file: LICENSE
6−Author: Obsidian Systems LLC
7−Maintainer: maintainer@obsidian.systems
8−Stability: Experimental
9−Build-type: Simple
10−Cabal-version: >=1.9.2
11−
12−library
13− hs-source-dirs: src
14− ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
15− build-depends: base
16− , linux-namespaces
17− , process
18− , temporary
19− , text
20− , unix
21− exposed-modules:
22− Test.Util.UnshareNetwork
23− Test.Util.ChromeFlags
24− if !os(linux) || !arch(x86_64)
25− buildable: False
26−
27−source-repository head
28− type: git
29− location: https://github.com/reflex-frp/reflex-dom
30− subdir: chrome-test-utils
chrome-test-utils/src/Test/Util/ChromeFlags.hsdeleted−17
@@ -1,17 +0,0 @@
1−{-# LANGUAGE OverloadedStrings #-}
2−module Test.Util.ChromeFlags where
3−
4−import Data.Semigroup
5−import Data.Text
6−import System.IO.Temp
7−
8−withSandboxedChromeFlags :: Bool -> ([Text] -> IO a) -> IO a
9−withSandboxedChromeFlags headless action =
10− withSystemTempDirectory "reflex-dom-core_test" $ \tmp ->
11− action
12− [ if headless then "--headless" else "--auto-open-devtools-for-tabs"
13− , "--disable-gpu"
14− , "--no-sandbox"
15− , "--remote-debugging-port=9222"
16− , "--user-data-dir=" <> pack tmp
17− ]
chrome-test-utils/src/Test/Util/UnshareNetwork.hsdeleted−12
@@ -1,12 +0,0 @@
1−module Test.Util.UnshareNetwork where
2−
3−import System.Linux.Namespaces
4−import System.Posix
5−import System.Process
6−
7−unshareNetwork :: IO ()
8−unshareNetwork = do
9− uid <- getEffectiveUserID
10− unshare [User, Network]
11− writeUserMappings Nothing [UserMapping 0 uid 1]
12− callCommand "ip link set lo up ; ip addr"
default.nixnew file+6
@@ -0,0 +1,6 @@
1+haskellPackages: nixpkgs: {
2+ reflex-dom = haskellPackages.callPackage ./reflex-dom {};
3+ reflex-dom-core = haskellPackages.callPackage ./reflex-dom-core {
4+ inherit (nixpkgs) iproute chromium;
5+ };
6+}
dep/reflex-platform/default.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
reflex-dom-core/ChangeLog.mddeleted−94
@@ -1,94 +0,0 @@
1−# Revision history for reflex-dom-core
2−
3−## 0.6.2.1
4−
5−* Fix hlint complaints with newer GHC.
6−
7−## 0.6.2.0
8−
9−* ([#400](https://github.com/reflex-frp/reflex-dom/pull/400/files)) Set value of input elements in static renderer
10−
11−## 0.6.1.0
12−
13−* Bump version bounds
14−* Update for new dependent-map and dependent-sum version (after the "some" package split)
15−* Add `MonadAtomicRef` instance for `UnrunnableT`
16−* Fix ([#467](https://github.com/reflex-frp/reflex-dom/issues/467)): Prevent multiple firings of XHR response event
17−* Updates for GHC 8.10
18−* Move `HasSetValue` from Reflex.Dom.Widget.Input to Reflex.Dom.Builder.Class and add an instance for `TextAreaElementConfig`
19−* Add `now` to the `MonadHold` instance for `UnrunnableT`
20−
21−
22−## 0.6.0.0
23−
24−* ([#375](https://github.com/reflex-frp/reflex-dom/pull/375)) **(Breaking change)** Expose resized dimensions from `resizeDetector`, `resizeDetectorWithStyle`, and `resizeDetectorWithAttrs` from `Reflex.Dom.Widget.Resize`.
25−* ([#374](https://github.com/reflex-frp/reflex-dom/pull/374)) **(Breaking change)** Provide text clipboard data as value of `Paste` event.
26−* ([#348](https://github.com/reflex-frp/reflex-dom/pull/348)) **(Breaking change)** Make XHR response headers case insensitive by changing `_xhrResponse_headers :: Map Text Text` to `_xhrResponse_headers :: Map (CI Text) Text`.
27−* ([#225](https://github.com/reflex-frp/reflex-dom/pull/225)) **(Breaking change)** Add a functional dependency to `HasDomEvent`.
28−* ([#342](https://github.com/reflex-frp/reflex-dom/issues/342)) **(Breaking change)** The mouse wheel event is now a `WheelEventResult` rather than `()`. This provides information about the wheel's motion beyond the fact that it merely moved.
29−* ([#353](https://github.com/reflex-frp/reflex-dom/pull/353)) Support GHC 8.8.
30−* ([#358](https://github.com/reflex-frp/reflex-dom/pull/358)) Fix attribute support for explicitly namespaced elements.
31−* ([#363](https://github.com/reflex-frp/reflex-dom/pull/363)) Remove deprecation warnings for the following widgets in
32− `Reflex.Dom.Widget.Basic`:
33− * `Link`
34− * `button`
35− * `dtdd`
36− * `linkClass`
37− * `link`
38− * `tabDisplay`
39− * `tableDynAttr`
40−* ([#361](https://github.com/reflex-frp/reflex-dom/pull/361)) Fix bug in hydration causing the JavaScript to crash when dealing with unexpected HTML.
41−* ([#310](https://github.com/reflex-frp/reflex-dom/issues/310)) Fix the static rendering of which dropdown value is selected.
42−* ([#364](https://github.com/reflex-frp/reflex-dom/pull/364)) Export attributes used for controlling hydration at the element level:
43− * "data-ssr" is now available as `Reflex.Dom.Builder.Immediate.hydratableAttribute`.
44− * "data-hydration-skip" is now available as `Reflex.Dom.Builder.Immediate.skipHydrationAttribute`.
45−* ([#366](https://github.com/reflex-frp/reflex-dom/pull/366)) Bump bounds for `reflex` to include 0.7.
46−
47−## 0.5.3
48−
49−* Deprecate a number of old inflexible widget helpers in `Reflex.Dom.Widget.Basic`:
50− * `Link`
51− * `button`
52− * `dtdd`
53− * `linkClass`
54− * `link`
55− * `tabDisplay`
56− * `tableDynAttr`
57−
58− And in `Reflex.Dom.Widget.Input`:
59− * `TextInput`
60− * `TextAreaConfig`
61− * `CheckboxConfig`
62− * `FileInput`
63−* Add `< 0.7` upper bound for `reflex`.
64−
65−## 0.5.2
66−
67−* Update to use new dependent-sum/map packages and drop dependency on `*Tag` classes (e.g., `ShowTag`).
68−
69−* Update version bounds of base, containers, and stm
70−
71−* Update to use the newly split `these`/`semialign` packages. To use the pre-split `these` package, set the `split-these` flag to false.
72−
73−* Reintroduce "data-ssr": elements without this attribute are skipped during
74− hydration.
75−
76−* Fix an issue in the hydration tests that prevented the test from finding the chromium executable
77−
78−* Relax constraints on `dyn` and `widgetHold` to match the ones in `networkView` and `networkHold` respectively
79−
80−* Fix prerender for RequesterT so that it doesn't accidentally discard a request that is made at the same moment as getPostBuild's Event fires
81−
82−## 0.5.1
83−
84−* Added support for marking elements with a "data-skip-hydration" attribute, which will cause hydration to ignore and skip over them.
85−
86−* Removed "data-ssr" attributes from statically rendered output.
87−
88−## 0.5
89−
90−* Add HydrationDomBuilderT to support hydration of statically rendered DOM nodes. See the note at the top of Reflex.Dom.Builder.Immediate.
91−
92−* As a result of the hydration changes, the Prerender class has changed, the type of `prerender` has changed and it is now a class method.
93−
94−* Add the Reflex.Dom.Xhr.FormData module to make posting formdata over xhr more convenient.
reflex-dom-core/LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2020, Obsidian Systems LLC
1+Copyright (c) 2015, Obsidian Systems LLC
22All rights reserved.
33
44Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
reflex-dom-core/default.nixnew file+58
@@ -0,0 +1,58 @@
1+{ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder
2+, bytestring, constraints, constraints-extras, containers
3+, contravariant, data-default, dependent-map, dependent-sum
4+, dependent-sum-template, directory, exception-transformers
5+, exceptions, filepath, ghcjs-dom, hlint, hspec, hspec-webdriver, http-types, HUnit
6+, jsaddle, jsaddle-warp, keycode, lens, lifted-base, linux-namespaces
7+, monad-control, mtl, network, network-uri, primitive, process
8+, random, ref-tf, reflex, semigroups, silently, stdenv, stm
9+, template-haskell, temporary, text, these, transformers, unix, wai
10+, wai-websockets, warp, webdriver, websockets, zenc
11+, ghc, iproute, chromium, hashable, selenium-server-standalone, which, fontconfig
12+}:
13+let addGcTestDepends = drv: if (stdenv.system != "x86_64-linux" || stdenv.hostPlatform != stdenv.buildPlatform || (ghc.isGhcjs or false)) then drv else drv // {
14+ # The headless browser run as part of gc tests would hang/crash without this
15+ preCheck = ''
16+ export FONTCONFIG_PATH=${fontconfig.out}/etc/fonts
17+ '';
18+ testHaskellDepends = (drv.testHaskellDepends or []) ++ [ temporary jsaddle-warp process linux-namespaces ];
19+ testSystemDepends = (drv.testSystemDepends or []) ++ [ chromium iproute ];
20+ };
21+in mkDerivation (addGcTestDepends {
22+ pname = "reflex-dom-core";
23+ version = "0.4";
24+ src = ./.;
25+ libraryHaskellDepends = [
26+ aeson base bifunctors bimap blaze-builder bytestring constraints
27+ containers contravariant data-default dependent-map dependent-sum
28+ dependent-sum-template directory exception-transformers ghcjs-dom
29+ jsaddle keycode lens monad-control mtl network-uri primitive random
30+ ref-tf reflex semigroups stm template-haskell text these
31+ transformers unix zenc
32+ ] ++ (if ghc.isGhcjs or false then [
33+ hashable
34+ ] else []);
35+
36+ #TODO: Get hlint working for cross-compilation
37+ doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
38+
39+ # The headless browser run as part of the tests will exit without this
40+ preBuild = ''
41+ export HOME="$PWD"
42+ '';
43+
44+ # Show some output while running tests, so we might notice what's wrong
45+ testTarget = "--show-details=streaming";
46+
47+ testSystemDepends = [ selenium-server-standalone which ];
48+ testHaskellDepends = [
49+ aeson base bytestring constraints constraints-extras containers
50+ dependent-map dependent-sum dependent-sum-template directory
51+ exceptions filepath ghcjs-dom hlint hspec hspec-webdriver http-types HUnit jsaddle
52+ jsaddle-warp lens lifted-base linux-namespaces network process random reflex
53+ silently temporary text unix wai wai-websockets warp webdriver
54+ websockets
55+ ];
56+ description = "Functional Reactive Web Apps with Reflex";
57+ license = stdenv.lib.licenses.bsd3;
58+})
reflex-dom-core/reflex-dom-core.cabal+37−77
@@ -1,18 +1,7 @@
1−cabal-version: 1.24
21Name: reflex-dom-core
3−Version: 0.6.2.1
2+Version: 0.4
43Synopsis: Functional Reactive Web Apps with Reflex
5−Description:
6− Web applications without callbacks or side-effects.
7− Reflex-DOM brings the power of functional reactive programming (FRP) to the web.
8− Build HTML and other Document Object Model (DOM) data with a pure functional interface.
9− .
10− Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine: <https://reflex-frp.org/>.
11− .
12− The @reflex-dom@ package is a small wrapper around the @reflex-dom-core@ package. It pulls in the
13− correct set of dependencies for each target platform (GHCJS, WebKitGTK, WASM, mobile, etc.).
14− Libraries should depend on @reflex-dom-core@ and executables will usually depend on @reflex-dom@.
15− All of @reflex-dom-core@'s modules are re-exported by @reflex-dom@.
4+Description: Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine
165License: BSD3
176License-file: LICENSE
187Author: Ryan Trinkle
@@ -20,6 +9,7 @@ Maintainer: ryan.trinkle@gmail.com
209Stability: Experimental
2110Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
2211Build-type: Simple
12+Cabal-version: >=1.9.2
2313-- Deal with https://github.com/haskell/cabal/issues/2544 / https://github.com/haskell/cabal/issues/367
2414extra-source-files: src-ghc/Foreign/JavaScript/Internal/Utils.hs
2515 src-ghcjs/Foreign/JavaScript/Internal/Utils.hs
@@ -27,7 +17,6 @@ extra-source-files: src-ghc/Foreign/JavaScript/Internal/Utils.hs
2717 src/Reflex/Dom/WebSocket/Foreign.hs
2818 src/Reflex/Dom/Xhr/ResponseType.hs
2919 src/Reflex/Dom/Xhr/Exception.hs
30− ChangeLog.md
3120
3221flag use-template-haskell
3322 description: Use template haskell to generate lenses
@@ -49,54 +38,39 @@ flag profile-reflex
4938 default: False
5039 manual: True
5140
52−flag split-these
53− description: Use split these/semialign packages
54− manual: False
55− default: True
56−
57−flag hydration-tests
58− description: Whether to run the hydration tests (currently only available on linux)
59− default: True
60− manual: True
61−
62−flag gc-tests
63− description: Whether to run the gc tests (currently only available on linux)
64− default: True
65− manual: True
66−
6741library
6842 hs-source-dirs: src
6943 build-depends:
70− aeson >= 0.8 && < 1.6,
71− base >= 4.7 && < 4.15,
44+ aeson >= 0.8 && < 1.4,
45+ base >= 4.7 && < 4.12,
7246 bifunctors >= 4.2 && < 6,
73− bimap >= 0.3 && < 0.5,
74− blaze-builder >= 0.4.1 && < 0.5,
47+ bimap >= 0.3 && < 0.4,
48+ blaze-builder,
7549 bytestring == 0.10.*,
76− case-insensitive < 1.3,
77− containers >= 0.6 && < 0.7,
78− constraints >= 0.9 && < 0.13,
79− contravariant >= 1.4 && < 1.6,
50+ containers == 0.5.*,
51+ constraints >= 0.9 && < 0.11,
52+ contravariant >= 1.4 && < 1.5,
8053 data-default >= 0.5 && < 0.8,
81− dependent-map >= 0.3 && < 0.5,
82− dependent-sum >= 0.6 && < 0.8,
83− dependent-sum-template >= 0.1 && < 0.2,
54+ dependent-map == 0.2.*,
55+ dependent-sum >= 0.3 && < 0.5,
56+ dependent-sum-template >= 0.0.0.4 && < 0.1,
8457 directory >= 1.2 && < 1.4,
8558 exception-transformers == 0.4.*,
8659 ghcjs-dom >= 0.9.1.0 && < 0.10,
87− jsaddle >= 0.9.0.0 && < 0.10,
60+ jsaddle >=0.9.0.0 && <0.10,
8861 -- keycode-0.2 has a bug on firefox
8962 keycode >= 0.2.1 && < 0.3,
9063 lens >= 4.7 && < 5,
9164 monad-control >= 1.0.1 && < 1.1,
9265 mtl >= 2.1 && < 2.3,
93− primitive >= 0.5 && < 0.8,
94− random >= 1.1 && < 1.2,
66+ primitive >= 0.5 && < 0.7,
67+ random,
9568 ref-tf == 0.4.*,
96− reflex >= 0.8 && < 0.9,
97− semigroups >= 0.16 && < 0.20,
98− stm >= 2.4 && < 2.6,
69+ reflex == 0.5.*,
70+ semigroups >= 0.16 && < 0.19,
71+ stm == 2.4.*,
9972 text == 1.2.*,
73+ these >= 0.4 && < 0.8,
10074 transformers >= 0.3 && < 0.6,
10175 network-uri >= 2.6.1 && < 2.7,
10276 zenc == 0.1.*
@@ -105,20 +79,12 @@ library
10579 hs-source-dirs: src-ghcjs
10680 build-depends:
10781 ghcjs-base,
108− hashable >= 1.2 && < 1.4
82+ hashable == 1.2.*
10983 else
11084 hs-source-dirs: src-ghc
11185 if !os(windows)
11286 build-depends: unix == 2.7.*
11387
114− if flag(split-these)
115− build-depends:
116− semialign >= 1 && < 1.2,
117− these >= 1 && < 1.2
118− else
119− build-depends:
120− these >= 0.4 && < 0.9
121−
12288 exposed-modules:
12389 Foreign.JavaScript.TH
12490 Foreign.JavaScript.Orphans
@@ -127,12 +93,12 @@ library
12793 Reflex.Dom.Builder.Class.Events
12894 Reflex.Dom.Builder.Immediate
12995 Reflex.Dom.Builder.InputDisabled
130− Reflex.Dom.Builder.Hydratable
13196 Reflex.Dom.Builder.Static
13297 Reflex.Dom.Class
13398 Reflex.Dom.Core
13499 Reflex.Dom.Location
135100 Reflex.Dom.Main
101+ Reflex.Dom.Modals.Base
136102 Reflex.Dom.Modals.Class
137103 Reflex.Dom.Old
138104 Reflex.Dom.Prerender
@@ -145,7 +111,6 @@ library
145111 Reflex.Dom.Widget.Lazy
146112 Reflex.Dom.Widget.Resize
147113 Reflex.Dom.Xhr
148− Reflex.Dom.Xhr.FormData
149114 other-modules:
150115 Foreign.JavaScript.Internal.Utils
151116 Reflex.Dom.WebSocket.Foreign
@@ -153,7 +118,6 @@ library
153118 Reflex.Dom.Xhr.ResponseType
154119 Reflex.Dom.Xhr.Exception
155120
156− default-language: Haskell98
157121 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
158122 ghc-prof-options: -fprof-auto
159123
@@ -168,28 +132,27 @@ library
168132
169133 if flag(use-template-haskell)
170134 build-depends:
171− dependent-sum-template >= 0.1 && < 0.2,
172− template-haskell >= 2.12.0 && < 2.17
135+ dependent-sum >= 0.3 && < 0.5,
136+ dependent-sum-template >= 0.0.0.5 && < 0.1,
137+ template-haskell
173138 other-extensions: TemplateHaskell
174139 cpp-options: -DUSE_TEMPLATE_HASKELL
175140 other-modules:
176141 Reflex.Dom.Builder.Class.TH
142+ else
143+ build-depends:
144+ dependent-sum == 0.4.*
177145
178146test-suite hlint
179− build-depends:
180− base,
181− hlint >= 2.0 && < 4.0
147+ build-depends: base, hlint
182148 hs-source-dirs: test
183149 main-is: hlint.hs
184150 type: exitcode-stdio-1.0
185− default-language: Haskell98
186151
187152test-suite hydration
188153 build-depends: base
189154 , aeson
190− , async
191155 , bytestring
192− , chrome-test-utils
193156 , constraints
194157 , constraints-extras
195158 , containers
@@ -201,7 +164,6 @@ test-suite hydration
201164 , filepath
202165 , ghcjs-dom
203166 , hspec
204− , hspec-core
205167 , hspec-webdriver
206168 , http-types
207169 , HUnit
@@ -223,34 +185,32 @@ test-suite hydration
223185 , warp
224186 , webdriver
225187 , websockets
226− , which
227188 hs-source-dirs: test
228− ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
189+ ghc-options: -threaded -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
229190 ghc-prof-options: -fprof-auto -optP-DPROFILING
230191 main-is: hydration.hs
231192 type: exitcode-stdio-1.0
232− default-language: Haskell98
233− if !os(linux) || !arch(x86_64) || flag(profile-reflex) || !flag(hydration-tests)
193+ if !os(linux) || !arch(x86_64)-- || impl(ghc >= 8.4.0)
234194 buildable: False
235195
236196-- broken test on base 4.11 & ghc 8.4.3
237197-- needs to be updated for changes in GHC.Stats
238198test-suite gc
239199 build-depends: base
240− , chrome-test-utils
200+ , reflex
201+ , reflex-dom-core
241202 , jsaddle
242203 , jsaddle-warp
204+ , linux-namespaces
243205 , process
244− , reflex
245− , reflex-dom-core
246− , text
206+ , temporary
207+ , unix
247208 hs-source-dirs: test
248209 ghc-options: -rtsopts -with-rtsopts=-T -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
249210 ghc-prof-options: -fprof-auto -optP-DPROFILING
250211 main-is: gc.hs
251212 type: exitcode-stdio-1.0
252− default-language: Haskell98
253− if !os(linux) || !arch(x86_64) || !flag(gc-tests)
213+ if !os(linux) || !arch(x86_64)
254214 buildable: False
255215
256216source-repository head
reflex-dom-core/src/Foreign/JavaScript/Orphans.hs−3
@@ -1,8 +1,5 @@
1−{-# OPTIONS_HADDOCK hide #-}
21{-# LANGUAGE CPP #-}
32{-# LANGUAGE FlexibleContexts #-}
4−{-# LANGUAGE UndecidableInstances #-}
5−
63{-# OPTIONS_GHC -fno-warn-orphans #-}
74module Foreign.JavaScript.Orphans where
85
reflex-dom-core/src/Foreign/JavaScript/TH.hs+4−2
@@ -6,9 +6,11 @@
66{-# LANGUAGE FlexibleInstances #-}
77{-# LANGUAGE FunctionalDependencies #-}
88{-# LANGUAGE GeneralizedNewtypeDeriving #-}
9+{-# LANGUAGE MultiParamTypeClasses #-}
910{-# LANGUAGE RankNTypes #-}
1011{-# LANGUAGE StandaloneDeriving #-}
1112{-# LANGUAGE TypeFamilies #-}
13+{-# LANGUAGE TypeSynonymInstances #-}
1214{-# LANGUAGE UndecidableInstances #-}
1315#ifdef USE_TEMPLATE_HASKELL
1416{-# LANGUAGE TemplateHaskell #-}
@@ -292,7 +294,7 @@ class Monad m => MonadJS x m | m -> x where
292294#ifdef ghcjs_HOST_OS
293295
294296data JSCtx_IO
295−type JS' = JSCtx_IO
297+type HasJS' = HasJS JSCtx_IO
296298
297299instance MonadIO m => HasJS JSCtx_IO (WithJSContextSingleton x m) where
298300 type JSX (WithJSContextSingleton x m) = IO
@@ -343,7 +345,7 @@ foreign import javascript unsafe "function(){ return $1(arguments); }" funWithAr
343345#else
344346
345347data JSCtx_JavaScriptCore x
346−type JS' = JSCtx_JavaScriptCore ()
348+type HasJS' = HasJS (JSCtx_JavaScriptCore ())
347349
348350instance IsJSContext (JSCtx_JavaScriptCore x) where
349351 newtype JSRef (JSCtx_JavaScriptCore x) = JSRef_JavaScriptCore { unJSRef_JavaScriptCore :: JSVal }
reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+5−16
@@ -9,12 +9,12 @@
99{-# LANGUAGE GeneralizedNewtypeDeriving #-}
1010#if !MIN_VERSION_base(4,9,0)
1111{-# LANGUAGE ImpredicativeTypes #-}
12−#else
13−{-# LANGUAGE Rank2Types #-} -- Implied by ImpredicativeTypes
1412#endif
1513{-# LANGUAGE LambdaCase #-}
14+{-# LANGUAGE MultiParamTypeClasses #-}
1615{-# LANGUAGE OverloadedStrings #-}
1716{-# LANGUAGE PolyKinds #-}
17+{-# LANGUAGE RankNTypes #-}
1818{-# LANGUAGE RecursiveDo #-}
1919{-# LANGUAGE ScopedTypeVariables #-}
2020{-# LANGUAGE StandaloneDeriving #-}
@@ -35,7 +35,6 @@ import Reflex.Dom.Builder.Class.Events
3535#ifdef USE_TEMPLATE_HASKELL
3636import Reflex.Dom.Builder.Class.TH
3737#endif
38−import Reflex.BehaviorWriter.Base
3938import Reflex.DynamicWriter.Base
4039import Reflex.EventWriter.Base
4140import Reflex.NotReady.Class
@@ -192,7 +191,7 @@ data CommentNodeConfig t
192191 }
193192
194193#ifndef USE_TEMPLATE_HASKELL
195−commentNodeConfig_initialContents :: Lens' (CommentNodeConfig t) Text
194+commentNodeConfig_initialContents :: Lens' (CommentNodeConfig t) Comment
196195commentNodeConfig_initialContents f (CommentNodeConfig a b) = (\a' -> CommentNodeConfig a' b) <$> f a
197196{-# INLINE commentNodeConfig_initialContents #-}
198197#endif
@@ -618,7 +617,7 @@ instance (DomBuilder t m, MonadHold t m, MonadFix m, Semigroup w) => DomBuilder
618617 placeRawElement = lift . placeRawElement
619618 wrapRawElement e = lift . wrapRawElement e
620619
621−instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive q, Eq q) => DomBuilder t (QueryT t q m) where
620+instance (DomBuilder t m, MonadFix m, MonadHold t m, Group q, Query q, Additive q) => DomBuilder t (QueryT t q m) where
622621 type DomBuilderSpace (QueryT t q m) = DomBuilderSpace m
623622 textNode = liftTextNode
624623 commentNode = liftCommentNode
@@ -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
@@ -716,9 +715,7 @@ instance DomRenderHook t m => DomRenderHook t (Lazy.StateT e m) where
716715 requestDomAction = lift . requestDomAction
717716 requestDomAction_ = lift . requestDomAction_
718717
719−deriving instance DomRenderHook t m => DomRenderHook t (BehaviorWriterT t w m)
720718deriving instance DomRenderHook t m => DomRenderHook t (EventWriterT t w m)
721−deriving instance DomRenderHook t m => DomRenderHook t (DynamicWriterT t w m)
722719deriving instance DomRenderHook t m => DomRenderHook t (RequesterT t req rsp m)
723720deriving instance DomRenderHook t m => DomRenderHook t (PostBuildT t m)
724721deriving instance DomRenderHook t m => DomRenderHook t (QueryT t q m)
@@ -745,11 +742,3 @@ instance HasDocument m => HasDocument (DynamicWriterT t w m)
745742instance HasDocument m => HasDocument (PostBuildT t m)
746743instance HasDocument m => HasDocument (RequesterT t request response m)
747744instance HasDocument m => HasDocument (QueryT t q m)
748−
749−class HasSetValue a where
750− type SetValue a :: *
751− setValue :: Lens' a (SetValue a)
752−
753−instance Reflex t => HasSetValue (TextAreaElementConfig er t m) where
754− type SetValue (TextAreaElementConfig er t m) = Event t Text
755− setValue = textAreaElementConfig_setValue
reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs+3−13
@@ -1,6 +1,7 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE DataKinds #-}
33{-# LANGUAGE GADTs #-}
4+{-# LANGUAGE KindSignatures #-}
45{-# LANGUAGE PolyKinds #-}
56#ifdef USE_TEMPLATE_HASKELL
67{-# LANGUAGE TemplateHaskell #-}
@@ -14,7 +15,6 @@ import Data.GADT.Compare.TH
1415import Data.GADT.Compare
1516 (GOrdering(..), (:~:)(..), GEq(..), GCompare(..))
1617#endif
17−import Data.Text (Text)
1818
1919data EventTag
2020 = AbortTag
@@ -152,7 +152,7 @@ type family EventResultType (en :: EventTag) :: * where
152152 EventResultType 'BeforecopyTag = ()
153153 EventResultType 'CopyTag = ()
154154 EventResultType 'BeforepasteTag = ()
155− EventResultType 'PasteTag = Maybe Text
155+ EventResultType 'PasteTag = ()
156156 EventResultType 'ResetTag = ()
157157 EventResultType 'SearchTag = ()
158158 EventResultType 'SelectstartTag = ()
@@ -160,17 +160,7 @@ type family EventResultType (en :: EventTag) :: * where
160160 EventResultType 'TouchmoveTag = TouchEventResult
161161 EventResultType 'TouchendTag = TouchEventResult
162162 EventResultType 'TouchcancelTag = TouchEventResult
163− EventResultType 'WheelTag = WheelEventResult
164−
165−data DeltaMode = DeltaPixel | DeltaLine | DeltaPage
166− deriving (Show, Read, Eq, Ord, Bounded, Enum)
167−
168−data WheelEventResult = WheelEventResult
169− { _wheelEventResult_deltaX :: Double
170− , _wheelEventResult_deltaY :: Double
171− , _wheelEventResult_deltaZ :: Double
172− , _wheelEventResult_deltaMode :: DeltaMode
173− } deriving (Show, Read, Eq, Ord)
163+ EventResultType 'WheelTag = ()
174164
175165data TouchEventResult = TouchEventResult
176166 { _touchEventResult_altKey :: Bool
reflex-dom-core/src/Reflex/Dom/Builder/Hydratable.hsdeleted−116
@@ -1,116 +0,0 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE FlexibleInstances #-}
3−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4−{-# LANGUAGE MultiParamTypeClasses #-}
5−{-# LANGUAGE OverloadedStrings #-}
6−{-# LANGUAGE StandaloneDeriving #-}
7−{-# LANGUAGE TypeFamilies #-}
8−{-# LANGUAGE UndecidableInstances #-}
9−module Reflex.Dom.Builder.Hydratable where
10−
11−import Control.Monad.Fix
12−import Control.Monad.Primitive
13−import Control.Monad.Ref
14−import Control.Monad.Trans
15−import Control.Monad.Trans.Control
16−import Data.Coerce
17−import qualified Data.Map as Map
18−import Foreign.JavaScript.TH
19−#ifndef ghcjs_HOST_OS
20−import GHCJS.DOM.Types (MonadJSM (..))
21−#endif
22−import Reflex
23−import Reflex.Dom.Builder.Class
24−import Reflex.Dom.Builder.Immediate (HasDocument (..), hydratableAttribute)
25−import Reflex.Host.Class
26−
27−-- | A DomBuilder transformer that adds an attribute to all elements such that the
28−-- hydration builder knows which bits of DOM were added by us, and which were
29−-- added by external scripts.
30−newtype HydratableT m a = HydratableT { runHydratableT :: m a } deriving (Functor, Applicative, Monad, MonadAtomicRef, MonadFix, MonadIO)
31−
32−#ifndef ghcjs_HOST_OS
33−instance MonadJSM m => MonadJSM (HydratableT m) where
34− liftJSM' = HydratableT . liftJSM'
35−#endif
36−
37−deriving instance MonadSample t m => MonadSample t (HydratableT m)
38−deriving instance MonadHold t m => MonadHold t (HydratableT m)
39−
40−instance MonadTrans HydratableT where
41− lift = HydratableT
42−
43−instance MonadTransControl HydratableT where
44− type StT HydratableT a = a
45− liftWith f = HydratableT $ f runHydratableT
46− restoreT = HydratableT
47−
48−instance MonadRef m => MonadRef (HydratableT m) where
49− type Ref (HydratableT m) = Ref m
50− newRef = lift . newRef
51− readRef = lift . readRef
52− writeRef ref = lift . writeRef ref
53−
54−instance PerformEvent t m => PerformEvent t (HydratableT m) where
55− type Performable (HydratableT m) = Performable m
56− performEvent_ = lift . performEvent_
57− performEvent = lift . performEvent
58−
59−instance PrimMonad m => PrimMonad (HydratableT m) where
60− type PrimState (HydratableT m) = PrimState m
61− primitive = lift . primitive
62−
63−makeHydratable :: Reflex t => ElementConfig er t m -> ElementConfig er t m
64−makeHydratable cfg = cfg
65− { _elementConfig_initialAttributes = Map.insert hydratableAttribute "" $ _elementConfig_initialAttributes cfg
66− , _elementConfig_modifyAttributes = fmap (Map.delete hydratableAttribute) <$> _elementConfig_modifyAttributes cfg
67− }
68−
69−instance PostBuild t m => PostBuild t (HydratableT m) where
70− getPostBuild = lift getPostBuild
71−
72−deriving instance TriggerEvent t m => TriggerEvent t (HydratableT m)
73−
74−instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydratableT m) where
75− newEventWithTrigger = lift . newEventWithTrigger
76− newFanEventWithTrigger f = lift $ newFanEventWithTrigger f
77−
78−instance Adjustable t m => Adjustable t (HydratableT m) where
79− runWithReplace a0 a' = HydratableT $ runWithReplace (coerce a0) (coerceEvent a')
80− traverseDMapWithKeyWithAdjust f dm0 dm' = HydratableT $ traverseDMapWithKeyWithAdjust (\k v -> runHydratableT $ f k v) (coerce dm0) (coerceEvent dm')
81− traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = HydratableT $ traverseDMapWithKeyWithAdjustWithMove (\k v -> runHydratableT $ f k v) (coerce dm0) (coerceEvent dm')
82− traverseIntMapWithKeyWithAdjust f m0 m' = HydratableT $ traverseIntMapWithKeyWithAdjust (\k v -> runHydratableT $ f k v) (coerce m0) (coerceEvent m')
83−
84−instance NotReady t m => NotReady t (HydratableT m) where
85− notReadyUntil = lift . notReadyUntil
86− notReady = lift notReady
87−
88−instance DomBuilder t m => DomBuilder t (HydratableT m) where
89− type DomBuilderSpace (HydratableT m) = DomBuilderSpace m
90− element t cfg = lift . element t (makeHydratable cfg) . runHydratableT
91− inputElement cfg = lift $ inputElement $ cfg
92− { _inputElementConfig_elementConfig = makeHydratable $ _inputElementConfig_elementConfig cfg
93− }
94− textAreaElement cfg = lift $ textAreaElement $ cfg
95− { _textAreaElementConfig_elementConfig = makeHydratable $ _textAreaElementConfig_elementConfig cfg
96− }
97− selectElement cfg child = do
98− let cfg' = cfg
99− { _selectElementConfig_elementConfig = makeHydratable $ _selectElementConfig_elementConfig cfg
100− }
101− lift $ selectElement cfg' $ runHydratableT child
102−
103−instance HasDocument m => HasDocument (HydratableT m)
104−
105−instance HasJSContext m => HasJSContext (HydratableT m) where
106− type JSContextPhantom (HydratableT m) = JSContextPhantom m
107− askJSContext = lift askJSContext
108−
109−instance HasJS js m => HasJS js (HydratableT m) where
110− type JSX (HydratableT m) = JSX m
111− liftJS = lift . liftJS
112−
113−instance DomRenderHook t m => DomRenderHook t (HydratableT m) where
114− withRenderHook f = HydratableT . withRenderHook f . runHydratableT
115− requestDomAction = HydratableT . requestDomAction
116− requestDomAction_ = HydratableT . requestDomAction_
reflex-dom-core/src/Reflex/Dom/Builder/Immediate.hs+135−231
@@ -2,6 +2,7 @@
22{-# LANGUAGE CPP #-}
33{-# LANGUAGE ConstraintKinds #-}
44{-# LANGUAGE DataKinds #-}
5+{-# LANGUAGE DeriveFunctor #-}
56{-# LANGUAGE DeriveTraversable #-}
67{-# LANGUAGE EmptyDataDecls #-}
78{-# LANGUAGE FlexibleContexts #-}
@@ -48,7 +49,6 @@ module Reflex.Dom.Builder.Immediate
4849 , HydrationMode (..)
4950 , HydrationRunnerT (..)
5051 , runHydrationRunnerT
51− , runHydrationRunnerTWithFailure
5252 , ImmediateDomBuilderT
5353 , runHydrationDomBuilderT
5454 , getHydrationMode
@@ -86,6 +86,9 @@ module Reflex.Dom.Builder.Immediate
8686 , ghcjsEventSpec_filters
8787 , ghcjsEventSpec_handler
8888 , GhcjsEventHandler (..)
89+#ifndef USE_TEMPLATE_HASKELL
90+ , phantom2
91+#endif
8992 , drawChildUpdate
9093 , ChildReadyState (..)
9194 , mkHasFocus
@@ -107,9 +110,6 @@ module Reflex.Dom.Builder.Immediate
107110 , WindowConfig (..)
108111 , Window (..)
109112 , wrapWindow
110− -- * Attributes for controlling hydration
111− , hydratableAttribute
112− , skipHydrationAttribute
113113 -- * Internal
114114 , traverseDMapWithKeyWithAdjust'
115115 , hoistTraverseWithKeyWithAdjust
@@ -135,20 +135,15 @@ import Data.Functor.Compose
135135import Data.Functor.Constant
136136import Data.Functor.Misc
137137import Data.Functor.Product
138−import Data.GADT.Compare (GCompare)
139138import Data.IORef
140139import Data.IntMap.Strict (IntMap)
141140import Data.Maybe
142−import Data.Monoid ((<>))
143141import Data.Some (Some(..))
144−import Data.GADT.Compare (GCompare)
145−import Data.String (IsString)
146142import Data.Text (Text)
147143import Foreign.JavaScript.Internal.Utils
148144import Foreign.JavaScript.TH
149−import GHCJS.DOM.ClipboardEvent as ClipboardEvent
150145import GHCJS.DOM.Document (Document, createDocumentFragment, createElement, createElementNS, createTextNode, createComment)
151−import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute)
146+import GHCJS.DOM.Element (getScrollTop, removeAttribute, removeAttributeNS, setAttribute, setAttributeNS, hasAttribute, hasAttributeNS)
152147import GHCJS.DOM.EventM (EventM, event, on)
153148import GHCJS.DOM.KeyboardEvent as KeyboardEvent
154149import GHCJS.DOM.MouseEvent
@@ -167,9 +162,6 @@ import Reflex.PerformEvent.Base (PerformEventT)
167162import Reflex.PerformEvent.Class
168163import Reflex.PostBuild.Base (PostBuildT)
169164import Reflex.PostBuild.Class
170−#ifdef PROFILE_REFLEX
171−import Reflex.Profiled
172−#endif
173165import Reflex.Requester.Base
174166import Reflex.Requester.Class
175167import Reflex.Spider (Spider, SpiderHost, Global)
@@ -182,7 +174,6 @@ import qualified Data.IntMap.Strict as IntMap
182174import qualified Data.Map as Map
183175import qualified Data.Text as T
184176import qualified GHCJS.DOM as DOM
185−import qualified GHCJS.DOM.DataTransfer as DataTransfer
186177import qualified GHCJS.DOM.DocumentAndElementEventHandlers as Events
187178import qualified GHCJS.DOM.DocumentOrShadowRoot as Document
188179import qualified GHCJS.DOM.Element as Element
@@ -200,7 +191,6 @@ import qualified GHCJS.DOM.TouchEvent as TouchEvent
200191import qualified GHCJS.DOM.TouchList as TouchList
201192import qualified GHCJS.DOM.Types as DOM
202193import qualified GHCJS.DOM.Window as Window
203−import qualified GHCJS.DOM.WheelEvent as WheelEvent
204194import qualified Reflex.Patch.DMap as PatchDMap
205195import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
206196import qualified Reflex.Patch.MapWithMove as PatchMapWithMove
@@ -208,7 +198,6 @@ import qualified Reflex.TriggerEvent.Base as TriggerEventT (askEvents)
208198
209199#ifndef USE_TEMPLATE_HASKELL
210200import Data.Functor.Contravariant (phantom)
211−import Control.Lens (Lens', Getter)
212201#endif
213202
214203#ifndef ghcjs_HOST_OS
@@ -277,8 +266,8 @@ newtype HydrationRunnerT t m a = HydrationRunnerT { unHydrationRunnerT :: StateT
277266 )
278267
279268data HydrationState = HydrationState
280− { _hydrationState_previousNode :: !(Maybe Node)
281− , _hydrationState_failed :: !Bool
269+ { _hydrationState_previousNode :: Maybe Node
270+ , _hydrationState_failed :: Bool
282271 }
283272
284273{-# INLINABLE localRunner #-}
@@ -287,28 +276,18 @@ localRunner (HydrationRunnerT m) s parent = do
287276 s0 <- HydrationRunnerT get
288277 (a, s') <- HydrationRunnerT $ lift $ local (\_ -> parent) $ runStateT m (s0 { _hydrationState_previousNode = s })
289278 traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
290− HydrationRunnerT $ modify' $ \hs -> hs { _hydrationState_failed = _hydrationState_failed s' }
291279 pure a
292280
293281{-# INLINABLE runHydrationRunnerT #-}
294282runHydrationRunnerT
295283 :: (MonadRef m, Ref m ~ IORef, Monad m, PerformEvent t m, MonadFix m, MonadReflexCreateTrigger t m, MonadJSM m, MonadJSM (Performable m))
296284 => 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
285+runHydrationRunnerT (HydrationRunnerT m) s parent events = flip runDomRenderHookT events $ flip runReaderT parent $ do
304286 (a, s') <- runStateT m (HydrationState s False)
305287 traverse_ removeSubsequentNodes $ _hydrationState_previousNode s'
306288 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
308289 pure a
309290
310−
311−
312291instance MonadReflexCreateTrigger t m => MonadReflexCreateTrigger t (HydrationRunnerT t m) where
313292 {-# INLINABLE newEventWithTrigger #-}
314293 newEventWithTrigger = lift . newEventWithTrigger
@@ -332,11 +311,12 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (HydrationRunnerT t m) where
332311-- done *before* the switchover to immediate mode - this is most likely some
333312-- form of 'hold' which we want to remove after hydration is done
334313{-# INLINABLE addHydrationStepWithSetup #-}
335−addHydrationStepWithSetup :: MonadIO m => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
314+addHydrationStepWithSetup :: (Adjustable t m, MonadIO m) => m a -> (a -> HydrationRunnerT t m ()) -> HydrationDomBuilderT s t m ()
336315addHydrationStepWithSetup setup f = getHydrationMode >>= \case
337316 HydrationMode_Immediate -> pure ()
338317 HydrationMode_Hydrating -> do
339− s <- lift setup
318+ switchover <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_switchover
319+ (s, _) <- lift $ runWithReplace setup $ return () <$ switchover
340320 addHydrationStep (f s)
341321
342322-- | Add a hydration step
@@ -364,7 +344,7 @@ runDomRenderHookT (DomRenderHookT a) events = do
364344 flip runTriggerEventT events $ do
365345 rec (result, req) <- runRequesterT a rsp
366346 rsp <- performEventAsync $ ffor req $ \rm f -> liftJSM $ runInAnimationFrame f $
367− traverseRequesterData (fmap Identity) rm
347+ traverseRequesterData (\r -> Identity <$> r) rm
368348 return result
369349 where
370350 runInAnimationFrame f x = void . DOM.inAnimationFrame' $ \_ -> do
@@ -379,7 +359,7 @@ instance (Reflex t, MonadFix m) => DomRenderHook t (DomRenderHookT t m) where
379359 withRenderHook hook (DomRenderHookT a) = do
380360 DomRenderHookT $ withRequesting $ \rsp -> do
381361 (x, req) <- lift $ runRequesterT a $ runIdentity <$> rsp
382− return (ffor req $ \rm -> hook $ traverseRequesterData (fmap Identity) rm, x)
362+ return (ffor req $ \rm -> hook $ traverseRequesterData (\r -> Identity <$> r) rm, x)
383363 requestDomAction = DomRenderHookT . requestingIdentity
384364 requestDomAction_ = DomRenderHookT . requesting_
385365
@@ -546,17 +526,17 @@ wrap events e cfg = do
546526 return eventTriggerRefs
547527
548528{-# SPECIALIZE wrap
549− :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
529+ :: Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
550530 -> DOM.Element
551− -> RawElementConfig er DomTimeline HydrationDomSpace
552− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
531+ -> RawElementConfig er Spider HydrationDomSpace
532+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (DMap EventName (EventFilterTriggerRef Spider er))
553533 #-}
554534
555535{-# SPECIALIZE wrap
556− :: Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
536+ :: Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
557537 -> DOM.Element
558− -> RawElementConfig er DomTimeline GhcjsDomSpace
559− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (DMap EventName (EventFilterTriggerRef DomTimeline er))
538+ -> RawElementConfig er Spider GhcjsDomSpace
539+ -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (DMap EventName (EventFilterTriggerRef Spider er))
560540 #-}
561541
562542{-# INLINE triggerBody #-}
@@ -592,23 +572,23 @@ triggerBody ctx cfg events eventTriggerRefs e (WrapArg en) t = case DMap.lookup
592572
593573{-# SPECIALIZE triggerBody
594574 :: DOM.JSContextRef
595− -> RawElementConfig er DomTimeline HydrationDomSpace
596− -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
597− -> DMap EventName (EventFilterTriggerRef DomTimeline er)
575+ -> RawElementConfig er Spider HydrationDomSpace
576+ -> Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
577+ -> DMap EventName (EventFilterTriggerRef Spider er)
598578 -> DOM.Element
599579 -> WrapArg er EventName x
600− -> EventTrigger DomTimeline x
580+ -> EventTrigger Spider x
601581 -> IO (IO ())
602582 #-}
603583
604584{-# SPECIALIZE triggerBody
605585 :: DOM.JSContextRef
606− -> RawElementConfig er DomTimeline GhcjsDomSpace
607− -> Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
608− -> DMap EventName (EventFilterTriggerRef DomTimeline er)
586+ -> RawElementConfig er Spider GhcjsDomSpace
587+ -> Chan [DSum (EventTriggerRef Spider) TriggerInvocation]
588+ -> DMap EventName (EventFilterTriggerRef Spider er)
609589 -> DOM.Element
610590 -> WrapArg er EventName x
611− -> EventTrigger DomTimeline x
591+ -> EventTrigger Spider x
612592 -> IO (IO ())
613593 #-}
614594
@@ -657,11 +637,15 @@ data GhcjsEventSpec er = GhcjsEventSpec
657637newtype GhcjsEventHandler er = GhcjsEventHandler { unGhcjsEventHandler :: forall en. (EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)) }
658638
659639#ifndef USE_TEMPLATE_HASKELL
640+phantom2 :: (Functor f, Contravariant f) => f a -> f b
641+phantom2 = phantom
642+{-# INLINE phantom2 #-}
643+
660644ghcjsEventSpec_filters :: forall er . Lens' (GhcjsEventSpec er) (DMap EventName (GhcjsEventFilter er))
661645ghcjsEventSpec_filters f (GhcjsEventSpec a b) = (\a' -> GhcjsEventSpec a' b) <$> f a
662646{-# INLINE ghcjsEventSpec_filters #-}
663647ghcjsEventSpec_handler :: forall er en . Getter (GhcjsEventSpec er) ((EventName en, GhcjsDomEvent en) -> JSM (Maybe (er en)))
664−ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom (f b)
648+ghcjsEventSpec_handler f (GhcjsEventSpec _ (GhcjsEventHandler b)) = phantom2 (f b)
665649{-# INLINE ghcjsEventSpec_handler #-}
666650#endif
667651
@@ -674,7 +658,6 @@ instance er ~ EventResult => Default (GhcjsEventSpec er) where
674658 runReaderT (defaultDomEventHandler e en) evt
675659 }
676660
677−{-# INLINE makeElement #-}
678661makeElement :: MonadJSM m => Document -> Text -> ElementConfig er t s -> m DOM.Element
679662makeElement doc elementTag cfg = do
680663 e <- uncheckedCastTo DOM.Element <$> case cfg ^. namespace of
@@ -709,16 +692,16 @@ elementImmediate elementTag cfg child = do
709692
710693{-# SPECIALIZE elementImmediate
711694 :: Text
712− -> ElementConfig er DomTimeline HydrationDomSpace
713− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
714− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
695+ -> ElementConfig er Spider HydrationDomSpace
696+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
697+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (Element er GhcjsDomSpace Spider, a)
715698 #-}
716699
717700{-# SPECIALIZE elementImmediate
718701 :: Text
719− -> ElementConfig er DomTimeline GhcjsDomSpace
720− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM a
721− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (Element er GhcjsDomSpace DomTimeline, a)
702+ -> ElementConfig er Spider GhcjsDomSpace
703+ -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM a
704+ -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (Element er GhcjsDomSpace Spider, a)
722705 #-}
723706
724707-- For specialisation
@@ -755,19 +738,11 @@ elementInternal elementTag cfg child = getHydrationMode >>= \case
755738
756739{-# SPECIALIZE elementInternal
757740 :: Text
758− -> ElementConfig er DomTimeline HydrationDomSpace
759− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
760− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (Element er HydrationDomSpace DomTimeline, a)
741+ -> ElementConfig er Spider HydrationDomSpace
742+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
743+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (Element er HydrationDomSpace Spider, 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 ssrAttr = "data-ssr" :: DOM.JSString
768+ hasSSRAttribute :: DOM.Element -> HydrationRunnerT t m Bool
769+ hasSSRAttribute e = case cfg ^. namespace of
770+ Nothing -> hasAttribute e ssrAttr <* removeAttribute e ssrAttr
771+ Just ns -> hasAttributeNS e (Just ns) ssrAttr <* removeAttributeNS e (Just ns) ssrAttr
801772 childDom <- liftIO $ readIORef childDelayedRef
802773 let rawCfg = extractRawElementConfig cfg
803774 doc <- askDocument
@@ -812,9 +783,9 @@ 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
817− False -> do
786+ Just e -> hasSSRAttribute e >>= \case
787+ False -> go (Just node) -- this element was not added by the static renderer, skip
788+ True -> do
818789 t <- Element.getTagName e
819790 -- TODO: check attributes?
820791 if T.toCaseFold elementTag == T.toCaseFold t
@@ -857,9 +828,9 @@ hydrateElement elementTag cfg child = do
857828
858829{-# SPECIALIZE hydrateElement
859830 :: Text
860− -> ElementConfig er DomTimeline HydrationDomSpace
861− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM a
862− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM ((Element er HydrationDomSpace DomTimeline, a), IORef DOM.Element)
831+ -> ElementConfig er Spider HydrationDomSpace
832+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM a
833+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM ((Element er HydrationDomSpace Spider, a), IORef DOM.Element)
863834 #-}
864835
865836{-# INLINE inputElementImmediate #-}
@@ -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 ->
@@ -1252,7 +1194,6 @@ hydrateTextNode doc t = do
12521194 where
12531195 go parent mLastNode = maybe (Node.getFirstChild parent) Node.getNextSibling mLastNode >>= \case
12541196 Nothing -> do
1255− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
12561197 n <- createTextNode doc t
12571198 insertAfterPreviousNode n
12581199 pure n
@@ -1268,7 +1209,6 @@ hydrateTextNode doc t = do
12681209 DOM.splitText_ originalNode $ fromIntegral $ T.length t
12691210 return originalNode
12701211 Nothing -> do
1271− HydrationRunnerT $ modify' $ \s -> s { _hydrationState_failed = True }
12721212 n <- createTextNode doc t
12731213 insertAfterPreviousNode n
12741214 pure n
@@ -1328,8 +1268,8 @@ hydrateComment doc t mSetContents = do
13281268skipToAndReplaceComment
13291269 :: (MonadJSM m, Reflex t, MonadFix m, Adjustable t m, MonadHold t m, RawDocument (DomBuilderSpace (HydrationDomBuilderT s t m)) ~ Document)
13301270 => Text
1331− -> IORef (Maybe Text)
1332− -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef (Maybe Text))
1271+ -> IORef Text
1272+ -> HydrationDomBuilderT s t m (HydrationRunnerT t m (), IORef DOM.Text, IORef Text)
13331273skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
13341274 HydrationMode_Immediate -> do
13351275 -- If we're in immediate mode, we don't try to replace an existing comment,
@@ -1337,50 +1277,43 @@ skipToAndReplaceComment prefix key0Ref = getHydrationMode >>= \case
13371277 t <- textNodeImmediate $ TextNodeConfig ("" :: Text) Nothing
13381278 append $ toNode t
13391279 textNodeRef <- liftIO $ newIORef t
1340− keyRef <- liftIO $ newIORef Nothing
1280+ keyRef <- liftIO $ newIORef ""
13411281 pure (pure (), textNodeRef, keyRef)
13421282 HydrationMode_Hydrating -> do
13431283 doc <- askDocument
13441284 textNodeRef <- liftIO $ newIORef $ error "textNodeRef not yet initialized"
13451285 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
1286+ let go key0 mLastNode = do
1287+ parent <- askParent
1288+ node <- maybe (Node.getFirstChildUnchecked parent) Node.getNextSiblingUnchecked mLastNode
1289+ DOM.castTo DOM.Comment node >>= \case
13571290 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.
1291+ commentText <- Node.getTextContentUnchecked comment
1292+ case T.stripPrefix (prefix <> key0) commentText of
13601293 Just key -> do
13611294 -- Replace the comment with an (invisible) text node
13621295 tn <- createTextNode doc ("" :: Text)
13631296 Node.replaceChild_ parent tn comment
1364− pure (tn, Just key)
1297+ pure (tn, key)
13651298 Nothing -> do
1366− go (Just key0) (Just node)
1299+ go key0 (Just node)
13671300 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
1301+ go key0 (Just node)
1302+ switchComment = do
1303+ key0 <- liftIO $ readIORef key0Ref
1304+ (tn, key) <- go key0 =<< getPreviousNode
1305+ setPreviousNode $ Just $ toNode tn
1306+ liftIO $ do
1307+ writeIORef textNodeRef tn
1308+ writeIORef keyRef key
13761309 pure (switchComment, textNodeRef, keyRef)
13771310
13781311{-# 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.
1312+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)
1313+skipToReplaceStart = skipToAndReplaceComment "replace-start" =<< liftIO (newIORef "")
13811314
13821315{-# 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)
1316+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)
13841317skipToReplaceEnd key = fmap (\(m,e,_) -> (m,e)) $ skipToAndReplaceComment "replace-end" key
13851318
13861319instance SupportsHydrationDomBuilder t m => NotReady t (HydrationDomBuilderT s t m) where
@@ -1620,13 +1553,13 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16201553 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
16211554 ChildReadyState_Ready -> return PatchDMapWithMove.From_Delete
16221555 ChildReadyState_Unready _ -> do
1623− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1556+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
16241557 return $ PatchDMapWithMove.From_Insert $ Constant (_traverseChildImmediate_childReadyState immediate)
16251558 PatchDMapWithMove.From_Delete -> return PatchDMapWithMove.From_Delete
16261559 PatchDMapWithMove.From_Move fromKey -> return $ PatchDMapWithMove.From_Move fromKey
16271560 deleteOrMove :: forall a. k a -> Product (Constant (IORef (ChildReadyState (Some k)))) (ComposeMaybe k) a -> IO (Constant () a)
16281561 deleteOrMove _ (Pair (Constant sRef) (ComposeMaybe mToKey)) = do
1629− writeIORef sRef $ ChildReadyState_Unready $ Some <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
1562+ writeIORef sRef $ ChildReadyState_Unready $ This <$> mToKey -- This will be Nothing if deleting, and Just if moving, so it works out in both cases
16301563 return $ Constant ()
16311564 p' <- fmap unsafePatchDMapWithMove $ DMap.traverseWithKey new $ unPatchDMapWithMove p
16321565 _ <- DMap.traverseWithKey deleteOrMove $ PatchDMapWithMove.getDeletionsAndMoves p old
@@ -1636,8 +1569,8 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16361569 phsBefore <- liftIO $ readIORef placeholders
16371570 let collectIfMoved :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant (Maybe DOM.DocumentFragment) a)
16381571 collectIfMoved k e = do
1639− let mThisPlaceholder = Map.lookup (Some k) phsBefore -- Will be Nothing if this element wasn't present before
1640− nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsBefore
1572+ let mThisPlaceholder = Map.lookup (This k) phsBefore -- Will be Nothing if this element wasn't present before
1573+ nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phsBefore
16411574 case isJust $ getComposeMaybe $ PatchDMapWithMove._nodeInfo_to e of
16421575 False -> do
16431576 mapM_ (`deleteUpTo` nextPlaceholder) mThisPlaceholder
@@ -1656,7 +1589,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16561589 PatchMapWithMove.From_Move k -> Just $ PatchMapWithMove.From_Move k
16571590 let placeFragment :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Compose (TraverseChild t m (Some k)) v') a -> JSM (Constant () a)
16581591 placeFragment k e = do
1659− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phsAfter
1592+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phsAfter
16601593 case PatchDMapWithMove._nodeInfo_from e of
16611594 PatchDMapWithMove.From_Insert (Compose (TraverseChild x _)) -> case x of
16621595 Left _ -> pure ()
@@ -1672,7 +1605,7 @@ instance (Adjustable t m, MonadJSM m, MonadHold t m, MonadFix m, PrimMonad m, Ra
16721605
16731606{-# INLINABLE traverseDMapWithKeyWithAdjust' #-}
16741607traverseDMapWithKeyWithAdjust'
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)
1608+ :: 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)
16761609 => (forall a. k a -> v a -> HydrationDomBuilderT s t m (v' a))
16771610 -> DMap k v
16781611 -> Event t (PatchDMap k v)
@@ -1687,7 +1620,7 @@ traverseDMapWithKeyWithAdjust' = do
16871620 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
16881621 ChildReadyState_Ready -> return Nothing -- Delete this child, since it's ready
16891622 ChildReadyState_Unready _ -> do
1690− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1623+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
16911624 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
16921625 delete _ (Constant sRef) = do
16931626 writeIORef sRef $ ChildReadyState_Unready Nothing
@@ -1698,9 +1631,9 @@ traverseDMapWithKeyWithAdjust' = do
16981631 hoistTraverseWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap updateChildUnreadiness $ \placeholders lastPlaceholder (PatchDMap patch) -> do
16991632 phs <- liftIO $ readIORef placeholders
17001633 forM_ (DMap.toList patch) $ \(k :=> ComposeMaybe mv) -> do
1701− let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (Some k) phs
1634+ let nextPlaceholder = maybe lastPlaceholder snd $ Map.lookupGT (This k) phs
17021635 -- Delete old node
1703− forM_ (Map.lookup (Some k) phs) $ \thisPlaceholder -> do
1636+ forM_ (Map.lookup (This k) phs) $ \thisPlaceholder -> do
17041637 thisPlaceholder `deleteUpTo` nextPlaceholder
17051638 -- Insert new node
17061639 forM_ mv $ \(Compose (TraverseChild e _)) -> case e of
@@ -1762,17 +1695,17 @@ traverseIntMapWithKeyWithAdjust' = do
17621695 liftIO $ writeIORef placeholders $! fromMaybe phs $ apply filtered phs
17631696
17641697{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1765− :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
1698+ :: (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM v')
17661699 -> IntMap v
1767− -> Event DomTimeline (PatchIntMap v)
1768− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1700+ -> Event Spider (PatchIntMap v)
1701+ -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
17691702 #-}
17701703
17711704{-# SPECIALIZE traverseIntMapWithKeyWithAdjust'
1772− :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
1705+ :: (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM v')
17731706 -> IntMap v
1774− -> Event DomTimeline (PatchIntMap v)
1775− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1707+ -> Event Spider (PatchIntMap v)
1708+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
17761709 #-}
17771710
17781711data ChildReadyState a
@@ -1792,7 +1725,7 @@ hoistTraverseWithKeyWithAdjust
17921725 ::
17931726 ( Adjustable t m
17941727 , MonadHold t m
1795− , GCompare k
1728+ , DMap.GCompare k
17961729 , MonadIO m
17971730 , MonadJSM m
17981731 , PrimMonad m
@@ -1850,7 +1783,7 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18501783 liftIO $ writeIORef childReadyState ChildReadyState_Ready
18511784 case countedAt of
18521785 Nothing -> return ()
1853− Just (Some k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
1786+ Just (This k) -> do -- This child has been counted as unready, so we need to remove it from the unready set
18541787 (oldUnready, p) <- liftIO $ readIORef pendingChange
18551788 when (not $ DMap.null oldUnready) $ do -- This shouldn't actually ever be null
18561789 let newUnready = DMap.delete k oldUnready
@@ -1865,7 +1798,7 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18651798 readIORef (_traverseChildImmediate_childReadyState immediate) >>= \case
18661799 ChildReadyState_Ready -> return Nothing
18671800 ChildReadyState_Unready _ -> do
1868− writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ Some k
1801+ writeIORef (_traverseChildImmediate_childReadyState immediate) $ ChildReadyState_Unready $ Just $ This k
18691802 return $ Just $ Constant (_traverseChildImmediate_childReadyState immediate)
18701803 initialUnready <- liftIO $ DMap.mapMaybeWithKey (\_ -> getComposeMaybe) <$> DMap.traverseWithKey processChild children0
18711804 liftIO $ if DMap.null initialUnready
@@ -1876,14 +1809,14 @@ hoistTraverseWithKeyWithAdjust base mapPatch updateChildUnreadiness applyDomUpda
18761809 getHydrationMode >>= \case
18771810 HydrationMode_Hydrating -> addHydrationStepWithSetup (holdIncremental children0 children') $ \children -> do
18781811 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
1812+ phs <- traverse id $ weakenDMapWith (either _traverseChildHydration_delayed (pure . _traverseChildImmediate_placeholder) . _traverseChild_mode . getCompose) dm
18801813 liftIO $ writeIORef placeholders $! phs
18811814 insertAfterPreviousNode lastPlaceholder
18821815 HydrationMode_Immediate -> do
18831816 let activate i = do
18841817 append $ toNode $ _traverseChildImmediate_fragment i
18851818 pure $ _traverseChildImmediate_placeholder i
1886− phs <- sequenceA $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
1819+ phs <- traverse id $ weakenDMapWith (either (error "impossible") activate . _traverseChild_mode . getCompose) children0
18871820 liftIO $ writeIORef placeholders $! phs
18881821 append $ toNode lastPlaceholder
18891822 requestDomAction_ $ ffor children' $ \p -> do
@@ -2007,39 +1940,39 @@ hoistTraverseIntMapWithKeyWithAdjust base updateChildUnreadiness applyDomUpdate_
20071940 return (result0, result')
20081941
20091942{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2010− :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
1943+ :: ((IntMap.Key -> v -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM Int v'))
20111944 -> IntMap v
2012− -> Event DomTimeline (PatchIntMap v)
2013− -> DomRenderHookT DomTimeline HydrationM (IntMap (TraverseChild DomTimeline HydrationM Int v'), Event DomTimeline (PatchIntMap (TraverseChild DomTimeline HydrationM Int v'))))
2014− -> (PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1945+ -> Event Spider (PatchIntMap v)
1946+ -> DomRenderHookT Spider HydrationM (IntMap (TraverseChild Spider HydrationM Int v'), Event Spider (PatchIntMap (TraverseChild Spider HydrationM Int v'))))
1947+ -> (PatchIntMap (TraverseChild Spider HydrationM Int v')
20151948 -> IntMap (IORef (ChildReadyState Int))
20161949 -> IO (IntMap (IORef (ChildReadyState Int))))
20171950 -> (IORef (IntMap DOM.Text)
20181951 -> DOM.Text
2019− -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1952+ -> PatchIntMap (TraverseChild Spider HydrationM Int v')
20201953 -> JSM ())
2021− -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM v')
1954+ -> (IntMap.Key -> v -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM v')
20221955 -> IntMap v
2023− -> Event DomTimeline (PatchIntMap v)
2024− -> HydrationDomBuilderT HydrationDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1956+ -> Event Spider (PatchIntMap v)
1957+ -> HydrationDomBuilderT HydrationDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
20251958 #-}
20261959
20271960{-# SPECIALIZE hoistTraverseIntMapWithKeyWithAdjust
2028− :: ((IntMap.Key -> v -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM Int v'))
1961+ :: ((IntMap.Key -> v -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM Int v'))
20291962 -> IntMap v
2030− -> Event DomTimeline (PatchIntMap v)
2031− -> DomRenderHookT DomTimeline HydrationM (IntMap (TraverseChild DomTimeline HydrationM Int v'), Event DomTimeline (PatchIntMap (TraverseChild DomTimeline HydrationM Int v'))))
2032− -> (PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1963+ -> Event Spider (PatchIntMap v)
1964+ -> DomRenderHookT Spider HydrationM (IntMap (TraverseChild Spider HydrationM Int v'), Event Spider (PatchIntMap (TraverseChild Spider HydrationM Int v'))))
1965+ -> (PatchIntMap (TraverseChild Spider HydrationM Int v')
20331966 -> IntMap (IORef (ChildReadyState Int))
20341967 -> IO (IntMap (IORef (ChildReadyState Int))))
20351968 -> (IORef (IntMap DOM.Text)
20361969 -> DOM.Text
2037− -> PatchIntMap (TraverseChild DomTimeline HydrationM Int v')
1970+ -> PatchIntMap (TraverseChild Spider HydrationM Int v')
20381971 -> JSM ())
2039− -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM v')
1972+ -> (IntMap.Key -> v -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM v')
20401973 -> IntMap v
2041− -> Event DomTimeline (PatchIntMap v)
2042− -> HydrationDomBuilderT GhcjsDomSpace DomTimeline HydrationM (IntMap v', Event DomTimeline (PatchIntMap v'))
1974+ -> Event Spider (PatchIntMap v)
1975+ -> HydrationDomBuilderT GhcjsDomSpace Spider HydrationM (IntMap v', Event Spider (PatchIntMap v'))
20431976 #-}
20441977
20451978data TraverseChildImmediate k = TraverseChildImmediate
@@ -2109,17 +2042,17 @@ drawChildUpdate initialEnv markReady child = do
21092042 }
21102043
21112044{-# SPECIALIZE drawChildUpdate
2112− :: HydrationDomBuilderEnv DomTimeline HydrationM
2045+ :: HydrationDomBuilderEnv Spider HydrationM
21132046 -> (IORef (ChildReadyState Int) -> JSM ())
2114− -> HydrationDomBuilderT s DomTimeline HydrationM (Identity a)
2115− -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM Int) Identity a)
2047+ -> HydrationDomBuilderT s Spider HydrationM (Identity a)
2048+ -> DomRenderHookT Spider HydrationM (Compose (TraverseChild Spider HydrationM Int) Identity a)
21162049 #-}
21172050
21182051{-# SPECIALIZE drawChildUpdate
2119− :: HydrationDomBuilderEnv DomTimeline HydrationM
2052+ :: HydrationDomBuilderEnv Spider HydrationM
21202053 -> (IORef (ChildReadyState (Some k)) -> JSM ())
2121− -> HydrationDomBuilderT s DomTimeline HydrationM (f a)
2122− -> DomRenderHookT DomTimeline HydrationM (Compose (TraverseChild DomTimeline HydrationM (Some k)) f a)
2054+ -> HydrationDomBuilderT s Spider HydrationM (f a)
2055+ -> DomRenderHookT Spider HydrationM (Compose (TraverseChild Spider HydrationM (Some k)) f a)
21232056 #-}
21242057
21252058{-# INLINABLE drawChildUpdateInt #-}
@@ -2131,10 +2064,10 @@ drawChildUpdateInt :: (MonadIO m, MonadJSM m, Reflex t)
21312064drawChildUpdateInt env mark m = fmap runIdentity . getCompose <$> drawChildUpdate env mark (Identity <$> m)
21322065
21332066{-# SPECIALIZE drawChildUpdateInt
2134− :: HydrationDomBuilderEnv DomTimeline HydrationM
2067+ :: HydrationDomBuilderEnv Spider HydrationM
21352068 -> (IORef (ChildReadyState k) -> JSM ())
2136− -> HydrationDomBuilderT s DomTimeline HydrationM v
2137− -> DomRenderHookT DomTimeline HydrationM (TraverseChild DomTimeline HydrationM k v)
2069+ -> HydrationDomBuilderT s Spider HydrationM v
2070+ -> DomRenderHookT Spider HydrationM (TraverseChild Spider HydrationM k v)
21382071 #-}
21392072
21402073{-# INLINE mkHasFocus #-}
@@ -2297,7 +2230,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
22972230 Beforecopy -> return ()
22982231 Copy -> return ()
22992232 Beforepaste -> return ()
2300− Paste -> getPasteData
2233+ Paste -> return ()
23012234 Reset -> return ()
23022235 Search -> return ()
23032236 Selectstart -> return ()
@@ -2306,7 +2239,7 @@ defaultDomEventHandler e evt = fmap (Just . EventResult) $ case evt of
23062239 Touchend -> getTouchEvent
23072240 Touchcancel -> getTouchEvent
23082241 Mousewheel -> return ()
2309− Wheel -> getWheelEvent
2242+ Wheel -> return ()
23102243
23112244{-# INLINABLE defaultDomWindowEventHandler #-}
23122245defaultDomWindowEventHandler :: DOM.Window -> EventName en -> EventM DOM.Window (EventType en) (Maybe (EventResult en))
@@ -2347,7 +2280,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
23472280 Beforecopy -> return ()
23482281 Copy -> return ()
23492282 Beforepaste -> return ()
2350− Paste -> getPasteData
2283+ Paste -> return ()
23512284 Reset -> return ()
23522285 Search -> return ()
23532286 Selectstart -> return ()
@@ -2356,7 +2289,7 @@ defaultDomWindowEventHandler w evt = fmap (Just . EventResult) $ case evt of
23562289 Touchend -> getTouchEvent
23572290 Touchcancel -> getTouchEvent
23582291 Mousewheel -> return ()
2359− Wheel -> getWheelEvent
2292+ Wheel -> return ()
23602293
23612294{-# INLINABLE withIsEvent #-}
23622295withIsEvent :: EventName en -> (IsEvent (EventType en) => r) -> r
@@ -2624,15 +2557,6 @@ getMouseEventCoords = do
26242557 e <- event
26252558 bisequence (getClientX e, getClientY e)
26262559
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−
26362560{-# INLINABLE getTouchEvent #-}
26372561getTouchEvent :: EventM e TouchEvent TouchEventResult
26382562getTouchEvent = do
@@ -2674,26 +2598,6 @@ getTouchEvent = do
26742598 , _touchEventResult_touches = touches
26752599 }
26762600
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−
26972601instance MonadSample t m => MonadSample t (HydrationDomBuilderT s t m) where
26982602 {-# INLINABLE sample #-}
26992603 sample = lift . sample
reflex-dom-core/src/Reflex/Dom/Builder/InputDisabled.hs−6
@@ -80,7 +80,6 @@ instance Adjustable t m => Adjustable t (InputDisabledT m) where
8080 runWithReplace a0 a' = InputDisabledT $ runWithReplace (coerce a0) (coerceEvent a')
8181 traverseDMapWithKeyWithAdjust f dm0 dm' = InputDisabledT $ traverseDMapWithKeyWithAdjust (\k v -> runInputDisabledT $ f k v) (coerce dm0) (coerceEvent dm')
8282 traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = InputDisabledT $ traverseDMapWithKeyWithAdjustWithMove (\k v -> runInputDisabledT $ f k v) (coerce dm0) (coerceEvent dm')
83− traverseIntMapWithKeyWithAdjust f m0 m' = InputDisabledT $ traverseIntMapWithKeyWithAdjust (\k v -> runInputDisabledT $ f k v) (coerce m0) (coerceEvent m')
8483
8584instance NotReady t m => NotReady t (InputDisabledT m) where
8685 notReadyUntil = lift . notReadyUntil
@@ -109,8 +108,3 @@ instance HasJSContext m => HasJSContext (InputDisabledT m) where
109108instance HasJS js m => HasJS js (InputDisabledT m) where
110109 type JSX (InputDisabledT m) = JSX m
111110 liftJS = lift . liftJS
112−
113−instance DomRenderHook t m => DomRenderHook t (InputDisabledT m) where
114− withRenderHook f = InputDisabledT . withRenderHook f . runInputDisabledT
115− requestDomAction = InputDisabledT . requestDomAction
116− requestDomAction_ = InputDisabledT . requestDomAction_
reflex-dom-core/src/Reflex/Dom/Builder/Static.hs+20−49
@@ -37,8 +37,6 @@ import Data.IntMap (IntMap)
3737import qualified Data.IntMap as IntMap
3838import qualified Data.Map as Map
3939import Data.Map.Misc (applyMap)
40−import Data.Maybe (fromMaybe)
41−import Data.Monoid ((<>))
4240import qualified Data.Set as Set
4341import Data.Text (Text)
4442import qualified Data.Text as T
@@ -56,6 +54,7 @@ import Reflex.PerformEvent.Class
5654import Reflex.PostBuild.Base
5755import Reflex.PostBuild.Class
5856import Reflex.TriggerEvent.Class
57+import System.Random (randomRIO)
5958
6059data StaticDomBuilderEnv t = StaticDomBuilderEnv
6160 { _staticDomBuilderEnv_shouldEscape :: Bool
@@ -64,7 +63,6 @@ data StaticDomBuilderEnv t = StaticDomBuilderEnv
6463 -- We use this to add a "selected" attribute to the appropriate "option" child element.
6564 -- This is not yet a perfect simulation of what the browser does, but it is much closer than doing nothing.
6665 -- TODO: Handle edge cases, e.g. setting to a value for which there is no option, then adding that option dynamically afterwards.
67− , _staticDomBuilderEnv_nextRunWithReplaceKey :: IORef Int
6866 }
6967
7068newtype StaticDomBuilderT t m a = StaticDomBuilderT
@@ -165,7 +163,7 @@ instance (SupportsStaticDomBuilder t m, Monad m) => HasDocument (StaticDomBuilde
165163instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m) => Adjustable t (StaticDomBuilderT t m) where
166164 runWithReplace a0 a' = do
167165 e <- StaticDomBuilderT ask
168− key <- replaceStart e
166+ key <- replaceStart
169167 (result0, result') <- lift $ runWithReplace (runStaticDomBuilderT a0 e) (flip runStaticDomBuilderT e <$> a')
170168 o <- hold (snd result0) $ fmapCheap snd result'
171169 StaticDomBuilderT $ modify $ (:) $ join o
@@ -175,9 +173,10 @@ instance (Reflex t, Adjustable t m, MonadHold t m, SupportsStaticDomBuilder t m)
175173 traverseDMapWithKeyWithAdjust = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjust mapPatchDMap
176174 traverseDMapWithKeyWithAdjustWithMove = hoistDMapWithKeyWithAdjust traverseDMapWithKeyWithAdjustWithMove mapPatchDMapWithMove
177175
178−replaceStart :: (DomBuilder t m, MonadIO m) => StaticDomBuilderEnv t -> m Text
179−replaceStart env = do
180− str <- show <$> liftIO (atomicModifyRef (_staticDomBuilderEnv_nextRunWithReplaceKey env) $ \k -> (succ k, k))
176+-- TODO remove this?
177+replaceStart :: (DomBuilder t m, MonadIO m) => m Text
178+replaceStart = do
179+ str <- liftIO $ replicateM 8 $ randomRIO ('a', 'z')
181180 let key = "-" <> T.pack str
182181 _ <- commentNode $ def { _commentNodeConfig_initialContents = "replace-start" <> key }
183182 pure key
@@ -274,7 +273,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
274273 --TODO: Do not escape quotation marks; see https://stackoverflow.com/questions/25612166/what-characters-must-be-escaped-in-html-5
275274 shouldEscape <- asks _staticDomBuilderEnv_shouldEscape
276275 let escape = if shouldEscape then fromHtmlEscapedText else byteString . encodeUtf8
277− (modify . (:)) . (\c -> "<!--" <> c <> "-->") =<< case mSetContents of
276+ modify . (:) =<< (\c -> "<!--" <> c <> "-->") <$> case mSetContents of
278277 Nothing -> return (pure (escape initialContents))
279278 Just setContents -> hold (escape initialContents) $ fmapCheap escape setContents --Only because it doesn't get optimized when profiling is on
280279 return $ CommentNode ()
@@ -287,9 +286,8 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
287286 es <- newFanEventWithTrigger $ \_ _ -> return (return ())
288287 StaticDomBuilderT $ do
289288 let shouldEscape = elementTag `Set.notMember` noEscapeElements
290− nextRunWithReplaceKey <- asks _staticDomBuilderEnv_nextRunWithReplaceKey
291− (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing nextRunWithReplaceKey
292− attrs0 <- foldDyn applyMap (cfg ^. initialAttributes) (cfg ^. modifyAttributes)
289+ (result, innerHtml) <- lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv shouldEscape Nothing
290+ attrs0 <- foldDyn applyMap (Map.insert "data-ssr" "" $ cfg ^. initialAttributes) (cfg ^. modifyAttributes)
293291 selectValue <- asks _staticDomBuilderEnv_selectValue
294292 let addSelectedAttr attrs sel = case Map.lookup "value" attrs of
295293 Just v | v == sel -> attrs <> Map.singleton "selected" ""
@@ -312,32 +310,13 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
312310 return (e, result)
313311 {-# INLINABLE inputElement #-}
314312 inputElement cfg = do
315− -- Tweak the config to update the "value" and "checked" attributes appropriately.
316− -- TODO: warn upon overwriting values.
317− let setInitialValue = Map.insert "value" (_inputElementConfig_initialValue cfg)
318− setUpdatedValue updatedAttrs = case _inputElementConfig_setValue cfg of
319− Nothing -> updatedAttrs
320− Just e -> (Map.singleton "value" . Just <$> e) <> updatedAttrs
321− setInitialChecked = case _inputElementConfig_initialChecked cfg of
322− True -> Map.insert "checked" "checked"
323− False -> id
324− setUpdatedChecked updatedAttrs = case _inputElementConfig_setChecked cfg of
325− Nothing -> updatedAttrs
326− Just e -> (Map.singleton "checked" (Just "checked") <$ e) <> updatedAttrs
327− adjustedConfig = _inputElementConfig_elementConfig cfg
328− & elementConfig_initialAttributes %~ setInitialValue . setInitialChecked
329− & elementConfig_modifyAttributes %~ setUpdatedValue . setUpdatedChecked
330− (e, _result) <- element "input" adjustedConfig $ return ()
331− v <- case _inputElementConfig_setValue cfg of
332− Nothing -> pure $ constDyn (cfg ^. inputElementConfig_initialValue)
333− Just ev -> holdDyn (cfg ^. inputElementConfig_initialValue) ev
334− c <- case _inputElementConfig_setChecked cfg of
335− Nothing -> pure $ constDyn $ _inputElementConfig_initialChecked cfg
336− Just ev -> holdDyn (_inputElementConfig_initialChecked cfg) ev
313+ (e, _result) <- element "input" (cfg ^. inputElementConfig_elementConfig) $ return ()
314+ let v0 = constDyn $ cfg ^. inputElementConfig_initialValue
315+ let c0 = constDyn $ cfg ^. inputElementConfig_initialChecked
337316 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
338317 return $ InputElement
339− { _inputElement_value = v
340− , _inputElement_checked = c
318+ { _inputElement_value = v0
319+ , _inputElement_checked = c0
341320 , _inputElement_checkedChange = never
342321 , _inputElement_input = never
343322 , _inputElement_hasFocus = hasFocus
@@ -347,17 +326,12 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
347326 }
348327 {-# INLINABLE textAreaElement #-}
349328 textAreaElement cfg = do
350− (e, _domElement) <- element "textarea" (_textAreaElementConfig_elementConfig cfg) $ do
351− -- Set the initial value
352− void $ textNode $ def
353− & textNodeConfig_initialContents .~ _textAreaElementConfig_initialValue cfg
354− & textNodeConfig_setContents .~ fromMaybe never (_textAreaElementConfig_setValue cfg)
355− v <- case _textAreaElementConfig_setValue cfg of
356− Nothing -> pure $ constDyn (cfg ^. textAreaElementConfig_initialValue)
357− Just ev -> holdDyn (cfg ^. textAreaElementConfig_initialValue) ev
329+ --TODO: Support setValue event
330+ (e, _domElement) <- element "textarea" (cfg ^. textAreaElementConfig_elementConfig) $ return ()
331+ let v0 = constDyn $ cfg ^. textAreaElementConfig_initialValue
358332 let hasFocus = constDyn False -- TODO should this be coming from initialAtttributes
359333 return $ TextAreaElement
360− { _textAreaElement_value = v
334+ { _textAreaElement_value = v0
361335 , _textAreaElement_input = never
362336 , _textAreaElement_hasFocus = hasFocus
363337 , _textAreaElement_element = e
@@ -366,9 +340,7 @@ instance SupportsStaticDomBuilder t m => DomBuilder t (StaticDomBuilderT t m) wh
366340 selectElement cfg child = do
367341 v <- holdDyn (cfg ^. selectElementConfig_initialValue) (cfg ^. selectElementConfig_setValue)
368342 (e, result) <- element "select" (_selectElementConfig_elementConfig cfg) $ do
369− (a, innerHtml) <- StaticDomBuilderT $ do
370− nextRunWithReplaceKey <- asks _staticDomBuilderEnv_nextRunWithReplaceKey
371− lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv False (Just $ current v) nextRunWithReplaceKey
343+ (a, innerHtml) <- StaticDomBuilderT $ lift $ lift $ runStaticDomBuilderT child $ StaticDomBuilderEnv False $ Just (current v)
372344 StaticDomBuilderT $ lift $ modify $ (:) innerHtml
373345 return a
374346 let wrapped = SelectElement
@@ -390,8 +362,7 @@ renderStatic :: StaticWidget x a -> IO (a, ByteString)
390362renderStatic w = do
391363 runDomHost $ do
392364 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
393− nextRunWithReplaceKey <- newRef 0
394− let env0 = StaticDomBuilderEnv True Nothing nextRunWithReplaceKey
365+ let env0 = StaticDomBuilderEnv True Nothing
395366 ((res, bs), FireCommand fire) <- hostPerformEventT $ runStaticDomBuilderT (runPostBuildT w postBuild) env0
396367 mPostBuildTrigger <- readRef postBuildTriggerRef
397368 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
reflex-dom-core/src/Reflex/Dom/Class.hs+7−4
@@ -4,7 +4,8 @@ module Reflex.Dom.Class ( module Reflex.Dom.Class
44 , module Web.KeyCode
55 ) where
66
7−import Control.Lens
7+import Data.Map (Map)
8+import qualified Data.Map as Map
89import Reflex.Class
910import Web.KeyCode
1011
@@ -12,9 +13,11 @@ import Foreign.JavaScript.TH
1213import Reflex.PerformEvent.Class
1314import Reflex.PostBuild.Class
1415
15−-- | Previously an alias for 'Data.Map.singleton', but now generalised to 'At'
16−(=:) :: (At m, Monoid m) => Index m -> IxValue m -> m
17−k =: a = at k ?~ a $ mempty
16+import Prelude hiding (concat, mapM, mapM_, sequence)
17+
18+-- | Alias for Data.Map.singleton
19+(=:) :: k -> a -> Map k a
20+(=:) = Map.singleton
1821infixr 7 =: -- Ought to bind tighter than <>, which is infixr 6
1922
2023{-# DEPRECATED keycodeEnter "Instead of `x == keycodeEnter`, use `keyCodeLookup x == Enter`" #-}
reflex-dom-core/src/Reflex/Dom/Core.hs+1−2
@@ -6,17 +6,16 @@ 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
1312import Reflex.Dom.Class as X
1413import Reflex.Dom.Location as X
1514import Reflex.Dom.Main as X
15+import Reflex.Dom.Modals.Base as X
1616import Reflex.Dom.Modals.Class as X
1717import Reflex.Dom.Old as X
1818import Reflex.Dom.Prerender as X
1919import Reflex.Dom.WebSocket as X
2020import Reflex.Dom.Widget as X
2121import Reflex.Dom.Xhr as X
22−import Reflex.Dom.Xhr.FormData as X
reflex-dom-core/src/Reflex/Dom/Main.hs+37−89
@@ -5,6 +5,7 @@
55{-# LANGUAGE GADTs #-}
66{-# LANGUAGE MultiParamTypeClasses #-}
77{-# LANGUAGE NoMonomorphismRestriction #-}
8+{-# LANGUAGE PatternSynonyms #-}
89{-# LANGUAGE RankNTypes #-}
910{-# LANGUAGE RecursiveDo #-}
1011{-# LANGUAGE ScopedTypeVariables #-}
@@ -26,9 +27,6 @@ import Reflex.PostBuild.Base
2627import Reflex.Spider (Global, Spider, SpiderHost, runSpiderHost)
2728import Reflex.TriggerEvent.Base
2829import Reflex.TriggerEvent.Class
29−#ifdef PROFILE_REFLEX
30−import Reflex.Profiled
31−#endif
3230
3331import Control.Concurrent
3432import Control.Lens
@@ -66,40 +64,20 @@ mainHydrationWidgetWithHead' :: HydrationWidget () () -> HydrationWidget () () -
6664mainHydrationWidgetWithHead' = mainHydrationWidgetWithSwitchoverAction' (pure ())
6765
6866{-# INLINE mainHydrationWidgetWithSwitchoverAction #-}
69−mainHydrationWidgetWithSwitchoverAction :: JSM () -> (forall x. HydrationWidget x ()) -> (forall x. HydrationWidget x ()) -> JSM ()
67+mainHydrationWidgetWithSwitchoverAction :: IO () -> (forall x. HydrationWidget x ()) -> (forall x. HydrationWidget x ()) -> JSM ()
7068mainHydrationWidgetWithSwitchoverAction = mainHydrationWidgetWithSwitchoverAction'
7169
7270{-# INLINABLE mainHydrationWidgetWithSwitchoverAction' #-}
7371-- | Warning: `mainHydrationWidgetWithSwitchoverAction'` is provided only as performance tweak. It is expected to disappear in future releases.
74−mainHydrationWidgetWithSwitchoverAction' :: 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
72+mainHydrationWidgetWithSwitchoverAction' :: IO () -> HydrationWidget () () -> HydrationWidget () () -> JSM ()
73+mainHydrationWidgetWithSwitchoverAction' switchoverAction head' body = do
74+ runHydrationWidgetWithHeadAndBody switchoverAction $ \appendHead appendBody -> do
8375 appendHead head'
8476 appendBody body
8577
8678{-# INLINABLE attachHydrationWidget #-}
8779attachHydrationWidget
88− :: JSM ()
89− -> JSContextSingleton ()
90− -> ( Event DomTimeline ()
91− -> IORef HydrationMode
92− -> Maybe (IORef [(Node, HydrationRunnerT DomTimeline (DomCoreWidget ()) ())])
93− -> EventChannel
94− -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
95− )
96− -> IO (a, FireCommand DomTimeline DomHost)
97−attachHydrationWidget = attachHydrationWidgetWithFailure (pure ())
98−
99−{-# INLINABLE attachHydrationWidgetWithFailure #-}
100−attachHydrationWidgetWithFailure
10180 :: IO ()
102− -> JSM ()
10381 -> JSContextSingleton ()
10482 -> ( Event DomTimeline ()
10583 -> IORef HydrationMode
@@ -108,7 +86,7 @@ attachHydrationWidgetWithFailure
10886 -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
10987 )
11088 -> IO (a, FireCommand DomTimeline DomHost)
111−attachHydrationWidgetWithFailure onFailure switchoverAction jsSing w = do
89+attachHydrationWidget switchoverAction jsSing w = do
11290 hydrationMode <- liftIO $ newIORef HydrationMode_Hydrating
11391 rootNodesRef <- liftIO $ newIORef []
11492 events <- newChan
@@ -124,10 +102,10 @@ attachHydrationWidgetWithFailure onFailure switchoverAction jsSing w = do
124102 rootNodes <- liftIO $ readIORef rootNodesRef
125103 let delayedAction = do
126104 for_ (reverse rootNodes) $ \(rootNode, runner) -> do
127− let hydrate = runHydrationRunnerTWithFailure runner onFailure Nothing rootNode events
105+ let hydrate = runHydrationRunnerT runner Nothing rootNode events
128106 void $ runWithJSContextSingleton (runPostBuildT hydrate never) jsSing
129107 liftIO $ writeIORef hydrationMode HydrationMode_Immediate
130− runWithJSContextSingleton (DOM.liftJSM switchoverAction) jsSing
108+ liftIO $ switchoverAction
131109 pure (result, fc)
132110
133111type HydrationWidget x a = HydrationDomBuilderT HydrationDomSpace DomTimeline (DomCoreWidget x) a
@@ -139,28 +117,17 @@ type DomCoreWidget x = PostBuildT DomTimeline (WithJSContextSingleton x (Perform
139117
140118{-# INLINABLE runHydrationWidgetWithHeadAndBody #-}
141119runHydrationWidgetWithHeadAndBody
142− :: JSM ()
143− -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head" --TODO: test invoking this more than once
144− -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body" --TODO: test invoking this more than once
145− -> FloatingWidget () ()
146− )
147− -> JSM ()
148−runHydrationWidgetWithHeadAndBody = runHydrationWidgetWithHeadAndBodyWithFailure (pure ())
149−
150−{-# INLINABLE runHydrationWidgetWithHeadAndBodyWithFailure #-}
151−runHydrationWidgetWithHeadAndBodyWithFailure
152120 :: 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
121+ -> ( (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to head"
122+ -> (forall c. HydrationWidget () c -> FloatingWidget () c) -- "Append to body"
156123 -> FloatingWidget () ()
157124 )
158125 -> JSM ()
159−runHydrationWidgetWithHeadAndBodyWithFailure onFailure switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
126+runHydrationWidgetWithHeadAndBody switchoverAction app = withJSContextSingletonMono $ \jsSing -> do
160127 globalDoc <- currentDocumentUnchecked
161128 headElement <- getHeadUnchecked globalDoc
162129 bodyElement <- getBodyUnchecked globalDoc
163− (events, fc) <- liftIO . attachHydrationWidgetWithFailure onFailure switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
130+ (events, fc) <- liftIO . attachHydrationWidget switchoverAction jsSing $ \switchover hydrationMode hydrationResult events -> do
164131 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
165132 let hydrateDom :: DOM.Node -> HydrationWidget () c -> FloatingWidget () c
166133 hydrateDom n w = do
@@ -242,48 +209,39 @@ type Widget x = ImmediateDomBuilderT DomTimeline (DomCoreWidget x)
242209attachWidget :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> JSM a
243210attachWidget rootElement wv w = fst <$> attachWidget' rootElement wv w
244211
245−{-# INLINABLE runImmediateWidgetWithHeadAndBody #-}
246−runImmediateWidgetWithHeadAndBody
247− :: ( (forall c. Widget () c -> FloatingWidget () c) -- "Append to head"
248− -> (forall c. Widget () c -> FloatingWidget () c) -- "Append to body"
249− -> FloatingWidget () ()
250− )
251− -> JSM ()
252−runImmediateWidgetWithHeadAndBody app = withJSContextSingletonMono $ \jsSing -> do
253− globalDoc <- currentDocumentUnchecked
254− headElement <- getHeadUnchecked globalDoc
255− bodyElement <- getBodyUnchecked globalDoc
256− headFragment <- createDocumentFragment globalDoc
257− bodyFragment <- createDocumentFragment globalDoc
258− (events, fc) <- liftIO . attachImmediateWidget $ \hydrationMode events -> do
212+-- | Warning: `mainWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.
213+mainWidgetWithHead' :: (a -> Widget () b, b -> Widget () a) -> JSM ()
214+mainWidgetWithHead' widgets = withJSContextSingletonMono $ \jsSing -> do
215+ doc <- currentDocumentUnchecked
216+ headElement <- getHeadUnchecked doc
217+ headFragment <- createDocumentFragment doc
218+ bodyElement <- getBodyUnchecked doc
219+ bodyFragment <- createDocumentFragment doc
220+ hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
221+ (events, fc) <- liftIO . attachWidget'' $ \events -> do
222+ let (headWidget, bodyWidget) = widgets
259223 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
260− let go :: forall c. DOM.DocumentFragment -> Widget () c -> FloatingWidget () c
261− go df w = do
224+ let go :: forall c. Widget () c -> DOM.DocumentFragment -> PerformEventT DomTimeline DomHost c
225+ go w df = do
262226 unreadyChildren <- liftIO $ newIORef 0
263227 delayed <- liftIO $ newIORef $ pure ()
264228 let builderEnv = HydrationDomBuilderEnv
265− { _hydrationDomBuilderEnv_document = globalDoc
229+ { _hydrationDomBuilderEnv_document = toDocument doc
266230 , _hydrationDomBuilderEnv_parent = Left $ toNode df
267231 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
268− , _hydrationDomBuilderEnv_commitAction = pure () --TODO: possibly `replaceElementContents n f`
269− , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
232+ , _hydrationDomBuilderEnv_commitAction = return () --TODO
270233 , _hydrationDomBuilderEnv_switchover = never
271234 , _hydrationDomBuilderEnv_delayed = delayed
235+ , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
272236 }
273− lift $ runHydrationDomBuilderT w builderEnv events
274− runWithJSContextSingleton (runPostBuildT (runTriggerEventT (app (go headFragment) (go bodyFragment)) events) postBuild) jsSing
237+ runWithJSContextSingleton (runPostBuildT (runHydrationDomBuilderT w builderEnv events) postBuild) jsSing
238+ rec b <- go (headWidget a) headFragment
239+ a <- go (bodyWidget b) bodyFragment
275240 return (events, postBuildTriggerRef)
276241 replaceElementContents headElement headFragment
277242 replaceElementContents bodyElement bodyFragment
278243 liftIO $ processAsyncEvents events fc
279244
280−-- | Warning: `mainWidgetWithHead'` is provided only as performance tweak. It is expected to disappear in future releases.
281−mainWidgetWithHead' :: (a -> Widget () b, b -> Widget () a) -> JSM ()
282−mainWidgetWithHead' (h, b) = runImmediateWidgetWithHeadAndBody $ \appendHead appendBody -> do
283− rec hOut <- appendHead $ h bOut
284− bOut <- appendBody $ b hOut
285− pure ()
286−
287245replaceElementContents :: DOM.IsElement e => e -> DOM.DocumentFragment -> JSM ()
288246replaceElementContents e df = do
289247 setInnerHTML e ("" :: String)
@@ -295,7 +253,8 @@ attachWidget' :: DOM.IsElement e => e -> JSContextSingleton x -> Widget x a -> J
295253attachWidget' rootElement jsSing w = do
296254 doc <- getOwnerDocumentUnchecked rootElement
297255 df <- createDocumentFragment doc
298− ((a, events), fc) <- liftIO . attachImmediateWidget $ \hydrationMode events -> do
256+ hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
257+ ((a, events), fc) <- liftIO . attachWidget'' $ \events -> do
299258 (postBuild, postBuildTriggerRef) <- newEventWithTriggerRef
300259 unreadyChildren <- liftIO $ newIORef 0
301260 delayed <- liftIO $ newIORef $ pure ()
@@ -316,18 +275,12 @@ attachWidget' rootElement jsSing w = do
316275
317276type EventChannel = Chan [DSum (EventTriggerRef DomTimeline) TriggerInvocation]
318277
319−{-# INLINABLE attachImmediateWidget #-}
320−attachImmediateWidget
321− :: ( IORef HydrationMode
322− -> EventChannel
323− -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))
324− )
325− -> IO (a, FireCommand DomTimeline DomHost)
326−attachImmediateWidget w = do
327− hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
278+{-# INLINABLE attachWidget'' #-}
279+attachWidget'' :: (EventChannel -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))) -> IO (a, FireCommand DomTimeline DomHost)
280+attachWidget'' w = do
328281 events <- newChan
329282 runDomHost $ do
330− ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w hydrationMode events
283+ ((result, postBuildTriggerRef), fc@(FireCommand fire)) <- hostPerformEventT $ w events
331284 mPostBuildTrigger <- readRef postBuildTriggerRef
332285 forM_ mPostBuildTrigger $ \postBuildTrigger -> fire [postBuildTrigger :=> Identity ()] $ return ()
333286 return (result, fc)
@@ -369,8 +322,3 @@ runApp' app = withJSContextSingleton $ \jsSing -> do
369322 { _appInput_window = w
370323 }
371324 return ()
372−
373−{-# DEPRECATED attachWidget'' "Use 'attachImmediateWidget . const' instead" #-}
374−{-# INLINABLE attachWidget'' #-}
375−attachWidget'' :: (EventChannel -> PerformEventT DomTimeline DomHost (a, IORef (Maybe (EventTrigger DomTimeline ())))) -> IO (a, FireCommand DomTimeline DomHost)
376−attachWidget'' = attachImmediateWidget . const
reflex-dom-core/src/Reflex/Dom/Modals/Base.hsnew file+199
@@ -0,0 +1,199 @@
1+{-
2+{-# LANGUAGE CPP #-}
3+{-# LANGUAGE FlexibleInstances #-}
4+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
5+{-# LANGUAGE OverloadedStrings #-}
6+{-# LANGUAGE MultiParamTypeClasses #-}
7+{-# LANGUAGE RankNTypes #-}
8+{-# LANGUAGE RecursiveDo #-}
9+{-# LANGUAGE ScopedTypeVariables #-}
10+{-# LANGUAGE TypeFamilies #-}
11+{-# LANGUAGE UndecidableInstances #-}
12+-}
13+module Reflex.Dom.Modals.Base
14+where
15+{-
16+ ( ModalsT (..)
17+ , ModalLayerConfig (..)
18+ , withModalLayer
19+ )where
20+
21+import Control.Lens hiding (element)
22+import Control.Monad.Fix
23+import Control.Monad.Primitive
24+import Control.Monad.Ref
25+import Control.Monad.Trans
26+import Data.Coerce
27+import Data.Default
28+import Data.Dependent.Map (DMap, DSum (..), GCompare)
29+import qualified Data.Dependent.Map as DMap
30+import Data.Functor.Compose
31+import Data.Proxy
32+import Data.Semigroup
33+import Data.Text (Text)
34+import qualified Data.Text as T
35+import Foreign.JavaScript.TH
36+import Language.Javascript.JSaddle (MonadJSM)
37+
38+import Data.Functor.Misc
39+import Reflex
40+import Reflex.Dom.Builder.Class
41+import Reflex.Dom.Builder.Immediate
42+import Reflex.Dom.Class
43+import Reflex.Dom.Modals.Class
44+import Reflex.Host.Class
45+
46+instance (Reflex t, PrimMonad m) => ModalOpener t (ModalsT t m) where
47+ requestingModal = ModalsT . requesting . fmap Compose
48+
49+newtype ModalsT t m a = ModalsT { unModalsT :: RequesterT t (Compose (ModalsT t m) (Event t)) Maybe m a }
50+ deriving (Functor, Applicative, Monad, MonadIO, MonadFix)
51+
52+instance Wrapped (ModalsT t m a) where
53+ type Unwrapped (ModalsT t m a) = RequesterT t (Compose (ModalsT t m) (Event t)) Maybe m a
54+ _Wrapped' = iso coerce coerce
55+
56+instance ModalsT t m a ~ x => Rewrapped (ModalsT t m a) x
57+
58+instance MonadTrans (ModalsT t) where
59+ lift = ModalsT . lift
60+
61+instance (Reflex t, PostBuild t m) => PostBuild t (ModalsT t m) where
62+ getPostBuild = view _Unwrapped getPostBuild
63+
64+instance MonadSample t m => MonadSample t (ModalsT t m) where
65+ {-# INLINABLE sample #-}
66+ sample = lift . sample
67+
68+instance MonadHold t m => MonadHold t (ModalsT t m) where
69+ {-# INLINABLE hold #-}
70+ hold v0 = lift . hold v0
71+ {-# INLINABLE holdDyn #-}
72+ holdDyn v0 = lift . holdDyn v0
73+ {-# INLINABLE holdIncremental #-}
74+ holdIncremental v0 = lift . holdIncremental v0
75+
76+instance PerformEvent t m => PerformEvent t (ModalsT t m) where
77+ type Performable (ModalsT t m) = Performable m
78+ {-# INLINABLE performEvent_ #-}
79+ performEvent_ = lift . performEvent_
80+ {-# INLINABLE performEvent #-}
81+ performEvent = lift . performEvent
82+
83+instance (ReflexHost t, MonadReflexCreateTrigger t m) => MonadReflexCreateTrigger t (ModalsT t m) where
84+ {-# INLINABLE newEventWithTrigger #-}
85+ newEventWithTrigger = ModalsT . lift . newEventWithTrigger
86+ {-# INLINABLE newFanEventWithTrigger #-}
87+ newFanEventWithTrigger f = ModalsT $ lift $ newFanEventWithTrigger f
88+
89+instance TriggerEvent t m => TriggerEvent t (ModalsT t m) where
90+ {-# INLINABLE newTriggerEvent #-}
91+ newTriggerEvent = lift newTriggerEvent
92+ {-# INLINABLE newTriggerEventWithOnComplete #-}
93+ newTriggerEventWithOnComplete = lift newTriggerEventWithOnComplete
94+ newEventWithLazyTriggerWithOnComplete = lift . newEventWithLazyTriggerWithOnComplete
95+
96+instance MonadRef m => MonadRef (ModalsT t m) where
97+ type Ref (ModalsT t m) = Ref m
98+ {-# INLINABLE newRef #-}
99+ newRef = lift . newRef
100+ {-# INLINABLE readRef #-}
101+ readRef = lift . readRef
102+ {-# INLINABLE writeRef #-}
103+ writeRef r = lift . writeRef r
104+
105+instance MonadAtomicRef m => MonadAtomicRef (ModalsT t m) where
106+ {-# INLINABLE atomicModifyRef #-}
107+ atomicModifyRef r = lift . atomicModifyRef r
108+
109+instance (Adjustable t m, MonadHold t m, MonadFix m) => Adjustable t (ModalsT t m) where
110+ runWithReplace a0 a' = ModalsT $ runWithReplace (unModalsT a0) (fmapCheap unModalsT a')
111+ traverseDMapWithKeyWithAdjust f dm0 dm' = ModalsT $ traverseDMapWithKeyWithAdjust (coerce f) dm0 dm'
112+ traverseDMapWithKeyWithAdjustWithMove f dm0 dm' = ModalsT $ traverseDMapWithKeyWithAdjustWithMove (coerce f) dm0 dm'
113+
114+instance (DomBuilder t m, PerformEvent t m, MonadFix m, MonadHold t m) => DomBuilder t (ModalsT t m) where
115+ type DomBuilderSpace (ModalsT t m) = DomBuilderSpace m
116+ element = coerce (element :: Text -> ElementConfig er t (DomBuilderSpace m) -> Unwrapped (ModalsT t m a) -> Unwrapped (ModalsT t m (Element er (DomBuilderSpace m) t, a)))
117+ inputElement = coerce (inputElement :: InputElementConfig er t (DomBuilderSpace m) -> Unwrapped (ModalsT t m (InputElement er (DomBuilderSpace m) t)))
118+ textAreaElement = coerce (textAreaElement :: TextAreaElementConfig er t (DomBuilderSpace m) -> Unwrapped (ModalsT t m (TextAreaElement er (DomBuilderSpace m) t)))
119+ selectElement = coerce (selectElement :: SelectElementConfig er t (DomBuilderSpace m) -> Unwrapped (ModalsT t m a) -> Unwrapped (ModalsT t m (SelectElement er (DomBuilderSpace m) t, a)))
120+ wrapRawElement e = (view _Unwrapped :: forall a. Unwrapped (ModalsT t m a) -> ModalsT t m a) . wrapRawElement e
121+
122+instance HasDocument m => HasDocument (ModalsT t m)
123+instance HasJSContext m => HasJSContext (ModalsT t m) where
124+ type JSContextPhantom (ModalsT t m) = JSContextPhantom m
125+ askJSContext = ModalsT askJSContext
126+#ifndef ghcjs_HOST_OS
127+instance MonadJSM m => MonadJSM (ModalsT t m)
128+#endif
129+
130+data ModalLayerConfig t m = ModalLayerConfig
131+ { _modalLayerConfig_backdropElementConfig :: ElementConfig EventResult t (DomBuilderSpace m)
132+ , _modalLayerConfig_bodyElementConfig :: ElementConfig EventResult t (DomBuilderSpace m)
133+ }
134+
135+instance (DomBuilder t m) => Default (ModalLayerConfig t m) where
136+ def = ModalLayerConfig
137+ { _modalLayerConfig_backdropElementConfig = (def :: ElementConfig EventResult t (DomBuilderSpace m))
138+ & elementConfig_eventSpec %~ addEventSpecFlags (Proxy :: Proxy (DomBuilderSpace m)) Click (const stopPropagation)
139+ & initialAttributes .~ ("style" =: T.intercalate ";"
140+ [ "position:absolute"
141+ , "left:0", "right:0", "top:0", "bottom:0"
142+ , "background-color:rgba(0,0,0,0.1)"
143+ , "display:flex", "justify-content:center", "align-items:center"
144+ ])
145+ , _modalLayerConfig_bodyElementConfig = (def :: ElementConfig EventResult t (DomBuilderSpace m))
146+ & elementConfig_eventSpec %~ addEventSpecFlags (Proxy :: Proxy (DomBuilderSpace m)) Click (const stopPropagation)
147+ & initialAttributes .~ ("style" =: "background-color:white;opacity:1;padding:1em")
148+ }
149+
150+instance (MonadQuery t q m, Monad m) => MonadQuery t q (ModalsT t m) where
151+ tellQueryIncremental = lift . tellQueryIncremental
152+ askQueryResult = lift askQueryResult
153+ queryIncremental = lift . queryIncremental
154+
155+withModalLayer :: forall t m a. (Reflex t, MonadFix m, DomBuilder t m, MonadHold t m)
156+ => ModalLayerConfig t m
157+ -> ModalsT t m a
158+ -> m a
159+withModalLayer cfg (ModalsT a) = do
160+ rec (result, requests) <- do
161+ runRequesterT a modalDone
162+ modalDone <- modalInner requests cfg
163+ return result
164+
165+modalInner :: forall t m k. (GCompare k, MonadHold t m, MonadFix m, DomBuilder t m)
166+ => Event t (DMap k (Compose (ModalsT t m) (Event t)))
167+ -> ModalLayerConfig t m
168+ -> m (Event t (DMap k Maybe))
169+modalInner rqs' cfg = do
170+ rec let rqs = fmap toInsertionsDMap rqs'
171+ dones = fmap toDeletionsDMap modalDone
172+ (m0, mpatch) <- traverseDMapWithKeyWithAdjust (\_ v -> Compose <$> modalBody cfg v) DMap.empty (rqs <> dones)
173+ modal <- fmap (merge . mapKeyValuePairsMonotonic wrapArgs) . incrementalToDynamic <$> holdIncremental m0 mpatch
174+ let modalDone = fmap (mapKeyValuePairsMonotonic unwrapArgs) $ switch $ current modal
175+ return modalDone
176+ where
177+ wrapArgs (k :=> v) = WrapArg k :=> getCompose v
178+ unwrapArgs :: DSum (WrapArg Maybe k) Identity -> DSum k Maybe
179+ unwrapArgs (WrapArg k :=> Identity v) = k :=> v
180+ toInsertionsDMap :: DMap k v -> PatchDMap k v
181+ toInsertionsDMap = coerce . DMap.map (ComposeMaybe . Just)
182+ toDeletionsDMap :: forall k' v v'. DMap k' v -> PatchDMap k' v'
183+ toDeletionsDMap = coerce . DMap.map (\(_ :: v a) -> ComposeMaybe (Nothing :: Maybe (v' a)))
184+
185+modalBody :: forall t m a. (MonadHold t m, MonadFix m, DomBuilder t m)
186+ => ModalLayerConfig t m
187+ -> Compose (ModalsT t m) (Event t) a
188+ -> m (Event t (Maybe a))
189+modalBody cfg v = do
190+ (overlay, complete) <- element "div" (_modalLayerConfig_backdropElementConfig cfg) $ do
191+ fmap snd $ element "div" (_modalLayerConfig_bodyElementConfig cfg) $ do
192+ rec (rsps, rqs') <- runRequesterT (unModalsT (getCompose v)) innerDone
193+ innerDone <- modalInner rqs' cfg
194+ return rsps
195+ return $ leftmost
196+ [ Just <$> complete
197+ , Nothing <$ domEvent Click overlay
198+ ]
199+-}
reflex-dom-core/src/Reflex/Dom/Old.hs+1
@@ -1,5 +1,6 @@
11{-# LANGUAGE CPP #-}
22{-# LANGUAGE ConstraintKinds #-}
3+{-# LANGUAGE ExplicitForAll #-}
34{-# LANGUAGE FlexibleContexts #-}
45{-# LANGUAGE FlexibleInstances #-}
56{-# LANGUAGE MultiParamTypeClasses #-}
reflex-dom-core/src/Reflex/Dom/Prerender.hs+84−208
@@ -1,60 +1,55 @@
11{-# LANGUAGE ConstraintKinds #-}
2−{-# LANGUAGE CPP #-}
3−{-# LANGUAGE EmptyCase #-}
42{-# LANGUAGE FlexibleContexts #-}
53{-# LANGUAGE FlexibleInstances #-}
64{-# LANGUAGE FunctionalDependencies #-}
7−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
85{-# LANGUAGE LambdaCase #-}
96{-# LANGUAGE OverloadedStrings #-}
7+{-# LANGUAGE MultiParamTypeClasses #-}
108{-# LANGUAGE Rank2Types #-}
11−{-# LANGUAGE RecursiveDo #-}
129{-# LANGUAGE ScopedTypeVariables #-}
1310{-# LANGUAGE TypeFamilies #-}
11+{-# LANGUAGE TypeSynonymInstances #-}
1412{-# LANGUAGE UndecidableInstances #-}
15−{-# LANGUAGE UndecidableSuperClasses #-}
1613
1714-- | Render the first widget on the server, and the second on the client.
1815module Reflex.Dom.Prerender
1916 ( Prerender (..)
17+ , prerender
2018 , prerender_
2119 , PrerenderClientConstraint
2220 , PrerenderBaseConstraints
2321 ) where
2422
25−import Control.Monad.Primitive (PrimMonad(..))
23+import Control.Monad.Primitive (PrimMonad)
2624import Control.Monad.Reader
27−import Control.Monad.Ref (MonadRef(..), MonadAtomicRef(..))
25+import Control.Monad.Ref (MonadRef(..))
26+import Control.Monad.State.Strict
27+import Data.Foldable (traverse_)
2828import Data.IORef (IORef, newIORef)
29−import Data.Semigroup (Semigroup)
3029import Data.Text (Text)
31−import Data.Void
3230import Foreign.JavaScript.TH
3331import GHCJS.DOM.Types (MonadJSM)
3432import Reflex hiding (askEvents)
3533import Reflex.Dom.Builder.Class
36−import Reflex.Dom.Builder.Hydratable
3734import Reflex.Dom.Builder.Immediate
3835import Reflex.Dom.Builder.InputDisabled
3936import Reflex.Dom.Builder.Static
4037import Reflex.Host.Class
41−import Data.IntMap.Strict (IntMap)
42−import qualified Data.IntMap.Strict as IntMap
4338
4439import qualified GHCJS.DOM.Document as Document
4540import qualified GHCJS.DOM.Node as Node
4641import qualified GHCJS.DOM.Types as DOM
4742
48−type PrerenderClientConstraint js t m =
43+type PrerenderClientConstraint t m =
4944 ( DomBuilder t m
5045 , DomBuilderSpace m ~ GhcjsDomSpace
51− , DomRenderHook t m
5246 , HasDocument m
5347 , TriggerEvent t m
54− , PrerenderBaseConstraints js t m
48+ , Prerender t m
49+ , PrerenderBaseConstraints t m
5550 )
5651
57−type PrerenderBaseConstraints js t m =
52+type PrerenderBaseConstraints t m =
5853 ( HasJSContext (Performable m)
5954 , HasJSContext m
6055 , MonadFix m
@@ -70,235 +65,116 @@ type PrerenderBaseConstraints js t m =
7065 , PrimMonad m
7166 , Ref (Performable m) ~ IORef
7267 , Ref m ~ IORef
73− , HasJS js m
74− , HasJS js (Performable m)
7568 )
7669
70+-- | Render the first widget on the server, and the second on the client. The
71+-- hydration builder will run *both* widgets, updating the result dynamic at
72+-- switchover time.
73+prerender
74+ :: (Functor m, Prerender t m)
75+ => m a -> ((PrerenderClientConstraint t (Client m)) => Client m a) -> m (Dynamic t a)
76+prerender server client = snd <$> prerenderImpl ((,) () <$> server) client
77+
7778-- | Render the first widget on the server, and the second on the client. The
7879-- hydration builder will run *both* widgets.
7980prerender_
80− :: (Functor m, Reflex t, Prerender js t m)
81− => m () -> Client m () -> m ()
82−prerender_ server client = void $ prerender server client
81+ :: (Functor m, Reflex t, Prerender t m)
82+ => m () -> ((PrerenderClientConstraint t (Client m)) => Client m ()) -> m ()
83+prerender_ server client = void $ prerenderImpl ((,) () <$> server) client
8384
84−class (PrerenderClientConstraint js t (Client m), Client (Client m) ~ Client m, Prerender js t (Client m)) => Prerender js t m | m -> t js where
85+class Prerender t m | m -> t where
8586 -- | Monad in which the client widget is built
8687 type Client m :: * -> *
87− -- | Render the first widget on the server, and the second on the client. The
88− -- hydration builder will run *both* widgets, updating the result dynamic at
89− -- switchover time.
90− prerender :: m a -> Client m a -> m (Dynamic t a)
88+ -- | This function should be considered internal: it should only be used where
89+ -- the resultant 'Maybe' isn't used to change what is built in the DOM, or
90+ -- hydration will fail.
91+ prerenderImpl :: m (a, b) -> ((PrerenderClientConstraint t (Client m)) => Client m b) -> m (Maybe a, Dynamic t b)
9192
92−instance (ReflexHost t, Adjustable t m, PrerenderBaseConstraints js t m) => Prerender js t (HydrationDomBuilderT GhcjsDomSpace t m) where
93+instance (Adjustable t m, PrerenderBaseConstraints t m) => Prerender t (HydrationDomBuilderT GhcjsDomSpace t m) where
9394 type Client (HydrationDomBuilderT GhcjsDomSpace t m) = HydrationDomBuilderT GhcjsDomSpace t m
94− prerender _ client = pure <$> client
95+ prerenderImpl _ client = (,) Nothing . pure <$> client
9596
96−instance (Adjustable t m, PrerenderBaseConstraints js t m, ReflexHost t) => Prerender js t (HydrationDomBuilderT HydrationDomSpace t m) where
97+instance (Adjustable t m, PrerenderBaseConstraints t m, ReflexHost t) => Prerender t (HydrationDomBuilderT HydrationDomSpace t m) where
9798 -- | PostBuildT is needed here because we delay running the client builder
9899 -- until after switchover, at which point the postBuild of @m@ has already fired
99− type Client (HydrationDomBuilderT HydrationDomSpace t m) = PostBuildT t (HydrationDomBuilderT GhcjsDomSpace t m)
100+ type Client (HydrationDomBuilderT HydrationDomSpace t m) = PostBuildT t (HydrationDomBuilderT GhcjsDomSpace t m) -- PostBuildT t (ImmediateDomBuilderT t m)
100101 -- | Runs the server widget up until switchover, then replaces it with the
101102 -- client widget.
102− prerender server client = do
103+ prerenderImpl server client = do
103104 env <- HydrationDomBuilderT ask
104105 events <- askEvents
105106 doc <- askDocument
106− serverDf <- Document.createDocumentFragment doc -- server dom should not be mounted in the window's doc in hydration
107107 df <- Document.createDocumentFragment doc
108108 unreadyChildren <- HydrationDomBuilderT $ asks _hydrationDomBuilderEnv_unreadyChildren
109− immediateMode <- liftIO $ newIORef HydrationMode_Immediate
109+ hydrationMode <- liftIO $ newIORef HydrationMode_Immediate
110110 delayed <- liftIO $ newIORef $ pure ()
111− let clientEnv = env
112− { _hydrationDomBuilderEnv_parent = Left $ DOM.toNode df
113− , _hydrationDomBuilderEnv_hydrationMode = immediateMode
114− }
115− serverEnv = HydrationDomBuilderEnv
111+ let env' = HydrationDomBuilderEnv
116112 { _hydrationDomBuilderEnv_document = doc
117− , _hydrationDomBuilderEnv_parent = Left $ DOM.toNode serverDf
113+ , _hydrationDomBuilderEnv_parent = Left $ DOM.toNode df
118114 , _hydrationDomBuilderEnv_unreadyChildren = unreadyChildren
119115 , _hydrationDomBuilderEnv_commitAction = pure ()
120116 , _hydrationDomBuilderEnv_delayed = delayed
121− , _hydrationDomBuilderEnv_hydrationMode = immediateMode
117+ , _hydrationDomBuilderEnv_hydrationMode = hydrationMode
122118 , _hydrationDomBuilderEnv_switchover = never
123119 }
124− a0 <- lift $ runHydrationDomBuilderT server serverEnv events
125− (a', trigger) <- newTriggerEvent
120+ (a, b0) <- lift $ runHydrationDomBuilderT server (env { _hydrationDomBuilderEnv_delayed = delayed }) events
121+ (b', trigger) <- newTriggerEvent
126122 getHydrationMode >>= \case
127123 HydrationMode_Immediate -> do
128− liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') clientEnv events
124+ liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void b') env' events
129125 append $ DOM.toNode df
130126 HydrationMode_Hydrating -> addHydrationStep $ do
131− liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void a') clientEnv events
127+ liftIO . trigger <=< lift $ runHydrationDomBuilderT (runPostBuildT client $ void b') env' events
132128 insertBefore df =<< deleteToPrerenderEnd doc
133− holdDyn a0 a'
134−
135−newtype UnrunnableT js t m a = UnrunnableT (ReaderT Void m a)
136− deriving (Functor, Applicative, Monad, MonadTrans)
129+ (,) (Just a) <$> holdDyn b0 b'
137130
138−unrunnable :: UnrunnableT js t m a
139−unrunnable = UnrunnableT $ ReaderT $ \case {}
140−
141−instance (Reflex t, Monad m) => DomBuilder t (UnrunnableT js t m) where
142− type DomBuilderSpace (UnrunnableT js t m) = GhcjsDomSpace
143− textNode _ = unrunnable
144− commentNode _ = unrunnable
145− element _ _ _ = unrunnable
146− inputElement _ = unrunnable
147− textAreaElement _ = unrunnable
148− selectElement _ _ = unrunnable
149− placeRawElement _ = unrunnable
150− wrapRawElement _ _ = unrunnable
151−instance (Reflex t, Monad m) => NotReady t (UnrunnableT js t m) where
152− notReadyUntil _ = unrunnable
153− notReady = unrunnable
154−instance (Reflex t, Monad m) => Adjustable t (UnrunnableT js t m) where
155− runWithReplace _ _ = unrunnable
156− traverseIntMapWithKeyWithAdjust _ _ _ = unrunnable
157− traverseDMapWithKeyWithAdjust _ _ _ = unrunnable
158− traverseDMapWithKeyWithAdjustWithMove _ _ _ = unrunnable
159−instance (Reflex t, Monad m) => PerformEvent t (UnrunnableT js t m) where
160− type Performable (UnrunnableT js t m) = UnrunnableT js t m
161− performEvent _ = unrunnable
162− performEvent_ _ = unrunnable
163−instance Monad m => MonadRef (UnrunnableT js t m) where
164− type Ref (UnrunnableT js t m) = Ref IO
165− newRef _ = unrunnable
166− readRef _ = unrunnable
167− writeRef _ _ = unrunnable
168−instance Monad m => MonadAtomicRef (UnrunnableT js t m) where
169− atomicModifyRef _ _ = unrunnable
170−instance Monad m => HasDocument (UnrunnableT js t m) where
171− askDocument = unrunnable
172−instance Monad m => HasJSContext (UnrunnableT js t m) where
173− type JSContextPhantom (UnrunnableT js t m) = ()
174− askJSContext = unrunnable
175−instance Monad m => HasJS JS' (UnrunnableT js t m) where
176− type JSX (UnrunnableT js t m) = UnrunnableT js t m
177− liftJS _ = unrunnable
178−instance Monad m => MonadJS JS' (UnrunnableT js t m) where
179− runJS _ _ = unrunnable
180− forkJS _ = unrunnable
181− mkJSUndefined = unrunnable
182− isJSNull _ = unrunnable
183− isJSUndefined _ = unrunnable
184− fromJSBool _ = unrunnable
185− fromJSString _ = unrunnable
186− fromJSArray _ = unrunnable
187− fromJSUint8Array _ = unrunnable
188− fromJSNumber _ = unrunnable
189− withJSBool _ _ = unrunnable
190− withJSString _ _ = unrunnable
191− withJSNumber _ _ = unrunnable
192− withJSArray _ _ = unrunnable
193− withJSUint8Array _ _ = unrunnable
194− mkJSFun _ = unrunnable
195− freeJSFun _ = unrunnable
196− setJSProp _ _ _ = unrunnable
197− getJSProp _ _ = unrunnable
198− withJSNode _ _ = unrunnable
199−instance Monad m => TriggerEvent t (UnrunnableT js t m) where
200− newTriggerEvent = unrunnable
201− newTriggerEventWithOnComplete = unrunnable
202− newEventWithLazyTriggerWithOnComplete _ = unrunnable
203−instance Monad m => MonadReflexCreateTrigger t (UnrunnableT js t m) where
204− newEventWithTrigger _ = unrunnable
205− newFanEventWithTrigger _ = unrunnable
206−instance Monad m => MonadFix (UnrunnableT js t m) where
207− mfix _ = unrunnable
208−instance (Monad m, MonadHold t m) => MonadHold t (UnrunnableT js t m) where
209− hold _ _ = unrunnable
210− holdDyn _ _ = unrunnable
211− holdIncremental _ _ = unrunnable
212− buildDynamic _ _ = unrunnable
213− headE _ = unrunnable
214− now = unrunnable
215−instance Monad m => MonadSample t (UnrunnableT js t m) where
216− sample _ = unrunnable
217−instance Monad m => MonadIO (UnrunnableT js t m) where
218− liftIO _ = unrunnable
219−#ifndef ghcjs_HOST_OS
220−instance Monad m => MonadJSM (UnrunnableT js t m) where
221− liftJSM' _ = unrunnable
222−#endif
223−instance (Reflex t, Monad m) => PostBuild t (UnrunnableT js t m) where
224− getPostBuild = unrunnable
225−instance Monad m => PrimMonad (UnrunnableT js t m) where
226− type PrimState (UnrunnableT js t m) = PrimState IO
227− primitive _ = unrunnable
228−instance (Reflex t, Monad m) => DomRenderHook t (UnrunnableT js t m) where
229− withRenderHook _ _ = unrunnable
230− requestDomAction _ = unrunnable
231− requestDomAction_ _ = unrunnable
232−instance (Reflex t, Monad m, MonadHold t m) => Prerender JS' t (UnrunnableT js t m) where
233− type Client (UnrunnableT js t m) = UnrunnableT js t m
234− prerender _ _ = unrunnable
235−
236−instance (SupportsStaticDomBuilder t m) => Prerender JS' t (StaticDomBuilderT t m) where
237− type Client (StaticDomBuilderT t m) = UnrunnableT JS' t m
238− prerender server _ = do
131+instance SupportsStaticDomBuilder t m => Prerender t (StaticDomBuilderT t m) where
132+ type Client (StaticDomBuilderT t m) = HydrationDomBuilderT GhcjsDomSpace t m
133+ prerenderImpl server _ = do
239134 _ <- commentNode $ CommentNodeConfig startMarker Nothing
240− a <- server
135+ (a, b) <- server
241136 _ <- commentNode $ CommentNodeConfig endMarker Nothing
242− pure $ pure a
137+ pure (Just a, pure b)
243138
244−instance (Prerender js t m, Monad m) => Prerender js t (ReaderT r m) where
245− type Client (ReaderT r m) = ReaderT r (Client m)
246− prerender server client = do
139+instance (Prerender t m, Monad m) => Prerender t (ReaderT r m) where
140+ type Client (ReaderT r m) = Client m
141+ prerenderImpl server client = do
247142 r <- ask
248− lift $ prerender (runReaderT server r) (runReaderT client r)
249−
250−instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Monoid w) => Prerender js t (DynamicWriterT t w m) where
251− type Client (DynamicWriterT t w m) = DynamicWriterT t w (Client m)
252− prerender server client = do
253− x <- lift $ prerender (runDynamicWriterT server) (runDynamicWriterT client)
254− let (a, w') = splitDynPure x
255− w = join w'
256− tellDyn w
257− pure a
258−
259−instance (Prerender js t m, Monad m, Reflex t, Semigroup w) => Prerender js t (EventWriterT t w m) where
260− type Client (EventWriterT t w m) = EventWriterT t w (Client m)
261− prerender server client = do
262− x <- lift $ prerender (runEventWriterT server) (runEventWriterT client)
263− let (a, w') = splitDynPure x
264− w = switch $ current w'
265− tellEvent w
266− pure a
267−
268−instance (Prerender js t m, MonadFix m, Reflex t) => Prerender js t (RequesterT t request response m) where
269− type Client (RequesterT t request response m) = RequesterT t request response (Client m)
270− prerender server client = mdo
271− let fannedResponses = fanInt responses
272− withFannedResponses :: forall m' a. Monad m' => RequesterT t request response m' a -> Int -> m' (a, Event t (IntMap (RequesterData request)))
273− withFannedResponses w selector = do
274− (x, e) <- runRequesterT w (selectInt fannedResponses selector)
275− pure (x, fmapCheap (IntMap.singleton selector) e)
276− (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
279−
280−instance (Prerender js t m, Monad m, Reflex t, MonadFix m, Group q, Additive q, Query q, Eq q) => Prerender js t (QueryT t q m) where
281− type Client (QueryT t q m) = QueryT t q (Client m)
282− prerender server client = mdo
283− result <- queryDyn query
284− x <- lift $ prerender (runQueryT server result) (runQueryT client result)
285− let (a, inc) = splitDynPure x
286− query = incrementalToDynamic =<< inc -- Can we avoid the incrementalToDynamic?
287− pure a
288−
289−instance (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
296−
297−instance (Prerender js t m, Monad m, ReflexHost t) => Prerender js t (PostBuildT t m) where
298− type Client (PostBuildT t m) = PostBuildT t (Client m)
299− prerender server client = PostBuildT $ do
300− pb <- ask
301− lift $ prerender (runPostBuildT server pb) (runPostBuildT client pb)
143+ lift $ prerenderImpl (runReaderT server r) client
144+
145+instance (Prerender t m, Monad m, Functor (Client m)) => Prerender t (StateT s m) where
146+ type Client (StateT s m) = Client m
147+ prerenderImpl server client = do
148+ s <- get
149+ (ma, evt) <- lift $ prerenderImpl
150+ (do ((a, b), s') <- runStateT server s; pure ((a, s'), b))
151+ client
152+ traverse_ (put . snd) ma
153+ pure (fst <$> ma, evt)
154+
155+instance (Prerender t m, Monad m, Functor (Client m)) => Prerender t (DynamicWriterT t w m) where
156+ type Client (DynamicWriterT t w m) = Client m
157+ prerenderImpl (DynamicWriterT server) client = DynamicWriterT $ prerenderImpl server client
158+
159+instance (Prerender t m, Monad m, Functor (Client m)) => Prerender t (EventWriterT t w m) where
160+ type Client (EventWriterT t w m) = Client m
161+ prerenderImpl (EventWriterT server) client = EventWriterT $ prerenderImpl server client
162+
163+instance (Prerender t m, Monad m, Functor (Client m)) => Prerender t (RequesterT t request response m) where
164+ type Client (RequesterT t request response m) = Client m
165+ prerenderImpl (RequesterT server) client = RequesterT $ prerenderImpl server client
166+
167+instance (Prerender t m, Monad m, Functor (Client m)) => Prerender t (QueryT t q m) where
168+ type Client (QueryT t q m) = Client m
169+ prerenderImpl (QueryT server) client = QueryT $ prerenderImpl server client
170+
171+instance (Prerender t m, Monad m) => Prerender t (InputDisabledT m) where
172+ type Client (InputDisabledT m) = Client m
173+ prerenderImpl (InputDisabledT server) client = InputDisabledT $ prerenderImpl server client
174+
175+instance (Prerender t m, Monad m) => Prerender t (PostBuildT t m) where
176+ type Client (PostBuildT t m) = Client m
177+ prerenderImpl (PostBuildT server) client = PostBuildT $ prerenderImpl server client
302178
303179startMarker, endMarker :: Text
304180startMarker = "prerender/start"
reflex-dom-core/src/Reflex/Dom/WebSocket.hs+4−12
@@ -55,7 +55,6 @@ import Data.Text
5555import Data.Text.Encoding
5656import Foreign.JavaScript.Utils (jsonDecode)
5757import GHCJS.DOM.Types (runJSM, askJSM, MonadJSM, liftJSM, JSM)
58−import GHCJS.DOM.WebSocket (getReadyState)
5958import GHCJS.Marshal
6059import qualified Language.Javascript.JSaddle.Monad as JS (catch)
6160
@@ -102,7 +101,7 @@ webSocket' url config onRawMessage = do
102101 liftIO $ triggerEClose args
103102 _ <- liftIO $ atomically $ tryTakeTMVar isOpen
104103 liftIO $ writeIORef currentSocketRef Nothing
105− when (_webSocketConfig_reconnect config) $ forkJSM $ do
104+ when (_webSocketConfig_reconnect config) $ do
106105 liftIO $ threadDelay 1000000
107106 start
108107 start = do
@@ -128,11 +127,9 @@ webSocket' url config onRawMessage = do
128127 mws <- liftIO $ readIORef currentSocketRef
129128 success <- case mws of
130129 Nothing -> return False
131− Just ws -> flip runJSM ctx $ do
132− rs <- getReadyState $ unWebSocket ws
133− if rs == 1
134− then (webSocketSend ws payload >> return True) `JS.catch` (\(_ :: SomeException) -> return False)
135− else return False
130+ Just ws -> runJSM ((webSocketSend ws payload >> return True)
131+ `JS.catch`
132+ (\(_ :: SomeException) -> return False)) ctx
136133 unless success $ atomically $ unGetTQueue payloadQueue payload
137134 return $ RawWebSocket eRecv eOpen eError eClose
138135
@@ -144,11 +141,6 @@ jsonWebSocket url cfg = do
144141 ws <- textWebSocket url $ cfg { _webSocketConfig_send = fmap (decodeUtf8 . toStrict . encode) <$> _webSocketConfig_send cfg }
145142 return ws { _webSocket_recv = jsonDecode . textToJSString <$> _webSocket_recv ws }
146143
147−forkJSM :: JSM () -> JSM ()
148−forkJSM a = do
149− jsm <- askJSM
150− void $ liftIO $ forkIO $ runJSM a jsm
151−
152144#ifdef USE_TEMPLATE_HASKELL
153145makeLensesWith (lensRules & simpleLenses .~ True) ''WebSocketConfig
154146makeLensesWith (lensRules & simpleLenses .~ True) ''RawWebSocket
reflex-dom-core/src/Reflex/Dom/WebSocket/Foreign.hs+23−37
@@ -12,6 +12,7 @@ module Reflex.Dom.WebSocket.Foreign
1212
1313import Prelude hiding (all, concat, concatMap, div, mapM, mapM_, sequence, span)
1414
15+import Control.Monad.Reader
1516import Data.Bifoldable
1617import Data.ByteString (ByteString)
1718import qualified Data.ByteString.Lazy as LBS
@@ -19,11 +20,12 @@ import Data.Text (Text)
1920import Data.Text.Encoding
2021import Foreign.JavaScript.Utils (bsFromMutableArrayBuffer, bsToArrayBuffer)
2122import GHCJS.DOM.CloseEvent
23+import GHCJS.DOM.EventM (on)
2224import GHCJS.DOM.MessageEvent
23−import GHCJS.DOM.Types (JSM, JSVal, liftJSM, fromJSValUnchecked, WebSocket(..))
25+import GHCJS.DOM.Types (JSM, JSVal, liftJSM, fromJSValUnchecked)
26+import GHCJS.DOM.WebSocket (WebSocket)
2427import qualified GHCJS.DOM.WebSocket as DOM
2528import GHCJS.Foreign (JSType(..), jsTypeOf)
26−import Language.Javascript.JSaddle (fun, eval, toJSVal, call)
2729import Language.Javascript.JSaddle.Helper (mutableArrayBufferFromJSVal)
2830import Language.Javascript.JSaddle.Types (ghcjsPure)
2931
@@ -62,41 +64,25 @@ newWebSocket
6264 -> ((Bool, Word, Text) -> JSM ()) -- onclose
6365 -> JSM JSWebSocket
6466newWebSocket _ url protocols onMessage onOpen onError onClose = do
65− let onOpenWrapped = fun $ \_ _ _ -> onOpen
66− onErrorWrapped = fun $ \_ _ _ -> onError
67− onCloseWrapped = fun $ \_ _ (e:_) -> do
68− let e' = CloseEvent e
69− wasClean <- getWasClean e'
70− code <- getCode e'
71− reason <- getReason e'
72− liftJSM $ onClose (wasClean, code, reason)
73− onMessageWrapped = fun $ \_ _ (e:_) -> do
74− let e' = MessageEvent e
75− d <- getData e'
76− liftJSM $ ghcjsPure (jsTypeOf d) >>= \case
77− String -> onMessage $ Right d
78− _ -> do
79− ab <- mutableArrayBufferFromJSVal d
80− bsFromMutableArrayBuffer ab >>= onMessage . Left
81− newWS <- eval $ unlines
82− [ "(function(url, protos, open, error, close, message) {"
83− , " var ws = new window['WebSocket'](url, protos);"
84− , " ws['binaryType'] = 'arraybuffer';"
85− , " ws['addEventListener']('open', open);"
86− , " ws['addEventListener']('error', error);"
87− , " ws['addEventListener']('close', close);"
88− , " ws['addEventListener']('message', message);"
89− , " return ws;"
90− , "})"
91− ]
92− url' <- toJSVal url
93− protocols' <- toJSVal protocols
94− onOpen' <- toJSVal onOpenWrapped
95− onError' <- toJSVal onErrorWrapped
96− onClose' <- toJSVal onCloseWrapped
97− onMessage' <- toJSVal onMessageWrapped
98− ws <- call newWS newWS [url', protocols', onOpen', onError', onClose', onMessage']
99− return $ JSWebSocket $ WebSocket ws
67+ ws <- DOM.newWebSocket url protocols
68+ DOM.setBinaryType ws "arraybuffer"
69+ _ <- on ws DOM.open $ liftJSM onOpen
70+ _ <- on ws DOM.error $ liftJSM onError
71+ _ <- on ws DOM.closeEvent $ do
72+ e <- ask
73+ wasClean <- getWasClean e
74+ code <- getCode e
75+ reason <- getReason e
76+ liftJSM $ onClose (wasClean, code, reason)
77+ _ <- on ws DOM.message $ do
78+ e <- ask
79+ d <- getData e
80+ liftJSM $ ghcjsPure (jsTypeOf d) >>= \case
81+ String -> onMessage $ Right d
82+ _ -> do
83+ ab <- mutableArrayBufferFromJSVal d
84+ bsFromMutableArrayBuffer ab >>= onMessage . Left
85+ return $ JSWebSocket ws
10086
10187onBSMessage :: Either ByteString JSVal -> JSM ByteString
10288onBSMessage = either return $ fmap encodeUtf8 . fromJSValUnchecked
reflex-dom-core/src/Reflex/Dom/Widget/Basic.hs+43−33
@@ -10,9 +10,11 @@
1010{-# LANGUAGE ScopedTypeVariables #-}
1111{-# LANGUAGE TypeFamilies #-}
1212module Reflex.Dom.Widget.Basic
13− (
13+ ( partitionMapBySetLT
14+ , ChildResult (..)
15+
1416 -- * Displaying Values
15− text
17+ , text
1618 , dynText
1719 , comment
1820 , dynComment
@@ -57,10 +59,8 @@ module Reflex.Dom.Widget.Basic
5759 , module Data.Map.Misc
5860 , module Reflex.Collection
5961 , module Reflex.Workflow
60− , partitionMapBySetLT
6162 ) where
6263
63−import Reflex.Adjustable.Class
6464import Reflex.Class
6565import Reflex.Collection
6666import Reflex.Dom.Builder.Class
@@ -95,7 +95,6 @@ import Prelude hiding (mapM, mapM_, sequence, sequence_)
9595-- No empty pieces will be included in the output.
9696
9797--TODO: This can probably be done more efficiently by dividing and conquering, re-using the structure of the Set instead of going through the Set linearally
98−{-# DEPRECATED partitionMapBySetLT "This will be removed in future releases." #-}
9998partitionMapBySetLT :: forall k v. Ord k => Set k -> Map k v -> Map (Either k ()) (Map k v)
10099partitionMapBySetLT s m0 = Map.fromDistinctAscList $ go (Set.toAscList s) m0
101100 where go :: [k] -> Map k v -> [(Either k (), Map k v)]
@@ -108,7 +107,8 @@ partitionMapBySetLT s m0 = Map.fromDistinctAscList $ go (Set.toAscList s) m0
108107 then go t geq
109108 else (Left h, lt) : go t geq
110109
111−{-# INLINABLE text #-}
110+newtype ChildResult t k a = ChildResult { unChildResult :: (a, Event t (Map k (Maybe (ChildResult t k a)))) }
111+
112112text :: DomBuilder t m => Text -> m ()
113113text t = void $ textNode $ def & textNodeConfig_initialContents .~ t
114114
@@ -145,73 +145,63 @@ button t = do
145145
146146--TODO: Should this be renamed to 'widgetView' for consistency with 'widgetHold'?
147147-- | 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.
151−-- Note: Often, the type @a@ is an 'Event', in which case the return value is an Event-of-Events that would typically be flattened (via 'switchHold').
152−dyn :: (Adjustable t m, NotReady t m, PostBuild t m) => Dynamic t (m a) -> m (Event t a)
148+-- The returned Event of widget results occurs when the Dynamic does.
149+-- 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 'switchPromptly').
150+dyn :: (DomBuilder t m, PostBuild t m) => Dynamic t (m a) -> m (Event t a)
153151dyn = networkView
154152
155153-- | Like 'dyn' but discards result.
156−dyn_ :: (Adjustable t m, NotReady t m, PostBuild t m) => Dynamic t (m a) -> m ()
154+dyn_ :: (DomBuilder t m, PostBuild t m) => Dynamic t (m a) -> m ()
157155dyn_ = void . dyn
158156
159157-- | Given an initial widget and an Event of widget-creating actions, create a widget that is recreated whenever the Event fires.
160158-- The returned Dynamic of widget results occurs when the Event does.
161−-- Note: Often, the type 'a' is an Event, in which case the return value is a Dynamic-of-Events that would typically be flattened (via 'switchDyn').
162−widgetHold :: (Adjustable t m, MonadHold t m) => m a -> Event t (m a) -> m (Dynamic t a)
159+-- Note: Often, the type 'a' is an Event, in which case the return value is a Dynamic-of-Events that would typically be flattened.
160+widgetHold :: (DomBuilder t m, MonadHold t m) => m a -> Event t (m a) -> m (Dynamic t a)
163161widgetHold = networkHold
164162
165163-- | Like 'widgetHold' but discards result.
166−widgetHold_ :: (Adjustable t m, MonadHold t m) => m a -> Event t (m a) -> m ()
164+widgetHold_ :: (DomBuilder t m, MonadHold t m) => m a -> Event t (m a) -> m ()
167165widgetHold_ z = void . widgetHold z
168166
169167-- | Create a DOM element
170−--
171−-- >>> el "div" (text "Hello World")
168+-- > el "div" (text "Hello World")
172169-- <div>Hello World</div>
173170{-# INLINABLE el #-}
174171el :: forall t m a. DomBuilder t m => Text -> m a -> m a
175172el elementTag child = snd <$> el' elementTag child
176173
177174-- | Create a DOM element with attributes
178−--
179−-- >>> elAttr "a" ("href" =: "https://reflex-frp.org") (text "Reflex-FRP!")
180−-- <a href="https://reflex-frp.org">Reflex-FRP!</a>
175+-- > elAttr "a" ("href" =: "http://google.com") (text "Google!")
176+-- <a href="http://google.com">Google!</a>
181177{-# INLINABLE elAttr #-}
182178elAttr :: forall t m a. DomBuilder t m => Text -> Map Text Text -> m a -> m a
183179elAttr elementTag attrs child = snd <$> elAttr' elementTag attrs child
184180
185181-- | Create a DOM element with classes
186−--
187−-- >>> elClass "div" "row" (return ())
182+-- > elClass "div" "row" (return ())
188183-- <div class="row"></div>
189184{-# INLINABLE elClass #-}
190185elClass :: forall t m a. DomBuilder t m => Text -> Text -> m a -> m a
191186elClass elementTag c child = snd <$> elClass' elementTag c child
192187
193188-- | Create a DOM element with Dynamic Attributes
194−--
195−-- >>> elClass "div" (constDyn ("class" =: "row")) (return ())
189+-- > elClass "div" (constDyn ("class" =: "row")) (return ())
196190-- <div class="row"></div>
197191{-# INLINABLE elDynAttr #-}
198192elDynAttr :: forall t m a. (DomBuilder t m, PostBuild t m) => Text -> Dynamic t (Map Text Text) -> m a -> m a
199193elDynAttr elementTag attrs child = snd <$> elDynAttr' elementTag attrs child
200194
201195-- | Create a DOM element with a Dynamic Class
202−--
203−-- >>> elDynClass "div" (constDyn "row") (return ())
196+-- > elDynClass "div" (constDyn "row") (return ())
204197-- <div class="row"></div>
205198{-# INLINABLE elDynClass #-}
206199elDynClass :: forall t m a. (DomBuilder t m, PostBuild t m) => Text -> Dynamic t Text -> m a -> m a
207200elDynClass elementTag c child = snd <$> elDynClass' elementTag c child
208201
209202-- | Create a DOM element and return the element
210−--
211−-- @
212−-- do (e, _) <- el' "div" (text "Click")
213−-- return $ domEvent Click e
214−-- @
203+-- > do (e, _) <- el' "div" (text "Click")
204+-- > return $ domEvent Click e
215205{-# INLINABLE el' #-}
216206el' :: forall t m a. DomBuilder t m => Text -> m a -> m (Element EventResult (DomBuilderSpace m) t, a)
217207el' elementTag = element elementTag def
@@ -271,6 +261,28 @@ dynamicAttributesToModifyAttributesWithInitial attrs0 d = do
271261 return $ if Map.null p then Nothing else Just p
272262 return modificationsNeeded
273263
264+--------------------------------------------------------------------------------
265+-- Copied and pasted from Reflex.Widget.Class
266+--------------------------------------------------------------------------------
267+
268+{-
269+schedulePostBuild x = performEvent_ . (x <$) =<< getPostBuild
270+
271+elDynHtml' :: DomBuilder t m => Text -> Dynamic t Text -> m (El t)
272+elDynHtml' elementTag html = do
273+ e <- buildEmptyElement elementTag (Map.empty :: Map Text Text)
274+ schedulePostBuild $ setInnerHTML e . Just =<< sample (current html)
275+ performEvent_ $ fmap (setInnerHTML e . Just) $ updated html
276+ wrapElement defaultDomEventHandler e
277+
278+elDynHtmlAttr' :: DomBuilder t m => Text -> Map Text Text -> Dynamic t Text -> m (El t)
279+elDynHtmlAttr' elementTag attrs html = do
280+ e <- buildEmptyElement elementTag attrs
281+ schedulePostBuild $ setInnerHTML e . Just =<< sample (current html)
282+ performEvent_ $ fmap (setInnerHTML e . Just) $ updated html
283+ wrapElement defaultDomEventHandler e
284+-}
285+
274286newtype Link t
275287 = Link { _link_clicked :: Event t ()
276288 }
@@ -294,7 +306,6 @@ dtdd h w = do
294306blank :: forall m. Monad m => m ()
295307blank = return ()
296308
297−-- TODO: Move to an example project.
298309-- | A widget to display a table with static columns and dynamic rows.
299310tableDynAttr :: forall t m r k v. (Ord k, DomBuilder t m, MonadHold t m, PostBuild t m, MonadFix m)
300311 => Text -- ^ Class applied to <table> element
@@ -311,7 +322,6 @@ tableDynAttr klass cols dRows rowAttrs = elAttr "div" (Map.singleton "style" "zo
311322 dAttrs <- rowAttrs k
312323 elDynAttr' "tr" dAttrs $ mapM (\x -> el "td" $ snd x k r) cols)
313324
314−-- TODO: Move to an example project.
315325-- | A widget to construct a tabbed view that shows only one of its child widgets at a time.
316326-- Creates a header bar containing a <ul> with one <li> per child; clicking a <li> displays
317327-- the corresponding child and hides all others.
reflex-dom-core/src/Reflex/Dom/Widget/Input.hs+52−12
@@ -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
@@ -350,10 +346,16 @@ fileInput config = do
350346 & modifyAttributes .~ fmap mapKeysToAttributeName modifyAttrs
351347 & elementConfig_eventSpec . ghcjsEventSpec_filters .~ filters
352348 cfg = (def :: InputElementConfig EventResult t (DomBuilderSpace m)) & inputElementConfig_elementConfig .~ elCfg
353− input <- inputElement cfg
349+ eRaw <- inputElement cfg
350+ let e = _inputElement_raw eRaw
351+ eChange <- wrapDomEvent e (`on` Events.change) $ do
352+ files <- Input.getFilesUnchecked e
353+ len <- FileList.getLength files
354+ mapM (fmap (fromMaybe (error "fileInput: fileList.item returned null")) . FileList.item files) [0 .. len-1]
355+ dValue <- holdDyn [] eChange
354356 return $ FileInput
355− { _fileInput_value = _inputElement_files input
356− , _fileInput_element = _inputElement_raw input
357+ { _fileInput_value = dValue
358+ , _fileInput_element = e
357359 }
358360
359361data Dropdown t k
@@ -437,12 +439,9 @@ dropdown k0 options (DropdownConfig setK attrs) = do
437439 let xs = fmap (\(ix, (k, v)) -> ((ix, k), ((ix, k), v))) $ zip [0::Int ..] $ Map.toList os
438440 in (Map.fromList $ map snd xs, Bimap.fromList $ map fst xs)
439441 modifyAttrs <- dynamicAttributesToModifyAttributes attrs
440− postBuild <- getPostBuild
441− let setSelection = attachPromptlyDynWithMaybe (flip Bimap.lookupR) ixKeys $
442− leftmost [setK, k0 <$ postBuild]
443442 let cfg = def
444443 & selectElementConfig_elementConfig . elementConfig_modifyAttributes .~ fmap mapKeysToAttributeName modifyAttrs
445− & selectElementConfig_setValue .~ fmap (T.pack . show) setSelection
444+ & selectElementConfig_setValue .~ fmap (T.pack . show) (attachPromptlyDynWithMaybe (flip Bimap.lookupR) ixKeys setK)
446445 (eRaw, _) <- selectElement cfg $ listWithKey indexedOptions $ \(ix, k) v -> do
447446 let optionAttrs = fmap (\dk -> "value" =: T.pack (show ix) <> if dk == k then "selected" =: "selected" else mempty) defaultKey
448447 elDynAttr "option" optionAttrs $ dynText v
@@ -629,6 +628,9 @@ instance HasAttributes (FileInputConfig t) where
629628 type Attrs (FileInputConfig t) = Dynamic t (Map Text Text)
630629 attributes = fileInputConfig_attributes
631630
631+class HasSetValue a where
632+ type SetValue a :: *
633+ setValue :: Lens' a (SetValue a)
632634
633635instance HasSetValue (TextAreaConfig t) where
634636 type SetValue (TextAreaConfig t) = Event t Text
@@ -685,3 +687,41 @@ instance HasValue (Dropdown t k) where
685687instance HasValue (Checkbox t) where
686688 type Value (Checkbox t) = Dynamic t Bool
687689 value = _checkbox_value
690+
691+{-
692+type family Controller sm t a where
693+ Controller Edit t a = (a, Event t a) -- Initial value and setter
694+ Controller View t a = Dynamic t a -- Value (always)
695+
696+type family Output sm t a where
697+ Output Edit t a = Dynamic t a -- Value (always)
698+ Output View t a = Event t a -- Requested changes
699+
700+data CheckboxConfig sm t
701+ = CheckboxConfig { _checkbox_input :: Controller sm t Bool
702+ , _checkbox_attributes :: Attributes
703+ }
704+
705+instance Reflex t => Default (CheckboxConfig Edit t) where
706+ def = CheckboxConfig (False, never) mempty
707+
708+data Checkbox sm t
709+ = Checkbox { _checkbox_output :: Output sm t Bool
710+ }
711+
712+data StateMode = Edit | View
713+
714+--TODO: There must be a more generic way to get this witness and allow us to case on the type-level StateMode
715+data StateModeWitness (sm :: StateMode) where
716+ EditWitness :: StateModeWitness Edit
717+ ViewWitness :: StateModeWitness View
718+
719+class HasStateModeWitness (sm :: StateMode) where
720+ stateModeWitness :: StateModeWitness sm
721+
722+instance HasStateModeWitness Edit where
723+ stateModeWitness = EditWitness
724+
725+instance HasStateModeWitness View where
726+ stateModeWitness = ViewWitness
727+-}
reflex-dom-core/src/Reflex/Dom/Widget/Lazy.hs+3−3
@@ -108,7 +108,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu
108108 uniqWindow <- holdUniqDyn window
109109 return (uniqWindow, result)
110110 where
111− toStyleAttr m = "style" =: Map.foldrWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
111+ toStyleAttr m = "style" =: Map.foldWithKey (\k v s -> k <> ":" <> v <> ";" <> s) "" m
112112 mkViewport h = toStyleAttr $ "overflow" =: "auto" <> "position" =: "absolute" <>
113113 "left" =: "0" <> "right" =: "0" <> "height" =: (T.pack (show h) <> "px")
114114 mkContainer h = toStyleAttr $ "position" =: "relative" <> "height" =: (T.pack (show h) <> "px")
@@ -117,7 +117,7 @@ virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBu
117117 "overflow" =: "hidden" <>
118118 "position" =: "relative"
119119 mkRow k = toStyleAttr $ "height" =: (T.pack (show rowPx) <> "px") <>
120− "top" =: (<> "px") (T.pack $ show $ keyToIndex k * rowPx) <>
120+ "top" =: ((<>"px") $ T.pack $ show $ keyToIndex k * rowPx) <>
121121 "position" =: "absolute" <>
122122 "width" =: "100%"
123123 findWindow sizeIncrement windowSize startingPosition =
@@ -142,7 +142,7 @@ virtualListBuffered buffer heightPx rowPx maxIndex i0 setI keyToIndex items0 ite
142142 (win, m) <- virtualList heightPx rowPx maxIndex i0 setI keyToIndex items0 itemsUpdate itemBuilder
143143 pb <- getPostBuild
144144 let extendWin o l = (max 0 (o - l * (buffer-1) `div` 2), l * buffer)
145− rec let winHitEdge = attachWithMaybe (\(oldOffset, oldLimit) (winOffset, winLimit) ->
145+ rec let winHitEdge = fmapMaybe id $ attachWith (\(oldOffset, oldLimit) (winOffset, winLimit) ->
146146 if winOffset > oldOffset && winOffset + winLimit < oldOffset + oldLimit
147147 then Nothing
148148 else Just (extendWin winOffset winLimit)) (current winBuffered) (updated win)
reflex-dom-core/src/Reflex/Dom/Widget/Resize.hs+5−9
@@ -32,24 +32,20 @@ import GHCJS.DOM.HTMLElement (getOffsetWidth, getOffsetHeight)
3232import qualified GHCJS.DOM.Types as DOM
3333
3434-- | A widget that wraps the given widget in a div and fires an event when resized.
35−-- Adapted from @github.com\/marcj\/css-element-queries@
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)
35+-- Adapted from github.com/marcj/css-element-queries
36+resizeDetector :: (MonadJSM m, DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadJSM (Performable m), MonadFix m) => m a -> m (Event t (), a)
4137resizeDetector = resizeDetectorWithStyle ""
4238
4339resizeDetectorWithStyle :: (MonadJSM m, DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadJSM (Performable m), MonadFix m)
4440 => Text -- ^ A css style string. Warning: It should not contain the "position" style attribute.
4541 -> m a -- ^ The embedded widget
46− -> m (Event t (Maybe Double, Maybe Double), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget
42+ -> m (Event t (), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget
4743resizeDetectorWithStyle styleString = resizeDetectorWithAttrs ("style" =: styleString)
4844
4945resizeDetectorWithAttrs :: (MonadJSM m, DomBuilder t m, PostBuild t m, TriggerEvent t m, PerformEvent t m, MonadHold t m, DomBuilderSpace m ~ GhcjsDomSpace, MonadJSM (Performable m), MonadFix m)
5046 => Map Text Text -- ^ A map of attributes. Warning: It should not modify the "position" style attribute.
5147 -> m a -- ^ The embedded widget
52− -> m (Event t (Maybe Double, Maybe Double), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget
48+ -> m (Event t (), a) -- ^ An 'Event' that fires on resize, and the result of the embedded widget
5349resizeDetectorWithAttrs attrs w = do
5450 let childStyle = "position: absolute; left: 0; top: 0;"
5551 containerAttrs = "style" =: "position: absolute; left: 0; top: 0; right: 0; bottom: 0; overflow: scroll; z-index: -1; visibility: hidden;"
@@ -91,4 +87,4 @@ resizeDetectorWithAttrs attrs w = do
9187 size0 <- performEvent $ fmap (const $ liftJSM reset) pb
9288 rec resize <- performEventAsync $ fmap (\d cb -> (liftIO . cb) =<< liftJSM (resetIfChanged d)) $ tag (current dimensions) $ leftmost [expandScroll, shrinkScroll]
9389 dimensions <- holdDyn (Nothing, Nothing) $ leftmost [ size0, fmapMaybe id resize ]
94− return (updated dimensions, w')
90+ return (fmapMaybe void resize, w')
reflex-dom-core/src/Reflex/Dom/Xhr.hs+6−8
@@ -159,8 +159,6 @@ import Data.Aeson.Text
159159import Data.Aeson.Encode
160160#endif
161161import qualified Data.ByteString.Lazy as BL
162−import Data.CaseInsensitive (CI)
163−import qualified Data.CaseInsensitive as CI
164162import Data.Default
165163import qualified Data.List as L
166164import Data.Map (Map)
@@ -200,12 +198,12 @@ data XhrResponse
200198 , _xhrResponse_statusText :: Text
201199 , _xhrResponse_response :: Maybe XhrResponseBody
202200 , _xhrResponse_responseText :: Maybe Text
203− , _xhrResponse_headers :: Map (CI Text) Text
201+ , _xhrResponse_headers :: Map Text Text
204202 }
205203 deriving (Typeable)
206204
207205data XhrResponseHeaders =
208− OnlyHeaders (Set.Set (CI Text)) -- ^ Parse a subset of headers from the XHR Response
206+ OnlyHeaders (Set.Set Text) -- ^ Parse a subset of headers from the XHR Response
209207 | AllHeaders -- ^ Parse all headers from the XHR Response
210208 deriving (Show, Read, Eq, Ord, Typeable)
211209
@@ -277,7 +275,7 @@ newXMLHttpRequestWithError req cb = do
277275 AllHeaders -> parseAllHeadersString <$>
278276 xmlHttpRequestGetAllResponseHeaders xhr
279277 OnlyHeaders xs -> traverse (xmlHttpRequestGetResponseHeader xhr)
280− (Map.fromSet CI.original xs)
278+ (Map.fromSet id xs)
281279 _ <- liftJSM $ cb $ Right
282280 XhrResponse { _xhrResponse_status = status
283281 , _xhrResponse_statusText = statusText
@@ -290,10 +288,10 @@ newXMLHttpRequestWithError req cb = do
290288 return ()
291289 return xhr
292290
293−parseAllHeadersString :: Text -> Map (CI Text) Text
291+parseAllHeadersString :: Text -> Map Text Text
294292parseAllHeadersString s = Map.fromList $ fmap (stripBoth . T.span (/=':')) $
295293 L.dropWhileEnd T.null $ T.splitOn (T.pack "\r\n") s
296− where stripBoth (txt1, txt2) = (CI.mk $ T.strip txt1, T.strip $ T.drop 1 txt2)
294+ where stripBoth (txt1, txt2) = (T.strip txt1, T.strip $ T.drop 1 txt2)
297295
298296newXMLHttpRequest :: (HasJSContext m, MonadJSM m, IsXhrPayload a) => XhrRequest a -> (XhrResponse -> JSM ()) -> m XMLHttpRequest
299297newXMLHttpRequest req cb = newXMLHttpRequestWithError req $ mapM_ cb
@@ -446,7 +444,7 @@ xhrResponse_responseText :: Lens' XhrResponse (Maybe Text)
446444xhrResponse_responseText f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 y x5) <$> f x4
447445{-# INLINE xhrResponse_responseText #-}
448446
449−xhrResponse_headers :: Lens' XhrResponse (Map (CI Text) Text)
447+xhrResponse_headers :: Lens' XhrResponse (Map Text Text)
450448xhrResponse_headers f (XhrResponse x1 x2 x3 x4 x5) = (\y -> XhrResponse x1 x2 x3 x4 y) <$> f x5
451449{-# INLINE xhrResponse_headers #-}
452450
reflex-dom-core/src/Reflex/Dom/Xhr/Foreign.hs+3−2
@@ -1,6 +1,7 @@
11{-# LANGUAGE FlexibleInstances #-}
22{-# LANGUAGE JavaScriptFFI #-}
33{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE TypeSynonymInstances #-}
45
56module Reflex.Dom.Xhr.Foreign (
67 XMLHttpRequest
@@ -15,7 +16,7 @@ import Data.Text (Text)
1516import Data.ByteString (ByteString)
1617import Foreign.JavaScript.Utils (bsFromMutableArrayBuffer, bsToArrayBuffer)
1718import GHCJS.DOM.Enums
18−import GHCJS.DOM.EventM (EventM, on, onSync)
19+import GHCJS.DOM.EventM (EventM, on)
1920import GHCJS.DOM.EventTarget (dispatchEvent)
2021import GHCJS.DOM.Types (MonadJSM, ToJSString, FormData, Document, Blob (..), ArrayBuffer (..), JSVal, JSM, IsEvent, XMLHttpRequestProgressEvent, ProgressEvent, Event, XMLHttpRequestUpload, FromJSString, ArrayBufferView (..), liftJSM, castTo)
2122import GHCJS.DOM.XMLHttpRequest
@@ -114,7 +115,7 @@ xmlHttpRequestOntimeout :: XMLHttpRequest -> EventM XMLHttpRequest ProgressEvent
114115xmlHttpRequestOntimeout = (`on` timeout)
115116
116117xmlHttpRequestOnreadystatechange :: XMLHttpRequest -> EventM XMLHttpRequest Event () -> JSM (JSM ())
117−xmlHttpRequestOnreadystatechange = (`onSync` readyStateChange)
118+xmlHttpRequestOnreadystatechange = (`on` readyStateChange)
118119
119120xmlHttpRequestSetTimeout :: MonadJSM m => XMLHttpRequest -> Word -> m ()
120121xmlHttpRequestSetTimeout = setTimeout
reflex-dom-core/src/Reflex/Dom/Xhr/FormData.hsdeleted−47
@@ -1,47 +0,0 @@
1−{-# LANGUAGE FlexibleContexts #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−module Reflex.Dom.Xhr.FormData
4− ( postForms
5− , FormValue (..)
6− , fileToFormValue
7− )
8− where
9−
10−import Control.Lens
11−import Data.Default
12−import Data.Map (Map)
13−import Data.Text (Text)
14−import Data.Traversable
15−import qualified GHCJS.DOM.FormData as FD
16−import Foreign.JavaScript.TH
17−import GHCJS.DOM.File (getName)
18−import GHCJS.DOM.Types (File, IsBlob)
19−import Language.Javascript.JSaddle.Monad (MonadJSM, liftJSM)
20−import Reflex
21−import Reflex.Dom.Xhr
22−
23−-- | A FormData value may be a blob/file or a string. The file can optionally be provided with filename.
24−data FormValue blob = FormValue_Text Text
25− | FormValue_File blob (Maybe Text) -- maybe filename
26−
27−-- | Performs a POST request with the provided FormData payload
28−postForms
29− :: ( IsBlob blob, HasJSContext (Performable m), MonadJSM (Performable m)
30− , PerformEvent t m, TriggerEvent t m
31− , Traversable f)
32− => Text -- ^ The target url
33− -> Event t (f (Map Text (FormValue blob))) -- ^ Maps of text keys and values that will be sent as "FormData"
34− -> m (Event t (f XhrResponse))
35−postForms url payload = do
36− performMkRequestsAsync $ ffor payload $ \fs -> for fs $ \u -> liftJSM $ do
37− fd <- FD.newFormData Nothing
38− iforM_ u $ \k v -> case v of
39− FormValue_Text t -> FD.append fd k t
40− FormValue_File b fn -> FD.appendBlob fd k b fn
41− return $ xhrRequest "POST" url $ def & xhrRequestConfig_sendData .~ fd
42−
43−-- | Converts a File (e.g., the output of a 'FileInput') into a 'FormValue'. The filename will be included if it is available.
44−fileToFormValue :: MonadJSM m => File -> m (FormValue File)
45−fileToFormValue f = do
46− fn <- getName f
47− return $ FormValue_File f $ Just fn
reflex-dom-core/test/gc.hs+11−12
@@ -8,17 +8,16 @@ import Control.Exception
88import Control.Monad
99import Control.Monad.IO.Class
1010import Data.Int
11−import Data.Text as T
1211import Language.Javascript.JSaddle.Warp
1312import Reflex.Dom.Core
1413import Reflex.Time
1514import System.Exit
15+import System.IO.Temp
16+import System.Linux.Namespaces
1617import System.Mem
18+import System.Posix
1719import System.Process
1820
19−import Test.Util.ChromeFlags
20−import Test.Util.UnshareNetwork
21−
2221#if MIN_VERSION_base(4,11,0)
2322import GHC.Stats (getRTSStatsEnabled, getRTSStats, RTSStats(..), gcdetails_live_bytes, gc)
2423currentBytesUsed :: RTSStats -> Int64
@@ -47,14 +46,14 @@ failureLimit = 0
4746
4847main :: IO ()
4948main = do
50− handle (\(_ :: IOError) -> return ()) $ unshareNetwork -- If we run into an exception with sandboxing, just don't bother
51− withSandboxedChromeFlags True $ \chromeFlags -> do
52− mainThread <- myThreadId
53− browserProcess <- spawnCommand $ mconcat
54− [ "echo 'Starting Chromium' ; chromium "
55− , unpack $ T.unwords chromeFlags
56− , " http://localhost:3911 ; echo 'Chromium exited'"
57− ]
49+ uid <- getEffectiveUserID
50+ handle (\(_ :: IOError) -> return ()) $ do -- If we run into an exception with sandboxing, just don't bother
51+ unshare [User, Network]
52+ writeUserMappings Nothing [UserMapping 0 uid 1]
53+ callCommand "ip link set lo up ; ip addr"
54+ mainThread <- myThreadId
55+ withSystemTempDirectory "reflex-dom-core_test_gc" $ \tmp -> do
56+ browserProcess <- spawnCommand $ "echo 'Starting Chromium' ; chromium --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 --user-data-dir=" ++ tmp ++ " http://localhost:3911 ; echo 'Chromium exited'"
5857 let finishTest result = do
5958 interruptProcessGroupOf browserProcess
6059 throwTo mainThread result
reflex-dom-core/test/hlint.hs+1−3
@@ -1,4 +1,4 @@
1−import Language.Haskell.HLint (hlint)
1+import Language.Haskell.HLint3 (hlint)
22import System.Exit (exitFailure, exitSuccess)
33
44main :: IO ()
@@ -16,11 +16,9 @@ main = do
1616 , "--ignore=Use unless"
1717 , "--ignore=Use if"
1818 , "--ignore=Use fewer imports"
19− , "--ignore=Use list comprehension"
2019 , "--ignore=Unnecessary hiding" -- Interferes with cross-version compatibility
2120 , "--ignore=Use <$>"
2221 , "--ignore=Reduce duplication" --TODO: Re-enable this test
23− , "--ignore=Use list comprehension"
2422 , "--cpp-define=USE_TEMPLATE_HASKELL"
2523 ]
2624 if null ideas then exitSuccess else exitFailure
reflex-dom-core/test/hydration.hs+473−848
@@ -1,54 +1,39 @@
11{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE StandaloneDeriving #-}
3+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4+{-# LANGUAGE UndecidableInstances #-}
25{-# LANGUAGE ConstraintKinds #-}
6+{-# LANGUAGE CPP #-}
37{-# LANGUAGE FlexibleContexts #-}
4−{-# LANGUAGE FlexibleInstances #-}
58{-# LANGUAGE GADTs #-}
6−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
79{-# LANGUAGE LambdaCase #-}
810{-# LANGUAGE MultiParamTypeClasses #-}
911{-# LANGUAGE OverloadedStrings #-}
10−{-# LANGUAGE PolyKinds #-}
1112{-# LANGUAGE RankNTypes #-}
1213{-# LANGUAGE RecursiveDo #-}
1314{-# LANGUAGE ScopedTypeVariables #-}
14−{-# LANGUAGE StandaloneDeriving #-}
1515{-# LANGUAGE TemplateHaskell #-}
1616{-# LANGUAGE TupleSections #-}
1717{-# LANGUAGE TypeApplications #-}
1818{-# 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.
3019
31−import Prelude hiding (fail)
3220import Control.Concurrent
33−import qualified Control.Concurrent.Async as Async
34−import Control.Lens.Operators
35−import Control.Monad hiding (fail)
21+import Control.Monad
3622import Control.Monad.Catch
37−import Control.Monad.Fail
3823import Control.Monad.Fix
3924import Control.Monad.IO.Class
4025import Control.Monad.Ref
26+import Data.Constraint (Dict(..))
4127import Data.Constraint.Extras
42−import Data.Constraint.Extras.TH
4328import Data.Dependent.Map (DMap)
44−import Data.Dependent.Sum (DSum(..), (==>))
29+import Data.Dependent.Sum (DSum(..), (==>), EqTag(..), ShowTag(..))
30+import Data.Foldable (traverse_)
4531import Data.Functor.Identity
4632import Data.Functor.Misc
4733import Data.GADT.Compare.TH
4834import Data.GADT.Show.TH
4935import Data.IORef (IORef)
50−import Data.List (sort)
51−import Data.Maybe
36+import Data.Maybe (fromMaybe, fromJust)
5237import Data.Proxy
5338import Data.Text (Text)
5439import Language.Javascript.JSaddle (syncPoint, liftJSM)
@@ -58,22 +43,18 @@ import Network.Socket
5843import Network.Wai
5944import Network.WebSockets
6045import Reflex.Dom.Core
61−import Reflex.Dom.Widget.Input (dropdown)
6246import Reflex.Patch.DMapWithMove
6347import System.Directory
64−import System.Environment
6548import System.IO (stderr)
6649import System.IO.Silently
6750import System.IO.Temp
6851import System.Process
69−import System.Which (staticWhich)
70−import qualified Test.HUnit as HUnit
52+import System.Timeout.Lifted
53+import qualified Test.HUnit as HUnit (assertEqual, assertFailure)
7154import qualified Test.Hspec as H
72−import qualified Test.Hspec.Core.Spec as H
73−import Test.Hspec (xit)
74−import Test.Hspec.WebDriver hiding (runWD, click, uploadFile, WD)
55+import Test.Hspec.WebDriver hiding (runWD)
7556import qualified Test.Hspec.WebDriver as WD
76−import Test.WebDriver (WD(..))
57+import Test.WebDriver (WD)
7758
7859import qualified Data.ByteString.Lazy as LBS
7960import qualified Data.Dependent.Map as DMap
@@ -86,37 +67,20 @@ import qualified System.FilePath as FilePath
8667import qualified Test.WebDriver as WD
8768import qualified Test.WebDriver.Capabilities as WD
8869
89−import Test.Util.ChromeFlags
90−import Test.Util.UnshareNetwork
91−
92−-- ORPHAN: https://github.com/kallisti-dev/hs-webdriver/pull/167
93−deriving instance MonadMask WD
94−
95−chromium :: FilePath
96−chromium = $(staticWhich "chromium")
97−
98−seleniumPort, jsaddlePort :: PortNumber
99−seleniumPort = 8000
100−jsaddlePort = 8001
101−
10270-- TODO Remove orphan
103−instance MonadRef WD where
104− type Ref WD = Ref IO
105− newRef = WD . newRef
106− readRef = WD . readRef
107− writeRef r = WD . writeRef r
71+deriving instance MonadRef WD
10872
10973assertEqual :: (MonadIO m, Eq a, Show a) => String -> a -> a -> m ()
110−assertEqual msg a b = liftIO $ HUnit.assertEqual msg a b
74+assertEqual a b = liftIO . HUnit.assertEqual a b
11175
11276assertFailure :: MonadIO m => String -> m ()
11377assertFailure = liftIO . HUnit.assertFailure
11478
115−assertBool :: (MonadIO m) => String -> Bool -> m ()
116−assertBool msg bool = liftIO $ HUnit.assertBool msg bool
79+testTimeLimit :: Int
80+testTimeLimit = 5 * 1000 * 1000
11781
118−chromeConfig :: Text -> [Text] -> WD.WDConfig
119−chromeConfig fp flags = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags }) WD.defaultConfig
82+chromeConfig :: Text -> WD.WDConfig
83+chromeConfig fp = WD.useBrowser (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = ["--headless"] }) WD.defaultConfig
12084
12185keyMap :: DMap DKey Identity
12286keyMap = DMap.fromList
@@ -129,6 +93,14 @@ data DKey a where
12993 Key_Char :: DKey Char
13094 Key_Bool :: DKey Bool
13195
96+instance ArgDict DKey where
97+ type ConstraintsFor DKey c = (c Int, c Char, c Bool)
98+ type ConstraintsFor' DKey c g = (c (g Int), c (g Char), c (g Bool))
99+ argDict = \case
100+ Key_Int -> Dict
101+ Key_Char -> Dict
102+ Key_Bool -> Dict
103+ argDict' = undefined -- Missing constraints?
132104
133105textKey :: DKey a -> Text
134106textKey = \case
@@ -136,43 +108,34 @@ textKey = \case
136108 Key_Char -> "Key_Char"
137109 Key_Bool -> "Key_Bool"
138110
139−deriveArgDict ''DKey
140111deriveGEq ''DKey
141112deriveGCompare ''DKey
142113deriveGShow ''DKey
143114
144−deriving instance MonadFail WD
115+instance ShowTag DKey Identity where
116+ showTaggedPrec = \case
117+ Key_Int -> showsPrec
118+ Key_Char -> showsPrec
119+ Key_Bool -> showsPrec
120+
121+instance EqTag DKey Identity where
122+ eqTagged Key_Int Key_Int = (==)
123+ eqTagged Key_Char Key_Char = (==)
124+ eqTagged Key_Bool Key_Bool = (==)
145125
146126main :: IO ()
147−main = do
148− unshareNetwork
149− isHeadless <- (== Nothing) <$> lookupEnv "NO_HEADLESS"
150− withSandboxedChromeFlags isHeadless $ \chromeFlags -> do
151− withSeleniumServer $ \selenium -> do
152− let browserPath = T.strip $ T.pack chromium
153− when (T.null browserPath) $ fail "No browser found"
154− withDebugging <- isNothing <$> lookupEnv "NO_DEBUG"
155− let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
156− chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
157− hspec (tests withDebugging wdConfig [(chromeCaps', "chrome")] selenium) `finally` _selenium_stopServer selenium
127+main = withSeleniumServer $ \selenium -> do
128+ browserPath <- liftIO $ T.strip . T.pack <$> readProcess "which" [ "chromium" ] ""
129+ when (T.null browserPath) $ fail "No browser found"
130+ let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _selenium_portNumber selenium }
131+ chromeCaps' = WD.getCaps $ chromeConfig browserPath
132+ hspec (tests wdConfig [chromeCaps'] selenium) `finally` _selenium_stopServer selenium
158133
159−tests :: Bool -> WD.WDConfig -> [(Capabilities, String)] -> Selenium -> Spec
160−tests withDebugging wdConfig caps _selenium = do
161− let putStrLnDebug :: MonadIO m => Text -> m ()
162− putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
163− session' t = sessionWith wdConfig t . using caps
164− runWD m = runWDOptions (WdOptions False) $ do
165− putStrLnDebug "before"
166− r <- m
167− putStrLnDebug "after"
168− return r
169− testWidgetStatic :: WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
170− testWidgetStatic = testWidgetStaticDebug withDebugging
171− testWidget :: WD () -> WD b -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
172− testWidget = testWidgetDebug True withDebugging
173− testWidget' :: WD a -> (a -> WD b) -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> WD b
174− testWidget' = testWidgetDebug' True withDebugging
175− session' "text" $ do
134+tests :: WD.WDConfig -> [Capabilities] -> Selenium -> Spec
135+tests wdConfig caps _selenium = do
136+ let session' = sessionWith wdConfig "" . using (map (,"") caps)
137+ runWD = runWDOptions (WdOptions False)
138+ describe "text" $ session' $ do
176139 it "works" $ runWD $ do
177140 testWidgetStatic (checkBodyText "hello world") $ do
178141 text "hello world"
@@ -227,25 +190,27 @@ tests withDebugging wdConfig caps _selenium = do
227190 it "updates in immediate mode" $ runWD $ do
228191 let checkUpdated = do
229192 checkBodyText "initial"
230− WD.click =<< findElemWithRetry (WD.ByTag "button")
193+ WD.click =<< WD.findElem (WD.ByTag "button")
194+ liftIO $ threadDelay 100000 -- wait for update
231195 checkBodyText "after"
232196 testWidget (pure ()) checkUpdated $ prerender_ (pure ()) $ do
233197 click <- button ""
234198 void $ textNode $ TextNodeConfig "initial" $ Just $ "after" <$ click
235199
236− session' "element" $ do
200+ describe "element" $ session' $ do
237201 it "works with domEvent Click" $ runWD $ do
238202 clickedRef <- liftIO $ newRef False
239− testWidget' (findElemWithRetry $ WD.ByTag "div") WD.click $ do
203+ testWidget' (WD.findElem $ WD.ByTag "div") WD.click $ do
240204 (e, _) <- el' "div" $ text "hello world"
241205 performEvent_ $ liftIO (writeRef clickedRef True) <$ domEvent Click e
242− readRef clickedRef `shouldBeWithRetryM` True
206+ clicked <- liftIO $ readRef clickedRef
207+ liftIO $ assertEqual "Not clicked" True clicked
243208 it "works with eventFlags stopPropagation" $ runWD $ do
244209 firstClickedRef <- newRef False
245210 secondClickedRef <- newRef False
246211 let clickBoth = do
247− findElemWithRetry (WD.ById "first") >>= WD.click
248− findElemWithRetry (WD.ById "second") >>= WD.click
212+ WD.findElem (WD.ById "first") >>= WD.click
213+ WD.findElem (WD.ById "second") >>= WD.click
249214 testWidget (pure ()) clickBoth $ do
250215 (firstDivEl, _) <- el' "div" $ prerender_ (pure ()) $ do
251216 void $ elAttr "span" ("id" =: "first") $ text "hello world"
@@ -262,7 +227,7 @@ tests withDebugging wdConfig caps _selenium = do
262227 assertEqual "Click propagated when it should have stopped" (True, False) (firstClicked, secondClicked)
263228 it "works with eventFlags preventDefault" $ runWD $ do
264229 let click = do
265− e <- findElemWithRetry $ WD.ByTag "input"
230+ e <- WD.findElem $ WD.ByTag "input"
266231 s0 <- WD.isSelected e
267232 WD.click e
268233 s1 <- WD.isSelected e
@@ -276,7 +241,7 @@ tests withDebugging wdConfig caps _selenium = do
276241 assertEqual "Click not prevented" (False, False) clicked
277242 it "can add/update/remove attributes" $ runWD $ do
278243 let checkInitialAttrs = do
279− e <- findElemWithRetry $ WD.ByTag "div"
244+ e <- WD.findElem $ WD.ByTag "div"
280245 assertAttr e "const" (Just "const")
281246 assertAttr e "delete" (Just "delete")
282247 assertAttr e "init" (Just "init")
@@ -284,11 +249,11 @@ tests withDebugging wdConfig caps _selenium = do
284249 pure e
285250 checkModifyAttrs e = do
286251 WD.click e
287− withRetry $ do
288− assertAttr e "const" (Just "const")
289− assertAttr e "delete" Nothing
290− assertAttr e "init" (Just "click")
291− assertAttr e "click" (Just "click")
252+ liftIO $ threadDelay 100000
253+ assertAttr e "const" (Just "const")
254+ assertAttr e "delete" Nothing
255+ assertAttr e "init" (Just "click")
256+ assertAttr e "click" (Just "click")
292257 testWidget' checkInitialAttrs checkModifyAttrs $ mdo
293258 let conf = def
294259 & initialAttributes .~ "const" =: "const" <> "delete" =: "delete" <> "init" =: "init"
@@ -296,87 +261,40 @@ tests withDebugging wdConfig caps _selenium = do
296261 (e, ()) <- element "div" conf $ text "hello world"
297262 let click = domEvent Click e
298263 return ()
264+ -- TODO check this is the correct solution
265+ it "has ssr attribute, removes ssr attribute" $ runWD $ do
266+ let checkSSRAttr = do
267+ e <- WD.findElem $ WD.ByTag "div"
268+ assertAttr e "data-ssr" (Just "")
269+ pure e
270+ testWidget' checkSSRAttr (\e -> assertAttr e "data-ssr" Nothing) $ el "div" $ text "hello world"
299271
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
272+ describe "inputElement" $ do
273+ describe "hydration" $ session' $ do
359274 it "doesn't wipe user input when switching over" $ runWD $ do
360− inputRef <- newRef ("hello " :: Text)
275+ inputRef <- newRef ("" :: Text)
361276 testWidget'
362277 (do
363− e <- findElemWithRetry $ WD.ByTag "input"
364− WD.sendKeys "world" e
278+ e <- WD.findElem $ WD.ByTag "input"
279+ WD.sendKeys "hello world" e
365280 pure e)
366281 (\e -> do
367− WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
368− WD.click =<< findElemWithRetry (WD.ByTag "button")
369− readRef inputRef `shouldBeWithRetryM` "hello world"
282+ t <- WD.attr e "value"
283+ t `shouldBe` Just "hello world"
284+ WD.click <=< WD.findElem $ WD.ByTag "button"
285+ input <- liftIO $ readRef inputRef
286+ input `shouldBe` "hello world"
370287 ) $ do
371− e <- inputElement $ def & inputElementConfig_initialValue .~ "hello "
288+ e <- inputElement def
372289 click <- button "save"
373290 performEvent_ $ liftIO . writeRef inputRef <$> tag (current (value e)) click
374291 it "captures user input after switchover" $ runWD $ do
375292 inputRef <- newRef ("" :: Text)
376293 let checkValue = do
377− WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
378− WD.click =<< findElemWithRetry (WD.ByTag "button")
379− readRef inputRef `shouldBeWithRetryM` "hello world"
294+ WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "input"
295+ WD.click <=< WD.findElem $ WD.ByTag "button"
296+ input <- liftIO $ readRef inputRef
297+ input `shouldBe` "hello world"
380298 testWidget (pure ()) checkValue $ do
381299 e <- inputElement def
382300 click <- button "save"
@@ -384,21 +302,23 @@ tests withDebugging wdConfig caps _selenium = do
384302 it "sets focus appropriately" $ runWD $ do
385303 focusRef <- newRef False
386304 let checkValue = do
387− readRef focusRef `shouldBeWithRetryM` False
388− e <- findElemWithRetry $ WD.ByTag "input"
305+ readRef focusRef >>= flip shouldBe False
306+ e <- WD.findElem $ WD.ByTag "input"
389307 WD.click e
390− readRef focusRef `shouldBeWithRetryM` True
308+ liftIO $ threadDelay 100000
309+ readRef focusRef >>= flip shouldBe True
391310 testWidget (pure ()) checkValue $ do
392311 e <- inputElement def
393312 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
394313 it "sets focus when focus occurs before hydration" $ runWD $ do
395314 focusRef <- newRef False
396315 let setup = do
397− e <- findElemWithRetry $ WD.ByTag "input"
316+ e <- WD.findElem $ WD.ByTag "input"
398317 WD.click e
399− ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
400− readRef focusRef `shouldBeWithRetryM` False
401− check = readRef focusRef `shouldBeWithRetryM` True
318+ hasFocus <- (== e) <$> WD.activeElem
319+ hasFocus `shouldBe` True
320+ readRef focusRef >>= flip shouldBe False
321+ check = readRef focusRef >>= flip shouldBe True
402322 testWidget setup check $ do
403323 e <- inputElement def
404324 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
@@ -407,15 +327,17 @@ tests withDebugging wdConfig caps _selenium = do
407327 valueRef <- newRef ("" :: Text)
408328 setValueChan :: Chan Text <- liftIO newChan
409329 let checkValue = do
410− readRef valueByUIRef `shouldBeWithRetryM` ""
411− readRef valueRef `shouldBeWithRetryM` ""
412− e <- findElemWithRetry $ WD.ByTag "input"
330+ readRef valueByUIRef >>= flip shouldBe ""
331+ readRef valueRef >>= flip shouldBe ""
332+ e <- WD.findElem $ WD.ByTag "input"
413333 WD.sendKeys "hello" e
414− readRef valueByUIRef `shouldBeWithRetryM` "hello"
415− readRef valueRef `shouldBeWithRetryM` "hello"
334+ liftIO $ threadDelay 100000
335+ readRef valueByUIRef >>= flip shouldBe "hello"
336+ readRef valueRef >>= flip shouldBe "hello"
416337 liftIO $ writeChan setValueChan "world"
417− readRef valueByUIRef `shouldBeWithRetryM` "hello"
418− readRef valueRef `shouldBeWithRetryM` "world"
338+ liftIO $ threadDelay 100000
339+ readRef valueByUIRef >>= flip shouldBe "hello"
340+ readRef valueRef >>= flip shouldBe "world"
419341 testWidget (pure ()) checkValue $ do
420342 update <- triggerEventWithChan setValueChan
421343 e <- inputElement $ def & inputElementConfig_setValue .~ update
@@ -425,181 +347,51 @@ 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
433− readRef checkedByUIRef `shouldBeWithRetryM` False
434− readRef checkedRef `shouldBeWithRetryM` False
435− WD.attr e "checked" `shouldBeWithRetryM` Nothing
350+ let checkValue = do
351+ readRef checkedByUIRef >>= flip shouldBe False
352+ readRef checkedRef >>= flip shouldBe False
353+ e <- WD.findElem $ WD.ByTag "input"
436354 WD.moveToCenter e
437355 WD.click e
438− readRef checkedByUIRef `shouldBeWithRetryM` True
439− readRef checkedRef `shouldBeWithRetryM` True
440− WD.attr e "checked" `shouldBeWithRetryM` Just "true"
356+ liftIO $ threadDelay 100000
357+ readRef checkedByUIRef >>= flip shouldBe True
358+ readRef checkedRef >>= flip shouldBe True
441359 liftIO $ writeChan setCheckedChan False
442− readRef checkedByUIRef `shouldBeWithRetryM` True
443− readRef checkedRef `shouldBeWithRetryM` False
444− WD.attr e "checked" `shouldBeWithRetryM` Nothing
445− testWidget' checkStatic checkValue $ do
360+ liftIO $ threadDelay 100000
361+ readRef checkedByUIRef >>= flip shouldBe True
362+ readRef checkedRef >>= flip shouldBe False
363+ testWidget (pure ()) checkValue $ do
446364 setChecked <- triggerEventWithChan setCheckedChan
447365 e <- inputElement $ def
448366 & initialAttributes .~ "type" =: "checkbox"
449367 & inputElementConfig_setChecked .~ setChecked
450368 performEvent_ $ liftIO . writeRef checkedByUIRef <$> _inputElement_checkedChange e
451369 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)
471370 it "captures file uploads" $ runWD $ do
472371 filesRef :: IORef [Text] <- newRef []
473372 let uploadFile = do
474− e <- findElemWithRetry $ WD.ByTag "input"
373+ e <- WD.findElem $ WD.ByTag "input"
475374 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
476375 WD.sendKeys (T.pack path) e
477− WD.click =<< findElemWithRetry (WD.ByTag "button")
376+ WD.click <=< WD.findElem $ WD.ByTag "button"
478377 liftIO $ removeFile path
479− readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
378+ input <- readRef filesRef
379+ input `shouldBe` [T.pack $ FilePath.takeFileName path]
480380 testWidget (pure ()) uploadFile $ do
481381 e <- inputElement $ def & initialAttributes .~ "type" =: "file"
482382 click <- button "save"
483383 prerender_ (pure ()) $ performEvent_ $ ffor (tag (current (_inputElement_files e)) click) $ \fs -> do
484384 names <- liftJSM $ traverse File.getName fs
485385 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
386+
387+ describe "hydration/immediate" $ session' $ do
597388 it "captures user input after switchover" $ runWD $ do
598389 inputRef :: IORef Text <- newRef ""
599390 let checkValue = do
600− WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "input")
601− WD.click =<< findElemWithRetry (WD.ByTag "button")
602− readRef inputRef `shouldBeWithRetryM` "hello world"
391+ WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "input"
392+ WD.click <=< WD.findElem $ WD.ByTag "button"
393+ input <- readRef inputRef
394+ input `shouldBe` "hello world"
603395 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
604396 e <- inputElement def
605397 click <- button "save"
@@ -607,10 +399,11 @@ tests withDebugging wdConfig caps _selenium = do
607399 it "sets focus appropriately" $ runWD $ do
608400 focusRef <- newRef False
609401 let checkValue = do
610− readRef focusRef `shouldBeWithRetryM` False
611− e <- findElemWithRetry $ WD.ByTag "input"
402+ readRef focusRef >>= flip shouldBe False
403+ e <- WD.findElem $ WD.ByTag "input"
612404 WD.click e
613− readRef focusRef `shouldBeWithRetryM` True
405+ liftIO $ threadDelay 100000
406+ readRef focusRef >>= flip shouldBe True
614407 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
615408 e <- inputElement def
616409 performEvent_ $ liftIO . writeRef focusRef <$> updated (_inputElement_hasFocus e)
@@ -619,15 +412,17 @@ tests withDebugging wdConfig caps _selenium = do
619412 valueRef :: IORef Text <- newRef ""
620413 setValueChan :: Chan Text <- liftIO newChan
621414 let checkValue = do
622− readRef valueByUIRef `shouldBeWithRetryM` ""
623− readRef valueRef `shouldBeWithRetryM` ""
624− e <- findElemWithRetry $ WD.ByTag "input"
415+ readRef valueByUIRef >>= flip shouldBe ""
416+ readRef valueRef >>= flip shouldBe ""
417+ e <- WD.findElem $ WD.ByTag "input"
625418 WD.sendKeys "hello" e
626− readRef valueByUIRef `shouldBeWithRetryM` "hello"
627− readRef valueRef `shouldBeWithRetryM` "hello"
419+ liftIO $ threadDelay 100000
420+ readRef valueByUIRef >>= flip shouldBe "hello"
421+ readRef valueRef >>= flip shouldBe "hello"
628422 liftIO $ writeChan setValueChan "world"
629− readRef valueByUIRef `shouldBeWithRetryM` "hello"
630− readRef valueRef `shouldBeWithRetryM` "world"
423+ liftIO $ threadDelay 100000
424+ readRef valueByUIRef >>= flip shouldBe "hello"
425+ readRef valueRef >>= flip shouldBe "world"
631426 testWidget (pure ()) checkValue $ do
632427 update <- triggerEventWithChan setValueChan
633428 prerender_ (pure ()) $ do
@@ -639,16 +434,18 @@ tests withDebugging wdConfig caps _selenium = do
639434 checkedRef <- newRef False
640435 setCheckedChan <- liftIO newChan
641436 let checkValue = do
642− readRef checkedByUIRef `shouldBeWithRetryM` False
643− readRef checkedRef `shouldBeWithRetryM` False
644− e <- findElemWithRetry $ WD.ByTag "input"
437+ readRef checkedByUIRef >>= flip shouldBe False
438+ readRef checkedRef >>= flip shouldBe False
439+ e <- WD.findElem $ WD.ByTag "input"
645440 WD.moveToCenter e
646441 WD.click e
647− readRef checkedByUIRef `shouldBeWithRetryM` True
648− readRef checkedRef `shouldBeWithRetryM` True
442+ liftIO $ threadDelay 100000
443+ readRef checkedByUIRef >>= flip shouldBe True
444+ readRef checkedRef >>= flip shouldBe True
649445 liftIO $ writeChan setCheckedChan False
650− readRef checkedByUIRef `shouldBeWithRetryM` True
651− readRef checkedRef `shouldBeWithRetryM` False
446+ liftIO $ threadDelay 100000
447+ readRef checkedByUIRef >>= flip shouldBe True
448+ readRef checkedRef >>= flip shouldBe False
652449 testWidget (pure ()) checkValue $ do
653450 setChecked <- triggerEventWithChan setCheckedChan
654451 prerender_ (pure ()) $ do
@@ -660,12 +457,13 @@ tests withDebugging wdConfig caps _selenium = do
660457 it "captures file uploads" $ runWD $ do
661458 filesRef :: IORef [Text] <- newRef []
662459 let uploadFile = do
663− e <- findElemWithRetry $ WD.ByTag "input"
460+ e <- WD.findElem $ WD.ByTag "input"
664461 path <- liftIO $ writeSystemTempFile "testFile" "file contents"
665462 WD.sendKeys (T.pack path) e
666− WD.click =<< findElemWithRetry (WD.ByTag "button")
463+ WD.click <=< WD.findElem $ WD.ByTag "button"
667464 liftIO $ removeFile path
668− readRef filesRef `shouldBeWithRetryM` [T.pack $ FilePath.takeFileName path]
465+ input <- liftIO $ readRef filesRef
466+ input `shouldBe` [T.pack $ FilePath.takeFileName path]
669467 testWidget (pure ()) uploadFile $ prerender_ (pure ()) $ do
670468 e <- inputElement $ def & initialAttributes .~ "type" =: "file"
671469 click <- button "save"
@@ -673,42 +471,21 @@ tests withDebugging wdConfig caps _selenium = do
673471 names <- liftJSM $ traverse File.getName fs
674472 liftIO $ writeRef filesRef names
675473
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
474+ describe "textAreaElement" $ do
475+ describe "hydration" $ session' $ do
701476 it "doesn't wipe user input when switching over" $ runWD $ do
702477 inputRef <- newRef ("" :: Text)
703478 testWidget'
704479 (do
705− e <- findElemWithRetry $ WD.ByTag "textarea"
480+ e <- WD.findElem $ WD.ByTag "textarea"
706481 WD.sendKeys "hello world" e
707482 pure e)
708483 (\e -> do
709− WD.attr e "value" `shouldBeWithRetryM` Just "hello world"
710− WD.click <=< findElemWithRetry $ WD.ByTag "button"
711− readRef inputRef `shouldBeWithRetryM` "hello world"
484+ t <- WD.attr e "value"
485+ t `shouldBe` Just "hello world"
486+ WD.click <=< WD.findElem $ WD.ByTag "button"
487+ input <- readRef inputRef
488+ input `shouldBe` "hello world"
712489 ) $ do
713490 e <- textAreaElement def
714491 click <- button "save"
@@ -716,9 +493,10 @@ tests withDebugging wdConfig caps _selenium = do
716493 it "captures user input after switchover" $ runWD $ do
717494 inputRef <- newRef ("" :: Text)
718495 let checkValue = do
719− WD.sendKeys "hello world" =<< findElemWithRetry (WD.ByTag "textarea")
720− WD.click =<< findElemWithRetry (WD.ByTag "button")
721− readRef inputRef `shouldBeWithRetryM` "hello world"
496+ WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "textarea"
497+ WD.click <=< WD.findElem $ WD.ByTag "button"
498+ input <- readRef inputRef
499+ input `shouldBe` "hello world"
722500 testWidget (pure ()) checkValue $ do
723501 e <- textAreaElement def
724502 click <- button "save"
@@ -726,21 +504,23 @@ tests withDebugging wdConfig caps _selenium = do
726504 it "sets focus appropriately" $ runWD $ do
727505 focusRef <- newRef False
728506 let checkValue = do
729− readRef focusRef `shouldBeWithRetryM` False
730− e <- findElemWithRetry $ WD.ByTag "textarea"
507+ readRef focusRef >>= flip shouldBe False
508+ e <- WD.findElem $ WD.ByTag "textarea"
731509 WD.click e
732− readRef focusRef `shouldBeWithRetryM` True
510+ liftIO $ threadDelay 100000
511+ readRef focusRef >>= flip shouldBe True
733512 testWidget (pure ()) checkValue $ do
734513 e <- textAreaElement def
735514 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
736515 it "sets focus when focus occurs before hydration" $ runWD $ do
737516 focusRef <- newRef False
738517 let setup = do
739− e <- findElemWithRetry $ WD.ByTag "textarea"
518+ e <- WD.findElem $ WD.ByTag "textarea"
740519 WD.click e
741− ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
742− readRef focusRef `shouldBeWithRetryM` False
743− check = readRef focusRef `shouldBeWithRetryM` True
520+ hasFocus <- (== e) <$> WD.activeElem
521+ hasFocus `shouldBe` True
522+ readRef focusRef >>= flip shouldBe False
523+ check = readRef focusRef >>= flip shouldBe True
744524 testWidget setup check $ do
745525 e <- textAreaElement def
746526 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
@@ -749,110 +529,31 @@ tests withDebugging wdConfig caps _selenium = do
749529 valueRef <- newRef ("" :: Text)
750530 setValueChan :: Chan Text <- liftIO newChan
751531 let checkValue = do
752− readRef valueByUIRef `shouldBeWithRetryM` ""
753− readRef valueRef `shouldBeWithRetryM` ""
754− e <- findElemWithRetry $ WD.ByTag "textarea"
532+ readRef valueByUIRef >>= flip shouldBe ""
533+ readRef valueRef >>= flip shouldBe ""
534+ e <- WD.findElem $ WD.ByTag "textarea"
755535 WD.sendKeys "hello" e
756− readRef valueByUIRef `shouldBeWithRetryM` "hello"
757− readRef valueRef `shouldBeWithRetryM` "hello"
536+ liftIO $ threadDelay 100000
537+ readRef valueByUIRef >>= flip shouldBe "hello"
538+ readRef valueRef >>= flip shouldBe "hello"
758539 liftIO $ writeChan setValueChan "world"
759− readRef valueByUIRef `shouldBeWithRetryM` "hello"
760− readRef valueRef `shouldBeWithRetryM` "world"
540+ liftIO $ threadDelay 100000
541+ readRef valueByUIRef >>= flip shouldBe "hello"
542+ readRef valueRef >>= flip shouldBe "world"
761543 testWidget (pure ()) checkValue $ do
762544 setValue' <- triggerEventWithChan setValueChan
763545 e <- textAreaElement $ def { _textAreaElementConfig_setValue = Just setValue' }
764546 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
765547 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
848548
849− describe "hydration/immediate" $ do
549+ describe "hydration/immediate" $ session' $ do
850550 it "captures user input after switchover" $ runWD $ do
851551 inputRef :: IORef Text <- newRef ""
852552 let checkValue = do
853− WD.sendKeys "hello world" <=< findElemWithRetry $ WD.ByTag "textarea"
854− WD.click <=< findElemWithRetry $ WD.ByTag "button"
855− readRef inputRef `shouldBeWithRetryM` "hello world"
553+ WD.sendKeys "hello world" <=< WD.findElem $ WD.ByTag "textarea"
554+ WD.click <=< WD.findElem $ WD.ByTag "button"
555+ input <- liftIO $ readRef inputRef
556+ input `shouldBe` "hello world"
856557 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
857558 e <- textAreaElement def
858559 click <- button "save"
@@ -860,10 +561,11 @@ tests withDebugging wdConfig caps _selenium = do
860561 it "sets focus appropriately" $ runWD $ do
861562 focusRef <- newRef False
862563 let checkValue = do
863− readRef focusRef `shouldBeWithRetryM` False
864− e <- findElemWithRetry $ WD.ByTag "textarea"
564+ readRef focusRef >>= flip shouldBe False
565+ e <- WD.findElem $ WD.ByTag "textarea"
865566 WD.click e
866− readRef focusRef `shouldBeWithRetryM` True
567+ liftIO $ threadDelay 100000
568+ readRef focusRef >>= flip shouldBe True
867569 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
868570 e <- textAreaElement def
869571 performEvent_ $ liftIO . writeRef focusRef <$> updated (_textAreaElement_hasFocus e)
@@ -872,15 +574,17 @@ tests withDebugging wdConfig caps _selenium = do
872574 valueRef :: IORef Text <- newRef ""
873575 setValueChan :: Chan Text <- liftIO newChan
874576 let checkValue = do
875− readRef valueByUIRef `shouldBeWithRetryM` ""
876− readRef valueRef `shouldBeWithRetryM` ""
877− e <- findElemWithRetry $ WD.ByTag "textarea"
577+ readRef valueByUIRef >>= flip shouldBe ""
578+ readRef valueRef >>= flip shouldBe ""
579+ e <- WD.findElem $ WD.ByTag "textarea"
878580 WD.sendKeys "hello" e
879− readRef valueByUIRef `shouldBeWithRetryM` "hello"
880− readRef valueRef `shouldBeWithRetryM` "hello"
581+ liftIO $ threadDelay 100000
582+ readRef valueByUIRef >>= flip shouldBe "hello"
583+ readRef valueRef >>= flip shouldBe "hello"
881584 liftIO $ writeChan setValueChan "world"
882− readRef valueByUIRef `shouldBeWithRetryM` "hello"
883− readRef valueRef `shouldBeWithRetryM` "world"
585+ liftIO $ threadDelay 100000
586+ readRef valueByUIRef >>= flip shouldBe "hello"
587+ readRef valueRef >>= flip shouldBe "world"
884588 testWidget (pure ()) checkValue $ do
885589 setValue' <- triggerEventWithChan setValueChan
886590 prerender_ (pure ()) $ do
@@ -888,26 +592,26 @@ tests withDebugging wdConfig caps _selenium = do
888592 performEvent_ $ liftIO . writeRef valueByUIRef <$> _textAreaElement_input e
889593 performEvent_ $ liftIO . writeRef valueRef <$> updated (value e)
890594
891− session' "selectElement" $ do
595+ describe "selectElement" $ do
892596 let options :: DomBuilder t m => m ()
893597 options = do
894598 elAttr "option" ("value" =: "one" <> "id" =: "one") $ text "one"
895599 elAttr "option" ("value" =: "two" <> "id" =: "two") $ text "two"
896600 elAttr "option" ("value" =: "three" <> "id" =: "three") $ text "three"
897− describe "hydration" $ do
601+ describe "hydration" $ session' $ do
898602 it "sets initial value correctly" $ runWD $ do
899603 inputRef <- newRef ("" :: Text)
900604 let setup = do
901− e <- findElemWithRetry $ WD.ByTag "select"
605+ e <- WD.findElem $ WD.ByTag "select"
902606 assertAttr e "value" (Just "three")
903− WD.click =<< findElemWithRetry (WD.ById "two")
607+ WD.click <=< WD.findElem $ WD.ById "two"
904608 pure e
905609 check e = do
906610 assertAttr e "value" (Just "two")
907− readRef inputRef `shouldBeWithRetryM` "three"
908− WD.click =<< findElemWithRetry (WD.ByTag "button")
611+ readRef inputRef >>= (`shouldBe` "three")
612+ WD.click <=< WD.findElem $ WD.ByTag "button"
909613 assertAttr e "value" (Just "two")
910− readRef inputRef `shouldBeWithRetryM` "two"
614+ readRef inputRef >>= (`shouldBe` "two")
911615 testWidget' setup check $ do
912616 (e, ()) <- selectElement (def { _selectElementConfig_initialValue = "three" }) options
913617 click <- button "save"
@@ -916,12 +620,12 @@ tests withDebugging wdConfig caps _selenium = do
916620 it "captures user input after switchover" $ runWD $ do
917621 inputRef <- newRef ("" :: Text)
918622 let checkValue = do
919− e <- findElemWithRetry $ WD.ByTag "select"
623+ e <- WD.findElem $ WD.ByTag "select"
920624 assertAttr e "value" (Just "one")
921− WD.click =<< findElemWithRetry (WD.ById "two")
625+ WD.click <=< WD.findElem $ WD.ById "two"
922626 assertAttr e "value" (Just "two")
923− WD.click =<< findElemWithRetry (WD.ByTag "button")
924− readRef inputRef `shouldBeWithRetryM` "two"
627+ WD.click <=< WD.findElem $ WD.ByTag "button"
628+ readRef inputRef >>= (`shouldBe` "two")
925629 testWidget (pure ()) checkValue $ do
926630 (e, ()) <- selectElement def options
927631 click <- button "save"
@@ -929,21 +633,23 @@ tests withDebugging wdConfig caps _selenium = do
929633 it "sets focus appropriately" $ runWD $ do
930634 focusRef <- newRef False
931635 let checkValue = do
932− readRef focusRef `shouldBeWithRetryM` False
933− e <- findElemWithRetry $ WD.ByTag "select"
636+ readRef focusRef >>= flip shouldBe False
637+ e <- WD.findElem $ WD.ByTag "select"
934638 WD.click e
935− readRef focusRef `shouldBeWithRetryM` True
639+ liftIO $ threadDelay 100000
640+ readRef focusRef >>= flip shouldBe True
936641 testWidget (pure ()) checkValue $ do
937642 (e, ()) <- selectElement def options
938643 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
939644 it "sets focus when focus occurs before hydration" $ runWD $ do
940645 focusRef <- newRef False
941646 let setup = do
942− e <- findElemWithRetry $ WD.ByTag "select"
647+ e <- WD.findElem $ WD.ByTag "select"
943648 WD.click e
944− ((== e) <$> WD.activeElem) `shouldBeWithRetryM` True
945− readRef focusRef `shouldBeWithRetryM` False
946− check = readRef focusRef `shouldBeWithRetryM` True
649+ hasFocus <- (== e) <$> WD.activeElem
650+ hasFocus `shouldBe` True
651+ readRef focusRef >>= flip shouldBe False
652+ check = readRef focusRef >>= flip shouldBe True
947653 testWidget setup check $ do
948654 (e, ()) <- selectElement def options
949655 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
@@ -952,29 +658,31 @@ tests withDebugging wdConfig caps _selenium = do
952658 valueRef <- newRef ("" :: Text)
953659 setValueChan :: Chan Text <- liftIO newChan
954660 let checkValue = do
955− e <- findElemWithRetry $ WD.ByTag "select"
661+ e <- WD.findElem $ WD.ByTag "select"
956662 assertAttr e "value" (Just "one")
957− readRef valueByUIRef `shouldBeWithRetryM` "one"
958− readRef valueRef `shouldBeWithRetryM` "one"
959− WD.click <=< findElemWithRetry $ WD.ById "two"
960− readRef valueByUIRef `shouldBeWithRetryM` "two"
961− readRef valueRef `shouldBeWithRetryM` "two"
663+ readRef valueByUIRef >>= flip shouldBe "one"
664+ readRef valueRef >>= flip shouldBe "one"
665+ WD.click <=< WD.findElem $ WD.ById "two"
666+ liftIO $ threadDelay 100000
667+ readRef valueByUIRef >>= flip shouldBe "two"
668+ readRef valueRef >>= flip shouldBe "two"
962669 liftIO $ writeChan setValueChan "three"
963− readRef valueByUIRef `shouldBeWithRetryM` "two"
964− readRef valueRef `shouldBeWithRetryM` "three"
670+ liftIO $ threadDelay 100000
671+ readRef valueByUIRef >>= flip shouldBe "two"
672+ readRef valueRef >>= flip shouldBe "three"
965673 testWidget (pure ()) checkValue $ do
966674 setValue' <- triggerEventWithChan setValueChan
967675 (e, ()) <- selectElement def { _selectElementConfig_setValue = Just setValue' } options
968676 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
969677 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
970678
971− describe "hydration/immediate" $ do
679+ describe "hydration/immediate" $ session' $ do
972680 it "captures user input after switchover" $ runWD $ do
973681 inputRef :: IORef Text <- newRef ""
974682 let checkValue = do
975− WD.click <=< findElemWithRetry $ WD.ById "two"
976− WD.click <=< findElemWithRetry $ WD.ByTag "button"
977− readRef inputRef `shouldBeWithRetryM` "two"
683+ WD.click <=< WD.findElem $ WD.ById "two"
684+ WD.click <=< WD.findElem $ WD.ByTag "button"
685+ readRef inputRef >>= flip shouldBe "two"
978686 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
979687 (e, ()) <- selectElement def options
980688 click <- button "save"
@@ -982,16 +690,17 @@ tests withDebugging wdConfig caps _selenium = do
982690 it "sets focus appropriately" $ runWD $ do
983691 focusRef <- newRef False
984692 let checkValue = do
985− readRef focusRef `shouldBeWithRetryM` False
986− e <- findElemWithRetry $ WD.ByTag "select"
693+ readRef focusRef >>= flip shouldBe False
694+ e <- WD.findElem $ WD.ByTag "select"
987695 WD.click e
988− readRef focusRef `shouldBeWithRetryM` True
696+ liftIO $ threadDelay 100000
697+ readRef focusRef >>= flip shouldBe True
989698 testWidget (pure ()) checkValue $ prerender_ (pure ()) $ do
990699 (e, ()) <- selectElement def options
991700 performEvent_ $ liftIO . writeRef focusRef <$> updated (_selectElement_hasFocus e)
992701 it "has correct initial value" $ runWD $ do
993702 valueRef :: IORef Text <- newRef ""
994− let checkValue = readRef valueRef `shouldBeWithRetryM` "one"
703+ let checkValue = readRef valueRef >>= flip shouldBe "one"
995704 testWidget (pure ()) checkValue $ do
996705 prerender_ (pure ()) $ do
997706 (e, ()) <- selectElement def { _selectElementConfig_initialValue = "one" } options
@@ -1001,12 +710,14 @@ tests withDebugging wdConfig caps _selenium = do
1001710 valueRef :: IORef Text <- newRef ""
1002711 setValueChan :: Chan Text <- liftIO newChan
1003712 let checkValue = do
1004− WD.click =<< findElemWithRetry (WD.ById "two")
1005− readRef valueByUIRef `shouldBeWithRetryM` "two"
1006− readRef valueRef `shouldBeWithRetryM` "two"
713+ WD.click <=< WD.findElem $ WD.ById "two"
714+ liftIO $ threadDelay 100000
715+ readRef valueByUIRef >>= flip shouldBe "two"
716+ readRef valueRef >>= flip shouldBe "two"
1007717 liftIO $ writeChan setValueChan "three"
1008− readRef valueByUIRef `shouldBeWithRetryM` "two"
1009− readRef valueRef `shouldBeWithRetryM` "three"
718+ liftIO $ threadDelay 100000
719+ readRef valueByUIRef >>= flip shouldBe "two"
720+ readRef valueRef >>= flip shouldBe "three"
1010721 testWidget (pure ()) checkValue $ do
1011722 setValue' <- triggerEventWithChan setValueChan
1012723 prerender_ (pure ()) $ do
@@ -1014,12 +725,12 @@ tests withDebugging wdConfig caps _selenium = do
1014725 performEvent_ $ liftIO . writeRef valueByUIRef <$> _selectElement_change e
1015726 performEvent_ $ liftIO . writeRef valueRef <$> updated (_selectElement_value e)
1016727
1017− session' "prerender" $ do
728+ describe "prerender" $ session' $ do
1018729 it "works in simple case" $ runWD $ do
1019730 testWidget (checkBodyText "One") (checkBodyText "Two") $ do
1020731 prerender_ (text "One") (text "Two")
1021732 it "removes element correctly" $ runWD $ do
1022− testWidget' (findElemWithRetry $ WD.ByTag "span") elementShouldBeRemoved $ do
733+ testWidget' (WD.findElem $ WD.ByTag "span") elementShouldBeRemoved $ do
1023734 prerender_ (el "span" $ text "One") (text "Two")
1024735 it "can be nested in server widget" $ runWD $ do
1025736 testWidget (checkBodyText "One") (checkBodyText "Three") $ do
@@ -1059,9 +770,9 @@ tests withDebugging wdConfig caps _selenium = do
1059770 pb <- getPostBuild
1060771 performEvent_ $ liftIO (putMVar lock ()) <$ pb
1061772 it "result Dynamic is updated *after* switchover" $ runWD $ do
1062− let preSwitchover = checkBodyText "PostBuild"
1063− check = checkBodyText "Client"
1064− testWidget preSwitchover check $ void $ do
773+ let static = shouldContainText "PostBuild" =<< WD.findElem (WD.ByTag "body")
774+ check = shouldContainText "Client" =<< WD.findElem (WD.ByTag "body")
775+ testWidget static check $ void $ do
1065776 d <- prerender (pure "Initial") (pure "Client")
1066777 pb <- getPostBuild
1067778 initial <- sample $ current d
@@ -1069,39 +780,32 @@ tests withDebugging wdConfig caps _selenium = do
1069780 -- This essentially checks that the client IO runs *after* switchover/postBuild,
1070781 -- thus can't create conflicting DOM
1071782 it "can't exploit IO to break hydration" $ runWD $ do
1072− let preSwitchover = checkBodyText "Initial"
1073− testWidgetStatic preSwitchover $ void $ do
783+ let static = shouldContainText "Initial" =<< WD.findElem (WD.ByTag "body")
784+ testWidgetStatic static $ void $ do
1074785 ref <- liftIO $ newRef "Initial"
1075786 prerender_ (pure ()) (liftIO $ writeRef ref "Client")
1076787 text <=< liftIO $ readRef ref
1077788 -- As above, so below
1078789 it "can't exploit triggerEvent to break hydration" $ runWD $ do
1079− let preSwitchover = checkBodyText "Initial"
1080− check = checkBodyText "Client"
1081− testWidget preSwitchover check $ void $ do
790+ let static = shouldContainText "Initial" =<< WD.findElem (WD.ByTag "body")
791+ check = shouldContainText "Client" =<< WD.findElem (WD.ByTag "body")
792+ testWidget static check $ void $ do
1082793 (e, trigger) <- newTriggerEvent
1083794 prerender_ (pure ()) (liftIO $ trigger "Client")
1084795 textNode $ TextNodeConfig "Initial" $ Just e
1085796
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
797+ describe "runWithReplace" $ session' $ do
1096798 it "works" $ runWD $ do
1097799 replaceChan :: Chan Text <- liftIO newChan
1098− let setup = findElemWithRetry $ WD.ByTag "div"
800+ let setup = WD.findElem $ WD.ByTag "div"
1099801 check ssr = do
1100802 -- Check that the original element still exists and has the correct text
1101− shouldContainText "two" ssr
1102− liftIO $ writeChan replaceChan "three"
803+ WD.getText ssr >>= flip shouldBe "two"
804+ liftIO $ do
805+ writeChan replaceChan "three"
806+ threadDelay 100000
1103807 elementShouldBeRemoved ssr
1104− shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
808+ shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1105809 testWidget' setup check $ do
1106810 replace <- triggerEventWithChan replaceChan
1107811 pb <- getPostBuild
@@ -1111,13 +815,15 @@ tests withDebugging wdConfig caps _selenium = do
1111815 ]
1112816 it "can be nested in initial widget" $ runWD $ do
1113817 replaceChan :: Chan Text <- liftIO newChan
1114− let setup = findElemWithRetry $ WD.ByTag "div"
818+ let setup = WD.findElem $ WD.ByTag "div"
1115819 check ssr = do
1116820 -- Check that the original element still exists and has the correct text
1117− shouldContainText "two" ssr
1118− liftIO $ writeChan replaceChan "three"
821+ WD.getText ssr >>= flip shouldBe "two"
822+ liftIO $ do
823+ writeChan replaceChan "three"
824+ threadDelay 100000
1119825 elementShouldBeRemoved ssr
1120− shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
826+ shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1121827 testWidget' setup check $ void $ flip runWithReplace never $ do
1122828 replace <- triggerEventWithChan replaceChan
1123829 pb <- getPostBuild
@@ -1126,14 +832,16 @@ tests withDebugging wdConfig caps _selenium = do
1126832 , el "span" . text <$> replace
1127833 ]
1128834 it "can be nested in postBuild widget" $ runWD $ do
1129− replaceChan :: Chan Text <- liftIO newChan
1130− let setup = findElemWithRetry $ WD.ByTag "div"
835+ replaceChan <- liftIO newChan
836+ let setup = WD.findElem $ WD.ByTag "div"
1131837 check ssr = do
1132838 -- Check that the original element still exists and has the correct text
1133− shouldContainText "two" ssr
1134− liftIO $ writeChan replaceChan "three"
839+ WD.getText ssr >>= flip shouldBe "two"
840+ liftIO $ do
841+ writeChan replaceChan "three"
842+ threadDelay 100000
1135843 elementShouldBeRemoved ssr
1136− shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
844+ shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1137845 testWidget' setup check $ void $ do
1138846 pb <- getPostBuild
1139847 runWithReplace (pure ()) $ ffor pb $ \() -> do
@@ -1159,15 +867,17 @@ tests withDebugging wdConfig caps _selenium = do
1159867 replaceChan2 :: Chan Text <- liftIO newChan
1160868 lock :: MVar () <- liftIO newEmptyMVar
1161869 let check = do
1162− shouldContainText "" =<< findElemWithRetry (WD.ByTag "body")
870+ shouldContainText "" =<< WD.findElem (WD.ByTag "body")
1163871 liftIO $ do
1164872 writeChan replaceChan1 "one"
1165873 takeMVar lock
1166− one <- findElemWithRetry $ WD.ByTag "div"
1167− shouldContainText "pb" one
1168− liftIO $ writeChan replaceChan2 "two"
874+ one <- WD.findElem $ WD.ByTag "div"
875+ WD.getText one >>= flip shouldBe "pb"
876+ liftIO $ do
877+ writeChan replaceChan2 "two"
878+ threadDelay 100000
1169879 elementShouldBeRemoved one
1170− shouldContainText "two" =<< findElemWithRetry (WD.ByTag "span")
880+ shouldContainText "two" =<< WD.findElem (WD.ByTag "span")
1171881 testWidget (pure ()) check $ void $ do
1172882 replace1 <- triggerEventWithChan replaceChan1
1173883 runWithReplace (pure ()) $ ffor replace1 $ \r1 -> do
@@ -1208,12 +918,14 @@ tests withDebugging wdConfig caps _selenium = do
1208918 it "works in immediate mode (RHS of prerender)" $ runWD $ do
1209919 replaceChan :: Chan Text <- liftIO newChan
1210920 let check = do
1211− checkBodyText "one"
1212− one <- findElemWithRetry $ WD.ByTag "div"
1213− shouldContainText "one" one
1214− liftIO $ writeChan replaceChan "pb"
921+ one <- WD.findElem $ WD.ByTag "div"
922+ shouldContainText "one" =<< WD.findElem (WD.ByTag "body")
923+ WD.getText one >>= flip shouldBe "one"
924+ liftIO $ do
925+ writeChan replaceChan "pb"
926+ threadDelay 100000
1215927 elementShouldBeRemoved one
1216− shouldContainText "pb" =<< findElemWithRetry (WD.ByTag "span")
928+ shouldContainText "pb" =<< WD.findElem (WD.ByTag "span")
1217929 testWidget (pure ()) check $ void $ do
1218930 replace <- triggerEventWithChan replaceChan
1219931 prerender_ blank $ do
@@ -1221,12 +933,14 @@ tests withDebugging wdConfig caps _selenium = do
1221933 it "works with postBuild in immediate mode (RHS of prerender)" $ runWD $ do
1222934 replaceChan :: Chan Text <- liftIO newChan
1223935 let check = do
1224− checkBodyText "two"
1225− two <- findElemWithRetry $ WD.ByTag "div"
1226− shouldContainText "two" two
1227− liftIO $ writeChan replaceChan "three"
936+ two <- WD.findElem $ WD.ByTag "div"
937+ shouldContainText "two" =<< WD.findElem (WD.ByTag "body")
938+ WD.getText two >>= flip shouldBe "two"
939+ liftIO $ do
940+ writeChan replaceChan "three"
941+ threadDelay 100000
1228942 elementShouldBeRemoved two
1229− shouldContainText "three" =<< findElemWithRetry (WD.ByTag "span")
943+ shouldContainText "three" =<< WD.findElem (WD.ByTag "span")
1230944 testWidget (pure ()) check $ void $ do
1231945 replace <- triggerEventWithChan replaceChan
1232946 prerender_ blank $ do
@@ -1236,61 +950,7 @@ tests withDebugging wdConfig caps _selenium = do
1236950 , el "span" . text <$> replace
1237951 ]
1238952
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
953+ describe "traverseDMapWithKeyWithAdjust" $ session' $ do
1294954 let widget :: DomBuilder t m => DKey a -> Identity a -> m (Identity a)
1295955 widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1296956 elClass "span" "key" $ text $ textKey k
@@ -1298,58 +958,58 @@ tests withDebugging wdConfig caps _selenium = do
1298958 pure (Identity v)
1299959 checkItem :: WD.Element -> Text -> Text -> WD ()
1300960 checkItem li k v = do
1301− putStrLnDebug "checkItem"
1302− shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1303− shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
961+ shouldContainText k =<< WD.findElemFrom li (WD.ByClass "key")
962+ shouldContainText v =<< WD.findElemFrom li (WD.ByClass "value")
1304963 checkInitialItems dm xs = do
1305− putStrLnDebug "checkInitialItems"
1306964 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1307965 forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey k) (T.pack $ has @Show k $ show v)
1308− getAndCheckInitialItems dm = withRetry $ do
1309− putStrLnDebug "getAndCheckInitialItems"
966+ getAndCheckInitialItems dm = do
1310967 xs <- WD.findElems (WD.ByTag "li")
1311968 checkInitialItems dm xs
1312969 pure xs
1313970 checkRemoval chan k = do
1314− putStrLnDebug "checkRemoval"
1315− e <- findElemWithRetry (WD.ById $ textKey k)
1316− liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe Nothing)
971+ e <- WD.findElem (WD.ById $ textKey k)
972+ liftIO $ do
973+ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe Nothing)
974+ threadDelay 100000
1317975 elementShouldBeRemoved e
1318976 checkReplace chan k v = do
1319− putStrLnDebug "checkReplace"
1320− e <- findElemWithRetry (WD.ById $ textKey k)
1321− liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
977+ e <- WD.findElem (WD.ById $ textKey k)
978+ liftIO $ do
979+ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
980+ threadDelay 100000
1322981 elementShouldBeRemoved e
1323− e' <- findElemWithRetry $ WD.ById $ textKey k
982+ e' <- WD.findElem (WD.ById $ textKey k)
1324983 checkItem e' (textKey k) (T.pack $ show v)
1325984 checkInsert chan k v = do
1326− putStrLnDebug "checkInsert"
1327− liftIO $ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
1328− e <- findElemWithRetry (WD.ById $ textKey k)
985+ liftIO $ do
986+ writeChan chan $ PatchDMap $ DMap.singleton k (ComposeMaybe $ Just $ Identity v)
987+ threadDelay 100000
988+ e <- WD.findElem (WD.ById $ textKey k)
1329989 checkItem e (textKey k) (T.pack $ show v)
1330990 postBuildPatch = PatchDMap $ DMap.fromList [Key_Char :=> ComposeMaybe Nothing, Key_Bool :=> ComposeMaybe (Just $ Identity True)]
1331991 it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1332992 chan <- liftIO newChan
1333− let preSwitchover :: WD [WD.Element]
1334− preSwitchover = getAndCheckInitialItems keyMap
993+ let static :: WD [WD.Element]
994+ static = getAndCheckInitialItems keyMap
1335995 check :: [WD.Element] -> WD ()
1336996 check xs = do
1337997 checkInitialItems keyMap xs
1338998 checkRemoval chan Key_Int
1339999 checkReplace chan Key_Char 'B'
13401000 checkInsert chan Key_Bool True
1341− testWidget' preSwitchover check $ do
1001+ testWidget' static check $ do
13421002 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap =<< triggerEventWithChan chan
13431003 liftIO $ dmap `H.shouldBe` keyMap
13441004 it "handles postBuild correctly" $ runWD $ do
13451005 chan <- liftIO newChan
1346− let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1006+ let static = getAndCheckInitialItems (fromJust $ apply postBuildPatch keyMap)
13471007 check xs = do
1348− withRetry $ checkInitialItems (applyAlways postBuildPatch keyMap) xs
1008+ checkInitialItems (fromMaybe undefined $ apply postBuildPatch keyMap) xs
13491009 checkRemoval chan Key_Int
13501010 checkInsert chan Key_Char 'B'
13511011 checkReplace chan Key_Bool True
1352− testWidget' preSwitchover check $ void $ do
1012+ testWidget' static check $ void $ do
13531013 pb <- getPostBuild
13541014 replace <- triggerEventWithChan chan
13551015 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
@@ -1382,7 +1042,7 @@ tests withDebugging wdConfig caps _selenium = do
13821042 it "handles postBuild correctly in prerender" $ runWD $ do
13831043 chan <- liftIO newChan
13841044 let check = do
1385− _ <- getAndCheckInitialItems $ applyAlways postBuildPatch keyMap
1045+ _ <- getAndCheckInitialItems (fromJust $ apply postBuildPatch keyMap)
13861046 checkRemoval chan Key_Int
13871047 checkInsert chan Key_Char 'B'
13881048 checkReplace chan Key_Bool True
@@ -1393,7 +1053,7 @@ tests withDebugging wdConfig caps _selenium = do
13931053 (dmap, _evt) <- traverseDMapWithKeyWithAdjust widget keyMap $ leftmost [postBuildPatch <$ pb, replace]
13941054 liftIO $ dmap `H.shouldBe` keyMap
13951055
1396− session' "traverseIntMapWithKeyWithAdjust" $ do
1056+ describe "traverseIntMapWithKeyWithAdjust" $ session' $ do
13971057 let textKeyInt k = "key" <> T.pack (show k)
13981058 intMap = IntMap.fromList
13991059 [ (1, "one")
@@ -1407,89 +1067,89 @@ tests withDebugging wdConfig caps _selenium = do
14071067 pure v
14081068 checkItem :: WD.Element -> Text -> Text -> WD ()
14091069 checkItem li k v = do
1410− putStrLnDebug "checkItem"
1411− shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1412− shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
1070+ shouldContainText k =<< WD.findElemFrom li (WD.ByClass "key")
1071+ shouldContainText v =<< WD.findElemFrom li (WD.ByClass "value")
14131072 checkInitialItems dm xs = do
1414− putStrLnDebug "checkInitialItems"
14151073 liftIO $ assertEqual "Wrong amount of items in DOM" (IntMap.size dm) (length xs)
14161074 forM_ (zip xs (IntMap.toList dm)) $ \(e, (k, v)) -> checkItem e (textKeyInt k) v
1417− getAndCheckInitialItems dm = withRetry $ do
1418− putStrLnDebug "getAndCheckInitialItems"
1075+ getAndCheckInitialItems dm = do
14191076 xs <- WD.findElems (WD.ByTag "li")
14201077 checkInitialItems dm xs
14211078 pure xs
14221079 checkRemoval chan k = do
1423− putStrLnDebug "checkRemoval"
1424− e <- findElemWithRetry (WD.ById $ textKeyInt k)
1425− liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k Nothing
1080+ e <- WD.findElem (WD.ById $ textKeyInt k)
1081+ liftIO $ do
1082+ writeChan chan $ PatchIntMap $ IntMap.singleton k Nothing
1083+ threadDelay 100000
14261084 elementShouldBeRemoved e
14271085 checkReplace chan k v = do
1428− putStrLnDebug "checkReplace"
1429− e <- findElemWithRetry (WD.ById $ textKeyInt k)
1430− liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1086+ e <- WD.findElem (WD.ById $ textKeyInt k)
1087+ liftIO $ do
1088+ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1089+ threadDelay 100000
14311090 elementShouldBeRemoved e
1432− e' <- findElemWithRetry (WD.ById $ textKeyInt k)
1433− withRetry $ checkItem e' (textKeyInt k) v
1091+ e' <- WD.findElem (WD.ById $ textKeyInt k)
1092+ checkItem e' (textKeyInt k) v
14341093 checkInsert chan k v = do
1435− putStrLnDebug "checkInsert"
1436− liftIO $ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1437− e <- findElemWithRetry (WD.ById $ textKeyInt k)
1094+ liftIO $ do
1095+ writeChan chan $ PatchIntMap $ IntMap.singleton k $ Just v
1096+ threadDelay 100000
1097+ e <- WD.findElem (WD.ById $ textKeyInt k)
14381098 checkItem e (textKeyInt k) v
14391099 postBuildPatch = PatchIntMap $ IntMap.fromList [(2, Nothing), (3, Just "trois"), (4, Just "four")]
1440− xit "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
1100+ it "doesn't replace elements at switchover, can delete/update/insert" $ runWD $ do
14411101 chan <- liftIO newChan
1442− let preSwitchover = getAndCheckInitialItems intMap
1102+ let static = getAndCheckInitialItems intMap
14431103 check xs = do
14441104 checkInitialItems intMap xs
14451105 checkRemoval chan 1
14461106 checkReplace chan 2 "deux"
14471107 checkInsert chan 4 "four"
1448− testWidget' preSwitchover check $ void $ do
1108+ testWidget' static check $ void $ do
14491109 (im, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
14501110 liftIO $ im `H.shouldBe` intMap
1451− xit "handles postBuild correctly" $ runWD $ do
1111+ it "handles postBuild correctly" $ runWD $ do
14521112 chan <- liftIO newChan
1453− let preSwitchover = getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1113+ let static = getAndCheckInitialItems (fromJust $ apply postBuildPatch intMap)
14541114 check xs = do
1455− withRetry $ checkInitialItems (applyAlways postBuildPatch intMap) xs
1115+ checkInitialItems (fromMaybe undefined $ apply postBuildPatch intMap) xs
14561116 checkRemoval chan 1
14571117 checkInsert chan 2 "deux"
14581118 checkReplace chan 3 "trois"
1459− testWidget' preSwitchover check $ void $ do
1119+ testWidget' static check $ void $ do
14601120 pb <- getPostBuild
14611121 replace <- triggerEventWithChan chan
14621122 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
14631123 liftIO $ dmap `H.shouldBe` intMap
1464− xit "can delete/update/insert when built in prerender" $ runWD $ do
1124+ it "can delete/update/insert when built in prerender" $ runWD $ do
14651125 chan <- liftIO newChan
14661126 let check = do
14671127 _ <- getAndCheckInitialItems intMap
14681128 checkRemoval chan 1
14691129 checkReplace chan 2 "deux"
1470− checkInsert chan 4 "quatre"
1130+ checkInsert chan 3 "trois"
14711131 testWidget (pure ()) check $ do
14721132 replace <- triggerEventWithChan chan
14731133 prerender_ (pure ()) $ do
14741134 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap replace
14751135 liftIO $ dmap `H.shouldBe` intMap
1476− xit "can delete/update/insert when built in immediate mode" $ runWD $ do
1136+ it "can delete/update/insert when built in immediate mode" $ runWD $ do
14771137 chan <- liftIO newChan
14781138 let check = do
14791139 _ <- getAndCheckInitialItems intMap
14801140 checkRemoval chan 1
14811141 checkReplace chan 2 "deux"
1482− checkInsert chan 4 "quatre"
1142+ checkInsert chan 3 "trois"
14831143 testWidget (pure ()) check $ void $ do
14841144 pb <- getPostBuild
14851145 runWithReplace (pure ()) $ ffor pb $ \() -> void $ do
14861146 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap =<< triggerEventWithChan chan
14871147 liftIO $ dmap `H.shouldBe` intMap
14881148 -- Should be fixed by prerender changes!
1489− xit "handles postBuild correctly in prerender" $ runWD $ do
1149+ it "handles postBuild correctly in prerender" $ runWD $ do
14901150 chan <- liftIO newChan
14911151 let check = do
1492− _ <- getAndCheckInitialItems $ applyAlways postBuildPatch intMap
1152+ _ <- getAndCheckInitialItems (fromJust $ apply postBuildPatch intMap)
14931153 checkRemoval chan 1
14941154 checkInsert chan 2 "deux"
14951155 checkReplace chan 3 "trois"
@@ -1500,30 +1160,47 @@ tests withDebugging wdConfig caps _selenium = do
15001160 (dmap, _evt) <- traverseIntMapWithKeyWithAdjust widget intMap $ leftmost [postBuildPatch <$ pb, replace]
15011161 liftIO $ dmap `H.shouldBe` intMap
15021162
1503− session' "traverseDMapWithKeyWithAdjustWithMove" $ do
1163+ describe "traverseDMapWithKeyWithAdjustWithMove" $ session' $ do
15041164 let widget :: DomBuilder t m => Key2 a -> Identity a -> m (Identity a)
1505− widget k (Identity v) = elAttr "li" ("id" =: textKey2 k) $ do
1506− elClass "span" "key" $ text $ textKey2 k
1165+ widget k (Identity v) = elAttr "li" ("id" =: textKey k) $ do
1166+ elClass "span" "key" $ text $ textKey k
15071167 elClass "span" "value" $ text $ T.pack $ has @Show k $ show v
15081168 pure (Identity v)
1509− textKey2 :: Key2 a -> Text
1510− textKey2 = \case
1169+ textKey :: Key2 a -> Text
1170+ textKey = \case
15111171 Key2_Int i -> "i" <> T.pack (show i)
15121172 Key2_Char c -> "c" <> T.pack [c]
15131173 checkItem :: WD.Element -> Text -> Text -> WD ()
15141174 checkItem li k v = do
1515− shouldContainTextNoRetry k =<< WD.findElemFrom li (WD.ByClass "key")
1516− shouldContainTextNoRetry v =<< WD.findElemFrom li (WD.ByClass "value")
1175+ shouldContainText k =<< WD.findElemFrom li (WD.ByClass "key")
1176+ shouldContainText v =<< WD.findElemFrom li (WD.ByClass "value")
15171177 checkInitialItems dm xs = do
15181178 liftIO $ assertEqual "Wrong amount of items in DOM" (DMap.size dm) (length xs)
1519− forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey2 k) (T.pack $ has @Show k $ show v)
1520− getAndCheckInitialItems dm = withRetry $ do
1179+ forM_ (zip xs (DMap.toList dm)) $ \(e, k :=> Identity v) -> checkItem e (textKey k) (T.pack $ has @Show k $ show v)
1180+ getAndCheckInitialItems dm = do
15211181 xs <- WD.findElems (WD.ByTag "li")
15221182 checkInitialItems dm xs
15231183 pure xs
1524− moveSpec
1525− :: (DMap Key2 Identity -> (WD.Element -> Chan (PatchDMapWithMove Key2 Identity) -> WD ()) -> WD ())
1526− -> H.SpecM (WdTestSession ()) ()
1184+ checkRemoval chan k = do
1185+ e <- WD.findElem (WD.ById $ textKey k)
1186+ liftIO $ do
1187+ writeChan chan $ deleteDMapKey k
1188+ threadDelay 100000
1189+ elementShouldBeRemoved e
1190+ checkReplace chan k v = do
1191+ e <- WD.findElem (WD.ById $ textKey k)
1192+ liftIO $ do
1193+ writeChan chan $ insertDMapKey k (Identity v)
1194+ threadDelay 100000
1195+ elementShouldBeRemoved e
1196+ e' <- WD.findElem (WD.ById $ textKey k)
1197+ checkItem e' (textKey k) (T.pack $ show v)
1198+ checkInsert chan k v = do
1199+ liftIO $ do
1200+ writeChan chan $ insertDMapKey k (Identity v)
1201+ threadDelay 100000
1202+ e <- WD.findElem (WD.ById $ textKey k)
1203+ checkItem e (textKey k) (T.pack $ show v)
15271204 moveSpec testMove = do
15281205 it "can insert an item" $ runWD $ testMove (DMap.fromList [Key2_Int 1 ==> 1, Key2_Int 3 ==> 3]) $ \body chan -> do
15291206 shouldContainText (T.strip $ T.unlines ["i11","i33"]) body
@@ -1551,26 +1228,26 @@ tests withDebugging wdConfig caps _selenium = do
15511228
15521229 describe "hydration" $ moveSpec $ \initMap test -> do
15531230 chan <- liftIO newChan
1554− let preSwitchover = getAndCheckInitialItems initMap
1231+ let static = getAndCheckInitialItems initMap
15551232 check xs = do
15561233 checkInitialItems initMap xs
1557− body <- getBody
1234+ body <- WD.findElem (WD.ByTag "body")
15581235 test body chan
1559− testWidget' preSwitchover check $ void $ do
1236+ testWidget' static check $ void $ do
15601237 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
15611238 liftIO $ assertEqual "DMap" initMap dmap
15621239
15631240 describe "hydration/immediate" $ moveSpec $ \initMap test -> do
15641241 chan <- liftIO newChan
15651242 replace <- liftIO newChan
1566− lock :: MVar () <- liftIO newEmptyMVar
1243+ lock <- liftIO newEmptyMVar
15671244 let check = do
15681245 liftIO $ do
15691246 writeChan replace ()
15701247 takeMVar lock
15711248 xs <- getAndCheckInitialItems initMap
15721249 checkInitialItems initMap xs
1573− body <- getBody
1250+ body <- WD.findElem (WD.ByTag "body")
15741251 test body chan
15751252 testWidget (pure ()) check $ void $ do
15761253 e <- triggerEventWithChan replace
@@ -1580,26 +1257,24 @@ tests withDebugging wdConfig caps _selenium = do
15801257 (dmap, _evt) <- traverseDMapWithKeyWithAdjustWithMove widget initMap =<< triggerEventWithChan chan
15811258 liftIO $ assertEqual "DMap" initMap dmap
15821259
1583− session' "hydrating invalid HTML" $ do
1584− xit "can hydrate list in paragraph" $ runWD $ do
1585− let preSwitchover = do
1586− checkBodyText "before\ninner\nafter"
1260+ describe "hydrating invalid HTML" $ session' $ do
1261+ it "can hydrate list in paragraph" $ runWD $ do
1262+ let static = do
1263+ body <- WD.findElem (WD.ByTag "body")
1264+ shouldContainText "before\ninner\nafter" body
15871265 -- 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)"
1591− ol <- findElemWithRetry (WD.ByTag "ol")
1266+ [p1, p2] <- WD.findElems (WD.ByTag "p")
1267+ ol <- WD.findElem (WD.ByTag "ol")
15921268 shouldContainText "before" p1
15931269 shouldContainText "inner" ol
15941270 shouldContainText "" p2
1595− pure (p1, ol, p2)
1596− check (p1, ol, p2) = do
1597− checkBodyText "before\ninner\nafter"
1271+ pure (body, p1, ol, p2)
1272+ check (body, p1, ol, p2) = do
1273+ shouldContainText "before\ninner\nafter" body
15981274 shouldContainText "before\ninner\nafter" p1
15991275 elementShouldBeRemoved ol
16001276 elementShouldBeRemoved p2
1601− -- Don't fail fatally when hydration encounters the invalid DOM
1602− testWidgetDebug' False withDebugging preSwitchover check $ do
1277+ testWidget' static check $ do
16031278 -- This is deliberately invalid HTML, the browser will interpret it as
16041279 -- <p>before</p><ol>inner</ol>after<p></p>
16051280 el "p" $ do
@@ -1607,29 +1282,6 @@ tests withDebugging wdConfig caps _selenium = do
16071282 el "ol" $ text "inner"
16081283 text "after"
16091284
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−
16331285data Selenium = Selenium
16341286 { _selenium_portNumber :: PortNumber
16351287 , _selenium_stopServer :: IO ()
@@ -1646,177 +1298,136 @@ startSeleniumServer port = do
16461298
16471299withSeleniumServer :: (Selenium -> IO ()) -> IO ()
16481300withSeleniumServer f = do
1649− stopServer <- startSeleniumServer seleniumPort
1301+ port <- getFreePort
1302+ stopServer <- startSeleniumServer port
16501303 threadDelay $ 1000 * 1000 * 2 -- TODO poll or wait on a a signal to block on
16511304 f $ Selenium
1652− { _selenium_portNumber = seleniumPort
1305+ { _selenium_portNumber = port
16531306 , _selenium_stopServer = stopServer
16541307 }
16551308
1656−triggerEventWithChan :: (Reflex t, TriggerEvent t m, Prerender js t m) => Chan a -> m (Event t a)
1309+triggerEventWithChan :: (Reflex t, TriggerEvent t m, Prerender t m) => Chan a -> m (Event t a)
16571310triggerEventWithChan chan = do
16581311 (e, trigger) <- newTriggerEvent
16591312 -- In prerender because we only want to do this on the client
16601313 prerender_ (pure ()) $ void $ liftIO $ forkIO $ forever $ trigger =<< readChan chan
16611314 pure e
16621315
1663−shouldBeWithRetryM :: (Eq a, Show a) => WD a -> a -> WD ()
1664−shouldBeWithRetryM m expected = withRetry $ do
1665− got <- m
1666− got `shouldBe` expected
1667−
16681316assertAttr :: WD.Element -> Text -> Maybe Text -> WD ()
16691317assertAttr e k v = liftIO . assertEqual "Incorrect attribute value" v =<< WD.attr e k
16701318
16711319elementShouldBeRemoved :: WD.Element -> WD ()
1672−elementShouldBeRemoved e = withRetry $ do
1320+elementShouldBeRemoved e = do
16731321 try (WD.getText e) >>= \case
16741322 Left (WD.FailedCommand WD.StaleElementReference _) -> return ()
16751323 Left err -> throwM err
16761324 Right !_ -> liftIO $ assertFailure "Expected element to be removed, but it still exists"
16771325
16781326shouldContainText :: Text -> WD.Element -> WD ()
1679−shouldContainText t = withRetry . shouldContainTextNoRetry t
1680−
1681−shouldContainTextNoRetry :: Text -> WD.Element -> WD ()
1682−shouldContainTextNoRetry t = flip shouldBe t <=< WD.getText
1327+shouldContainText t = flip shouldBe t <=< WD.getText
16831328
16841329checkBodyText :: Text -> WD ()
16851330checkBodyText = checkTextInTag "body"
16861331
16871332checkTextInTag :: Text -> Text -> WD ()
1688−checkTextInTag t expected = do
1689− e <- findElemWithRetry (WD.ByTag t)
1690− shouldContainText expected e
1333+checkTextInTag t expected = WD.findElem (WD.ByTag t) >>= shouldContainText expected
16911334
16921335checkTextInId :: Text -> Text -> WD ()
1693−checkTextInId i expected = do
1694− e <- findElemWithRetry (WD.ById i)
1695− shouldContainText expected e
1696−
1697−findElemWithRetry :: Selector -> WD WD.Element
1698−findElemWithRetry = withRetry . WD.findElem
1699−
1700−findElemsWithRetry :: Selector -> WD [WD.Element]
1701−findElemsWithRetry = withRetry . WD.findElems
1702−
1703−getBody :: WD WD.Element
1704−getBody = WD.findElem $ WD.ByTag "body"
1705−
1706−withRetry :: forall a. WD a -> WD a
1707−withRetry a = wait 300
1708− where wait :: Int -> WD a
1709− wait 0 = a
1710− wait n = try a >>= \case
1711− Left (e :: SomeException) -> do
1712− liftIO $ putStrLn ("(retrying due to " <> show e <> ")") *> threadDelay 100000
1713− wait $ n - 1
1714− Right v -> return v
1336+checkTextInId i expected = WD.findElem (WD.ById i) >>= shouldContainText expected
17151337
17161338divId :: DomBuilder t m => Text -> m a -> m a
17171339divId i = elAttr "div" ("id" =: i)
17181340
1719−type TestWidget js t m = (DomBuilder t m, MonadHold t m, PostBuild t m, Prerender js t m, PerformEvent t m, TriggerEvent t m, MonadFix m, MonadIO (Performable m), MonadIO m)
1341+type TestWidget n t m = (DomBuilder t m, MonadHold t m, PostBuild t m, Prerender t m, PerformEvent t m, TriggerEvent t m, MonadFix m, MonadIO (Performable m), MonadIO m)
17201342
1721−testWidgetStaticDebug
1722− :: Bool
1723− -> WD b
1343+testWidgetStatic
1344+ :: WD b
17241345 -- ^ Webdriver commands to run before JS runs and after hydration switchover
17251346 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17261347 -- ^ Widget we are testing
17271348 -> WD b
1728−testWidgetStaticDebug withDebugging w = testWidgetDebug True withDebugging (void w) w
1349+testWidgetStatic w = testWidget (void w) w
17291350
17301351-- | TODO: do something about JSExceptions not causing tests to fail
1731−testWidgetDebug
1732− :: Bool
1733− -> Bool
1734− -> WD ()
1352+testWidget
1353+ :: WD ()
17351354 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17361355 -> WD b
17371356 -- ^ Webdriver commands to run after hydration switchover
17381357 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17391358 -- ^ Widget we are testing
17401359 -> 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
1360+testWidget beforeJS afterSwitchover = testWidget' beforeJS (const afterSwitchover)
17461361
17471362-- | TODO: do something about JSExceptions not causing tests to fail
1748−testWidgetDebug'
1749− :: Bool
1750− -> Bool
1751− -> WD a
1363+testWidget'
1364+ :: WD a
17521365 -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
17531366 -> (a -> WD b)
17541367 -- ^ Webdriver commands to run after hydration switchover
17551368 -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
17561369 -- ^ Widget we are testing (contents of body)
17571370 -> WD b
1758−testWidgetDebug' hardFailure withDebugging beforeJS afterSwitchover bodyWidget = do
1759− let putStrLnDebug :: MonadIO m => Text -> m ()
1760− putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
1761− staticApp = do
1371+testWidget' beforeJS afterSwitchover bodyWidget = maybe (error "test timed out") pure <=< timeout testTimeLimit $ do
1372+ let staticApp = do
17621373 el "head" $ pure ()
17631374 el "body" $ do
17641375 bodyWidget
17651376 el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1766− putStrLnDebug "rendering static"
1767− ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
1768− putStrLnDebug "rendered static"
1377+ ((), html) <- liftIO $ renderStatic staticApp
17691378 waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
1770− onFailure <- if hardFailure then (`throwTo` HydrationFailedException) <$> liftIO myThreadId else pure $ pure ()
17711379 waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
17721380 let entryPoint = do
1773− putStrLnDebug "taking waitBeforeJS"
17741381 liftIO $ takeMVar waitBeforeJS
1775− let switchOverAction = do
1776− putStrLnDebug "switchover syncPoint"
1777− syncPoint
1778− putStrLnDebug "putting waitUntilSwitchover"
1779− liftIO $ putMVar waitUntilSwitchover ()
1780− putStrLnDebug "put waitUntilSwitchover"
1781− putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
1782− mainHydrationWidgetWithSwitchoverActionWithFailure' onFailure switchOverAction blank bodyWidget
1783− putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
1382+ mainHydrationWidgetWithSwitchoverAction (putMVar waitUntilSwitchover ()) (pure ()) bodyWidget
17841383 syncPoint
1785− application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
1786− putStrLnDebug "sending response"
1787− r <- sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
1788− putStrLnDebug "sent response"
1789− return r
1384+ application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse ->
1385+ sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
1386+ port <- getFreePort
17901387 waitJSaddle <- liftIO newEmptyMVar
17911388 let settings = foldr ($) Warp.defaultSettings
1792− [ Warp.setPort $ fromIntegral $ toInteger jsaddlePort
1793− , Warp.setBeforeMainLoop $ do
1794− putStrLnDebug "putting waitJSaddle"
1795− putMVar waitJSaddle ()
1796− putStrLnDebug "put waitJSaddle"
1389+ [ Warp.setPort $ fromIntegral (toInteger port)
1390+ , Warp.setBeforeMainLoop $ putMVar waitJSaddle ()
17971391 ]
17981392 -- hSilence to get rid of ConnectionClosed logs
1799− silenceIfDebug = if withDebugging then id else hSilence [stderr]
1800− jsaddleWarp = silenceIfDebug $ Warp.runSettings settings application
1801− withAsync' jsaddleWarp $ do
1802− putStrLnDebug "taking waitJSaddle"
1803− liftIO $ takeMVar waitJSaddle
1804− putStrLnDebug "opening page"
1805− WD.openPage $ "http://localhost:" <> show jsaddlePort
1806− putStrLnDebug "running beforeJS"
1807− a <- beforeJS
1808− putStrLnDebug "putting waitBeforeJS"
1809− liftIO $ putMVar waitBeforeJS ()
1810− putStrLnDebug "taking waitUntilSwitchover"
1811− liftIO $ takeMVar waitUntilSwitchover
1812− putStrLnDebug "running afterSwitchover"
1813− afterSwitchover a
1393+ jsaddleWarp = forkIO $ hSilence [stderr] $ Warp.runSettings settings application
1394+ jsaddleTid <- liftIO jsaddleWarp
1395+ liftIO $ takeMVar waitJSaddle
1396+ WD.openPage $ "http://localhost:" <> show port
1397+ a <- beforeJS
1398+ liftIO $ putMVar waitBeforeJS ()
1399+ liftIO $ takeMVar waitUntilSwitchover
1400+ liftIO $ threadDelay 100000 -- wait a bit
1401+ b <- afterSwitchover a
1402+ liftIO $ killThread jsaddleTid
1403+ return b
1404+
18141405
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)
1406+-- TODO: Should this be part of more widely used module?
1407+-- TODO: Ensure port is not taken
1408+getFreePort :: MonadIO m => m PortNumber
1409+getFreePort = liftIO $ withSocketsDo $ do
1410+ addr:_ <- getAddrInfo (Just defaultHints) (Just "127.0.0.1") (Just "0")
1411+ bracket (open addr) close socketPort
1412+ where
1413+ open addr = do
1414+ sock <- socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr)
1415+ bind sock (addrAddress addr)
1416+ return sock
1417+
1418+testWidgetDebug :: MonadIO n => (forall m js. TestWidget js (SpiderTimeline Global) m => m ()) -> n ()
1419+testWidgetDebug bodyWidget = liftIO $ do
1420+ let staticApp = do
1421+ el "head" $ pure ()
1422+ el "body" $ do
1423+ bodyWidget
1424+ el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
1425+ ((), html) <- renderStatic staticApp
1426+ let entryPoint = do
1427+ mainHydrationWidgetWithSwitchoverAction (pure ()) (pure ()) bodyWidget
1428+ syncPoint
1429+ application <- jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
1430+ Warp.runSettings (Warp.setPort 3911 Warp.defaultSettings) application
18201431
18211432data Key2 a where
18221433 Key2_Int :: Int -> Key2 Int
@@ -1825,4 +1436,18 @@ data Key2 a where
18251436deriveGEq ''Key2
18261437deriveGCompare ''Key2
18271438deriveGShow ''Key2
1828−deriveArgDict ''Key2
1439+
1440+instance ShowTag Key2 Identity where
1441+ showTaggedPrec = \case
1442+ Key2_Int _ -> showsPrec
1443+ Key2_Char _ -> showsPrec
1444+
1445+instance EqTag Key2 Identity where
1446+ eqTagged (Key2_Int _) (Key2_Int _) = (==)
1447+ eqTagged (Key2_Char _) (Key2_Char _) = (==)
1448+
1449+instance ArgDict Key2 where
1450+ type ConstraintsFor Key2 c = (c Int, c Char)
1451+ argDict = \case
1452+ Key2_Int _ -> Dict
1453+ Key2_Char _ -> Dict
reflex-dom-test-selenium/CHANGELOG.mddeleted−5
@@ -1,5 +0,0 @@
1−# Revision history for reflex-dom-core-selenium
2−
3−## 0.1.0.0 -- YYYY-mm-dd
4−
5−* First version. Released on an unsuspecting world.
reflex-dom-test-selenium/LICENSEdeleted−12
@@ -1,12 +0,0 @@
1−Copyright (c) 2020, Obsidian Systems LLC
2−All rights reserved.
3−
4−Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
5−
6−1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
7−
8−2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
9−
10−3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
11−
12−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
reflex-dom-test-selenium/Setup.hsdeleted−2
@@ -1,2 +0,0 @@
1−import Distribution.Simple
2−main = defaultMain
reflex-dom-test-selenium/add-overrides.nixdeleted−20
@@ -1,20 +0,0 @@
1−{ nixpkgs }: testPackage:
2− nixpkgs.haskell.lib.overrideCabal testPackage
3− (drv: {
4−
5− # The headless browser run as part of the tests will exit without this
6− preBuild = ''
7− export HOME="$PWD"
8− '';
9−
10− testSystemDepends = with nixpkgs; (drv.testSystemDepends or []) ++ [
11− selenium-server-standalone which
12− chromium
13− nixpkgs.iproute
14− ];
15−
16− # The headless browser run as part of gc tests would hang/crash without this
17− preCheck = ''
18− export FONTCONFIG_PATH=${nixpkgs.fontconfig.out}/etc/fonts
19− '';
20− })
reflex-dom-test-selenium/reflex-dom-test-selenium.cabaldeleted−41
@@ -1,41 +0,0 @@
1−cabal-version: 1.24
2−Name: reflex-dom-test-selenium
3−Version: 0.0.0.1
4−Synopsis: Testing framework for selenium tests
5−Description:
6−License: BSD3
7−License-file: LICENSE
8−Author: Ryan Trinkle
9−Maintainer: ryan.trinkle@gmail.com
10−Stability: Experimental
11−Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
12−Build-type: Simple
13−
14−library
15− hs-source-dirs: src
16− build-depends:
17− async,
18− base >= 4.7 && < 4.15,
19− bytestring == 0.10.*,
20− chrome-test-utils,
21− exceptions,
22− hspec-core,
23− hspec-webdriver >= 1.2.1,
24− http-types,
25− jsaddle >= 0.9.0.0 && < 0.10,
26− jsaddle-warp,
27− network,
28− process,
29− reflex-dom-core,
30− silently,
31− text == 1.2.*,
32− wai,
33− warp,
34− webdriver,
35− websockets
36−
37− exposed-modules:
38− Reflex.Dom.Test.Selenium
39−
40− default-language: Haskell98
41− ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
reflex-dom-test-selenium/src/Reflex/Dom/Test/Selenium.hsdeleted−249
@@ -1,249 +0,0 @@
1−{-# LANGUAGE ConstraintKinds #-}
2−{-# LANGUAGE FlexibleContexts #-}
3−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
4−{-# LANGUAGE OverloadedStrings #-}
5−{-# LANGUAGE RankNTypes #-}
6−{-# LANGUAGE ScopedTypeVariables #-}
7−{-# LANGUAGE StandaloneDeriving #-}
8−{-# LANGUAGE TemplateHaskell #-}
9−
10−{-# OPTIONS_GHC -fno-warn-orphans #-}
11−
12−-- | Utilities for testing reflex-dom widgets with Selenium.
13−--
14−-- Any uses of the 'testWidget' functions will start a jsaddle warp server and
15−-- serve the given widget in an otherwise empty page. Webdriver commands can run
16−-- on the statically rendered page, and on the hydrated page.
17−module Reflex.Dom.Test.Selenium
18− ( TestWidget
19− , TestWidgetConfig (..)
20− , testWidget, testWidget', testWidgetStatic, testWidgetHydrated
21− , withSeleniumSpec
22− , embedSpec
23− , SeleniumSetupConfig (..)
24− ) where
25−
26−import Control.Concurrent (threadDelay, newEmptyMVar, takeMVar, putMVar)
27−import Control.Exception (throwIO)
28−import Control.Monad (when)
29−import Control.Monad.Catch (MonadMask, handle)
30−import Control.Monad.Fix (MonadFix)
31−import Control.Monad.IO.Class (MonadIO, liftIO)
32−import Data.Text (Text)
33−import Language.Javascript.JSaddle
34−import Language.Javascript.JSaddle.Warp
35−import Network.HTTP.Types (status200)
36−import Network.Socket (PortNumber)
37−import Network.Wai (responseLBS)
38−import Network.WebSockets (defaultConnectionOptions)
39−import Reflex.Dom.Core
40−import System.IO (stderr)
41−import System.IO.Silently (hSilence)
42−import System.Process (std_in, std_out, std_err, createProcess, proc, StdStream (..), terminateProcess)
43−import Test.Hspec.WebDriver (Spec, SpecWith, WdTestSession, sessionWith, using)
44−import Test.Util.ChromeFlags
45−import Test.Util.UnshareNetwork
46−import Test.WebDriver (WD)
47−
48−import qualified Control.Concurrent.Async as Async
49−import qualified Data.ByteString.Lazy as LBS
50−import qualified Data.Text as T
51−import qualified Data.Text.Encoding as TE
52−import qualified Network.Wai.Handler.Warp as Warp
53−import qualified Test.Hspec.Core.Spec as Hspec
54−import qualified Test.WebDriver as WD
55−import qualified Test.WebDriver.Capabilities as WD
56−
57−deriving instance MonadMask WD
58−
59−data SeleniumSetupConfig = SeleniumSetupConfig
60− { _seleniumSetupConfig_chromiumPath :: FilePath
61− -- ^ Path to the chromium executable
62− , _seleniumSetupConfig_headless :: Bool
63− -- ^ True means that the browser is invoked in headless mode, False means that
64− -- the user can see the interaction happening on the browser (useful for debugging).
65− , _seleniumSetupConfig_seleniumPort :: PortNumber
66− -- ^ The port number used by selenium
67− }
68−
69−-- | Setup a selenium server and use it to run some hspec tests.
70−--
71−-- withSeleniumSpec config $ \runSession -> hspec $ do
72−-- describe "tests using webdriver session" $ runSession $ do
73−-- webdriver tests here
74−withSeleniumSpec :: SeleniumSetupConfig -> ((forall multi. SpecWith (WdTestSession multi) -> Spec) -> IO a) -> IO a
75−withSeleniumSpec config runSpec = do
76− liftIO $ handle (\(_ :: IOError) -> return ()) $ unshareNetork -- If we run into an exception with sandboxing, just don't bother
77− withSandboxedChromeFlags (_seleniumSetupConfig_headless config) $ \chromeFlags -> do
78− withSeleniumServer (_seleniumSetupConfig_seleniumPort config) $ do
79− let browserPath = T.strip $ T.pack $ _seleniumSetupConfig_chromiumPath config
80− when (T.null browserPath) $ fail "No browser found"
81− let wdConfig = WD.defaultConfig { WD.wdPort = fromIntegral $ _seleniumSetupConfig_seleniumPort config }
82− chromeCaps' = WD.getCaps $ chromeConfig browserPath chromeFlags
83− runSpec $ sessionWith wdConfig "" . using [(chromeCaps', "chrome")]
84−
85−startSeleniumServer :: PortNumber -> IO (IO ())
86−startSeleniumServer port = do
87− (_,_,_,ph) <- createProcess $ (proc "selenium-server" ["-port", show port])
88− { std_in = NoStream
89− , std_out = NoStream
90− , std_err = NoStream
91− }
92− return $ terminateProcess ph
93−
94−withSeleniumServer :: PortNumber -> IO a -> IO a
95−withSeleniumServer port f = bracket (startSeleniumServer port) id $ \_ -> do
96− threadDelay $ 1000 * 1000 * 2 -- TODO poll or wait on a a signal to block on
97− f
98−
99−chromeConfig :: Text -> [Text] -> WD.WDConfig
100−chromeConfig fp flags =
101− WD.useBrowser
102− (WD.chrome { WD.chromeBinary = Just $ T.unpack fp, WD.chromeOptions = T.unpack <$> flags })
103− WD.defaultConfig
104−
105−--------------------------------------------------------------------------------
106−-- Function to test widgets
107−--------------------------------------------------------------------------------
108−
109−-- | The environment in which your widgets can be tested
110−type TestWidget js t m =
111− (DomBuilder t m, MonadHold t m, PostBuild t m
112− , Prerender js t m, PerformEvent t m, TriggerEvent t m
113− , MonadFix m, MonadIO (Performable m), MonadIO m)
114−
115−-- | Configuration of individual tests
116−data TestWidgetConfig = TestWidgetConfig
117− { _testWidgetConfig_debug :: Bool
118− -- ^ If this flag is set to True, during the test we will emit debug messages
119− , _testWidgetConfig_headWidget :: (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
120− -- ^ We can add widgets here that will be included in the head of the page
121− -- (useful for example to include external js libraries in the tests)
122− , _testWidgetConfig_jsaddlePort :: PortNumber
123− -- ^ Port used by the jsaddle server
124− }
125−
126−-- | Test a widget by running some webdriver commands before and after
127−-- hydration.
128−testWidget
129− :: TestWidgetConfig
130− -> WD a
131− -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
132− -> WD b
133− -- ^ Webdriver commands to run after hydration switchover
134− -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
135− -- ^ Widget we are testing (contents of body)
136− -> WD b
137−testWidget cfg before after widget = testWidget' cfg before (const after) widget
138−
139−-- | Test a widget by running some webdriver commands before hydration (on the
140−-- statically rendered page).
141−testWidgetStatic
142− :: TestWidgetConfig
143− -> WD a
144− -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
145− -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
146− -- ^ Widget we are testing (contents of body)
147− -> WD a
148−testWidgetStatic cfg before widget = testWidget' cfg before pure widget
149−
150−-- | Test a widget by running some webdriver commands after hydration.
151−testWidgetHydrated
152− :: TestWidgetConfig
153− -> WD b
154− -- ^ Webdriver commands to run after hydration switchover
155− -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
156− -- ^ Widget we are testing (contents of body)
157− -> WD b
158−testWidgetHydrated cfg after widget = testWidget' cfg (pure ()) (const after) widget
159−
160−-- | Test a widget by running some webdriver commands before and after
161−-- hydration. Like 'testWidget', but you can use the result of the webdriver
162−-- commands from before hydration in the post hydration test.
163−testWidget'
164− :: TestWidgetConfig
165− -> WD a
166− -- ^ Webdriver commands to run before the JS runs (i.e. on the statically rendered page)
167− -> (a -> WD b)
168− -- ^ Webdriver commands to run after hydration switchover
169− -> (forall m js. TestWidget js (SpiderTimeline Global) m => m ())
170− -- ^ Widget we are testing (contents of body)
171− -> WD b
172−testWidget' (TestWidgetConfig withDebugging headWidget jsaddlePort) beforeJS afterSwitchover bodyWidget = do
173− let putStrLnDebug :: MonadIO m => Text -> m ()
174− putStrLnDebug m = when withDebugging $ liftIO $ putStrLn $ T.unpack m
175− staticApp = do
176− el "head" $ headWidget
177− el "body" $ do
178− bodyWidget
179− el "script" $ text $ TE.decodeUtf8 $ LBS.toStrict $ jsaddleJs False
180− putStrLnDebug "rendering static"
181− ((), html) <- liftIO $ renderStatic $ runHydratableT staticApp
182− putStrLnDebug "rendered static"
183− waitBeforeJS <- liftIO newEmptyMVar -- Empty until JS should be run
184− waitUntilSwitchover <- liftIO newEmptyMVar -- Empty until switchover
185− let entryPoint = do
186− putStrLnDebug "taking waitBeforeJS"
187− liftIO $ takeMVar waitBeforeJS
188− let switchOverAction = do
189− putStrLnDebug "switchover syncPoint"
190− syncPoint
191− putStrLnDebug "putting waitUntilSwitchover"
192− liftIO $ putMVar waitUntilSwitchover ()
193− putStrLnDebug "put waitUntilSwitchover"
194− putStrLnDebug "running mainHydrationWidgetWithSwitchoverAction"
195− mainHydrationWidgetWithSwitchoverAction switchOverAction blank bodyWidget
196− putStrLnDebug "syncPoint after mainHydrationWidgetWithSwitchoverAction"
197− syncPoint
198− application <- liftIO $ jsaddleOr defaultConnectionOptions entryPoint $ \_ sendResponse -> do
199− putStrLnDebug "sending response"
200− r <- sendResponse $ responseLBS status200 [] $ "<!doctype html>\n" <> LBS.fromStrict html
201− putStrLnDebug "sent response"
202− return r
203− waitJSaddle <- liftIO newEmptyMVar
204− let settings = foldr ($) Warp.defaultSettings
205− [ Warp.setPort $ fromIntegral $ toInteger jsaddlePort
206− , Warp.setBeforeMainLoop $ do
207− putStrLnDebug "putting waitJSaddle"
208− putMVar waitJSaddle ()
209− putStrLnDebug "put waitJSaddle"
210− ]
211− -- hSilence to get rid of ConnectionClosed logs
212− silenceIfNotDebugging = if withDebugging then id else hSilence [stderr]
213− jsaddleWarp = silenceIfNotDebugging $ Warp.runSettings settings application
214− withAsync' jsaddleWarp $ do
215− putStrLnDebug "taking waitJSaddle"
216− liftIO $ takeMVar waitJSaddle
217− putStrLnDebug "opening page"
218− WD.openPage $ "http://localhost:" <> show jsaddlePort
219− putStrLnDebug "running beforeJS"
220− a <- beforeJS
221− putStrLnDebug "putting waitBeforeJS"
222− liftIO $ putMVar waitBeforeJS ()
223− putStrLnDebug "taking waitUntilSwitchover"
224− liftIO $ takeMVar waitUntilSwitchover
225− putStrLnDebug "running afterSwitchover"
226− afterSwitchover a
227−
228−--------------------------------------------------------------------------------
229−-- Utilities
230−--------------------------------------------------------------------------------
231−
232−-- | Embed a different spec type by evaluating it directly.
233−embedSpec :: (Hspec.Example a, MonadIO m) => Hspec.Arg a -> a -> m ()
234−embedSpec arg spec = liftIO $ do
235− Hspec.Result _info status <- Hspec.evaluateExample
236− spec
237− Hspec.defaultParams
238− (\actionWith -> actionWith arg)
239− (\_ -> pure ())
240− case status of
241− Hspec.Success -> pure ()
242− Hspec.Pending _ _ -> pure () -- should not happen
243− failure -> throwIO failure
244−
245−withAsync' :: (MonadIO m, MonadMask m) => IO a -> m b -> m b
246−withAsync' f g = bracket
247− (liftIO $ Async.async f)
248− (liftIO . Async.uninterruptibleCancel)
249− (const g)
reflex-dom/ChangeLog.mddeleted−42
@@ -1,42 +0,0 @@
1−# Revision history for reflex-dom
2−
3−## 0.6.1.0-r1
4−
5−* Loosen reflex-dom-core version bounds
6−
7−## 0.6.1.0
8−
9−* Update for new dependent-map and dependent-sum (after the "some" package split)
10−
11−## 0.6.0.0
12−
13−* ([#379](https://github.com/reflex-frp/reflex-dom/pull/379)) Re-export all modules from `reflex-dom-core`. The newly re-exported modules are:
14− * `Foreign.JavaScript.Utils`
15− * `Reflex.Dom.Builder.Hydratable`
16− * `Reflex.Dom.Modals.Class`
17− * `Reflex.Dom.Prerender`
18− * `Reflex.Dom.Time`
19− * `Reflex.Dom.WebSocket.Query`
20− * `Reflex.Dom.Xhr.FormData`
21−* ([#366](https://github.com/reflex-frp/reflex-dom/pull/366)) Bump bounds for `reflex` to include 0.7.
22−
23−## 0.5.3
24−
25−* On Android, enable prompting the user for geolocation
26− permissions on demand by default. See
27− https://developer.android.com/reference/android/webkit/WebChromeClient.html#onGeolocationPermissionsShowPrompt(java.lang.String,%20android.webkit.GeolocationPermissions.Callback)
28− for details.
29−
30− * Add `< 0.7` upper bound for reflex
31−
32−## 0.5.2
33−
34−* The default jsaddle backend on macOS when built from nix
35− is now jsaddle-wkwebview, matching the behaviour of cabal
36− builds.
37−
38−## 0.5
39−
40−* Re-export new hydration widget "mainWidget" functions.
41−
42−* The use-warp flag now properly takes precedence on macOS.
reflex-dom/LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2020, Obsidian Systems LLC
1+Copyright (c) 2015, Obsidian Systems LLC
22All rights reserved.
33
44Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
reflex-dom/benchmark.hs+1−2
@@ -15,9 +15,8 @@ import qualified Data.Text as T
1515import Reflex.Dom
1616import System.Random
1717import qualified Data.Map as Map
18−import Data.Dependent.Map (DMap (..))
18+import Data.Dependent.Map (DMap (..), DSum (..))
1919import qualified Data.Dependent.Map as DMap
20−import Data.Dependent.Sum (DSum (..))
2120import Data.Functor.Misc
2221import Data.Functor.Identity
2322import Data.Functor.Compose
reflex-dom/default.nixnew file+37
@@ -0,0 +1,37 @@
1+{ mkDerivation, base, bytestring, jsaddle-webkit2gtk, jsaddle-wkwebview, jsaddle-warp, reflex
2+, reflex-dom-core, stdenv, text, ghc, hostPlatform, jsaddle-clib, android-activity ? null
3+, ghcBackend ? if hostPlatform.isDarwin then "warp" else "webkit2gtk"
4+}:
5+assert (builtins.elem ghcBackend [ "warp" "webkit2gtk" ]);
6+let isAndroid = hostPlatform.libc == "bionic";
7+ ghcBackendPackage = {
8+ webkit2gtk = jsaddle-webkit2gtk;
9+ warp = jsaddle-warp;
10+ }.${ghcBackend};
11+in mkDerivation {
12+ pname = "reflex-dom";
13+ version = "0.4";
14+ src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;
15+ libraryHaskellDepends = [
16+ base bytestring reflex reflex-dom-core text
17+ ] ++ (if ghc.isGhcjs or false then [
18+ ] else if hostPlatform.isiOS then [
19+ jsaddle-wkwebview
20+ ] else if isAndroid then [
21+ jsaddle-clib
22+ android-activity
23+ ] else if hostPlatform.isMacOS then [
24+ jsaddle-wkwebview
25+ ghcBackendPackage
26+ ] else [
27+ ghcBackendPackage
28+ ]);
29+ configureFlags = if isAndroid then [
30+ "-fandroid"
31+ ] else if ghcBackend == "warp" then [
32+ "-fuse-warp"
33+ ] else [
34+ ];
35+ description = "Functional Reactive Web Apps with Reflex";
36+ license = stdenv.lib.licenses.bsd3;
37+}
reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java+1−14
@@ -8,7 +8,6 @@ import android.util.Log;
88import android.view.ViewGroup.LayoutParams;
99import android.view.Window;
1010import android.webkit.CookieManager;
11−import android.webkit.GeolocationPermissions;
1211import android.webkit.JavascriptInterface;
1312import android.webkit.MimeTypeMap;
1413import android.webkit.PermissionRequest;
@@ -23,7 +22,6 @@ import java.io.IOException;
2322import java.io.InputStream;
2423import android.content.Intent;
2524import android.content.ActivityNotFoundException;
26−import java.util.concurrent.atomic.AtomicBoolean;
2725
2826import java.nio.charset.StandardCharsets;
2927
@@ -47,17 +45,11 @@ public class MainWidget {
4745 wv.setWebContentsDebuggingEnabled(true);
4846 // allow video to play without user interaction
4947 wv.getSettings().setMediaPlaybackRequiresUserGesture(false);
50− final AtomicBoolean jsaddleLoaded = new AtomicBoolean(false);
5148
5249 wv.setWebViewClient(new WebViewClient() {
5350 @Override
5451 public void onPageFinished(WebView _view, String _url) {
55− Log.i("reflex", "onPageFinished");
56− boolean alreadyLoaded = jsaddleLoaded.getAndSet(true);
57− if(!alreadyLoaded) {
58− Log.i("reflex", "loading jsaddle");
59− wv.evaluateJavascript(initialJS, null);
60− }
52+ wv.evaluateJavascript(initialJS, null);
6153 }
6254
6355 // Re-route / to /android_asset
@@ -123,11 +115,6 @@ public class MainWidget {
123115 public Bitmap getDefaultVideoPoster() {
124116 return Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888);
125117 }
126−
127− @Override
128− public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) {
129− callback.invoke(origin, true, false);
130− }
131118 });
132119
133120 wv.addJavascriptInterface(new JSaddleCallbacks(jsaddleCallbacks), "jsaddle");
reflex-dom/reflex-dom.cabal+36−85
@@ -1,20 +1,7 @@
1−cabal-version: 1.24
21Name: reflex-dom
3−Version: 0.6.1.0
2+Version: 0.4
43Synopsis: Functional Reactive Web Apps with Reflex
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@.
16− .
17− For Hackage documentation, please see: <https://hackage.haskell.org/package/reflex-dom-core>.
4+Description: Reflex-DOM is a Functional Reactive web framework based on the Reflex FRP engine
185License: BSD3
196License-file: LICENSE
207Author: Ryan Trinkle
@@ -22,9 +9,13 @@ Maintainer: ryan.trinkle@gmail.com
229Stability: Experimental
2310Category: FRP, Web, GUI, HTML, Javascript, Reactive, Reactivity, User Interfaces, User-interface
2411Build-type: Simple
25−extra-source-files:
26− java/org/reflexfrp/reflexdom/MainWidget.java
27− ChangeLog.md
12+cabal-version: >=1.24
13+-- Deal with https://github.com/haskell/cabal/issues/2544 / https://github.com/haskell/cabal/issues/367
14+extra-source-files: src/Reflex/Dom/Xhr/Foreign.hs
15+ src/Reflex/Dom/WebSocket/Foreign.hs
16+ src/Reflex/Dom/Xhr/ResponseType.hs
17+ src/Reflex/Dom/Xhr/Exception.hs
18+ java/org/reflexfrp/reflexdom/MainWidget.java
2819
2920flag use-warp
3021 description: Use jsaddle-warp server
@@ -50,67 +41,59 @@ 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
70− install-includes: MainWidget.h
7161 cpp-options: -DANDROID
7262 build-tools: hsc2hs
7363 build-depends:
74− base >= 4.7 && < 4.15,
64+ base >= 4.7 && < 4.12,
7565 bytestring == 0.10.*,
76− reflex >= 0.8 && < 0.9,
77− reflex-dom-core >= 0.6.1.0 && <0.7,
66+ reflex == 0.5.*,
67+ reflex-dom-core >=0.4 && <0.5,
7868 text == 1.2.*
7969 if !impl(ghcjs)
80− if flag(use-warp) && (os(linux) || os(osx))
70+ if os(osx) || os(ios)
8171 build-depends:
82− jsaddle >= 0.9.6 && < 0.10,
83− jsaddle-warp >= 0.9.6 && < 0.10
72+ data-default == 0.7.*,
73+ jsaddle,
74+ jsaddle-wkwebview
8475 else
85− if os(osx) || os(ios)
76+ if flag(use-warp)
8677 build-depends:
87− data-default == 0.7.*,
88− jsaddle >= 0.9.6 && < 0.10,
89− jsaddle-wkwebview >= 0.9.6 && < 0.10
78+ jsaddle,
79+ jsaddle-warp
9080 else
91− if flag(wasm32)
81+ if flag(webkit2gtk)
9282 build-depends:
93− jsaddle >= 0.9.6 && < 0.10,
94− jsaddle-wasm >= 0.1 && < 0.2
83+ jsaddle-webkit2gtk
9584 else
96− if flag(webkit2gtk)
85+ if !flag(android)
9786 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
87+ jsaddle-webkit2gtk
10388
10489 exposed-modules:
10590 Reflex.Dom
10691 Reflex.Dom.Internal
10792 reexported-modules:
108− Foreign.JavaScript.Orphans
109− , Foreign.JavaScript.TH
110− , Foreign.JavaScript.Utils
93+ Foreign.JavaScript.TH
94+ , Foreign.JavaScript.Orphans
11195 , Reflex.Dom.Builder.Class
11296 , Reflex.Dom.Builder.Class.Events
113− , Reflex.Dom.Builder.Hydratable
11497 , Reflex.Dom.Builder.Immediate
11598 , Reflex.Dom.Builder.InputDisabled
11699 , Reflex.Dom.Builder.Static
@@ -118,25 +101,19 @@ library
118101 , Reflex.Dom.Core
119102 , Reflex.Dom.Location
120103 , Reflex.Dom.Main
121− , Reflex.Dom.Modals.Class
122104 , Reflex.Dom.Old
123− , Reflex.Dom.Prerender
124− , Reflex.Dom.Time
125105 , Reflex.Dom.WebSocket
126− , Reflex.Dom.WebSocket.Query
127106 , Reflex.Dom.Widget
128107 , Reflex.Dom.Widget.Basic
129108 , Reflex.Dom.Widget.Input
130109 , Reflex.Dom.Widget.Lazy
131110 , Reflex.Dom.Widget.Resize
132111 , Reflex.Dom.Xhr
133− , Reflex.Dom.Xhr.FormData
134112 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans
135113 if flag(expose-all-unfoldings)
136114 ghc-options: -fexpose-all-unfoldings
137115 if flag(use-reflex-optimizer)
138116 ghc-options: -fplugin=Reflex.Optimizer
139− default-language: Haskell2010
140117
141118executable sortableList
142119 build-depends: base
@@ -153,59 +130,33 @@ executable sortableList
153130 hs-source-dirs: examples
154131 main-is: sortableList.hs
155132 ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively
133+ ghc-prof-options: -fprof-auto
156134 if !flag(build-examples)
157135 buildable: False
158136 if flag(expose-all-unfoldings)
159137 ghc-options: -fexpose-all-unfoldings
160138 if flag(use-reflex-optimizer)
161139 ghc-options: -fplugin=Reflex.Optimizer
162− default-language: Haskell2010
163140
164141executable benchmark
165− build-depends: base
166− , containers
167− , dependent-map
168− , dependent-sum
169− , ghc-prim
170− , ghcjs-dom
171− , mtl
172− , prim-uniq
173− , random
174− , reflex
175− , reflex-dom
176− , text
177− , transformers
142+ build-depends: base, reflex, reflex-dom, text, prim-uniq, dependent-map, containers, transformers, mtl, ghcjs-dom, ghc-prim, random, dependent-sum
178143 hs-source-dirs: .
179144 main-is: benchmark.hs
180145 ghc-options: -O2 -fspecialise-aggressively
181146 if !impl(ghcjs)
182147 buildable: False
183− default-language: Haskell2010
184148
185149executable 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
150+ build-depends: base, reflex, reflex-dom, text, prim-uniq, dependent-map, containers, transformers, mtl, ghcjs-dom, ghc-prim, random, dependent-sum, vector
200151 hs-source-dirs: benchmarks
201152 main-is: krausest.hs
202153 ghc-options: -O2 -fspecialise-aggressively
203154 if impl(ghcjs)
204− ghcjs-options: -dedupe
155+ ghc-options: -dedupe
205156 cpp-options: -DGHCJS_BROWSER -DGHCJS_GC_INTERVAL=60000
206157 else
207− buildable: False
208− default-language: Haskell2010
158+ --buildable: False
159+ type: exitcode-stdio-1.0
209160
210161source-repository head
211162 type: git
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
release.nixdeleted−63
@@ -1,63 +0,0 @@
1−{ reflex-platform-fun ? import ./dep/reflex-platform
2−, supportedSystems ? ["x86_64-linux" "x86_64-darwin"]
3−}:
4−
5−let
6− native-reflex-platform = reflex-platform-fun {};
7− inherit (native-reflex-platform.nixpkgs) lib;
8−
9− tests = system: import ./test { pkgs = (reflex-platform-fun { inherit system; }).nixpkgs; };
10−
11− perPlatform = lib.genAttrs supportedSystems (system: let
12− reflex-platform = reflex-platform-fun { inherit system; };
13− compilers = [
14− "ghc"
15− "ghcjs"
16− ] ++ lib.optionals (reflex-platform.androidSupport) [
17− "ghcAndroidAarch64"
18− "ghcAndroidAarch32"
19− ] ++ lib.optionals (reflex-platform.iosSupport) [
20− "ghcIosAarch64"
21− ];
22− compilerPkgs = lib.genAttrs compilers (ghc: let
23− reflex-platform = reflex-platform-fun {
24− inherit system;
25− haskellOverlays = [
26− # Use this package's source for reflex
27− (self: super: {
28− _dep = super._dep // {
29− reflex-dom = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
30− ".git"
31− "dist"
32− "dist-newstyle"
33− ]) && !(builtins.elem path [
34− ./CONTRIBUTING.md
35− ./FAQ.md
36− ./Quickref.md
37− ./README.md
38− ./release.nix
39− ./test
40− ])) ./.;
41− };
42− })
43− ];
44− };
45− all = tests system // {
46− inherit (reflex-platform.${ghc})
47− reflex-dom-core
48− reflex-dom
49− ;
50− };
51− in all // {
52− cache = reflex-platform.pinBuildInputs "reflex-${system}-${ghc}"
53− (builtins.attrValues all);
54− });
55− in compilerPkgs // {
56− cache = reflex-platform.pinBuildInputs "reflex-${system}"
57− (map (a: a.cache) (builtins.attrValues compilerPkgs));
58− });
59−
60− metaCache = native-reflex-platform.pinBuildInputs "reflex-dom-everywhere"
61− (map (a: a.cache) (builtins.attrValues perPlatform));
62−
63−in perPlatform // { inherit metaCache; }
test/default.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)