Ryu Sato 5 лет назад
Родитель
Сommit
501edf3c89

+ 2 - 2
src/client/js/components/PageHistory.jsx

@@ -10,7 +10,7 @@ import PageRevisionList from './PageHistory/PageRevisionList';
 
 import PageHistroyContainer from '../services/PageHistoryContainer';
 import PaginationWrapper from './PaginationWrapper';
-import RevisionCompare from './RevisionCompare';
+import RevisionComparer from './RevisionComparer/RevisionComparer';
 import RevisionCompareContainer from '../services/RevisionCompareContainer';
 
 const logger = loggerFactory('growi:PageHistory');
@@ -77,7 +77,7 @@ function PageHistory(props) {
         onDiffOpenClicked={onDiffOpenClicked}
       />
       {pager()}
-      <RevisionCompare />
+      <RevisionComparer />
     </div>
   );
 

+ 2 - 2
src/client/js/components/PageHistory/PageRevisionList.jsx

@@ -6,7 +6,7 @@ import PageHistroyContainer from '../../services/PageHistoryContainer';
 
 import Revision from './Revision';
 import RevisionDiff from './RevisionDiff';
-import RevisionCompareTargetSelector from './RevisionCompareTargetSelector';
+import RevisionSelector from '../RevisionComparer/RevisionSelector';
 
 class PageRevisionList extends React.Component {
 
@@ -53,7 +53,7 @@ class PageRevisionList extends React.Component {
             key={`revision-history-rev-${revisionId}`}
           />
           <div className="align-self-center ml-auto">
-            <RevisionCompareTargetSelector
+            <RevisionSelector
               revision={revision}
               hasDiff={hasDiff}
               key={`revision-compare-target-selector-${revisionId}`}

+ 7 - 7
src/client/js/components/RevisionCompare.jsx → src/client/js/components/RevisionComparer/RevisionComparer.jsx

@@ -6,11 +6,11 @@ import {
   Dropdown, DropdownToggle, DropdownMenu, DropdownItem,
 } from 'reactstrap';
 
-import { withUnstatedContainers } from './UnstatedUtils';
+import { withUnstatedContainers } from '../UnstatedUtils';
 
-import RevisionCompareContainer from '../services/RevisionCompareContainer';
+import RevisionCompareContainer from '../../services/RevisionCompareContainer';
 
-import RevisionDiff from './PageHistory/RevisionDiff';
+import RevisionDiff from '../PageHistory/RevisionDiff';
 
 /* eslint-disable react/prop-types */
 const DropdownItemContents = ({ title, contents }) => (
@@ -30,7 +30,7 @@ function encodeSpaces(str) {
   return str.replace(/ /g, '%20').replace(/\u3000/g, '%E3%80%80');
 }
 
-const RevisionCompare = (props) => {
+const RevisionComparer = (props) => {
 
   const [dropdownOpen, setDropdownOpen] = useState(false);
 
@@ -112,13 +112,13 @@ const RevisionCompare = (props) => {
 /**
  * Wrapper component for using unstated
  */
-const RevisionCompareWrapper = withUnstatedContainers(RevisionCompare, [RevisionCompareContainer]);
+const RevisionComparerWrapper = withUnstatedContainers(RevisionComparer, [RevisionCompareContainer]);
 
-RevisionCompare.propTypes = {
+RevisionComparer.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   revisionCompareContainer: PropTypes.instanceOf(RevisionCompareContainer).isRequired,
 
   revisions: PropTypes.array,
 };
 
-export default withTranslation()(RevisionCompareWrapper);
+export default withTranslation()(RevisionComparerWrapper);

+ 4 - 4
src/client/js/components/PageHistory/RevisionCompareTargetSelector.jsx → src/client/js/components/RevisionComparer/RevisionSelector.jsx

@@ -6,7 +6,7 @@ import { withLoadingSppiner } from '../SuspenseUtils';
 
 import RevisionCompareContainer from '../../services/RevisionCompareContainer';
 
-const RevisionCompareTargetSelector = (props) => {
+const RevisionSelector = (props) => {
 
   const { revision, hasDiff, revisionCompareContainer } = props;
   const { fromRevision, toRevision } = revisionCompareContainer.state;
@@ -47,13 +47,13 @@ const RevisionCompareTargetSelector = (props) => {
 
 }
 
-const RevisionCompareTargetSelectorWrapper = withUnstatedContainers(withLoadingSppiner(RevisionCompareTargetSelector), [RevisionCompareContainer]);
+const RevisionSelectorWrapper = withUnstatedContainers(withLoadingSppiner(RevisionSelector), [RevisionCompareContainer]);
 
-RevisionCompareTargetSelector.propTypes = {
+RevisionSelector.propTypes = {
   revisionCompareContainer: PropTypes.instanceOf(RevisionCompareContainer).isRequired,
 
   revision: PropTypes.object,
   hasDiff: PropTypes.bool.isRequired,
 };
 
-export default RevisionCompareTargetSelectorWrapper;
+export default RevisionSelectorWrapper;