Merge pull request #2007 from Shopify/revert-1994-non-primary-primaryaction

Revert "[Page] Give primaryAction more Button variants"

Author: AndrewMusgrave

CHANGELOG.md

@@ -6,10 +6,6 @@ The format is based on [these versioning and changelog guidelines][changelog-gui
 
 <!-- ## Unreleased -->
 
-### Enhancements
-
-- Updated the page component's primary action to support `Button` props. ([#1994](https://github.com/Shopify/polaris-react/pull/1994))
-
 ## 2.6.1 - 2018-08-21
 
 ### Development workflow

src/components/Page/components/Header/Header.tsx

@@ -52,13 +52,9 @@ export default class Header extends React.PureComponent<Props, State> {
     const breadcrumbMarkup =
       breadcrumbs.length > 0 ? <Breadcrumbs breadcrumbs={breadcrumbs} /> : null;
 
-    const primary =
-      primaryAction &&
-      (primaryAction.primary === undefined ? true : primaryAction.primary);
-
     const primaryActionMarkup = primaryAction ? (
       <div className={styles.PrimaryAction}>
-        {buttonsFrom(primaryAction, {primary})}
+        {buttonsFrom(primaryAction, {primary: true})}
       </div>
     ) : null;
 

src/components/Page/types.ts

@@ -1,13 +1,12 @@
 import {
   ActionListItemDescriptor,
-  Action,
   IconableAction,
   DisableableAction,
+  LoadableAction,
   BadgeAction,
 } from '../../types';
 import {PaginationDescriptor} from '../Pagination';
 import {Props as BreadcrumbProps} from '../Breadcrumbs';
-import {Props as ButtonProps} from '../Button';
 
 export type SecondaryAction = IconableAction & DisableableAction;
 
@@ -53,7 +52,7 @@ export interface HeaderProps {
   /** Collection of page-level groups of secondary actions */
   actionGroups?: ActionGroup[];
   /** Primary page-level action */
-  primaryAction?: Action & ButtonProps;
+  primaryAction?: DisableableAction & LoadableAction;
   /** Page-level pagination */
   pagination?: PaginationDescriptor;
 }