iglooform 2.5.52 → 3.0.0-alpha

package/lib/free-form/element/index.js

@@ -4,155 +4,100 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-require("antd/es/row/style");
-
-var _row = _interopRequireDefault(require("antd/es/row"));
-
-require("antd/es/form/style");
-
-var _form = _interopRequireDefault(require("antd/es/form"));
-
-require("antd/es/col/style");
-
-var _col = _interopRequireDefault(require("antd/es/col"));
-
-require("antd/es/grid/style");
-
-var _grid = _interopRequireDefault(require("antd/es/grid"));
-
-var _jsxRuntime = require("react/jsx-runtime");
-
 var _react = require("react");
-
+var _antd = require("antd");
 var _iglooicon = require("iglooicon");
-
 var _formUtils = require("../../utils/form-utils");
-
 var _formContext = _interopRequireDefault(require("../../form-context"));
-
 var _typography = _interopRequireDefault(require("../../typography"));
-
 var _omit = _interopRequireDefault(require("omit.js"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 require("./style/index.less");
-
 var _invariant = _interopRequireDefault(require("invariant"));
-
+var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["parentName", "preview", "disabledFromParent", "children"],
-    _excluded2 = ["halfRow"];
-
+  _excluded2 = ["halfRow"];
 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); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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; }
-
-var useBreakpoint = _grid.default.useBreakpoint;
-
+var useBreakpoint = _antd.Grid.useBreakpoint;
 var Element = function Element(props) {
   var parentName = props.parentName,
-      preview = props.preview,
-      disabledFromParent = props.disabledFromParent,
-      children = props.children,
-      rest = _objectWithoutProperties(props, _excluded);
-
+    preview = props.preview,
+    disabledFromParent = props.disabledFromParent,
+    children = props.children,
+    rest = _objectWithoutProperties(props, _excluded);
   (0, _invariant.default)(!(rest.selectValue || rest.copyValue || rest.initialValue) || rest.name, 'Form item with selectValue/copyValue/initialValue should have a name.');
-
   var _useContext = (0, _react.useContext)(_formContext.default),
-      form = _useContext.form,
-      requiredMark = _useContext.requiredMark,
-      registerDependencies = _useContext.registerDependencies,
-      handleValuesChange = _useContext.handleValuesChange;
-
+    form = _useContext.form,
+    requiredMark = _useContext.requiredMark,
+    registerDependencies = _useContext.registerDependencies,
+    handleValuesChange = _useContext.handleValuesChange;
   var _useReducer = (0, _react.useReducer)(function (r) {
-    return r + 1;
-  }, 0),
-      _useReducer2 = _slicedToArray(_useReducer, 2),
-      _ = _useReducer2[0],
-      dispatch = _useReducer2[1];
-
+      return r + 1;
+    }, 0),
+    _useReducer2 = _slicedToArray(_useReducer, 2),
+    _ = _useReducer2[0],
+    dispatch = _useReducer2[1];
   (0, _react.useEffect)(function () {
     var dependencies = props.dependencies,
-        asserts = props.asserts,
-        copyValue = props.copyValue,
-        selectValue = props.selectValue,
-        shouldRender = props.shouldRender,
-        dependField = props.dependField,
-        getOptions = props.getOptions,
-        subscribedFields = props.subscribedFields,
-        extraLabel = props.extraLabel,
-        disabled = props.disabled,
-        requiredAsserts = props.requiredAsserts;
+      asserts = props.asserts,
+      copyValue = props.copyValue,
+      selectValue = props.selectValue,
+      shouldRender = props.shouldRender,
+      dependField = props.dependField,
+      getOptions = props.getOptions,
+      subscribedFields = props.subscribedFields,
+      extraLabel = props.extraLabel,
+      disabled = props.disabled,
+      requiredAsserts = props.requiredAsserts;
     var dependentField = dependencies || [];
-
     if (Array.isArray(subscribedFields)) {
       dependentField.push.apply(dependentField, _toConsumableArray(subscribedFields));
     }
-
     if (asserts && asserts.length) {
       asserts.forEach(function (_ref) {
         var field = _ref.field;
         return dependentField.push(field);
       });
     }
-
     if (requiredAsserts && requiredAsserts.length) {
       requiredAsserts.forEach(function (_ref2) {
         var field = _ref2.field;
         return dependentField.push(field);
       });
     }
-
     if (copyValue) {
       dependentField.push(copyValue.assert.field);
     }
-
     if (selectValue && selectValue.length) {
       selectValue.forEach(function (_ref3) {
         var assert = _ref3.assert;
         return dependentField.push(assert.field);
       });
     }
-
     if ((shouldRender || getOptions || typeof extraLabel === 'function') && !Array.isArray(subscribedFields)) {
       dependentField.push('SUBSCRIBE_ALL');
     }
-
     if (dependField) {
       dependentField.push(dependField);
     }
-
     if (Array.isArray(disabled)) {
       disabled.forEach(function (_ref4) {
         var field = _ref4.field;
@@ -161,36 +106,31 @@ var Element = function Element(props) {
     } else if (_typeof(disabled) === 'object') {
       dependentField.push(disabled.field);
     }
-
     registerDependencies(dependentField, dispatch);
   }, []);
   var extraConfig = (0, _react.useMemo)(function () {
     var _children$type, _children$type2;
+    if (! /*#__PURE__*/(0, _react.isValidElement)(children)) return {};
 
-    if (! /*#__PURE__*/(0, _react.isValidElement)(children)) return {}; //@ts-ignore
-
-    return (children === null || children === void 0 ? void 0 : (_children$type = children.type) === null || _children$type === void 0 ? void 0 : _children$type.formItemPropsHandler) ? //@ts-ignore
+    //@ts-ignore
+    return children !== null && children !== void 0 && (_children$type = children.type) !== null && _children$type !== void 0 && _children$type.formItemPropsHandler ? //@ts-ignore
     children === null || children === void 0 ? void 0 : (_children$type2 = children.type) === null || _children$type2 === void 0 ? void 0 : _children$type2.formItemPropsHandler(props) : {};
   }, [children]);
-
   var _calcFormItemProps = (0, _formUtils.calcFormItemProps)(rest, _objectSpread(_objectSpread({}, extraConfig), {}, {
-    requiredMark: requiredMark
-  }), form, parentName),
-      colProps = _calcFormItemProps.colProps,
-      formItemProps = _calcFormItemProps.formItemProps,
-      display = _calcFormItemProps.display,
-      previewFormater = _calcFormItemProps.previewFormater,
-      elementProps = _calcFormItemProps.elementProps;
-
+      requiredMark: requiredMark
+    }), form, parentName),
+    colProps = _calcFormItemProps.colProps,
+    formItemProps = _calcFormItemProps.formItemProps,
+    display = _calcFormItemProps.display,
+    previewFormater = _calcFormItemProps.previewFormater,
+    elementProps = _calcFormItemProps.elementProps;
   (0, _react.useEffect)(function () {
     if (formItemProps.name === undefined || preview || !formItemProps.copiedValue.copied) return;
     var originalValue = form === null || form === void 0 ? void 0 : form.getFieldValue(formItemProps.name);
     var value = formItemProps.copiedValue.value;
-
     if (_typeof(originalValue) === 'object' && _typeof(value) === 'object') {
       value = Object.assign(originalValue, formItemProps.copiedValue.value);
     }
-
     form && form.setFields([{
       name: formItemProps.name,
       value: value,
@@ -205,15 +145,11 @@ var Element = function Element(props) {
       errors: []
     }]);
   }, [formItemProps.selectedValue.value]);
-
   var _useBreakpoint = useBreakpoint(),
-      md = _useBreakpoint.md;
-
+    md = _useBreakpoint.md;
   var ref = (0, _react.useRef)(null);
-
   var halfRow = colProps.halfRow,
-      restColProps = _objectWithoutProperties(colProps, _excluded2);
-
+    restColProps = _objectWithoutProperties(colProps, _excluded2);
   var value = form === null || form === void 0 ? void 0 : form.getFieldValue(formItemProps.name);
   var error = form === null || form === void 0 ? void 0 : form.getFieldError(formItemProps.name);
   (0, _react.useEffect)(function () {
@@ -224,14 +160,12 @@ var Element = function Element(props) {
       value: formItemProps.initialValue
     }]);
   }, [formItemProps.initialValue]);
-
   var setFieldError = function setFieldError(errorMsg) {
     form === null || form === void 0 ? void 0 : form.setFields([{
       name: formItemProps.name,
       errors: errorMsg ? [errorMsg] : []
     }]);
   };
-
   var setFieldValue = function setFieldValue(value) {
     form === null || form === void 0 ? void 0 : form.setFields([{
       name: formItemProps.name,
@@ -241,15 +175,12 @@ var Element = function Element(props) {
       name: formItemProps.name
     }]);
   };
-
   var validateField = function validateField() {
     form === null || form === void 0 ? void 0 : form.validateFields([formItemProps.name]);
   };
-
   var getFormInstance = function getFormInstance() {
     return form;
   };
-
   var transformChildren = function transformChildren() {
     if (! /*#__PURE__*/(0, _react.isValidElement)(children)) return children;
     return /*#__PURE__*/(0, _react.cloneElement)(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), elementProps), {}, {
@@ -261,17 +192,15 @@ var Element = function Element(props) {
       validateField: validateField
     }));
   };
-
   if (!display) return null;
-
   if (preview) {
-    return (0, _jsxRuntime.jsx)(_col.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, {
       span: 24,
       className: (0, _classnames.default)('igloo-freeform-element-preview', {
         'igloo-freeform-element-preview-hide': props.hideWhenPreview,
         'igloo-freeform-element-preview-hide-divider': props.hidePreviewDivider
       }),
-      children: (0, _jsxRuntime.jsx)(_form.default.Item, _objectSpread(_objectSpread({}, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue'])), {}, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({}, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue'])), {}, {
         labelCol: {
           span: 24
         },
@@ -279,42 +208,42 @@ var Element = function Element(props) {
           span: 24
         },
         label: null,
-        children: (0, _jsxRuntime.jsxs)(_row.default, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Row, {
           className: "igloo-freeform-element-preview-item",
           gutter: {
             md: 32,
             sm: 0,
             xs: 0
           },
-          children: [(rest.previewLabel || rest.label) && (0, _jsxRuntime.jsx)(_col.default, {
+          children: [(rest.previewLabel || rest.label) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, {
             span: 12,
             md: 12,
             sm: 24,
             xs: 24,
             className: "igloo-freeform-element-preview-label",
             children: rest.previewLabel || rest.label
-          }), (0, _jsxRuntime.jsxs)(_col.default, {
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Col, {
             span: rest.previewLabel || rest.label ? 12 : 24,
             md: rest.previewLabel || rest.label ? 12 : 24,
             sm: 24,
             xs: 24,
             className: "igloo-freeform-element-preview-value",
-            children: [error && !!error.length && (0, _jsxRuntime.jsxs)(_row.default, {
+            children: [error && !!error.length && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Row, {
               style: {
                 alignItems: 'center'
               },
-              children: [(0, _jsxRuntime.jsx)(_col.default, {
-                children: (0, _jsxRuntime.jsx)(_iglooicon.AlertFilled, {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, {
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_iglooicon.AlertFilled, {
                   className: "igloo-freeform-element-preview-value-icon"
                 })
-              }), (0, _jsxRuntime.jsx)(_col.default, {
-                children: (0, _jsxRuntime.jsx)(_typography.default, {
+              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, {
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.default, {
                   level: "caption2",
                   className: "igloo-freeform-element-preview-value-errors",
                   children: error.join('\n')
                 })
               })]
-            }), (0, _jsxRuntime.jsx)("div", {
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
               children: previewFormater ? previewFormater(value, form) : _typeof(value) === 'object' ? JSON.stringify(value) : value
             })]
           })]
@@ -322,16 +251,15 @@ var Element = function Element(props) {
       }))
     });
   }
-
-  return props.hideWhenEdit ? null : (0, _jsxRuntime.jsx)(_col.default, _objectSpread(_objectSpread({}, restColProps), {}, {
+  return props.hideWhenEdit ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, _objectSpread(_objectSpread({}, restColProps), {}, {
     className: "igloo-freeform-item",
-    children: (0, _jsxRuntime.jsx)("div", {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       ref: ref,
       style: {
         width: halfRow && md ? '50%' : '100%',
         paddingRight: halfRow && md ? 16 : 0
       },
-      children: (0, _jsxRuntime.jsx)(_form.default.Item, _objectSpread(_objectSpread({
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({
         labelCol: {
           span: 24
         },
@@ -345,7 +273,6 @@ var Element = function Element(props) {
     })
   }));
 };
-
 Element.displayName = 'Igloo_Free_Form_Item';
 var _default = Element;
 exports.default = _default;

package/lib/free-form/element/style/index.less

@@ -11,12 +11,12 @@
 
   .igloo-freeform-element-preview-item {
     .igloo-freeform-element-preview-label {
-      color: #666666;
+      color:  @icon-color;
       line-height: 24px;
     }
 
     .igloo-freeform-element-preview-value {
-      color: #212121;
+      color:  @text-color;
       white-space: pre-wrap;
       word-break: break-word;
       line-height: 24px;
@@ -95,7 +95,7 @@
   width: 100%;
 
   .igloo-freeform-label-text {
-    color: #666666;
+    color:  @icon-color;
     font-size: 16px;
     line-height: 24px;
 
@@ -106,7 +106,7 @@
       margin-left: 5px;
       font-size: 16px;
       font-style: italic;
-      color: #999999;
+      color: @hint-color;
     }
   }
 }

package/lib/free-form/index.d.ts

@@ -1,10 +1,10 @@
-import { FC } from 'react';
+import { FC, PropsWithChildren } from 'react';
 import { Form } from 'antd';
 import { FormBasicConfig } from '../types';
 import './style/index.less';
 interface FreeFormProps extends Omit<FormBasicConfig, 'config'> {
 }
-interface FreeFormType extends FC<FreeFormProps> {
+interface FreeFormType extends FC<PropsWithChildren<FreeFormProps>> {
     useForm: typeof Form.useForm;
 }
 declare const FreeForm: FreeFormType;