refactor: integrals

cheminfo · Oct 19, 2023 · 0481a12 · 0481a12
1 parent 12e5ac6
commit 0481a12
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/src/component/1d/integral/Integral.tsx b/src/component/1d/integral/Integral.tsx
@@ -11,7 +11,7 @@ interface IntegralProps {
   max: number;
 }
 
-function Integral({ integral, nucleus, max }: IntegralProps) {
+export function Integral({ integral, nucleus, max }: IntegralProps) {
   const { x, y } = integral;
   const { scaleRatio } = useActiveSpectrumIntegralsViewState();
   const path = useIntegralPath({ x, y, max, scaleRatio });
@@ -34,5 +34,3 @@ function Integral({ integral, nucleus, max }: IntegralProps) {
     </g>
   );
 }
-
-export default Integral;
diff --git a/src/component/1d/integral/IntegralsSeries.tsx b/src/component/1d/integral/IntegralsSeries.tsx
@@ -5,7 +5,7 @@ import { Integral as IntegralType } from 'nmr-processing';
 import { useChartData } from '../../context/ChartContext';
 import useSpectrum from '../../hooks/useSpectrum';
 
-import Integral from './Integral';
+import { Integral } from './Integral';
 
 const emptyData = { integrals: {}, info: {}, display: {} };
 
@@ -14,7 +14,7 @@ export interface IntegralData extends IntegralType {
   y: Float64Array;
 }
 
-function IntegralsSeries() {
+export default function IntegralsSeries() {
   const {
     displayerKey,
     view: {
@@ -26,17 +26,15 @@ function IntegralsSeries() {
   if (!integrals) return null;
 
   return (
-    <g clipPath={`url(#${displayerKey}clip-chart-1d)`}>
-      <g className="integrals">
-        {integrals.values.map((integral) => (
-          <Integral
-            nucleus={nucleus}
-            key={integral.id}
-            integral={integral}
-            max={integrals.max}
-          />
-        ))}
-      </g>
+    <g clipPath={`url(#${displayerKey}clip-chart-1d)`} className="integrals">
+      {integrals.values.map((integral) => (
+        <Integral
+          nucleus={nucleus}
+          key={integral.id}
+          integral={integral}
+          max={integrals.max}
+        />
+      ))}
     </g>
   );
 }
@@ -76,5 +74,3 @@ function useIntegrals() {
 
   return { max, values };
 }
-
-export default IntegralsSeries;