archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge new state on assignment for legacy widgets (#1476)

Browse Source
This commit is contained in:
Dylan Piercey 2020-01-15 15:00:46 -08:00 committed by GitHub
parent a68e6fde4a
commit cb1622c418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/runtime/components/legacy/defineWidget-legacy-browser.js
View File

@ -57,6 +57,31 @@ module.exports = function defineWidget(def, renderer) {
proto.constructor = def.constructor = Component;
Object.defineProperty(proto, "state", {
get: function() {
return this.___state;
},
set: function(newState) {
newState = newState || {};
// eslint-disable-next-line no-constant-condition
if ("MARKO_DEBUG") {
if (
Object.keys(newState)
.sort()
.join("") !==
Object.keys((this.___state && this.___state.___raw) || {})
.sort()
.join("")
)
complain(
"'widget.state = newState' has changed from merging the newState to replacing the old state."
);
}
this.setState(newState);
}
});
Object.defineProperty(proto, "__document", {
get: function() {
// eslint-disable-next-line no-constant-condition

9
test/components-browser/fixtures-deprecated/widget-state-assignment-merge/index.js Normal file
View File

@ -0,0 +1,9 @@
module.exports = require("marko-widgets").defineComponent({
template: require("./template.marko"),
getInitialState: function() {
return {
size: "normal",
variant: "primary"
};
}
});

8
test/components-browser/fixtures-deprecated/widget-state-assignment-merge/template.marko Normal file
View File

@ -0,0 +1,8 @@
<var classes = [
data.size !== 'normal' && 'app-button-'+data.size,
data.variant !== 'primary' && 'app-button-'+data.variant,
]/>
<button class=classes w-bind>
Hello
</button>

20
test/components-browser/fixtures-deprecated/widget-state-assignment-merge/test.js Normal file
View File

@ -0,0 +1,20 @@
var expect = require("chai").expect;
module.exports = function(helpers) {
var widget = helpers.mount(require.resolve("./"));
expect(Object.keys(widget.state.toJSON())).has.length(2);
expect(widget.state).has.property("size", "normal");
expect(widget.state).has.property("variant", "primary");
widget.state = {};
expect(Object.keys(widget.state.toJSON())).has.length(2);
expect(widget.state).has.property("size", "normal");
expect(widget.state).has.property("variant", "primary");
widget.state = { newProp: 1 };
expect(Object.keys(widget.state.toJSON())).has.length(3);
expect(widget.state).has.property("size", "normal");
expect(widget.state).has.property("variant", "primary");
expect(widget.state).has.property("newProp", 1);
};