Просмотр исходного кода

fix spinner display size
fix import problems

Tatsuya Ise 2 лет назад
Родитель
Сommit
f423ae28d9

+ 1 - 1
apps/app/src/components/Admin/App/QuestionnaireSettings.tsx

@@ -66,7 +66,7 @@ const QuestionnaireSettings = (): JSX.Element => {
 
       {isLoading && (
         <div className="text-muted text-center mb-5">
-          <span className="me-1"><LoadingSpinnerPulse /></span>
+          <span className="me-1 fs-3"><LoadingSpinnerPulse /></span>
         </div>
       )}
 

+ 1 - 1
apps/app/src/components/Admin/Customize/CustomizeLayoutSetting.tsx

@@ -45,7 +45,7 @@ const CustomizeLayoutSetting = (): JSX.Element => {
 
   if (isContainerFluid == null) {
     return (
-      <div className="text-muted text-center">
+      <div className="text-muted text-center fs-3">
         <LoadingSpinnerPulse />
       </div>
     );

+ 2 - 1
apps/app/src/components/Admin/SlackIntegration/SlackIntegration.jsx

@@ -8,6 +8,7 @@ import {
   apiv3Delete, apiv3Get, apiv3Post, apiv3Put,
 } from '~/client/util/apiv3-client';
 import { toastSuccess, toastError } from '~/client/util/toastr';
+import { LoadingSpinnerPulse } from '~/components/LoadingSpinnerPulse';
 
 import BotTypeCard from './BotTypeCard';
 import ConfirmBotChangeModal from './ConfirmBotChangeModal';
@@ -187,7 +188,7 @@ const SlackIntegration = () => {
   if (isLoading) {
     return (
       <div className="text-muted text-center">
-        <span className="me-1"><LoadingSpinnerPulse /></span>
+        <span className="me-1 fs-3"><LoadingSpinnerPulse /></span>
       </div>
     );
   }

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

@@ -8,8 +8,8 @@ import type {
 import { useTranslation } from 'next-i18next';
 
 import { toastSuccess } from '~/client/util/toastr';
-import { IPagingResult } from '~/interfaces/paging-result';
-import { OnDeletedFunction, OnPutBackedFunction } from '~/interfaces/ui';
+import type { IPagingResult } from '~/interfaces/paging-result';
+import type { OnDeletedFunction, OnPutBackedFunction } from '~/interfaces/ui';
 import { useIsGuestUser, useIsReadOnlyUser, useIsSharedUser } from '~/stores/context';
 import {
   mutatePageTree,
@@ -86,7 +86,7 @@ const DescendantsPageListSubstance = (props: SubstanceProps): JSX.Element => {
     return (
       <div className="wiki">
         <div className="text-muted text-center">
-          <span className="me-1"><LoadingSpinnerPulse /></span>
+          <span className="me-1 fs-3"><LoadingSpinnerPulse /></span>
         </div>
       </div>
     );

+ 1 - 1
apps/app/src/components/InAppNotification/InAppNotificationList.tsx

@@ -22,7 +22,7 @@ const InAppNotificationList: FC<Props> = (props: Props) => {
     return (
       <div className="wiki">
         <div className="text-muted text-center">
-          <span className="me-1"><LoadingSpinnerPulse /></span>
+          <span className="me-1 fs-3"><LoadingSpinnerPulse /></span>
         </div>
       </div>
     );

+ 1 - 1
apps/app/src/components/InAppNotification/InAppNotificationPage.tsx

@@ -66,7 +66,7 @@ export const InAppNotificationPage: FC = () => {
       return (
         <div className="wiki" data-testid="grw-in-app-notification-page-spinner">
           <div className="text-muted text-center">
-            <span className="me-1"><LoadingSpinnerPulse /></span>
+            <span className="me-1 fs-3"><LoadingSpinnerPulse /></span>
           </div>
         </div>
       );

+ 5 - 4
apps/app/src/components/InfiniteScroll.tsx

@@ -1,9 +1,10 @@
-import React, {
-  Ref, useEffect, useState,
-} from 'react';
+import type { Ref } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import type { SWRInfiniteResponse } from 'swr/infinite';
 
+import { LoadingSpinnerPulse } from './LoadingSpinnerPulse';
+
 type Props<T> = {
   swrInifiniteResponse: SWRInfiniteResponse<T>
   children: React.ReactNode,
@@ -32,7 +33,7 @@ const useIntersection = <E extends HTMLElement>(): [boolean, Ref<E>] => {
 const LoadingIndicator = (): React.ReactElement => {
   return (
     <div className="text-muted text-center">
-      <span className="me-1"><LoadingSpinnerPulse /></span>
+      <span className="me-1 fs-3"><LoadingSpinnerPulse /></span>
     </div>
   );
 };

+ 1 - 1
apps/app/src/components/Me/QuestionnaireSettings.tsx

@@ -47,7 +47,7 @@ export const QuestionnaireSettings = (): JSX.Element => {
 
       {isLoadingCurrentUser && (
         <div className="text-muted text-center mb-5">
-          <span className="me-1"><LoadingSpinnerPulse /></span>
+          <span className="me-1 fs-3"><LoadingSpinnerPulse /></span>
         </div>
       )}
 

+ 3 - 1
apps/app/src/components/Page/RevisionLoader.tsx

@@ -7,6 +7,8 @@ import type { RendererOptions } from '~/interfaces/renderer-options';
 import { useSWRxPageRevision } from '~/stores/page';
 import loggerFactory from '~/utils/logger';
 
+import { LoadingSpinnerPulse } from '../LoadingSpinnerPulse';
+
 import RevisionRenderer from './RevisionRenderer';
 
 export const ROOT_ELEM_ID = 'revision-loader' as const;
@@ -64,7 +66,7 @@ export const RevisionLoader = (props: RevisionLoaderProps): JSX.Element => {
     return (
       <div className="wiki">
         <div className="text-muted text-center">
-          <span className="me-1"><LoadingSpinnerPulse /></span>
+          <span className="me-1 fs-3"><LoadingSpinnerPulse /></span>
         </div>
       </div>
     );

+ 2 - 1
apps/app/src/components/PageAccessoriesModal/PageAttachment.tsx

@@ -9,6 +9,7 @@ import { useIsGuestUser, useIsReadOnlyUser } from '~/stores/context';
 import { useDeleteAttachmentModal } from '~/stores/modal';
 import { useSWRxCurrentPage, useCurrentPageId } from '~/stores/page';
 
+import { LoadingSpinnerPulse } from '../LoadingSpinnerPulse';
 import { PageAttachmentList } from '../PageAttachment/PageAttachmentList';
 import PaginationWrapper from '../PaginationWrapper';
 
@@ -63,7 +64,7 @@ const PageAttachment = (): JSX.Element => {
     if (dataAttachments == null || inUseAttachmentsMap == null) {
       return (
         <div className="text-muted text-center">
-          <span className="me-1"><LoadingSpinnerPulse /></span>
+          <span className="me-1 fs-3"><LoadingSpinnerPulse /></span>
         </div>
       );
     }

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

@@ -23,7 +23,7 @@ import styles from './PagePresentationModal.module.scss';
 const Presentation = dynamic<PresentationProps>(() => import('./Presentation/Presentation').then(mod => mod.Presentation), {
   ssr: false,
   loading: () => (
-    <span className="text-muted"><LoadingSpinnerPulse /></span>
+    <span className="text-muted fs-1"><LoadingSpinnerPulse /></span>
   ),
 });
 

+ 3 - 1
apps/app/src/components/SearchPage/SearchPageBase.tsx

@@ -20,6 +20,8 @@ import type { ForceHideMenuItems } from '../Common/Dropdown/PageItemControl';
 
 // Do not import with next/dynamic
 // see: https://github.com/weseek/growi/pull/7923
+import { LoadingSpinnerPulse } from '../LoadingSpinnerPulse';
+
 import { SearchResultList } from './SearchResultList';
 
 import styles from './SearchPageBase.module.scss';
@@ -181,7 +183,7 @@ const SearchPageBaseSubstance: ForwardRefRenderFunction<ISelectableAll & IReturn
           {/* Loading */}
           { pages == null && (
             <div className="mw-0 flex-grow-1 flex-basis-0 m-5 text-muted text-center">
-              <span className="me-1"><LoadingSpinnerPulse /></span>
+              <span className="me-1 fs-3"><LoadingSpinnerPulse /></span>
             </div>
           ) }
 

+ 2 - 1
apps/app/src/components/TemplateModal/TemplateModal.tsx

@@ -26,6 +26,7 @@ import { usePersonalSettings } from '~/stores/personal-settings';
 import { usePreviewOptions } from '~/stores/renderer';
 import loggerFactory from '~/utils/logger';
 
+import { LoadingSpinnerPulse } from '../LoadingSpinnerPulse';
 import Preview from '../PageEditor/Preview';
 
 import { useFormatter } from './use-formatter';
@@ -186,7 +187,7 @@ const TemplateModalSubstance = (props: TemplateModalSubstanceProps): JSX.Element
 
             { isLoading && (
               <div className="h-100 d-flex justify-content-center align-items-center">
-                <span className="mx-auto text-muted"><LoadingSpinnerPulse /></span>
+                <span className="mx-auto text-muted fs-3"><LoadingSpinnerPulse /></span>
               </div>
             ) }
 

+ 1 - 1
apps/app/src/pages/tags.page.tsx

@@ -91,7 +91,7 @@ const TagPage: NextPageWithLayout<CommonProps> = (props: Props) => {
           { isLoading
             ? (
               <div className="text-muted text-center">
-                <span className="mt-3"><LoadingSpinnerPulse /></span>
+                <span className="mt-3 fs-3"><LoadingSpinnerPulse /></span>
               </div>
             )
             : (