Răsfoiți Sursa

remove reactFragment

kaori 4 ani în urmă
părinte
comite
ebed49b8a7
1 a modificat fișierele cu 49 adăugiri și 51 ștergeri
  1. 49 51
      packages/app/src/components/Sidebar/PageTree/Item.tsx

+ 49 - 51
packages/app/src/components/Sidebar/PageTree/Item.tsx

@@ -214,62 +214,60 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
   }, [data, isOpen]);
 
   return (
-    <>
-      <div className={`grw-pagetree-item-container ${isOver ? 'grw-pagetree-is-over' : ''}`}>
-        <div
-          ref={(c) => { drag(c); drop(c) }}
-          className={`grw-pagetree-item d-flex align-items-center pr-1 ${page.isTarget ? 'grw-pagetree-is-target' : ''}`}
+    <div className={`grw-pagetree-item-container ${isOver ? 'grw-pagetree-is-over' : ''}`}>
+      <div
+        ref={(c) => { drag(c); drop(c) }}
+        className={`grw-pagetree-item d-flex align-items-center pr-1 ${page.isTarget ? 'grw-pagetree-is-target' : ''}`}
+      >
+        <button
+          type="button"
+          className={`grw-pagetree-button btn ${isOpen ? 'grw-pagetree-open' : ''}`}
+          onClick={onClickLoadChildren}
         >
-          <button
-            type="button"
-            className={`grw-pagetree-button btn ${isOpen ? 'grw-pagetree-open' : ''}`}
-            onClick={onClickLoadChildren}
-          >
-            <div className="grw-triangle-icon">
-              <TriangleIcon />
-            </div>
-          </button>
-          <a href={page._id} className="grw-pagetree-title-anchor flex-grow-1">
-            <p className={`text-truncate m-auto ${page.isEmpty && 'text-muted'}`}>{nodePath.basename(page.path as string) || '/'}</p>
-          </a>
-          <div className="grw-pagetree-count-wrapper">
-            <ItemCount />
-          </div>
-          <div className="grw-pagetree-control d-none">
-            <ItemControl
-              page={page}
-              onClickDeleteButtonHandler={onClickDeleteButtonHandler}
-              onClickPlusButtonHandler={() => { setNewPageInputShown(true) }}
-              isEnableActions={isEnableActions}
-              isDeletable={!page.isEmpty && !isTopPage(page.path as string)}
-            />
+          <div className="grw-triangle-icon">
+            <TriangleIcon />
           </div>
+        </button>
+        <a href={page._id} className="grw-pagetree-title-anchor flex-grow-1">
+          <p className={`text-truncate m-auto ${page.isEmpty && 'text-muted'}`}>{nodePath.basename(page.path as string) || '/'}</p>
+        </a>
+        <div className="grw-pagetree-count-wrapper">
+          <ItemCount />
         </div>
-
-        {isEnableActions && (
-          <ClosableTextInput
-            isShown={isNewPageInputShown}
-            placeholder={t('Input page name')}
-            onClickOutside={() => { setNewPageInputShown(false) }}
-            onPressEnter={onPressEnterHandler}
-            inputValidator={inputValidator}
+        <div className="grw-pagetree-control d-none">
+          <ItemControl
+            page={page}
+            onClickDeleteButtonHandler={onClickDeleteButtonHandler}
+            onClickPlusButtonHandler={() => { setNewPageInputShown(true) }}
+            isEnableActions={isEnableActions}
+            isDeletable={!page.isEmpty && !isTopPage(page.path as string)}
           />
-        )}
-        {
-          isOpen && hasChildren() && currentChildren.map(node => (
-            <div key={node.page._id} className="grw-pagetree-item-children">
-              <Item
-                isEnableActions={isEnableActions}
-                itemNode={node}
-                isOpen={false}
-                targetPathOrId={targetPathOrId}
-                onClickDeleteByPage={onClickDeleteByPage}
-              />
-            </div>
-          ))
-        }
+        </div>
       </div>
-    </>
+
+      {isEnableActions && (
+        <ClosableTextInput
+          isShown={isNewPageInputShown}
+          placeholder={t('Input page name')}
+          onClickOutside={() => { setNewPageInputShown(false) }}
+          onPressEnter={onPressEnterHandler}
+          inputValidator={inputValidator}
+        />
+      )}
+      {
+        isOpen && hasChildren() && currentChildren.map(node => (
+          <div key={node.page._id} className="grw-pagetree-item-children">
+            <Item
+              isEnableActions={isEnableActions}
+              itemNode={node}
+              isOpen={false}
+              targetPathOrId={targetPathOrId}
+              onClickDeleteByPage={onClickDeleteByPage}
+            />
+          </div>
+        ))
+      }
+    </div>
   );
 
 };