Clean Battery

patternfly · Sep 12, 2023 · 32e9fda · 32e9fda
1 parent 1937ec3
commit 32e9fda
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 102 deletions.
diff --git a/...sions/component-groups/Battery/Battery.md → ...ponent-groups/examples/Battery/Battery.md b/...sions/component-groups/Battery/Battery.md → ...ponent-groups/examples/Battery/Battery.md
@@ -13,7 +13,7 @@ source: react
 propComponents: ['Battery']
 ---
 
-import { Battery } from "@patternfly/react-component-groups";
+import Battery from '@patternfly/react-component-groups/dist/dynamic/Battery';
 
 
 This is the battery component that generates a 'battery' which corresponds to a level 1-4.

diff --git a/...groups/Battery/BatteryCriticalExample.tsx → ...amples/Battery/BatteryCriticalExample.tsx b/...groups/Battery/BatteryCriticalExample.tsx → ...amples/Battery/BatteryCriticalExample.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Battery } from '@patternfly/react-component-groups';
+import Battery from '@patternfly/react-component-groups/dist/dynamic/Battery';
 
 const BatteryCriticalExample: React.FunctionComponent = () => (
   <>

diff --git a/...-groups/Battery/BatteryDefaultExample.tsx → ...xamples/Battery/BatteryDefaultExample.tsx b/...-groups/Battery/BatteryDefaultExample.tsx → ...xamples/Battery/BatteryDefaultExample.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Battery } from '@patternfly/react-component-groups';
+import Battery from '@patternfly/react-component-groups/dist/dynamic/Battery';
 
 const BatteryDefaultExample: React.FunctionComponent = () => <Battery label="Default" severity={'an unknown value' as any}/>
 

diff --git a/...ent-groups/Battery/BatteryHighExample.tsx → ...s/examples/Battery/BatteryHighExample.tsx b/...ent-groups/Battery/BatteryHighExample.tsx → ...s/examples/Battery/BatteryHighExample.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Battery } from '@patternfly/react-component-groups';
+import Battery from '@patternfly/react-component-groups/dist/dynamic/Battery';
 
 const BatteryHighExample: React.FunctionComponent = () => (
   <>

diff --git a/...nent-groups/Battery/BatteryLowExample.tsx → ...ps/examples/Battery/BatteryLowExample.tsx b/...nent-groups/Battery/BatteryLowExample.tsx → ...ps/examples/Battery/BatteryLowExample.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Battery } from '@patternfly/react-component-groups';
+import Battery from '@patternfly/react-component-groups/dist/dynamic/Battery';
 
 const BatteryLowExample: React.FunctionComponent = () => (
   <>

diff --git a/...t-groups/Battery/BatteryMediumExample.tsx → ...examples/Battery/BatteryMediumExample.tsx b/...t-groups/Battery/BatteryMediumExample.tsx → ...examples/Battery/BatteryMediumExample.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Battery } from '@patternfly/react-component-groups';
+import Battery from '@patternfly/react-component-groups/dist/dynamic/Battery';
 
 const BatteryMediumExample: React.FunctionComponent = () => (
   <>

diff --git a/packages/module/src/Battery/Batery.test.tsx b/packages/module/src/Battery/Batery.test.tsx
@@ -1,11 +1,6 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import Battery, { BatterySeverity } from './Battery';
-import CriticalBattery from './CriticalBattery';
-import HighBattery from './HighBattery';
-import MediumBattery from './MediumBattery';
-import LowBattery from './LowBattery';
-import NullBattery from './NullBattery';
 
 describe('Battery component', () => {
   jest.spyOn(global.console, 'error');
@@ -52,29 +47,4 @@ describe('Battery component', () => {
       expect(container).toMatchSnapshot();
     });
   });
-
-  test(`CriticalBattery`, () => {
-    const { container } = render(<CriticalBattery />);
-    expect(container).toMatchSnapshot();
-  });
-
-  test(`HighBattery`, () => {
-    const { container } = render(<HighBattery />);
-    expect(container).toMatchSnapshot();
-  });
-
-  test(`MediumBattery`, () => {
-    const { container } = render(<MediumBattery />);
-    expect(container).toMatchSnapshot();
-  });
-
-  test(`LowBattery`, () => {
-    const { container } = render(<LowBattery />);
-    expect(container).toMatchSnapshot();
-  });
-
-  test(`NullBattery`, () => {
-    const { container } = render(<NullBattery />);
-    expect(container).toMatchSnapshot();
-  });
 });
diff --git a/packages/module/src/Battery/Battery.tsx b/packages/module/src/Battery/Battery.tsx
@@ -1,10 +1,5 @@
 import React from 'react';
 import classNames from 'classnames';
-import CriticalBattery from './CriticalBattery';
-import HighBattery from './HighBattery';
-import MediumBattery from './MediumBattery';
-import LowBattery from './LowBattery';
-import NullBattery from './NullBattery';
 import { createUseStyles } from 'react-jss'
 
 const batteryDefault = {
@@ -80,7 +75,7 @@ export interface BatteryProps extends React.DetailedHTMLProps<React.HTMLAttribut
   className?: string;
 }
 
-export const Battery: React.FunctionComponent<BatteryProps> = ({ severity, label, labelHidden, className, ...props }: BatteryProps) => {
+const Battery: React.FunctionComponent<BatteryProps> = ({ severity, label, labelHidden, className, ...props }: BatteryProps) => {
   const classes = useStyles();
   const batteryClasses = classNames(classes.battery, classes[`battery-${severity}`], className);
 
@@ -93,23 +88,23 @@ export const Battery: React.FunctionComponent<BatteryProps> = ({ severity, label
     switch (severity) {
     case 'critical':
     case 4:
-      return <CriticalBattery />;
+      return <path d="M 99.168858,143.38516 H 351.33914 c 5.33437,0 9.69886,-5.04 9.69886,-11.2 v -28 c 0,-6.16 -4.36449,-11.2 -9.69886,-11.2 H 99.168857 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.2 9.698858,11.2 z M 99.168857,235.25069 H 351.33914 c 5.33437,0 9.69886,-5.04 9.69886,-11.2 v -28 c 0,-6.16 -4.36449,-11.2 -9.69886,-11.2 H 99.168857 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.2 9.698857,11.2 z M 99.168857,327.14542 H 351.33914 c 5.33437,0 9.69886,-5.04 9.69886,-11.19999 v -28 c 0,-6.16001 -4.36449,-11.2 -9.69886,-11.2 H 99.168857 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.19999 9.698857,11.19999 z M 99.168993,419.0375 H 351.33927 c 5.33437,0 9.69886,-5.04 9.69886,-11.2 v -28 c 0,-6.16 -4.36449,-11.2 -9.69886,-11.2 H 99.168993 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.2 9.698857,11.2 z" />;
     case 'high':
     case 'error':
     case 3:
-      return <HighBattery />;
+      return <path d="M 99.168857,235.25069 H 351.33914 c 5.33437,0 9.69886,-5.04 9.69886,-11.2 v -28 c 0,-6.16 -4.36449,-11.2 -9.69886,-11.2 H 99.168857 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.2 9.698857,11.2 z M 99.168857,327.14542 H 351.33914 c 5.33437,0 9.69886,-5.04 9.69886,-11.19999 v -28 c 0,-6.16001 -4.36449,-11.2 -9.69886,-11.2 H 99.168857 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.19999 9.698857,11.19999 z M 99.168993,419.0375 H 351.33927 c 5.33437,0 9.69886,-5.04 9.69886,-11.2 v -28 c 0,-6.16 -4.36449,-11.2 -9.69886,-11.2 H 99.168993 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.2 9.698857,11.2 z" />;
     case 'medium':
     case 'warn':
     case 2:
-      return <MediumBattery />;
+      return <path d="M 99.168857,327.14542 H 351.33914 c 5.33437,0 9.69886,-5.04 9.69886,-11.19999 v -28 c 0,-6.16001 -4.36449,-11.2 -9.69886,-11.2 H 99.168857 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.19999 9.698857,11.19999 z M 99.168993,419.0375 H 351.33927 c 5.33437,0 9.69886,-5.04 9.69886,-11.2 v -28 c 0,-6.16 -4.36449,-11.2 -9.69886,-11.2 H 99.168993 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.2 9.698857,11.2 z" />;
     case 'low':
     case 'info':
     case 1:
-      return <LowBattery />;
+      return <path d="M 99.168993,419.0375 H 351.33927 c 5.33437,0 9.69886,-5.04 9.69886,-11.2 v -28 c 0,-6.16 -4.36449,-11.2 -9.69886,-11.2 H 99.168993 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.2 9.698857,11.2 z" />;
     default:
       // eslint-disable-next-line
         console.error('Warning: Unsupported value presented to battery component');
-      return <NullBattery />;
+      return <path d="M 99.168858,143.38516 H 351.33914 c 5.33437,0 9.69886,-5.04 9.69886,-11.2 v -28 c 0,-6.16 -4.36449,-11.2 -9.69886,-11.2 H 99.168857 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.2 9.698858,11.2 z M 99.168857,235.25069 H 351.33914 c 5.33437,0 9.69886,-5.04 9.69886,-11.2 v -28 c 0,-6.16 -4.36449,-11.2 -9.69886,-11.2 H 99.168857 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.2 9.698857,11.2 z M 99.168857,327.14542 H 351.33914 c 5.33437,0 9.69886,-5.04 9.69886,-11.19999 v -28 c 0,-6.16001 -4.36449,-11.2 -9.69886,-11.2 H 99.168857 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.19999 9.698857,11.19999 z M 99.168993,419.0375 H 351.33927 c 5.33437,0 9.69886,-5.04 9.69886,-11.2 v -28 c 0,-6.16 -4.36449,-11.2 -9.69886,-11.2 H 99.168993 c -5.334371,0 -9.698857,5.04 -9.698857,11.2 v 28 c 0,6.16 4.364486,11.2 9.698857,11.2 z" />;
     }
   };
 

diff --git a/packages/module/src/Battery/CriticalBattery.tsx b/packages/module/src/Battery/CriticalBattery.tsx
diff --git a/packages/module/src/Battery/HighBattery.tsx b/packages/module/src/Battery/HighBattery.tsx
diff --git a/packages/module/src/Battery/LowBattery.tsx b/packages/module/src/Battery/LowBattery.tsx
diff --git a/packages/module/src/Battery/MediumBattery.tsx b/packages/module/src/Battery/MediumBattery.tsx
diff --git a/packages/module/src/Battery/NullBattery.tsx b/packages/module/src/Battery/NullBattery.tsx
diff --git a/packages/module/src/Battery/index.ts b/packages/module/src/Battery/index.ts
@@ -1,6 +1 @@
 export * from './Battery';
-export { default as CriticalBattery } from './CriticalBattery';
-export { default as HighBattery } from './HighBattery';
-export { default as MediumBattery } from './MediumBattery';
-export { default as LowBattery } from './LowBattery';
-export { default as NullBattery } from './NullBattery';