fix: spinner

Informasjonsforvaltning · Dec 5, 2023 · f3379fd · f3379fd
1 parent a3c5525
commit f3379fd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/apps/catalog-admin/app/auth/signin/heading.tsx b/apps/catalog-admin/app/auth/signin/heading.tsx
@@ -45,7 +45,7 @@ export const Heading = () => {
           size='small'
         >
           <div>{localization.auth.loggingIn}</div>
-          <Spinner />)
+          <Spinner />
         </DSHeading>
       )}
     </>

diff --git a/apps/concept-catalog/app/[catalogId]/search-page-client.tsx b/apps/concept-catalog/app/[catalogId]/search-page-client.tsx
@@ -9,6 +9,7 @@ import {
   UploadButton,
   SearchField,
   SearchHitContainer,
+  Spinner,
 } from '@catalog-frontend/ui';
 import {
   textToNumber,
@@ -17,7 +18,7 @@ import {
   capitalizeFirstLetter,
   localization as loc,
 } from '@catalog-frontend/utils';
-import { Chip, Select, Spinner } from '@digdir/design-system-react';
+import { Chip, Select } from '@digdir/design-system-react';
 import { PlusCircleIcon, FileImportIcon } from '@navikt/aksel-icons';
 
 import { useState, useEffect } from 'react';
@@ -391,7 +392,7 @@ export const SearchPageClient = ({
                 conceptStatuses={conceptStatuses}
               />
               {status === 'loading' || importConcepts.status === 'loading' ? (
-                <Spinner title='Loading' />
+                <Spinner />
               ) : (
                 <SearchHitContainer
                   onPageChange={onPageChange}

diff --git a/apps/concept-catalog/app/auth/signin/heading.tsx b/apps/concept-catalog/app/auth/signin/heading.tsx
@@ -45,7 +45,7 @@ export const Heading = () => {
           size='small'
         >
           <div>{localization.auth.loggingIn}</div>
-          <Spinner />)
+          <Spinner />
         </DSHeading>
       )}
     </>

diff --git a/apps/service-catalog/app/auth/signin/heading.tsx b/apps/service-catalog/app/auth/signin/heading.tsx
@@ -45,7 +45,7 @@ export const Heading = () => {
           size='small'
         >
           <div>{localization.auth.loggingIn}</div>
-          <Spinner />)
+          <Spinner />
         </DSHeading>
       )}
     </>

diff --git a/libs/ui/src/lib/details-page-layout/index.tsx b/libs/ui/src/lib/details-page-layout/index.tsx
@@ -2,10 +2,11 @@
 
 import { HTMLAttributes, ReactNode } from 'react';
 import styles from './details-page.module.css';
-import { Spinner, ToggleGroup } from '@digdir/design-system-react';
+import { ToggleGroup } from '@digdir/design-system-react';
 
 import cn from 'classnames';
 import { DetailHeading } from '../detail-heading';
+import { Spinner } from '../spinner';
 
 interface DetailsPageLayoutProps extends HTMLAttributes<HTMLDivElement> {
   mainColumn?: ReactNode;
@@ -41,7 +42,7 @@ const DetailsPageLayout = ({
         headingTitle={headingTitle}
         subtitle={headingSubtitle}
       />
-      {loading && <Spinner title={'Laster'} />}
+      {loading && <Spinner />}
       {!loading && (
         <>
           <div className={styles.buttonRow}>

diff --git a/libs/ui/src/lib/spinner/index.tsx b/libs/ui/src/lib/spinner/index.tsx
@@ -6,10 +6,10 @@ import { localization } from '@catalog-frontend/utils';
 import classes from './spinner.module.css';
 
 export interface SpinnerProps {
-  size?: 'xSmall' | 'small' | 'medium' | 'large' | '1xLarge' | '2xLarge' | '3xLarge';
+  size?: 'xxsmall' | 'xsmall' | 'small' | 'medium' | 'large' | 'xlarge';
 }
 
-const Spinner: FC<SpinnerProps> = ({ size = '3xLarge' }) => {
+const Spinner: FC<SpinnerProps> = ({ size = 'xlarge' }) => {
   return (
     <div className={classes.spinner}>
       <SpinnerBase