@arcblock/ux 1.15.20 → 1.15.25

package/lib/Theme/index.js

@@ -9,9 +9,20 @@ var _styles = require("@material-ui/core/styles");
 
 var _responsiveFontSizes = _interopRequireDefault(require("./responsiveFontSizes"));
 
+const _excluded = ["mode", "pageWidth", "palette", "typography", "overrides"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// https://app.zeplin.io/styleguide/5d1436f1e97c2156f49c0725/colors
+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 _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 _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; }
+
 const colors = {
   white: '#FFFFFF',
   dark: '#4A707C',
@@ -36,14 +47,17 @@ const colors = {
 exports.colors = colors;
 
 const create = function create() {
-  let {
+  let _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      {
     mode = 'light',
     pageWidth = 'md',
     palette,
     typography,
     overrides
-  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  const theme = (0, _styles.createTheme)({
+  } = _ref,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  const theme = (0, _styles.createTheme)(_objectSpread({
     themeName: 'ArcBlock',
     palette: Object.assign({
       primary: {
@@ -141,7 +155,7 @@ const create = function create() {
     pageWidth,
     colors,
     mode
-  });
+  }, rest));
   const enhanced = (0, _responsiveFontSizes.default)(theme, {
     breakpoints: ['xs', 'sm', 'md', 'lg'],
     disableAlign: false,

package/lib/Util/index.js

@@ -11,6 +11,7 @@ exports.setDateTool = setDateTool;
 exports.getDateTool = getDateTool;
 exports.formatToDate = formatToDate;
 exports.formatToDatetime = formatToDatetime;
+exports.openWebWallet = openWebWallet;
 exports.formatUptime = exports.str2color = exports.getTimezone = exports.getBackground = exports.getColor = void 0;
 
 var _padStart = _interopRequireDefault(require("lodash/padStart"));
@@ -31,6 +32,13 @@ function parseQuery(str) {
     return memo;
   }, {});
 }
+/**
+ * @param {number} opts.expireInDays
+ * @param {string} opts.path
+ * @param {domain} opts.domain
+ * @param {boolean} opts.returnDomain if === false, opts.domain will be skipped
+ */
+
 
 function getCookieOptions() {
   let expireInDays = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
@@ -56,7 +64,11 @@ function getCookieOptions() {
     domain: opts.domain || ''
   };
 
-  if (typeof window === 'undefined' || opts.domain) {
+  if (typeof window === 'undefined' || opts.domain || opts.returnDomain === false) {
+    if (opts.returnDomain === false) {
+      delete options.domain;
+    }
+
     return options;
   }
 
@@ -266,4 +278,46 @@ function formatToDatetime(date) {
     locale,
     tz
   });
+}
+
+function openWebWallet(_ref3) {
+  let {
+    webWalletUrl,
+    action = 'login',
+    locale = 'en',
+    url,
+    windowFeatures
+  } = _ref3;
+  const defaultWindowFeatures = {
+    toolbar: 'no',
+    location: 'no',
+    status: 'no',
+    menubar: 'no',
+    scrollbars: 'yes',
+    resizable: 'yes',
+    // iphone 8plus size
+    width: 414,
+    height: 736
+  };
+  const windowUrl = "".concat(webWalletUrl, "?action=").concat(action, "&locale=").concat(locale, "&url=").concat(encodeURIComponent(url));
+  const mergedWindowFeatures = Object.assign({}, defaultWindowFeatures, windowFeatures);
+
+  const getWindowWidth = win => {
+    return win.innerWidth || win.document.documentElement.clientWidth || win.document.body.clientWidth;
+  }; // 默认在浏览器右上角弹出窗口
+
+
+  if (!('left' in mergedWindowFeatures)) {
+    const winWidth = getWindowWidth(window.top || window);
+    const winLeft = window.screenLeft || window.screenX;
+    mergedWindowFeatures.left = winWidth + winLeft - mergedWindowFeatures.width;
+  }
+
+  if (!('top' in mergedWindowFeatures)) {
+    const winTop = window.screenTop || window.screenY;
+    mergedWindowFeatures.top = winTop;
+  }
+
+  const strWindowFeatures = Object.keys(mergedWindowFeatures).map(key => "".concat(key, "=").concat(mergedWindowFeatures[key])).join(',');
+  window.open(windowUrl, 'targetWindow', strWindowFeatures);
 }

package/package.json

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