mirror of
https://github.com/odoo/owl.git
synced 2025-10-06 19:59:41 +07:00
[IMP] component: wait for parent rendering to be complete before doing child
This is a breaking semantic change. With this commit, the UI is frozen whenever owl is waiting for a parent to change Also, this allows Owl not to render components that will be removed later.
This commit is contained in:
committed by
Samuel Degueldre
parent
828be28653
commit
e3b1566943
@@ -2,23 +2,16 @@ import type { App, Env } from "../app/app";
|
|||||||
import { BDom, VNode } from "../blockdom";
|
import { BDom, VNode } from "../blockdom";
|
||||||
import {
|
import {
|
||||||
clearReactivesForCallback,
|
clearReactivesForCallback,
|
||||||
|
getSubscriptions,
|
||||||
|
NonReactive,
|
||||||
Reactive,
|
Reactive,
|
||||||
reactive,
|
reactive,
|
||||||
TARGET,
|
TARGET,
|
||||||
NonReactive,
|
|
||||||
getSubscriptions,
|
|
||||||
} from "../reactivity";
|
} from "../reactivity";
|
||||||
import { batched, Callback } from "../utils";
|
import { batched, Callback } from "../utils";
|
||||||
import { Component, ComponentConstructor } from "./component";
|
import { Component, ComponentConstructor } from "./component";
|
||||||
import { fibersInError, handleError } from "./error_handling";
|
import { fibersInError, handleError } from "./error_handling";
|
||||||
import {
|
import { Fiber, makeChildFiber, makeRootFiber, MountFiber, MountOptions } from "./fibers";
|
||||||
Fiber,
|
|
||||||
makeChildFiber,
|
|
||||||
makeRootFiber,
|
|
||||||
MountFiber,
|
|
||||||
MountOptions,
|
|
||||||
RootFiber,
|
|
||||||
} from "./fibers";
|
|
||||||
import { applyDefaultProps } from "./props_validation";
|
import { applyDefaultProps } from "./props_validation";
|
||||||
import { STATUS } from "./status";
|
import { STATUS } from "./status";
|
||||||
|
|
||||||
@@ -126,6 +119,7 @@ export function component<P extends object>(
|
|||||||
|
|
||||||
node.initiateRender(new Fiber(node, parentFiber));
|
node.initiateRender(new Fiber(node, parentFiber));
|
||||||
}
|
}
|
||||||
|
parentFiber.root!.reachedChildren.add(node);
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -193,7 +187,7 @@ export class ComponentNode<P extends object = any, E = any> implements VNode<Com
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.status === STATUS.NEW && this.fiber === fiber) {
|
if (this.status === STATUS.NEW && this.fiber === fiber) {
|
||||||
this._render(fiber);
|
fiber.render();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,17 +232,7 @@ export class ComponentNode<P extends object = any, E = any> implements VNode<Com
|
|||||||
// embedded in a rendering coming from above, so the fiber will be rendered
|
// embedded in a rendering coming from above, so the fiber will be rendered
|
||||||
// in the next microtick anyway, so we should not render it again.
|
// in the next microtick anyway, so we should not render it again.
|
||||||
if (this.fiber === fiber && (current || !fiber.parent)) {
|
if (this.fiber === fiber && (current || !fiber.parent)) {
|
||||||
this._render(fiber);
|
fiber.render();
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_render(fiber: Fiber | RootFiber) {
|
|
||||||
try {
|
|
||||||
fiber.bdom = this.renderFn();
|
|
||||||
const root = fiber.root!;
|
|
||||||
root.setCounter(root.counter - 1);
|
|
||||||
} catch (e) {
|
|
||||||
handleError({ node: this, error: e });
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -292,7 +276,7 @@ export class ComponentNode<P extends object = any, E = any> implements VNode<Com
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
component.props = props;
|
component.props = props;
|
||||||
this._render(fiber);
|
fiber.render();
|
||||||
const parentRoot = parentFiber.root!;
|
const parentRoot = parentFiber.root!;
|
||||||
if (this.willPatch.length) {
|
if (this.willPatch.length) {
|
||||||
parentRoot.willPatch.push(fiber);
|
parentRoot.willPatch.push(fiber);
|
||||||
|
|||||||
@@ -8,6 +8,10 @@ export function makeChildFiber(node: ComponentNode, parent: Fiber): Fiber {
|
|||||||
if (current) {
|
if (current) {
|
||||||
cancelFibers(current.children);
|
cancelFibers(current.children);
|
||||||
current.root = null;
|
current.root = null;
|
||||||
|
if (current instanceof RootFiber && current.delayedRenders.length) {
|
||||||
|
let root = parent.root!;
|
||||||
|
root.delayedRenders = root.delayedRenders.concat(current.delayedRenders);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return new Fiber(node, parent);
|
return new Fiber(node, parent);
|
||||||
}
|
}
|
||||||
@@ -19,6 +23,9 @@ export function makeRootFiber(node: ComponentNode): Fiber {
|
|||||||
root.setCounter(root.counter + 1 - cancelFibers(current.children));
|
root.setCounter(root.counter + 1 - cancelFibers(current.children));
|
||||||
current.children = [];
|
current.children = [];
|
||||||
current.bdom = null;
|
current.bdom = null;
|
||||||
|
if (current === root) {
|
||||||
|
root.reachedChildren = new WeakSet();
|
||||||
|
}
|
||||||
if (fibersInError.has(current)) {
|
if (fibersInError.has(current)) {
|
||||||
fibersInError.delete(current);
|
fibersInError.delete(current);
|
||||||
fibersInError.delete(root);
|
fibersInError.delete(root);
|
||||||
@@ -81,6 +88,46 @@ export class Fiber {
|
|||||||
this.root = this as any;
|
this.root = this as any;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
// if some parent has a fiber => register in followup
|
||||||
|
let prev = this.root!.node;
|
||||||
|
let current = prev.parent;
|
||||||
|
while (current) {
|
||||||
|
if (current.fiber) {
|
||||||
|
let root = current.fiber.root!;
|
||||||
|
if (root.counter) {
|
||||||
|
root.delayedRenders.push(this);
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
if (!root.reachedChildren.has(prev)) {
|
||||||
|
// is dead
|
||||||
|
this.node.app.scheduler.shouldClear = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
current = root.node;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
prev = current;
|
||||||
|
current = current.parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
// there are no current rendering from above => we can render
|
||||||
|
this._render();
|
||||||
|
}
|
||||||
|
|
||||||
|
_render() {
|
||||||
|
const node = this.node;
|
||||||
|
const root = this.root;
|
||||||
|
if (root) {
|
||||||
|
try {
|
||||||
|
this.bdom = node.renderFn();
|
||||||
|
root.setCounter(root.counter - 1);
|
||||||
|
} catch (e) {
|
||||||
|
handleError({ node, error: e });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class RootFiber extends Fiber {
|
export class RootFiber extends Fiber {
|
||||||
@@ -94,6 +141,9 @@ export class RootFiber extends Fiber {
|
|||||||
// i.e.: render triggered in onWillUnmount or in willPatch will be delayed
|
// i.e.: render triggered in onWillUnmount or in willPatch will be delayed
|
||||||
locked: boolean = false;
|
locked: boolean = false;
|
||||||
|
|
||||||
|
delayedRenders: Fiber[] = [];
|
||||||
|
reachedChildren: WeakSet<ComponentNode> = new WeakSet();
|
||||||
|
|
||||||
complete() {
|
complete() {
|
||||||
const node = this.node;
|
const node = this.node;
|
||||||
this.locked = true;
|
this.locked = true;
|
||||||
@@ -148,6 +198,14 @@ export class RootFiber extends Fiber {
|
|||||||
setCounter(newValue: number) {
|
setCounter(newValue: number) {
|
||||||
this.counter = newValue;
|
this.counter = newValue;
|
||||||
if (newValue === 0) {
|
if (newValue === 0) {
|
||||||
|
if (this.delayedRenders.length) {
|
||||||
|
for (let f of this.delayedRenders) {
|
||||||
|
if (f.root) {
|
||||||
|
f.render();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.delayedRenders = [];
|
||||||
|
}
|
||||||
this.node.app.scheduler.flush();
|
this.node.app.scheduler.flush();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ export class Scheduler {
|
|||||||
tasks: Set<RootFiber> = new Set();
|
tasks: Set<RootFiber> = new Set();
|
||||||
requestAnimationFrame: Window["requestAnimationFrame"];
|
requestAnimationFrame: Window["requestAnimationFrame"];
|
||||||
frame: number = 0;
|
frame: number = 0;
|
||||||
|
shouldClear: boolean = false;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.requestAnimationFrame = Scheduler.requestAnimationFrame;
|
this.requestAnimationFrame = Scheduler.requestAnimationFrame;
|
||||||
@@ -31,6 +32,14 @@ export class Scheduler {
|
|||||||
this.frame = this.requestAnimationFrame(() => {
|
this.frame = this.requestAnimationFrame(() => {
|
||||||
this.frame = 0;
|
this.frame = 0;
|
||||||
this.tasks.forEach((fiber) => this.processFiber(fiber));
|
this.tasks.forEach((fiber) => this.processFiber(fiber));
|
||||||
|
if (this.shouldClear) {
|
||||||
|
this.shouldClear = false;
|
||||||
|
for (let task of this.tasks) {
|
||||||
|
if (task.node.status === STATUS.DESTROYED) {
|
||||||
|
this.tasks.delete(task);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1067,6 +1067,184 @@ exports[`delay willUpdateProps with rendering grandchild 4`] = `
|
|||||||
}"
|
}"
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, but then initial rendering is cancelled by yet another render 1`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return component(\`B\`, {value: ctx['state'].value}, key + \`__1\`, node, ctx);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, but then initial rendering is cancelled by yet another render 2`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return component(\`C\`, {value: ctx['state'].someValue+ctx['props'].value}, key + \`__1\`, node, ctx);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, but then initial rendering is cancelled by yet another render 3`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
let block3 = createBlock(\`<p><block-text-0/></p>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
const b2 = component(\`D\`, {}, key + \`__1\`, node, ctx);
|
||||||
|
let txt1 = ctx['props'].value;
|
||||||
|
const b3 = block3([txt1]);
|
||||||
|
return multi([b2, b3]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, but then initial rendering is cancelled by yet another render 4`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<button block-handler-0=\\"click\\"><block-text-1/></button>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
let hdlr1 = [ctx['increment'], ctx];
|
||||||
|
let txt1 = ctx['state'].val;
|
||||||
|
return block1([hdlr1, txt1]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, reusing fiber and stuff 1`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return component(\`B\`, {value: ctx['state'].value}, key + \`__1\`, node, ctx);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, reusing fiber and stuff 2`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
const b2 = text(ctx['props'].value);
|
||||||
|
const b3 = component(\`C\`, {}, key + \`__1\`, node, ctx);
|
||||||
|
return multi([b2, b3]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, reusing fiber and stuff 3`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<button block-handler-0=\\"click\\"><block-text-1/></button>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
let hdlr1 = [ctx['increment'], ctx];
|
||||||
|
let txt1 = ctx['state'].val;
|
||||||
|
return block1([hdlr1, txt1]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, reusing fiber then component is destroyed and stuff 1`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
let b2,b3;
|
||||||
|
b2 = text(\`A\`);
|
||||||
|
if (ctx['state'].value<15) {
|
||||||
|
b3 = component(\`B\`, {value: ctx['state'].value}, key + \`__1\`, node, ctx);
|
||||||
|
}
|
||||||
|
return multi([b2, b3]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, reusing fiber then component is destroyed and stuff 2`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
const b2 = text(ctx['props'].value);
|
||||||
|
const b3 = component(\`C\`, {}, key + \`__1\`, node, ctx);
|
||||||
|
return multi([b2, b3]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, reusing fiber then component is destroyed and stuff 3`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<button block-handler-0=\\"click\\"><block-text-1/></button>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
let hdlr1 = [ctx['increment'], ctx];
|
||||||
|
let txt1 = ctx['state'].val;
|
||||||
|
return block1([hdlr1, txt1]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, then component is destroyed and stuff 1`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return component(\`B\`, {value: ctx['state'].value}, key + \`__1\`, node, ctx);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, then component is destroyed and stuff 2`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
let b2,b3;
|
||||||
|
b2 = text(ctx['props'].value);
|
||||||
|
if (ctx['props'].value<10) {
|
||||||
|
b3 = component(\`C\`, {}, key + \`__1\`, node, ctx);
|
||||||
|
}
|
||||||
|
return multi([b2, b3]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`delayed rendering, then component is destroyed and stuff 3`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
let block1 = createBlock(\`<button block-handler-0=\\"click\\"><block-text-1/></button>\`);
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
let hdlr1 = [ctx['increment'], ctx];
|
||||||
|
let txt1 = ctx['state'].val;
|
||||||
|
return block1([hdlr1, txt1]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`destroying/recreating a subcomponent, other scenario 1`] = `
|
exports[`destroying/recreating a subcomponent, other scenario 1`] = `
|
||||||
"function anonymous(bdom, helpers
|
"function anonymous(bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -1,5 +1,31 @@
|
|||||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`reactivity in lifecycle Child component doesn't render when state they depend on changes but their parent is about to unmount them 1`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
let b2;
|
||||||
|
if (ctx['state'].renderChild) {
|
||||||
|
b2 = component(\`Child\`, {state: ctx['state']}, key + \`__1\`, node, ctx);
|
||||||
|
}
|
||||||
|
return multi([b2]);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`reactivity in lifecycle Child component doesn't render when state they depend on changes but their parent is about to unmount them 2`] = `
|
||||||
|
"function anonymous(bdom, helpers
|
||||||
|
) {
|
||||||
|
let { text, createBlock, list, multi, html, toggler, component, comment } = bdom;
|
||||||
|
|
||||||
|
return function template(ctx, node, key = \\"\\") {
|
||||||
|
return text(ctx['props'].state.content.a);
|
||||||
|
}
|
||||||
|
}"
|
||||||
|
`;
|
||||||
|
|
||||||
exports[`reactivity in lifecycle can use a state hook 1`] = `
|
exports[`reactivity in lifecycle can use a state hook 1`] = `
|
||||||
"function anonymous(bdom, helpers
|
"function anonymous(bdom, helpers
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import {
|
|||||||
Component,
|
Component,
|
||||||
mount,
|
mount,
|
||||||
onMounted,
|
onMounted,
|
||||||
|
onRendered,
|
||||||
onWillStart,
|
onWillStart,
|
||||||
onWillUnmount,
|
onWillUnmount,
|
||||||
onWillUpdateProps,
|
onWillUpdateProps,
|
||||||
@@ -1079,11 +1080,7 @@ test("concurrent renderings scenario 3", async () => {
|
|||||||
stateC.fromC = "d";
|
stateC.fromC = "d";
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("<div><p><span><i>1c</i></span></p></div>");
|
expect(fixture.innerHTML).toBe("<div><p><span><i>1c</i></span></p></div>");
|
||||||
expect([
|
expect([]).toBeLogged();
|
||||||
"ComponentC:willRender",
|
|
||||||
"ComponentD:willUpdateProps",
|
|
||||||
"ComponentC:rendered",
|
|
||||||
]).toBeLogged();
|
|
||||||
|
|
||||||
defB.resolve(); // resolve rendering initiated in A (still blocked in D)
|
defB.resolve(); // resolve rendering initiated in A (still blocked in D)
|
||||||
await nextTick();
|
await nextTick();
|
||||||
@@ -1099,14 +1096,7 @@ test("concurrent renderings scenario 3", async () => {
|
|||||||
|
|
||||||
defsD[0].resolve(); // resolve rendering initiated in C (should be ignored)
|
defsD[0].resolve(); // resolve rendering initiated in C (should be ignored)
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(ComponentD.prototype.someValue).toBeCalledTimes(1);
|
|
||||||
expect(fixture.innerHTML).toBe("<div><p><span><i>1c</i></span></p></div>");
|
|
||||||
expect([]).toBeLogged();
|
|
||||||
|
|
||||||
defsD[1].resolve(); // completely resolve rendering initiated in A
|
|
||||||
await nextTick();
|
|
||||||
expect(fixture.innerHTML).toBe("<div><p><span><i>2d</i></span></p></div>");
|
expect(fixture.innerHTML).toBe("<div><p><span><i>2d</i></span></p></div>");
|
||||||
expect(ComponentD.prototype.someValue).toBeCalledTimes(2);
|
|
||||||
expect([
|
expect([
|
||||||
"ComponentD:willRender",
|
"ComponentD:willRender",
|
||||||
"ComponentD:rendered",
|
"ComponentD:rendered",
|
||||||
@@ -1119,6 +1109,7 @@ test("concurrent renderings scenario 3", async () => {
|
|||||||
"ComponentB:patched",
|
"ComponentB:patched",
|
||||||
"ComponentA:patched",
|
"ComponentA:patched",
|
||||||
]).toBeLogged();
|
]).toBeLogged();
|
||||||
|
expect(ComponentD.prototype.someValue).toBeCalledTimes(2);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("concurrent renderings scenario 4", async () => {
|
test("concurrent renderings scenario 4", async () => {
|
||||||
@@ -1207,11 +1198,7 @@ test("concurrent renderings scenario 4", async () => {
|
|||||||
stateC.fromC = "d";
|
stateC.fromC = "d";
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("<div><p><span><i>1c</i></span></p></div>");
|
expect(fixture.innerHTML).toBe("<div><p><span><i>1c</i></span></p></div>");
|
||||||
expect([
|
expect([]).toBeLogged();
|
||||||
"ComponentC:willRender",
|
|
||||||
"ComponentD:willUpdateProps",
|
|
||||||
"ComponentC:rendered",
|
|
||||||
]).toBeLogged();
|
|
||||||
|
|
||||||
defB.resolve(); // resolve rendering initiated in A (still blocked in D)
|
defB.resolve(); // resolve rendering initiated in A (still blocked in D)
|
||||||
await nextTick();
|
await nextTick();
|
||||||
@@ -1227,6 +1214,12 @@ test("concurrent renderings scenario 4", async () => {
|
|||||||
|
|
||||||
defsD[1].resolve(); // completely resolve rendering initiated in A
|
defsD[1].resolve(); // completely resolve rendering initiated in A
|
||||||
await nextTick();
|
await nextTick();
|
||||||
|
expect(fixture.innerHTML).toBe("<div><p><span><i>1c</i></span></p></div>");
|
||||||
|
expect(ComponentD.prototype.someValue).toBeCalledTimes(1);
|
||||||
|
expect([]).toBeLogged();
|
||||||
|
|
||||||
|
defsD[0].resolve(); // resolve rendering initiated in C (should be ignored)
|
||||||
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("<div><p><span><i>2d</i></span></p></div>");
|
expect(fixture.innerHTML).toBe("<div><p><span><i>2d</i></span></p></div>");
|
||||||
expect(ComponentD.prototype.someValue).toBeCalledTimes(2);
|
expect(ComponentD.prototype.someValue).toBeCalledTimes(2);
|
||||||
expect([
|
expect([
|
||||||
@@ -1241,12 +1234,6 @@ test("concurrent renderings scenario 4", async () => {
|
|||||||
"ComponentB:patched",
|
"ComponentB:patched",
|
||||||
"ComponentA:patched",
|
"ComponentA:patched",
|
||||||
]).toBeLogged();
|
]).toBeLogged();
|
||||||
|
|
||||||
defsD[0].resolve(); // resolve rendering initiated in C (should be ignored)
|
|
||||||
await nextTick();
|
|
||||||
expect(fixture.innerHTML).toBe("<div><p><span><i>2d</i></span></p></div>");
|
|
||||||
expect(ComponentD.prototype.someValue).toBeCalledTimes(2);
|
|
||||||
expect([]).toBeLogged();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test("concurrent renderings scenario 5", async () => {
|
test("concurrent renderings scenario 5", async () => {
|
||||||
@@ -2714,13 +2701,7 @@ test("delay willUpdateProps", async () => {
|
|||||||
parent.render();
|
parent.render();
|
||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("0_0");
|
expect(fixture.innerHTML).toBe("0_0");
|
||||||
expect([
|
expect(["Parent:willRender", "Child:willUpdateProps", "Parent:rendered"]).toBeLogged();
|
||||||
"Child:willRender",
|
|
||||||
"Child:rendered",
|
|
||||||
"Parent:willRender",
|
|
||||||
"Child:willUpdateProps",
|
|
||||||
"Parent:rendered",
|
|
||||||
]).toBeLogged();
|
|
||||||
|
|
||||||
promise = makeDeferred();
|
promise = makeDeferred();
|
||||||
const prom2 = promise;
|
const prom2 = promise;
|
||||||
@@ -2837,13 +2818,9 @@ test("delay willUpdateProps with rendering grandchild", async () => {
|
|||||||
await nextTick();
|
await nextTick();
|
||||||
expect(fixture.innerHTML).toBe("0_0<div></div>");
|
expect(fixture.innerHTML).toBe("0_0<div></div>");
|
||||||
expect([
|
expect([
|
||||||
"DelayedChild:willRender",
|
|
||||||
"DelayedChild:rendered",
|
|
||||||
"GrandParent:willRender",
|
"GrandParent:willRender",
|
||||||
"Parent:willUpdateProps",
|
"Parent:willUpdateProps",
|
||||||
"GrandParent:rendered",
|
"GrandParent:rendered",
|
||||||
"ReactiveChild:willRender",
|
|
||||||
"ReactiveChild:rendered",
|
|
||||||
"Parent:willRender",
|
"Parent:willRender",
|
||||||
"DelayedChild:willUpdateProps",
|
"DelayedChild:willUpdateProps",
|
||||||
"ReactiveChild:willUpdateProps",
|
"ReactiveChild:willUpdateProps",
|
||||||
@@ -2864,8 +2841,6 @@ test("delay willUpdateProps with rendering grandchild", async () => {
|
|||||||
"GrandParent:willRender",
|
"GrandParent:willRender",
|
||||||
"Parent:willUpdateProps",
|
"Parent:willUpdateProps",
|
||||||
"GrandParent:rendered",
|
"GrandParent:rendered",
|
||||||
"ReactiveChild:willRender",
|
|
||||||
"ReactiveChild:rendered",
|
|
||||||
"Parent:willRender",
|
"Parent:willRender",
|
||||||
"DelayedChild:willUpdateProps",
|
"DelayedChild:willUpdateProps",
|
||||||
"ReactiveChild:willUpdateProps",
|
"ReactiveChild:willUpdateProps",
|
||||||
@@ -3254,6 +3229,368 @@ test("rendering parent twice, with different props on child and stuff", async ()
|
|||||||
]).toBeLogged();
|
]).toBeLogged();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("delayed rendering, but then initial rendering is cancelled by yet another render", async () => {
|
||||||
|
const promC = makeDeferred();
|
||||||
|
let stateB: any = null;
|
||||||
|
|
||||||
|
class D extends Component {
|
||||||
|
static template = xml`<button t-on-click="increment"><t t-esc="state.val"/></button>`;
|
||||||
|
state = useState({ val: 1 });
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
}
|
||||||
|
increment() {
|
||||||
|
this.state.val++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class C extends Component {
|
||||||
|
static template = xml`<D/><p><t t-esc="props.value"/></p>`;
|
||||||
|
static components = { D };
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
onWillUpdateProps(() => promC);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class B extends Component {
|
||||||
|
static template = xml`<C value="state.someValue + props.value"/>`;
|
||||||
|
static components = { C };
|
||||||
|
state = useState({ someValue: 3 });
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
stateB = this.state;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class A extends Component {
|
||||||
|
static template = xml`<B value="state.value"/>`;
|
||||||
|
static components = { B };
|
||||||
|
state = useState({ value: 33 });
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const parent = await mount(A, fixture);
|
||||||
|
expect(fixture.innerHTML).toBe("<button>1</button><p>36</p>");
|
||||||
|
expect([
|
||||||
|
"A:setup",
|
||||||
|
"A:willStart",
|
||||||
|
"A:willRender",
|
||||||
|
"B:setup",
|
||||||
|
"B:willStart",
|
||||||
|
"A:rendered",
|
||||||
|
"B:willRender",
|
||||||
|
"C:setup",
|
||||||
|
"C:willStart",
|
||||||
|
"B:rendered",
|
||||||
|
"C:willRender",
|
||||||
|
"D:setup",
|
||||||
|
"D:willStart",
|
||||||
|
"C:rendered",
|
||||||
|
"D:willRender",
|
||||||
|
"D:rendered",
|
||||||
|
"D:mounted",
|
||||||
|
"C:mounted",
|
||||||
|
"B:mounted",
|
||||||
|
"A:mounted",
|
||||||
|
]).toBeLogged();
|
||||||
|
|
||||||
|
// update B and C, but render is blocked by C willupdateProps
|
||||||
|
stateB.someValue = 5;
|
||||||
|
await nextTick();
|
||||||
|
expect(["B:willRender", "C:willUpdateProps", "B:rendered"]).toBeLogged();
|
||||||
|
|
||||||
|
// update D => render should be delayed, because B is currently rendering
|
||||||
|
fixture.querySelector("button")!.click();
|
||||||
|
await nextTick();
|
||||||
|
expect([]).toBeLogged();
|
||||||
|
|
||||||
|
// update A => render should go to B and cancel it
|
||||||
|
parent.state.value = 34;
|
||||||
|
await nextTick();
|
||||||
|
expect([
|
||||||
|
"A:willRender",
|
||||||
|
"B:willUpdateProps",
|
||||||
|
"A:rendered",
|
||||||
|
"B:willRender",
|
||||||
|
"C:willUpdateProps",
|
||||||
|
"B:rendered",
|
||||||
|
]).toBeLogged();
|
||||||
|
|
||||||
|
promC.resolve();
|
||||||
|
await nextTick();
|
||||||
|
expect([
|
||||||
|
"C:willRender",
|
||||||
|
"C:rendered",
|
||||||
|
"D:willRender",
|
||||||
|
"D:rendered",
|
||||||
|
"D:willPatch",
|
||||||
|
"D:patched",
|
||||||
|
"A:willPatch",
|
||||||
|
"B:willPatch",
|
||||||
|
"C:willPatch",
|
||||||
|
"C:patched",
|
||||||
|
"B:patched",
|
||||||
|
"A:patched",
|
||||||
|
]).toBeLogged();
|
||||||
|
expect(fixture.innerHTML).toBe("<button>2</button><p>39</p>");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("delayed rendering, reusing fiber and stuff", async () => {
|
||||||
|
let prom1 = makeDeferred();
|
||||||
|
let prom2 = makeDeferred();
|
||||||
|
|
||||||
|
class C extends Component {
|
||||||
|
static template = xml`<button t-on-click="increment"><t t-esc="state.val"/></button>`;
|
||||||
|
state = useState({ val: 1 });
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
}
|
||||||
|
increment() {
|
||||||
|
this.state.val++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class B extends Component {
|
||||||
|
static template = xml`<t t-esc="props.value"/><C />`;
|
||||||
|
static components = { C };
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
let flag = false;
|
||||||
|
onWillUpdateProps(() => {
|
||||||
|
flag = true;
|
||||||
|
return prom1;
|
||||||
|
});
|
||||||
|
onRendered(async () => {
|
||||||
|
if (flag) {
|
||||||
|
await nextMicroTick();
|
||||||
|
prom2.resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class A extends Component {
|
||||||
|
static template = xml`<B value="state.value"/>`;
|
||||||
|
static components = { B };
|
||||||
|
state = useState({ value: 33 });
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const parent = await mount(A, fixture);
|
||||||
|
expect(fixture.innerHTML).toBe("33<button>1</button>");
|
||||||
|
expect([
|
||||||
|
"A:setup",
|
||||||
|
"A:willStart",
|
||||||
|
"A:willRender",
|
||||||
|
"B:setup",
|
||||||
|
"B:willStart",
|
||||||
|
"A:rendered",
|
||||||
|
"B:willRender",
|
||||||
|
"C:setup",
|
||||||
|
"C:willStart",
|
||||||
|
"B:rendered",
|
||||||
|
"C:willRender",
|
||||||
|
"C:rendered",
|
||||||
|
"C:mounted",
|
||||||
|
"B:mounted",
|
||||||
|
"A:mounted",
|
||||||
|
]).toBeLogged();
|
||||||
|
|
||||||
|
// initiate a render in A, but is blocked in B
|
||||||
|
parent.state.value = 34;
|
||||||
|
await nextTick();
|
||||||
|
expect(["A:willRender", "B:willUpdateProps", "A:rendered"]).toBeLogged();
|
||||||
|
|
||||||
|
// initiate a render in C => delayed because of render in A
|
||||||
|
fixture.querySelector("button")!.click();
|
||||||
|
await nextTick();
|
||||||
|
expect([]).toBeLogged();
|
||||||
|
|
||||||
|
// wait for render in A to be completed
|
||||||
|
prom1.resolve();
|
||||||
|
await prom2;
|
||||||
|
expect(["B:willRender", "B:rendered", "C:willRender", "C:rendered"]).toBeLogged();
|
||||||
|
|
||||||
|
// initiate a new render in A => fiber will be reused
|
||||||
|
parent.state.value = 355;
|
||||||
|
await nextTick();
|
||||||
|
expect(fixture.innerHTML).toBe("355<button>2</button>");
|
||||||
|
expect([
|
||||||
|
"A:willRender",
|
||||||
|
"B:willUpdateProps",
|
||||||
|
"A:rendered",
|
||||||
|
"B:willRender",
|
||||||
|
"B:rendered",
|
||||||
|
"A:willPatch",
|
||||||
|
"B:willPatch",
|
||||||
|
"B:patched",
|
||||||
|
"A:patched",
|
||||||
|
"C:willPatch",
|
||||||
|
"C:patched",
|
||||||
|
]).toBeLogged();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("delayed rendering, then component is destroyed and stuff", async () => {
|
||||||
|
let prom1 = makeDeferred();
|
||||||
|
|
||||||
|
class C extends Component {
|
||||||
|
static template = xml`<button t-on-click="increment"><t t-esc="state.val"/></button>`;
|
||||||
|
state = useState({ val: 1 });
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
}
|
||||||
|
increment() {
|
||||||
|
this.state.val++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class B extends Component {
|
||||||
|
static template = xml`<t t-esc="props.value"/><t t-if="props.value lt 10"><C /></t>`;
|
||||||
|
static components = { C };
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
onWillUpdateProps(() => prom1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class A extends Component {
|
||||||
|
static template = xml`<B value="state.value"/>`;
|
||||||
|
static components = { B };
|
||||||
|
state = useState({ value: 3 });
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const parent = await mount(A, fixture);
|
||||||
|
expect(fixture.innerHTML).toBe("3<button>1</button>");
|
||||||
|
expect([
|
||||||
|
"A:setup",
|
||||||
|
"A:willStart",
|
||||||
|
"A:willRender",
|
||||||
|
"B:setup",
|
||||||
|
"B:willStart",
|
||||||
|
"A:rendered",
|
||||||
|
"B:willRender",
|
||||||
|
"C:setup",
|
||||||
|
"C:willStart",
|
||||||
|
"B:rendered",
|
||||||
|
"C:willRender",
|
||||||
|
"C:rendered",
|
||||||
|
"C:mounted",
|
||||||
|
"B:mounted",
|
||||||
|
"A:mounted",
|
||||||
|
]).toBeLogged();
|
||||||
|
|
||||||
|
// initiate a render in C (so will be first task)
|
||||||
|
fixture.querySelector("button")!.click();
|
||||||
|
// initiate a render in A, but is blocked in B. the render will destroy c. also,
|
||||||
|
// it blocks the render C
|
||||||
|
parent.state.value = 34;
|
||||||
|
await nextTick();
|
||||||
|
expect(["A:willRender", "B:willUpdateProps", "A:rendered"]).toBeLogged();
|
||||||
|
|
||||||
|
// wait for render in A to be completed
|
||||||
|
prom1.resolve();
|
||||||
|
await nextTick();
|
||||||
|
expect(fixture.innerHTML).toBe("34");
|
||||||
|
expect([
|
||||||
|
"B:willRender",
|
||||||
|
"B:rendered",
|
||||||
|
"A:willPatch",
|
||||||
|
"B:willPatch",
|
||||||
|
"C:willUnmount",
|
||||||
|
"C:willDestroy",
|
||||||
|
"B:patched",
|
||||||
|
"A:patched",
|
||||||
|
]).toBeLogged();
|
||||||
|
|
||||||
|
await nextTick();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("delayed rendering, reusing fiber then component is destroyed and stuff", async () => {
|
||||||
|
let prom1 = makeDeferred();
|
||||||
|
|
||||||
|
class C extends Component {
|
||||||
|
static template = xml`<button t-on-click="increment"><t t-esc="state.val"/></button>`;
|
||||||
|
state = useState({ val: 1 });
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
}
|
||||||
|
increment() {
|
||||||
|
this.state.val++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class B extends Component {
|
||||||
|
static template = xml`<t t-esc="props.value"/><C />`;
|
||||||
|
static components = { C };
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
onWillUpdateProps(() => prom1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class A extends Component {
|
||||||
|
static template = xml`A<t t-if="state.value lt 15"><B value="state.value"/></t>`;
|
||||||
|
static components = { B };
|
||||||
|
state = useState({ value: 3 });
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const parent = await mount(A, fixture);
|
||||||
|
expect(fixture.innerHTML).toBe("A3<button>1</button>");
|
||||||
|
expect([
|
||||||
|
"A:setup",
|
||||||
|
"A:willStart",
|
||||||
|
"A:willRender",
|
||||||
|
"B:setup",
|
||||||
|
"B:willStart",
|
||||||
|
"A:rendered",
|
||||||
|
"B:willRender",
|
||||||
|
"C:setup",
|
||||||
|
"C:willStart",
|
||||||
|
"B:rendered",
|
||||||
|
"C:willRender",
|
||||||
|
"C:rendered",
|
||||||
|
"C:mounted",
|
||||||
|
"B:mounted",
|
||||||
|
"A:mounted",
|
||||||
|
]).toBeLogged();
|
||||||
|
|
||||||
|
// initiate a render in A, but is blocked in B
|
||||||
|
parent.state.value = 5;
|
||||||
|
await nextTick();
|
||||||
|
expect(["A:willRender", "B:willUpdateProps", "A:rendered"]).toBeLogged();
|
||||||
|
|
||||||
|
// initiate a render in C (will be delayed because of render in A)
|
||||||
|
fixture.querySelector("button")!.click();
|
||||||
|
await nextTick();
|
||||||
|
expect([]).toBeLogged();
|
||||||
|
|
||||||
|
// initiate a render in A, that will destroy B
|
||||||
|
parent.state.value = 23;
|
||||||
|
await nextTick();
|
||||||
|
expect(fixture.innerHTML).toBe("A");
|
||||||
|
expect([
|
||||||
|
"A:willRender",
|
||||||
|
"A:rendered",
|
||||||
|
"A:willPatch",
|
||||||
|
"B:willUnmount",
|
||||||
|
"C:willUnmount",
|
||||||
|
"C:willDestroy",
|
||||||
|
"B:willDestroy",
|
||||||
|
"A:patched",
|
||||||
|
]).toBeLogged();
|
||||||
|
});
|
||||||
|
|
||||||
// test.skip("components with shouldUpdate=false", async () => {
|
// test.skip("components with shouldUpdate=false", async () => {
|
||||||
// const state = { p: 1, cc: 10 };
|
// const state = { p: 1, cc: 10 };
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
useState,
|
useState,
|
||||||
xml,
|
xml,
|
||||||
} from "../../src";
|
} from "../../src";
|
||||||
import { makeTestFixture, nextTick, snapshotEverything } from "../helpers";
|
import { makeTestFixture, nextTick, snapshotEverything, useLogLifecycle } from "../helpers";
|
||||||
|
|
||||||
let fixture: HTMLElement;
|
let fixture: HTMLElement;
|
||||||
|
|
||||||
@@ -155,4 +155,48 @@ describe("reactivity in lifecycle", () => {
|
|||||||
expect(steps).toEqual([2]);
|
expect(steps).toEqual([2]);
|
||||||
expect(fixture.innerHTML).toBe("<div>2</div>");
|
expect(fixture.innerHTML).toBe("<div>2</div>");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("Child component doesn't render when state they depend on changes but their parent is about to unmount them", async () => {
|
||||||
|
class Child extends Component {
|
||||||
|
static template = xml`<t t-esc="props.state.content.a"/>`;
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
class Parent extends Component {
|
||||||
|
static template = xml`<Child t-if="state.renderChild" state="state"/>`;
|
||||||
|
static components = { Child };
|
||||||
|
state: any = useState({ renderChild: true, content: { a: 2 } });
|
||||||
|
setup() {
|
||||||
|
useLogLifecycle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const parent = await mount(Parent, fixture);
|
||||||
|
expect(fixture.innerHTML).toBe("2");
|
||||||
|
expect([
|
||||||
|
"Parent:setup",
|
||||||
|
"Parent:willStart",
|
||||||
|
"Parent:willRender",
|
||||||
|
"Child:setup",
|
||||||
|
"Child:willStart",
|
||||||
|
"Parent:rendered",
|
||||||
|
"Child:willRender",
|
||||||
|
"Child:rendered",
|
||||||
|
"Child:mounted",
|
||||||
|
"Parent:mounted",
|
||||||
|
]).toBeLogged();
|
||||||
|
|
||||||
|
parent.state.content = null;
|
||||||
|
parent.state.renderChild = false;
|
||||||
|
await nextTick();
|
||||||
|
expect([
|
||||||
|
"Parent:willRender",
|
||||||
|
"Parent:rendered",
|
||||||
|
"Parent:willPatch",
|
||||||
|
"Child:willUnmount",
|
||||||
|
"Child:willDestroy",
|
||||||
|
"Parent:patched",
|
||||||
|
]).toBeLogged();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user