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