@arcblock/ux 1.15.7 → 1.15.11

package/lib/Button/wrap.js

@@ -9,11 +9,13 @@ var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _Spinner = _interopRequireDefault(require("../Spinner"));
+
 var _Theme = require("../Theme");
 
 var _Util = require("../Util");
 
-const _excluded = ["children", "rounded", "style", "forwardedRef"];
+const _excluded = ["children", "rounded", "loading", "disabled", "style", "forwardedRef"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -28,11 +30,27 @@ function _default(BaseComponent) {
     const {
       children,
       rounded,
+      loading,
+      disabled,
       style,
       forwardedRef
     } = newProps,
           rest = _objectWithoutProperties(newProps, _excluded);
 
+    let loadingSize = 16;
+
+    switch (rest.size) {
+      case 'small':
+        loadingSize = 14;
+        break;
+
+      case 'large':
+        loadingSize = 18;
+        break;
+
+      default:
+    }
+
     const styles = Object.assign({}, style, {
       boxShadow: 'none',
       textTransform: 'capitalize'
@@ -75,8 +93,14 @@ function _default(BaseComponent) {
 
     return /*#__PURE__*/_react.default.createElement(BaseComponent, Object.assign({
       style: styles,
-      ref: forwardedRef
-    }, rest), children);
+      ref: forwardedRef,
+      disabled: disabled || loading
+    }, rest), loading && /*#__PURE__*/_react.default.createElement(_Spinner.default, {
+      size: loadingSize,
+      style: {
+        marginRight: 5
+      }
+    }), children);
   }
 
   WrappedComponent.propTypes = {

package/lib/CookieConsent/index.js

@@ -0,0 +1,85 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.UXCookieConsent = UXCookieConsent;
+exports.default = DefaultCookieConsent;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
+
+var _reactCookieConsent = _interopRequireDefault(require("react-cookie-consent"));
+
+const _excluded = ["style", "contentStyle"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+/**
+ * UXCookieConsent, 目前直接返回 CookieConsent 组件, 定制化要求高的场景可以使用该组件
+ * 使用文档参考：https://github.com/Mastermindzh/react-cookie-consent
+ */
+function UXCookieConsent(props) {
+  return /*#__PURE__*/_react.default.createElement(_reactCookieConsent.default, props);
+}
+/**
+ * DefaultCookieConsent, 对 react-cookie-consent package 封装, 以便 arcblock 内部产品可以快速使用
+ * - 默认内容
+ * - 默认配置/样式
+ */
+
+
+function DefaultCookieConsent(_ref) {
+  let {
+    style,
+    contentStyle
+  } = _ref,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  return /*#__PURE__*/_react.default.createElement(_reactCookieConsent.default, Object.assign({
+    disableButtonStyles: true,
+    ButtonComponent: _Button.default,
+    buttonClasses: "MuiButton-contained MuiButton-containedPrimary",
+    buttonStyle: {
+      margin: '0 16px',
+      padding: '6px 16px'
+    },
+    contentStyle: _objectSpread({
+      margin: 16
+    }, contentStyle),
+    style: _objectSpread({
+      boxSizing: 'border-box',
+      alignItems: 'center',
+      padding: 16
+    }, style)
+  }, rest));
+}
+
+DefaultCookieConsent.propTypes = {
+  children: _propTypes.default.any,
+  style: _propTypes.default.object,
+  contentStyle: _propTypes.default.object
+};
+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."),
+  style: {},
+  contentStyle: {}
+};

package/lib/Dialog/confirm.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
+var _Button = _interopRequireDefault(require("../Button"));
 
 var _dialog = _interopRequireDefault(require("./dialog"));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "1.15.7",
+  "version": "1.15.11",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -52,10 +52,10 @@
     "react": ">=16.12.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "014671fd745ce44cd8c0b18c41bab1dfb4d9d6f1",
+  "gitHead": "d3f501467f29cba123c8926f82124d71c578d404",
   "dependencies": {
-    "@arcblock/icons": "^1.15.7",
-    "@arcblock/react-hooks": "^1.15.7",
+    "@arcblock/icons": "^1.15.11",
+    "@arcblock/react-hooks": "^1.15.11",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@material-ui/core": "^4.12.3",
     "@material-ui/icons": "4.11.2",
@@ -74,6 +74,7 @@
     "js-cookie": "^2.2.0",
     "lodash": "^4.17.21",
     "mdi-material-ui": "^6.22.1",
+    "react-cookie-consent": "^6.4.1",
     "react-helmet": "^5.2.1",
     "react-intersection-observer": "^8.31.1",
     "react-load-script": "^0.0.6",