refactor

apps/app/src/components/PageSelectModal/TreeItemForModal.tsx

@@ -9,7 +9,7 @@ type PageTreeItemProps = Omit<SimpleItemProps, Optional> & {key};
 
 export const TreeItemForModal: FC<PageTreeItemProps> = (props) => {
 
-  const { NewPageInputWrapper, NewPageCreateButtonWrapper } = useNewPageInput();
+  const { Input: NewPageInput, CreateButton: NewPageCreateButton } = useNewPageInput();
 
   return (
     <SimpleItem
@@ -22,9 +22,9 @@ export const TreeItemForModal: FC<PageTreeItemProps> = (props) => {
       onRenamed={props.onRenamed}
       onClickDuplicateMenuItem={props.onClickDuplicateMenuItem}
       onClickDeleteMenuItem={props.onClickDeleteMenuItem}
-      customNextComponents={[NewPageInputWrapper]}
+      customNextComponents={[NewPageInput]}
       itemClass={TreeItemForModal}
-      customEndComponents={[SimpleItemTool, NewPageCreateButtonWrapper]}
+      customEndComponents={[SimpleItemTool, NewPageCreateButton]}
     />
   );
 };

apps/app/src/components/Sidebar/PageTreeItem/PageTreeItem.tsx

@@ -154,7 +154,7 @@ export const PageTreeItem: FC<PageTreeItemProps> = (props) => {
 
   const mainClassName = `${isOver ? 'grw-pagetree-is-over' : ''} ${shouldHide ? 'd-none' : ''}`;
 
-  const { NewPageInputWrapper, NewPageCreateButtonWrapper } = useNewPageInput();
+  const { Input: NewPageInput, CreateButton: NewPageCreateButton } = useNewPageInput();
 
   return (
     <SimpleItem
@@ -169,8 +169,8 @@ export const PageTreeItem: FC<PageTreeItemProps> = (props) => {
       itemRef={itemRef}
       itemClass={PageTreeItem}
       mainClassName={mainClassName}
-      customEndComponents={[Ellipsis, NewPageCreateButtonWrapper]}
-      customNextComponents={[NewPageInputWrapper]}
+      customEndComponents={[Ellipsis, NewPageCreateButton]}
+      customNextComponents={[NewPageInput]}
     />
   );
 };

apps/app/src/components/TreeItem/UseNewPageInput.tsx

@@ -9,8 +9,8 @@ import { NewPageInput } from './NewPageInput';
 import type { SimpleItemContentProps } from './interfaces';
 
 type UseNewPageInput = {
-  NewPageInputWrapper: FC<SimpleItemContentProps>,
-  NewPageCreateButtonWrapper: FC<SimpleItemContentProps>,
+  Input: FC<SimpleItemContentProps>,
+  CreateButton: FC<SimpleItemContentProps>,
   isProcessingSubmission: boolean,
 }
 
@@ -21,7 +21,7 @@ export const useNewPageInput = (): UseNewPageInput => {
 
   const { getDescCount } = usePageTreeDescCountMap();
 
-  const NewPageCreateButtonWrapper: FC<SimpleItemContentProps> = (props) => {
+  const CreateButton: FC<SimpleItemContentProps> = (props) => {
 
     const { page, children, stateHandlers } = props;
     const { setIsOpen } = stateHandlers;
@@ -48,7 +48,7 @@ export const useNewPageInput = (): UseNewPageInput => {
     );
   };
 
-  const NewPageInputWrapper: FC<SimpleItemContentProps> = (props) => {
+  const Input: FC<SimpleItemContentProps> = (props) => {
 
     const {
       page, children, stateHandlers,
@@ -102,8 +102,8 @@ export const useNewPageInput = (): UseNewPageInput => {
   };
 
   return {
-    NewPageInputWrapper,
-    NewPageCreateButtonWrapper,
+    Input,
+    CreateButton,
     isProcessingSubmission,
   };
 };