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] update owl to v2.0.0-beta-21

Browse Source
This commit is contained in:
Géry Debongnie
2022-09-26 15:44:36 +02:00
parent d7552f1900
commit 4ada971c51
1 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
owl.js
+46 -33
View File
@@ -675,6 +675,15 @@
: document.createElement(tagName); : document.createElement(tagName);
} }
if (el instanceof Element) { if (el instanceof Element) {
if (!domParentTree) {
// some html elements may have side effects when setting their attributes.
// For example, setting the src attribute of an <img/> will trigger a
// request to get the corresponding image. This is something that we
// don't want at compile time. We avoid that by putting the content of
// the block in a <template/> element
const fragment = document.createElement("template").content;
fragment.appendChild(el);
}
for (let i = 0; i < attrs.length; i++) { for (let i = 0; i < attrs.length; i++) {
const attrName = attrs[i].name; const attrName = attrs[i].name;
const attrValue = attrs[i].value; const attrValue = attrs[i].value;
@@ -2599,66 +2608,70 @@
const VText = text("").constructor; const VText = text("").constructor;
class VPortal extends VText { class VPortal extends VText {
constructor(selector, realBDom) { constructor(selector, content) {
super(""); super("");
this.target = null; this.target = null;
this.selector = selector; this.selector = selector;
this.realBDom = realBDom; this.content = content;
} }
mount(parent, anchor) { mount(parent, anchor) {
super.mount(parent, anchor); super.mount(parent, anchor);
this.target = document.querySelector(this.selector); this.target = document.querySelector(this.selector);
if (!this.target) { if (this.target) {
let el = this.el; this.content.mount(this.target, null);
while (el && el.parentElement instanceof HTMLElement) {
el = el.parentElement;
} }
this.target = el && el.querySelector(this.selector); else {
if (!this.target) { this.content.mount(parent, anchor);
throw new OwlError("invalid portal target");
} }
} }
this.realBDom.mount(this.target, null);
}
beforeRemove() { beforeRemove() {
this.realBDom.beforeRemove(); this.content.beforeRemove();
} }
remove() { remove() {
if (this.realBDom) { if (this.content) {
super.remove(); super.remove();
this.realBDom.remove(); this.content.remove();
this.realBDom = null; this.content = null;
} }
} }
patch(other) { patch(other) {
super.patch(other); super.patch(other);
if (this.realBDom) { if (this.content) {
this.realBDom.patch(other.realBDom, true); this.content.patch(other.content, true);
} }
else { else {
this.realBDom = other.realBDom; this.content = other.content;
this.realBDom.mount(this.target, null); this.content.mount(this.target, null);
} }
} }
} }
/** /**
* <t t-slot="default"/> * kind of similar to <t t-slot="default"/>, but it wraps it around a VPortal
*/ */
function portalTemplate(app, bdom, helpers) { function portalTemplate(app, bdom, helpers) {
let { callSlot } = helpers; let { callSlot } = helpers;
return function template(ctx, node, key = "") { return function template(ctx, node, key = "") {
return callSlot(ctx, node, key, "default", false, null); return new VPortal(ctx.props.target, callSlot(ctx, node, key, "default", false, null));
}; };
} }
class Portal extends Component { class Portal extends Component {
setup() { setup() {
const node = this.__owl__; const node = this.__owl__;
const renderFn = node.renderFn; onMounted(() => {
node.renderFn = () => new VPortal(this.props.target, renderFn()); const portal = node.bdom;
onWillUnmount(() => { if (!portal.target) {
if (node.bdom) { const target = document.querySelector(this.props.target);
node.bdom.remove(); if (target) {
portal.content.moveBefore(target, null);
} }
else {
throw new OwlError("invalid portal target");
}
}
});
onWillUnmount(() => {
const portal = node.bdom;
portal.remove();
}); });
} }
} }
@@ -2982,10 +2995,10 @@
* visit recursively the props and all the children to check if they are valid. * visit recursively the props and all the children to check if they are valid.
* This is why it is only done in 'dev' mode. * This is why it is only done in 'dev' mode.
*/ */
function validateProps(name, props, parent) { function validateProps(name, props, comp) {
const ComponentClass = typeof name !== "string" const ComponentClass = typeof name !== "string"
? name ? name
: parent.constructor.components[name]; : comp.constructor.components[name];
if (!ComponentClass) { if (!ComponentClass) {
// this is an error, wrong component. We silently return here instead so the // this is an error, wrong component. We silently return here instead so the
// error is triggered by the usual path ('component' function) // error is triggered by the usual path ('component' function)
@@ -2993,7 +3006,7 @@
} }
const schema = ComponentClass.props; const schema = ComponentClass.props;
if (!schema) { if (!schema) {
if (parent.__owl__.app.warnIfNoStaticProps) { if (comp.__owl__.app.warnIfNoStaticProps) {
console.warn(`Component '${ComponentClass.name}' does not have a static props description`); console.warn(`Component '${ComponentClass.name}' does not have a static props description`);
} }
return; return;
@@ -4497,7 +4510,7 @@
expr = `\`${ast.name}\``; expr = `\`${ast.name}\``;
} }
if (this.dev) { if (this.dev) {
this.addLine(`helpers.validateProps(${expr}, ${propVar}, ctx);`); this.addLine(`helpers.validateProps(${expr}, ${propVar}, this);`);
} }
if (block && (ctx.forceNewBlock === false || ctx.tKeyExpr)) { if (block && (ctx.forceNewBlock === false || ctx.tKeyExpr)) {
// todo: check the forcenewblock condition // todo: check the forcenewblock condition
@@ -5788,9 +5801,9 @@ See https://github.com/odoo/owl/blob/${hash}/doc/reference/app.md#configuration
Object.defineProperty(exports, '__esModule', { value: true }); Object.defineProperty(exports, '__esModule', { value: true });
__info__.version = '2.0.0-beta-20'; __info__.version = '2.0.0-beta-21';
__info__.date = '2022-09-09T07:26:31.611Z'; __info__.date = '2022-09-26T13:44:29.909Z';
__info__.hash = 'b51756f'; __info__.hash = 'ab72cdd';
__info__.url = 'https://github.com/odoo/owl'; __info__.url = 'https://github.com/odoo/owl';