Skip to content

Commit 9378211

Browse files
committed
Update to v0.15.0
1 parent 7a1eed0 commit 9378211

File tree

8 files changed

+92
-71
lines changed

8 files changed

+92
-71
lines changed

Diff for: packages.dhall

+17-2
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,21 @@ in upstream
105105
-------------------------------
106106
-}
107107
let upstream =
108-
https://github.com/purescript/package-sets/releases/download/psc-0.14.0-20210309/packages.dhall sha256:585332a8a11c6420d7287943f81bc2121746cdd352f2cf3f5ecf65053f2afcd3
108+
https://github.com/purescript/package-sets/releases/download/psc-0.15.0-20220510/packages.dhall
109+
sha256:0b0d4db1f2f0acd3b37fa53220644ac6f64cf9b5d0226fd097c0593df563d5be
110+
111+
{- temporary -}
112+
let additions =
113+
{ react-basic =
114+
{ dependencies =
115+
[ "effect"
116+
, "prelude"
117+
, "record"
118+
]
119+
, repo = "https://github.com/lumihq/purescript-react-basic.git"
120+
, version = "v17.0.0"
121+
}
122+
}
109123

110-
in upstream
124+
in upstream // additions
125+

Diff for: spago.dhall

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ You can edit this file as you like.
44
-}
55
{ name = "react-basic-dom"
66
, dependencies =
7-
[ "console"
8-
, "effect"
7+
[ "effect"
8+
, "foldable-traversable"
99
, "foreign-object"
10-
, "psci-support"
10+
, "maybe"
11+
, "nullable"
12+
, "prelude"
1113
, "react-basic"
1214
, "unsafe-coerce"
1315
, "web-dom"

Diff for: src/React/Basic/DOM.js

+15-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
"use strict";
22

3-
const ReactDOM = require("react-dom");
3+
import ReactDOM from "react-dom";
44

5-
exports.renderThen = (jsx) => (node) => (callback) => () =>
6-
ReactDOM.render(jsx, node, callback);
5+
export function renderThen(jsx) {
6+
return (node) => (callback) => () =>
7+
ReactDOM.render(jsx, node, callback);
8+
}
79

8-
exports.hydrateThen = (jsx) => (node) => (callback) => () =>
9-
ReactDOM.hydrate(jsx, node, callback);
10+
export function hydrateThen(jsx) {
11+
return (node) => (callback) => () =>
12+
ReactDOM.hydrate(jsx, node, callback);
13+
}
1014

11-
exports.unmount = (node) => () => ReactDOM.unmountComponentAtNode(node);
15+
export function unmount(node) {
16+
return () => ReactDOM.unmountComponentAtNode(node);
17+
}
1218

13-
exports.createPortal = (jsx) => (node) => ReactDOM.createPortal(jsx, node);
19+
export function createPortal(jsx) {
20+
return (node) => ReactDOM.createPortal(jsx, node);
21+
}

Diff for: src/React/Basic/DOM/Components/GlobalEvents.js

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
"use strict";
2-
3-
var React = require("react");
4-
5-
exports._passiveSupported = null;
1+
import React from "react";
2+
export var _passiveSupported = null;
63

74
function checkPassiveSupported() {
8-
if (exports._passiveSupported == null) {
5+
if (_passiveSupported == null) {
96
try {
107
window.addEventListener(
118
"test",
129
null,
1310
Object.defineProperty({}, "passive", {
1411
get: function() {
15-
exports._passiveSupported = true;
12+
_passiveSupported = true;
1613
}
1714
})
1815
);
1916
} catch (err) {
20-
exports._passiveSupported = false;
17+
_passiveSupported = false;
2118
}
2219
}
23-
return exports._passiveSupported;
20+
return _passiveSupported;
2421
}
2522

2623
function createHandler(h) {
@@ -87,9 +84,9 @@ GlobalEvent.prototype.render = function() {
8784
return this.props.child;
8885
};
8986

90-
exports.globalEvent_ = GlobalEvent;
87+
export {GlobalEvent as globalEvent_};
9188

92-
exports.unsafeWindowEventTarget = (function() {
89+
export var unsafeWindowEventTarget = (function() {
9390
if (typeof window === "undefined") {
9491
return undefined;
9592
} else {

Diff for: src/React/Basic/DOM/Components/Ref.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
"use strict";
1+
import React from "react";
22

3-
var React = require("react");
4-
5-
exports.mkRef = function(toMaybe) {
3+
export function mkRef(toMaybe) {
64
var Ref = function(_props) {
75
this.state = { node: null };
86
this.ref = React.createRef();
@@ -40,4 +38,4 @@ exports.mkRef = function(toMaybe) {
4038
};
4139

4240
return Ref;
43-
};
41+
}

Diff for: src/React/Basic/DOM/Concurrent.js

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
"use strict";
2-
3-
const ReactDOM = require("react-dom");
1+
import ReactDOM from "react-dom";
42
const createRoot = ReactDOM.createRoot || ReactDOM.unstable_createRoot;
53
const createBlockingRoot =
64
ReactDOM.createBlockingRoot || ReactDOM.unstable_createBlockingRoot;
75

8-
exports.createRoot = (element) => () => createRoot(element);
6+
export function createRoot(element) {
7+
return () => createRoot(element);
8+
}
99

10-
exports.createBlockingRoot = (element) => () => createBlockingRoot(element);
10+
export function createBlockingRoot(element) {
11+
return () => createBlockingRoot(element);
12+
}
1113

12-
exports.renderRoot = (root) => (jsx) => () => root.render(jsx);
14+
export function renderRoot(root) {
15+
return (jsx) => () => root.render(jsx);
16+
}

Diff for: src/React/Basic/DOM/Internal.js

+31-30
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1-
"use strict";
1+
import React from "react";
22

3-
const React = require("react");
3+
export function mergeStyles(styles) {
4+
return Object.assign.apply(null, [{}].concat(styles));
5+
}
46

5-
exports.mergeStyles = (styles) =>
6-
Object.assign.apply(null, [{}].concat(styles));
7-
8-
exports.unsafeCreateDOMComponent_ = (createElement) => (el) => {
9-
const flattenDataProp = (props, ref) => {
10-
var data = null;
11-
if (props._data != null) {
12-
data = { _data: undefined };
13-
Object.entries(props._data).forEach(function (entry) {
14-
data["data-" + entry[0]] = entry[1];
15-
});
16-
}
17-
var aria = null;
18-
if (props._aria != null) {
19-
aria = { _aria: undefined };
20-
Object.entries(props._aria).forEach(function (entry) {
21-
aria["aria-" + entry[0]] = entry[1];
22-
});
23-
}
24-
return Object.assign({ ref }, props, data, aria);
25-
};
26-
return () => {
27-
const c = React.forwardRef((props, ref) =>
28-
createElement(el)(flattenDataProp(props, ref))
29-
);
30-
c.displayName = el;
31-
return c;
7+
export function unsafeCreateDOMComponent_(createElement) {
8+
return (el) => {
9+
const flattenDataProp = (props, ref) => {
10+
var data = null;
11+
if (props._data != null) {
12+
data = { _data: undefined };
13+
Object.entries(props._data).forEach(function (entry) {
14+
data["data-" + entry[0]] = entry[1];
15+
});
16+
}
17+
var aria = null;
18+
if (props._aria != null) {
19+
aria = { _aria: undefined };
20+
Object.entries(props._aria).forEach(function (entry) {
21+
aria["aria-" + entry[0]] = entry[1];
22+
});
23+
}
24+
return Object.assign({ ref }, props, data, aria);
25+
};
26+
return () => {
27+
const c = React.forwardRef((props, ref) =>
28+
createElement(el)(flattenDataProp(props, ref))
29+
);
30+
c.displayName = el;
31+
return c;
32+
};
3233
};
33-
};
34+
}

Diff for: src/React/Basic/DOM/Server.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
"use strict";
2-
3-
const ReactDOMServer = require("react-dom/server");
4-
5-
exports.renderToString = ReactDOMServer.renderToString;
6-
7-
exports.renderToStaticMarkup = ReactDOMServer.renderToStaticMarkup;
1+
import ReactDOMServer from "react-dom/server";
2+
export var renderToString = ReactDOMServer.renderToString;
3+
export var renderToStaticMarkup = ReactDOMServer.renderToStaticMarkup;

0 commit comments

Comments
 (0)