@arco-design/mobile-react 2.38.3 → 2.39.0

package/esm/ellipsis/utils/dom.js

@@ -1,7 +1,6 @@
 export function getLineHeight(element) {
   var style = window.getComputedStyle(element, null);
   var lineHeight = style.getPropertyValue('line-height');
-
   if (lineHeight === 'normal') {
     // Create a temp element to get line-height
     var dom = document.createElement('span');
@@ -14,30 +13,24 @@ export function getLineHeight(element) {
     element.removeChild(dom);
     return height;
   }
-
   return parseFloat(lineHeight);
 }
-
 function createSpan(text, className) {
   if (className === void 0) {
     className = '';
   }
-
   var span = document.createElement('span');
   span.className = className;
   span.textContent = text;
   return span;
 }
-
 export function wrapTextChildNodesWithSpan(node, className) {
   if (className === void 0) {
     className = '';
   }
-
   if (node.nodeType === Node.TEXT_NODE) {
     if (node.textContent) {
       var _node$parentNode;
-
       (_node$parentNode = node.parentNode) == null ? void 0 : _node$parentNode.replaceChild(createSpan(node.textContent, className), node);
     }
   } else {

package/esm/ellipsis/utils/is.js

@@ -1,8 +1,8 @@
 export var isBrowser = function isBrowser() {
   return typeof window !== 'undefined' && typeof document !== 'undefined';
 };
-/** Whether the environment support -webkit-line-clamp. */
 
+/** Whether the environment support -webkit-line-clamp. */
 export var isSupportWebkitLineClamp = function isSupportWebkitLineClamp() {
   return isBrowser() && typeof document.body.style.webkitLineClamp !== 'undefined';
 };

package/esm/form/form-item.d.ts

@@ -1,7 +1,8 @@
-import React, { PureComponent, ReactNode } from 'react';
-import { Promise } from 'es6-promise';
+import type { ReactNode } from 'react';
+import React, { PureComponent } from 'react';
 import { FormItemContext } from './form-item-context';
-import { IFieldError, FieldValue, IFormItemInnerProps, FormItemProps, ValidateStatus, FormItemRef, ValueChangeType, IFormItemContext } from './type';
+import type { IFieldError, FieldValue, IFormItemInnerProps, FormItemProps, ValidateStatus, FormItemRef, IFormItemContext } from './type';
+import { ValueChangeType } from './type';
 interface IFormItemInnerState {
     validateStatus: ValidateStatus;
     errors?: ReactNode[];
@@ -19,7 +20,7 @@ declare class FormItemInner extends PureComponent<IFormItemInnerProps, IFormItem
         changeType: ValueChangeType;
     } | undefined) => void;
     getInitialValue: () => any;
-    getFieldError: () => React.ReactNode[];
+    getFieldError: () => ReactNode[];
     isFieldTouched: () => boolean;
     getAllRuleValidateTriggers: () => string[];
     validateField: (validateTrigger?: string | undefined) => Promise<IFieldError>;

package/esm/form/form-item.js

@@ -1,35 +1,30 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
-var _excluded = ["label", "field", "disabled", "layout", "style", "extra", "requiredIcon", "rules", "className"];
-
+var _excluded = ["label", "field", "disabled", "layout", "style", "extra", "requiredIcon", "rules", "className", "labelName"];
 /* eslint-disable react/no-unused-class-component-methods */
+
 import React, { forwardRef, PureComponent, useContext, useImperativeHandle, useRef, useState } from 'react';
 import { cls, Validator, ValidatorType } from '@arco-design/mobile-utils';
-import { Promise } from 'es6-promise';
+import { Promise as ES6Promise } from 'es6-promise';
 import { FormItemContext } from './form-item-context';
 import { GlobalContext } from '../context-provider';
-import { FormInternalComponentType, ValueChangeType } from './type';
+import { ValueChangeType, FormInternalComponentType } from './type';
 import { getDefaultValueForInterComponent, getErrorAndWarnings, isFieldRequired } from './utils';
 import { DefaultDatePickerLinkedContainer, DefaultPickerLinkedContainer } from './linked-container';
-
 var FormItemInner = /*#__PURE__*/function (_PureComponent) {
   _inheritsLoose(FormItemInner, _PureComponent);
-
-  // eslint-disable-next-line react/static-property-placement
   function FormItemInner(props, context) {
     var _this;
-
     _this = _PureComponent.call(this, props) || this;
+    // eslint-disable-next-line react/static-property-placement
     _this.context = void 0;
     _this.destroyField = void 0;
     _this._errors = [];
     _this._touched = false;
-
     _this.onValueChange = function (curValue, preValue, info) {
       _this._touched = true;
       var shouldUpdate = _this.props.shouldUpdate;
-
       if (typeof shouldUpdate === 'function') {
         shouldUpdate({
           preValue: preValue,
@@ -37,92 +32,77 @@ var FormItemInner = /*#__PURE__*/function (_PureComponent) {
         }) && _this.forceUpdate();
         return;
       }
-
       if ((info == null ? void 0 : info.changeType) === ValueChangeType.Reset) {
         _this.props.onValidateStatusChange({
           errors: [],
           warnings: [],
           errorTypes: []
         });
-
         _this._errors = [];
       }
-
       _this.forceUpdate();
     };
-
     _this.getInitialValue = function () {
       var _children$type, _getInitialValue;
-
       var _this$props = _this.props,
-          children = _this$props.children,
-          displayType = _this$props.displayType;
-
+        children = _this$props.children,
+        displayType = _this$props.displayType;
       var _this$context$form$ge = _this.context.form.getInternalHooks(),
-          getInitialValue = _this$context$form$ge.getInitialValue;
-
-      var childrenType = displayType || ((_children$type = children.type) == null ? void 0 : _children$type.displayName); // get user-defined initialValue or if not defined
-
+        getInitialValue = _this$context$form$ge.getInitialValue;
+      var childrenType = displayType || ((_children$type = children.type) == null ? void 0 : _children$type.displayName);
+      // get user-defined initialValue or if not defined
       return (_getInitialValue = getInitialValue(_this.props.field)) != null ? _getInitialValue : getDefaultValueForInterComponent(childrenType);
     };
-
     _this.getFieldError = function () {
       return _this._errors;
     };
-
     _this.isFieldTouched = function () {
       return _this._touched;
     };
-
     _this.getAllRuleValidateTriggers = function () {
       var _this$props$rules;
-
       return ((_this$props$rules = _this.props.rules) == null ? void 0 : _this$props$rules.map(function (rule) {
         return rule.validateTrigger;
       }).flat().filter(function (v) {
         return !!v;
       })) || [];
     };
-
     _this.validateField = function (validateTrigger) {
       var validateMessages = _this.context.validateMessages;
       var getFieldValue = _this.context.form.getFieldValue;
       var _this$props2 = _this.props,
-          field = _this$props2.field,
-          rules = _this$props2.rules,
-          onValidateStatusChange = _this$props2.onValidateStatusChange;
-      var value = getFieldValue(field); // rules: if validateTrigger is not defined, all rules will be validated
+        field = _this$props2.field,
+        rules = _this$props2.rules,
+        onValidateStatusChange = _this$props2.onValidateStatusChange,
+        labelName = _this$props2.labelName;
+      var value = getFieldValue(field);
+      // rules: if validateTrigger is not defined, all rules will be validated
       // if validateTrigger is defined, only rules  with validateTrigger  or  without rule.validateTrigger  will be validated
-
       var curRules = validateTrigger ? rules == null ? void 0 : rules.filter(function (rule) {
         var triggerList = [].concat(rule.validateTrigger || validateTrigger);
         return triggerList.includes(validateTrigger);
       }) : rules;
-
       if (curRules != null && curRules.length && field) {
         var _Validator;
-
         var fieldDom = _this.props.getFormItemRef();
-
-        var fieldValidator = new Validator((_Validator = {}, _Validator[field] = curRules, _Validator), {
+        var validateFieldName = labelName || field;
+        var fieldValidator = new Validator((_Validator = {}, _Validator[validateFieldName] = curRules, _Validator), {
           validateMessages: validateMessages
         });
-        return new Promise(function (resolve) {
+        return new ES6Promise(function (resolve) {
           var _fieldValidator$valid;
-
-          fieldValidator.validate((_fieldValidator$valid = {}, _fieldValidator$valid[field] = value, _fieldValidator$valid), function (errorsMap) {
-            var _getErrorAndWarnings = getErrorAndWarnings((errorsMap == null ? void 0 : errorsMap[field]) || []),
-                errors = _getErrorAndWarnings.errors,
-                warnings = _getErrorAndWarnings.warnings,
-                errorTypes = _getErrorAndWarnings.errorTypes;
-
+          fieldValidator.validate((_fieldValidator$valid = {}, _fieldValidator$valid[validateFieldName] = value, _fieldValidator$valid), function (errorsMap) {
+            var _getErrorAndWarnings = getErrorAndWarnings((errorsMap == null ? void 0 : errorsMap[validateFieldName]) || []),
+              errors = _getErrorAndWarnings.errors,
+              warnings = _getErrorAndWarnings.warnings,
+              errorTypes = _getErrorAndWarnings.errorTypes;
             _this._errors = errors;
             onValidateStatusChange({
               errors: _this._errors,
               warnings: warnings,
               errorTypes: errorTypes
             });
-            return resolve({
+            resolve({
               errors: _this._errors,
               warnings: warnings,
               value: value,
@@ -132,8 +112,7 @@ var FormItemInner = /*#__PURE__*/function (_PureComponent) {
           });
         });
       }
-
-      return Promise.resolve({
+      return ES6Promise.resolve({
         errors: [],
         warnings: [],
         value: value,
@@ -141,130 +120,96 @@ var FormItemInner = /*#__PURE__*/function (_PureComponent) {
         dom: null
       });
     };
-
     _this.setFieldData = function (value) {
       var _this$props3 = _this.props,
-          field = _this$props3.field,
-          _this$props3$trigger = _this$props3.trigger,
-          trigger = _this$props3$trigger === void 0 ? 'onChange' : _this$props3$trigger;
-
+        field = _this$props3.field,
+        _this$props3$trigger = _this$props3.trigger,
+        trigger = _this$props3$trigger === void 0 ? 'onChange' : _this$props3$trigger;
       var _this$context$form$ge2 = _this.context.form.getInternalHooks(),
-          innerSetFieldValue = _this$context$form$ge2.innerSetFieldValue;
-
+        innerSetFieldValue = _this$context$form$ge2.innerSetFieldValue;
       innerSetFieldValue(field, value);
-
       _this.validateField(trigger);
     };
-
     _this.innerTriggerFunctionWithValueFirst = function (value) {
       var _children$props;
-
       _this.setFieldData(value);
-
       var _this$props4 = _this.props,
-          children = _this$props4.children,
-          _this$props4$trigger = _this$props4.trigger,
-          trigger = _this$props4$trigger === void 0 ? 'onChange' : _this$props4$trigger;
-
+        children = _this$props4.children,
+        _this$props4$trigger = _this$props4.trigger,
+        trigger = _this$props4$trigger === void 0 ? 'onChange' : _this$props4$trigger;
       if (trigger && (_children$props = children.props) != null && _children$props[trigger]) {
         var _children$props2;
-
         for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
           args[_key - 1] = arguments[_key];
         }
-
         (_children$props2 = children.props) == null ? void 0 : _children$props2[trigger].apply(_children$props2, [value].concat(args));
       }
     };
-
     _this.innerOnInputFunction = function (_, value) {
       var _children$props3;
-
       _this.setFieldData(value);
-
       var children = _this.props.children;
-
       for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
         args[_key2 - 2] = arguments[_key2];
       }
-
       (_children$props3 = children.props) == null ? void 0 : _children$props3.onInput == null ? void 0 : _children$props3.onInput.apply(_children$props3, [_, value].concat(args));
     };
-
     _this.innerClearFunction = function () {
       var _children$props4;
-
       var children = _this.props.children;
-
       _this.setFieldData('');
-
       if ((_children$props4 = children.props) != null && _children$props4.onClear) {
         var _children$props5;
-
         for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
           args[_key3] = arguments[_key3];
         }
-
         (_children$props5 = children.props) == null ? void 0 : _children$props5.onClear.apply(_children$props5, args);
       }
     };
-
     _this.destroyField = function () {};
-
     if (props != null && props.initialValue && props.field) {
       var _context$form$getInte = context.form.getInternalHooks(),
-          setInitialValue = _context$form$getInte.setInitialValue;
-
+        setInitialValue = _context$form$getInte.setInitialValue;
       setInitialValue(props.field, props.initialValue);
     }
-
     return _this;
   }
-
   var _proto = FormItemInner.prototype;
-
   _proto.componentDidMount = function componentDidMount() {
     var _this$context$form$ge3 = this.context.form.getInternalHooks(),
-        registerField = _this$context$form$ge3.registerField;
-
+      registerField = _this$context$form$ge3.registerField;
     this.destroyField = registerField(this.props.field, this);
   };
-
   _proto.componentWillUnmount = function componentWillUnmount() {
     this.destroyField();
   };
-
   _proto.renderChildren = function renderChildren() {
     var _this2 = this,
-        _children$type2,
-        _children$props7,
-        _children$props8;
-
+      _children$type2,
+      _children$props7,
+      _children$props8;
     var _this$props5 = this.props,
-        children = _this$props5.children,
-        field = _this$props5.field,
-        _this$props5$trigger = _this$props5.trigger,
-        trigger = _this$props5$trigger === void 0 ? 'onChange' : _this$props5$trigger,
-        _this$props5$triggerP = _this$props5.triggerPropsField,
-        triggerPropsField = _this$props5$triggerP === void 0 ? 'value' : _this$props5$triggerP,
-        displayType = _this$props5.displayType,
-        disabled = _this$props5.disabled;
+      children = _this$props5.children,
+      field = _this$props5.field,
+      _this$props5$trigger = _this$props5.trigger,
+      trigger = _this$props5$trigger === void 0 ? 'onChange' : _this$props5$trigger,
+      _this$props5$triggerP = _this$props5.triggerPropsField,
+      triggerPropsField = _this$props5$triggerP === void 0 ? 'value' : _this$props5$triggerP,
+      displayType = _this$props5.displayType,
+      disabled = _this$props5.disabled;
     var getFieldValue = this.context.form.getFieldValue;
     var childrenProps = {
       disabled: disabled
-    }; // inject validateTriggers of rules
-
+    };
+    // inject validateTriggers of rules
     this.getAllRuleValidateTriggers().forEach(function (triggerName) {
       childrenProps[triggerName] = function (e) {
         var _children$props6, _children$props6$trig;
-
         _this2.validateField(triggerName);
-
         children == null ? void 0 : (_children$props6 = children.props) == null ? void 0 : (_children$props6$trig = _children$props6[triggerName]) == null ? void 0 : _children$props6$trig.call(_children$props6, e);
       };
     });
     var childrenType = displayType || ((_children$type2 = children.type) == null ? void 0 : _children$type2.displayName);
-
     switch (childrenType) {
       case FormInternalComponentType.Input:
       case FormInternalComponentType.Textarea:
@@ -272,114 +217,95 @@ var FormItemInner = /*#__PURE__*/function (_PureComponent) {
         childrenProps.onInput = this.innerOnInputFunction;
         childrenProps.onClear = this.innerClearFunction;
         break;
-
       case FormInternalComponentType.DatePicker:
         childrenProps.currentTs = getFieldValue(field);
         childrenProps.onChange = this.innerTriggerFunctionWithValueFirst;
-
         childrenProps.renderLinkedContainer = ((_children$props7 = children.props) == null ? void 0 : _children$props7.renderLinkedContainer) || function (ts, types) {
           return /*#__PURE__*/React.createElement(DefaultDatePickerLinkedContainer, {
             ts: ts,
             types: types
           });
         };
-
         break;
-
       case FormInternalComponentType.Picker:
         childrenProps.value = getFieldValue(field) || '';
         childrenProps.onChange = this.innerTriggerFunctionWithValueFirst;
-
         childrenProps.renderLinkedContainer = ((_children$props8 = children.props) == null ? void 0 : _children$props8.renderLinkedContainer) || function (val) {
           return /*#__PURE__*/React.createElement(DefaultPickerLinkedContainer, {
             value: val
           });
         };
-
         break;
-
       case FormInternalComponentType.Switch:
         childrenProps.checked = Boolean(getFieldValue(field));
         childrenProps.onChange = this.innerTriggerFunctionWithValueFirst;
         break;
-
       case FormInternalComponentType.ImagePicker:
         childrenProps.images = getFieldValue(field);
         childrenProps.onChange = this.innerTriggerFunctionWithValueFirst;
         break;
-
       default:
         if (triggerPropsField) {
           childrenProps[triggerPropsField] = getFieldValue(field);
-        } // inject the validated result
-
-
+        }
+        // inject the validated result
         childrenProps.error = this._errors;
         childrenProps[trigger] = this.innerTriggerFunctionWithValueFirst;
     }
-
     return /*#__PURE__*/React.cloneElement(children, childrenProps);
   };
-
   _proto.render = function render() {
     return this.renderChildren();
   };
-
   return FormItemInner;
 }(PureComponent);
-
 FormItemInner.contextType = FormItemContext;
 export { FormItemInner };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   var _cls;
-
   var label = props.label,
-      field = props.field,
-      _props$disabled = props.disabled,
-      disabled = _props$disabled === void 0 ? false : _props$disabled,
-      itemLayout = props.layout,
-      style = props.style,
-      extra = props.extra,
-      requiredIcon = props.requiredIcon,
-      rules = props.rules,
-      _props$className = props.className,
-      className = _props$className === void 0 ? '' : _props$className,
-      rest = _objectWithoutPropertiesLoose(props, _excluded);
-
+    field = props.field,
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
+    itemLayout = props.layout,
+    style = props.style,
+    extra = props.extra,
+    requiredIcon = props.requiredIcon,
+    rules = props.rules,
+    _props$className = props.className,
+    className = _props$className === void 0 ? '' : _props$className,
+    labelName = props.labelName,
+    rest = _objectWithoutPropertiesLoose(props, _excluded);
   var _useContext = useContext(GlobalContext),
-      prefixCls = _useContext.prefixCls;
-
+    prefixCls = _useContext.prefixCls;
   var _useContext2 = useContext(FormItemContext),
-      layout = _useContext2.layout,
-      propsDisabled = _useContext2.disabled;
-
+    layout = _useContext2.layout,
+    propsDisabled = _useContext2.disabled;
   var _useState = useState(null),
-      errors = _useState[0],
-      setErrors = _useState[1];
-
+    errors = _useState[0],
+    setErrors = _useState[1];
   var _useState2 = useState(null),
-      errorTypes = _useState2[0],
-      setErrorTypes = _useState2[1];
-
+    errorTypes = _useState2[0],
+    setErrorTypes = _useState2[1];
   var _useState3 = useState([]),
-      warnings = _useState3[0],
-      setWarnings = _useState3[1];
-
+    warnings = _useState3[0],
+    setWarnings = _useState3[1];
   var formItemRef = useRef(null);
-
+  // Prioritize user provided label (if exists and valid string).
+  // Only use labelName as substitute when label is invalid (not a string) or not provided.
+  var labelStr = labelName || (typeof label === 'string' ? label : undefined);
+  var renderedLabel = label !== undefined ? label : labelName;
   var onValidateStatusChange = function onValidateStatusChange(validateResult) {
     var _errors = validateResult.errors,
-        _warnings = validateResult.warnings,
-        _errorTypes = validateResult.errorTypes;
+      _warnings = validateResult.warnings,
+      _errorTypes = validateResult.errorTypes;
     setErrors(_errors.length ? _errors[0] : null);
     setErrorTypes(_errorTypes.length ? _errorTypes[0] : null);
     setWarnings(_warnings);
   };
-
   var getFormItemRef = function getFormItemRef() {
     return formItemRef.current;
   };
-
   var fieldDisabled = disabled || propsDisabled;
   var fieldRules = rest != null && rest.required ? [{
     type: ValidatorType.String,
@@ -401,7 +327,7 @@ export default /*#__PURE__*/forwardRef(function (props, ref) {
     className: cls(prefixCls + "-form-label-item")
   }, isRequired ? requiredIcon || /*#__PURE__*/React.createElement("span", {
     className: cls(prefixCls + "-form-label-item-required-asterisk")
-  }, "*") : null, label), /*#__PURE__*/React.createElement("div", {
+  }, "*") : null, renderedLabel), /*#__PURE__*/React.createElement("div", {
     className: cls(prefixCls + "-form-item-control-wrapper")
   }, /*#__PURE__*/React.createElement("div", {
     className: cls(prefixCls + "-form-item-control")
@@ -409,6 +335,7 @@ export default /*#__PURE__*/forwardRef(function (props, ref) {
     rules: fieldRules,
     disabled: fieldDisabled,
     field: field,
+    labelName: labelStr,
     onValidateStatusChange: onValidateStatusChange,
     getFormItemRef: getFormItemRef
   }))), errors && /*#__PURE__*/React.createElement("div", {

package/esm/form/index.js

@@ -9,40 +9,35 @@ export { default as useForm } from './useForm';
 export * from './type';
 var Form = /*#__PURE__*/forwardRef(function (props, ref) {
   var _props$className = props.className,
-      className = _props$className === void 0 ? '' : _props$className,
-      style = props.style,
-      _props$layout = props.layout,
-      layout = _props$layout === void 0 ? 'horizontal' : _props$layout,
-      initialValues = props.initialValues,
-      formInstance = props.form,
-      children = props.children,
-      onValuesChange = props.onValuesChange,
-      onChange = props.onChange,
-      onSubmit = props.onSubmit,
-      onSubmitFailed = props.onSubmitFailed,
-      disabled = props.disabled;
+    className = _props$className === void 0 ? '' : _props$className,
+    style = props.style,
+    _props$layout = props.layout,
+    layout = _props$layout === void 0 ? 'horizontal' : _props$layout,
+    initialValues = props.initialValues,
+    formInstance = props.form,
+    children = props.children,
+    onValuesChange = props.onValuesChange,
+    onChange = props.onChange,
+    onSubmit = props.onSubmit,
+    onSubmitFailed = props.onSubmitFailed,
+    disabled = props.disabled;
   var domRef = useRef(null);
   var initRef = useRef(false);
-
   var _useForm = useForm(formInstance),
-      form = _useForm[0];
-
+    form = _useForm[0];
   var _getInternalHooks = form.getInternalHooks(),
-      setCallbacks = _getInternalHooks.setCallbacks,
-      setInitialValues = _getInternalHooks.setInitialValues;
-
+    setCallbacks = _getInternalHooks.setCallbacks,
+    setInitialValues = _getInternalHooks.setInitialValues;
   setCallbacks({
     onValuesChange: onValuesChange,
     onSubmit: onSubmit,
     onSubmitFailed: onSubmitFailed,
     onChange: onChange
   });
-
   if (!initRef.current) {
     setInitialValues(initialValues || {});
     initRef.current = true;
   }
-
   useImperativeHandle(ref, function () {
     return {
       dom: domRef.current,
@@ -56,8 +51,8 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   return /*#__PURE__*/React.createElement(ContextLayout, null, function (_ref) {
     var prefixCls = _ref.prefixCls,
-        _ref$locale = _ref.locale,
-        locale = _ref$locale === void 0 ? defaultLocale : _ref$locale;
+      _ref$locale = _ref.locale,
+      locale = _ref$locale === void 0 ? defaultLocale : _ref$locale;
     return /*#__PURE__*/React.createElement("form", {
       className: prefixCls + "-form " + className,
       style: style,
@@ -74,6 +69,7 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     }, children));
   });
 });
+
 /**
  * 表单组件用于集合数据录入
  * @en Form, Form for collecting data input
@@ -82,7 +78,6 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
  * @name 表单
  * @name_en Form
  */
-
 export default componentWrapper(Form, {
   Item: Item
 });