ryoji-s 2 лет назад
Родитель
Сommit
6ed7e86bcf

+ 4 - 7
apps/app/src/components/PageList/PageListItemL.tsx

@@ -3,7 +3,6 @@ import React, {
   ForwardRefRenderFunction, memo, useCallback, useImperativeHandle, useRef, useEffect,
   ForwardRefRenderFunction, memo, useCallback, useImperativeHandle, useRef, useEffect,
 } from 'react';
 } from 'react';
 
 
-
 import type {
 import type {
   IPageInfoAll, IPageWithMeta, IPageInfoForListing,
   IPageInfoAll, IPageWithMeta, IPageInfoForListing,
 } from '@growi/core';
 } from '@growi/core';
@@ -16,7 +15,6 @@ import { format } from 'date-fns';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';
 import Link from 'next/link';
 import Link from 'next/link';
 import Clamp from 'react-multiline-clamp';
 import Clamp from 'react-multiline-clamp';
-// import { CustomInput } from 'reactstrap';
 
 
 import { ISelectable } from '~/client/interfaces/selectable-all';
 import { ISelectable } from '~/client/interfaces/selectable-all';
 import { unlink, bookmark, unbookmark } from '~/client/services/page-operation';
 import { unlink, bookmark, unbookmark } from '~/client/services/page-operation';
@@ -198,14 +196,13 @@ const PageListItemLSubstance: ForwardRefRenderFunction<ISelectable, Props> = (pr
           {/* checkbox */}
           {/* checkbox */}
           {onCheckboxChanged != null && (
           {onCheckboxChanged != null && (
             <div className="d-flex align-items-center justify-content-center">
             <div className="d-flex align-items-center justify-content-center">
-              {/* // TODO: replace CustomInput https://redmine.weseek.co.jp/issues/128494 */}
-              {/* <CustomInput
-                type="checkbox"
+              <input
+                type='checkbox'
                 id={`cbSelect-${pageData._id}`}
                 id={`cbSelect-${pageData._id}`}
                 data-testid="cb-select"
                 data-testid="cb-select"
-                innerRef={inputRef}
+                ref={inputRef}
                 onChange={(e) => { onCheckboxChanged(e.target.checked, pageData._id) }}
                 onChange={(e) => { onCheckboxChanged(e.target.checked, pageData._id) }}
-              /> */}
+              />
             </div>
             </div>
           )}
           )}
 
 

+ 3 - 9
apps/app/src/components/SearchPage/OperateAllControl.tsx

@@ -2,14 +2,12 @@ import React, {
   ChangeEvent, forwardRef, ForwardRefRenderFunction, useImperativeHandle, useRef,
   ChangeEvent, forwardRef, ForwardRefRenderFunction, useImperativeHandle, useRef,
 } from 'react';
 } from 'react';
 
 
-// import { CustomInput } from 'reactstrap';
 import { ISelectableAndIndeterminatable } from '~/client/interfaces/selectable-all';
 import { ISelectableAndIndeterminatable } from '~/client/interfaces/selectable-all';
 import { IndeterminateInputElement } from '~/interfaces/indeterminate-input-elm';
 import { IndeterminateInputElement } from '~/interfaces/indeterminate-input-elm';
 
 
 type Props = {
 type Props = {
   isCheckboxDisabled?: boolean,
   isCheckboxDisabled?: boolean,
   onCheckboxChanged?: (isChecked: boolean) => void,
   onCheckboxChanged?: (isChecked: boolean) => void,
-
   children?: React.ReactNode,
   children?: React.ReactNode,
 }
 }
 
 
@@ -17,7 +15,6 @@ const OperateAllControlSubstance: ForwardRefRenderFunction<ISelectableAndIndeter
   const {
   const {
     isCheckboxDisabled,
     isCheckboxDisabled,
     onCheckboxChanged,
     onCheckboxChanged,
-
     children,
     children,
   } = props;
   } = props;
 
 
@@ -54,21 +51,18 @@ const OperateAllControlSubstance: ForwardRefRenderFunction<ISelectableAndIndeter
   };
   };
 
 
   return (
   return (
-
     <div className="d-flex align-items-center">
     <div className="d-flex align-items-center">
-      {/* // TODO: replace CustomInput https://redmine.weseek.co.jp/issues/128494 */}
-      {/* <CustomInput
+      <input
         type="checkbox"
         type="checkbox"
         id="cb-check-all"
         id="cb-check-all"
         data-testid="cb-select-all"
         data-testid="cb-select-all"
-        innerRef={selectAllCheckboxElm}
+        ref={selectAllCheckboxElm}
         disabled={isCheckboxDisabled}
         disabled={isCheckboxDisabled}
         onChange={checkboxChangedHandler}
         onChange={checkboxChangedHandler}
-      /> */}
+      />
       {children}
       {children}
     </div>
     </div>
   );
   );
-
 };
 };
 
 
 export const OperateAllControl = React.memo(forwardRef(OperateAllControlSubstance));
 export const OperateAllControl = React.memo(forwardRef(OperateAllControlSubstance));