soumaeda 2 лет назад
Родитель
Сommit
3692b5c002

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

@@ -63,7 +63,7 @@ const Tags = (props: TagsProps): JSX.Element => {
         ? (
           <PageTags
             tags={tagsInfoData.tags}
-            isTagLabelsDisabled={isTagLabelsDisabled ?? false}
+            isTagLabelsDisabled={isTagLabelsDisabled}
             onClickEditTagsButton={onClickEditTagsButton}
           />
         )

+ 8 - 9
apps/app/src/components/PageTags/TagEditModal.tsx

@@ -15,7 +15,7 @@ import { useTagEditModal, type TagEditModalStatus } from '~/stores/modal';
 import { TagsInput } from './TagsInput';
 
 type TagEditModalSubstanceProps = {
-  tagEditModalData?: TagEditModalStatus,
+  tagEditModalData: TagEditModalStatus,
   closeTagEditModal: () => void,
 }
 
@@ -24,12 +24,12 @@ const TagEditModalSubstance: React.FC<TagEditModalSubstanceProps> = (props: TagE
   const { t } = useTranslation();
 
   const initTags = useMemo(() => {
-    return tagEditModalData?.tags ?? [];
-  }, [tagEditModalData?.tags]);
+    return tagEditModalData.tags;
+  }, [tagEditModalData.tags]);
 
-  const isOpen = tagEditModalData?.isOpen;
-  const pageId = tagEditModalData?.pageId;
-  const revisionId = tagEditModalData?.revisionId;
+  const isOpen = tagEditModalData.isOpen;
+  const pageId = tagEditModalData.pageId;
+  const revisionId = tagEditModalData.revisionId;
   const updateStateAfterSave = useUpdateStateAfterSave(pageId);
 
   const [tags, setTags] = useState<string[]>([]);
@@ -73,10 +73,9 @@ const TagEditModalSubstance: React.FC<TagEditModalSubstanceProps> = (props: TagE
 
 export const TagEditModal: React.FC = () => {
   const { data: tagEditModalData, close: closeTagEditModal } = useTagEditModal();
-  const isOpen = tagEditModalData?.isOpen;
 
-  if (!isOpen) {
-    return <></>;
+  if (tagEditModalData == null || !tagEditModalData.isOpen) {
+    return;
   }
 
   return <TagEditModalSubstance tagEditModalData={tagEditModalData} closeTagEditModal={closeTagEditModal} />;