@centreon/ui 24.4.24 → 24.4.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centreon/ui",
-  "version": "24.4.24",
+  "version": "24.4.25",
   "description": "Centreon UI Components",
   "scripts": {
     "eslint": "eslint ./src --ext .js,.jsx,.ts,.tsx --max-warnings 0",

package/src/Button/Save/Content.tsx

@@ -1,6 +1,7 @@
+import { useTranslation } from 'react-i18next';
+
 import CheckIcon from '@mui/icons-material/Check';
 import SaveIcon from '@mui/icons-material/Save';
-import { Typography, TypographyProps } from '@mui/material';
 
 interface Props {
   labelLoading: string;
@@ -10,42 +11,24 @@ interface Props {
   succeeded: boolean;
 }
 
-interface WrapperLabelProps {
-  label: string;
-}
-
-const WrapperLabel = ({
-  label,
-  ...rest
-}: WrapperLabelProps & TypographyProps): JSX.Element => {
-  return <Typography {...rest}>{label}</Typography>;
-};
-
 const Content = ({
   succeeded,
   labelSucceeded,
   labelSave,
   loading,
-  labelLoading,
-  ...rest
-}: Props & TypographyProps): JSX.Element | string | null => {
+  labelLoading
+}: Props): JSX.Element | string | null => {
+  const { t } = useTranslation();
+
   if (loading) {
-    return <WrapperLabel label={labelLoading} {...rest} />;
+    return t(labelLoading);
   }
 
   if (succeeded) {
-    return labelSucceeded ? (
-      <WrapperLabel label={labelSucceeded} {...rest} />
-    ) : (
-      <CheckIcon />
-    );
+    return labelSucceeded ? t(labelSucceeded) : <CheckIcon />;
   }
 
-  return labelSave ? (
-    <WrapperLabel label={labelSave} {...rest} />
-  ) : (
-    <SaveIcon />
-  );
+  return labelSave ? t(labelSave) : <SaveIcon />;
 };
 
 export default Content;

package/src/Button/Save/index.tsx

@@ -1,13 +1,13 @@
 import { any, isEmpty, isNil, not, or, pipe } from 'ramda';
 import { makeStyles } from 'tss-react/mui';
 
-import { Theme, Tooltip, TypographyProps } from '@mui/material';
 import { LoadingButton, LoadingButtonProps } from '@mui/lab';
+import { Theme, Tooltip } from '@mui/material';
 
 import { getNormalizedId } from '../../utils';
 
-import StartIcon from './StartIcon';
 import Content from './Content';
+import StartIcon from './StartIcon';
 
 const useStyles = makeStyles()((theme: Theme) => ({
   loadingButton: {
@@ -18,7 +18,6 @@ const useStyles = makeStyles()((theme: Theme) => ({
 interface Props {
   className?: string;
   labelLoading?: string;
-  labelProps?: TypographyProps;
   labelSave?: string;
   labelSucceeded?: string;
   loading?: boolean;
@@ -48,7 +47,6 @@ const SaveButton = ({
   size = 'small',
   className,
   startIcon = true,
-  labelProps,
   ...rest
 }: Props & LoadingButtonProps): JSX.Element => {
   const { classes, cx } = useStyles();
@@ -88,8 +86,7 @@ const SaveButton = ({
             labelSave,
             labelSucceeded,
             loading,
-            succeeded,
-            ...labelProps
+            succeeded
           })}
         </LoadingButton>
       </div>