Explorar o código

set editorContainerTags for editorMode

kaori %!s(int64=3) %!d(string=hai) anos
pai
achega
6bd6a11cfd

+ 8 - 5
packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -167,6 +167,7 @@ const GrowiContextualSubNavigation = (props) => {
   const { data: isAbleToShowPageAuthors } = useIsAbleToShowPageAuthors();
   const { data: isAbleToShowPageAuthors } = useIsAbleToShowPageAuthors();
 
 
   const { mutate: mutateSWRTagsInfo, data: tagsInfoData } = useSWRxTagsInfo(pageId);
   const { mutate: mutateSWRTagsInfo, data: tagsInfoData } = useSWRxTagsInfo(pageId);
+  const { data: editorContainerTags, mutate: mutateEditorContainerTags } = useStaticPageTags(pageId);
 
 
   const { open: openDuplicateModal } = usePageDuplicateModal();
   const { open: openDuplicateModal } = usePageDuplicateModal();
   const { open: openRenameModal } = usePageRenameModal();
   const { open: openRenameModal } = usePageRenameModal();
@@ -175,7 +176,7 @@ const GrowiContextualSubNavigation = (props) => {
   const [isPageTemplateModalShown, setIsPageTempleteModalShown] = useState(false);
   const [isPageTemplateModalShown, setIsPageTempleteModalShown] = useState(false);
 
 
   const {
   const {
-    editorContainer, isCompactMode, isLinkSharingDisabled,
+    /* editorContainer, */ isCompactMode, isLinkSharingDisabled,
   } = props;
   } = props;
 
 
   const isViewMode = editorMode === EditorMode.View;
   const isViewMode = editorMode === EditorMode.View;
@@ -187,7 +188,8 @@ const GrowiContextualSubNavigation = (props) => {
     if (editorMode === EditorMode.Editor) {
     if (editorMode === EditorMode.Editor) {
       console.log('tagsUpdatedHandler1');
       console.log('tagsUpdatedHandler1');
       console.log('newTags', newTags);
       console.log('newTags', newTags);
-      return editorContainer.setState({ tags: newTags });
+      // return editorContainer.setState({ tags: newTags });
+      return mutateEditorContainerTags(newTags);
     }
     }
     console.log('editorMode_2', editorMode);
     console.log('editorMode_2', editorMode);
 
 
@@ -197,8 +199,9 @@ const GrowiContextualSubNavigation = (props) => {
 
 
       // revalidate SWRTagsInfo
       // revalidate SWRTagsInfo
       mutateSWRTagsInfo();
       mutateSWRTagsInfo();
+      mutateEditorContainerTags(newTags);
       // update editorContainer.state
       // update editorContainer.state
-      editorContainer.setState({ tags });
+      // editorContainer.setState({ tags });
 
 
       toastSuccess('updated tags successfully');
       toastSuccess('updated tags successfully');
     }
     }
@@ -206,7 +209,7 @@ const GrowiContextualSubNavigation = (props) => {
       toastError(err, 'fail to update tags');
       toastError(err, 'fail to update tags');
     }
     }
 
 
-  }, [editorMode, editorContainer, pageId, revisionId, mutateSWRTagsInfo]);
+  }, [editorMode, pageId, revisionId, mutateSWRTagsInfo, mutateEditorContainerTags]);
 
 
   const duplicateItemClickedHandler = useCallback(async(page: IPageForPageDuplicateModal) => {
   const duplicateItemClickedHandler = useCallback(async(page: IPageForPageDuplicateModal) => {
     const duplicatedHandler: OnDuplicatedFunction = (fromPath, toPath) => {
     const duplicatedHandler: OnDuplicatedFunction = (fromPath, toPath) => {
@@ -329,7 +332,7 @@ const GrowiContextualSubNavigation = (props) => {
       isGuestUser={isGuestUser}
       isGuestUser={isGuestUser}
       isDrawerMode={isDrawerMode}
       isDrawerMode={isDrawerMode}
       isCompactMode={isCompactMode}
       isCompactMode={isCompactMode}
-      tags={isViewMode ? tagsInfoData?.tags || [] : editorContainer.state.tags}
+      tags={isViewMode ? tagsInfoData?.tags || [] : editorContainerTags}
       tagsUpdatedHandler={tagsUpdatedHandler}
       tagsUpdatedHandler={tagsUpdatedHandler}
       controls={ControlComponents}
       controls={ControlComponents}
       additionalClasses={['container-fluid']}
       additionalClasses={['container-fluid']}