Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(v-model): create non-existent properties as reactive #80

Merged
merged 1 commit into from
Oct 5, 2019
Merged

fix(v-model): create non-existent properties as reactive #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions packages/babel-sugar-v-model/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,18 @@ const addProp = (t, path, propName, expression, unshift = false) => {
* @param valueExpression Expression
*/
const genAssignmentCode = (t, valuePath, valueExpression) => {
if (t.isMemberExpression(valuePath) && valuePath.node.computed) {
return t.callExpression(t.memberExpression(t.thisExpression(), t.identifier('$set')), [
valuePath.get('object').node,
valuePath.get('property').node,
valueExpression,
])
let obj
if (t.isMemberExpression(valuePath) && !t.isThisExpression(obj = valuePath.get('object').node)) {
return t.callExpression(
t.memberExpression(t.thisExpression(), t.identifier('$set')),
[
obj,
valuePath.node.computed
? valuePath.get('property').node
: t.stringLiteral(valuePath.get('property.name').node),
valueExpression
]
);
} else {
return t.assignmentExpression('=', valuePath.node, valueExpression)
}
Expand Down
46 changes: 23 additions & 23 deletions packages/babel-sugar-v-model/test/snapshot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const tests = [
to: `const A = <MyComponent model={{
value: a.b,
callback: $$v => {
a.b = $$v;
this.$set(a, "b", $$v);
}
}} />;`,
},
Expand All @@ -40,7 +40,7 @@ const tests = [
to: `const A = <my-component model={{
value: a.b,
callback: $$v => {
a.b = $$v;
this.$set(a, "b", $$v);
}
}} />;`,
},
Expand All @@ -50,7 +50,7 @@ const tests = [
to: `const A = <a.b model={{
value: a.b,
callback: $$v => {
a.b = $$v;
this.$set(a, "b", $$v);
}
}} />;`,
},
Expand All @@ -60,7 +60,7 @@ const tests = [
to: `const A = <MyComponent model={{
value: a.b,
callback: $$v => {
a.b = this._n($$v);
this.$set(a, "b", this._n($$v));
}
}} />;`,
},
Expand All @@ -70,7 +70,7 @@ const tests = [
to: `const A = <MyComponent model={{
value: a.b,
callback: $$v => {
a.b = typeof $$v === "string" ? $$v.trim() : $$v;
this.$set(a, "b", typeof $$v === "string" ? $$v.trim() : $$v);
}
}} />;`,
},
Expand All @@ -80,7 +80,7 @@ const tests = [
to: `const A = <MyComponent model={{
value: a.b,
callback: $$v => {
a.b = this._n(typeof $$v === "string" ? $$v.trim() : $$v);
this.$set(a, "b", this._n(typeof $$v === "string" ? $$v.trim() : $$v));
}
}} />;`,
},
Expand All @@ -99,7 +99,7 @@ const tests = [
from: `const A = <select vModel={a.b} />`,
to: `const A = <select on-change={$event => {
const $$selectedVal = Array.prototype.filter.call($event.target.options, o => o.selected).map(o => "_value" in o ? o._value : o.value);
a.b = $event.target.multiple ? $$selectedVal : $$selectedVal[0];
this.$set(a, "b", $event.target.multiple ? $$selectedVal : $$selectedVal[0]);
}} {...{
directives: [{
name: "model",
Expand All @@ -113,7 +113,7 @@ const tests = [
from: `const A = <select vModel_number={a.b} />`,
to: `const A = <select on-change={$event => {
const $$selectedVal = Array.prototype.filter.call($event.target.options, o => o.selected).map(o => this._n("_value" in o ? o._value : o.value));
a.b = $event.target.multiple ? $$selectedVal : $$selectedVal[0];
this.$set(a, "b", $event.target.multiple ? $$selectedVal : $$selectedVal[0]);
}} {...{
directives: [{
name: "model",
Expand All @@ -137,12 +137,12 @@ const tests = [
$$i = this._i($$a, $$v);

if ($$el.checked) {
$$i < 0 && (a.b = $$a.concat([$$v]));
$$i < 0 && this.$set(a, "b", $$a.concat([$$v]));
} else {
$$i > -1 && (a.b = $$a.slice(0, $$i).concat($$a.slice($$i + 1)));
$$i > -1 && this.$set(a, "b", $$a.slice(0, $$i).concat($$a.slice($$i + 1)));
}
} else {
a.b = $$c;
this.$set(a, "b", $$c);
}
}} type="checkbox" domProps-checked={Array.isArray(a.b) ? this._i(a.b, null) > -1 : a.b} {...{
directives: [{
Expand All @@ -165,12 +165,12 @@ const tests = [
$$i = this._i($$a, $$v);

if ($$el.checked) {
$$i < 0 && (a.b = $$a.concat([$$v]));
$$i < 0 && this.$set(a, "b", $$a.concat([$$v]));
} else {
$$i > -1 && (a.b = $$a.slice(0, $$i).concat($$a.slice($$i + 1)));
$$i > -1 && this.$set(a, "b", $$a.slice(0, $$i).concat($$a.slice($$i + 1)));
}
} else {
a.b = $$c;
this.$set(a, "b", $$c);
}
}} type="checkbox" domProps-checked={Array.isArray(a.b) ? this._i(a.b, null) > -1 : a.b} {...{
directives: [{
Expand All @@ -195,12 +195,12 @@ const tests = [
$$i = this._i($$a, $$v);

if ($$el.checked) {
$$i < 0 && (a.b = $$a.concat([$$v]));
$$i < 0 && this.$set(a, "b", $$a.concat([$$v]));
} else {
$$i > -1 && (a.b = $$a.slice(0, $$i).concat($$a.slice($$i + 1)));
$$i > -1 && this.$set(a, "b", $$a.slice(0, $$i).concat($$a.slice($$i + 1)));
}
} else {
a.b = $$c;
this.$set(a, "b", $$c);
}
}} type="checkbox" domProps-checked={Array.isArray(a.b) ? this._i(a.b, "abc") > -1 : this._q(a.b, trueVal)} {...{
directives: [{
Expand All @@ -214,7 +214,7 @@ const tests = [
name: 'Generic input[type="radio"] vModel',
from: `const A = <input type="radio" vModel={a.b} />`,
to: `const A = <input on-change={$event => {
a.b = null;
this.$set(a, "b", null);
}} type="radio" domProps-checked={this._q(a.b, null)} {...{
directives: [{
name: "model",
Expand All @@ -227,7 +227,7 @@ const tests = [
name: 'input[type="radio"] vModel_number',
from: `const A = <input type="radio" vModel_number={a.b} value="10" />`,
to: `const A = <input on-change={$event => {
a.b = this._n("10");
this.$set(a, "b", this._n("10"));
}} type="radio" domProps-checked={this._q(a.b, this._n("10"))} {...{
directives: [{
name: "model",
Expand All @@ -243,7 +243,7 @@ const tests = [
from: `const A = <input type="text" vModel={a.b} />`,
to: `const A = <input on-input={$event => {
if ($event.target.composing) return;
a.b = $event.target.value;
this.$set(a, "b", $event.target.value);
}} type="text" domProps-value={a.b} {...{
directives: [{
name: "model",
Expand All @@ -257,7 +257,7 @@ const tests = [
from: `const A = <textarea vModel={a.b} />`,
to: `const A = <textarea on-input={$event => {
if ($event.target.composing) return;
a.b = $event.target.value;
this.$set(a, "b", $event.target.value);
}} domProps-value={a.b} {...{
directives: [{
name: "model",
Expand All @@ -272,7 +272,7 @@ const tests = [
to: `const A = <input on-blur={$event => {
this.$forceUpdate();
}} on-change={$event => {
a.b = this._n($event.target.value.trim());
this.$set(a, "b", this._n($event.target.value.trim()));
}} type="text" domProps-value={a.b} {...{
directives: [{
name: "model",
Expand All @@ -289,7 +289,7 @@ const tests = [
name: 'input[type="range"] vModel',
from: `const A = <input type="range" vModel={a.b} />`,
to: `const A = <input on-__r={$event => {
a.b = $event.target.value;
this.$set(a, "b", $event.target.value);
}} type="range" domProps-value={a.b} {...{
directives: [{
name: "model",
Expand Down