add t-ref directive

This commit is contained in:
Géry Debongnie
2019-01-21 15:46:29 +01:00
parent 64557ae999
commit 9be5cc1760
6 changed files with 53 additions and 15 deletions
+4 -1
View File
@@ -48,4 +48,7 @@ Before even thinking about using this in a real scenario:
- style is props? difference between props and attrs
- text node
- t-extend???
- improve qweb generated code: do not assign object/array if no props/attrs/children
- improve qweb generated code: do not assign object/array if no props/attrs/children
- improve qweb gen code: when building a vnode, propagate a structure with
children/attrs/hooks, fill it properly by each directive, then and only
then create node with minimal code
+1 -1
View File
@@ -1,7 +1,7 @@
import Widget from "../../src/core/widget";
const template = `
<div t-debug="1">
<div>
<button t-on-click="increment(-1)">-</button>
<span style="font-weight:bold">Value: <t t-esc="state.counter"/></span>
<button t-on-click="increment(1)">+</button>
+1 -1
View File
@@ -2,7 +2,7 @@ import Widget from "../../src/core/widget";
import Counter from "./Counter";
const template = `
<div t-debug="1">
<div>
<span>Root Widget</span>
<button t-on-click="resetCounter">Reset</button>
<button t-on-click="resetCounterAsync">Reset in 3s</button>
+12 -1
View File
@@ -100,6 +100,7 @@ export default class QWeb {
ifDirective,
callDirective,
onDirective,
refDirective,
widgetDirective
].forEach(d => this.addDirective(d));
}
@@ -653,6 +654,17 @@ const onDirective: Directive = {
}
};
const refDirective: Directive = {
name: "ref",
priority: 95,
atNodeCreation({ ctx, node, nodeID }) {
let ref = node.getAttribute("t-ref");
ctx.addLine(`p${ctx.parentNode}.hook = {
create: (_, n) => context.refs['${ref}'] = n.elm,
}`);
}
};
const widgetDirective: Directive = {
name: "widget",
priority: 100,
@@ -671,7 +683,6 @@ const widgetDirective: Directive = {
);
ctx.addLine(`context._TEMP.push(def${defID})`);
// split into extra directive?
let ref = node.getAttribute("t-ref");
if (ref) {
ctx.addLine(`context.refs['${ref}'] = _${widgetID}`);
+12 -1
View File
@@ -69,7 +69,7 @@ describe("error handling", () => {
test("template with text node and tag", () => {
const qweb = new QWeb();
qweb.addTemplate("test", `<t t-debug="1">text<span>other node</span></t>`);
qweb.addTemplate("test", `<t>text<span>other node</span></t>`);
expect(() => renderToString(qweb, "test")).toThrow(
"A template should not have more than one root node"
@@ -652,3 +652,14 @@ describe("t-on", () => {
expect(a).toBe(6);
});
});
describe("t-ref", () => {
test("can get a ref on a node", () => {
const qweb = new QWeb();
qweb.addTemplate("test", `<div><span t-ref="myspan"/></div>`);
let refs: any = {};
renderToDOM(qweb, "test", { refs});
expect(refs.myspan.tagName).toBe('SPAN');
});
});
+23 -10
View File
@@ -120,21 +120,34 @@ describe("destroy method", () => {
});
describe("composition", () => {
class WidgetB extends Widget {
template= `<div>world</div>`;
}
class WidgetA extends Widget {
name="a";
template= `<div>Hello<t t-widget="b"/></div>`;
widgets = {b: WidgetB}
}
test("a widget with a sub widget", async () => {
class WidgetB extends Widget {
template= `<div>world</div>`;
}
class WidgetA extends Widget {
name="a";
template= `<div>Hello<t t-widget="b"/></div>`;
widgets = {b: WidgetB}
}
const widget = makeWidget(WidgetA);
const target = document.createElement("div");
await widget.mount(target);
expect(target.innerHTML).toBe("<div>Hello<div>world</div></div>");
});
test("t-refs on widget are widgets", async () => {
class WidgetC extends Widget {
name="a";
template= `<div t-debug="1">Hello<t t-ref="mywidgetb" t-widget="b"/></div>`;
widgets = {b: WidgetB}
}
const widget = makeWidget(WidgetC);
const target = document.createElement("div");
await widget.mount(target);
expect(widget.refs.mywidgetb instanceof WidgetB).toBe(true);
});
});