shineout 3.7.3-beta.3 → 3.7.3-beta.4

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.7.3-beta.3'
+  version: '3.7.3-beta.4'
 };

package/dist/shineout.js

@@ -12234,7 +12234,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.7.3-beta.3');
+/* harmony default export */ var version = ('3.7.3-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -35810,12 +35810,33 @@ var Input = function Input(props) {
     addEnd = props.addEnd,
     hasSuffix = props.hasSuffix,
     rest = objectWithoutProperties_default()(props, simple_input_excluded);
+  var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
+      needTriggerEnter: false
+    }),
+    context = _useRef.current;
   var inputStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$input = jssStyle.input) === null || _jssStyle$input === void 0 ? void 0 : _jssStyle$input.call(jssStyle);
   var config = useConfig();
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(FormFieldContext),
     fieldId = _useContext.fieldId;
   var _useInput = use_input(objectSpread2_default()(objectSpread2_default()({}, rest), {}, {
-      onFocusedChange: onFocusedChange
+      onFocusedChange: onFocusedChange,
+      // 由于form的原生submit事件是在keydown中触发的，submit校验后触发scrollToError会导致当前焦点的input立即失焦，导致input的回车事件无法触发
+      // 所以这里在onKeyDown时机记录下needTriggerEnter标志，在onBlur时机判断是否需要触发onEnterPress
+      onKeyDown: function onKeyDown(e) {
+        var _props$onKeyDown;
+        if (e.key === 'Enter') {
+          context.needTriggerEnter = true;
+        }
+        (_props$onKeyDown = props.onKeyDown) === null || _props$onKeyDown === void 0 || _props$onKeyDown.call(props, e);
+      },
+      onBlur: function onBlur(e) {
+        var _props$onBlur;
+        if (context.needTriggerEnter) {
+          context.needTriggerEnter = false;
+          _onEnterPress === null || _onEnterPress === void 0 || _onEnterPress(e.target.value || '', e);
+        }
+        (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
+      }
     })),
     getRootProps = _useInput.getRootProps,
     getClearProps = _useInput.getClearProps,
@@ -35831,6 +35852,10 @@ var Input = function Input(props) {
   });
   var onKeyUp = usePersistFn(function (e) {
     var _props$onKeyUp;
+    if (e.key === 'Enter') {
+      context.needTriggerEnter = false;
+    }
+    ;
     (_props$onKeyUp = props.onKeyUp) === null || _props$onKeyUp === void 0 || _props$onKeyUp.call(props, e);
     keyHandler(e);
   });
@@ -50651,14 +50676,14 @@ var useForm = function useForm(props) {
             });
           case 6:
             result = _context.sent;
-            if (activeEl) activeEl.focus();
             if (result === true) {
               (_props$onSubmit2 = props.onSubmit) === null || _props$onSubmit2 === void 0 || _props$onSubmit2.call(props, (_context$value2 = context.value) !== null && _context$value2 !== void 0 ? _context$value2 : {});
+              if (activeEl) activeEl.focus();
             } else {
               handleSubmitError(result);
             }
             callback === null || callback === void 0 || callback();
-          case 10:
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -71565,7 +71590,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.3-beta.3'
+  version: '3.7.3-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;