From abd7cac120242e8e5cca8dd7860d3fcce1a28144 Mon Sep 17 00:00:00 2001 From: Aylie Chou Date: Tue, 12 Oct 2021 08:15:17 +0000 Subject: [PATCH 1/2] fix(universal-header): fix channel item cannot click in narrow header --- .../universal-header/src/components/header.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/universal-header/src/components/header.js b/packages/universal-header/src/components/header.js index 5703d0f67..cf6446c6b 100644 --- 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 }) => { - + Date: Tue, 12 Oct 2021 08:39:16 +0000 Subject: [PATCH 2/2] chore(prerelease): bump version - @twreporter/react-article-components@1.4.1-rc.0 - @twreporter/universal-header@2.2.1-rc.0 --- packages/react-article-components/CHANGELOG.md | 8 ++++++++ packages/react-article-components/package.json | 4 ++-- packages/universal-header/CHANGELOG.md | 11 +++++++++++ packages/universal-header/package.json | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/packages/react-article-components/CHANGELOG.md b/packages/react-article-components/CHANGELOG.md index d74f4b915..5fdc764cc 100644 --- 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 index 759c99435..846f59509 100644 --- 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 index f50a275ca..50e104876 100644 --- 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 index 598b214ac..6c4a53bdc 100644 --- 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": {