spinner fixes (#3434)

Co-authored-by: Mungo Dewar <mungodewar@skyscanner.net>
Skyscanner · May 13, 2024 · 8eb7250 · 8eb7250
1 parent 1861cc2
commit 8eb7250
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 131 deletions.
diff --git a/...es/bpk-component-spinner/SpinnerLayout.js → ...s/bpk-component-spinner/SpinnerLayout.tsx b/...es/bpk-component-spinner/SpinnerLayout.js → ...s/bpk-component-spinner/SpinnerLayout.tsx
@@ -16,10 +16,8 @@
  * limitations under the License.
  */
 
-/* @flow strict */
-
 import PropTypes from 'prop-types';
-import type { Node } from 'react';
+import type { ReactElement } from 'react';
 import { Children } from 'react';
 
 import { SPINNER_TYPES } from '../../packages/bpk-component-spinner';
@@ -30,7 +28,7 @@ import STYLES from './SpinnerLayout.module.scss';
 const getClassName = cssModules(STYLES);
 
 type Props = {
-  children: Node,
+  children: Array<ReactElement<any, any>> | ReactElement<any, any> // Expect a single or array of React elements
 };
 
 const SpinnerLayout = (props: Props) => {

diff --git a/examples/bpk-component-spinner/examples.js → examples/bpk-component-spinner/examples.tsx b/examples/bpk-component-spinner/examples.js → examples/bpk-component-spinner/examples.tsx
diff --git a/examples/bpk-component-spinner/stories.js → examples/bpk-component-spinner/stories.ts b/examples/bpk-component-spinner/stories.js → examples/bpk-component-spinner/stories.ts
diff --git a/packages/bpk-component-spinner/src/BpkExtraLargeSpinner.d.ts b/packages/bpk-component-spinner/src/BpkExtraLargeSpinner.d.ts
diff --git a/packages/bpk-component-spinner/src/BpkExtraLargeSpinner.tsx b/packages/bpk-component-spinner/src/BpkExtraLargeSpinner.tsx
@@ -24,12 +24,14 @@ import { cssModules } from '../../bpk-react-utils';
 
 import SPINNER_TYPES from './spinnerTypes';
 
+import type { SpinnerTypes } from './spinnerTypes';
+
 import STYLES from './BpkSpinner.module.scss';
 
 const getClassName = cssModules(STYLES);
 
 type Props = {
-  type: keyof typeof SPINNER_TYPES,
+  type: SpinnerTypes,
   className?: string,
 };
 

diff --git a/packages/bpk-component-spinner/src/BpkLargeSpinner.d.ts b/packages/bpk-component-spinner/src/BpkLargeSpinner.d.ts
diff --git a/packages/bpk-component-spinner/src/BpkLargeSpinner.tsx b/packages/bpk-component-spinner/src/BpkLargeSpinner.tsx
@@ -24,12 +24,14 @@ import { cssModules } from '../../bpk-react-utils';
 
 import SPINNER_TYPES from './spinnerTypes';
 
+import type { SpinnerTypes } from './spinnerTypes';
+
 import STYLES from './BpkSpinner.module.scss';
 
 const getClassName = cssModules(STYLES);
 
 type Props = {
-  type: keyof typeof SPINNER_TYPES,
+  type: SpinnerTypes,
   className?: string,
   alignToButton: boolean,
 };

diff --git a/packages/bpk-component-spinner/src/BpkSpinner.d.ts b/packages/bpk-component-spinner/src/BpkSpinner.d.ts
diff --git a/packages/bpk-component-spinner/src/BpkSpinner.tsx b/packages/bpk-component-spinner/src/BpkSpinner.tsx
@@ -25,12 +25,14 @@ import { cssModules } from '../../bpk-react-utils';
 
 import SPINNER_TYPES from './spinnerTypes';
 
+import type { SpinnerTypes } from './spinnerTypes';
+
 import STYLES from './BpkSpinner.module.scss';
 
 const getClassName = cssModules(STYLES);
 
 type Props = {
-  type: keyof typeof SPINNER_TYPES,
+  type: SpinnerTypes,
   className?: string,
   alignToButton: boolean,
 };

diff --git a/packages/bpk-component-spinner/src/spinnerTypes.ts b/packages/bpk-component-spinner/src/spinnerTypes.ts
@@ -16,10 +16,12 @@
  * limitations under the License.
  */
 
-/* @flow strict */
-
-export default {
+const SPINNER_TYPES = {
   primary: 'primary',
   light: 'light',
   dark: 'dark',
-};
+} as const;
+
+export default SPINNER_TYPES;
+
+export type SpinnerTypes = (typeof SPINNER_TYPES)[keyof typeof SPINNER_TYPES];