@centreon/ui 23.10.122 → 24.4.0

package/src/RichTextEditor/ContentEditable.tsx

@@ -1,195 +1,195 @@
-import { useCallback, useEffect, useLayoutEffect, useState } from 'react';
-
-import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
-import { makeStyles } from 'tss-react/mui';
-import { isEmpty, isNil } from 'ramda';
-import { useTranslation } from 'react-i18next';
-
-import { Typography } from '@mui/material';
-
-interface StyleProps {
-  editable: boolean;
-  error?: string;
-  minInputHeight: number;
-}
-
-const useStyles = makeStyles<StyleProps>()(
-  (theme, { minInputHeight, editable, error }) => ({
-    container: {
-      backgroundColor: theme.palette.background.paper,
-      border: error
-        ? `1px solid ${theme.palette.error.main}`
-        : '1px solid transparent',
-      borderRadius: theme.shape.borderRadius,
-      padding: theme.spacing(0.5, 1)
-    },
-    emptyInput: {
-      marginTop: '-22px'
-    },
-    input: {
-      minHeight: editable ? minInputHeight : 'min-content',
-      outline: '0px solid transparent'
-    },
-    inputFocused: {
-      border: error
-        ? `1px solid ${theme.palette.error.main}`
-        : `1px solid ${theme.palette.primary.main}`
-    },
-    notEditable: {
-      backgroundColor: 'transparent'
-    },
-    placeholder: {
-      color: theme.palette.grey[500],
-      pointerEvents: 'none'
-    },
-    root: {
-      '& p,h1,h2,h3,h4,h5,h6,span': {
-        margin: 0
-      }
-    }
-  })
-);
-
-interface Props {
-  className?: string;
-  disabled?: boolean;
-  editable: boolean;
-  editorState?: string;
-  error?: string;
-  hasInitialTextContent?: boolean;
-  initialEditorState?: string;
-  initialize?: (editor) => void;
-  inputClassname?: string;
-  minInputHeight: number;
-  namespace: string;
-  onBlur?: (e: string) => void;
-  placeholder: string;
-  resetEditorToInitialStateCondition?: () => boolean;
-}
-
-const defaultState =
-  '{"root":{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}';
-
-const ContentEditable = ({
-  minInputHeight,
-  inputClassname,
-  placeholder,
-  hasInitialTextContent,
-  editable,
-  editorState,
-  namespace,
-  resetEditorToInitialStateCondition,
-  initialEditorState,
-  error,
-  onBlur,
-  className,
-  disabled,
-  initialize
-}: Props): JSX.Element => {
-  const { classes, cx } = useStyles({ editable, error, minInputHeight });
-  const { t } = useTranslation();
-
-  const [editor] = useLexicalComposerContext();
-  const [isFocused, setFocused] = useState(false);
-  const [root, setRoot] = useState('');
-
-  const ref = useCallback(
-    (rootElement: null | HTMLElement) => {
-      editor.setRootElement(rootElement);
-    },
-    [editor]
-  );
-
-  useLayoutEffect(() => {
-    if (!editable) {
-      const newEditorState = editor.parseEditorState(
-        editorState || defaultState
-      );
-
-      editor.setEditorState(newEditorState);
-    }
-  }, [editor, editorState]);
-
-  useEffect(() => {
-    editor.registerTextContentListener((currentRoot) => {
-      setRoot(currentRoot);
-    });
-
-    if (!hasInitialTextContent) {
-      return;
-    }
-
-    setRoot(' ');
-  }, [editor]);
-
-  useEffect(() => {
-    const shouldResetEditorToInitialState =
-      resetEditorToInitialStateCondition?.();
-
-    if (!shouldResetEditorToInitialState) {
-      return;
-    }
-
-    const newEditorState = editor.parseEditorState(
-      initialEditorState || defaultState
-    );
-
-    editor.setEditorState(newEditorState);
-  }, [editorState]);
-
-  const isTextEmpty =
-    isEmpty(root) &&
-    !editor.getEditorState().toJSON().root.children?.[0]?.children?.length;
-
-  const handleBlur = (event: React.FocusEvent<HTMLInputElement>): void => {
-    setFocused(false);
-    onBlur?.(event);
-  };
-
-  const isEditable = editor.isEditable();
-
-  useEffect(() => {
-    if (isNil(disabled)) {
-      return;
-    }
-
-    editor.setEditable(!disabled);
-  }, [disabled]);
-
-  useEffect(() => {
-    initialize?.(editor);
-  }, []);
-
-  return (
-    <div
-      className={cx(
-        classes.root,
-        editable && classes.container,
-        !isEditable && !disabled && classes.notEditable,
-        className,
-        isFocused && classes.inputFocused
-      )}
-    >
-      {editable && isTextEmpty && (
-        <Typography className={classes.placeholder}>
-          {t(placeholder)}
-        </Typography>
-      )}
-      <div
-        aria-label={namespace}
-        className={cx(
-          editable && isTextEmpty && classes.emptyInput,
-          classes.input,
-          inputClassname
-        )}
-        contentEditable={isEditable}
-        data-testid={namespace}
-        ref={ref}
-        onBlur={handleBlur}
-        onFocus={(): void => setFocused(true)}
-      />
-    </div>
-  );
-};
-
-export default ContentEditable;
+import { useCallback, useEffect, useLayoutEffect, useState } from 'react';
+
+import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
+import { isEmpty, isNil } from 'ramda';
+import { useTranslation } from 'react-i18next';
+import { makeStyles } from 'tss-react/mui';
+
+import { Typography } from '@mui/material';
+
+interface StyleProps {
+  editable: boolean;
+  error?: string;
+  minInputHeight: number;
+}
+
+const useStyles = makeStyles<StyleProps>()(
+  (theme, { minInputHeight, editable, error }) => ({
+    container: {
+      backgroundColor: theme.palette.background.paper,
+      border: error
+        ? `1px solid ${theme.palette.error.main}`
+        : '1px solid transparent',
+      borderRadius: theme.shape.borderRadius,
+      padding: theme.spacing(0.5, 1)
+    },
+    emptyInput: {
+      marginTop: '-22px'
+    },
+    input: {
+      minHeight: editable ? minInputHeight : 'min-content',
+      outline: '0px solid transparent'
+    },
+    inputFocused: {
+      border: error
+        ? `1px solid ${theme.palette.error.main}`
+        : `1px solid ${theme.palette.primary.main}`
+    },
+    notEditable: {
+      backgroundColor: 'transparent'
+    },
+    placeholder: {
+      color: theme.palette.grey[500],
+      pointerEvents: 'none'
+    },
+    root: {
+      '& p,h1,h2,h3,h4,h5,h6,span': {
+        margin: 0
+      }
+    }
+  })
+);
+
+interface Props {
+  className?: string;
+  disabled?: boolean;
+  editable: boolean;
+  editorState?: string;
+  error?: string;
+  hasInitialTextContent?: boolean;
+  initialEditorState?: string;
+  initialize?: (editor) => void;
+  inputClassname?: string;
+  minInputHeight: number;
+  namespace: string;
+  onBlur?: (e: string) => void;
+  placeholder: string;
+  resetEditorToInitialStateCondition?: () => boolean;
+}
+
+const defaultState =
+  '{"root":{"children":[{"children":[],"direction":null,"format":"","indent":0,"type":"paragraph","version":1}],"direction":null,"format":"","indent":0,"type":"root","version":1}}';
+
+const ContentEditable = ({
+  minInputHeight,
+  inputClassname,
+  placeholder,
+  hasInitialTextContent,
+  editable,
+  editorState,
+  namespace,
+  resetEditorToInitialStateCondition,
+  initialEditorState,
+  error,
+  onBlur,
+  className,
+  disabled,
+  initialize
+}: Props): JSX.Element => {
+  const { classes, cx } = useStyles({ editable, error, minInputHeight });
+  const { t } = useTranslation();
+
+  const [editor] = useLexicalComposerContext();
+  const [isFocused, setFocused] = useState(false);
+  const [root, setRoot] = useState('');
+
+  const ref = useCallback(
+    (rootElement: null | HTMLElement) => {
+      editor.setRootElement(rootElement);
+    },
+    [editor]
+  );
+
+  useLayoutEffect(() => {
+    if (!editable) {
+      const newEditorState = editor.parseEditorState(
+        editorState || defaultState
+      );
+
+      editor.setEditorState(newEditorState);
+    }
+  }, [editor, editorState]);
+
+  useEffect(() => {
+    editor.registerTextContentListener((currentRoot) => {
+      setRoot(currentRoot);
+    });
+
+    if (!hasInitialTextContent) {
+      return;
+    }
+
+    setRoot(' ');
+  }, [editor]);
+
+  useEffect(() => {
+    const shouldResetEditorToInitialState =
+      resetEditorToInitialStateCondition?.();
+
+    if (!shouldResetEditorToInitialState) {
+      return;
+    }
+
+    const newEditorState = editor.parseEditorState(
+      initialEditorState || defaultState
+    );
+
+    editor.setEditorState(newEditorState);
+  }, [editorState]);
+
+  const isTextEmpty =
+    isEmpty(root) &&
+    !editor.getEditorState().toJSON().root.children?.[0]?.children?.length;
+
+  const handleBlur = (event: React.FocusEvent<HTMLInputElement>): void => {
+    setFocused(false);
+    onBlur?.(event);
+  };
+
+  const isEditable = editor.isEditable();
+
+  useEffect(() => {
+    if (isNil(disabled)) {
+      return;
+    }
+
+    editor.setEditable(!disabled);
+  }, [disabled]);
+
+  useEffect(() => {
+    initialize?.(editor);
+  }, []);
+
+  return (
+    <div
+      className={cx(
+        classes.root,
+        editable && classes.container,
+        !isEditable && !disabled && classes.notEditable,
+        className,
+        !disabled && isFocused && classes.inputFocused
+      )}
+    >
+      {editable && isTextEmpty && (
+        <Typography className={classes.placeholder}>
+          {t(placeholder)}
+        </Typography>
+      )}
+      <div
+        aria-label={namespace}
+        className={cx(
+          editable && isTextEmpty && classes.emptyInput,
+          classes.input,
+          inputClassname
+        )}
+        contentEditable={isEditable}
+        data-testid={namespace}
+        ref={ref}
+        onBlur={handleBlur}
+        onFocus={(): void => setFocused(true)}
+      />
+    </div>
+  );
+};
+
+export default ContentEditable;

package/src/RichTextEditor/RichTextEditor.tsx

@@ -12,6 +12,7 @@ import { LinkPlugin } from '@lexical/react/LexicalLinkPlugin';
 import { equals } from 'ramda';
 import { ListPlugin } from '@lexical/react/LexicalListPlugin';
 import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin';
+import { $generateHtmlFromNodes } from '@lexical/html';
 
 import { Typography } from '@mui/material';
 
@@ -38,6 +39,7 @@ export interface RichTextEditorProps {
   openLinkInNewTab?: boolean;
   placeholder?: string;
   resetEditorToInitialStateCondition?: () => boolean;
+  setHtmlString?: (htmlString: string) => void;
   toolbarClassName?: string;
   toolbarPositions?: 'start' | 'end';
 }
@@ -143,6 +145,7 @@ const RichTextEditor = ({
   openLinkInNewTab = true,
   initialize,
   displayBlockButtons = true,
+  setHtmlString,
   toolbarClassName
 }: RichTextEditorProps): JSX.Element => {
   const { classes } = useStyles({ toolbarPositions });
@@ -178,6 +181,13 @@ const RichTextEditor = ({
     }
   };
 
+  const change = (state: EditorState, editor: LexicalEditor): void => {
+    editor.update(() => {
+      setHtmlString?.($generateHtmlFromNodes(editor, null));
+    });
+    getEditorState?.(state, editor);
+  };
+
   return (
     <LexicalComposer initialConfig={initialConfig}>
       <div className={classes.container}>
@@ -210,6 +220,7 @@ const RichTextEditor = ({
                 resetEditorToInitialStateCondition={
                   resetEditorToInitialStateCondition
                 }
+                setHtmlString={setHtmlString}
                 onBlur={onBlur}
               />
             }
@@ -218,7 +229,7 @@ const RichTextEditor = ({
           <HistoryPlugin />
           <LinkPlugin />
           <ListPlugin />
-          <OnChangePlugin onChange={getEditorState} />
+          <OnChangePlugin onChange={change} />
           <AutoCompleteLinkPlugin openLinkInNewTab={openLinkInNewTab} />
           <FloatingLinkEditorPlugin
             editable={editable}

package/src/SortableItems/index.tsx

@@ -15,11 +15,7 @@ import {
   DragEndEvent,
   Over
 } from '@dnd-kit/core';
-import {
-  SortableContext,
-  sortableKeyboardCoordinates,
-  SortingStrategy
-} from '@dnd-kit/sortable';
+import { SortableContext, SortingStrategy } from '@dnd-kit/sortable';
 import {
   equals,
   find,
@@ -117,7 +113,6 @@ const SortableItems = <T extends { [propertyToFilterItemsOn]: string }>({
     useSensor(MouseSensor),
     useSensor(PointerSensor),
     useSensor(KeyboardSensor, {
-      coordinateGetter: sortableKeyboardCoordinates,
       keyboardCodes: {
         cancel: ['Escape'],
         end: ['Space', 'Enter'],
@@ -169,7 +164,7 @@ const SortableItems = <T extends { [propertyToFilterItemsOn]: string }>({
   };
 
   const getItemById = (id): T | undefined =>
-    find(propEq(propertyToFilterItemsOn, id), items);
+    find(propEq(id, propertyToFilterItemsOn), items);
 
   const activeItem = getItemById(activeId) as Record<string, unknown>;
 

package/src/StoryBookThemeProvider/index.tsx

@@ -1,36 +1,35 @@
-import * as React from 'react';
-import { useMemo } from 'react';
-
-import {
-  ThemeProvider as MuiThemeProvider,
-  StyledEngineProvider,
-  createTheme,
-  CssBaseline
-} from '@mui/material';
-
-import { ThemeMode } from '@centreon/ui-context';
-
-import { getTheme } from '../ThemeProvider';
-
-interface Props {
-  children: React.ReactElement;
-  themeMode: ThemeMode;
-}
-
-const StoryBookThemeProvider = ({
-  children,
-  themeMode
-}: Props): JSX.Element => {
-  const theme = useMemo(() => createTheme(getTheme(themeMode)), [themeMode]);
-
-  return (
-    <StyledEngineProvider injectFirst>
-      <MuiThemeProvider theme={theme}>
-        {children}
-        <CssBaseline />
-      </MuiThemeProvider>
-    </StyledEngineProvider>
-  );
-};
-
-export default StoryBookThemeProvider;
+import { useMemo } from 'react';
+
+import {
+  CssBaseline,
+  ThemeProvider as MuiThemeProvider,
+  StyledEngineProvider,
+  createTheme
+} from '@mui/material';
+
+import { ThemeMode } from '@centreon/ui-context';
+
+import { getTheme } from '../ThemeProvider';
+
+interface Props {
+  children: React.ReactElement;
+  themeMode: ThemeMode;
+}
+
+const StoryBookThemeProvider = ({
+  children,
+  themeMode
+}: Props): JSX.Element => {
+  const theme = useMemo(() => createTheme(getTheme(themeMode)), [themeMode]);
+
+  return (
+    <StyledEngineProvider injectFirst>
+      <MuiThemeProvider theme={theme}>
+        {children}
+        <CssBaseline />
+      </MuiThemeProvider>
+    </StyledEngineProvider>
+  );
+};
+
+export default StoryBookThemeProvider;

package/src/ThemeProvider/index.tsx

@@ -1,31 +1,31 @@
-import * as React from 'react';
+import { ReactNode, useMemo } from 'react';
 
 import { useAtomValue } from 'jotai';
-import { CSSInterpolation } from 'tss-react';
 import { equals } from 'ramda';
+import { CSSInterpolation } from 'tss-react';
 
 import {
   ButtonProps,
-  createTheme,
   InputBaseProps,
+  ThemeProvider as MuiThemeProvider,
   StyledEngineProvider,
   Theme,
-  ThemeProvider as MuiThemeProvider
+  createTheme
 } from '@mui/material';
-import CssBaseline from '@mui/material/CssBaseline';
 import { autocompleteClasses } from '@mui/material/Autocomplete';
+import CssBaseline from '@mui/material/CssBaseline';
 import { ThemeOptions } from '@mui/material/styles/createTheme';
 
 import { ThemeMode, userAtom } from '@centreon/ui-context';
-import RobotoLightWoff2 from '@centreon/ui/fonts/roboto-light-webfont.woff2';
-import RobotoRegularWoff2 from '@centreon/ui/fonts/roboto-regular-webfont.woff2';
-import RobotoMediumWoff2 from '@centreon/ui/fonts/roboto-medium-webfont.woff2';
-import RobotoBoldWoff2 from '@centreon/ui/fonts/roboto-bold-webfont.woff2';
+
+import RobotoBoldWoff2 from '../fonts/roboto-bold-webfont.woff2';
+import RobotoLightWoff2 from '../fonts/roboto-light-webfont.woff2';
+import RobotoMediumWoff2 from '../fonts/roboto-medium-webfont.woff2';
+import RobotoRegularWoff2 from '../fonts/roboto-regular-webfont.woff2';
 
 import { getPalette } from './palettes';
 
 declare module '@mui/styles/defaultTheme' {
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
   interface DefaultTheme extends Theme {}
 }
 
@@ -147,6 +147,30 @@ export const getTheme = (mode: ThemeMode): ThemeOptions => ({
     },
     MuiCssBaseline: {
       styleOverrides: (theme) => `
+        ::-webkit-scrollbar {
+          height: ${theme.spacing(1)};
+          width: ${theme.spacing(1)};
+          background-color: transparent;
+        }
+        ::-webkit-scrollbar-thumb {
+          background-color: ${
+            equals(mode, 'dark')
+              ? theme.palette.divider
+              : theme.palette.text.disabled
+          };
+          border-radius: ${theme.spacing(0.5)};
+        }
+        ::-webkit-scrollbar-thumb:hover {
+          background-color: ${theme.palette.primary.main};
+        }
+        * {
+          scrollbar-color: ${
+            equals(mode, 'dark')
+              ? theme.palette.divider
+              : theme.palette.text.disabled
+          } ${theme.palette.background.default};
+          scrollbar-width: thin;
+        }
         html {
           margin: 0;
           padding: 0;
@@ -160,6 +184,9 @@ export const getTheme = (mode: ThemeMode): ThemeOptions => ({
           padding: 0;
           width: 100%;
         }
+        #root {
+          background-color: ${theme.palette.background.paper};
+        }
         @font-face {
           font-family: 'Roboto';
           font-style: normal;
@@ -266,13 +293,13 @@ export const getTheme = (mode: ThemeMode): ThemeOptions => ({
 });
 
 interface Props {
-  children: React.ReactNode;
+  children: ReactNode;
 }
 
 const ThemeProvider = ({ children }: Props): JSX.Element => {
   const { themeMode } = useAtomValue(userAtom);
 
-  const theme = React.useMemo(
+  const theme = useMemo(
     () => createTheme(getTheme(themeMode || ThemeMode.light)),
     [themeMode]
   );