Merge with 2.0.0-m3

scm-ui-components/packages/ui-components/src/layout/Page.js

@@ -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);
         }
       }

scm-ui-components/packages/ui-components/src/layout/PageActions.js

@@ -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;

scm-ui-components/packages/ui-components/src/modals/Modal.js

@@ -28,7 +28,7 @@ class Modal extends React.Component<Props> {
         <div className="modal-background" />
         <div className="modal-card">
           <header className="modal-card-head">
-            <p className="modal-card-title">{title}</p>
+            <p className="modal-card-title is-marginless">{title}</p>
             <button
               className="delete"
               aria-label="close"