soumaeda 2 лет назад
Родитель
Сommit
0c4d0086e7

+ 3 - 3
apps/app/src/components/PageControls/PageControls.tsx

@@ -312,11 +312,11 @@ export const PageControls = memo((props: PageControlsProps): JSX.Element => {
   const { open: openTagEditModal } = useTagEditModal();
 
   const onClickEditTagsButton = useCallback(() => {
-    if (pageId != null && revisionId != null) {
+    if (pageId == null || revisionId == null || tagsInfoData == null) {
       return;
     }
-    openTagEditModal(tagsInfoData?.tags, pageId, revisionId);
-  }, [openTagEditModal, tagsInfoData?.tags, pageId, revisionId]);
+    openTagEditModal(tagsInfoData.tags, pageId, revisionId);
+  }, [pageId, revisionId, tagsInfoData, openTagEditModal]);
 
   if (error != null) {
     return <></>;

+ 4 - 4
apps/app/src/components/PageSideContents/PageSideContents.tsx

@@ -45,11 +45,11 @@ const Tags = (props: TagsProps): JSX.Element => {
   const { open: openTagEditModal } = useTagEditModal();
 
   const onClickEditTagsButton = useCallback(() => {
-    if (pageId != null && revisionId != null) {
+    if (pageId == null || revisionId == null || tagsInfoData == null) {
       return;
     }
-    openTagEditModal(tagsInfoData?.tags, pageId, revisionId);
-  }, [openTagEditModal, pageId, revisionId, tagsInfoData?.tags]);
+    openTagEditModal(tagsInfoData.tags, pageId, revisionId);
+  }, [pageId, revisionId, tagsInfoData, openTagEditModal]);
 
   if (!showTagLabel) {
     return <></>;
@@ -59,7 +59,7 @@ const Tags = (props: TagsProps): JSX.Element => {
 
   return (
     <div className="grw-taglabels-container">
-      { tagsInfoData?.tags != null
+      { tagsInfoData && tagsInfoData.tags != null
         ? (
           <PageTags
             tags={tagsInfoData.tags}

+ 1 - 1
apps/app/src/stores/modal.tsx

@@ -785,7 +785,7 @@ export type TagEditModalStatus = {
 }
 
 type TagEditModalUtils = {
-  open(tags?: string[], pageId?: string, revisionId?: string): void,
+  open(tags: string[], pageId: string, revisionId: string): void,
   close(): void,
 }