@twreporter/universal-header 2.7.0-rc.9 → 2.7.0

package/CHANGELOG.md

@@ -3,6 +3,49 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.7.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.13...@twreporter/universal-header@2.7.0) (2023-08-31)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
+# [2.7.0-rc.13](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.12...@twreporter/universal-header@2.7.0-rc.13) (2023-08-25)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
+# [2.7.0-rc.12](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.11...@twreporter/universal-header@2.7.0-rc.12) (2023-08-22)
+
+
+### Bug Fixes
+
+* add `hamburgerContext` props ([d7d2f51](https://github.com/twreporter/twreporter-npm-packages/commit/d7d2f51cce33958fcf38c36f39b4d17be8840b25))
+
+
+
+
+
+# [2.7.0-rc.11](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.10...@twreporter/universal-header@2.7.0-rc.11) (2023-08-21)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
+# [2.7.0-rc.10](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.9...@twreporter/universal-header@2.7.0-rc.10) (2023-08-16)
+
+**Note:** Version bump only for package @twreporter/universal-header
+
+
+
+
+
 # [2.7.0-rc.9](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/universal-header@2.7.0-rc.8...@twreporter/universal-header@2.7.0-rc.9) (2023-08-16)
 
 **Note:** Version bump only for package @twreporter/universal-header

package/lib/components/header.js

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _CSSTransition = _interopRequireDefault(require("react-transition-group/CSSTransition"));
@@ -228,7 +230,10 @@ var PrevButton = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   return props.isShow ? '' : 'display: none;';
 });
 
-var Header = function Header() {
+var Header = function Header(_ref) {
+  var _ref$hamburgerContext = _ref.hamburgerContext,
+      hamburgerContext = _ref$hamburgerContext === void 0 ? {} : _ref$hamburgerContext;
+
   var _useContext = (0, _react.useContext)(_headerContext["default"]),
       releaseBranch = _useContext.releaseBranch,
       isLinkExternal = _useContext.isLinkExternal,
@@ -240,9 +245,11 @@ var Header = function Header() {
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      showHamburger = _useState2[0],
-      setShowHamburger = _useState2[1];
+      defaultShowHamburger = _useState2[0],
+      setDefaultShowHamburger = _useState2[1];
 
+  var showHamburger = (hamburgerContext === null || hamburgerContext === void 0 ? void 0 : hamburgerContext.showHamburger) || defaultShowHamburger;
+  var setShowHamburger = (hamburgerContext === null || hamburgerContext === void 0 ? void 0 : hamburgerContext.setShowHamburger) || setDefaultShowHamburger;
   var logoLink = (0, _links.getLogoLink)(isLinkExternal, releaseBranch);
   var logoType = (0, _theme.selectLogoType)(theme);
 
@@ -269,6 +276,9 @@ var Header = function Header() {
     closeHamburgerMenu: closeHamburger,
     isHamburgerMenuOpen: showHamburger
   };
+  (0, _react.useEffect)(function () {
+    closeHamburger();
+  }, [pathname]);
 
   var isOnArticlePage = _.includes(pathname, _entityPath["default"].article);
 
@@ -376,5 +386,8 @@ var Header = function Header() {
   })))));
 };
 
+Header.propTypes = {
+  hamburgerContext: _propTypes["default"].object
+};
 var _default = Header;
 exports["default"] = _default;

package/lib/containers/header.js

@@ -13,8 +13,6 @@ var _reactRedux = require("react-redux");
 
 var _headerContext = _interopRequireDefault(require("../contexts/header-context"));
 
-var _actions = require("../constants/actions");
-
 var _propTypes = require("../constants/prop-types");
 
 var _header = _interopRequireDefault(require("../components/header"));
@@ -25,24 +23,12 @@ var _featureFlag = require("@twreporter/core/lib/constants/feature-flag");
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
-var _map = _interopRequireDefault(require("lodash/map"));
-
-var _reduce = _interopRequireDefault(require("lodash/reduce"));
-
-var _excluded = ["releaseBranch", "isAuthed", "isLinkExternal", "theme", "pathname", "referrerPath"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -66,9 +52,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var _ = {
-  get: _get["default"],
-  map: _map["default"],
-  reduce: _reduce["default"]
+  get: _get["default"]
 };
 var Header = _featureFlag.MEMBERSHIP ? _header["default"] : _headerOld["default"];
 var HIDE_HEADER_THRESHOLD = 8;
@@ -198,18 +182,6 @@ var Container = /*#__PURE__*/function (_React$PureComponent) {
 
       return scrollState;
     }
-  }, {
-    key: "__prepareActionProps",
-    value: function __prepareActionProps() {
-      return _.reduce(_actions.ACTION_ORDER, function (res, value, key) {
-        res[key] = _.map(value, function (itemKey) {
-          return {
-            key: itemKey
-          };
-        });
-        return res;
-      }, {});
-    }
   }, {
     key: "render",
     value: function render() {
@@ -220,8 +192,7 @@ var Container = /*#__PURE__*/function (_React$PureComponent) {
           theme = _this$props.theme,
           pathname = _this$props.pathname,
           referrerPath = _this$props.referrerPath,
-          passThrough = _objectWithoutProperties(_this$props, _excluded);
-
+          hamburgerContext = _this$props.hamburgerContext;
       var _this$state = this.state,
           toUseNarrow = _this$state.toUseNarrow,
           hideHeader = _this$state.hideHeader;
@@ -235,16 +206,11 @@ var Container = /*#__PURE__*/function (_React$PureComponent) {
         toUseNarrow: toUseNarrow,
         hideHeader: hideHeader
       };
-
-      var actionProps = this.__prepareActionProps();
-
       return /*#__PURE__*/_react["default"].createElement(_headerContext["default"].Provider, {
         value: contextValue
-      }, /*#__PURE__*/_react["default"].createElement(Header, _extends({
-        actions: actionProps.desktop,
-        mobileActions: actionProps.mobile,
-        hbActions: actionProps.hamburger
-      }, passThrough)));
+      }, /*#__PURE__*/_react["default"].createElement(Header, {
+        hamburgerContext: hamburgerContext
+      }));
     }
   }]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "2.7.0-rc.9",
+  "version": "2.7.0",
   "description": "Universal header of TWReporter sites",
   "main": "lib/index.js",
   "scripts": {
@@ -20,8 +20,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@twreporter/core": "^1.11.0-rc.4",
-    "@twreporter/react-components": "^8.18.1-rc.8",
+    "@twreporter/core": "^1.11.0",
+    "@twreporter/react-components": "^8.18.1",
     "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": "c405c3a97de6b1ee0234d8b24eeaa725463825fa"
+  "gitHead": "a3fcc35f1a2534bb4a08d69d636ba53405160c9f"
 }