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

package/lib/utils/theme-old.js

@@ -19,255 +19,199 @@ function selectLogoType(theme) {
   switch (theme) {
     case _theme["default"].photography:
     case _theme["default"].transparent:
-      {
-        return 'white';
-      }
+      return 'white';
 
     default:
-      {
-        return 'default';
-      }
+      return 'default';
   }
 }
 
 function selectServiceIcons(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return _icon.ServiceIcons.photography;
-      }
+      return _icon.ServiceIcons.photography;
 
     case _theme["default"].transparent:
-      {
-        return _icon.ServiceIcons.transparent;
-      }
+      return _icon.ServiceIcons.transparent;
 
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return _icon.ServiceIcons.normal;
-      }
+      return _icon.ServiceIcons.normal;
   }
 }
 
 function selectHamburgerServiceIcons(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return _icon.ServiceIcons.photography;
-      }
+      return _icon.ServiceIcons.photography;
 
     case _theme["default"].transparent:
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return _icon.ServiceIcons.normal;
-      }
+      return _icon.ServiceIcons.normal;
   }
 }
 
 function selectIcons(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return _icon.Icons.photography;
-      }
+      return _icon.Icons.photography;
 
     case _theme["default"].transparent:
-      {
-        return _icon.Icons.transparent;
-      }
+      return _icon.Icons.transparent;
 
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return _icon.Icons.normal;
-      }
+      return _icon.Icons.normal;
   }
 }
 
 function selectChannelTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return {
-          bgColor: _color.colorPhoto.dark,
-          fontColor: _color.colorGrayscale.gray600,
-          hoverFontColor: _color.colorGrayscale.white,
-          hoverBgColor: _colors["default"].gray50,
-          borderColor: _colors["default"].gray250
-        };
-      }
+      return {
+        bgColor: _color.colorPhoto.dark,
+        fontColor: _color.colorGrayscale.gray600,
+        hoverFontColor: _color.colorGrayscale.white,
+        hoverBgColor: _colors["default"].gray50,
+        borderColor: _colors["default"].gray250
+      };
 
     case _theme["default"].transparent:
-      {
-        return {
-          bgColor: 'transparent',
-          fontColor: _color.colorGrayscale.white,
-          hoverFontColor: _color.colorGrayscale.gray900,
-          hoverBgColor: _color.colorGrayscale.white,
-          borderColor: _colors["default"].gray250
-        };
-      }
+      return {
+        bgColor: 'transparent',
+        fontColor: _color.colorGrayscale.white,
+        hoverFontColor: _color.colorGrayscale.gray900,
+        hoverBgColor: _color.colorGrayscale.white,
+        borderColor: _colors["default"].gray250
+      };
 
     case _theme["default"].index:
-      {
-        return {
-          bgColor: _color.colorGrayscale.white,
-          fontColor: _color.colorGrayscale.gray600,
-          hoverFontColor: _color.colorGrayscale.gray900,
-          hoverBgColor: _colors["default"].gray150,
-          borderColor: _color.colorGrayscale.gray200
-        };
-      }
+      return {
+        bgColor: _color.colorGrayscale.white,
+        fontColor: _color.colorGrayscale.gray600,
+        hoverFontColor: _color.colorGrayscale.gray900,
+        hoverBgColor: _colors["default"].gray150,
+        borderColor: _color.colorGrayscale.gray200
+      };
 
     case _theme["default"].normal:
     default:
-      {
-        return {
-          bgColor: _color.colorGrayscale.gray100,
-          fontColor: _color.colorGrayscale.gray600,
-          hoverFontColor: _color.colorGrayscale.gray900,
-          hoverBgColor: _colors["default"].gray150,
-          borderColor: _color.colorGrayscale.gray200
-        };
-      }
+      return {
+        bgColor: _color.colorGrayscale.gray100,
+        fontColor: _color.colorGrayscale.gray600,
+        hoverFontColor: _color.colorGrayscale.gray900,
+        hoverBgColor: _colors["default"].gray150,
+        borderColor: _color.colorGrayscale.gray200
+      };
   }
 }
 
 function selectHeaderTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return {
-          bgColor: _color.colorPhoto.dark,
-          borderColor: _colors["default"].gray250
-        };
-      }
+      return {
+        bgColor: _color.colorPhoto.dark,
+        borderColor: _colors["default"].gray250
+      };
 
     case _theme["default"].transparent:
-      {
-        return {
-          bgColor: _colors["default"].gray150,
-          borderColor: _colors["default"].gray250
-        };
-      }
+      return {
+        bgColor: _colors["default"].gray150,
+        borderColor: _colors["default"].gray250
+      };
 
     case _theme["default"].index:
-      {
-        return {
-          bgColor: _color.colorGrayscale.white,
-          borderColor: _color.colorGrayscale.gray200
-        };
-      }
+      return {
+        bgColor: _color.colorGrayscale.white,
+        borderColor: _color.colorGrayscale.gray200
+      };
 
     case _theme["default"].normal:
     default:
-      {
-        return {
-          bgColor: _color.colorGrayscale.gray100,
-          borderColor: _color.colorGrayscale.gray200
-        };
-      }
+      return {
+        bgColor: _color.colorGrayscale.gray100,
+        borderColor: _color.colorGrayscale.gray200
+      };
   }
 }
 
 function selectActionButtonTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return {
-          color: _color.colorGrayscale.white,
-          bgColor: _color.colorSupportive.main,
-          hoverBgColor: _colors["default"].brownDark
-        };
-      }
+      return {
+        color: _color.colorGrayscale.white,
+        bgColor: _color.colorSupportive.main,
+        hoverBgColor: _colors["default"].brownDark
+      };
 
     case _theme["default"].transparent:
-      {
-        return {
-          color: _color.colorSupportive.main,
-          bgColor: _color.colorGrayscale.white,
-          hoverBgColor: _color.colorGrayscale.gray300
-        };
-      }
+      return {
+        color: _color.colorSupportive.main,
+        bgColor: _color.colorGrayscale.white,
+        hoverBgColor: _color.colorGrayscale.gray300
+      };
 
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return {
-          color: _color.colorGrayscale.white,
-          bgColor: _color.colorBrand.heavy,
-          hoverBgColor: _colors["default"].redDark
-        };
-      }
+      return {
+        color: _color.colorGrayscale.white,
+        bgColor: _color.colorBrand.heavy,
+        hoverBgColor: _colors["default"].redDark
+      };
   }
 }
 
 function selectHamburgerMenuTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return {
-          bgColor: _color.colorPhoto.dark
-        };
-      }
+      return {
+        bgColor: _color.colorPhoto.dark
+      };
 
     case _theme["default"].transparent:
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return {
-          bgColor: _color.colorGrayscale.gray100
-        };
-      }
+      return {
+        bgColor: _color.colorGrayscale.gray100
+      };
   }
 }
 
 function selectHamburgerServiceTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return {
-          borderColor: _colors["default"].gray450
-        };
-      }
+      return {
+        borderColor: _colors["default"].gray450
+      };
 
     case _theme["default"].transparent:
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return {
-          borderColor: _colors["default"].gray250
-        };
-      }
+      return {
+        borderColor: _colors["default"].gray250
+      };
   }
 }
 
 function selectSloganTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return _color.colorSupportive.main;
-      }
+      return _color.colorSupportive.main;
 
     case _theme["default"].transparent:
-      {
-        return _color.colorGrayscale.white;
-      }
+      return _color.colorGrayscale.white;
 
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return _color.colorGrayscale.gray900;
-      }
+      return _color.colorGrayscale.gray900;
   }
 }
 /*
@@ -279,51 +223,39 @@ function selectSloganTheme(theme) {
 function selectActionButtonHBTheme(theme) {
   switch (theme) {
     case _theme["default"].transparent:
-      {
-        return selectActionButtonTheme('normal');
-      }
+      return selectActionButtonTheme('normal');
 
     case _theme["default"].photography:
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return selectActionButtonTheme(theme);
-      }
+      return selectActionButtonTheme(theme);
   }
 }
 
 function selectChannelHBTheme(theme) {
   switch (theme) {
     case _theme["default"].transparent:
-      {
-        return selectChannelTheme('normal');
-      }
+      return selectChannelTheme('normal');
 
     case _theme["default"].photography:
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return selectChannelTheme(theme);
-      }
+      return selectChannelTheme(theme);
   }
 }
 
 function selectSloganHBTheme(theme) {
   switch (theme) {
     case _theme["default"].transparent:
-      {
-        return selectSloganTheme('normal');
-      }
+      return selectSloganTheme('normal');
 
     case _theme["default"].photography:
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return selectSloganTheme(theme);
-      }
+      return selectSloganTheme(theme);
   }
 }
 

package/lib/utils/theme.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.selectHamburgerMenuTheme = exports.selectHamburgerItemTheme = exports.selectHamburgerFooterTheme = exports.selectSloganTheme = exports.selectHeaderTheme = exports.selectLogoType = void 0;
+exports.selectTabBarTheme = exports.selectHamburgerMenuTheme = exports.selectHamburgerItemTheme = exports.selectHamburgerFooterTheme = exports.selectSloganTheme = exports.selectHeaderTheme = exports.selectLogoType = void 0;
 
 var _theme = _interopRequireDefault(require("../constants/theme"));
 
@@ -15,14 +15,10 @@ var selectLogoType = function selectLogoType(theme) {
   switch (theme) {
     case _theme["default"].photography:
     case _theme["default"].transparent:
-      {
-        return 'white';
-      }
+      return 'white';
 
     default:
-      {
-        return 'default';
-      }
+      return 'default';
   }
 };
 
@@ -31,37 +27,29 @@ exports.selectLogoType = selectLogoType;
 var selectHeaderTheme = function selectHeaderTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return {
-          bgColor: _color.colorPhoto.dark,
-          topRowBgColor: _color.colorPhoto.dark
-        };
-      }
+      return {
+        bgColor: _color.colorPhoto.dark,
+        topRowBgColor: _color.colorPhoto.dark
+      };
 
     case _theme["default"].transparent:
-      {
-        return {
-          bgColor: _color.colorOpacity['black_0.2'],
-          topRowBgColor: 'unset'
-        };
-      }
+      return {
+        bgColor: _color.colorOpacity['black_0.2'],
+        topRowBgColor: 'unset'
+      };
 
     case _theme["default"].index:
-      {
-        return {
-          bgColor: _color.colorGrayscale.white,
-          topRowBgColor: _color.colorGrayscale.white
-        };
-      }
+      return {
+        bgColor: _color.colorGrayscale.white,
+        topRowBgColor: _color.colorGrayscale.white
+      };
 
     case _theme["default"].normal:
     default:
-      {
-        return {
-          bgColor: _color.colorGrayscale.gray100,
-          topRowBgColor: _color.colorGrayscale.gray100
-        };
-      }
+      return {
+        bgColor: _color.colorGrayscale.gray100,
+        topRowBgColor: _color.colorGrayscale.gray100
+      };
   }
 };
 
@@ -71,16 +59,12 @@ var selectSloganTheme = function selectSloganTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
     case _theme["default"].transparent:
-      {
-        return _color.colorGrayscale.white;
-      }
+      return _color.colorGrayscale.white;
 
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return _color.colorGrayscale.gray800;
-      }
+      return _color.colorGrayscale.gray800;
   }
 };
 
@@ -89,29 +73,25 @@ exports.selectSloganTheme = selectSloganTheme;
 var selectHamburgerFooterTheme = function selectHamburgerFooterTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return {
-          color: _color.colorGrayscale.gray400,
-          hoverColor: _color.colorGrayscale.gray400,
-          hoverBgColor: _color.colorOpacity['white_0.2'],
-          activeColor: _color.colorGrayscale.gray400,
-          activeBgColor: _color.colorOpacity['white_0.5']
-        };
-      }
+      return {
+        color: _color.colorGrayscale.gray400,
+        hoverColor: _color.colorGrayscale.gray400,
+        hoverBgColor: _color.colorOpacity['white_0.2'],
+        activeColor: _color.colorGrayscale.gray400,
+        activeBgColor: _color.colorOpacity['white_0.5']
+      };
 
     case _theme["default"].transparent:
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return {
-          color: _color.colorGrayscale.gray600,
-          hoverColor: _color.colorGrayscale.gray800,
-          hoverBgColor: _color.colorGrayscale.gray100,
-          activeColor: _color.colorGrayscale.gray800,
-          activeBgColor: _color.colorGrayscale.gray200
-        };
-      }
+      return {
+        color: _color.colorGrayscale.gray600,
+        hoverColor: _color.colorGrayscale.gray800,
+        hoverBgColor: _color.colorGrayscale.gray100,
+        activeColor: _color.colorGrayscale.gray800,
+        activeBgColor: _color.colorGrayscale.gray200
+      };
   }
 };
 
@@ -120,25 +100,21 @@ exports.selectHamburgerFooterTheme = selectHamburgerFooterTheme;
 var selectHamburgerItemTheme = function selectHamburgerItemTheme(theme, active) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return {
-          color: active ? _color.colorSupportive.main : _color.colorGrayscale.white,
-          hoverBgColor: _color.colorOpacity['white_0.2'],
-          activeBgColor: _color.colorOpacity['white_0.5']
-        };
-      }
+      return {
+        color: active ? _color.colorSupportive.main : _color.colorGrayscale.white,
+        hoverBgColor: _color.colorOpacity['white_0.2'],
+        activeBgColor: _color.colorOpacity['white_0.5']
+      };
 
     case _theme["default"].transparent:
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return {
-          color: active ? _color.colorBrand.heavy : _color.colorGrayscale.gray800,
-          hoverBgColor: _color.colorGrayscale.gray100,
-          activeBgColor: _color.colorGrayscale.gray200
-        };
-      }
+      return {
+        color: active ? _color.colorBrand.heavy : _color.colorGrayscale.gray800,
+        hoverBgColor: _color.colorGrayscale.gray100,
+        activeBgColor: _color.colorGrayscale.gray200
+      };
   }
 };
 
@@ -147,24 +123,41 @@ exports.selectHamburgerItemTheme = selectHamburgerItemTheme;
 var selectHamburgerMenuTheme = function selectHamburgerMenuTheme(theme) {
   switch (theme) {
     case _theme["default"].photography:
-      {
-        return {
-          bgColor: _color.colorPhoto.dark,
-          scrollBarColor: _color.colorOpacity['white_0.8']
-        };
-      }
+      return {
+        bgColor: _color.colorPhoto.dark,
+        scrollBarColor: _color.colorOpacity['white_0.8']
+      };
 
     case _theme["default"].transparent:
     case _theme["default"].index:
     case _theme["default"].normal:
     default:
-      {
-        return {
-          bgColor: _color.colorGrayscale.white,
-          scrollBarColor: _color.colorOpacity['black_0.2']
-        };
-      }
+      return {
+        bgColor: _color.colorGrayscale.white,
+        scrollBarColor: _color.colorOpacity['black_0.2']
+      };
   }
 };
 
-exports.selectHamburgerMenuTheme = selectHamburgerMenuTheme;
+exports.selectHamburgerMenuTheme = selectHamburgerMenuTheme;
+
+var selectTabBarTheme = function selectTabBarTheme(theme) {
+  switch (theme) {
+    case _theme["default"].photography:
+      return {
+        bgColor: _color.colorPhoto.dark,
+        borderColor: _color.colorPhoto.heavy
+      };
+
+    case _theme["default"].transparent:
+    case _theme["default"].index:
+    case _theme["default"].normal:
+    default:
+      return {
+        bgColor: _color.colorGrayscale.gray100,
+        borderColor: _color.colorGrayscale.gray300
+      };
+  }
+};
+
+exports.selectTabBarTheme = selectTabBarTheme;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/universal-header",
-  "version": "2.4.0-rc.4",
+  "version": "2.4.0-rc.6",
   "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.6",
     "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": "a1da0ea82fa6ec21f620b76bcb6cebac5ca8c519"
 }