Merge branch 'master' into content-block-headlines-css-grid

carbon-design-system · Feb 4, 2021 · f8e8300 · f8e8300
2 parents d20b16a + b35605c
commit f8e8300
Show file tree

Hide file tree

Showing 15 changed files with 121 additions and 218 deletions.
diff --git a/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap b/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap
@@ -38449,6 +38449,7 @@ exports[`Storyshots Components|Dotcom Shell Default (footer language only) 1`] =
                       </SkipToContent>
                       <HeaderMenuButton
                         aria-label="Open menu"
+                        className=""
                         data-autoid="dds--masthead-default-sidenav__l0-menu"
                         isActive={false}
                         onClick={[Function]}
@@ -45382,6 +45383,7 @@ exports[`Storyshots Components|Dotcom Shell Default 1`] = `
                     </SkipToContent>
                     <HeaderMenuButton
                       aria-label="Open menu"
+                      className=""
                       data-autoid="dds--masthead-default-sidenav__l0-menu"
                       isActive={false}
                       onClick={[Function]}
@@ -51123,6 +51125,48 @@ exports[`Storyshots Components|Dotcom Shell Search open 1`] = `
                           Skip to main content
                         </a>
                       </SkipToContent>
+                      <HeaderMenuButton
+                        aria-label="Open menu"
+                        className="bx--masthead__header--search-active"
+                        data-autoid="dds--masthead-default-sidenav__l0-menu"
+                        isActive={false}
+                        onClick={[Function]}
+                      >
+                        <button
+                          aria-label="Open menu"
+                          className="bx--masthead__header--search-active bx--header__action bx--header__menu-trigger bx--header__menu-toggle bx--header__menu-toggle__hidden"
+                          data-autoid="dds--masthead-default-sidenav__l0-menu"
+                          onClick={[Function]}
+                          title="Open menu"
+                          type="button"
+                        >
+                          <ForwardRef(Menu20)>
+                            <Icon
+                              fill="currentColor"
+                              height={20}
+                              preserveAspectRatio="xMidYMid meet"
+                              viewBox="0 0 20 20"
+                              width={20}
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <svg
+                                aria-hidden={true}
+                                fill="currentColor"
+                                focusable="false"
+                                height={20}
+                                preserveAspectRatio="xMidYMid meet"
+                                viewBox="0 0 20 20"
+                                width={20}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M2 14.8H18V16H2zM2 11.2H18V12.399999999999999H2zM2 7.6H18V8.799999999999999H2zM2 4H18V5.2H2z"
+                                />
+                              </svg>
+                            </Icon>
+                          </ForwardRef(Menu20)>
+                        </button>
+                      </HeaderMenuButton>
                       <IbmLogo
                         autoid="dds--masthead-default__l0-logo"
                         isSearchActive={true}
@@ -59226,6 +59270,7 @@ exports[`Storyshots Components|Dotcom Shell With L1 1`] = `
                       </SkipToContent>
                       <HeaderMenuButton
                         aria-label="Open menu"
+                        className=""
                         data-autoid="dds--masthead-alt-sidenav__l0-menu"
                         isActive={false}
                         onClick={[Function]}
@@ -68517,6 +68562,7 @@ exports[`Storyshots Components|Dotcom Shell With micro footer (language only) 1`
                       </SkipToContent>
                       <HeaderMenuButton
                         aria-label="Open menu"
+                        className=""
                         data-autoid="dds--masthead-default-sidenav__l0-menu"
                         isActive={false}
                         onClick={[Function]}
@@ -74455,6 +74501,7 @@ exports[`Storyshots Components|Dotcom Shell With micro footer 1`] = `
                       </SkipToContent>
                       <HeaderMenuButton
                         aria-label="Open menu"
+                        className=""
                         data-autoid="dds--masthead-default-sidenav__l0-menu"
                         isActive={false}
                         onClick={[Function]}
@@ -80101,13 +80148,14 @@ exports[`Storyshots Components|Dotcom Shell With platform 1`] = `
                       </SkipToContent>
                       <HeaderMenuButton
                         aria-label="Open menu"
+                        className="bx--masthead__platform"
                         data-autoid="dds--masthead-eco-sidenav__l0-menu"
                         isActive={false}
                         onClick={[Function]}
                       >
                         <button
                           aria-label="Open menu"
-                          className="bx--header__action bx--header__menu-trigger bx--header__menu-toggle bx--header__menu-toggle__hidden"
+                          className="bx--masthead__platform bx--header__action bx--header__menu-trigger bx--header__menu-toggle bx--header__menu-toggle__hidden"
                           data-autoid="dds--masthead-eco-sidenav__l0-menu"
                           onClick={[Function]}
                           title="Open menu"
@@ -86309,6 +86357,7 @@ exports[`Storyshots Components|Dotcom Shell With short footer (language only) 1`
                       </SkipToContent>
                       <HeaderMenuButton
                         aria-label="Open menu"
+                        className=""
                         data-autoid="dds--masthead-default-sidenav__l0-menu"
                         isActive={false}
                         onClick={[Function]}
@@ -93308,6 +93357,7 @@ exports[`Storyshots Components|Dotcom Shell With short footer 1`] = `
                       </SkipToContent>
                       <HeaderMenuButton
                         aria-label="Open menu"
+                        className=""
                         data-autoid="dds--masthead-default-sidenav__l0-menu"
                         isActive={false}
                         onClick={[Function]}
@@ -115925,6 +115975,7 @@ exports[`Storyshots Components|Masthead Default 1`] = `
                   </SkipToContent>
                   <HeaderMenuButton
                     aria-label="Open menu"
+                    className=""
                     data-autoid="dds--masthead-default-sidenav__l0-menu"
                     isActive={false}
                     onClick={[Function]}
@@ -116480,6 +116531,48 @@ exports[`Storyshots Components|Masthead Search open by default 1`] = `
                       Skip to main content
                     </a>
                   </SkipToContent>
+                  <HeaderMenuButton
+                    aria-label="Open menu"
+                    className="bx--masthead__header--search-active"
+                    data-autoid="dds--masthead-default-sidenav__l0-menu"
+                    isActive={false}
+                    onClick={[Function]}
+                  >
+                    <button
+                      aria-label="Open menu"
+                      className="bx--masthead__header--search-active bx--header__action bx--header__menu-trigger bx--header__menu-toggle bx--header__menu-toggle__hidden"
+                      data-autoid="dds--masthead-default-sidenav__l0-menu"
+                      onClick={[Function]}
+                      title="Open menu"
+                      type="button"
+                    >
+                      <ForwardRef(Menu20)>
+                        <Icon
+                          fill="currentColor"
+                          height={20}
+                          preserveAspectRatio="xMidYMid meet"
+                          viewBox="0 0 20 20"
+                          width={20}
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <svg
+                            aria-hidden={true}
+                            fill="currentColor"
+                            focusable="false"
+                            height={20}
+                            preserveAspectRatio="xMidYMid meet"
+                            viewBox="0 0 20 20"
+                            width={20}
+                            xmlns="http://www.w3.org/2000/svg"
+                          >
+                            <path
+                              d="M2 14.8H18V16H2zM2 11.2H18V12.399999999999999H2zM2 7.6H18V8.799999999999999H2zM2 4H18V5.2H2z"
+                            />
+                          </svg>
+                        </Icon>
+                      </ForwardRef(Menu20)>
+                    </button>
+                  </HeaderMenuButton>
                   <IbmLogo
                     autoid="dds--masthead-default__l0-logo"
                     isSearchActive={true}
@@ -118914,6 +119007,7 @@ exports[`Storyshots Components|Masthead With Custom Navigation 1`] = `
                     </SkipToContent>
                     <HeaderMenuButton
                       aria-label="Open menu"
+                      className=""
                       data-autoid="dds--masthead-default-sidenav__l0-menu"
                       isActive={false}
                       onClick={[Function]}
@@ -124358,6 +124452,7 @@ exports[`Storyshots Components|Masthead With L 1 1`] = `
                     </SkipToContent>
                     <HeaderMenuButton
                       aria-label="Open menu"
+                      className=""
                       data-autoid="dds--masthead-alt-sidenav__l0-menu"
                       isActive={false}
                       onClick={[Function]}
@@ -128096,13 +128191,14 @@ exports[`Storyshots Components|Masthead With Platform 1`] = `
                     </SkipToContent>
                     <HeaderMenuButton
                       aria-label="Open menu"
+                      className="bx--masthead__platform"
                       data-autoid="dds--masthead-eco-sidenav__l0-menu"
                       isActive={false}
                       onClick={[Function]}
                     >
                       <button
                         aria-label="Open menu"
-                        className="bx--header__action bx--header__menu-trigger bx--header__menu-toggle bx--header__menu-toggle__hidden"
+                        className="bx--masthead__platform bx--header__action bx--header__menu-trigger bx--header__menu-toggle bx--header__menu-toggle__hidden"
                         data-autoid="dds--masthead-eco-sidenav__l0-menu"
                         onClick={[Function]}
                         title="Open menu"
@@ -128688,6 +128784,7 @@ exports[`Storyshots Components|Masthead With logo data 1`] = `
                   </SkipToContent>
                   <HeaderMenuButton
                     aria-label="Open menu"
+                    className=""
                     data-autoid="dds--masthead-default-sidenav__l0-menu"
                     isActive={false}
                     onClick={[Function]}

diff --git a/packages/react/src/components/Masthead/Masthead.js b/packages/react/src/components/Masthead/Masthead.js
@@ -211,12 +211,13 @@ const Masthead = ({
                 data-autoid={`${stablePrefix}--masthead`}>
                 <SkipToContent />
 
-                {(mastheadL1Data || navigation) && !isSearchActive && (
+                {(mastheadL1Data || navigation) && (
                   <HeaderMenuButton
                     aria-label={isSideNavExpanded ? 'Close menu' : 'Open menu'}
                     data-autoid={`${stablePrefix}--masthead-${navType}-sidenav__l0-menu`}
                     onClick={onClickSideNavExpand}
                     isActive={isSideNavExpanded}
+                    className={headerSearchClasses}
                   />
                 )}
 

diff --git a/packages/services/src/services/Profile/Profile.js b/packages/services/src/services/Profile/Profile.js
@@ -50,7 +50,11 @@ class ProfileAPI {
         },
         withCredentials: true,
       })
-      .then(response => response.data);
+      .then(response => response.data)
+      .catch(error => {
+        console.log('Failed Profile Network Call', error);
+        return { user: 'Unauthenticated' };
+      });
   }
 }
 

diff --git a/packages/styles/scss/components/masthead/_masthead-leftnav.scss b/packages/styles/scss/components/masthead/_masthead-leftnav.scss
@@ -51,6 +51,12 @@
       }
     }
 
+    &.#{$prefix}--masthead__header--search-active {
+      @include carbon--breakpoint-down('md') {
+        display: none;
+      }
+    }
+
     @include carbon--breakpoint-between('md', 'lg') {
       + .#{$prefix}--header__logo {
         a {

diff --git a/packages/web-components/examples/codesandbox/components/masthead-search/.gitignore b/packages/web-components/examples/codesandbox/components/masthead-search/.gitignore
diff --git a/packages/web-components/examples/codesandbox/components/masthead-search/index.html b/packages/web-components/examples/codesandbox/components/masthead-search/index.html
diff --git a/packages/web-components/examples/codesandbox/components/masthead-search/package.json b/packages/web-components/examples/codesandbox/components/masthead-search/package.json
diff --git a/packages/web-components/examples/codesandbox/components/masthead-search/sandbox.config.json b/packages/web-components/examples/codesandbox/components/masthead-search/sandbox.config.json
diff --git a/packages/web-components/examples/codesandbox/components/masthead-search/snowpack.config.json b/packages/web-components/examples/codesandbox/components/masthead-search/snowpack.config.json