Fix XLOOKUP for scenario with 2D returnArray

handsontable · Dec 5, 2024 · af99365 · af99365
1 parent d3c6a26
commit af99365
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/interpreter/plugin/LookupPlugin.ts b/src/interpreter/plugin/LookupPlugin.ts
@@ -147,19 +147,16 @@ export class LookupPlugin extends FunctionPlugin implements FunctionPluginTypech
   }
 
   public xlookupArraySize(ast: ProcedureAst, state: InterpreterState): ArraySize {
-    if (ast?.args?.length !== 5) {
-      return ArraySize.error()
-    }
-
     const lookupRangeValue = ast?.args?.[1] as CellRange
     const returnRangeValue = ast?.args?.[2] as CellRange
 
-    if ([
-      lookupRangeValue.start,
-      returnRangeValue.start,
-      lookupRangeValue.end,
-      returnRangeValue.end
-    ].some((val) => val === undefined)) {
+    if (lookupRangeValue == null
+      || lookupRangeValue.start == null
+      || lookupRangeValue.end == null
+      || returnRangeValue == null
+      || returnRangeValue.start == null
+      || returnRangeValue.end == null
+    ) {
       return ArraySize.error()
     }