Parcourir la source

conversion on RevisionLoader.jsx

Kami-jo il y a 3 ans
Parent
commit
8687308181
1 fichiers modifiés avec 13 ajouts et 12 suppressions
  1. 13 12
      packages/app/src/components/Page/RevisionLoader.jsx

+ 13 - 12
packages/app/src/components/Page/RevisionLoader.jsx

@@ -1,10 +1,9 @@
 import React from 'react';
 
 import PropTypes from 'prop-types';
-import { withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 import { Waypoint } from 'react-waypoint';
 
-import AppContainer from '~/client/services/AppContainer';
 import GrowiRenderer from '~/client/util/GrowiRenderer';
 import { apiv3Get } from '~/client/util/apiv3-client';
 import loggerFactory from '~/utils/logger';
@@ -17,7 +16,7 @@ import RevisionRenderer from './RevisionRenderer';
 /**
  * Load data from server and render RevisionBody component
  */
-class LegacyRevisionLoader extends React.Component {
+class RevisionLoader extends React.Component {
 
   constructor(props) {
     super(props);
@@ -122,13 +121,8 @@ class LegacyRevisionLoader extends React.Component {
 
 }
 
-/**
- * Wrapper component for using unstated
- */
-const LegacyRevisionLoaderWrapper = withTranslation()(withUnstatedContainers(LegacyRevisionLoader, [AppContainer]));
 
-LegacyRevisionLoader.propTypes = {
-  appContainer: PropTypes.instanceOf(AppContainer).isRequired,
+RevisionLoader.propTypes = {
   t: PropTypes.func.isRequired,
 
   growiRenderer: PropTypes.instanceOf(GrowiRenderer).isRequired,
@@ -140,7 +134,14 @@ LegacyRevisionLoader.propTypes = {
   highlightKeywords: PropTypes.arrayOf(PropTypes.string),
 };
 
-const RevisionLoader = (props) => {
-  return <LegacyRevisionLoaderWrapper {...props}></LegacyRevisionLoaderWrapper>;
+const RevisionLoaderWrapperFC = (props) => {
+  const { t } = useTranslation();
+  return <RevisionLoader t={t} {...props} />;
 };
-export default RevisionLoader;
+
+/**
+ * Wrapper component for using unstated
+ */
+const RevisionLoaderWrapper = withUnstatedContainers(RevisionLoaderWrapperFC, []);
+
+export default RevisionLoaderWrapper;