fix(app): fix terminal errors

altence · Dec 5, 2023 · e7d8411 · e7d8411
1 parent 925a2c3
commit e7d8411
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/src/components/common/BaseCheckbox/BaseCheckbox.tsx b/src/components/common/BaseCheckbox/BaseCheckbox.tsx
@@ -1,10 +1,12 @@
 import React from 'react';
-import { CheckboxProps } from 'antd';
+import { CheckboxProps, CheckboxRef } from 'antd';
 import * as S from './BaseCheckbox.styles';
 
+export type BaseCheckboxRef = CheckboxRef;
+
 export type BaseCheckboxProps = CheckboxProps;
 
-const Checkbox = React.forwardRef<HTMLInputElement, BaseCheckboxProps>((props, ref) => {
+const Checkbox = React.forwardRef<BaseCheckboxRef, BaseCheckboxProps>((props, ref) => {
   return <S.Checkbox {...props} ref={ref} />;
 });
 
@@ -16,4 +18,4 @@ interface BaseCheckboxInterface extends CheckboxForwardRef {
 
 export const BaseCheckbox = Checkbox as BaseCheckboxInterface;
 
-BaseCheckbox.Group = S.CheckboxGroup;
+BaseCheckbox.Group = S.CheckboxGroup;
diff --git a/src/components/layouts/main/sider/MainSider/MainSider.styles.ts b/src/components/layouts/main/sider/MainSider/MainSider.styles.ts
@@ -20,7 +20,7 @@ export const Sider = styled(BaseLayout.Sider)`
 
   &.ant-layout-sider {
     position: fixed;
-    background: ${(({ theme }) => theme.layoutSiderBg)};
+    background: ${({ theme }) => theme.layoutSiderBg};
 
     @media only screen and (${media('xl')}) {
       position: unset;

diff --git a/src/controllers/modalController.tsx b/src/controllers/modalController.tsx
@@ -49,7 +49,7 @@ const modalRender = (node: React.ReactNode) => <ModalStyles>{node}</ModalStyles>
 
 type IconType = 'info' | 'success' | 'warning' | 'error';
 
-type ModalType = Pick<ModalStaticFunctions, IconType>;
+export type ModalType = Pick<ModalStaticFunctions, IconType>;
 
 const open = (type: IconType, modal: ModalType): ModalType[IconType] => {
   const Icon = Icons[type];

diff --git a/src/hooks/useFeedback.ts b/src/hooks/useFeedback.ts
@@ -1,9 +1,11 @@
 import { App } from 'antd';
 
 import { notificationController } from '@app/controllers/notificationController';
-import { modalController } from '@app/controllers/modalController';
+import { ModalType, modalController } from '@app/controllers/modalController';
 
-export const useFeedback = (): ReturnType<typeof App.useApp> => {
+export const useFeedback = (): Omit<ReturnType<typeof App.useApp>, 'modal'> & {
+  modal: ModalType;
+} => {
   const { message, notification, modal } = App.useApp();
 
   return {
@@ -15,7 +17,6 @@ export const useFeedback = (): ReturnType<typeof App.useApp> => {
     },
     modal: {
       ...modalController(modal),
-      confirm: modal.confirm,
     },
   };
 };
diff --git a/src/styles/GlobalStyle.ts b/src/styles/GlobalStyle.ts
@@ -24,7 +24,7 @@ export default styled.createGlobalStyle`
         a {
           font-size: ${({ theme }) => theme.fontSizes.md};
           color: ${({ theme }) => theme.textMain};
-      
+
           &:hover,
           :active {
             color: ${({ theme }) => theme.primary6};