Yuki Takei 7 месяцев назад
Родитель
Сommit
0b1bf17352

+ 2 - 2
apps/app/src/client/components/PageEditor/PageEditorReadOnly.tsx

@@ -19,9 +19,9 @@ type Props = {
 export const PageEditorReadOnly = react.memo(({ visibility }: Props): JSX.Element => {
 export const PageEditorReadOnly = react.memo(({ visibility }: Props): JSX.Element => {
   const previewRef = useRef<HTMLDivElement>(null);
   const previewRef = useRef<HTMLDivElement>(null);
 
 
-  const [currentPage] = useCurrentPageData();
+  const currentPage = useCurrentPageData();
   const { data: rendererOptions } = usePreviewOptions();
   const { data: rendererOptions } = usePreviewOptions();
-  const [isLatestRevision] = useLatestRevision();
+  const isLatestRevision = useLatestRevision();
   const shouldExpandContent = useShouldExpandContent(currentPage);
   const shouldExpandContent = useShouldExpandContent(currentPage);
 
 
   const { scrollEditorHandler, scrollPreviewHandler } = useScrollSync(GlobalCodeMirrorEditorKey.READONLY, previewRef);
   const { scrollEditorHandler, scrollPreviewHandler } = useScrollSync(GlobalCodeMirrorEditorKey.READONLY, previewRef);

+ 2 - 3
apps/app/src/client/components/PageStatusAlert.tsx

@@ -3,10 +3,9 @@ import React, { useCallback, type JSX } from 'react';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';
 
 
 import { useIsGuestUser, useIsReadOnlyUser } from '~/states/context';
 import { useIsGuestUser, useIsReadOnlyUser } from '~/states/context';
-import { useCurrentPageData, useRemoteRevisionId } from '~/states/page';
+import { useCurrentPageData, useRemoteRevisionId, useRemoteRevisionLastUpdateUser } from '~/states/page';
 import { useEditorMode } from '~/states/ui/editor';
 import { useEditorMode } from '~/states/ui/editor';
 import { usePageStatusAlert } from '~/stores/alert';
 import { usePageStatusAlert } from '~/stores/alert';
-import { useRemoteRevisionLastUpdateUser } from '~/stores/remote-latest-page';
 
 
 import { Username } from '../../components/User/Username';
 import { Username } from '../../components/User/Username';
 
 
@@ -20,7 +19,7 @@ export const PageStatusAlert = (): JSX.Element => {
   const isReadOnlyUser = useIsReadOnlyUser();
   const isReadOnlyUser = useIsReadOnlyUser();
   const { data: pageStatusAlertData } = usePageStatusAlert();
   const { data: pageStatusAlertData } = usePageStatusAlert();
   const remoteRevisionId = useRemoteRevisionId();
   const remoteRevisionId = useRemoteRevisionId();
-  const { data: remoteRevisionLastUpdateUser } = useRemoteRevisionLastUpdateUser();
+  const remoteRevisionLastUpdateUser = useRemoteRevisionLastUpdateUser();
   const pageData = useCurrentPageData();
   const pageData = useCurrentPageData();
 
 
   const onClickRefreshPage = useCallback(() => {
   const onClickRefreshPage = useCallback(() => {

+ 3 - 3
apps/app/src/client/components/ReactMarkdownComponents/RichAttachment.tsx

@@ -23,9 +23,9 @@ export const RichAttachment = React.memo((props: RichAttachmentProps) => {
   const { data: attachment, remove } = useSWRxAttachment(attachmentId);
   const { data: attachment, remove } = useSWRxAttachment(attachmentId);
   const { open: openDeleteAttachmentModal } = useDeleteAttachmentModal();
   const { open: openDeleteAttachmentModal } = useDeleteAttachmentModal();
 
 
-  const [isGuestUser] = useIsGuestUser();
-  const [isSharedUser] = useIsSharedUser();
-  const [isReadOnlyUser] = useIsReadOnlyUser();
+  const isGuestUser = useIsGuestUser();
+  const isSharedUser = useIsSharedUser();
+  const isReadOnlyUser = useIsReadOnlyUser();
 
 
   const showTrashButton = isGuestUser === false && isSharedUser === false && isReadOnlyUser === false;
   const showTrashButton = isGuestUser === false && isSharedUser === false && isReadOnlyUser === false;
 
 

+ 5 - 5
apps/app/src/client/components/ReactMarkdownComponents/TableWithEditButton.tsx

@@ -25,11 +25,11 @@ type TableWithEditButtonProps = {
 const TableWithEditButtonNoMemorized = (props: TableWithEditButtonProps): JSX.Element => {
 const TableWithEditButtonNoMemorized = (props: TableWithEditButtonProps): JSX.Element => {
   const { children, node, className } = props;
   const { children, node, className } = props;
 
 
-  const [isGuestUser] = useIsGuestUser();
-  const [isReadOnlyUser] = useIsReadOnlyUser();
-  const [isSharedUser] = useIsSharedUser();
-  const [shareLinkId] = useShareLinkId();
-  const [isRevisionOutdated] = useIsRevisionOutdated();
+  const isGuestUser = useIsGuestUser();
+  const isReadOnlyUser = useIsReadOnlyUser();
+  const isSharedUser = useIsSharedUser();
+  const shareLinkId = useShareLinkId();
+  const isRevisionOutdated = useIsRevisionOutdated();
   const { data: currentPageYjsData } = useCurrentPageYjsData();
   const { data: currentPageYjsData } = useCurrentPageYjsData();
 
 
   const bol = node.position?.start.line;
   const bol = node.position?.start.line;

+ 1 - 1
apps/app/src/client/components/SearchPage/SearchResultContent.tsx

@@ -125,7 +125,7 @@ export const SearchResultContent: FC<Props> = (props: Props) => {
   const { open: openRenameModal } = usePageRenameModal();
   const { open: openRenameModal } = usePageRenameModal();
   const { open: openDeleteModal } = usePageDeleteModal();
   const { open: openDeleteModal } = usePageDeleteModal();
   const { data: rendererOptions } = useSearchResultOptions(pageWithMeta.data.path, highlightKeywords);
   const { data: rendererOptions } = useSearchResultOptions(pageWithMeta.data.path, highlightKeywords);
-  const [currentUser] = useCurrentUser();
+  const currentUser = useCurrentUser();
 
 
   const shouldExpandContent = useShouldExpandContent(page);
   const shouldExpandContent = useShouldExpandContent(page);