Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-06 12:20:56 +01:00
Code Issues Packages Projects Releases Activity

Merged in bugfix/pageactions_check (pull request #305)

Browse Source 
Bugfix/pageactions check
This commit is contained in:
Eduard Heimbuch
2019-09-02 12:15:48 +00:00
parent ed159fc3bc 590b06784f
commit f783e3b764
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scm-ui-components/packages/ui-components/src/layout/Page.js
View File

@@ -44,6 +44,11 @@ class Page extends React.Component<Props> {
);
}
isPageAction(node: any) {
return node.displayName === PageActions.displayName
|| (node.type && node.type.displayName === PageActions.displayName);
}
renderPageHeader() {
const { error, title, subtitle, children, classes } = this.props;
@@ -51,7 +56,7 @@ class Page extends React.Component<Props> {
let pageActionsExists = false;
React.Children.forEach(children, child => {
if (child && !error) {
if (child.type.name === PageActions.name) {
if (this.isPageAction(child)) {
pageActions = (
<div
className={classNames(
@@ -97,7 +102,7 @@ class Page extends React.Component<Props> {
let content = [];
React.Children.forEach(children, child => {
if (child) {
if (child.type.name !== PageActions.name) {
if (!this.isPageAction(child)) {
content.push(child);
}
}

6
scm-ui-components/packages/ui-components/src/layout/PageActions.js
View File

@@ -8,7 +8,9 @@ type Props = {
children: React.Node
};
class PageActions extends React.Component<Props> {
export default class PageActions extends React.Component<Props> {
static displayName = "PageActions";
render() {
return <>{this.renderContent()}</>;
}
@@ -24,5 +26,3 @@ class PageActions extends React.Component<Props> {
return children;
}
}
export default PageActions;