fix(Shell): header should be able to be removed

alibaba-fusion · Oct 11, 2019 · c1ef847 · c1ef847
1 parent b68cbf9
commit c1ef847
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/src/shell/shell.jsx b/src/shell/shell.jsx
@@ -342,7 +342,7 @@ export default function ShellBase(props) {
                 }
 
                 if (!branding) {
-                    layout.header.Branding = trigger;
+                    trigger && (layout.header.Branding = trigger);
                 } else {
                     layout.header.Branding = React.cloneElement(branding, {}, [
                         trigger,
@@ -520,7 +520,7 @@ export default function ShellBase(props) {
             }
 
             // 按照dom结构, arr 包括 header Navigation ToolDock 和 innerArr
-            if (layout.header) {
+            if (Object.keys(layout.header).length > 0) {
                 headerDom = (
                     <header key="header" className={headerCls}>
                         {layout.header.Branding}

diff --git a/test/shell/index-spec.js b/test/shell/index-spec.js
@@ -228,5 +228,35 @@ describe('Shell', () => {
 
             assert(wrapper.find('.next-shell-navigation.next-shell-collapse'));
         });
+
+        it('should support no header', () => {
+            wrapper = render(
+            <Shell className={"iframe-hack"} style={{border: '1px solid #eee'}}>
+                 <Shell.Navigation trigger={null}>
+                    <Nav embeddable aria-label="global navigation">
+                        <Nav.Item icon="account">Nav Item 1</Nav.Item>
+                        <Nav.Item icon="calendar">Nav Item 2</Nav.Item>
+                        <Nav.Item icon="atm">Nav Item 3</Nav.Item>
+                        <Nav.Item icon="account">Nav Item 4</Nav.Item>
+                        <Nav.Item icon="account">Nav Item 5</Nav.Item>
+                        <Nav.Item icon="account">Nav Item 6</Nav.Item>
+                        <Nav.Item icon="account">Nav Item 7</Nav.Item>
+                    </Nav>
+                </Shell.Navigation>
+
+                <Shell.Content>
+                    <div style={{minHeight: 1200, background: '#fff'}}></div>
+                </Shell.Content>
+
+                <Shell.Footer>
+                    <span>Alibaba Fusion</span>
+                    <span>@ 2019 Alibaba Piecework 版权所有</span>
+                </Shell.Footer>
+            </Shell>
+            );
+
+            assert(wrapper.find('.next-shell-header').length === 0);
+        });
+
     });
 });