fix breaking change in setMeasureFunc after emscripten migration (#1219)
Summary: current `MeasureFunc` is stricter than the previous one and when it returns only one dimension object yoga throw `TypeError: Missing field: "height"` or `TypeError: Missing field: "width"` this is a breaking change and `react-pdf` use this feature a lot, so i wanna return the previous behavior back codesandbox with reproduction on `yoga-layout-prebuilt`: https://codesandbox.io/s/yoga-layout-measure-callback-wrong-data-1l9133 Pull Request resolved: https://github.com/facebook/yoga/pull/1219 Reviewed By: NickGerleman Differential Revision: D42778696 Pulled By: jacdebug fbshipit-source-id: 2fb87be74f456ee34273655f2c47f62360001895
This commit is contained in:
committed by
Facebook GitHub Bot
parent
9e1bcd8557
commit
5496554cbf
@@ -74,11 +74,25 @@ module.exports = (lib) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function wrapMeasureFunction(measureFunction) {
|
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) {
|
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) {
|
function wrapDirtiedFunc(dirtiedFunction) {
|
||||||
@@ -115,16 +129,6 @@ module.exports = (lib) => {
|
|||||||
this.free();
|
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(
|
patch(
|
||||||
lib.Node.prototype,
|
lib.Node.prototype,
|
||||||
"calculateLayout",
|
"calculateLayout",
|
||||||
|
@@ -23,3 +23,42 @@ test("dont_measure_single_grow_shrink_child", () => {
|
|||||||
|
|
||||||
root.freeRecursive();
|
root.freeRecursive();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("dont_fail_with_incomplete_measure_dimensions", () => {
|
||||||
|
const heightOnlyCallback = getMeasureCounter(Yoga, () => ({ height: 10 }));
|
||||||
|
const widthOnlyCallback = getMeasureCounter(Yoga, () => ({ width: 10 }));
|
||||||
|
const emptyCallback = getMeasureCounter(Yoga, () => ({}));
|
||||||
|
|
||||||
|
const root = Yoga.Node.create();
|
||||||
|
root.setWidth(100);
|
||||||
|
root.setHeight(100);
|
||||||
|
|
||||||
|
const node1 = Yoga.Node.create();
|
||||||
|
const node2 = Yoga.Node.create();
|
||||||
|
const node3 = Yoga.Node.create();
|
||||||
|
|
||||||
|
root.insertChild(node1, root.getChildCount());
|
||||||
|
root.insertChild(node2, root.getChildCount());
|
||||||
|
root.insertChild(node3, root.getChildCount());
|
||||||
|
|
||||||
|
node1.setMeasureFunc(heightOnlyCallback.inc);
|
||||||
|
node2.setMeasureFunc(widthOnlyCallback.inc);
|
||||||
|
node3.setMeasureFunc(emptyCallback.inc);
|
||||||
|
|
||||||
|
root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
|
||||||
|
|
||||||
|
expect(heightOnlyCallback.get()).toBe(1);
|
||||||
|
expect(widthOnlyCallback.get()).toBe(1);
|
||||||
|
expect(emptyCallback.get()).toBe(1);
|
||||||
|
|
||||||
|
expect(node1.getComputedWidth()).toBe(100);
|
||||||
|
expect(node1.getComputedHeight()).toBe(10);
|
||||||
|
|
||||||
|
expect(node2.getComputedWidth()).toBe(100);
|
||||||
|
expect(node2.getComputedHeight()).toBe(0);
|
||||||
|
|
||||||
|
expect(node3.getComputedWidth()).toBe(100);
|
||||||
|
expect(node3.getComputedHeight()).toBe(0);
|
||||||
|
|
||||||
|
root.freeRecursive();
|
||||||
|
});
|
||||||
|
Reference in New Issue
Block a user