Merge pull request #223 from twreporter/master

chore: release
twreporter · Oct 12, 2021 · 38780c0 · 38780c0
2 parents b482bef + ffcd960
commit 38780c0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/packages/react-article-components/CHANGELOG.md b/packages/react-article-components/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.1-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.4.0...@twreporter/react-article-components@1.4.1-rc.0) (2021-10-12)
+
+**Note:** Version bump only for package @twreporter/react-article-components
+
+
+
+
+
 # [1.4.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/react-article-components@1.4.0-rc.6...@twreporter/react-article-components@1.4.0) (2021-10-12)
 
 **Note:** Version bump only for package @twreporter/react-article-components

diff --git a/packages/react-article-components/package.json b/packages/react-article-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/react-article-components",
-  "version": "1.4.0",
+  "version": "1.4.1-rc.0",
   "description": "The Reporter react article components, which are used in article page",
   "main": "lib/components/article-page.js",
   "repository": "https://github.com/twreporter/twreporter-npm-packages.git",
@@ -27,7 +27,7 @@
     "@twreporter/core": "^1.2.1",
     "@twreporter/react-components": "^8.5.0",
     "@twreporter/redux": "^7.2.0",
-    "@twreporter/universal-header": "^2.2.0",
+    "@twreporter/universal-header": "^2.2.1-rc.0",
     "howler": "^2.1.1",
     "lodash": "^4.17.11",
     "memoize-one": "^5.0.5",

diff --git a/packages/universal-header/CHANGELOG.md b/packages/universal-header/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.1-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.2.0...@twreporter/universal-header@2.2.1-rc.0) (2021-10-12)
+
+
+### Bug Fixes
+
+* **universal-header:** fix channel item cannot click in narrow header ([abd7cac](https://github.com/twreporter/twreporter-npm-packages/commit/abd7cac120242e8e5cca8dd7860d3fcce1a28144))
+
+
+
+
+
 # [2.2.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.2.0-rc.12...@twreporter/universal-header@2.2.0) (2021-10-12)
 
 **Note:** Version bump only for package @twreporter/universal-header

diff --git a/packages/universal-header/package.json b/packages/universal-header/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "2.2.0",
+  "version": "2.2.1-rc.0",
   "description": "Universal header of TWReporter sites",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/universal-header/src/components/header.js b/packages/universal-header/src/components/header.js
@@ -39,10 +39,12 @@ const styles = {
     narrow: [0, 0, 1, 0], // px
   },
   zIndex: {
-    topRow: 3,
+    flexGroup: 3,
     channelBottom: 1,
-    channelTop: 4,
-    actionButton: 5,
+    channelTop: {
+      wide: 2,
+      narrow: 4,
+    },
   },
 }
 
@@ -188,7 +190,6 @@ const TopRow = styled.div`
   flex-wrap: nowrap;
   justify-content: space-between;
   align-items: center;
-  z-index: ${styles.zIndex.topRow};
 `
 
 const ChannelContainer = styled.div`
@@ -200,6 +201,7 @@ const ChannelContainer = styled.div`
 
 const FlexGroup = styled.div`
   display: flex;
+  z-index: ${styles.zIndex.flexGroup};
 `
 
 const FlexItem = css`
@@ -219,7 +221,6 @@ const SloganContainer = styled.div`
 `
 
 const ActionContainer = styled.div`
-  z-index: ${styles.zIndex.actionButton};
   ${FlexItem}
   ${ActionEffect}
 `
@@ -243,7 +244,7 @@ const ChannelTopContainer = styled.div`
   max-width: 910px;
   height: ${styles.headerHeight.narrow}px;
   right: 186px;
-  z-index: ${styles.zIndex.channelTop};
+  z-index: ${props => styles.zIndex.channelTop[props.headerType]};
   ${FlexItem}
   ${ChannelEffect}
   ${mq.hdOnly`
@@ -300,7 +301,9 @@ const Header = ({ pathname, channels, services, actions, narrowActions }) => {
                     </CSSTransition>
                   </SloganContainer>
                 </FlexGroup>
-                <ChannelTopContainer>
+                <ChannelTopContainer
+                  headerType={toUseNarrow ? 'narrow' : 'wide'}
+                >
                   <CSSTransition
                     in={toUseNarrow}
                     classNames="channel-effect"