return width and height all the times

This commit is contained in:
Dmitry Ivakhnenko
2023-01-26 18:06:54 +03:00
parent d38d585a78
commit dcaef932dd

View File

@@ -74,11 +74,25 @@ module.exports = (lib) => {
}
function wrapMeasureFunction(measureFunction) {
return lib.MeasureCallback.implement({ measure: measureFunction });
return lib.MeasureCallback.implement({
measure: (...args) => {
const { width, height } = measureFunction(...args);
return {
width: width ?? NaN,
height: height ?? NaN,
};
},
});
}
patch(lib.Node.prototype, "setMeasureFunc", function (original, measureFunc) {
original.call(this, wrapMeasureFunction(measureFunc));
// This patch is just a convenience patch, since it helps write more
// idiomatic source code (such as .setMeasureFunc(null))
if (measureFunc) {
return original.call(this, wrapMeasureFunction(measureFunc));
} else {
return this.unsetMeasureFunc();
}
});
function wrapDirtiedFunc(dirtiedFunction) {
@@ -115,16 +129,6 @@ module.exports = (lib) => {
this.free();
});
patch(lib.Node.prototype, "setMeasureFunc", function (original, measureFunc) {
// This patch is just a convenience patch, since it helps write more
// idiomatic source code (such as .setMeasureFunc(null))
if (measureFunc) {
return original.call(this, (...args) => measureFunc(...args));
} else {
return this.unsetMeasureFunc();
}
});
patch(
lib.Node.prototype,
"calculateLayout",