🤖 Merge PR #44222 Fix yoga-layout types for setMeasureFunc() and unse…

…tMeasureFunc() by @vadimdemedes
DefinitelyTyped · May 17, 2020 · 735e871 · 735e871
1 parent f694ff8
commit 735e871
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/types/yoga-layout/index.d.ts b/types/yoga-layout/index.d.ts
@@ -230,6 +230,12 @@ declare namespace Yoga {
 
     type YogaExperimentalFeature = typeof EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS;
 
+    type YogaMeasureMode =
+        | typeof MEASURE_MODE_COUNT
+        | typeof MEASURE_MODE_UNDEFINED
+        | typeof MEASURE_MODE_EXACTLY
+        | typeof MEASURE_MODE_AT_MOST;
+
     interface YogaNode {
         calculateLayout(
             width?: number,
@@ -304,7 +310,7 @@ declare namespace Yoga {
         setMaxHeightPercent(maxHeight: number): void;
         setMaxWidth(maxWidth: number | string): void;
         setMaxWidthPercent(maxWidth: number): void;
-        setMeasureFunc(measureFunc: (() => any) | null): void;
+        setMeasureFunc(measureFunc: (width: number, widthMeasureMode: YogaMeasureMode, height: number, heightMeasureMode: YogaMeasureMode) => { width?: number; height?: number } | null): void;
         setMinHeight(minHeight: number | string): void;
         setMinHeightPercent(minHeight: number): void;
         setMinWidth(minWidth: number | string): void;
@@ -318,7 +324,7 @@ declare namespace Yoga {
         setWidth(width: number | string): void;
         setWidthAuto(): void;
         setWidthPercent(width: number): void;
-        unsetMeasureFun(): void;
+        unsetMeasureFunc(): void;
     }
 
     interface YogaConfig {

diff --git a/types/yoga-layout/yoga-layout-tests.ts b/types/yoga-layout/yoga-layout-tests.ts
@@ -16,6 +16,11 @@ node1.setHeight(100);
 node1.setDisplay(DISPLAY_FLEX);
 
 const node2 = Node.create();
+node2.setMeasureFunc((_width: number, _widthMeasureMode: yoga.YogaMeasureMode, _height: number, _heightMeasureMode: yoga.YogaMeasureMode) => ({
+    width: 100,
+    height: 100
+}));
+node2.unsetMeasureFunc();
 node2.setWidth(100);
 node2.setHeight(100);