Explorar o código

Revert "IconWithTooltip commonality"

This reverts commit 397b6a91e5aee41c88d9bbfd94c28624559b42e4.
Shun Miyazawa %!s(int64=2) %!d(string=hai) anos
pai
achega
9a5f294b26

+ 0 - 21
apps/app/src/components/Me/IconWIthTooltip.tsx

@@ -1,21 +0,0 @@
-import { UncontrolledTooltip } from 'reactstrap';
-
-type Props = {
-  id: string,
-  label: string,
-  children: JSX.Element,
-  additionalClasses?: string
-}
-
-export const IconWithTooltip = (props: Props): JSX.Element => {
-  const {
-    id, label, children, additionalClasses,
-  } = props;
-
-  return (
-    <>
-      <div id={id} className={`${additionalClasses != null ? additionalClasses : ''}`}>{children}</div>
-      <UncontrolledTooltip placement="bottom" fade={false} target={id}>{label}</UncontrolledTooltip>
-    </>
-  );
-};

+ 14 - 3
apps/app/src/components/Me/UISettings.tsx

@@ -1,18 +1,30 @@
 import { useCallback } from 'react';
 
 import { useTranslation } from 'react-i18next';
+import { UncontrolledTooltip } from 'reactstrap';
 
 import { updateUserUISettings } from '~/client/services/user-ui-settings';
 import { toastError, toastSuccess } from '~/client/util/toastr';
 import { useCollapsedContentsOpened, usePreferCollapsedMode, useSidebarMode } from '~/stores/ui';
 
-import { IconWithTooltip } from './IconWIthTooltip';
 import SidebarCollapsedIcon from './SidebarCollapsedIcon';
 import SidebarDockIcon from './SidebarDockIcon';
 
-
 import styles from './UISettings.module.scss';
 
+const IconWithTooltip = ({
+  id, label, children, additionalClasses,
+}: {
+id: string,
+label: string,
+children: JSX.Element,
+additionalClasses: string
+}) => (
+  <>
+    <div id={id} className={`${additionalClasses != null ? additionalClasses : ''}`}>{children}</div>
+    <UncontrolledTooltip placement="bottom" fade={false} target={id}>{label}</UncontrolledTooltip>
+  </>
+);
 
 export const UISettings = (): JSX.Element => {
   const { t } = useTranslation();
@@ -43,7 +55,6 @@ export const UISettings = (): JSX.Element => {
       <>
         <div className="d-flex align-items-start">
           <div className="d-flex align-items-center">
-
             <IconWithTooltip
               id="iwt-sidebar-collapsed"
               label="Collapsed"