|
|
@@ -16,8 +16,6 @@ import { withUnstatedContainers } from './UnstatedUtils';
|
|
|
import PageAccessoriesContainer from '../services/PageAccessoriesContainer';
|
|
|
import PageAttachment from './PageAttachment';
|
|
|
import PageHistory from './PageHistory';
|
|
|
-import { appContainer } from '../base';
|
|
|
-import PageContainer from '../services/PageContainer';
|
|
|
|
|
|
const PageAccessoriesModal = (props) => {
|
|
|
const { t, pageAccessoriesContainer } = props;
|
|
|
@@ -81,8 +79,8 @@ const PageAccessoriesModal = (props) => {
|
|
|
<TabPane tabId="pagelist"></TabPane>
|
|
|
<TabPane tabId="timeline"></TabPane>
|
|
|
<TabPane tabId="recent-changes">
|
|
|
- <div style={{ overflowX: 'auto' }}>
|
|
|
- <PageHistory pageId={props.pageContainer.state.pageId} crowi={appContainer} />
|
|
|
+ <div className="overflow-auto">
|
|
|
+ {pageAccessoriesContainer.state.activeComponents.has('recent-changes') && <PageHistory /> }
|
|
|
</div>
|
|
|
</TabPane>
|
|
|
<TabPane tabId="attachment" className="p-4">
|
|
|
@@ -98,11 +96,11 @@ const PageAccessoriesModal = (props) => {
|
|
|
/**
|
|
|
* Wrapper component for using unstated
|
|
|
*/
|
|
|
-const PageAccessoriesModalWrapper = withUnstatedContainers(PageAccessoriesModal, [PageAccessoriesContainer, PageContainer]);
|
|
|
+const PageAccessoriesModalWrapper = withUnstatedContainers(PageAccessoriesModal, [PageAccessoriesContainer]);
|
|
|
|
|
|
PageAccessoriesModal.propTypes = {
|
|
|
t: PropTypes.func.isRequired, // i18next
|
|
|
- pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
|
|
|
+ // pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
|
|
|
pageAccessoriesContainer: PropTypes.instanceOf(PageAccessoriesContainer).isRequired,
|
|
|
|
|
|
isOpen: PropTypes.bool.isRequired,
|