From 54dd023dd44884d013af04fbb0d28a52782eff2f Mon Sep 17 00:00:00 2001 From: Mark Silverwood Date: Mon, 3 Jul 2023 11:40:43 +0100 Subject: [PATCH] apply suggested changes to computeFiniteResult --- src/model/price-range-impl.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/model/price-range-impl.ts b/src/model/price-range-impl.ts index e11ccb31b5..04e9b13e77 100644 --- a/src/model/price-range-impl.ts +++ b/src/model/price-range-impl.ts @@ -2,10 +2,6 @@ import { isNumber } from '../helpers/strict-type-checks'; import { PriceRange } from './series-options'; -function ensureFiniteWithFallback(value: number, fallback: number): number { - return Number.isFinite(value) ? value : fallback; -} - function computeFiniteResult( method: (...values: number[]) => number, valueOne: number, @@ -13,11 +9,13 @@ function computeFiniteResult( fallback: number ): number { const firstFinite = Number.isFinite(valueOne); - return firstFinite && Number.isFinite(valueTwo) - ? method(valueOne, valueTwo) - : firstFinite - ? valueOne - : ensureFiniteWithFallback(valueTwo, fallback); + const secondFinite = Number.isFinite(valueTwo); + + if (firstFinite && secondFinite) { + return method(valueOne, valueTwo); + } + + return !firstFinite && !secondFinite ? fallback : (firstFinite ? valueOne : valueTwo); } export class PriceRangeImpl {