@twreporter/universal-header 2.4.0-rc.4 → 2.4.0-rc.5

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.4.0-rc.5](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.4.0-rc.4...@twreporter/universal-header@2.4.0-rc.5) (2022-11-07)
+
+
+### Bug Fixes
+
+* address defects ([a33aa3b](https://github.com/twreporter/twreporter-npm-packages/commit/a33aa3bf55fd9b1bf5472a4a13de942a9f8757ca))
+* remove console.log ([97eb713](https://github.com/twreporter/twreporter-npm-packages/commit/97eb7135bbdb1923d5050a805cebf5207e29e6f5))
+
+
+
+
+
 # [2.4.0-rc.4](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.4.0-rc.3...@twreporter/universal-header@2.4.0-rc.4) (2022-10-31)
 
 **Note:** Version bump only for package @twreporter/universal-header

package/lib/components/channels.js

@@ -53,7 +53,7 @@ var Item = /*#__PURE__*/_styledComponents["default"].div.withConfig({
 var CategoryContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "channels__CategoryContainer",
   componentId: "nu2llv-1"
-})(["display:flex;align-items:center;justify-content:space-between;width:calc(100% - 32px);padding:8px 16px;"]);
+})(["display:flex;align-items:center;justify-content:space-between;width:100%;padding:8px 16px;"]);
 
 var ChannelContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "channels__ChannelContainer",

package/lib/components/hamburger-menu.js

@@ -184,7 +184,7 @@ var DropdownContent = function DropdownContent(_ref) {
         path = "/categories/".concat(_categorySet.CATEGORY_PATH[itemKey]);
 
         if (subItem.key !== 'all') {
-          path += "/{subItem.key}";
+          path += "/".concat(subItem.key);
         }
       }
 
@@ -343,10 +343,13 @@ var HamburgerMenu = function HamburgerMenu(_ref2) {
     iconComponent: CloseIcon,
     theme: menuTheme,
     onClick: handleClose
-  })), /*#__PURE__*/_react["default"].createElement(LogoSection, null, /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], logoLink, /*#__PURE__*/_react["default"].createElement(_logo.LogoSymbol, {
+  })), /*#__PURE__*/_react["default"].createElement(LogoSection, null, /*#__PURE__*/_react["default"].createElement(_customizedLink["default"], _extends({}, logoLink, {
+    onClick: handleClose
+  }), /*#__PURE__*/_react["default"].createElement(_logo.LogoSymbol, {
     type: logoType
   }))), /*#__PURE__*/_react["default"].createElement(SearchSection, null, /*#__PURE__*/_react["default"].createElement(_input.SearchBar, {
-    onSearch: onSearch
+    onSearch: onSearch,
+    autofocus: false
   })), /*#__PURE__*/_react["default"].createElement(Content, null), /*#__PURE__*/_react["default"].createElement(_hamburgerFooter["default"], null), /*#__PURE__*/_react["default"].createElement(ActionSection, null, /*#__PURE__*/_react["default"].createElement(_actionButton["default"], {
     actions: actions,
     direction: "column"

package/lib/components/header.js

@@ -108,7 +108,7 @@ var HeaderSection = /*#__PURE__*/_styledComponents["default"].div.withConfig({
 var LogoContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "header__LogoContainer",
   componentId: "sc-1krza7i-2"
-})(["display:flex;align-items:center;margin-right:16px;"]);
+})(["display:flex;align-items:center;a{display:flex;}"]);
 
 var HideWhenNarrow = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "header__HideWhenNarrow",

package/lib/components/icons.js

@@ -13,6 +13,8 @@ var _querystring = _interopRequireDefault(require("querystring"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
+var _CSSTransition = _interopRequireDefault(require("react-transition-group/CSSTransition"));
+
 var _headerContext = _interopRequireDefault(require("../contexts/header-context"));
 
 var _links = require("../utils/links");
@@ -55,7 +57,7 @@ var IconsContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
 var IconContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "icons__IconContainer",
   componentId: "ay66zn-1"
-})(["position:relative;margin-right:16px;a{display:flex;}"]);
+})(["position:relative;margin-right:16px;&:last-child{margin-right:0;}a{display:flex;}"]);
 
 var Container = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "icons__Container",
@@ -72,7 +74,7 @@ var LogContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
 var SearchContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "icons__SearchContainer",
   componentId: "ay66zn-4"
-})(["opacity:", ";transition:opacity 300ms ease;position:absolute;right:0;top:-16px;z-index:", ";"], function (props) {
+})(["opacity:", ";transition:opacity 300ms ease;position:absolute;right:0;top:-8px;z-index:", ";"], function (props) {
   return props.isSearchOpened ? '1' : '0';
 }, function (props) {
   return props.isSearchOpened ? 999 : -1;
@@ -110,7 +112,7 @@ var LogInOutIcon = function LogInOutIcon() {
       destination: redirectURL
     });
 
-    window.location = (0, _links.getLogoutLink)(releaseBranch).to + '?' + query;
+    window.location = (0, _links.getLoginLink)(releaseBranch).to + '?' + query;
   };
 
   var onClickLogOut = function onClickLogOut(e) {
@@ -121,7 +123,7 @@ var LogInOutIcon = function LogInOutIcon() {
       destination: redirectURL
     });
 
-    window.location = (0, _links.getLoginLink)(releaseBranch).to + '?' + query;
+    window.location = (0, _links.getLogoutLink)(releaseBranch).to + '?' + query;
   };
 
   var closeDialog = function closeDialog() {
@@ -142,12 +144,21 @@ var LogInOutIcon = function LogInOutIcon() {
   }, /*#__PURE__*/_react["default"].createElement(_button.IconButton, {
     iconComponent: Icon,
     theme: theme
-  }), /*#__PURE__*/_react["default"].createElement(StyledDialog, {
+  }), /*#__PURE__*/_react["default"].createElement(_CSSTransition["default"], {
+    "in": showDialog,
+    classNames: "dialog-effect",
+    timeout: {
+      appear: 0,
+      enter: 100,
+      exit: 100
+    },
+    unmountOnExit: true
+  }, /*#__PURE__*/_react["default"].createElement(StyledDialog, {
     text: "\u767B\u51FA",
     size: "L",
     showDialog: showDialog,
     onClick: onClickLogOut
-  })));
+  }))));
 };
 
 var SearchIcon = function SearchIcon() {
@@ -208,7 +219,8 @@ var SearchIcon = function SearchIcon() {
     placeholder: "\u95DC\u9375\u5B57\u641C\u5C0B",
     theme: theme,
     onClose: closeSearchBox,
-    onSearch: onSearch
+    onSearch: onSearch,
+    handleBlur: closeSearchBox
   })));
 };
 

package/lib/components/slogan.js

@@ -30,9 +30,9 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 var SloganContainer = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "slogan__SloganContainer",
   componentId: "sc-1eoofl8-0"
-})(["color:", ";display:flex;align-items:center;cursor:default;font-family:", ";font-weight:", ";"], function (props) {
+})(["color:", ";display:flex;align-items:center;cursor:default;font-family:", ";font-weight:", ";font-size:14px;"], function (props) {
   return props.color;
-}, _font.fontFamily.title, _font.fontWeight.bold);
+}, _font.fontFamily.title, _font.fontWeight.normal);
 
 var Slogan = function Slogan(_ref) {
   var props = _extends({}, _ref);

package/lib/utils/links.js

@@ -66,11 +66,14 @@ var defaultReleaseBranch = _releaseBranch["default"].master;
 var defaultIsExternal = false;
 
 function __getLink(isExternal, releaseBranch, baseURL, path) {
+  var target = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '_self';
+
   if (isExternal) {
     if (baseURL.hasOwnProperty(releaseBranch)) {
       return {
         to: baseURL[releaseBranch] + path,
-        isExternal: isExternal
+        isExternal: isExternal,
+        target: target
       };
     }
   }
@@ -148,7 +151,7 @@ function getFooterLinks() {
 
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
-  return _ref2 = {}, _defineProperty(_ref2, _footer.FOOTER_KEY.aboutUs, __getLink(isExternal, releaseBranch, mainBaseURL, _footer.FOOTER_PATH[_footer.FOOTER_KEY.aboutUs])), _defineProperty(_ref2, _footer.FOOTER_KEY.influenceReport, __getLink(isExternal, releaseBranch, mainBaseURL, _footer.FOOTER_PATH[_footer.FOOTER_KEY.influenceReport])), _defineProperty(_ref2, _footer.FOOTER_KEY.openLab, __composeExternalLink(__getExternalLinks().openLab, '_blank')), _ref2;
+  return _ref2 = {}, _defineProperty(_ref2, _footer.FOOTER_KEY.aboutUs, __getLink(true, releaseBranch, mainBaseURL, _footer.FOOTER_PATH[_footer.FOOTER_KEY.aboutUs], '_blank')), _defineProperty(_ref2, _footer.FOOTER_KEY.influenceReport, __getLink(isExternal, releaseBranch, mainBaseURL, _footer.FOOTER_PATH[_footer.FOOTER_KEY.influenceReport])), _defineProperty(_ref2, _footer.FOOTER_KEY.openLab, __composeExternalLink(__getExternalLinks().openLab, '_blank')), _ref2;
 }
 
 function getSocialMediaLinks() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "2.4.0-rc.4",
+  "version": "2.4.0-rc.5",
   "description": "Universal header of TWReporter sites",
   "main": "lib/index.js",
   "scripts": {
@@ -20,8 +20,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@twreporter/core": "^1.8.0-rc.4",
-    "@twreporter/react-components": "^8.15.0-rc.4",
+    "@twreporter/core": "^1.8.0-rc.5",
+    "@twreporter/react-components": "^8.15.0-rc.5",
     "lodash": "^4.17.11",
     "prop-types": "^15.6.2",
     "querystring": "^0.2.0",
@@ -48,5 +48,5 @@
     "@storybook/testing-library": "^0.0.13",
     "babel-loader": "^8.2.5"
   },
-  "gitHead": "2d647f37f6f708d6314117ef49fab278a85cc0af"
+  "gitHead": "bf226b81aae93197d4cad8519a574ef6f85acc9b"
 }