Yuki Takei před 2 roky
rodič
revize
a20af55b4c

+ 4 - 7
apps/app/src/components/Sidebar/PageCreateButton/DropendToggle.tsx

@@ -8,15 +8,12 @@ import styles from './DropendToggle.module.scss';
 const moduleClass = styles['btn-toggle'];
 
 
-type Props = {
-  className?: string
-}
-
-export const DropendToggle = (props: Props): JSX.Element => {
-
+export const DropendToggle = (): JSX.Element => {
   return (
     <DropdownToggle
-      className={`position-absolute ${moduleClass} btn btn-primary ${props.className ?? ''}`}
+      color="primary"
+      className={`position-absolute ${moduleClass}`}
+      aria-expanded={false}
     >
       <Hexagon />
       <div className="hitarea position-absolute" />

+ 2 - 6
apps/app/src/components/Sidebar/PageCreateButton/PageCreateButton.tsx

@@ -4,6 +4,7 @@ import type { IUserHasId } from '@growi/core';
 import { pagePathUtils } from '@growi/core/dist/utils';
 import { format } from 'date-fns';
 import { useTranslation } from 'react-i18next';
+import { Dropdown } from 'reactstrap';
 
 import { useOnTemplateButtonClicked } from '~/client/services/use-on-template-button-clicked';
 import { toastError } from '~/client/util/toastr';
@@ -16,7 +17,6 @@ import { DropendMenu } from './DropendMenu';
 import { DropendToggle } from './DropendToggle';
 import { useOnNewButtonClicked, useOnTodaysButtonClicked } from './hooks';
 
-import { Dropdown } from 'reactstrap';
 
 const generateTodaysPath = (currentUser: IUserHasId, parentDirName: string) => {
   const now = format(new Date(), 'yyyy/MM/dd');
@@ -87,11 +87,7 @@ export const PageCreateButton = React.memo((): JSX.Element => {
           direction="end"
           className="position-absolute"
         >
-          <DropendToggle
-            className="dropdown-toggle dropdown-toggle-split"
-            data-bs-toggle="dropdown"
-            aria-expanded="false"
-          />
+          <DropendToggle />
           <DropendMenu
             onClickCreateNewPageButtonHandler={onClickNewButton}
             onClickCreateTodaysButtonHandler={onClickTodaysButton}