[FIX] component: error handling: rendering with sub components

Closes #425
This commit is contained in:
Aaron Bohy
2019-10-30 11:35:28 +01:00
committed by aab-odoo
parent fa6801b523
commit 9e37b968e8
6 changed files with 41 additions and 13 deletions
+9 -11
View File
@@ -4,7 +4,7 @@ import { h, patch, VNode } from "../vdom/index";
import "./directive";
import { Fiber } from "./fiber";
import "./props_validation";
import { Scheduler } from "./scheduler";
import { scheduler } from "./scheduler";
/**
* Owl Component System
@@ -20,8 +20,6 @@ import { Scheduler } from "./scheduler";
//------------------------------------------------------------------------------
// Types/helpers
//------------------------------------------------------------------------------
const raf = window.requestAnimationFrame.bind(window);
export const scheduler = new Scheduler(raf);
/**
* An Env (environment) is an object that will be (mostly) shared between all
@@ -296,13 +294,8 @@ export class Component<T extends Env, Props extends {}> {
}
return;
}
const fiber = new Fiber(null, this, this.props, undefined, undefined, false);
if (!__owl__.vnode) {
this.__prepareAndRender(fiber);
} else {
this.__render(fiber);
}
return new Promise((resolve, reject) => {
const fiber = new Fiber(null, this, this.props, undefined, undefined, false);
scheduler.addFiber(fiber, err => {
if (err) {
reject(err);
@@ -317,6 +310,11 @@ export class Component<T extends Env, Props extends {}> {
}
resolve();
});
if (!__owl__.vnode) {
this.__prepareAndRender(fiber);
} else {
this.__render(fiber);
}
});
}
@@ -348,9 +346,8 @@ export class Component<T extends Env, Props extends {}> {
) {
return;
}
const fiber = new Fiber(null, this, this.props, undefined, undefined, force);
this.__render(fiber);
return new Promise((resolve, reject) => {
const fiber = new Fiber(null, this, this.props, undefined, undefined, force);
scheduler.addFiber(fiber.root, err => {
if (err) {
reject(err);
@@ -361,6 +358,7 @@ export class Component<T extends Env, Props extends {}> {
}
resolve();
});
this.__render(fiber);
});
}
+5
View File
@@ -1,5 +1,6 @@
import { VNode } from "../vdom/index";
import { Component } from "./component";
import { scheduler } from "./scheduler";
/**
* Owl Fiber Class
@@ -216,7 +217,11 @@ export class Fiber {
component.catchError!(error);
});
} else {
// the 3 next lines aim to mark the root fiber as being in error, and
// to force it to end, without waiting for its children
this.root.counter = 0;
this.root.error = error;
scheduler.flush();
root.destroy();
}
}
+3
View File
@@ -65,3 +65,6 @@ export class Scheduler {
});
}
}
const raf = window.requestAnimationFrame.bind(window);
export const scheduler = new Scheduler(raf);