Web: Common: Moved isEmptyPage out of Section
This commit is contained in:
parent
ffabcea9d6
commit
f49e714bf0
@ -479,6 +479,7 @@ class PureHome extends React.Component {
|
||||
showFilter,
|
||||
frameConfig,
|
||||
withPaging,
|
||||
isEmptyFilesList,
|
||||
} = this.props;
|
||||
|
||||
if (window.parent && !frameConfig) {
|
||||
@ -523,13 +524,15 @@ class PureHome extends React.Component {
|
||||
)}
|
||||
</Section.SectionHeader>
|
||||
|
||||
<Section.SectionFilter>
|
||||
{isFrame ? (
|
||||
showFilter && <SectionFilterContent />
|
||||
) : (
|
||||
<SectionFilterContent />
|
||||
)}
|
||||
</Section.SectionFilter>
|
||||
{!isEmptyFilesList && (
|
||||
<Section.SectionFilter>
|
||||
{isFrame ? (
|
||||
showFilter && <SectionFilterContent />
|
||||
) : (
|
||||
<SectionFilterContent />
|
||||
)}
|
||||
</Section.SectionFilter>
|
||||
)}
|
||||
|
||||
<Section.SectionBody>
|
||||
<Consumer>
|
||||
@ -604,6 +607,7 @@ export default inject(
|
||||
createRoom,
|
||||
refreshFiles,
|
||||
setViewAs,
|
||||
isEmptyFilesList,
|
||||
} = filesStore;
|
||||
|
||||
const { gallerySelected } = oformsStore;
|
||||
@ -737,6 +741,7 @@ export default inject(
|
||||
refreshFiles,
|
||||
setViewAs,
|
||||
withPaging,
|
||||
isEmptyFilesList,
|
||||
};
|
||||
}
|
||||
)(withRouter(observer(Home)));
|
||||
|
@ -153,7 +153,6 @@ class Section extends React.Component {
|
||||
settingsStudio,
|
||||
clearUploadedFilesHistory,
|
||||
withPaging,
|
||||
isEmptyPage,
|
||||
} = this.props;
|
||||
|
||||
let sectionHeaderContent = null;
|
||||
@ -194,7 +193,7 @@ class Section extends React.Component {
|
||||
});
|
||||
|
||||
const isSectionHeaderAvailable = !!sectionHeaderContent,
|
||||
isSectionFilterAvailable = !!sectionFilterContent && !isEmptyPage,
|
||||
isSectionFilterAvailable = !!sectionFilterContent,
|
||||
isSectionPagingAvailable = !!sectionPagingContent,
|
||||
isSectionBodyAvailable =
|
||||
!!sectionBodyContent ||
|
||||
@ -448,7 +447,7 @@ Section.SectionFilter = SectionFilter;
|
||||
Section.SectionBody = SectionBody;
|
||||
Section.SectionPaging = SectionPaging;
|
||||
|
||||
export default inject(({ auth, filesStore }) => {
|
||||
export default inject(({ auth }) => {
|
||||
const { infoPanelStore, settingsStore } = auth;
|
||||
const {
|
||||
isHeaderVisible,
|
||||
@ -461,8 +460,6 @@ export default inject(({ auth, filesStore }) => {
|
||||
|
||||
const { isVisible: infoPanelIsVisible } = infoPanelStore;
|
||||
|
||||
const { isEmptyFilesList: isEmptyPage } = filesStore;
|
||||
|
||||
return {
|
||||
isTabletView,
|
||||
isHeaderVisible,
|
||||
@ -474,7 +471,5 @@ export default inject(({ auth, filesStore }) => {
|
||||
showText,
|
||||
|
||||
infoPanelIsVisible,
|
||||
|
||||
isEmptyPage,
|
||||
};
|
||||
})(observer(Section));
|
||||
|
Loading…
Reference in New Issue
Block a user