small refactors

rcpch · Sep 6, 2024 · b853da8 · b853da8
1 parent 363718b
commit b853da8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -10,21 +10,15 @@ const config: StorybookConfig = {
         '@storybook/addon-interactions',
         '@storybook/addon-mdx-gfm',
         '@storybook/addon-webpack5-compiler-babel',
-        {
-            name: '@storybook/addon-styling-webpack',
-            options: {
-              rules: [
-                // Replaces existing CSS rules with given rule
-                {
-                  test: /\.css$/,
-                  use: [
-                    'style-loader',
-                    'css-loader',
-                  ],
-                }
-              ]
-            }
-          }
+        // {
+        //     name: '@storybook/addon-styling-webpack',
+        //     options: {
+        //       rules: [
+        //         // Replaces existing CSS rules with given rule
+        //         // s
+        //       ]
+        //     }
+        //   }
     ],
     framework: {
         name: '@storybook/react-webpack5',

diff --git a/src/CentileChart/CentileChart.stories.tsx b/src/CentileChart/CentileChart.stories.tsx
@@ -1,7 +1,6 @@
 // Generated with util/create-component.js
 import * as React from 'react';
 import CentileChart from './CentileChart';
-import RCPCHChart from '../RCPCHChart';
 import { monochromeStyles } from '../testParameters/styles/monochromeStyles';
 import { Tanner1Styles } from '../testParameters/styles/tanner1Styles';
 import { Tanner2Styles } from '../testParameters/styles/tanner2Styles';

diff --git a/src/CentileChart/CentileChart.tsx b/src/CentileChart/CentileChart.tsx
@@ -300,7 +300,9 @@ function CentileChart({
                                     backgroundPadding={5}
                                     pointerLength={5}
                                     cornerRadius={0}
-                                    flyoutStyle={{...styles.toolTipFlyout}}
+                                    flyoutStyle={{
+                                        ...styles.toolTipFlyout,
+                                    }}
                                     style={{...styles.toolTipMain}}
                                 />
                             }

diff --git a/src/functions/makeAllStyles.ts b/src/functions/makeAllStyles.ts
@@ -66,18 +66,18 @@ function makeAllStyles(
         toolTipMain: {
             fontSize: chartStyle?.tooltipTextStyle?.size ?? 14,
             fill: chartStyle?.tooltipTextStyle?.colour ?? black,
-            fontFamily: 'Montserrat', // chartStyle?.tooltipTextStyle?.name ??
+            fontFamily: chartStyle?.tooltipTextStyle?.name ?? 'Montserrat',
             fontStyle: chartStyle?.tooltipTextStyle?.style ?? 'normal',
             textAnchor: "start"
         },
         chartTitle: {
-            fontFamily: 'Montserrat-Bold', //chartStyle?.titleStyle?.name ?? 'Arial'
+            fontFamily:  chartStyle?.titleStyle?.name ?? 'Arial',
             color: chartStyle?.titleStyle?.colour ?? black,
             fontSize: chartStyle?.titleStyle?.size ?? 14,
             fontStyle: chartStyle?.titleStyle?.style === 'italic' ? 'italic' : 'normal',
         },
         chartSubTitle: {
-            fontFamily: 'Montserrat-Italic', //chartStyle?.subTitleStyle?.name ?? 'Arial'
+            fontFamily: chartStyle?.subTitleStyle?.name ?? 'Arial', 
             color: chartStyle?.subTitleStyle?.colour ?? black,
             fontSize: chartStyle?.subTitleStyle?.size ?? 14,
             fontStyle: chartStyle?.subTitleStyle?.style === 'italic' ? 'italic' : 'normal',