NextERP/owl
2
0
Fork 0
mirror of https://github.com/odoo/owl.git synced 2025-10-06 19:59:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] component: do not set props in root components

Browse Source 
Also remove props from Fiber, as it was not useful anymore.
This commit is contained in:
Aaron Bohy
2019-10-30 14:57:24 +01:00
committed by Géry Debongnie
parent 0addca63a0
commit 7d249d6f09
5 changed files with 389 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/component/component.ts
+13 -18
View File
@@ -114,23 +114,17 @@ export class Component<T extends Env, Props extends {}> {
constructor(parent?: Component<T, any>, props?: Props) {
Component.current = this;
const defaultProps = (<any>this.constructor).defaultProps;
if (defaultProps) {
props = this.__applyDefaultProps(props, defaultProps);
}
// is this a good idea?
// Pro: if props is empty, we can create easily a component
// Con: this is not really safe
// Pro: but creating component (by a template) is always unsafe anyway
this.props = <Props>props || <Props>{};
if (QWeb.dev) {
QWeb.utils.validateProps(this.constructor, this.props);
}
const id: number = nextId++;
let depth;
if (parent) {
const defaultProps = (<any>this.constructor).defaultProps;
if (defaultProps) {
props = this.__applyDefaultProps(props, defaultProps);
}
this.props = <Props>props;
if (QWeb.dev) {
QWeb.utils.validateProps(this.constructor, this.props);
}
this.env = parent.env;
const __powl__ = parent.__owl__;
__powl__.children[id] = this;
@@ -138,6 +132,7 @@ export class Component<T extends Env, Props extends {}> {
} else {
// we are the root component
this.env = config.env as T;
this.props = undefined as unknown as Props;
this.env.qweb.on("update", this, () => {
if (this.__owl__.isMounted) {
this.render(true);
@@ -287,7 +282,7 @@ export class Component<T extends Env, Props extends {}> {
return;
}
return new Promise((resolve, reject) => {
const fiber = new Fiber(null, this, this.props, undefined, undefined, false);
const fiber = new Fiber(null, this, undefined, undefined, false);
scheduler.addFiber(fiber, err => {
if (err) {
reject(err);
@@ -339,7 +334,7 @@ export class Component<T extends Env, Props extends {}> {
return;
}
return new Promise((resolve, reject) => {
const fiber = new Fiber(null, this, this.props, undefined, undefined, force);
const fiber = new Fiber(null, this, undefined, undefined, force);
scheduler.addFiber(fiber.root, err => {
if (err) {
reject(err);
@@ -488,7 +483,7 @@ export class Component<T extends Env, Props extends {}> {
const shouldUpdate = parentFiber.force || this.shouldUpdate(nextProps);
if (shouldUpdate) {
const __owl__ = this.__owl__;
const fiber = new Fiber(parentFiber, this, this.props, scope, vars, parentFiber.force);
const fiber = new Fiber(parentFiber, this, scope, vars, parentFiber.force);
if (!parentFiber.child) {
parentFiber.child = fiber;
} else {
@@ -532,7 +527,7 @@ export class Component<T extends Env, Props extends {}> {
* parent template.
*/
__prepare(parentFiber: Fiber, scope: any, vars: any, previousSibling?: Fiber | null) {
const fiber = new Fiber(parentFiber, this, this.props, scope, vars, parentFiber.force);
const fiber = new Fiber(parentFiber, this, scope, vars, parentFiber.force);
fiber.shouldPatch = false;
if (!parentFiber.child) {
parentFiber.child = fiber;
src/component/fiber.ts
+1 -3
View File
@@ -44,7 +44,6 @@ export class Fiber {
scope: any;
vars: any;
props: any;
component: Component<any, any>;
vnode: VNode | null = null;
@@ -56,11 +55,10 @@ export class Fiber {
error?: Error;
constructor(parent: Fiber | null, component: Component<any, any>, props, scope, vars, force) {
constructor(parent: Fiber | null, component: Component<any, any>, scope, vars, force) {
this.force = force;
this.scope = scope;
this.vars = vars;
this.props = props;
this.component = component;
this.root = parent ? parent.root : this;