Taichi Masuyama 4 лет назад
Родитель
Сommit
b84f6d53c9
1 измененных файлов с 4 добавлено и 2 удалено
  1. 4 2
      packages/app/src/components/Sidebar/PageTree/Item.tsx

+ 4 - 2
packages/app/src/components/Sidebar/PageTree/Item.tsx

@@ -88,12 +88,14 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
   const isChildrenLoaded = currentChildren?.length > 0;
   const isChildrenLoaded = currentChildren?.length > 0;
   const hasDescendants = (page.descendantCount != null && page?.descendantCount > 0) || isChildrenLoaded;
   const hasDescendants = (page.descendantCount != null && page?.descendantCount > 0) || isChildrenLoaded;
 
 
+  // to re-show hidden item when useDrag end() callback
   const removeDisplayNoneFromItemByPageId = useCallback((pageId) => {
   const removeDisplayNoneFromItemByPageId = useCallback((pageId) => {
     const target = document.getElementById(`pagetree-item-${pageId}`);
     const target = document.getElementById(`pagetree-item-${pageId}`);
     if (target == null) {
     if (target == null) {
       return;
       return;
     }
     }
 
 
+    // wait 500ms to avoid removing before d-none is set by useDrag end() callback
     setTimeout(() => {
     setTimeout(() => {
       target.classList.remove('d-none');
       target.classList.remove('d-none');
     }, 500);
     }, 500);
@@ -123,7 +125,6 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
     const newPagePath = nodePath.join(newParentPath, pageTitle);
     const newPagePath = nodePath.join(newParentPath, pageTitle);
 
 
     try {
     try {
-      throw Error();
       await apiv3Put('/pages/rename', {
       await apiv3Put('/pages/rename', {
         pageId: droppedPage._id,
         pageId: droppedPage._id,
         revisionId: droppedPage.revision,
         revisionId: droppedPage.revision,
@@ -134,9 +135,10 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
 
 
       await mutateChildren();
       await mutateChildren();
 
 
+      // force open
       setIsOpen(true);
       setIsOpen(true);
 
 
-      toastSuccess('Renamed!');
+      toastSuccess('TODO: i18n Successfully moved pages.');
     }
     }
     catch (err) {
     catch (err) {
       // display the dropped item
       // display the dropped item