瀏覽代碼

add pageConatiner

itizawa 5 年之前
父節點
當前提交
14b0e096a8
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 1 1
      src/client/js/app.jsx
  2. 5 5
      src/client/js/components/PageHistory.jsx

+ 1 - 1
src/client/js/app.jsx

@@ -142,7 +142,7 @@ $('a[data-toggle="tab"][href="#revision-history"]').on('show.bs.tab', () => {
     <I18nextProvider i18n={i18n}>
     <I18nextProvider i18n={i18n}>
       <ErrorBoundary>
       <ErrorBoundary>
         <Provider inject={injectableContainers}>
         <Provider inject={injectableContainers}>
-          <PageHistory shareLinkId={pageContainer.state.shareLinkId} pageId={pageContainer.state.pageId} />
+          <PageHistory />
         </Provider>
         </Provider>
       </ErrorBoundary>
       </ErrorBoundary>
     </I18nextProvider>, document.getElementById('revision-history'),
     </I18nextProvider>, document.getElementById('revision-history'),

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

@@ -7,6 +7,7 @@ import { withUnstatedContainers } from './UnstatedUtils';
 
 
 import PageRevisionList from './PageHistory/PageRevisionList';
 import PageRevisionList from './PageHistory/PageRevisionList';
 import AppContainer from '../services/AppContainer';
 import AppContainer from '../services/AppContainer';
+import PageContainer from '../services/PageContainer';
 
 
 const logger = loggerFactory('growi:PageHistory');
 const logger = loggerFactory('growi:PageHistory');
 class PageHistory extends React.Component {
 class PageHistory extends React.Component {
@@ -28,8 +29,8 @@ class PageHistory extends React.Component {
   }
   }
 
 
   async componentWillMount() {
   async componentWillMount() {
-    const { appContainer, pageId } = this.props;
-    const shareLinkId = this.props.shareLinkId || null;
+    const { appContainer, pageContainer } = this.props;
+    const { shareLinkId, pageId } = pageContainer.state;
 
 
     if (!pageId) {
     if (!pageId) {
       return;
       return;
@@ -171,16 +172,15 @@ class PageHistory extends React.Component {
 
 
 }
 }
 
 
-const PageHistoryWrapper = withUnstatedContainers(PageHistory, [AppContainer]);
+const PageHistoryWrapper = withUnstatedContainers(PageHistory, [AppContainer, PageContainer]);
 
 
 
 
 PageHistory.propTypes = {
 PageHistory.propTypes = {
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
+  pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
 
 
   t: PropTypes.func.isRequired, // i18next
   t: PropTypes.func.isRequired, // i18next
 
 
-  shareLinkId: PropTypes.string,
-  pageId: PropTypes.string,
 };
 };
 
 
 export default withTranslation()(PageHistoryWrapper);
 export default withTranslation()(PageHistoryWrapper);