@twreporter/universal-header 2.2.15-rc.2 → 2.3.0-rc.0

package/lib/containers/header.js

@@ -17,22 +17,12 @@ var _reactRedux = require("react-redux");
 
 var _headerContext = _interopRequireDefault(require("../contexts/header-context"));
 
-var _links = _interopRequireDefault(require("../utils/links"));
-
-var _categories = require("../constants/categories");
-
-var _channels = require("../constants/channels");
-
-var _actions = require("../constants/actions");
-
-var _services = require("../constants/services");
+var _actionsOld = require("../constants/actions-old");
 
 var _propTypes2 = _interopRequireDefault(require("../constants/prop-types"));
 
 var _header = _interopRequireDefault(require("../components/header"));
 
-var _mobileHeader = _interopRequireDefault(require("../components/mobile-header"));
-
 var _mediaQuery = _interopRequireDefault(require("@twreporter/core/lib/utils/media-query"));
 
 var _get = _interopRequireDefault(require("lodash/get"));
@@ -41,7 +31,7 @@ var _map = _interopRequireDefault(require("lodash/map"));
 
 var _excluded = ["releaseBranch", "isAuthed", "isLinkExternal", "theme"];
 
-var _templateObject, _templateObject2, _templateObject3;
+var _templateObject;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -92,20 +82,10 @@ var TRANSFORM_HEADER_THRESHOLD = 40;
 var TRANSFORM_TIMEOUT = 800;
 var stickyTop = /*#__PURE__*/(0, _styledComponents.css)(["position:sticky;top:0;z-index:1000;"]);
 
-var MobileOnly = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  displayName: "header__MobileOnly",
-  componentId: "narage-0"
-})(["display:none;", ""], _mediaQuery["default"].mobileOnly(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    display: block;\n    ", "\n  "])), stickyTop));
-
-var TabletOnly = /*#__PURE__*/_styledComponents["default"].div.withConfig({
-  displayName: "header__TabletOnly",
-  componentId: "narage-1"
-})(["display:none;", ""], _mediaQuery["default"].tabletOnly(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    display: block;\n    ", "\n  "])), stickyTop));
-
 var DesktopAndAbove = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   displayName: "header__DesktopAndAbove",
-  componentId: "narage-2"
-})(["display:none;", ""], _mediaQuery["default"].desktopAndAbove(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    display: block;\n    ", "\n  "])), stickyTop));
+  componentId: "narage-0"
+})(["display:none;", ""], _mediaQuery["default"].desktopAndAbove(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    display: block;\n    ", "\n  "])), stickyTop));
 
 var Container = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Container, _React$PureComponent);
@@ -230,74 +210,24 @@ var Container = /*#__PURE__*/function (_React$PureComponent) {
 
       return scrollState;
     }
-  }, {
-    key: "__prepareServiceProps",
-    value: function __prepareServiceProps(isAuthed) {
-      var serviceProps = _.map(_services.serviceOrder, function (key) {
-        return {
-          key: key
-        };
-      });
-
-      if (isAuthed) {
-        var logoutKey = _services.serviceKeys.logout;
-        serviceProps.push({
-          key: logoutKey
-        });
-      } else {
-        var loginKey = _services.serviceKeys.login;
-        serviceProps.push({
-          key: loginKey
-        });
-      }
-
-      return serviceProps;
-    }
-  }, {
-    key: "__prepareChannelProps",
-    value: function __prepareChannelProps(releaseBranch, isLinkExternal) {
-      var channelProps = _.map(_channels.channelOrder, function (key) {
-        return {
-          key: key,
-          label: _channels.channelLabels[key],
-          type: _channels.channelTypes[key],
-          pathname: _channels.channelPathnames[key],
-          link: _links["default"].getChannelLinks(isLinkExternal, releaseBranch)[key]
-        };
-      });
-
-      return channelProps;
-    }
-  }, {
-    key: "__prepareCategoriesProps",
-    value: function __prepareCategoriesProps(releaseBranch, isLinkExternal, channelProps) {
-      channelProps[channelProps.length - 1].dropDownMenu = _.map(_categories.categoryOrder, function (key) {
-        return {
-          key: key,
-          label: _categories.categoryLabels[key],
-          pathname: _categories.categoryPathnames[key],
-          link: _links["default"].getCategoryLinks(isLinkExternal, releaseBranch)[key]
-        };
-      });
-    }
   }, {
     key: "__prepareActionProps",
     value: function __prepareActionProps() {
-      var isActive = _actions.actionActive;
+      var isActive = _actionsOld.actionActive;
 
-      var mobileActionProps = _.map(_actions.actionOrder.mobile, function (key) {
+      var mobileActionProps = _.map(_actionsOld.actionOrder.mobile, function (key) {
         return {
           key: key
         };
       });
 
-      var desktopAndTabletActionProps = _.map(_actions.actionOrder.desktop, function (key) {
+      var desktopAndTabletActionProps = _.map(_actionsOld.actionOrder.desktop, function (key) {
         return {
           key: key
         };
       });
 
-      var narrowActionProps = _.map(_actions.actionOrder.desktop, function (key) {
+      var narrowActionProps = _.map(_actionsOld.actionOrder.desktop, function (key) {
         return {
           key: key,
           active: isActive.narrow[key]
@@ -334,33 +264,12 @@ var Container = /*#__PURE__*/function (_React$PureComponent) {
         hideHeader: hideHeader
       };
 
-      var serviceProps = this.__prepareServiceProps(isAuthed);
-
-      var channelProps = this.__prepareChannelProps(releaseBranch, isLinkExternal);
-
       var actionProps = this.__prepareActionProps();
 
-      this.__prepareCategoriesProps(releaseBranch, isLinkExternal, channelProps);
-
       return /*#__PURE__*/_react["default"].createElement(_headerContext["default"].Provider, {
         value: contextValue
-      }, /*#__PURE__*/_react["default"].createElement(MobileOnly, null, /*#__PURE__*/_react["default"].createElement(_mobileHeader["default"], _extends({
-        actions: actionProps.mobile,
-        menuChannels: channelProps,
-        menuServices: serviceProps,
-        menuActions: actionProps.hamburger,
-        narrowActions: actionProps.narrow
-      }, passThrough))), /*#__PURE__*/_react["default"].createElement(TabletOnly, null, /*#__PURE__*/_react["default"].createElement(_mobileHeader["default"], _extends({
-        actions: actionProps.tablet,
-        menuChannels: channelProps,
-        menuServices: serviceProps,
-        menuActions: actionProps.hamburger,
-        narrowActions: actionProps.narrow
-      }, passThrough))), /*#__PURE__*/_react["default"].createElement(DesktopAndAbove, null, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
-        channels: channelProps,
-        services: serviceProps,
-        actions: actionProps.desktop,
-        narrowActions: actionProps.narrow
+      }, /*#__PURE__*/_react["default"].createElement(DesktopAndAbove, null, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
+        actions: actionProps.desktop
       }, passThrough))));
     }
   }]);
@@ -378,9 +287,7 @@ _defineProperty(Container, "propTypes", _objectSpread(_objectSpread({}, _propTyp
 
 function mapStateToProps(state) {
   return {
-    isAuthed: _.get(state, 'auth.isAuthed', false) // bookmarks: _.get(state, 'header.bookmarks'),
-    // notifications: _.get(state, 'headers.notifications'),
-
+    isAuthed: _.get(state, 'auth.isAuthed', false)
   };
 }
 

package/lib/index.js

@@ -3,16 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports["default"] = exports.Header = void 0;
 
 var _standaloneHeader = _interopRequireDefault(require("./standalone-header"));
 
 var _header = _interopRequireDefault(require("./containers/header"));
 
+var _headerOld = _interopRequireDefault(require("./containers/header-old"));
+
+var _featureFlag = require("@twreporter/core/lib/constants/feature-flag");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+// feature toggle
+var Header = _featureFlag.ENABLE_NEW_INFO_ARCH ? _header["default"] : _headerOld["default"];
+exports.Header = Header;
 var _default = {
-  Header: _header["default"],
+  Header: Header,
   StandaloneHeader: _standaloneHeader["default"]
 };
 exports["default"] = _default;

package/lib/utils/links.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.getActionLinks = getActionLinks;
+exports["default"] = exports.getCategoryLink = void 0;
 
 var _categories = require("../constants/categories");
 
@@ -11,7 +12,7 @@ var _channels = require("../constants/channels");
 
 var _services = require("../constants/services");
 
-var _actions = require("../constants/actions");
+var _actionsOld = require("../constants/actions-old");
 
 var _externalLinks = _interopRequireDefault(require("../constants/external-links"));
 
@@ -103,6 +104,15 @@ function getCategoryLinks() {
   return __getLinks(isExternal, releaseBranch, mainBaseURL, _categories.categoryPathnames);
 }
 
+var getCategoryLink = function getCategoryLink() {
+  var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
+  var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
+  var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  return __getLink(isExternal, releaseBranch, mainBaseURL, path);
+};
+
+exports.getCategoryLink = getCategoryLink;
+
 function getChannelLinks() {
   var isExternal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultIsExternal;
   var releaseBranch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultReleaseBranch;
@@ -154,10 +164,10 @@ function getServiceLinks() {
 function getActionLinks() {
   var _ref2;
 
-  return _ref2 = {}, _defineProperty(_ref2, _actions.actionKeys.support, {
+  return _ref2 = {}, _defineProperty(_ref2, _actionsOld.actionKeys.support, {
     to: __getExternalLinks().monthlyDonation,
     isExternal: true
-  }), _defineProperty(_ref2, _actions.actionKeys.newsLetter, {
+  }), _defineProperty(_ref2, _actionsOld.actionKeys.newsLetter, {
     to: __getExternalLinks().newsLetter,
     isExternal: true
   }), _ref2;

package/lib/utils/theme.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports["default"] = exports.selectSloganThemeNew = void 0;
 
 var _colors = _interopRequireDefault(require("../constants/colors"));
 
@@ -250,6 +250,25 @@ function selectHamburgerServiceTheme(theme) {
   }
 }
 
+var selectSloganThemeNew = function selectSloganThemeNew(theme) {
+  switch (theme) {
+    case _theme["default"].photography:
+    case _theme["default"].transparent:
+      {
+        return _color.colorGrayscale.white;
+      }
+
+    case _theme["default"].index:
+    case _theme["default"].normal:
+    default:
+      {
+        return _color.colorGrayscale.gray800;
+      }
+  }
+};
+
+exports.selectSloganThemeNew = selectSloganThemeNew;
+
 function selectSloganTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "2.2.15-rc.2",
+  "version": "2.3.0-rc.0",
   "description": "Universal header of TWReporter sites",
   "main": "lib/index.js",
   "scripts": {
     "clean": "make clean",
     "build": "make build",
     "dev": "make dev",
-    "prepublishOnly": "make build"
+    "prepublishOnly": "make build",
+    "storybook": "start-storybook -p 3000",
+    "build-storybook": "build-storybook"
   },
   "repository": "https://github.com/twreporter/twreporter-npm-packages.git",
   "author": "twreporter <developer@twreporter.org>",
@@ -18,8 +20,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@twreporter/core": "^1.7.0-rc.2",
-    "@twreporter/react-components": "^8.13.1-rc.2",
+    "@twreporter/core": "^1.7.0-rc.3",
+    "@twreporter/react-components": "^8.14.0-rc.0",
     "lodash": "^4.17.11",
     "prop-types": "^15.6.2",
     "querystring": "^0.2.0",
@@ -34,5 +36,17 @@
   "files": [
     "lib"
   ],
-  "gitHead": "978cab7f95e2f8e6af2dc4a61b350aaa505b3272"
+  "devDependencies": {
+    "@babel/core": "^7.19.1",
+    "@storybook/addon-actions": "^6.5.12",
+    "@storybook/addon-essentials": "^6.5.12",
+    "@storybook/addon-interactions": "^6.5.12",
+    "@storybook/addon-links": "^6.5.12",
+    "@storybook/builder-webpack4": "^6.5.12",
+    "@storybook/manager-webpack4": "^6.5.12",
+    "@storybook/react": "^6.5.12",
+    "@storybook/testing-library": "^0.0.13",
+    "babel-loader": "^8.2.5"
+  },
+  "gitHead": "cec95c45a29a3fbfa91b3bf3a6f33a1cc983504d"
 }