@sheinx/base 3.9.5-beta.6 → 3.9.5-beta.7

package/cjs/input/input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["input.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,MAAM,OAAO,CAAC;;AA8C1B,wBAAiC"}
+{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["input.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,MAAM,OAAO,CAAC;;AAyD1B,wBAAiC"}

package/cjs/input/input.js

@@ -43,10 +43,21 @@ var Input = function Input(props) {
     showClear: props.showClear,
     onKeyDown: function onKeyDown(e) {
       var _props$onKeyDown;
+      // 在 Enter 键按下时,如果开启了 trim,先执行 trim 逻辑
+      if (e.key === 'Enter' && inputFormatParams.trim) {
+        var target = e.target;
+        var value = target.value;
+        var trimmedValue = value.trim();
+        if (value !== trimmedValue) {
+          var _commonProps$onChange;
+          target.value = trimmedValue;
+          (_commonProps$onChange = commonProps.onChange) === null || _commonProps$onChange === void 0 || _commonProps$onChange.call(commonProps, trimmedValue);
+        }
+      }
       if (e.key === 'Enter' && !e.defaultPrevented) {
         var _props$onChange;
-        var value = e.target.value;
-        (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, value);
+        var _value = e.target.value;
+        (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, _value);
       }
       (_props$onKeyDown = props.onKeyDown) === null || _props$onKeyDown === void 0 || _props$onKeyDown.call(props, e);
     }

package/cjs/input/simple-input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simple-input.d.ts","sourceRoot":"","sources":["simple-input.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIhD,QAAA,MAAM,KAAK;YAAW,gBAAgB;;CA4HrC,CAAC;AAGF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"simple-input.d.ts","sourceRoot":"","sources":["simple-input.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIhD,QAAA,MAAM,KAAK;YAAW,gBAAgB;;CAqGrC,CAAC;AAGF,eAAe,KAAK,CAAC"}

package/cjs/input/simple-input.js

@@ -42,34 +42,13 @@ var Input = function Input(props) {
     addEnd = props.addEnd,
     hasSuffix = props.hasSuffix,
     rest = _objectWithoutProperties(props, _excluded);
-  var _useRef = (0, _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 = (0, _config.useConfig)();
   var _useContext = (0, _react.useContext)(_formFieldContext.FormFieldContext),
     fieldId = _useContext.fieldId;
   var showClearFromProp = props.showClear && !props.disabled;
   var _useInput = (0, _hooks.useInput)(_objectSpread(_objectSpread({}, rest), {}, {
-      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);
-      }
+      onFocusedChange: onFocusedChange
     })),
     getRootProps = _useInput.getRootProps,
     getClearProps = _useInput.getClearProps,
@@ -84,10 +63,6 @@ var Input = function Input(props) {
   });
   var onKeyUp = (0, _hooks.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);
   });

package/esm/input/input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["input.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,MAAM,OAAO,CAAC;;AA8C1B,wBAAiC"}
+{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["input.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,MAAM,OAAO,CAAC;;AAyD1B,wBAAiC"}

package/esm/input/input.js

@@ -36,10 +36,21 @@ var Input = function Input(props) {
     showClear: props.showClear,
     onKeyDown: function onKeyDown(e) {
       var _props$onKeyDown;
+      // 在 Enter 键按下时,如果开启了 trim,先执行 trim 逻辑
+      if (e.key === 'Enter' && inputFormatParams.trim) {
+        var target = e.target;
+        var value = target.value;
+        var trimmedValue = value.trim();
+        if (value !== trimmedValue) {
+          var _commonProps$onChange;
+          target.value = trimmedValue;
+          (_commonProps$onChange = commonProps.onChange) === null || _commonProps$onChange === void 0 || _commonProps$onChange.call(commonProps, trimmedValue);
+        }
+      }
       if (e.key === 'Enter' && !e.defaultPrevented) {
         var _props$onChange;
-        var value = e.target.value;
-        (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, value);
+        var _value = e.target.value;
+        (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, _value);
       }
       (_props$onKeyDown = props.onKeyDown) === null || _props$onKeyDown === void 0 || _props$onKeyDown.call(props, e);
     }

package/esm/input/simple-input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simple-input.d.ts","sourceRoot":"","sources":["simple-input.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIhD,QAAA,MAAM,KAAK;YAAW,gBAAgB;;CA4HrC,CAAC;AAGF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"simple-input.d.ts","sourceRoot":"","sources":["simple-input.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAIhD,QAAA,MAAM,KAAK;YAAW,gBAAgB;;CAqGrC,CAAC;AAGF,eAAe,KAAK,CAAC"}

package/esm/input/simple-input.js

@@ -9,7 +9,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 import { getDataset, useInput, useKeyEvent, usePersistFn, util } from '@sheinx/hooks';
 import classNames from 'classnames';
-import React, { useContext, useRef } from 'react';
+import React, { useContext } from 'react';
 import Icons from "../icons";
 import { useConfig } from "../config";
 import { FormFieldContext } from "../form/form-field-context";
@@ -34,34 +34,13 @@ var Input = function Input(props) {
     addEnd = props.addEnd,
     hasSuffix = props.hasSuffix,
     rest = _objectWithoutProperties(props, _excluded);
-  var _useRef = 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 = useContext(FormFieldContext),
     fieldId = _useContext.fieldId;
   var showClearFromProp = props.showClear && !props.disabled;
   var _useInput = useInput(_objectSpread(_objectSpread({}, rest), {}, {
-      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);
-      }
+      onFocusedChange: onFocusedChange
     })),
     getRootProps = _useInput.getRootProps,
     getClearProps = _useInput.getClearProps,
@@ -76,10 +55,6 @@ 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);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/base",
-  "version": "3.9.5-beta.6",
+  "version": "3.9.5-beta.7",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -10,7 +10,7 @@
   "module": "./esm/index.js",
   "typings": "./cjs/index.d.ts",
   "dependencies": {
-    "@sheinx/hooks": "3.9.5-beta.6",
+    "@sheinx/hooks": "3.9.5-beta.7",
     "immer": "^10.0.0",
     "classnames": "^2.0.0",
     "@shined/reactive": "^0.3.3"