mirror of
https://github.com/odoo/owl.git
synced 2025-10-06 19:59:41 +07:00
rename updateState into setState
This commit is contained in:
@@ -33,7 +33,7 @@ export class Clock extends Widget<{}, State> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
updateTime() {
|
updateTime() {
|
||||||
this.updateState({ currentTime: new Date().toLocaleTimeString() });
|
this.setState({ currentTime: new Date().toLocaleTimeString() });
|
||||||
}
|
}
|
||||||
|
|
||||||
startClock() {
|
startClock() {
|
||||||
|
|||||||
@@ -34,6 +34,6 @@ export class Counter extends Widget<Props, State> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
increment(delta: number) {
|
increment(delta: number) {
|
||||||
this.updateState({ counter: this.state.counter + delta });
|
this.setState({ counter: this.state.counter + delta });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,25 +22,25 @@ export class Discuss extends Widget<{}, State> {
|
|||||||
|
|
||||||
resetCounter(ev: MouseEvent) {
|
resetCounter(ev: MouseEvent) {
|
||||||
if (this.refs.counter instanceof Counter) {
|
if (this.refs.counter instanceof Counter) {
|
||||||
this.refs.counter.updateState({ counter: 3 });
|
this.refs.counter.setState({ counter: 3 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resetCounterAsync(ev: MouseEvent) {
|
resetCounterAsync(ev: MouseEvent) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (this.refs.counter2 instanceof Counter) {
|
if (this.refs.counter2 instanceof Counter) {
|
||||||
this.refs.counter2.updateState({ counter: 300 });
|
this.refs.counter2.setState({ counter: 300 });
|
||||||
}
|
}
|
||||||
}, 3000);
|
}, 3000);
|
||||||
}
|
}
|
||||||
|
|
||||||
toggle() {
|
toggle() {
|
||||||
this.updateState({ validcounter: !this.state.validcounter });
|
this.setState({ validcounter: !this.state.validcounter });
|
||||||
}
|
}
|
||||||
|
|
||||||
toggleColor() {
|
toggleColor() {
|
||||||
const newColor = this.state.color === "red" ? "blue" : "red";
|
const newColor = this.state.color === "red" ? "blue" : "red";
|
||||||
this.updateState({ color: newColor });
|
this.setState({ color: newColor });
|
||||||
}
|
}
|
||||||
|
|
||||||
addNotif(sticky: boolean) {
|
addNotif(sticky: boolean) {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export class Root extends Widget<Store, State> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
this.store.on("state_updated", this, this.updateState);
|
this.store.on("state_updated", this, this.setState);
|
||||||
this.store.on("rpc_status", this, this.toggleLoadingIndicator);
|
this.store.on("rpc_status", this, this.toggleLoadingIndicator);
|
||||||
this.store.on("update_action", this, this.applyController);
|
this.store.on("update_action", this, this.applyController);
|
||||||
if (this.store.lastController) {
|
if (this.store.lastController) {
|
||||||
|
|||||||
@@ -28,10 +28,10 @@ export class PureWidget<P, S> extends Widget<P, S> {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
async updateState(nextState: Partial<S>) {
|
async setState(nextState: Partial<S>) {
|
||||||
for (let k in nextState) {
|
for (let k in nextState) {
|
||||||
if (nextState[k] !== this.state[k]) {
|
if (nextState[k] !== this.state[k]) {
|
||||||
return super.updateState(nextState);
|
return super.setState(nextState);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -114,7 +114,7 @@
|
|||||||
<button t-on-click="resetCounterAsync">Reset counter 2 in 3s</button>
|
<button t-on-click="resetCounterAsync">Reset counter 2 in 3s</button>
|
||||||
<button t-on-click="toggle">Toggle Clock/counters</button>
|
<button t-on-click="toggle">Toggle Clock/counters</button>
|
||||||
<button t-on-click="toggleColor">Toggle Color</button>
|
<button t-on-click="toggleColor">Toggle Color</button>
|
||||||
<button t-on-click="updateState({})">Rerender this widget</button>
|
<button t-on-click="setState({})">Rerender this widget</button>
|
||||||
<input t-ref="textinput"/>
|
<input t-ref="textinput"/>
|
||||||
<t t-if="state.validcounter">
|
<t t-if="state.validcounter">
|
||||||
<t t-widget="Counter" t-ref="counter" t-props="{initialState:4}"/>
|
<t t-widget="Counter" t-ref="counter" t-props="{initialState:4}"/>
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ export class Counter extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
increment(delta) {
|
increment(delta) {
|
||||||
this.updateState({ counter: this.state.counter + delta });
|
this.setState({ counter: this.state.counter + delta });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|||||||
+2
-2
@@ -205,10 +205,10 @@ export class Component<
|
|||||||
*
|
*
|
||||||
* Notes:
|
* Notes:
|
||||||
* - it checks if we do not add extra keys to the state.
|
* - it checks if we do not add extra keys to the state.
|
||||||
* - it is ok to call updateState before the widget is started. In that
|
* - it is ok to call setState before the widget is started. In that
|
||||||
* case, it will simply update the state and will not rerender
|
* case, it will simply update the state and will not rerender
|
||||||
*/
|
*/
|
||||||
async updateState(nextState: Partial<State>) {
|
async setState(nextState: Partial<State>) {
|
||||||
if (Object.keys(nextState).length === 0) {
|
if (Object.keys(nextState).length === 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
+26
-26
@@ -52,7 +52,7 @@ class Counter extends Widget {
|
|||||||
};
|
};
|
||||||
|
|
||||||
inc() {
|
inc() {
|
||||||
this.updateState({ counter: this.state.counter + 1 });
|
this.setState({ counter: this.state.counter + 1 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -103,11 +103,11 @@ describe("basic widget properties", () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("updateState before first render does not trigger a render", async () => {
|
test("setState before first render does not trigger a render", async () => {
|
||||||
let renderCalls = 0;
|
let renderCalls = 0;
|
||||||
class TestW extends Widget {
|
class TestW extends Widget {
|
||||||
async willStart() {
|
async willStart() {
|
||||||
this.updateState({});
|
this.setState({});
|
||||||
}
|
}
|
||||||
async _render() {
|
async _render() {
|
||||||
renderCalls++;
|
renderCalls++;
|
||||||
@@ -119,10 +119,10 @@ describe("basic widget properties", () => {
|
|||||||
expect(renderCalls).toBe(1);
|
expect(renderCalls).toBe(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("updateState does not allow adding extra keys", async () => {
|
test("setState does not allow adding extra keys", async () => {
|
||||||
const widget = new Widget(env);
|
const widget = new Widget(env);
|
||||||
try {
|
try {
|
||||||
await widget.updateState({ extra: 1 });
|
await widget.setState({ extra: 1 });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
expect(e.message).toMatch("Invalid key:");
|
expect(e.message).toMatch("Invalid key:");
|
||||||
}
|
}
|
||||||
@@ -253,7 +253,7 @@ describe("lifecycle hooks", () => {
|
|||||||
const widget = new ParentWidget(env);
|
const widget = new ParentWidget(env);
|
||||||
await widget.mount(fixture);
|
await widget.mount(fixture);
|
||||||
expect(hookCounter).toBe(0); // sub widget not created yet
|
expect(hookCounter).toBe(0); // sub widget not created yet
|
||||||
await widget.updateState({ ok: true });
|
await widget.setState({ ok: true });
|
||||||
expect(hookCounter).toBe(2);
|
expect(hookCounter).toBe(2);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -313,7 +313,7 @@ describe("lifecycle hooks", () => {
|
|||||||
const widget = new ParentWidget(env);
|
const widget = new ParentWidget(env);
|
||||||
await widget.mount(fixture);
|
await widget.mount(fixture);
|
||||||
expect(steps).toEqual(["init", "willstart", "mounted"]);
|
expect(steps).toEqual(["init", "willstart", "mounted"]);
|
||||||
await widget.updateState({ ok: false });
|
await widget.setState({ ok: false });
|
||||||
expect(steps).toEqual([
|
expect(steps).toEqual([
|
||||||
"init",
|
"init",
|
||||||
"willstart",
|
"willstart",
|
||||||
@@ -568,9 +568,9 @@ describe("composition", () => {
|
|||||||
expect(fixture.innerHTML).toBe(
|
expect(fixture.innerHTML).toBe(
|
||||||
"<div><div>1<button>Inc</button></div></div>"
|
"<div><div>1<button>Inc</button></div></div>"
|
||||||
);
|
);
|
||||||
await widget.updateState({ ok: false });
|
await widget.setState({ ok: false });
|
||||||
expect(fixture.innerHTML).toBe("<div></div>");
|
expect(fixture.innerHTML).toBe("<div></div>");
|
||||||
await widget.updateState({ ok: true });
|
await widget.setState({ ok: true });
|
||||||
expect(fixture.innerHTML).toBe(
|
expect(fixture.innerHTML).toBe(
|
||||||
"<div><div>0<button>Inc</button></div></div>"
|
"<div><div>0<button>Inc</button></div></div>"
|
||||||
);
|
);
|
||||||
@@ -592,10 +592,10 @@ describe("composition", () => {
|
|||||||
);
|
);
|
||||||
const counter = children(widget)[0];
|
const counter = children(widget)[0];
|
||||||
expect(counter.__widget__.isMounted).toBe(true);
|
expect(counter.__widget__.isMounted).toBe(true);
|
||||||
await widget.updateState({ ok: false });
|
await widget.setState({ ok: false });
|
||||||
expect(fixture.innerHTML).toBe("<div></div>");
|
expect(fixture.innerHTML).toBe("<div></div>");
|
||||||
expect(counter.__widget__.isMounted).toBe(false);
|
expect(counter.__widget__.isMounted).toBe(false);
|
||||||
await widget.updateState({ ok: true });
|
await widget.setState({ ok: true });
|
||||||
expect(counter.__widget__.isMounted).toBe(true);
|
expect(counter.__widget__.isMounted).toBe(true);
|
||||||
expect(fixture.innerHTML).toBe(
|
expect(fixture.innerHTML).toBe(
|
||||||
"<div><div>1<button>Inc</button></div></div>"
|
"<div><div>1<button>Inc</button></div></div>"
|
||||||
@@ -615,9 +615,9 @@ describe("composition", () => {
|
|||||||
await widget.mount(fixture);
|
await widget.mount(fixture);
|
||||||
const input = fixture.getElementsByTagName("input")[0];
|
const input = fixture.getElementsByTagName("input")[0];
|
||||||
input.value = "test";
|
input.value = "test";
|
||||||
await widget.updateState({ ok: false });
|
await widget.setState({ ok: false });
|
||||||
expect(fixture.innerHTML).toBe("<div></div>");
|
expect(fixture.innerHTML).toBe("<div></div>");
|
||||||
await widget.updateState({ ok: true });
|
await widget.setState({ ok: true });
|
||||||
expect(fixture.innerHTML).toBe("<div><input></div>");
|
expect(fixture.innerHTML).toBe("<div><input></div>");
|
||||||
const input2 = fixture.getElementsByTagName("input")[0];
|
const input2 = fixture.getElementsByTagName("input")[0];
|
||||||
expect(input).toBe(input2);
|
expect(input).toBe(input2);
|
||||||
@@ -682,7 +682,7 @@ describe("composition", () => {
|
|||||||
}
|
}
|
||||||
const parent = new Parent(env);
|
const parent = new Parent(env);
|
||||||
await parent.mount(fixture);
|
await parent.mount(fixture);
|
||||||
await parent.updateState({ numbers: [1, 3] });
|
await parent.setState({ numbers: [1, 3] });
|
||||||
expect(normalize(fixture.innerHTML)).toBe(
|
expect(normalize(fixture.innerHTML)).toBe(
|
||||||
normalize(`
|
normalize(`
|
||||||
<div>
|
<div>
|
||||||
@@ -713,7 +713,7 @@ describe("composition", () => {
|
|||||||
const parent = new Parent(env);
|
const parent = new Parent(env);
|
||||||
await parent.mount(fixture);
|
await parent.mount(fixture);
|
||||||
const child = children(parent)[0];
|
const child = children(parent)[0];
|
||||||
await parent.updateState({ flag: true });
|
await parent.setState({ flag: true });
|
||||||
expect(children(parent)[0]).toBe(child);
|
expect(children(parent)[0]).toBe(child);
|
||||||
expect(child.__widget__.isDestroyed).toBe(false);
|
expect(child.__widget__.isDestroyed).toBe(false);
|
||||||
expect(normalize(fixture.innerHTML)).toBe(
|
expect(normalize(fixture.innerHTML)).toBe(
|
||||||
@@ -795,7 +795,7 @@ describe("props evaluation (with t-props directive)", () => {
|
|||||||
<t t-set="val" t-value="42"/>
|
<t t-set="val" t-value="42"/>
|
||||||
<t t-widget="child" t-props="{val:val}"/>
|
<t t-widget="child" t-props="{val:val}"/>
|
||||||
</div>`;
|
</div>`;
|
||||||
widgets = { child: Child }
|
widgets = { child: Child };
|
||||||
}
|
}
|
||||||
class Child extends Widget {
|
class Child extends Widget {
|
||||||
inlineTemplate = `
|
inlineTemplate = `
|
||||||
@@ -848,10 +848,10 @@ describe("other directives with t-widget", () => {
|
|||||||
|
|
||||||
expect(fixture.innerHTML).toBe("<div><span>hey</span></div>");
|
expect(fixture.innerHTML).toBe("<div><span>hey</span></div>");
|
||||||
|
|
||||||
await widget.updateState({ flag: false });
|
await widget.setState({ flag: false });
|
||||||
expect(fixture.innerHTML).toBe("<div></div>");
|
expect(fixture.innerHTML).toBe("<div></div>");
|
||||||
|
|
||||||
await widget.updateState({ flag: true });
|
await widget.setState({ flag: true });
|
||||||
expect(fixture.innerHTML).toBe("<div><span>hey</span></div>");
|
expect(fixture.innerHTML).toBe("<div><span>hey</span></div>");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -874,7 +874,7 @@ describe("other directives with t-widget", () => {
|
|||||||
|
|
||||||
expect(normalize(fixture.innerHTML)).toBe("<div><div>somediv</div></div>");
|
expect(normalize(fixture.innerHTML)).toBe("<div><div>somediv</div></div>");
|
||||||
|
|
||||||
await widget.updateState({ flag: false });
|
await widget.setState({ flag: false });
|
||||||
expect(normalize(fixture.innerHTML)).toBe("<div><span>hey</span></div>");
|
expect(normalize(fixture.innerHTML)).toBe("<div><span>hey</span></div>");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -910,7 +910,7 @@ describe("random stuff/miscellaneous", () => {
|
|||||||
const widget = new Parent(env);
|
const widget = new Parent(env);
|
||||||
await widget.mount(fixture);
|
await widget.mount(fixture);
|
||||||
expect(fixture.innerHTML).toBe("<div><span>abc</span></div>");
|
expect(fixture.innerHTML).toBe("<div><span>abc</span></div>");
|
||||||
await widget.updateState({ flag: true });
|
await widget.setState({ flag: true });
|
||||||
expect(fixture.innerHTML).toBe("<div><span>abcdef</span></div>");
|
expect(fixture.innerHTML).toBe("<div><span>abcdef</span></div>");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -979,10 +979,10 @@ describe("async rendering", () => {
|
|||||||
const w = new W(env);
|
const w = new W(env);
|
||||||
await w.mount(fixture);
|
await w.mount(fixture);
|
||||||
expect(n).toBe(0);
|
expect(n).toBe(0);
|
||||||
w.updateState({ val: 2 });
|
w.setState({ val: 2 });
|
||||||
expect(n).toBe(1);
|
expect(n).toBe(1);
|
||||||
await nextTick();
|
await nextTick();
|
||||||
w.updateState({ val: 3 });
|
w.setState({ val: 3 });
|
||||||
expect(n).toBe(2);
|
expect(n).toBe(2);
|
||||||
def.resolve();
|
def.resolve();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
@@ -1019,10 +1019,10 @@ describe("async rendering", () => {
|
|||||||
const parent = new Parent(env);
|
const parent = new Parent(env);
|
||||||
await parent.mount(fixture);
|
await parent.mount(fixture);
|
||||||
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe("<div></div>");
|
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe("<div></div>");
|
||||||
parent.updateState({ flagA: true });
|
parent.setState({ flagA: true });
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe("<div></div>");
|
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe("<div></div>");
|
||||||
parent.updateState({ flagB: true });
|
parent.setState({ flagB: true });
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe("<div></div>");
|
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe("<div></div>");
|
||||||
defB.resolve();
|
defB.resolve();
|
||||||
@@ -1065,12 +1065,12 @@ describe("async rendering", () => {
|
|||||||
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe(
|
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe(
|
||||||
"<div><span>a1</span></div>"
|
"<div><span>a1</span></div>"
|
||||||
);
|
);
|
||||||
parent.updateState({ valA: 2 });
|
parent.setState({ valA: 2 });
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe(
|
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe(
|
||||||
"<div><span>a1</span></div>"
|
"<div><span>a1</span></div>"
|
||||||
);
|
);
|
||||||
parent.updateState({ flagB: true });
|
parent.setState({ flagB: true });
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe(
|
expect(fixture.innerHTML.replace(/\r?\n|\r|\s+/g, "")).toBe(
|
||||||
"<div><span>a1</span></div>"
|
"<div><span>a1</span></div>"
|
||||||
|
|||||||
Reference in New Issue
Block a user