remove defualt and remove comment

ant-design · Oct 15, 2019 · 563ef29 · 563ef29
1 parent bae3484
commit 563ef29
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/components/config-provider/index.tsx b/components/config-provider/index.tsx
@@ -51,7 +51,7 @@ class ConfigProvider extends React.Component<ConfigProviderProps> {
       csp,
       autoInsertSpaceInButton,
       locale,
-      pageHeader = { ghost: true },
+      pageHeader,
     } = this.props;
 
     const config: ConfigConsumerProps = {
@@ -64,13 +64,12 @@ class ConfigProvider extends React.Component<ConfigProviderProps> {
     if (getPopupContainer) {
       config.getPopupContainer = getPopupContainer;
     }
+
     if (renderEmpty) {
       config.renderEmpty = renderEmpty;
     }
 
-    // set pageHeader type
-    // 防止设置为 null 报错
-    if (pageHeader && pageHeader.ghost) {
+    if (pageHeader) {
       config.pageHeader = pageHeader;
     }
 

diff --git a/components/page-header/index.tsx b/components/page-header/index.tsx
@@ -90,24 +90,30 @@ const renderChildren = (prefixCls: string, children: React.ReactNode) => {
 
 const PageHeader: React.SFC<PageHeaderProps> = props => (
   <ConfigConsumer>
-    {({ getPrefixCls, pageHeader = { ghost: true } }: ConfigConsumerProps) => {
+    {({ getPrefixCls, pageHeader }: ConfigConsumerProps) => {
       const {
         prefixCls: customizePrefixCls,
         style,
         footer,
         children,
-        ghost = true,
         breadcrumb,
         className: customizeClassName,
       } = props;
+      let ghost: undefined | boolean = true;
+
+      // Use `ghost` from `props` or from `ConfigProvider` instead.
+      if ('ghost' in props) {
+        ghost = props.ghost;
+      } else if (pageHeader && 'ghost' in pageHeader) {
+        ghost = pageHeader.ghost;
+      }
 
       const prefixCls = getPrefixCls('page-header', customizePrefixCls);
       const breadcrumbDom = breadcrumb && breadcrumb.routes ? renderBreadcrumb(breadcrumb) : null;
       const className = classnames(prefixCls, customizeClassName, {
         'has-breadcrumb': breadcrumbDom,
         'has-footer': footer,
-        // 防止设置为 null 报错
-        [`${prefixCls}-ghost`]: ghost || (pageHeader && ghost === undefined && pageHeader.ghost),
+        [`${prefixCls}-ghost`]: ghost,
       });
 
       return (