fix(🐛): getXforY() now returns null if x is out of bound (#431)

wcandillon · Apr 5, 2021 · 0faf0c6 · 0faf0c6
1 parent 655f422
commit 0faf0c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Paths.ts b/src/Paths.ts
@@ -273,7 +273,7 @@ const curveIsFound = (c: NullableSelectedCurve): c is SelectedCurve => {
  * @summary Return the curves at x. This function assumes that only one curve is available at x
  * @worklet
  */
-export const selectCurve = (path: Path, x: number): SelectedCurve => {
+export const selectCurve = (path: Path, x: number): SelectedCurve | null => {
   "worklet";
   const result: NullableSelectedCurve = {
     from: path.move,
@@ -292,7 +292,7 @@ export const selectCurve = (path: Path, x: number): SelectedCurve => {
     result.from = c.to;
   }
   if (!curveIsFound(result)) {
-    throw new Error(`No curve found at ${x}`);
+    return null;
   }
   return result;
 };
@@ -312,6 +312,9 @@ export const selectCurve = (path: Path, x: number): SelectedCurve => {
 export const getYForX = (path: Path, x: number, precision = 2) => {
   "worklet";
   const c = selectCurve(path, x);
+  if (c === null) {
+    return null;
+  }
   return cubicBezierYForX(
     x,
     c.from,

diff --git a/src/__tests__/Paths.test.ts b/src/__tests__/Paths.test.ts
@@ -46,7 +46,7 @@ test("getYForX()", () => {
   );
   expect(getYForX(p1, 200)).toBe(75);
   expect(getYForX(p1, 50)).toBe(151.160325);
-  expect(() => getYForX(p1, 750)).toThrow();
+  expect(getYForX(p1, 750)).toBe(null);
 });
 
 test("getYForX2()", () => {