Преглед изворни кода

Revert "moduralize imports for reactstrap"

This reverts commit 177d80982a3ba96e776767cb080c3527edd12a95.
Yuki Takei пре 2 година
родитељ
комит
98b48099b9
30 измењених фајлова са 69 додато и 91 уклоњено
  1. 0 1
      apps/app/next.config.js
  2. 1 2
      apps/app/src/components/Admin/Customize/CustomizeCssSetting.tsx
  3. 1 2
      apps/app/src/components/Admin/Customize/CustomizeFunctionSetting.tsx
  4. 1 2
      apps/app/src/components/Admin/Customize/CustomizeNoscriptSetting.tsx
  5. 1 2
      apps/app/src/components/Admin/Customize/CustomizeScriptSetting.tsx
  6. 1 2
      apps/app/src/components/Admin/Customize/CustomizeSidebarSetting.tsx
  7. 1 2
      apps/app/src/components/Admin/Customize/CustomizeTitle.tsx
  8. 3 4
      apps/app/src/components/Admin/Customize/PagingSizeUncontrolledDropdown.jsx
  9. 3 4
      apps/app/src/components/Admin/MarkdownSetting/IndentForm.tsx
  10. 1 2
      apps/app/src/components/Admin/MarkdownSetting/MarkDownSettingContents.tsx
  11. 3 2
      apps/app/src/components/Admin/Notification/NotificationSetting.jsx
  12. 1 2
      apps/app/src/components/Admin/Security/SecurityManagementContents.jsx
  13. 3 5
      apps/app/src/components/Admin/SlackIntegration/DeleteSlackBotSettingsModal.jsx
  14. 3 3
      apps/app/src/components/Admin/Users/UserMenu.tsx
  15. 3 4
      apps/app/src/components/Common/Dropdown/PageItemControl.tsx
  16. 3 3
      apps/app/src/components/CustomNavigation/CustomNav.tsx
  17. 3 2
      apps/app/src/components/CustomNavigation/CustomTabContent.tsx
  18. 3 4
      apps/app/src/components/InAppNotification/InAppNotificationDropdown.tsx
  19. 4 5
      apps/app/src/components/Page/CopyDropdown.jsx
  20. 3 3
      apps/app/src/components/PageComment/CommentEditor.tsx
  21. 3 4
      apps/app/src/components/PageEditor/ConflictDiffModal.tsx
  22. 2 2
      apps/app/src/components/PageEditor/EditorNavbarBottom.tsx
  23. 4 5
      apps/app/src/components/PageEditor/HandsontableModal.tsx
  24. 4 2
      apps/app/src/components/PageEditor/MarkdownTableDataImportForm.tsx
  25. 3 4
      apps/app/src/components/PageEditor/OptionsSelector.tsx
  26. 3 4
      apps/app/src/components/RevisionComparer/RevisionComparer.tsx
  27. 4 5
      apps/app/src/components/SavePageControls.tsx
  28. 2 3
      apps/app/src/components/Sidebar/PageTree/Item.tsx
  29. 1 3
      apps/app/src/components/SlackNotification.tsx
  30. 1 3
      apps/app/src/components/User/SeenUserInfo.tsx

+ 0 - 1
apps/app/next.config.js

@@ -33,7 +33,6 @@ const getTranspilePackages = () => {
     'longest-streak',
     'micromark',
     'property-information',
-    'reactstrap',
     'space-separated-tokens',
     'stringify-entities',
     'trim-lines',

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

@@ -1,8 +1,7 @@
 import React, { useCallback } from 'react';
 
 import { useTranslation } from 'next-i18next';
-import Card from 'reactstrap/es/Card';
-import CardBody from 'reactstrap/es/CardBody';
+import { Card, CardBody } from 'reactstrap';
 
 import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';

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

@@ -1,8 +1,7 @@
 import React, { useCallback } from 'react';
 
 import { useTranslation } from 'next-i18next';
-import Card from 'reactstrap/es/Card';
-import CardBody from 'reactstrap/es/CardBody';
+import { Card, CardBody } from 'reactstrap';
 
 import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';

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

@@ -3,8 +3,7 @@ import React, { useCallback } from 'react';
 import { useTranslation } from 'next-i18next';
 import { PrismAsyncLight } from 'react-syntax-highlighter';
 import { oneDark } from 'react-syntax-highlighter/dist/cjs/styles/prism';
-import Card from 'reactstrap/es/Card';
-import CardBody from 'reactstrap/es/CardBody';
+import { Card, CardBody } from 'reactstrap';
 
 import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';

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

@@ -3,8 +3,7 @@ import React, { useCallback } from 'react';
 import { useTranslation } from 'next-i18next';
 import { PrismAsyncLight } from 'react-syntax-highlighter';
 import { oneDark } from 'react-syntax-highlighter/dist/cjs/styles/prism';
-import Card from 'reactstrap/es/Card';
-import CardBody from 'reactstrap/es/CardBody';
+import { Card, CardBody } from 'reactstrap';
 
 import AdminCustomizeContainer from '~/client/services/AdminCustomizeContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';

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

@@ -1,8 +1,7 @@
 import React, { useCallback } from 'react';
 
 import { useTranslation } from 'next-i18next';
-import Card from 'reactstrap/es/Card';
-import CardBody from 'reactstrap/es/CardBody';
+import { Card, CardBody } from 'reactstrap';
 
 import { toastSuccess, toastError } from '~/client/util/toastr';
 import { useSWRxSidebarConfig } from '~/stores/ui';

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

@@ -1,8 +1,7 @@
 import React, { FC, useState } from 'react';
 
 import { useTranslation } from 'next-i18next';
-import Card from 'reactstrap/es/Card';
-import CardBody from 'reactstrap/es/CardBody';
+import { Card, CardBody } from 'reactstrap';
 
 import { apiv3Put } from '~/client/util/apiv3-client';
 import { toastSuccess, toastError } from '~/client/util/toastr';

+ 3 - 4
apps/app/src/components/Admin/Customize/PagingSizeUncontrolledDropdown.jsx

@@ -1,10 +1,9 @@
 import React from 'react';
 
 import PropTypes from 'prop-types';
-import DropdownItem from 'reactstrap/es/DropdownItem';
-import DropdownMenu from 'reactstrap/es/DropdownMenu';
-import DropdownToggle from 'reactstrap/es/DropdownToggle';
-import UncontrolledDropdown from 'reactstrap/es/UncontrolledDropdown';
+import {
+  UncontrolledDropdown, DropdownToggle, DropdownMenu, DropdownItem,
+} from 'reactstrap';
 
 
 const PagingSizeUncontrolledDropdown = (props) => {

+ 3 - 4
apps/app/src/components/Admin/MarkdownSetting/IndentForm.tsx

@@ -2,10 +2,9 @@
 import React, { useCallback } from 'react';
 
 import { useTranslation } from 'next-i18next';
-import DropdownItem from 'reactstrap/es/DropdownItem';
-import DropdownMenu from 'reactstrap/es/DropdownMenu';
-import DropdownToggle from 'reactstrap/es/DropdownToggle';
-import UncontrolledDropdown from 'reactstrap/es/UncontrolledDropdown';
+import {
+  UncontrolledDropdown, DropdownToggle, DropdownMenu, DropdownItem,
+} from 'reactstrap';
 
 import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';

+ 1 - 2
apps/app/src/components/Admin/MarkdownSetting/MarkDownSettingContents.tsx

@@ -1,8 +1,7 @@
 import React, { useEffect } from 'react';
 
 import { useTranslation } from 'next-i18next';
-import Card from 'reactstrap/es/Card';
-import CardBody from 'reactstrap/es/CardBody';
+import { Card, CardBody } from 'reactstrap';
 
 import AdminMarkDownContainer from '~/client/services/AdminMarkDownContainer';
 import { toastError } from '~/client/util/toastr';

+ 3 - 2
apps/app/src/components/Admin/Notification/NotificationSetting.jsx

@@ -5,8 +5,9 @@ import React, {
 import { SlackbotType } from '@growi/slack';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
-import TabContent from 'reactstrap/es/TabContent';
-import TabPane from 'reactstrap/es/TabPane';
+import {
+  TabContent, TabPane,
+} from 'reactstrap';
 
 import AdminNotificationContainer from '~/client/services/AdminNotificationContainer';
 import { toastError } from '~/client/util/toastr';

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

@@ -2,8 +2,7 @@ import React, { useMemo, useState } from 'react';
 
 import { useTranslation } from 'next-i18next';
 import Link from 'next/link';
-import TabContent from 'reactstrap/es/TabContent';
-import TabPane from 'reactstrap/es/TabPane';
+import { TabContent, TabPane } from 'reactstrap';
 
 import CustomNav from '../../CustomNavigation/CustomNav';
 

+ 3 - 5
apps/app/src/components/Admin/SlackIntegration/DeleteSlackBotSettingsModal.jsx

@@ -2,11 +2,9 @@ import React from 'react';
 
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
-import Button from 'reactstrap/es/Button';
-import Modal from 'reactstrap/es/Modal';
-import ModalBody from 'reactstrap/es/ModalBody';
-import ModalFooter from 'reactstrap/es/ModalFooter';
-import ModalHeader from 'reactstrap/es/ModalHeader';
+import {
+  Button, Modal, ModalHeader, ModalBody, ModalFooter,
+} from 'reactstrap';
 
 const DeleteSlackBotSettingsModal = React.memo((props) => {
   const { t } = useTranslation();

+ 3 - 3
apps/app/src/components/Admin/Users/UserMenu.tsx

@@ -2,9 +2,9 @@ import React, { useState, useCallback } from 'react';
 
 import { IUserHasId, USER_STATUS } from '@growi/core';
 import { useTranslation } from 'next-i18next';
-import DropdownMenu from 'reactstrap/es/DropdownMenu';
-import DropdownToggle from 'reactstrap/es/DropdownToggle';
-import UncontrolledDropdown from 'reactstrap/es/UncontrolledDropdown';
+import {
+  UncontrolledDropdown, DropdownToggle, DropdownMenu,
+} from 'reactstrap';
 
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';
 

+ 3 - 4
apps/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -1,10 +1,9 @@
 import React, { useState, useCallback, useEffect } from 'react';
 
 import { useTranslation } from 'next-i18next';
-import Dropdown from 'reactstrap/es/Dropdown';
-import DropdownItem from 'reactstrap/es/DropdownItem';
-import DropdownMenu from 'reactstrap/es/DropdownMenu';
-import DropdownToggle from 'reactstrap/es/DropdownToggle';
+import {
+  Dropdown, DropdownMenu, DropdownToggle, DropdownItem,
+} from 'reactstrap';
 
 import { NotAvailableForGuest } from '~/components/NotAvailableForGuest';
 import {

+ 3 - 3
apps/app/src/components/CustomNavigation/CustomNav.tsx

@@ -3,9 +3,9 @@ import React, {
 } from 'react';
 
 import { Breakpoint } from '@growi/ui/dist/interfaces/breakpoints';
-import Nav from 'reactstrap/es/Nav';
-import NavItem from 'reactstrap/es/NavItem';
-import NavLink from 'reactstrap/es/NavLink';
+import {
+  Nav, NavItem, NavLink,
+} from 'reactstrap';
 
 import { ICustomNavTabMappings } from '~/interfaces/ui';
 

+ 3 - 2
apps/app/src/components/CustomNavigation/CustomTabContent.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 
-import TabContent from 'reactstrap/es/TabContent';
-import TabPane from 'reactstrap/es/TabPane';
+import {
+  TabContent, TabPane,
+} from 'reactstrap';
 
 import type { ICustomNavTabMappings } from '~/interfaces/ui';
 

+ 3 - 4
apps/app/src/components/InAppNotification/InAppNotificationDropdown.tsx

@@ -2,10 +2,9 @@ import React, { useState, useEffect, useRef } from 'react';
 
 import { useTranslation } from 'next-i18next';
 import { useRipple } from 'react-use-ripple';
-import Dropdown from 'reactstrap/es/Dropdown';
-import DropdownItem from 'reactstrap/es/DropdownItem';
-import DropdownMenu from 'reactstrap/es/DropdownMenu';
-import DropdownToggle from 'reactstrap/es/DropdownToggle';
+import {
+  Dropdown, DropdownToggle, DropdownMenu, DropdownItem,
+} from 'reactstrap';
 
 
 import { apiv3Post } from '~/client/util/apiv3-client';

+ 4 - 5
apps/app/src/components/Page/CopyDropdown.jsx

@@ -6,11 +6,10 @@ import { pagePathUtils } from '@growi/core';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import Dropdown from 'reactstrap/es/Dropdown';
-import DropdownItem from 'reactstrap/es/DropdownItem';
-import DropdownMenu from 'reactstrap/es/DropdownMenu';
-import DropdownToggle from 'reactstrap/es/DropdownToggle';
-import Tooltip from 'reactstrap/es/Tooltip';
+import {
+  Dropdown, DropdownToggle, DropdownMenu, DropdownItem,
+  Tooltip,
+} from 'reactstrap';
 
 import styles from './CopyDropdown.module.scss';
 

+ 3 - 3
apps/app/src/components/PageComment/CommentEditor.tsx

@@ -4,9 +4,9 @@ import React, {
 
 import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import dynamic from 'next/dynamic';
-import Button from 'reactstrap/es/Button';
-import TabContent from 'reactstrap/es/TabContent';
-import TabPane from 'reactstrap/es/TabPane';
+import {
+  Button, TabContent, TabPane,
+} from 'reactstrap';
 import * as toastr from 'toastr';
 
 import { apiPostForm } from '~/client/util/apiv1-client';

+ 3 - 4
apps/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -6,10 +6,9 @@ import { UserPicture } from '@growi/ui/dist/components/User/UserPicture';
 import CodeMirror from 'codemirror/lib/codemirror';
 import { format, parseISO } from 'date-fns';
 import { useTranslation } from 'next-i18next';
-import Modal from 'reactstrap/es/Modal';
-import ModalBody from 'reactstrap/es/ModalBody';
-import ModalFooter from 'reactstrap/es/ModalFooter';
-import ModalHeader from 'reactstrap/es/ModalHeader';
+import {
+  Modal, ModalHeader, ModalBody, ModalFooter,
+} from 'reactstrap';
 
 import { useSaveOrUpdate } from '~/client/services/page-operation';
 import { toastError, toastSuccess } from '~/client/util/toastr';

+ 2 - 2
apps/app/src/components/PageEditor/EditorNavbarBottom.tsx

@@ -1,8 +1,8 @@
 import React, { useCallback, useState, useEffect } from 'react';
 
 import dynamic from 'next/dynamic';
-import Button from 'reactstrap/es/Button';
-import Collapse from 'reactstrap/es/Collapse';
+import { Collapse, Button } from 'reactstrap';
+
 
 import { SavePageControlsProps } from '~/components/SavePageControls';
 import { useIsSlackConfigured } from '~/stores/context';

+ 4 - 5
apps/app/src/components/PageEditor/HandsontableModal.tsx

@@ -3,11 +3,10 @@ import React, { useState, useEffect } from 'react';
 import { HotTable } from '@handsontable/react';
 import Handsontable from 'handsontable';
 import { useTranslation } from 'next-i18next';
-import Collapse from 'reactstrap/es/Collapse';
-import Modal from 'reactstrap/es/Modal';
-import ModalBody from 'reactstrap/es/ModalBody';
-import ModalFooter from 'reactstrap/es/ModalFooter';
-import ModalHeader from 'reactstrap/es/ModalHeader';
+import {
+  Collapse,
+  Modal, ModalHeader, ModalBody, ModalFooter,
+} from 'reactstrap';
 import { debounce } from 'throttle-debounce';
 
 import MarkdownTable from '~/client/models/MarkdownTable';

+ 4 - 2
apps/app/src/components/PageEditor/MarkdownTableDataImportForm.tsx

@@ -1,8 +1,10 @@
 import React, { useState } from 'react';
 
 import { useTranslation } from 'next-i18next';
-import Button from 'reactstrap/es/Button';
-import Collapse from 'reactstrap/es/Collapse';
+import {
+  Button,
+  Collapse,
+} from 'reactstrap';
 
 import MarkdownTable from '~/client/models/MarkdownTable';
 

+ 3 - 4
apps/app/src/components/PageEditor/OptionsSelector.tsx

@@ -3,10 +3,9 @@ import React, {
 } from 'react';
 
 import { useTranslation } from 'next-i18next';
-import Dropdown from 'reactstrap/es/Dropdown';
-import DropdownItem from 'reactstrap/es/DropdownItem';
-import DropdownMenu from 'reactstrap/es/DropdownMenu';
-import DropdownToggle from 'reactstrap/es/DropdownToggle';
+import {
+  Dropdown, DropdownToggle, DropdownMenu, DropdownItem,
+} from 'reactstrap';
 
 import { useIsIndentSizeForced } from '~/stores/context';
 import { useEditorSettings, useCurrentIndentSize } from '~/stores/editor';

+ 3 - 4
apps/app/src/components/RevisionComparer/RevisionComparer.tsx

@@ -3,10 +3,9 @@ import React, { useState } from 'react';
 import { IRevisionHasPageId, pagePathUtils } from '@growi/core';
 import { useTranslation } from 'next-i18next';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import Dropdown from 'reactstrap/es/Dropdown';
-import DropdownItem from 'reactstrap/es/DropdownItem';
-import DropdownMenu from 'reactstrap/es/DropdownMenu';
-import DropdownToggle from 'reactstrap/es/DropdownToggle';
+import {
+  Dropdown, DropdownToggle, DropdownMenu, DropdownItem,
+} from 'reactstrap';
 
 import { RevisionDiff } from '../PageHistory/RevisionDiff';
 

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

@@ -4,11 +4,10 @@ import EventEmitter from 'events';
 
 import { pagePathUtils } from '@growi/core';
 import { useTranslation } from 'next-i18next';
-import Button from 'reactstrap/es/Button';
-import DropdownItem from 'reactstrap/es/DropdownItem';
-import DropdownMenu from 'reactstrap/es/DropdownMenu';
-import DropdownToggle from 'reactstrap/es/DropdownToggle';
-import UncontrolledButtonDropdown from 'reactstrap/es/UncontrolledButtonDropdown';
+import {
+  UncontrolledButtonDropdown, Button,
+  DropdownToggle, DropdownMenu, DropdownItem,
+} from 'reactstrap';
 
 import { IPageGrantData } from '~/interfaces/page';
 import {

+ 2 - 3
apps/app/src/components/Sidebar/PageTree/Item.tsx

@@ -5,13 +5,12 @@ import React, {
 import nodePath from 'path';
 
 import {
-  pathUtils, pagePathUtils, Nullable,
+  pathUtils, pagePathUtils, Nullable, DevidedPagePath,
 } from '@growi/core';
 import { useTranslation } from 'next-i18next';
 import Link from 'next/link';
 import { useDrag, useDrop } from 'react-dnd';
-import DropdownToggle from 'reactstrap/es/DropdownToggle';
-import UncontrolledTooltip from 'reactstrap/es/UncontrolledTooltip';
+import { UncontrolledTooltip, DropdownToggle } from 'reactstrap';
 
 import { bookmark, unbookmark, resumeRenameOperation } from '~/client/services/page-operation';
 import { apiv3Put, apiv3Post } from '~/client/util/apiv3-client';

+ 1 - 3
apps/app/src/components/SlackNotification.tsx

@@ -2,9 +2,7 @@
 import React, { FC } from 'react';
 
 import { useTranslation } from 'next-i18next';
-import PopoverBody from 'reactstrap/es/PopoverBody';
-import PopoverHeader from 'reactstrap/es/PopoverHeader';
-import UncontrolledPopover from 'reactstrap/es/UncontrolledPopover';
+import { PopoverBody, PopoverHeader, UncontrolledPopover } from 'reactstrap';
 
 import styles from './SlackNotification.module.scss';
 

+ 1 - 3
apps/app/src/components/User/SeenUserInfo.tsx

@@ -2,9 +2,7 @@ import React, { FC, useState } from 'react';
 
 import { FootstampIcon } from '@growi/ui/dist/components/FootstampIcon';
 import { useTranslation } from 'next-i18next';
-import Popover from 'reactstrap/es/Popover';
-import PopoverBody from 'reactstrap/es/PopoverBody';
-import UncontrolledTooltip from 'reactstrap/es/UncontrolledTooltip';
+import { UncontrolledTooltip, Popover, PopoverBody } from 'reactstrap';
 
 import { IUser } from '~/interfaces/user';