From bbf8c8754193d60d539182113b365ea8b483dd62 Mon Sep 17 00:00:00 2001 From: Shun Miyazawa Date: Wed, 22 Jan 2025 09:01:29 +0000 Subject: [PATCH] Reapply "Merge pull request #9572 from weseek/support/upgrade-react" This reverts commit 3c03ef64b13cb2c14125fa44c9a4cbddbce589a4. --- apps/app/package.json | 8 +- .../Admin/AdminHome/EnvVarsTable.tsx | 2 +- .../components/Admin/App/AppSetting.jsx | 2 +- .../components/Admin/App/AwsSetting.tsx | 2 +- .../components/Admin/App/AzureSetting.tsx | 2 +- .../Admin/App/FileUploadSetting.tsx | 4 +- .../components/Admin/App/GcsSetting.tsx | 2 +- .../components/Admin/App/MaskedInput.tsx | 2 +- .../Admin/App/QuestionnaireSettings.tsx | 2 +- .../Admin/Common/AdminInstallButtonRow.tsx | 2 +- .../Admin/Common/AdminUpdateButtonRow.tsx | 2 +- .../Admin/Common/LabeledProgressBar.tsx | 2 +- .../Admin/Customize/CustomizeCssSetting.tsx | 2 +- .../Customize/CustomizeFunctionOption.tsx | 2 +- .../Customize/CustomizeFunctionSetting.tsx | 2 +- .../Customize/CustomizeLayoutSetting.tsx | 2 +- .../Admin/Customize/CustomizeLogoSetting.tsx | 2 +- .../Customize/CustomizeNoscriptSetting.tsx | 2 +- .../CustomizePresentationSetting.tsx | 2 +- .../Customize/CustomizeScriptSetting.tsx | 2 +- .../Customize/CustomizeSidebarSetting.tsx | 2 +- .../Admin/Customize/CustomizeThemeOptions.tsx | 2 +- .../Admin/Customize/CustomizeThemeSetting.tsx | 2 +- .../Admin/Customize/ThemeColorBox.tsx | 2 +- .../NormalizeIndicesControls.tsx | 2 +- .../ReconnectControls.tsx | 2 +- .../ExportArchiveData/ArchiveFilesTable.tsx | 2 +- .../ArchiveFilesTableMenu.tsx | 2 +- .../SelectCollectionsModal.tsx | 2 +- .../Admin/ExportArchiveDataPage.tsx | 2 +- .../client/components/Admin/ForbiddenPage.tsx | 2 +- .../Admin/FullTextSearchManagement.tsx | 2 +- .../components/Admin/G2GDataTransfer.tsx | 2 +- .../Admin/G2GDataTransferExportForm.tsx | 10 +- .../Admin/G2GDataTransferStatusIcon.tsx | 2 +- .../ImportData/GrowiArchive/ErrorViewer.tsx | 2 +- .../Admin/ManageExternalAccount.tsx | 2 +- .../MarkDownSettingContents.tsx | 2 +- .../Admin/MarkdownSetting/WhitelistInput.tsx | 2 +- .../client/components/Admin/NotFoundPage.tsx | 2 +- .../Notification/ManageGlobalNotification.tsx | 2 +- .../Notification/NotificationTypeIcon.tsx | 2 +- .../Admin/Security/LdapAuthTest.tsx | 2 +- .../Security/SamlSecuritySettingContents.jsx | 9 +- .../Admin/SlackIntegration/BotTypeCard.tsx | 2 +- .../Admin/SlackIntegration/Bridge.tsx | 4 +- .../CustomBotWithProxyConnectionStatus.tsx | 2 +- .../CustomBotWithoutProxyConnectionStatus.tsx | 2 +- .../SlackAppIntegrationControl.tsx | 2 +- .../SlackIntegration/SlackIntegration.tsx | 2 +- .../Admin/UserGroup/UserGroupTable.tsx | 2 +- .../UserGroupDetail/UserGroupDetailPage.tsx | 2 +- .../UserGroupDetail/UserGroupPageList.tsx | 2 +- .../UserGroupDetail/UserGroupUserModal.tsx | 2 +- .../UserGroupDetail/UserGroupUserTable.tsx | 2 +- .../Admin/Users/ExternalAccountTable.tsx | 2 +- .../Admin/Users/GrantAdminButton.tsx | 2 +- .../Admin/Users/GrantReadOnlyButton.tsx | 2 +- .../Admin/Users/RevokeAdminButton.tsx | 2 +- .../Admin/Users/RevokeAdminMenuItem.tsx | 4 +- .../Admin/Users/RevokeReadOnlyMenuItem.tsx | 2 +- .../components/Admin/Users/SortIcons.tsx | 2 +- .../Admin/Users/StatusSuspendMenuItem.tsx | 4 +- .../components/AlertSiteUrlUndefined.tsx | 2 +- .../components/AuthorInfo/AuthorInfo.tsx | 10 +- .../Bookmarks/BookmarkFolderItemControl.tsx | 2 +- .../Bookmarks/BookmarkFolderMenu.tsx | 2 +- .../Bookmarks/BookmarkFolderNameInput.tsx | 2 +- .../components/Bookmarks/BookmarkItem.tsx | 2 +- .../Bookmarks/BookmarkItemRenameInput.tsx | 2 +- .../Bookmarks/DragAndDropWrapper.tsx | 2 +- apps/app/src/client/components/Comments.tsx | 2 +- .../Common/DrawerToggler/DrawerToggler.tsx | 2 +- .../Common/Dropdown/PageItemControl.tsx | 6 +- .../client/components/Common/LazyRenderer.tsx | 4 +- .../client/components/ContentLinkButtons.tsx | 2 +- .../components/CustomNavigation/CustomNav.tsx | 8 +- .../CustomNavigation/CustomNavAndContents.tsx | 2 +- .../CustomNavigation/CustomTabContent.tsx | 2 +- .../client/components/DataTransferForm.tsx | 2 +- .../client/components/DescendantsPageList.tsx | 4 +- .../components/DescendantsPageListModal.tsx | 2 +- .../client/components/EmptyTrashButton.tsx | 2 +- .../src/client/components/ForbiddenPage.tsx | 2 +- .../GrantedGroupsInheritanceSelectModal.tsx | 2 +- .../Subscribers/ShowShortcutsModal.tsx | 2 +- .../client/components/Icons/FolderIcon.tsx | 2 +- .../components/Icons/RecentlyCreatedIcon.tsx | 2 +- .../client/components/IdenticalPathPage.tsx | 2 +- .../InAppNotificationDropdown.tsx | 2 +- .../InAppNotificationElm.tsx | 2 +- .../src/client/components/InstallerForm.tsx | 2 +- .../app/src/client/components/InvitedForm.tsx | 2 +- .../client/components/ItemsTree/ItemsTree.tsx | 2 +- .../ItemsTree/ItemsTreeContentSkeleton.tsx | 2 +- .../LoginForm/ExternalAuthButton.tsx | 2 +- .../client/components/LoginForm/LoginForm.tsx | 6 +- .../components/Maintenance/Maintenance.tsx | 2 +- .../src/client/components/Me/ApiSettings.tsx | 2 +- .../client/components/Me/AssociateModal.tsx | 2 +- .../components/Me/BasicInfoSettings.tsx | 2 +- .../components/Me/ColorModeSettings.tsx | 4 +- .../components/Me/DisassociateModal.tsx | 2 +- .../client/components/Me/EditorSettings.tsx | 2 +- .../client/components/Me/OtherSettings.tsx | 2 +- .../components/Me/ProfileImageSettings.tsx | 2 +- .../components/Me/QuestionnaireSettings.tsx | 2 +- .../src/client/components/Me/UISettings.tsx | 4 +- .../src/client/components/Me/UserSettings.tsx | 2 +- .../Navbar/GrowiContextualSubNavigation.tsx | 6 +- .../components/Navbar/GrowiNavbarBottom.tsx | 2 +- .../Navbar/PageEditorModeManager.tsx | 2 +- .../src/client/components/NotAvailable.tsx | 4 +- .../components/NotAvailableForGuest.tsx | 4 +- .../client/components/NotAvailableForNow.tsx | 4 +- .../NotAvailableForReadOnlyUser.tsx | 4 +- .../src/client/components/NotFoundPage.tsx | 2 +- .../components/Page/DisplaySwitcher.tsx | 2 +- .../components/Page/EditablePageEffects.tsx | 2 +- .../client/components/Page/RevisionLoader.tsx | 2 +- .../client/components/Page/SlideRenderer.tsx | 2 +- .../PageAccessoriesModal.tsx | 2 +- .../PageAccessoriesModal/PageAttachment.tsx | 2 +- .../ShareLink/ShareLink.tsx | 2 +- .../ShareLink/ShareLinkList.tsx | 4 +- .../PageAttachment/PageAttachmentList.tsx | 2 +- .../PageAuthorInfo/PageAuthorInfo.tsx | 2 +- .../app/src/client/components/PageComment.tsx | 2 +- .../client/components/PageComment/Comment.tsx | 2 +- .../components/PageComment/CommentControl.tsx | 2 +- .../components/PageComment/CommentEditor.tsx | 8 +- .../components/PageComment/CommentPreview.tsx | 2 +- .../PageComment/DeleteCommentModal.tsx | 2 +- .../components/PageComment/ReplyComments.tsx | 2 +- .../PageComment/SwitchingButtonGroup.tsx | 2 +- .../components/PageControls/PageControls.tsx | 8 +- .../components/PageControls/SearchButton.tsx | 2 +- .../client/components/PageDuplicateModal.tsx | 2 +- .../components/PageEditor/Cheatsheet.tsx | 2 +- .../PageEditor/ConflictDiffModal.tsx | 4 +- .../components/PageEditor/DrawioModal.tsx | 2 +- .../PageEditor/EditorNavbar/EditorNavbar.tsx | 2 +- .../PageEditor/EditorNavbarBottom.tsx | 2 +- .../PageEditor/HandsontableModal.tsx | 2 +- .../components/PageEditor/LinkEditModal.tsx | 8 +- .../MarkdownTableDataImportForm.tsx | 2 +- .../components/PageEditor/OptionsSelector.tsx | 22 +- .../components/PageEditor/PageEditor.tsx | 2 +- .../PageEditor/PageEditorReadOnly.tsx | 2 +- .../client/components/PageEditor/Preview.tsx | 2 +- .../components/PageHeader/PageHeader.tsx | 2 +- .../components/PageHeader/PagePathHeader.tsx | 2 +- .../components/PageHeader/PageTitleHeader.tsx | 2 +- .../PageHistory/PageRevisionTable.tsx | 2 +- .../components/PageHistory/Revision.tsx | 2 +- .../components/PageHistory/RevisionDiff.tsx | 2 +- .../client/components/PageList/PageList.tsx | 2 +- .../components/PageList/PageListItemL.tsx | 2 +- .../components/PageList/PageListItemS.tsx | 2 +- .../CollapsedParentsDropdown.tsx | 2 +- .../PagePathNavSticky/PagePathNavSticky.tsx | 2 +- .../components/PagePresentationModal.tsx | 2 +- .../src/client/components/PageRenameModal.tsx | 2 +- .../PageAccessoriesControl.tsx | 2 +- .../PageSideContents/PageSideContents.tsx | 4 +- .../src/client/components/PageStatusAlert.tsx | 2 +- .../client/components/PageTags/PageTags.tsx | 2 +- .../src/client/components/PageTimeline.tsx | 4 +- .../client/components/PaginationWrapper.tsx | 6 +- .../components/Presentation/Presentation.tsx | 2 +- .../client/components/Presentation/Slides.tsx | 2 +- .../client/components/PrivateLegacyPages.tsx | 6 +- .../PrivateLegacyPagesMigrationModal.tsx | 2 +- .../DrawioViewerWithEditButton.tsx | 2 +- .../ReactMarkdownComponents/Header.tsx | 4 +- .../ReactMarkdownComponents/LightBox.tsx | 2 +- .../TableWithEditButton.tsx | 2 +- .../RecentCreated/RecentCreated.tsx | 2 +- .../RevisionComparer/RevisionComparer.tsx | 2 +- .../client/components/SavePageControls.tsx | 2 +- .../GrantSelector/GrantSelector.tsx | 2 +- apps/app/src/client/components/SearchPage.tsx | 4 +- .../SearchPage/OperateAllControl.tsx | 2 +- .../components/SearchPage/SearchControl.tsx | 2 +- .../SearchPage/SearchResultContent.tsx | 2 +- .../src/client/components/ShortcutsModal.tsx | 2 +- .../components/Sidebar/AppTitle/AppTitle.tsx | 6 +- .../client/components/Sidebar/Bookmarks.tsx | 2 +- .../Sidebar/Bookmarks/BookmarkContents.tsx | 2 +- .../Sidebar/Custom/CustomSidebar.tsx | 2 +- .../Sidebar/Custom/CustomSidebarNotFound.tsx | 2 +- .../Sidebar/Custom/CustomSidebarSubstance.tsx | 2 +- .../InAppNotification/InAppNotification.tsx | 2 +- .../InAppNotificationSubstance.tsx | 4 +- .../Sidebar/PageCreateButton/CreateButton.tsx | 2 +- .../Sidebar/PageCreateButton/DropendMenu.tsx | 2 +- .../PageCreateButton/DropendToggle.tsx | 2 +- .../Sidebar/PageCreateButton/Hexagon.tsx | 2 +- .../PageCreateButton/PageCreateButton.tsx | 2 +- .../components/Sidebar/PageTree/PageTree.tsx | 2 +- .../CountBadgeForPageTreeItem.tsx | 2 +- .../PageTreeItem/CreatingNewPageSpinner.tsx | 2 +- .../Sidebar/PageTreeItem/PageTreeItem.tsx | 3 +- .../Sidebar/RecentChanges/RecentChanges.tsx | 2 +- .../RecentChangesContentSkeleton.tsx | 2 +- .../RecentChanges/RecentChangesSubstance.tsx | 10 +- .../Sidebar/ResizableArea/ResizableArea.tsx | 2 +- .../ResizableArea/ResizableAreaFallback.tsx | 2 +- .../src/client/components/Sidebar/Sidebar.tsx | 8 +- .../SidebarHead/ToggleCollapseButton.tsx | 2 +- .../Sidebar/SidebarNav/PersonalDropdown.tsx | 2 +- .../Sidebar/SidebarNav/PrimaryItem.tsx | 2 +- .../Skeleton/DefaultContentSkeleton.tsx | 2 +- .../Sidebar/Skeleton/TagContentSkeleton.tsx | 4 +- apps/app/src/client/components/Skeleton.tsx | 2 +- .../components/StaffCredit/StaffCredit.tsx | 2 +- .../components/StickyStretchableScroller.tsx | 4 +- .../src/client/components/SystemVersion.tsx | 2 +- .../src/client/components/TableOfContents.tsx | 2 +- .../TemplateModal/TemplateModal.tsx | 4 +- .../app/src/client/components/TemplateTab.tsx | 2 +- .../src/client/components/TrashPageList.tsx | 4 +- .../NewPageInput/use-new-page-input.tsx | 3 +- .../components/TreeItem/SimpleItemContent.tsx | 2 +- .../client/components/UnsavedAlertDialog.tsx | 2 +- .../client/components/UsersHomepageFooter.tsx | 2 +- .../Admin/Common/AdminNavigation.tsx | 2 +- .../PagePathHierarchicalLink.tsx | 2 +- .../Common/PagePathNav/PagePathNav.tsx | 4 +- .../Common/PagePathNav/PagePathNavLayout.tsx | 2 +- .../Common/PagePathNav/Separator.tsx | 2 +- .../PagePathNavTitle/PagePathNavTitle.tsx | 2 +- .../src/components/FontFamily/.eslintrc.js | 6 + .../src/components/FontFamily/GlobalFonts.tsx | 2 +- .../app/src/components/Layout/AdminLayout.tsx | 2 +- .../app/src/components/Layout/BasicLayout.tsx | 2 +- .../src/components/Layout/NoLoginLayout.tsx | 2 +- apps/app/src/components/Layout/RawLayout.tsx | 2 +- .../components/Layout/SearchResultLayout.tsx | 2 +- .../src/components/Layout/ShareLinkLayout.tsx | 2 +- .../src/components/Navbar/GroundGlassBar.tsx | 2 +- .../PageView/PageAlerts/FixPageGrantAlert.tsx | 4 +- .../FullTextSearchNotCoverAlert.tsx | 2 +- .../PageView/PageAlerts/OldRevisionAlert.tsx | 2 +- .../PageView/PageAlerts/PageAlerts.tsx | 2 +- .../PageView/PageAlerts/PageGrantAlert.tsx | 2 +- .../PageAlerts/PageRedirectedAlert.tsx | 2 +- .../PageView/PageAlerts/PageStaleAlert.tsx | 2 +- .../PageView/PageAlerts/TrashPageAlert.tsx | 2 +- .../PageView/PageAlerts/WipPageAlert.tsx | 2 +- .../components/PageView/PageContentFooter.tsx | 2 +- apps/app/src/components/PageView/PageView.tsx | 2 +- .../components/PageView/PageViewLayout.tsx | 2 +- .../components/PageView/RevisionRenderer.tsx | 2 +- .../ReactMarkdownComponents/CodeBlock.tsx | 6 +- .../ReactMarkdownComponents/NextLink.tsx | 2 +- .../DrawioViewerScript/DrawioViewerScript.tsx | 2 +- .../ShareLinkPageView/ShareLinkPageView.tsx | 2 +- apps/app/src/components/User/UserInfo.tsx | 2 +- apps/app/src/components/User/Username.tsx | 7 +- .../callout/components/CalloutViewer.tsx | 2 +- .../ExternalUserGroup/LdapGroupManagement.tsx | 2 +- .../ExternalUserGroup/SyncExecution.tsx | 2 +- .../PluginCard.tsx | 6 +- .../PluginInstallerForm.tsx | 2 +- .../PluginsExtensionPageContents.tsx | 4 +- .../components/GrowiPluginsActivator.tsx | 2 +- .../mermaid/components/MermaidViewer.tsx | 2 +- .../components/AiChatModal/AiChatModal.tsx | 4 +- .../components/AiChatModal/MessageCard.tsx | 8 +- .../AiChatModal/ResizableTextArea.tsx | 2 +- .../AiIntegration/AiIntegration.tsx | 2 +- .../client/components/RagSearchButton.tsx | 2 +- .../models/vector-store-file-relation.ts | 9 +- .../ProactiveQuestionnaireModal.tsx | 4 +- .../client/components/Question.tsx | 2 +- .../client/components/QuestionnaireModal.tsx | 2 +- .../components/QuestionnaireModalManager.tsx | 2 +- .../client/components/QuestionnaireToast.tsx | 2 +- .../questionnaire/server/util/condition.ts | 9 +- .../search/client/components/SearchForm.tsx | 2 +- .../search/client/components/SearchHelp.tsx | 2 +- .../client/components/SearchMenuItem.tsx | 2 +- .../components/SearchMethodMenuItem.tsx | 2 +- .../search/client/components/SearchModal.tsx | 2 +- .../components/SearchResultMenuItem.tsx | 2 +- apps/app/src/interfaces/editor-methods.ts | 2 +- apps/app/src/interfaces/ui.ts | 4 +- apps/app/src/pages/[[...path]].page.tsx | 6 +- apps/app/src/pages/_app.page.tsx | 2 +- apps/app/src/pages/_document.page.tsx | 10 +- apps/app/src/pages/_error.page.tsx | 2 +- apps/app/src/pages/_search.page.tsx | 2 +- apps/app/src/pages/me/[[...path]].page.tsx | 4 +- apps/app/src/pages/share/[[...path]].page.tsx | 2 +- apps/app/src/pages/tags.page.tsx | 2 +- apps/app/src/pages/trash.page.tsx | 2 +- .../app/src/server/models/external-account.ts | 5 +- apps/app/src/server/models/revision.ts | 3 +- .../src/server/service/file-uploader/azure.ts | 10 +- .../service/import/overwrite-function.ts | 3 +- .../convert-revision-page-id-to-objectid.ts | 3 +- apps/app/src/server/service/page-grant.ts | 6 +- apps/app/src/server/service/page/index.ts | 3 +- apps/app/src/server/service/yjs/yjs.ts | 7 +- apps/app/src/stores/ui.tsx | 9 +- .../integration/service/user-groups.test.ts | 5 +- package.json | 4 +- packages/core/src/interfaces/attachment.ts | 2 +- packages/core/src/interfaces/common.spec.ts | 3 +- packages/core/src/swr/use-swr-static.ts | 3 +- packages/editor/package.json | 8 +- .../CodeMirrorEditor/CodeMirrorEditor.tsx | 2 +- .../Toolbar/AttachmentsDropdownItem.tsx | 2 +- .../Toolbar/AttachmentsDropup.tsx | 2 +- .../Toolbar/DiagramButton.tsx | 2 +- .../CodeMirrorEditor/Toolbar/EmojiButton.tsx | 2 +- .../Toolbar/LinkEditButton.tsx | 2 +- .../CodeMirrorEditor/Toolbar/TableButton.tsx | 2 +- .../Toolbar/TemplateButton.tsx | 2 +- .../Toolbar/TextFormatTools.tsx | 4 +- .../CodeMirrorEditor/Toolbar/Toolbar.tsx | 2 +- .../playground/Playground.tsx | 2 +- .../playground/PlaygroundController.tsx | 8 +- .../playground/Preview.tsx | 2 +- .../components/CodeMirrorEditorComment.tsx | 2 +- .../components/CodeMirrorEditorMain.tsx | 2 +- .../components/CodeMirrorEditorReadOnly.tsx | 2 +- .../components/diff/CodeMirrorEditorDiff.tsx | 2 +- .../use-file-dropzone/FileDropzoneOverlay.tsx | 2 +- packages/presentation/package.json | 4 +- .../src/client/components/GrowiSlides.tsx | 2 +- .../src/client/components/MarpSlides.tsx | 2 +- .../src/client/components/Presentation.tsx | 2 +- .../client/components/RichSlideSection.tsx | 6 +- .../src/client/components/Slides.tsx | 2 +- packages/preset-themes/package.json | 4 +- packages/remark-attachment-refs/package.json | 4 +- .../src/client/components/AttachmentList.tsx | 2 +- .../components/ExtractedAttachments.tsx | 2 +- .../src/client/components/Gallery.tsx | 4 +- .../src/client/components/Ref.tsx | 6 +- .../src/client/components/RefImg.tsx | 6 +- .../src/client/components/Refs.tsx | 6 +- .../src/client/components/RefsImg.tsx | 6 +- packages/remark-drawio/package.json | 8 +- .../src/components/DrawioViewer.tsx | 2 +- packages/remark-lsx/package.json | 4 +- .../remark-lsx/src/client/components/Lsx.tsx | 12 +- .../components/LsxPageList/LsxListView.tsx | 2 +- .../client/components/LsxPageList/LsxPage.tsx | 10 +- packages/ui/package.json | 8 +- packages/ui/src/components/Attachment.tsx | 2 +- packages/ui/src/components/LoadingSpinner.tsx | 2 +- .../src/components/PagePath/PageListMeta.tsx | 2 +- packages/ui/src/components/UserPicture.tsx | 2 +- pnpm-lock.yaml | 2275 +++++++++-------- 357 files changed, 1794 insertions(+), 1527 deletions(-) create mode 100644 apps/app/src/components/FontFamily/.eslintrc.js diff --git a/apps/app/package.json b/apps/app/package.json index 39e5d6fc0a8..acf39c22e12 100644 --- a/apps/app/package.json +++ b/apps/app/package.json @@ -177,12 +177,12 @@ "prop-types": "^15.8.1", "qs": "^6.11.1", "rate-limiter-flexible": "^2.3.7", - "react": "^18.2.0", + "react": "^18.3.0", "react-bootstrap-typeahead": "^6.3.2", "react-card-flip": "^1.0.10", "react-datepicker": "^4.7.0", "react-disable": "^0.1.1", - "react-dom": "^18.2.0", + "react-dom": "^18.3.0", "react-error-boundary": "^3.1.4", "react-i18next": "^15.1.1", "react-image-crop": "^8.3.0", @@ -264,8 +264,8 @@ "@types/ldapjs": "^2.2.5", "@types/mdast": "^4.0.4", "@types/node-cron": "^3.0.11", - "@types/react": "^18.2.14", - "@types/react-dom": "^18.2.6", + "@types/react": "^18.3.0", + "@types/react-dom": "^18.3.0", "@types/react-input-autosize": "^2.2.4", "@types/react-scroll": "^1.8.4", "@types/react-stickynode": "^4.0.3", diff --git a/apps/app/src/client/components/Admin/AdminHome/EnvVarsTable.tsx b/apps/app/src/client/components/Admin/AdminHome/EnvVarsTable.tsx index 1189cbc53a8..b4e059767c1 100644 --- a/apps/app/src/client/components/Admin/AdminHome/EnvVarsTable.tsx +++ b/apps/app/src/client/components/Admin/AdminHome/EnvVarsTable.tsx @@ -5,7 +5,7 @@ type EnvVarsTableProps = { } export const EnvVarsTable: React.FC = (props: EnvVarsTableProps) => { - const envVarRows: JSX.Element[] = []; + const envVarRows: React.ReactElement[] = []; for (const [key, value] of Object.entries(props.envVars)) { if (value != null) { diff --git a/apps/app/src/client/components/Admin/App/AppSetting.jsx b/apps/app/src/client/components/Admin/App/AppSetting.jsx index f6da00f70b7..18f1586bb63 100644 --- a/apps/app/src/client/components/Admin/App/AppSetting.jsx +++ b/apps/app/src/client/components/Admin/App/AppSetting.jsx @@ -40,7 +40,7 @@ const AppSetting = (props) => { { adminAppContainer.changeTitle(e.target.value); }} diff --git a/apps/app/src/client/components/Admin/App/AwsSetting.tsx b/apps/app/src/client/components/Admin/App/AwsSetting.tsx index 71dd2368c17..d97e41c3a90 100644 --- a/apps/app/src/client/components/Admin/App/AwsSetting.tsx +++ b/apps/app/src/client/components/Admin/App/AwsSetting.tsx @@ -15,7 +15,7 @@ export type AwsSettingMoleculeProps = { onChangeS3SecretAccessKey: (val: string) => void }; -export const AwsSettingMolecule = (props: AwsSettingMoleculeProps): JSX.Element => { +export const AwsSettingMolecule = (props: AwsSettingMoleculeProps): React.ReactElement => { const { t } = useTranslation(); return ( diff --git a/apps/app/src/client/components/Admin/App/AzureSetting.tsx b/apps/app/src/client/components/Admin/App/AzureSetting.tsx index bf93e568a4c..3d3ce174a91 100644 --- a/apps/app/src/client/components/Admin/App/AzureSetting.tsx +++ b/apps/app/src/client/components/Admin/App/AzureSetting.tsx @@ -23,7 +23,7 @@ export type AzureSettingMoleculeProps = { onChangeAzureStorageContainerName: (val: string) => void }; -export const AzureSettingMolecule = (props: AzureSettingMoleculeProps): JSX.Element => { +export const AzureSettingMolecule = (props: AzureSettingMoleculeProps): React.ReactElement => { const { t } = useTranslation(); const { diff --git a/apps/app/src/client/components/Admin/App/FileUploadSetting.tsx b/apps/app/src/client/components/Admin/App/FileUploadSetting.tsx index 6928aece3b5..337356edae9 100644 --- a/apps/app/src/client/components/Admin/App/FileUploadSetting.tsx +++ b/apps/app/src/client/components/Admin/App/FileUploadSetting.tsx @@ -26,7 +26,7 @@ type FileUploadSettingMoleculeProps = { onChangeFileUploadType: (e: ChangeEvent, type: string) => void } & AwsSettingMoleculeProps & GcsSettingMoleculeProps & AzureSettingMoleculeProps; -export const FileUploadSettingMolecule = React.memo((props: FileUploadSettingMoleculeProps): JSX.Element => { +export const FileUploadSettingMolecule = React.memo((props: FileUploadSettingMoleculeProps): React.ReactElement => { const { t } = useTranslation(['admin', 'commons']); return ( @@ -136,7 +136,7 @@ type FileUploadSettingProps = { adminAppContainer: AdminAppContainer } -const FileUploadSetting = (props: FileUploadSettingProps): JSX.Element => { +const FileUploadSetting = (props: FileUploadSettingProps): React.ReactElement => { const { t } = useTranslation(['admin', 'commons']); const { adminAppContainer } = props; diff --git a/apps/app/src/client/components/Admin/App/GcsSetting.tsx b/apps/app/src/client/components/Admin/App/GcsSetting.tsx index 53292e6504e..4a7631ead31 100644 --- a/apps/app/src/client/components/Admin/App/GcsSetting.tsx +++ b/apps/app/src/client/components/Admin/App/GcsSetting.tsx @@ -15,7 +15,7 @@ export type GcsSettingMoleculeProps = { onChangeGcsUploadNamespace: (val: string) => void }; -export const GcsSettingMolecule = (props: GcsSettingMoleculeProps): JSX.Element => { +export const GcsSettingMolecule = (props: GcsSettingMoleculeProps): React.ReactElement => { const { t } = useTranslation(); const { diff --git a/apps/app/src/client/components/Admin/App/MaskedInput.tsx b/apps/app/src/client/components/Admin/App/MaskedInput.tsx index 8594785c734..6ef47fac196 100644 --- a/apps/app/src/client/components/Admin/App/MaskedInput.tsx +++ b/apps/app/src/client/components/Admin/App/MaskedInput.tsx @@ -10,7 +10,7 @@ type Props = { tabIndex?: number | undefined }; -export default function MaskedInput(props: Props): JSX.Element { +export default function MaskedInput(props: Props): React.ReactElement { const [passwordShown, setPasswordShown] = useState(false); const togglePassword = () => { setPasswordShown(!passwordShown); diff --git a/apps/app/src/client/components/Admin/App/QuestionnaireSettings.tsx b/apps/app/src/client/components/Admin/App/QuestionnaireSettings.tsx index e3162f75d1d..6e15ddac985 100644 --- a/apps/app/src/client/components/Admin/App/QuestionnaireSettings.tsx +++ b/apps/app/src/client/components/Admin/App/QuestionnaireSettings.tsx @@ -11,7 +11,7 @@ import { useSWRxAppSettings } from '~/stores/admin/app-settings'; import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow'; -const QuestionnaireSettings = (): JSX.Element => { +const QuestionnaireSettings = (): React.ReactElement => { const { t } = useTranslation(['admin', 'commons']); const { data, error, mutate } = useSWRxAppSettings(); diff --git a/apps/app/src/client/components/Admin/Common/AdminInstallButtonRow.tsx b/apps/app/src/client/components/Admin/Common/AdminInstallButtonRow.tsx index 4b08eb30017..f233ba5b29b 100644 --- a/apps/app/src/client/components/Admin/Common/AdminInstallButtonRow.tsx +++ b/apps/app/src/client/components/Admin/Common/AdminInstallButtonRow.tsx @@ -6,7 +6,7 @@ type Props = { } -export const AdminInstallButtonRow = (props: Props): JSX.Element => { +export const AdminInstallButtonRow = (props: Props): React.ReactElement => { return (
diff --git a/apps/app/src/client/components/Admin/Common/AdminUpdateButtonRow.tsx b/apps/app/src/client/components/Admin/Common/AdminUpdateButtonRow.tsx index b55d0bc69d3..75a12794cbe 100644 --- a/apps/app/src/client/components/Admin/Common/AdminUpdateButtonRow.tsx +++ b/apps/app/src/client/components/Admin/Common/AdminUpdateButtonRow.tsx @@ -7,7 +7,7 @@ type Props = { disabled?: boolean, } -const AdminUpdateButtonRow = (props: Props): JSX.Element => { +const AdminUpdateButtonRow = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); return ( diff --git a/apps/app/src/client/components/Admin/Common/LabeledProgressBar.tsx b/apps/app/src/client/components/Admin/Common/LabeledProgressBar.tsx index cfff5887eab..4c98a135e24 100644 --- a/apps/app/src/client/components/Admin/Common/LabeledProgressBar.tsx +++ b/apps/app/src/client/components/Admin/Common/LabeledProgressBar.tsx @@ -9,7 +9,7 @@ type Props = { isInProgress?: boolean, } -const LabeledProgressBar = (props: Props): JSX.Element => { +const LabeledProgressBar = (props: Props): React.ReactElement => { const { header, currentCount, totalCount, isInProgress, } = props; diff --git a/apps/app/src/client/components/Admin/Customize/CustomizeCssSetting.tsx b/apps/app/src/client/components/Admin/Customize/CustomizeCssSetting.tsx index 8d9afa11f1d..601e16b590f 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizeCssSetting.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizeCssSetting.tsx @@ -13,7 +13,7 @@ type Props = { adminCustomizeContainer: AdminCustomizeContainer } -const CustomizeCssSetting = (props: Props): JSX.Element => { +const CustomizeCssSetting = (props: Props): React.ReactElement => { const { adminCustomizeContainer } = props; const { t } = useTranslation(); diff --git a/apps/app/src/client/components/Admin/Customize/CustomizeFunctionOption.tsx b/apps/app/src/client/components/Admin/Customize/CustomizeFunctionOption.tsx index b7c045451d9..a237a691026 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizeFunctionOption.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizeFunctionOption.tsx @@ -8,7 +8,7 @@ type Props = { children: React.ReactNode, } -const CustomizeFunctionOption = (props: Props): JSX.Element => { +const CustomizeFunctionOption = (props: Props): React.ReactElement => { const { optionId, label, isChecked, onChecked, children, diff --git a/apps/app/src/client/components/Admin/Customize/CustomizeFunctionSetting.tsx b/apps/app/src/client/components/Admin/Customize/CustomizeFunctionSetting.tsx index edf66b56d8a..b93036a2d65 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizeFunctionSetting.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizeFunctionSetting.tsx @@ -16,7 +16,7 @@ type Props = { adminCustomizeContainer: AdminCustomizeContainer } -const CustomizeFunctionSetting = (props: Props): JSX.Element => { +const CustomizeFunctionSetting = (props: Props): React.ReactElement => { const { adminCustomizeContainer } = props; const { t } = useTranslation(); diff --git a/apps/app/src/client/components/Admin/Customize/CustomizeLayoutSetting.tsx b/apps/app/src/client/components/Admin/Customize/CustomizeLayoutSetting.tsx index f18f9a23b65..0b26bfa28fe 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizeLayoutSetting.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizeLayoutSetting.tsx @@ -24,7 +24,7 @@ const useIsContainerFluid = () => { }; }; -const CustomizeLayoutSetting = (): JSX.Element => { +const CustomizeLayoutSetting = (): React.ReactElement => { const { t } = useTranslation('admin'); const { resolvedTheme } = useNextThemes(); diff --git a/apps/app/src/client/components/Admin/Customize/CustomizeLogoSetting.tsx b/apps/app/src/client/components/Admin/Customize/CustomizeLogoSetting.tsx index 100e67d8bd2..509cedb80de 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizeLogoSetting.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizeLogoSetting.tsx @@ -15,7 +15,7 @@ import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow'; const DEFAULT_LOGO = '/images/logo.svg'; const CUSTOMIZED_LOGO = '/attachment/brand-logo'; -const CustomizeLogoSetting = (): JSX.Element => { +const CustomizeLogoSetting = (): React.ReactElement => { const { t } = useTranslation(); const { data: isDefaultLogo } = useIsDefaultLogo(); diff --git a/apps/app/src/client/components/Admin/Customize/CustomizeNoscriptSetting.tsx b/apps/app/src/client/components/Admin/Customize/CustomizeNoscriptSetting.tsx index 4b0d1065c6d..0cf22ffc187 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizeNoscriptSetting.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizeNoscriptSetting.tsx @@ -15,7 +15,7 @@ type Props = { adminCustomizeContainer: AdminCustomizeContainer } -const CustomizeNoscriptSetting = (props: Props): JSX.Element => { +const CustomizeNoscriptSetting = (props: Props): React.ReactElement => { const { adminCustomizeContainer } = props; const { t } = useTranslation(); diff --git a/apps/app/src/client/components/Admin/Customize/CustomizePresentationSetting.tsx b/apps/app/src/client/components/Admin/Customize/CustomizePresentationSetting.tsx index 7f9937e8acc..4bafd666435 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizePresentationSetting.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizePresentationSetting.tsx @@ -14,7 +14,7 @@ type Props = { adminCustomizeContainer: AdminCustomizeContainer } -const CustomizePresentationSetting = (props: Props): JSX.Element => { +const CustomizePresentationSetting = (props: Props): React.ReactElement => { const { adminCustomizeContainer } = props; const { t } = useTranslation(); diff --git a/apps/app/src/client/components/Admin/Customize/CustomizeScriptSetting.tsx b/apps/app/src/client/components/Admin/Customize/CustomizeScriptSetting.tsx index 8a4a7781ed8..f4d31e3a74a 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizeScriptSetting.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizeScriptSetting.tsx @@ -15,7 +15,7 @@ type Props = { adminCustomizeContainer: AdminCustomizeContainer } -const CustomizeScriptSetting = (props: Props): JSX.Element => { +const CustomizeScriptSetting = (props: Props): React.ReactElement => { const { adminCustomizeContainer } = props; const { t } = useTranslation(); diff --git a/apps/app/src/client/components/Admin/Customize/CustomizeSidebarSetting.tsx b/apps/app/src/client/components/Admin/Customize/CustomizeSidebarSetting.tsx index 8454f861e14..a5cf0fc9f73 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizeSidebarSetting.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizeSidebarSetting.tsx @@ -8,7 +8,7 @@ import { toastSuccess, toastError } from '~/client/util/toastr'; import { useNextThemes } from '~/stores-universal/use-next-themes'; import { useSWRxSidebarConfig } from '~/stores/admin/sidebar-config'; -const CustomizeSidebarsetting = (): JSX.Element => { +const CustomizeSidebarsetting = (): React.ReactElement => { const { t } = useTranslation(['admin', 'commons']); const { diff --git a/apps/app/src/client/components/Admin/Customize/CustomizeThemeOptions.tsx b/apps/app/src/client/components/Admin/Customize/CustomizeThemeOptions.tsx index 512108a89ea..922827d7aff 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizeThemeOptions.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizeThemeOptions.tsx @@ -12,7 +12,7 @@ type Props = { onSelected?: (themeName: string) => void, }; -const CustomizeThemeOptions = (props: Props): JSX.Element => { +const CustomizeThemeOptions = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); const { availableThemes, selectedTheme, onSelected } = props; diff --git a/apps/app/src/client/components/Admin/Customize/CustomizeThemeSetting.tsx b/apps/app/src/client/components/Admin/Customize/CustomizeThemeSetting.tsx index a1ae3d8b666..ba8f707c1a3 100644 --- a/apps/app/src/client/components/Admin/Customize/CustomizeThemeSetting.tsx +++ b/apps/app/src/client/components/Admin/Customize/CustomizeThemeSetting.tsx @@ -16,7 +16,7 @@ type Props = { } // eslint-disable-next-line @typescript-eslint/no-unused-vars -const CustomizeThemeSetting = (props: Props): JSX.Element => { +const CustomizeThemeSetting = (props: Props): React.ReactElement => { const { t } = useTranslation(); const { data, error, update } = useSWRxGrowiThemeSetting(); diff --git a/apps/app/src/client/components/Admin/Customize/ThemeColorBox.tsx b/apps/app/src/client/components/Admin/Customize/ThemeColorBox.tsx index 9b3323a9a24..daa2bc419e6 100644 --- a/apps/app/src/client/components/Admin/Customize/ThemeColorBox.tsx +++ b/apps/app/src/client/components/Admin/Customize/ThemeColorBox.tsx @@ -13,7 +13,7 @@ type Props = { onSelected?: () => void, }; -export const ThemeColorBox = (props: Props): JSX.Element => { +export const ThemeColorBox = (props: Props): React.ReactElement => { const { isSelected, metadata, onSelected, diff --git a/apps/app/src/client/components/Admin/ElasticsearchManagement/NormalizeIndicesControls.tsx b/apps/app/src/client/components/Admin/ElasticsearchManagement/NormalizeIndicesControls.tsx index f704024518f..e49ab01ac67 100644 --- a/apps/app/src/client/components/Admin/ElasticsearchManagement/NormalizeIndicesControls.tsx +++ b/apps/app/src/client/components/Admin/ElasticsearchManagement/NormalizeIndicesControls.tsx @@ -8,7 +8,7 @@ type Props = { isNormalized?: boolean, } -const NormalizeIndicesControls = (props: Props): JSX.Element => { +const NormalizeIndicesControls = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); const { isNormalized, isRebuildingProcessing } = props; diff --git a/apps/app/src/client/components/Admin/ElasticsearchManagement/ReconnectControls.tsx b/apps/app/src/client/components/Admin/ElasticsearchManagement/ReconnectControls.tsx index 2f0944ab216..86cce98aebc 100644 --- a/apps/app/src/client/components/Admin/ElasticsearchManagement/ReconnectControls.tsx +++ b/apps/app/src/client/components/Admin/ElasticsearchManagement/ReconnectControls.tsx @@ -10,7 +10,7 @@ type Props = { onReconnectingRequested: () => void, } -const ReconnectControls = (props: Props): JSX.Element => { +const ReconnectControls = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); const { isEnabled, isProcessing } = props; diff --git a/apps/app/src/client/components/Admin/ExportArchiveData/ArchiveFilesTable.tsx b/apps/app/src/client/components/Admin/ExportArchiveData/ArchiveFilesTable.tsx index 412d098d85c..0477f1366bf 100644 --- a/apps/app/src/client/components/Admin/ExportArchiveData/ArchiveFilesTable.tsx +++ b/apps/app/src/client/components/Admin/ExportArchiveData/ArchiveFilesTable.tsx @@ -10,7 +10,7 @@ type ArchiveFilesTableProps = { onZipFileStatRemove: (fileName: string) => void, } -const ArchiveFilesTable = (props: ArchiveFilesTableProps): JSX.Element => { +const ArchiveFilesTable = (props: ArchiveFilesTableProps): React.ReactElement => { const { t } = useTranslation(); return ( diff --git a/apps/app/src/client/components/Admin/ExportArchiveData/ArchiveFilesTableMenu.tsx b/apps/app/src/client/components/Admin/ExportArchiveData/ArchiveFilesTableMenu.tsx index d3be6ca4db5..45b1c41b515 100644 --- a/apps/app/src/client/components/Admin/ExportArchiveData/ArchiveFilesTableMenu.tsx +++ b/apps/app/src/client/components/Admin/ExportArchiveData/ArchiveFilesTableMenu.tsx @@ -9,7 +9,7 @@ type ArchiveFilesTableMenuProps = { onZipFileStatRemove: (fileName: string) => void, } -const ArchiveFilesTableMenu = (props: ArchiveFilesTableMenuProps):JSX.Element => { +const ArchiveFilesTableMenu = (props: ArchiveFilesTableMenuProps): React.ReactElement => { const { t } = useTranslation(); return ( diff --git a/apps/app/src/client/components/Admin/ExportArchiveData/SelectCollectionsModal.tsx b/apps/app/src/client/components/Admin/ExportArchiveData/SelectCollectionsModal.tsx index 641848bbba3..cdb8e8865e9 100644 --- a/apps/app/src/client/components/Admin/ExportArchiveData/SelectCollectionsModal.tsx +++ b/apps/app/src/client/components/Admin/ExportArchiveData/SelectCollectionsModal.tsx @@ -32,7 +32,7 @@ type Props = { isAllChecked?: boolean, }; -const SelectCollectionsModal = (props: Props): JSX.Element => { +const SelectCollectionsModal = (props: Props): React.ReactElement => { const { t } = useTranslation(); const { diff --git a/apps/app/src/client/components/Admin/ExportArchiveDataPage.tsx b/apps/app/src/client/components/Admin/ExportArchiveDataPage.tsx index 2632dfb7c12..8856d6cbbcb 100644 --- a/apps/app/src/client/components/Admin/ExportArchiveDataPage.tsx +++ b/apps/app/src/client/components/Admin/ExportArchiveDataPage.tsx @@ -17,7 +17,7 @@ const IGNORED_COLLECTION_NAMES = [ 'sessions', 'rlflx', 'yjs-writings', 'transferkeys', ]; -const ExportArchiveDataPage = (): JSX.Element => { +const ExportArchiveDataPage = (): React.ReactElement => { const { data: socket } = useAdminSocket(); const { t } = useTranslation('admin'); diff --git a/apps/app/src/client/components/Admin/ForbiddenPage.tsx b/apps/app/src/client/components/Admin/ForbiddenPage.tsx index 23f3a6245c8..81d3ca1b092 100644 --- a/apps/app/src/client/components/Admin/ForbiddenPage.tsx +++ b/apps/app/src/client/components/Admin/ForbiddenPage.tsx @@ -4,7 +4,7 @@ import DefaultErrorPage from 'next/error'; import { useTranslation } from 'react-i18next'; -export const ForbiddenPage = (): JSX.Element => { +export const ForbiddenPage = (): React.ReactElement => { const { t } = useTranslation('admin'); const errorMessage = t('forbidden_page.do_not_have_admin_permission'); diff --git a/apps/app/src/client/components/Admin/FullTextSearchManagement.tsx b/apps/app/src/client/components/Admin/FullTextSearchManagement.tsx index dc34c0d1fa9..66d28293166 100644 --- a/apps/app/src/client/components/Admin/FullTextSearchManagement.tsx +++ b/apps/app/src/client/components/Admin/FullTextSearchManagement.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'next-i18next'; import ElasticsearchManagement from './ElasticsearchManagement/ElasticsearchManagement'; -export const FullTextSearchManagement = (): JSX.Element => { +export const FullTextSearchManagement = (): React.ReactElement => { const { t } = useTranslation('admin'); return ( diff --git a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx index 8f1e1a12f6b..66a1e03852e 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx @@ -21,7 +21,7 @@ const IGNORED_COLLECTION_NAMES = [ 'sessions', 'rlflx', 'activities', 'attachmentFiles.files', 'attachmentFiles.chunks', ]; -const G2GDataTransfer = (): JSX.Element => { +const G2GDataTransfer = (): React.ReactElement => { const { data: socket } = useAdminSocket(); const { t } = useTranslation(['admin', 'commons']); diff --git a/apps/app/src/client/components/Admin/G2GDataTransferExportForm.tsx b/apps/app/src/client/components/Admin/G2GDataTransferExportForm.tsx index c9e6917fed7..d9bc5d0e6b0 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransferExportForm.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransferExportForm.tsx @@ -35,7 +35,7 @@ type Props = { updateOptionsMap: (newOptionsMap: any) => void, }; -const G2GDataTransferExportForm = (props: Props): JSX.Element => { +const G2GDataTransferExportForm = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); const { @@ -66,7 +66,7 @@ const G2GDataTransferExportForm = (props: Props): JSX.Element => { }); }, [optionsMap, updateOptionsMap]); - const ImportItems = ({ collectionNames }): JSX.Element => { + const ImportItems = ({ collectionNames }): React.ReactElement => { const toggleCheckbox = (collectionName, bool) => { const collections = new Set(selectedCollections); if (bool) { @@ -122,7 +122,7 @@ const G2GDataTransferExportForm = (props: Props): JSX.Element => { ); }; - const WarnForGroups = ({ errors }: { errors: Error[] }): JSX.Element => { + const WarnForGroups = ({ errors }: { errors: Error[] }): React.ReactElement => { if (errors.length === 0) { return <>; } @@ -138,7 +138,7 @@ const G2GDataTransferExportForm = (props: Props): JSX.Element => { ); }; - const GroupImportItems = ({ groupList, groupName, errors }): JSX.Element => { + const GroupImportItems = ({ groupList, groupName, errors }): React.ReactElement => { const collectionNames = groupList.filter((groupCollectionName) => { return allCollectionNames.includes(groupCollectionName); }); @@ -156,7 +156,7 @@ const G2GDataTransferExportForm = (props: Props): JSX.Element => { ); }; - const OtherImportItems = (): JSX.Element => { + const OtherImportItems = (): React.ReactElement => { const collectionNames = allCollectionNames.filter((collectionName) => { return !ALL_GROUPED_COLLECTIONS.includes(collectionName); }); diff --git a/apps/app/src/client/components/Admin/G2GDataTransferStatusIcon.tsx b/apps/app/src/client/components/Admin/G2GDataTransferStatusIcon.tsx index de4e0d803c6..83a8894f9d0 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransferStatusIcon.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransferStatusIcon.tsx @@ -15,7 +15,7 @@ interface Props extends ComponentPropsWithoutRef<'span'>{ /** * Icon for G2G transfer status */ -const G2GDataTransferStatusIcon = ({ status, className, ...props }: Props): JSX.Element => { +const G2GDataTransferStatusIcon = ({ status, className, ...props }: Props): React.ReactElement => { if (status === G2G_PROGRESS_STATUS.IN_PROGRESS) { return ( diff --git a/apps/app/src/client/components/Admin/ImportData/GrowiArchive/ErrorViewer.tsx b/apps/app/src/client/components/Admin/ImportData/GrowiArchive/ErrorViewer.tsx index ecb61000120..db24eb88145 100644 --- a/apps/app/src/client/components/Admin/ImportData/GrowiArchive/ErrorViewer.tsx +++ b/apps/app/src/client/components/Admin/ImportData/GrowiArchive/ErrorViewer.tsx @@ -8,7 +8,7 @@ type ErrorViewerProps = { onClose: () => void, } -const ErrorViewer = (props: ErrorViewerProps): JSX.Element => { +const ErrorViewer = (props: ErrorViewerProps): React.ReactElement => { const { errors } = props; let value = '(no errors)'; diff --git a/apps/app/src/client/components/Admin/ManageExternalAccount.tsx b/apps/app/src/client/components/Admin/ManageExternalAccount.tsx index 0e753445593..7e9b984455d 100644 --- a/apps/app/src/client/components/Admin/ManageExternalAccount.tsx +++ b/apps/app/src/client/components/Admin/ManageExternalAccount.tsx @@ -15,7 +15,7 @@ type ManageExternalAccountProps = { adminExternalAccountsContainer: AdminExternalAccountsContainer, } -const ManageExternalAccount = (props: ManageExternalAccountProps): JSX.Element => { +const ManageExternalAccount = (props: ManageExternalAccountProps): React.ReactElement => { const { t } = useTranslation(); const { adminExternalAccountsContainer } = props; diff --git a/apps/app/src/client/components/Admin/MarkdownSetting/MarkDownSettingContents.tsx b/apps/app/src/client/components/Admin/MarkdownSetting/MarkDownSettingContents.tsx index 3e68301e94d..4c1e626c747 100644 --- a/apps/app/src/client/components/Admin/MarkdownSetting/MarkDownSettingContents.tsx +++ b/apps/app/src/client/components/Admin/MarkdownSetting/MarkDownSettingContents.tsx @@ -20,7 +20,7 @@ type Props ={ adminMarkDownContainer: AdminMarkDownContainer } -const MarkDownSettingContents = React.memo((props: Props): JSX.Element => { +const MarkDownSettingContents = React.memo((props: Props): React.ReactElement => { const { t } = useTranslation('admin'); const { adminMarkDownContainer } = props; diff --git a/apps/app/src/client/components/Admin/MarkdownSetting/WhitelistInput.tsx b/apps/app/src/client/components/Admin/MarkdownSetting/WhitelistInput.tsx index c5bb6d670af..79979aec259 100644 --- a/apps/app/src/client/components/Admin/MarkdownSetting/WhitelistInput.tsx +++ b/apps/app/src/client/components/Admin/MarkdownSetting/WhitelistInput.tsx @@ -9,7 +9,7 @@ type Props ={ adminMarkDownContainer: AdminMarkDownContainer } -export const WhitelistInput = (props: Props): JSX.Element => { +export const WhitelistInput = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); const { adminMarkDownContainer } = props; diff --git a/apps/app/src/client/components/Admin/NotFoundPage.tsx b/apps/app/src/client/components/Admin/NotFoundPage.tsx index c8438c179d3..4c9563d5ac2 100644 --- a/apps/app/src/client/components/Admin/NotFoundPage.tsx +++ b/apps/app/src/client/components/Admin/NotFoundPage.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { useTranslation } from 'next-i18next'; -export const AdminNotFoundPage = (): JSX.Element => { +export const AdminNotFoundPage = (): React.ReactElement => { const { t } = useTranslation('commons'); return ( diff --git a/apps/app/src/client/components/Admin/Notification/ManageGlobalNotification.tsx b/apps/app/src/client/components/Admin/Notification/ManageGlobalNotification.tsx index a26e2c52690..6bcbfa432d8 100644 --- a/apps/app/src/client/components/Admin/Notification/ManageGlobalNotification.tsx +++ b/apps/app/src/client/components/Admin/Notification/ManageGlobalNotification.tsx @@ -26,7 +26,7 @@ type Props = { globalNotificationId?: string, } -const ManageGlobalNotification = (props: Props): JSX.Element => { +const ManageGlobalNotification = (props: Props): React.ReactElement => { const [triggerPath, setTriggerPath] = useState(''); const [notifyType, setNotifyType] = useState(NotifyType.Email); diff --git a/apps/app/src/client/components/Admin/Notification/NotificationTypeIcon.tsx b/apps/app/src/client/components/Admin/Notification/NotificationTypeIcon.tsx index 4e814de1fd9..3ee9628fa50 100644 --- a/apps/app/src/client/components/Admin/Notification/NotificationTypeIcon.tsx +++ b/apps/app/src/client/components/Admin/Notification/NotificationTypeIcon.tsx @@ -12,7 +12,7 @@ type NotificationTypeIconProps = { notification: INotificationType } -export const NotificationTypeIcon = (props: NotificationTypeIconProps): JSX.Element => { +export const NotificationTypeIcon = (props: NotificationTypeIconProps): React.ReactElement => { const { __t, _id, provider } = props.notification; const type = __t != null && __t === 'mail' ? 'mail' : 'slack'; diff --git a/apps/app/src/client/components/Admin/Security/LdapAuthTest.tsx b/apps/app/src/client/components/Admin/Security/LdapAuthTest.tsx index 3c47f8faabf..4a55df3ea5a 100644 --- a/apps/app/src/client/components/Admin/Security/LdapAuthTest.tsx +++ b/apps/app/src/client/components/Admin/Security/LdapAuthTest.tsx @@ -16,7 +16,7 @@ type LdapAuthTestProps = { onChangePassword: (password: string) => void, } -export const LdapAuthTest = (props: LdapAuthTestProps): JSX.Element => { +export const LdapAuthTest = (props: LdapAuthTestProps): React.ReactElement => { const { username, password, onChangeUsername, onChangePassword, } = props; diff --git a/apps/app/src/client/components/Admin/Security/SamlSecuritySettingContents.jsx b/apps/app/src/client/components/Admin/Security/SamlSecuritySettingContents.jsx index dd292e23cb5..55024e60ac7 100644 --- a/apps/app/src/client/components/Admin/Security/SamlSecuritySettingContents.jsx +++ b/apps/app/src/client/components/Admin/Security/SamlSecuritySettingContents.jsx @@ -486,11 +486,10 @@ pWVdnzS1VCO8fKsJ7YYIr+JmHvseph3kFUOI5RqkCcMZlKUv83aUThsTHw== aria-expanded="true" aria-controls="ablchelp" > - {this.state.isHelpOpened ? 'expand_more' : 'chevron_right'} - Show more... + + {this.state.isHelpOpened ? 'expand_more' : 'chevron_right'} + + Show more... diff --git a/apps/app/src/client/components/Admin/SlackIntegration/BotTypeCard.tsx b/apps/app/src/client/components/Admin/SlackIntegration/BotTypeCard.tsx index 04723c90631..e18f89e8227 100644 --- a/apps/app/src/client/components/Admin/SlackIntegration/BotTypeCard.tsx +++ b/apps/app/src/client/components/Admin/SlackIntegration/BotTypeCard.tsx @@ -36,7 +36,7 @@ type BotTypeCardProps = { onBotTypeSelectHandler: (botType: SlackbotType) => void, }; -export const BotTypeCard = (props: BotTypeCardProps): JSX.Element => { +export const BotTypeCard = (props: BotTypeCardProps): React.ReactElement => { const { t } = useTranslation(); const { isActive, botType, onBotTypeSelectHandler } = props; diff --git a/apps/app/src/client/components/Admin/SlackIntegration/Bridge.tsx b/apps/app/src/client/components/Admin/SlackIntegration/Bridge.tsx index 4cc8da144d6..3a19b859856 100644 --- a/apps/app/src/client/components/Admin/SlackIntegration/Bridge.tsx +++ b/apps/app/src/client/components/Admin/SlackIntegration/Bridge.tsx @@ -18,7 +18,7 @@ type BridgeCoreProps = { hrClass: string, withProxy?: boolean, } -const BridgeCore = (props: BridgeCoreProps): JSX.Element => { +const BridgeCore = (props: BridgeCoreProps): React.ReactElement => { const { description, iconClass, iconName, hrClass, withProxy, } = props; @@ -55,7 +55,7 @@ type BridgeProps = { totalCount: number, withProxy?: boolean, } -export const Bridge = (props: BridgeProps): JSX.Element => { +export const Bridge = (props: BridgeProps): React.ReactElement => { const { t } = useTranslation(); const { errorCount, totalCount, withProxy } = props; diff --git a/apps/app/src/client/components/Admin/SlackIntegration/CustomBotWithProxyConnectionStatus.tsx b/apps/app/src/client/components/Admin/SlackIntegration/CustomBotWithProxyConnectionStatus.tsx index c1a9f89b667..245e4bc4e0d 100644 --- a/apps/app/src/client/components/Admin/SlackIntegration/CustomBotWithProxyConnectionStatus.tsx +++ b/apps/app/src/client/components/Admin/SlackIntegration/CustomBotWithProxyConnectionStatus.tsx @@ -11,7 +11,7 @@ type CustomBotWithProxyConnectionStatusProps = { connectionStatuses: any, } -export const CustomBotWithProxyConnectionStatus = (props: CustomBotWithProxyConnectionStatusProps): JSX.Element => { +export const CustomBotWithProxyConnectionStatus = (props: CustomBotWithProxyConnectionStatusProps): React.ReactElement => { const { siteName, connectionStatuses } = props; const connectionStatusValues: ConnectionStatus[] = Object.values(connectionStatuses); diff --git a/apps/app/src/client/components/Admin/SlackIntegration/CustomBotWithoutProxyConnectionStatus.tsx b/apps/app/src/client/components/Admin/SlackIntegration/CustomBotWithoutProxyConnectionStatus.tsx index 0eb8f95be8d..b948f5dc00b 100644 --- a/apps/app/src/client/components/Admin/SlackIntegration/CustomBotWithoutProxyConnectionStatus.tsx +++ b/apps/app/src/client/components/Admin/SlackIntegration/CustomBotWithoutProxyConnectionStatus.tsx @@ -10,7 +10,7 @@ type CustomBotWithoutProxyConnectionStatusProps = { connectionStatuses: any, } -export const CustomBotWithoutProxyConnectionStatus = (props: CustomBotWithoutProxyConnectionStatusProps): JSX.Element => { +export const CustomBotWithoutProxyConnectionStatus = (props: CustomBotWithoutProxyConnectionStatusProps): React.ReactElement => { const { siteName, connectionStatuses } = props; const connectionStatusValues: ConnectionStatus[] = Object.values(connectionStatuses); diff --git a/apps/app/src/client/components/Admin/SlackIntegration/SlackAppIntegrationControl.tsx b/apps/app/src/client/components/Admin/SlackIntegration/SlackAppIntegrationControl.tsx index ea881245461..8f504f65ab7 100644 --- a/apps/app/src/client/components/Admin/SlackIntegration/SlackAppIntegrationControl.tsx +++ b/apps/app/src/client/components/Admin/SlackIntegration/SlackAppIntegrationControl.tsx @@ -10,7 +10,7 @@ type Props = { onDeleteButtonClicked?: (slackAppIntegration: unknown) => void, } -export const SlackAppIntegrationControl = (props: Props): JSX.Element => { +export const SlackAppIntegrationControl = (props: Props): React.ReactElement => { const { t } = useTranslation(); const { slackAppIntegration, onIsPrimaryChanged, onDeleteButtonClicked } = props; diff --git a/apps/app/src/client/components/Admin/SlackIntegration/SlackIntegration.tsx b/apps/app/src/client/components/Admin/SlackIntegration/SlackIntegration.tsx index 0e217c84430..0d6c57f4aab 100644 --- a/apps/app/src/client/components/Admin/SlackIntegration/SlackIntegration.tsx +++ b/apps/app/src/client/components/Admin/SlackIntegration/SlackIntegration.tsx @@ -20,7 +20,7 @@ import OfficialBotSettings from './OfficialBotSettings'; const botTypes = Object.values(SlackbotType); -export const SlackIntegration = (): JSX.Element => { +export const SlackIntegration = (): React.ReactElement => { const { t } = useTranslation(); const [currentBotType, setCurrentBotType] = useState(); diff --git a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx index 74b3652bc72..4812aa80c14 100644 --- a/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroup/UserGroupTable.tsx @@ -64,7 +64,7 @@ type UserGroupEditLinkProps = { isExternalGroup:boolean, } -const UserGroupEditLink = (props: UserGroupEditLinkProps): JSX.Element => { +const UserGroupEditLink = (props: UserGroupEditLinkProps): React.ReactElement => { return ( { +const UserGroupDetailPage = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); const router = useRouter(); const { userGroupId: currentUserGroupId, isExternalGroup } = props; diff --git a/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupPageList.tsx b/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupPageList.tsx index e22c9115e9a..60eae2bde39 100644 --- a/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupPageList.tsx +++ b/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupPageList.tsx @@ -16,7 +16,7 @@ type Props = { relatedPages?: IPageHasId[], } -const UserGroupPageList = (props: Props): JSX.Element => { +const UserGroupPageList = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); const { userGroupId, relatedPages } = props; diff --git a/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupUserModal.tsx b/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupUserModal.tsx index 2e23675bf8d..f3befea3c12 100644 --- a/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupUserModal.tsx +++ b/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupUserModal.tsx @@ -27,7 +27,7 @@ type Props = { onToggleIsAlsoNameSearched: () => void, } -const UserGroupUserModal = (props: Props): JSX.Element => { +const UserGroupUserModal = (props: Props): React.ReactElement => { const { t } = useTranslation(); const { isOpen, diff --git a/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupUserTable.tsx b/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupUserTable.tsx index 6132531bcdf..6f45b546232 100644 --- a/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupUserTable.tsx +++ b/apps/app/src/client/components/Admin/UserGroupDetail/UserGroupUserTable.tsx @@ -13,7 +13,7 @@ type Props = { isExternalGroup?: boolean } -export const UserGroupUserTable = (props: Props): JSX.Element => { +export const UserGroupUserTable = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); return ( diff --git a/apps/app/src/client/components/Admin/Users/ExternalAccountTable.tsx b/apps/app/src/client/components/Admin/Users/ExternalAccountTable.tsx index 81c514bcc62..c8df2a553df 100644 --- a/apps/app/src/client/components/Admin/Users/ExternalAccountTable.tsx +++ b/apps/app/src/client/components/Admin/Users/ExternalAccountTable.tsx @@ -15,7 +15,7 @@ type ExternalAccountTableProps = { adminExternalAccountsContainer: AdminExternalAccountsContainer, } -const ExternalAccountTable = (props: ExternalAccountTableProps): JSX.Element => { +const ExternalAccountTable = (props: ExternalAccountTableProps): React.ReactElement => { const { t } = useTranslation('admin'); diff --git a/apps/app/src/client/components/Admin/Users/GrantAdminButton.tsx b/apps/app/src/client/components/Admin/Users/GrantAdminButton.tsx index fd8ce680826..9c152ab066a 100644 --- a/apps/app/src/client/components/Admin/Users/GrantAdminButton.tsx +++ b/apps/app/src/client/components/Admin/Users/GrantAdminButton.tsx @@ -13,7 +13,7 @@ type GrantAdminButtonProps = { user: IUserHasId, } -const GrantAdminButton = (props: GrantAdminButtonProps): JSX.Element => { +const GrantAdminButton = (props: GrantAdminButtonProps): React.ReactElement => { const { t } = useTranslation('admin'); const { adminUsersContainer, user } = props; diff --git a/apps/app/src/client/components/Admin/Users/GrantReadOnlyButton.tsx b/apps/app/src/client/components/Admin/Users/GrantReadOnlyButton.tsx index aa80d3187b3..5b7e4dafa26 100644 --- a/apps/app/src/client/components/Admin/Users/GrantReadOnlyButton.tsx +++ b/apps/app/src/client/components/Admin/Users/GrantReadOnlyButton.tsx @@ -11,7 +11,7 @@ import { withUnstatedContainers } from '../../UnstatedUtils'; const GrantReadOnlyButton: React.FC<{ adminUsersContainer: AdminUsersContainer, user: IUserHasId, -}> = ({ adminUsersContainer, user }): JSX.Element => { +}> = ({ adminUsersContainer, user }): React.ReactElement => { const { t } = useTranslation('admin'); const onClickGrantReadOnlyBtnHandler = useCallback(async() => { diff --git a/apps/app/src/client/components/Admin/Users/RevokeAdminButton.tsx b/apps/app/src/client/components/Admin/Users/RevokeAdminButton.tsx index 040356025da..519937cf0d0 100644 --- a/apps/app/src/client/components/Admin/Users/RevokeAdminButton.tsx +++ b/apps/app/src/client/components/Admin/Users/RevokeAdminButton.tsx @@ -14,7 +14,7 @@ type RevokeAdminButtonProps = { user: IUserHasId, } -const RevokeAdminButton = (props: RevokeAdminButtonProps): JSX.Element => { +const RevokeAdminButton = (props: RevokeAdminButtonProps): React.ReactElement => { const { t } = useTranslation('admin'); const { data: currentUser } = useCurrentUser(); diff --git a/apps/app/src/client/components/Admin/Users/RevokeAdminMenuItem.tsx b/apps/app/src/client/components/Admin/Users/RevokeAdminMenuItem.tsx index bdf2c943c81..c170bfcd114 100644 --- a/apps/app/src/client/components/Admin/Users/RevokeAdminMenuItem.tsx +++ b/apps/app/src/client/components/Admin/Users/RevokeAdminMenuItem.tsx @@ -10,7 +10,7 @@ import { useCurrentUser } from '~/stores-universal/context'; import { withUnstatedContainers } from '../../UnstatedUtils'; -const RevokeAdminAlert = React.memo((): JSX.Element => { +const RevokeAdminAlert = React.memo((): React.ReactElement => { const { t } = useTranslation(); return ( @@ -28,7 +28,7 @@ type Props = { user: IUserHasId, } -const RevokeAdminMenuItem = (props: Props): JSX.Element => { +const RevokeAdminMenuItem = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); const { adminUsersContainer, user } = props; diff --git a/apps/app/src/client/components/Admin/Users/RevokeReadOnlyMenuItem.tsx b/apps/app/src/client/components/Admin/Users/RevokeReadOnlyMenuItem.tsx index 3e6124c15ab..659a3c73874 100644 --- a/apps/app/src/client/components/Admin/Users/RevokeReadOnlyMenuItem.tsx +++ b/apps/app/src/client/components/Admin/Users/RevokeReadOnlyMenuItem.tsx @@ -11,7 +11,7 @@ import { withUnstatedContainers } from '../../UnstatedUtils'; const RevokeReadOnlyMenuItem: React.FC<{ adminUsersContainer: AdminUsersContainer, user: IUserHasId, -}> = ({ adminUsersContainer, user }): JSX.Element => { +}> = ({ adminUsersContainer, user }): React.ReactElement => { const { t } = useTranslation('admin'); const clickRevokeReadOnlyBtnHandler = useCallback(async() => { diff --git a/apps/app/src/client/components/Admin/Users/SortIcons.tsx b/apps/app/src/client/components/Admin/Users/SortIcons.tsx index dc9144c7ecd..58cb7608afe 100644 --- a/apps/app/src/client/components/Admin/Users/SortIcons.tsx +++ b/apps/app/src/client/components/Admin/Users/SortIcons.tsx @@ -6,7 +6,7 @@ type SortIconsProps = { isAsc: boolean, } -export const SortIcons = (props: SortIconsProps): JSX.Element => { +export const SortIcons = (props: SortIconsProps): React.ReactElement => { const { onClick, isSelected, isAsc } = props; diff --git a/apps/app/src/client/components/Admin/Users/StatusSuspendMenuItem.tsx b/apps/app/src/client/components/Admin/Users/StatusSuspendMenuItem.tsx index 27ef89429f7..448e6eacbf7 100644 --- a/apps/app/src/client/components/Admin/Users/StatusSuspendMenuItem.tsx +++ b/apps/app/src/client/components/Admin/Users/StatusSuspendMenuItem.tsx @@ -9,7 +9,7 @@ import { toastSuccess, toastError } from '~/client/util/toastr'; import { useCurrentUser } from '~/stores-universal/context'; -const SuspendAlert = React.memo((): JSX.Element => { +const SuspendAlert = React.memo((): React.ReactElement => { const { t } = useTranslation(); return ( @@ -27,7 +27,7 @@ type Props = { user: IUserHasId, } -const StatusSuspendMenuItem = (props: Props): JSX.Element => { +const StatusSuspendMenuItem = (props: Props): React.ReactElement => { const { t } = useTranslation('admin'); const { adminUsersContainer, user } = props; diff --git a/apps/app/src/client/components/AlertSiteUrlUndefined.tsx b/apps/app/src/client/components/AlertSiteUrlUndefined.tsx index b3f3258b066..d61eb402a60 100644 --- a/apps/app/src/client/components/AlertSiteUrlUndefined.tsx +++ b/apps/app/src/client/components/AlertSiteUrlUndefined.tsx @@ -13,7 +13,7 @@ const isValidUrl = (str: string): boolean => { } }; -export const AlertSiteUrlUndefined = (): JSX.Element => { +export const AlertSiteUrlUndefined = (): React.ReactElement => { const { t } = useTranslation('commons'); const { data: siteUrl, error: errorSiteUrl } = useSiteUrl(); const isLoadingSiteUrl = siteUrl === undefined && errorSiteUrl === undefined; diff --git a/apps/app/src/client/components/AuthorInfo/AuthorInfo.tsx b/apps/app/src/client/components/AuthorInfo/AuthorInfo.tsx index ca48c170596..2cef21a5a6a 100644 --- a/apps/app/src/client/components/AuthorInfo/AuthorInfo.tsx +++ b/apps/app/src/client/components/AuthorInfo/AuthorInfo.tsx @@ -1,7 +1,9 @@ import React from 'react'; -import type { IUserHasId } from '@growi/core'; -import { isPopulated, type IUser, type Ref } from '@growi/core'; +import { + isPopulated, + type IUser, type Ref, type IUserHasId, +} from '@growi/core'; import { pagePathUtils } from '@growi/core/dist/utils'; import { UserPicture } from '@growi/ui/dist/components'; import { format } from 'date-fns/format'; @@ -11,7 +13,7 @@ import Link from 'next/link'; import styles from './AuthorInfo.module.scss'; -const UserLabel = ({ user }: { user: IUserHasId | Ref }): JSX.Element => { +const UserLabel = ({ user }: { user: IUserHasId | Ref }): React.ReactElement => { if (isPopulated(user)) { return ( @@ -31,7 +33,7 @@ type AuthorInfoProps = { locate: 'subnav' | 'footer', } -export const AuthorInfo = (props: AuthorInfoProps): JSX.Element => { +export const AuthorInfo = (props: AuthorInfoProps): React.ReactElement => { const { t } = useTranslation(); const { date, user, mode = 'create', locate = 'subnav', diff --git a/apps/app/src/client/components/Bookmarks/BookmarkFolderItemControl.tsx b/apps/app/src/client/components/Bookmarks/BookmarkFolderItemControl.tsx index 7e92e6643c5..288caf4fba2 100644 --- a/apps/app/src/client/components/Bookmarks/BookmarkFolderItemControl.tsx +++ b/apps/app/src/client/components/Bookmarks/BookmarkFolderItemControl.tsx @@ -15,7 +15,7 @@ export const BookmarkFolderItemControl: React.FC<{ onClickMoveToRoot, onClickRename, onClickDelete, -}): JSX.Element => { +}): React.ReactElement => { const { t } = useTranslation(); const [isOpen, setIsOpen] = useState(false); diff --git a/apps/app/src/client/components/Bookmarks/BookmarkFolderMenu.tsx b/apps/app/src/client/components/Bookmarks/BookmarkFolderMenu.tsx index 95eb5a10e21..25836173e5f 100644 --- a/apps/app/src/client/components/Bookmarks/BookmarkFolderMenu.tsx +++ b/apps/app/src/client/components/Bookmarks/BookmarkFolderMenu.tsx @@ -23,7 +23,7 @@ type BookmarkFolderMenuProps = { children?: React.ReactNode, } -export const BookmarkFolderMenu = (props: BookmarkFolderMenuProps): JSX.Element => { +export const BookmarkFolderMenu = (props: BookmarkFolderMenuProps): React.ReactElement => { const { isOpen, pageId, isBookmarked, onToggle, onUnbookmark, children, } = props; diff --git a/apps/app/src/client/components/Bookmarks/BookmarkFolderNameInput.tsx b/apps/app/src/client/components/Bookmarks/BookmarkFolderNameInput.tsx index 3094321d947..a37c80469ce 100644 --- a/apps/app/src/client/components/Bookmarks/BookmarkFolderNameInput.tsx +++ b/apps/app/src/client/components/Bookmarks/BookmarkFolderNameInput.tsx @@ -15,7 +15,7 @@ import type { SubmittableInputProps } from '../Common/SubmittableInput/types'; type Props = Pick, 'value' | 'onSubmit' | 'onCancel'>; -export const BookmarkFolderNameInput = (props: Props): JSX.Element => { +export const BookmarkFolderNameInput = (props: Props): React.ReactElement => { const { t } = useTranslation(); const { value, onSubmit, onCancel } = props; diff --git a/apps/app/src/client/components/Bookmarks/BookmarkItem.tsx b/apps/app/src/client/components/Bookmarks/BookmarkItem.tsx index 808fd56dc01..109b298768c 100644 --- a/apps/app/src/client/components/Bookmarks/BookmarkItem.tsx +++ b/apps/app/src/client/components/Bookmarks/BookmarkItem.tsx @@ -36,7 +36,7 @@ type Props = { bookmarkFolderTreeMutation: () => void, } -export const BookmarkItem = (props: Props): JSX.Element => { +export const BookmarkItem = (props: Props): React.ReactElement => { const BASE_FOLDER_PADDING = 15; const BASE_BOOKMARK_PADDING = 16; diff --git a/apps/app/src/client/components/Bookmarks/BookmarkItemRenameInput.tsx b/apps/app/src/client/components/Bookmarks/BookmarkItemRenameInput.tsx index 760ed67dde5..2188639a2f3 100644 --- a/apps/app/src/client/components/Bookmarks/BookmarkItemRenameInput.tsx +++ b/apps/app/src/client/components/Bookmarks/BookmarkItemRenameInput.tsx @@ -15,7 +15,7 @@ import type { SubmittableInputProps } from '../Common/SubmittableInput/types'; type Props = Pick, 'value' | 'onSubmit' | 'onCancel'>; -export const BookmarkItemRenameInput = (props: Props): JSX.Element => { +export const BookmarkItemRenameInput = (props: Props): React.ReactElement => { const { t } = useTranslation(); const { value, onSubmit, onCancel } = props; diff --git a/apps/app/src/client/components/Bookmarks/DragAndDropWrapper.tsx b/apps/app/src/client/components/Bookmarks/DragAndDropWrapper.tsx index 18e3491bd8f..c27bf987394 100644 --- a/apps/app/src/client/components/Bookmarks/DragAndDropWrapper.tsx +++ b/apps/app/src/client/components/Bookmarks/DragAndDropWrapper.tsx @@ -14,7 +14,7 @@ type DragAndDropWrapperProps = { isDropable?:(item: Partial, type: string | null | symbol) => boolean } -export const DragAndDropWrapper = (props: DragAndDropWrapperProps): JSX.Element => { +export const DragAndDropWrapper = (props: DragAndDropWrapperProps): React.ReactElement => { const { item, children, useDragMode, useDropMode, type, onDropItem, isDropable, } = props; diff --git a/apps/app/src/client/components/Comments.tsx b/apps/app/src/client/components/Comments.tsx index 43683712e27..4aea6a92651 100644 --- a/apps/app/src/client/components/Comments.tsx +++ b/apps/app/src/client/components/Comments.tsx @@ -24,7 +24,7 @@ type CommentsProps = { onLoaded?: () => void, } -export const Comments = (props: CommentsProps): JSX.Element => { +export const Comments = (props: CommentsProps): React.ReactElement => { const { pageId, pagePath, revision, onLoaded, diff --git a/apps/app/src/client/components/Common/DrawerToggler/DrawerToggler.tsx b/apps/app/src/client/components/Common/DrawerToggler/DrawerToggler.tsx index 3e3d39f6ad0..170bd4f8c59 100644 --- a/apps/app/src/client/components/Common/DrawerToggler/DrawerToggler.tsx +++ b/apps/app/src/client/components/Common/DrawerToggler/DrawerToggler.tsx @@ -13,7 +13,7 @@ type Props = { children?: ReactNode, } -export const DrawerToggler = (props: Props): JSX.Element => { +export const DrawerToggler = (props: Props): React.ReactElement => { const { className, children } = props; diff --git a/apps/app/src/client/components/Common/Dropdown/PageItemControl.tsx b/apps/app/src/client/components/Common/Dropdown/PageItemControl.tsx index 5d6bdb51ad8..4500b6c50a5 100644 --- a/apps/app/src/client/components/Common/Dropdown/PageItemControl.tsx +++ b/apps/app/src/client/components/Common/Dropdown/PageItemControl.tsx @@ -61,7 +61,7 @@ type DropdownMenuProps = CommonProps & { operationProcessData?: IPageOperationProcessData, } -const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.Element => { +const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): React.ReactElement => { const { t } = useTranslation(''); const { @@ -271,7 +271,7 @@ type PageItemControlSubstanceProps = CommonProps & { operationProcessData?: IPageOperationProcessData, } -export const PageItemControlSubstance = (props: PageItemControlSubstanceProps): JSX.Element => { +export const PageItemControlSubstance = (props: PageItemControlSubstanceProps): React.ReactElement => { const { pageId, pageInfo: presetPageInfo, children, onClickBookmarkMenuItem, onClickRenameMenuItem, @@ -370,7 +370,7 @@ export type PageItemControlProps = CommonProps & { operationProcessData?: IPageOperationProcessData, } -export const PageItemControl = (props: PageItemControlProps): JSX.Element => { +export const PageItemControl = (props: PageItemControlProps): React.ReactElement => { const { pageId } = props; if (pageId == null) { diff --git a/apps/app/src/client/components/Common/LazyRenderer.tsx b/apps/app/src/client/components/Common/LazyRenderer.tsx index fc30065cbb2..49957a81fad 100644 --- a/apps/app/src/client/components/Common/LazyRenderer.tsx +++ b/apps/app/src/client/components/Common/LazyRenderer.tsx @@ -2,10 +2,10 @@ import React, { useEffect, useState } from 'react'; type Props = { shouldRender: boolean | (() => boolean), - children: JSX.Element, + children: React.ReactElement, } -export const LazyRenderer = (props: Props): JSX.Element => { +export const LazyRenderer = (props: Props): React.ReactElement => { const { shouldRender: _shouldRender, children } = props; const [isActivated, setActivated] = useState(false); diff --git a/apps/app/src/client/components/ContentLinkButtons.tsx b/apps/app/src/client/components/ContentLinkButtons.tsx index 2cb6283f0f4..d3cadabf751 100644 --- a/apps/app/src/client/components/ContentLinkButtons.tsx +++ b/apps/app/src/client/components/ContentLinkButtons.tsx @@ -43,7 +43,7 @@ export type ContentLinkButtonsProps = { author?: IUserHasId, } -export const ContentLinkButtons = (props: ContentLinkButtonsProps): JSX.Element => { +export const ContentLinkButtons = (props: ContentLinkButtonsProps): React.ReactElement => { const { author } = props; if (author == null || author.status === USER_STATUS.DELETED) { diff --git a/apps/app/src/client/components/CustomNavigation/CustomNav.tsx b/apps/app/src/client/components/CustomNavigation/CustomNav.tsx index 3fc12e81cfa..5aff3f25ce9 100644 --- a/apps/app/src/client/components/CustomNavigation/CustomNav.tsx +++ b/apps/app/src/client/components/CustomNavigation/CustomNav.tsx @@ -35,7 +35,7 @@ type CustomNavDropdownProps = { onNavSelected?: (selectedTabKey: string) => void, }; -export const CustomNavDropdown = (props: CustomNavDropdownProps): JSX.Element => { +export const CustomNavDropdown = (props: CustomNavDropdownProps): React.ReactElement => { const { activeTab, navTabMapping, onNavSelected, } = props; @@ -109,10 +109,10 @@ type CustomNavTabProps = { onNavSelected?: (selectedTabKey: string) => void, hideBorderBottom?: boolean, breakpointToHideInactiveTabsDown?: Breakpoint, - navRightElement?: JSX.Element, + navRightElement?: React.ReactElement, }; -export const CustomNavTab = (props: CustomNavTabProps): JSX.Element => { +export const CustomNavTab = (props: CustomNavTabProps): React.ReactElement => { const [sliderWidth, setSliderWidth] = useState(0); const [sliderMarginLeft, setSliderMarginLeft] = useState(0); @@ -224,7 +224,7 @@ type CustomNavProps = { breakpointToSwitchDropdownDown?: Breakpoint, }; -const CustomNav = (props: CustomNavProps): JSX.Element => { +const CustomNav = (props: CustomNavProps): React.ReactElement => { const tabClassnames = ['d-none']; const dropdownClassnames = ['d-block']; diff --git a/apps/app/src/client/components/CustomNavigation/CustomNavAndContents.tsx b/apps/app/src/client/components/CustomNavigation/CustomNavAndContents.tsx index 9944318a1d9..55d60c6c439 100644 --- a/apps/app/src/client/components/CustomNavigation/CustomNavAndContents.tsx +++ b/apps/app/src/client/components/CustomNavigation/CustomNavAndContents.tsx @@ -13,7 +13,7 @@ type CustomNavAndContentsProps = { } -const CustomNavAndContents = (props: CustomNavAndContentsProps): JSX.Element => { +const CustomNavAndContents = (props: CustomNavAndContentsProps): React.ReactElement => { const { navTabMapping, defaultTabIndex, navigationMode = 'tab', tabContentClasses = ['p-4'], breakpointToHideInactiveTabsDown, navRightElement, } = props; diff --git a/apps/app/src/client/components/CustomNavigation/CustomTabContent.tsx b/apps/app/src/client/components/CustomNavigation/CustomTabContent.tsx index eb660517b4d..7e72525c82b 100644 --- a/apps/app/src/client/components/CustomNavigation/CustomTabContent.tsx +++ b/apps/app/src/client/components/CustomNavigation/CustomTabContent.tsx @@ -15,7 +15,7 @@ type Props = { additionalClassNames?: string[], } -const CustomTabContent = (props: Props): JSX.Element => { +const CustomTabContent = (props: Props): React.ReactElement => { const { activeTab, navTabMapping, additionalClassNames } = props; diff --git a/apps/app/src/client/components/DataTransferForm.tsx b/apps/app/src/client/components/DataTransferForm.tsx index 80a72052689..666f167ed15 100644 --- a/apps/app/src/client/components/DataTransferForm.tsx +++ b/apps/app/src/client/components/DataTransferForm.tsx @@ -7,7 +7,7 @@ import { useGrowiDocumentationUrl } from '~/stores-universal/context'; import CustomCopyToClipBoard from './Common/CustomCopyToClipBoard'; -const DataTransferForm = (): JSX.Element => { +const DataTransferForm = (): React.ReactElement => { const { t } = useTranslation('commons'); const { transferKey, generateTransferKey } = useGenerateTransferKey(); const { data: documentationUrl } = useGrowiDocumentationUrl(); diff --git a/apps/app/src/client/components/DescendantsPageList.tsx b/apps/app/src/client/components/DescendantsPageList.tsx index 041afc4eedd..d9a7dd4d7e6 100644 --- a/apps/app/src/client/components/DescendantsPageList.tsx +++ b/apps/app/src/client/components/DescendantsPageList.tsx @@ -34,7 +34,7 @@ const convertToIDataWithMeta = (page: IPageHasId): IDataWithMeta => return { data: page }; }; -const DescendantsPageListSubstance = (props: SubstanceProps): JSX.Element => { +const DescendantsPageListSubstance = (props: SubstanceProps): React.ReactElement => { const { t } = useTranslation(); @@ -128,7 +128,7 @@ export type DescendantsPageListProps = { forceHideMenuItems?: ForceHideMenuItems, } -export const DescendantsPageList = (props: DescendantsPageListProps): JSX.Element => { +export const DescendantsPageList = (props: DescendantsPageListProps): React.ReactElement => { const { path, limit, forceHideMenuItems } = props; const [activePage, setActivePage] = useState(1); diff --git a/apps/app/src/client/components/DescendantsPageListModal.tsx b/apps/app/src/client/components/DescendantsPageListModal.tsx index 8fe80c7133f..594229b0609 100644 --- a/apps/app/src/client/components/DescendantsPageListModal.tsx +++ b/apps/app/src/client/components/DescendantsPageListModal.tsx @@ -23,7 +23,7 @@ const DescendantsPageList = dynamic(() => import('./De const PageTimeline = dynamic(() => import('./PageTimeline').then(mod => mod.PageTimeline), { ssr: false }); -export const DescendantsPageListModal = (): JSX.Element => { +export const DescendantsPageListModal = (): React.ReactElement => { const { t } = useTranslation(); const [activeTab, setActiveTab] = useState('pagelist'); diff --git a/apps/app/src/client/components/EmptyTrashButton.tsx b/apps/app/src/client/components/EmptyTrashButton.tsx index a9d2a23bbec..d8c99064f66 100644 --- a/apps/app/src/client/components/EmptyTrashButton.tsx +++ b/apps/app/src/client/components/EmptyTrashButton.tsx @@ -8,7 +8,7 @@ type EmptyTrashButtonProps = { }; -const EmptyTrashButton = (props: EmptyTrashButtonProps): JSX.Element => { +const EmptyTrashButton = (props: EmptyTrashButtonProps): React.ReactElement => { const { onEmptyTrashButtonClick, disableEmptyButton } = props; const { t } = useTranslation(); diff --git a/apps/app/src/client/components/ForbiddenPage.tsx b/apps/app/src/client/components/ForbiddenPage.tsx index dcdff62ff9f..ea1f6289c14 100644 --- a/apps/app/src/client/components/ForbiddenPage.tsx +++ b/apps/app/src/client/components/ForbiddenPage.tsx @@ -6,7 +6,7 @@ type Props = { isLinkSharingDisabled?: boolean, } -const ForbiddenPage = React.memo((props: Props): JSX.Element => { +const ForbiddenPage = React.memo((props: Props): React.ReactElement => { const { t } = useTranslation(); return ( diff --git a/apps/app/src/client/components/GrantedGroupsInheritanceSelectModal.tsx b/apps/app/src/client/components/GrantedGroupsInheritanceSelectModal.tsx index 3d9e02fcfef..660e44e0e4b 100644 --- a/apps/app/src/client/components/GrantedGroupsInheritanceSelectModal.tsx +++ b/apps/app/src/client/components/GrantedGroupsInheritanceSelectModal.tsx @@ -7,7 +7,7 @@ import { import { useGrantedGroupsInheritanceSelectModal } from '~/stores/modal'; -const GrantedGroupsInheritanceSelectModal = (): JSX.Element => { +const GrantedGroupsInheritanceSelectModal = (): React.ReactElement => { const { t } = useTranslation(); const { data: modalData, close: closeModal } = useGrantedGroupsInheritanceSelectModal(); const [onlyInheritUserRelatedGrantedGroups, setOnlyInheritUserRelatedGrantedGroups] = useState(false); diff --git a/apps/app/src/client/components/Hotkeys/Subscribers/ShowShortcutsModal.tsx b/apps/app/src/client/components/Hotkeys/Subscribers/ShowShortcutsModal.tsx index c08575687ff..17e38518ca0 100644 --- a/apps/app/src/client/components/Hotkeys/Subscribers/ShowShortcutsModal.tsx +++ b/apps/app/src/client/components/Hotkeys/Subscribers/ShowShortcutsModal.tsx @@ -5,7 +5,7 @@ import { useShortcutsModal } from '~/stores/modal'; type Props = { onDeleteRender: () => void, } -const ShowShortcutsModal = (props: Props): JSX.Element => { +const ShowShortcutsModal = (props: Props): React.ReactElement => { const { data: status, open } = useShortcutsModal(); diff --git a/apps/app/src/client/components/Icons/FolderIcon.tsx b/apps/app/src/client/components/Icons/FolderIcon.tsx index 13b65b2646b..145201e837a 100644 --- a/apps/app/src/client/components/Icons/FolderIcon.tsx +++ b/apps/app/src/client/components/Icons/FolderIcon.tsx @@ -3,7 +3,7 @@ import React from 'react'; type Props = { isOpen: boolean } -export const FolderIcon = (props: Props): JSX.Element => { +export const FolderIcon = (props: Props): React.ReactElement => { const { isOpen } = props; return ( diff --git a/apps/app/src/client/components/Icons/RecentlyCreatedIcon.tsx b/apps/app/src/client/components/Icons/RecentlyCreatedIcon.tsx index 9caa9d4f598..e7defcf25ac 100644 --- a/apps/app/src/client/components/Icons/RecentlyCreatedIcon.tsx +++ b/apps/app/src/client/components/Icons/RecentlyCreatedIcon.tsx @@ -1,6 +1,6 @@ import React from 'react'; -export const RecentlyCreatedIcon = (): JSX.Element => ( +export const RecentlyCreatedIcon = (): React.ReactElement => ( = (props: IdenticalPathAl }; -export const IdenticalPathPage = (): JSX.Element => { +export const IdenticalPathPage = (): React.ReactElement => { const { data: currentPath } = useCurrentPathname(); diff --git a/apps/app/src/client/components/InAppNotification/InAppNotificationDropdown.tsx b/apps/app/src/client/components/InAppNotification/InAppNotificationDropdown.tsx index 142c3f2017e..1cb22d394f6 100644 --- a/apps/app/src/client/components/InAppNotification/InAppNotificationDropdown.tsx +++ b/apps/app/src/client/components/InAppNotification/InAppNotificationDropdown.tsx @@ -11,7 +11,7 @@ import { useDefaultSocket } from '~/stores/socket-io'; import InAppNotificationList from './InAppNotificationList'; -export const InAppNotificationDropdown = (): JSX.Element => { +export const InAppNotificationDropdown = (): React.ReactElement => { const { t } = useTranslation('commons'); const [isOpen, setIsOpen] = useState(false); diff --git a/apps/app/src/client/components/InAppNotification/InAppNotificationElm.tsx b/apps/app/src/client/components/InAppNotification/InAppNotificationElm.tsx index 077f858d215..f328794c283 100644 --- a/apps/app/src/client/components/InAppNotification/InAppNotificationElm.tsx +++ b/apps/app/src/client/components/InAppNotification/InAppNotificationElm.tsx @@ -41,7 +41,7 @@ const InAppNotificationElm: FC = (props: Props) => { publishOpen(); }; - const renderActionUserPictures = (): JSX.Element => { + const renderActionUserPictures = (): React.ReactElement => { const actionUsers = notification.actionUsers; if (actionUsers.length < 1) { diff --git a/apps/app/src/client/components/InstallerForm.tsx b/apps/app/src/client/components/InstallerForm.tsx index e2eb6d0824d..45f6bba0108 100644 --- a/apps/app/src/client/components/InstallerForm.tsx +++ b/apps/app/src/client/components/InstallerForm.tsx @@ -23,7 +23,7 @@ type Props = { minPasswordLength: number, } -const InstallerForm = memo((props: Props): JSX.Element => { +const InstallerForm = memo((props: Props): React.ReactElement => { const { t, i18n } = useTranslation(); const { minPasswordLength } = props; diff --git a/apps/app/src/client/components/InvitedForm.tsx b/apps/app/src/client/components/InvitedForm.tsx index 23e130407b9..000f8138f29 100644 --- a/apps/app/src/client/components/InvitedForm.tsx +++ b/apps/app/src/client/components/InvitedForm.tsx @@ -13,7 +13,7 @@ type InvitedFormProps = { invitedFormName: string, } -export const InvitedForm = (props: InvitedFormProps): JSX.Element => { +export const InvitedForm = (props: InvitedFormProps): React.ReactElement => { const { t } = useTranslation(); const router = useRouter(); diff --git a/apps/app/src/client/components/ItemsTree/ItemsTree.tsx b/apps/app/src/client/components/ItemsTree/ItemsTree.tsx index 63426e08de0..069378d6b80 100644 --- a/apps/app/src/client/components/ItemsTree/ItemsTree.tsx +++ b/apps/app/src/client/components/ItemsTree/ItemsTree.tsx @@ -102,7 +102,7 @@ type ItemsTreeProps = { /* * ItemsTree */ -export const ItemsTree = (props: ItemsTreeProps): JSX.Element => { +export const ItemsTree = (props: ItemsTreeProps): React.ReactElement => { const { targetPath, targetPathOrId, targetAndAncestorsData, isEnableActions, isReadOnlyUser, isWipPageShown, CustomTreeItem, onClickTreeItem, } = props; diff --git a/apps/app/src/client/components/ItemsTree/ItemsTreeContentSkeleton.tsx b/apps/app/src/client/components/ItemsTree/ItemsTreeContentSkeleton.tsx index 77da28853b4..6bc032b36b0 100644 --- a/apps/app/src/client/components/ItemsTree/ItemsTreeContentSkeleton.tsx +++ b/apps/app/src/client/components/ItemsTree/ItemsTreeContentSkeleton.tsx @@ -2,7 +2,7 @@ import { Skeleton } from '~/client/components/Skeleton'; import styles from './ItemsTreeContentSkeleton.module.scss'; -const ItemsTreeContentSkeleton = (): JSX.Element => { +const ItemsTreeContentSkeleton = (): React.ReactElement => { return (
    diff --git a/apps/app/src/client/components/LoginForm/ExternalAuthButton.tsx b/apps/app/src/client/components/LoginForm/ExternalAuthButton.tsx index be8331dff12..7806a68d157 100644 --- a/apps/app/src/client/components/LoginForm/ExternalAuthButton.tsx +++ b/apps/app/src/client/components/LoginForm/ExternalAuthButton.tsx @@ -20,7 +20,7 @@ const authLabel = { }; -export const ExternalAuthButton = ({ authType }: {authType: IExternalAuthProviderType}): JSX.Element => { +export const ExternalAuthButton = ({ authType }: {authType: IExternalAuthProviderType}): React.ReactElement => { const { t } = useTranslation(); const key = `btn-auth-${authType.toString()}`; diff --git a/apps/app/src/client/components/LoginForm/LoginForm.tsx b/apps/app/src/client/components/LoginForm/LoginForm.tsx index eb3f13ccc9d..b0f2f5ec50b 100644 --- a/apps/app/src/client/components/LoginForm/LoginForm.tsx +++ b/apps/app/src/client/components/LoginForm/LoginForm.tsx @@ -42,7 +42,7 @@ type LoginFormProps = { externalAccountLoginError?: IExternalAccountLoginError, minPasswordLength: number, } -export const LoginForm = (props: LoginFormProps): JSX.Element => { +export const LoginForm = (props: LoginFormProps): React.ReactElement => { const { t } = useTranslation(); const router = useRouter(); @@ -136,7 +136,7 @@ export const LoginForm = (props: LoginFormProps): JSX.Element => { }, []); // wrap error elements which use dangerouslySetInnerHtml - const generateDangerouslySetErrors = useCallback((errors: IErrorV3[]): JSX.Element => { + const generateDangerouslySetErrors = useCallback((errors: IErrorV3[]): React.ReactElement => { if (errors == null || errors.length === 0) return <>; return (
    @@ -149,7 +149,7 @@ export const LoginForm = (props: LoginFormProps): JSX.Element => { }, [tWithOpt]); // wrap error elements which do not use dangerouslySetInnerHtml - const generateSafelySetErrors = useCallback((errors: (IErrorV3 | IExternalAccountLoginError)[]): JSX.Element => { + const generateSafelySetErrors = useCallback((errors: (IErrorV3 | IExternalAccountLoginError)[]): React.ReactElement => { if (errors == null || errors.length === 0) return <>; return (
      diff --git a/apps/app/src/client/components/Maintenance/Maintenance.tsx b/apps/app/src/client/components/Maintenance/Maintenance.tsx index edcc1f95ca7..d284df8afad 100644 --- a/apps/app/src/client/components/Maintenance/Maintenance.tsx +++ b/apps/app/src/client/components/Maintenance/Maintenance.tsx @@ -10,7 +10,7 @@ type Props = { currentUser: IUserHasId, }; -export const Maintenance = (props: Props): JSX.Element => { +export const Maintenance = (props: Props): React.ReactElement => { const { t } = useTranslation(); useCurrentUser(props.currentUser ?? null); diff --git a/apps/app/src/client/components/Me/ApiSettings.tsx b/apps/app/src/client/components/Me/ApiSettings.tsx index 802daaca652..93eddd4538c 100644 --- a/apps/app/src/client/components/Me/ApiSettings.tsx +++ b/apps/app/src/client/components/Me/ApiSettings.tsx @@ -7,7 +7,7 @@ import { toastSuccess, toastError } from '~/client/util/toastr'; import { useSWRxPersonalSettings, usePersonalSettings } from '~/stores/personal-settings'; -const ApiSettings = React.memo((): JSX.Element => { +const ApiSettings = React.memo((): React.ReactElement => { const { t } = useTranslation(); const { mutate: mutateDatabaseData } = useSWRxPersonalSettings(); diff --git a/apps/app/src/client/components/Me/AssociateModal.tsx b/apps/app/src/client/components/Me/AssociateModal.tsx index e90cc34089c..5dfc4dac5ce 100644 --- a/apps/app/src/client/components/Me/AssociateModal.tsx +++ b/apps/app/src/client/components/Me/AssociateModal.tsx @@ -22,7 +22,7 @@ type Props = { onClose: () => void, } -const AssociateModal = (props: Props): JSX.Element => { +const AssociateModal = (props: Props): React.ReactElement => { const { t } = useTranslation(); const { mutate: mutatePersonalExternalAccounts } = useSWRxPersonalExternalAccounts(); const { associateLdapAccount } = usePersonalSettings(); diff --git a/apps/app/src/client/components/Me/BasicInfoSettings.tsx b/apps/app/src/client/components/Me/BasicInfoSettings.tsx index 9df8cce2560..1ac8879e835 100644 --- a/apps/app/src/client/components/Me/BasicInfoSettings.tsx +++ b/apps/app/src/client/components/Me/BasicInfoSettings.tsx @@ -8,7 +8,7 @@ import { toastSuccess, toastError } from '~/client/util/toastr'; import { useRegistrationWhitelist } from '~/stores-universal/context'; import { usePersonalSettings } from '~/stores/personal-settings'; -export const BasicInfoSettings = (): JSX.Element => { +export const BasicInfoSettings = (): React.ReactElement => { const { t } = useTranslation(); const { data: registrationWhitelist } = useRegistrationWhitelist(); diff --git a/apps/app/src/client/components/Me/ColorModeSettings.tsx b/apps/app/src/client/components/Me/ColorModeSettings.tsx index 94d0b8a2f1c..f460292569c 100644 --- a/apps/app/src/client/components/Me/ColorModeSettings.tsx +++ b/apps/app/src/client/components/Me/ColorModeSettings.tsx @@ -11,7 +11,7 @@ type ColorModeSettingsButtonProps = { onClick?: () => void, } -const ColorModeSettingsButton = ({ isActive, children, onClick }: ColorModeSettingsButtonProps): JSX.Element => { +const ColorModeSettingsButton = ({ isActive, children, onClick }: ColorModeSettingsButtonProps): React.ReactElement => { return (