Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-11 16:05:44 +01:00
Code Issues Packages Projects Releases Activity

fix PageAction detection by using a static class property

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-08-28 08:07:46 +02:00
parent 5d439e9783
commit e511f723e5
2 changed files with 8 additions and 3 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() { renderPageHeader() {
const { error, title, subtitle, children, classes } = this.props; const { error, title, subtitle, children, classes } = this.props;
@@ -51,7 +56,7 @@ class Page extends React.Component<Props> {
let pageActionsExists = false; let pageActionsExists = false;
React.Children.forEach(children, child => { React.Children.forEach(children, child => {
if (child && !error) { if (child && !error) {
if (child.displayName === PageActions.displayName) { if (this.isPageAction(child)) {
pageActions = ( pageActions = (
<div <div
className={classNames( className={classNames(
@@ -97,7 +102,7 @@ class Page extends React.Component<Props> {
let content = []; let content = [];
React.Children.forEach(children, child => { React.Children.forEach(children, child => {
if (child) { if (child) {
if (child.displayName !== PageActions.displayName) { if (!this.isPageAction(child)) {
content.push(child); content.push(child);
} }
} }

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

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