@arcblock/ux 1.15.29 → 1.15.30

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.29",
+  "version": "1.15.30",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -52,10 +52,10 @@
     "react": ">=16.12.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "70fc37255f3e512fd45c5c0f0e06ee828d69b259",
+  "gitHead": "a4b98e555b421f2fed875589bbca932e2edd6ca0",
   "dependencies": {
-    "@arcblock/icons": "^1.15.29",
-    "@arcblock/react-hooks": "^1.15.29",
+    "@arcblock/icons": "^1.15.30",
+    "@arcblock/react-hooks": "^1.15.30",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "4.11.2",