fix: absolute integration column format (#1828)

close: #1827
cheminfo · Oct 25, 2022 · f87886b · f87886b
1 parent 82568b6
commit f87886b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 23 deletions.
diff --git a/src/component/panels/RangesPanel/RangesTableRow.tsx b/src/component/panels/RangesPanel/RangesTableRow.tsx
@@ -26,7 +26,6 @@ import RelativeColumn from './TableColumns/RelativeColumn';
 import SignalAssignmentsColumn from './TableColumns/SignalAssignmentsColumn';
 import SignalDeltaColumn from './TableColumns/SignalDeltaColumn';
 import SignalDeltaHzColumn from './TableColumns/SignalDeltaHzColumn';
-import useFormat from './TableColumns/format';
 
 const HighlightedRowStyle = css`
   background-color: #ff6f0057;
@@ -76,8 +75,6 @@ function RangesTableRow({
   const [unlinkSignalButtonVisibility, showUnlinkSignalButton] =
     useState(false);
 
-  const getFormat = useFormat(preferences);
-
   const rowSpanTags: any = useMemo(() => {
     return {
       rowSpan: rowData.tableMetaInfo.rowSpan,
@@ -223,7 +220,7 @@ function RangesTableRow({
           value={rowData.absolute}
           rowSpanTags={rowSpanTags}
           onHoverRange={onHoverRange}
-          format={getFormat('absoluteFormat', undefined)}
+          format={preferences.absolute.format}
         />
       )}
 

diff --git a/src/component/panels/RangesPanel/TableColumns/format.ts b/src/component/panels/RangesPanel/TableColumns/format.ts
diff --git a/src/component/panels/extra/preferences/ColumnsHelper.ts b/src/component/panels/extra/preferences/ColumnsHelper.ts
@@ -60,14 +60,12 @@ export default class ColumnsHelper {
         } = options;
 
         if (showPrefixSuffixCallback(row)) {
-          return formatNumber(
-            row.original[columnKey],
-            format,
-            formatPrefix,
-            formatSuffix,
-          );
+          return formatNumber(row.original[columnKey], format, {
+            prefix: formatPrefix,
+            suffix: formatSuffix,
+          });
         } else {
-          return formatNumber(row.original[columnKey], format, '', '');
+          return formatNumber(row.original[columnKey], format);
         }
       });
     }

diff --git a/src/component/utility/formatNumber.ts b/src/component/utility/formatNumber.ts
@@ -1,8 +1,20 @@
 import numeral from 'numeral';
 
-function formatNumber(value, format, prefix = '', suffix = '') {
+interface FormatOptions {
+  prefix?: string;
+  suffix?: string;
+  defaultFormat?: string;
+}
+
+function formatNumber(
+  value: any,
+  format: number | string,
+  options: FormatOptions = {},
+) {
+  const { prefix = '', suffix = '', defaultFormat = '0.00' } = options;
+
   return (value || value === 0) && !isNaN(value)
-    ? prefix + numeral(value).format(format) + suffix
+    ? prefix + numeral(value).format(format || defaultFormat) + suffix
     : value;
 }