@arcblock/ux 1.15.27 → 1.15.31

package/lib/CookieConsent/index.js

@@ -3,83 +3,96 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UXCookieConsent = UXCookieConsent;
 exports.default = DefaultCookieConsent;
+Object.defineProperty(exports, "resetCookieConsentValue", {
+  enumerable: true,
+  get: function get() {
+    return _reactCookieConsent.resetCookieConsentValue;
+  }
+});
 
 var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
 var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
 
-var _reactCookieConsent = _interopRequireDefault(require("react-cookie-consent"));
+var _reactCookieConsent = _interopRequireWildcard(require("react-cookie-consent"));
 
-const _excluded = ["style", "contentStyle"];
+const _excluded = ["children", "locale", "style"];
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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); }
 
-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 _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-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 _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; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
 
-/**
- * UXCookieConsent, 目前直接返回 CookieConsent 组件, 定制化要求高的场景可以使用该组件
- * 使用文档参考：https://github.com/Mastermindzh/react-cookie-consent
- */
-function UXCookieConsent(props) {
-  return /*#__PURE__*/_react.default.createElement(_reactCookieConsent.default, props);
-}
+const translations = {
+  en: {
+    content: 'We use cookies and other tracking technologies to improve your browsing experience on our website, to show you personalized content, to analyze our website traffic, and to understand where our visitors are coming from.',
+    agree: 'I Understand'
+  },
+  zh: {
+    content: '我们使用 cookies 和其他跟踪技术来改善您在我们网站上的浏览体验，向您展示个性化的内容，分析我们的网站流量，并了解我们的访问者来自哪里。',
+    agree: '我知道了'
+  }
+};
 /**
  * DefaultCookieConsent, 对 react-cookie-consent package 封装, 以便 arcblock 内部产品可以快速使用
  * - 默认内容
  * - 默认配置/样式
  */
 
-
 function DefaultCookieConsent(_ref) {
   let {
-    style,
-    contentStyle
+    children,
+    locale,
+    style
   } = _ref,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  return /*#__PURE__*/_react.default.createElement(_reactCookieConsent.default, Object.assign({
+  if (locale && !translations[locale]) {
+    // eslint-disable-next-line no-param-reassign
+    locale = 'en';
+  }
+
+  return /*#__PURE__*/_react.default.createElement(Wrapper, {
+    style: style
+  }, /*#__PURE__*/_react.default.createElement(_reactCookieConsent.default, Object.assign({
+    disableStyles: true,
     disableButtonStyles: true,
     ButtonComponent: _Button.default,
+    buttonText: translations[locale].agree,
     buttonClasses: "MuiButton-contained MuiButton-containedPrimary",
     buttonStyle: {
-      margin: '0 16px',
+      marginTop: 16,
       padding: '6px 16px'
-    },
-    contentStyle: _objectSpread({
-      margin: 16
-    }, contentStyle),
-    style: _objectSpread({
-      boxSizing: 'border-box',
-      alignItems: 'center',
-      padding: 16
-    }, style)
-  }, rest));
+    }
+  }, rest), children || /*#__PURE__*/_react.default.createElement("p", {
+    style: {
+      margin: 0
+    }
+  }, translations[locale].content)));
 }
 
 DefaultCookieConsent.propTypes = {
   children: _propTypes.default.any,
   style: _propTypes.default.object,
-  contentStyle: _propTypes.default.object
+  locale: _propTypes.default.string
 };
 DefaultCookieConsent.defaultProps = {
-  children: /*#__PURE__*/_react.default.createElement("p", {
-    style: {
-      margin: 0,
-      textAlign: 'justify'
-    }
-  }, "We use cookies and other tracking technologies to improve your browsing experience on our website, to show you personalized content, to analyze our website traffic, and to understand where our visitors are coming from."),
+  children: null,
   style: {},
-  contentStyle: {}
-};
+  locale: 'en'
+};
+
+const Wrapper = _styledComponents.default.div.withConfig({
+  displayName: "CookieConsent__Wrapper",
+  componentId: "sc-xilwg4-0"
+})(["box-sizing:border-box;position:fixed;right:20px;bottom:20px;z-index:999;max-width:440px;padding:16px 24px;font-size:16px;color:#666;background:#fff;border-radius:6px;box-shadow:0 0 18px rgba(0,0,0,0.2);&:empty{display:none;}button{min-width:200px;}@media screen and (max-width:480px){left:16px;right:16px;bottom:16px;width:auto;button{display:block;width:100%;}}"]);

package/lib/Locale/context.js

@@ -47,9 +47,20 @@ exports.languages = languages;
 const langParams = {
   languages: ['zh', 'en'],
   fallback: 'en'
+}; // 跨应用传递多语言选择的方式是在 query string 中添加 locale 参数，LocaleSelector 要高优先级遵守这个参数
+
+const getLocaleFromSearchParams = function getLocaleFromSearchParams() {
+  let url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : window.location.href;
+  const locale = new URL(url).searchParams.get('locale');
+
+  if (languages.find(x => x.value === locale)) {
+    return locale;
+  }
+
+  return null;
 };
 
-const getLocale = locale => locale || _jsCookie.default.get(cookieName) || (0, _browserLang.default)(langParams);
+const getLocale = locale => locale || getLocaleFromSearchParams() || _jsCookie.default.get(cookieName) || (0, _browserLang.default)(langParams);
 
 exports.getLocale = getLocale;
 

package/lib/Locale/selector.js

@@ -11,6 +11,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
+var _styles = require("@material-ui/core/styles");
+
 var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
 
 var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
@@ -27,7 +29,7 @@ var _MenuList = _interopRequireDefault(require("@material-ui/core/MenuList"));
 
 var _Check = _interopRequireDefault(require("@material-ui/icons/Check"));
 
-var _Util = require("@arcblock/ux/lib/Util");
+var _Util = require("../Util");
 
 var _context = require("./context");
 
@@ -61,6 +63,7 @@ function LocaleSelector(props) {
   } = (0, _react.useContext)(_context.LocaleContext);
   const [anchorEl, setAnchorEl] = (0, _react.useState)(null);
   const [open, setOpen] = (0, _react.useState)(false);
+  const theme = (0, _styles.useTheme)();
 
   const onSelect = newLocale => {
     changeLocale(newLocale);
@@ -79,7 +82,8 @@ function LocaleSelector(props) {
   const ButtonComponent = showText ? _Button.default : _IconButton.default;
   return /*#__PURE__*/_react.default.createElement(Div, Object.assign({
     component: "div",
-    dark: dark
+    dark: dark,
+    theme: theme
   }, rest), /*#__PURE__*/_react.default.createElement(ButtonComponent, {
     buttonRef: node => setAnchorEl(node),
     className: "trigger",

package/lib/Util/index.js

@@ -102,7 +102,7 @@ const getColor = props => {
   }
 
   if (props.dark) {
-    return props.theme.palette.text.contrast;
+    return props.theme.palette.common.white;
   }
 
   return props.theme.palette.text.primary;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "1.15.27",
+  "version": "1.15.31",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -52,10 +52,10 @@
     "react": ">=16.12.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "d12c34f58ab2a61a89689abc481dbcb60f9e8aca",
+  "gitHead": "7b25d985d20ebe47114e0d9d5b65fd57fc1033d2",
   "dependencies": {
-    "@arcblock/icons": "^1.15.27",
-    "@arcblock/react-hooks": "^1.15.27",
+    "@arcblock/icons": "^1.15.31",
+    "@arcblock/react-hooks": "^1.15.31",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "4.11.2",