[FIX] component: slots should preserve parented relation

closes #234

src/qweb_core.ts

@@ -313,6 +313,7 @@ export class QWeb extends EventBus {
       ctx.nextID = parentContext.parentNode! + 1;
       ctx.parentNode = parentContext.parentNode!;
       ctx.allowMultipleRoots = true;
+      ctx.hasParentWidget = true;
       ctx.addLine(`let c${ctx.parentNode} = extra.parentNode;`);
 
       for (let v in parentContext.variables) {
@@ -685,6 +686,7 @@ export class Context {
   rootContext: Context;
   caller: Element | undefined;
   shouldDefineOwner: boolean = false;
+  shouldDefineParent: boolean = false;
   shouldDefineQWeb: boolean = false;
   shouldDefineUtils: boolean = false;
   shouldProtectContext: boolean = false;
@@ -693,6 +695,7 @@ export class Context {
   inPreTag: boolean = false;
   templateName: string;
   allowMultipleRoots: boolean = false;
+  hasParentWidget: boolean = false;
   scopeVars: any[] = [];
 
   constructor(name?: string) {
@@ -725,6 +728,13 @@ export class Context {
       // pollute the rendering context by adding some keys in it.
       this.code.unshift("    let owner = context;");
     }
+    if (this.shouldDefineParent) {
+      if (this.hasParentWidget) {
+        this.code.unshift("    let parent = extra.parent;");
+      } else {
+        this.code.unshift("    let parent = context;");
+      }
+    }
     if (this.shouldDefineQWeb) {
       this.code.unshift("    let QWeb = this.constructor;");
     }

src/qweb_extensions.ts

@@ -359,6 +359,7 @@ QWeb.addDirective({
     ctx.addLine("//COMPONENT");
     ctx.rootContext.shouldDefineOwner = true;
     ctx.rootContext.shouldDefineQWeb = true;
+    ctx.rootContext.shouldDefineParent = true;
     ctx.rootContext.shouldDefineUtils = true;
     let keepAlive = node.getAttribute("t-keepalive") ? true : false;
     let async = node.getAttribute("t-asyncroot") ? true : false;
@@ -552,7 +553,7 @@ QWeb.addDirective({
     if (QWeb.dev) {
       ctx.addLine(`utils.validateProps(W${componentID}, props${componentID})`);
     }
-    ctx.addLine(`w${componentID} = new W${componentID}(owner, props${componentID});`);
+    ctx.addLine(`w${componentID} = new W${componentID}(parent, props${componentID});`);
     ctx.addLine(`context.__owl__.cmap[${templateID}] = w${componentID}.__owl__.id;`);
 
     // SLOTS
@@ -786,12 +787,13 @@ QWeb.addDirective({
   priority: 80,
   atNodeEncounter({ ctx, value }): boolean {
     const slotKey = ctx.generateID();
+    ctx.rootContext.shouldDefineOwner = true;
     ctx.addLine(`const slot${slotKey} = this.slots[context.__owl__.slotId + '_' + '${value}'];`);
     ctx.addIf(`slot${slotKey}`);
     ctx.addLine(
       `slot${slotKey}(context.__owl__.parent, Object.assign({}, extra, {parentNode: c${
         ctx.parentNode
-      }, vars: extra.vars}));`
+      }, vars: extra.vars, parent: owner}));`
     );
     ctx.closeIf();
     return true;