shineout 3.5.4-beta.2 → 3.5.4-beta.3

package/cjs/form/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import IForm from './form';
-import { useFormRef as useForm, useFromInstance } from '@sheinx/hooks';
+import { useFormRef as useForm, useFormInstance } from '@sheinx/hooks';
 type RefForm = typeof IForm;
 declare const Button: ((props: import("./interface").SubmitProps) => JSX.Element) & {
     displayName: string;
@@ -32,7 +32,7 @@ export interface FormComponent extends RefForm {
     Reset: typeof Reset;
     Flow: typeof FormFlow;
     useForm: typeof useForm;
-    useFromInstance: typeof useFromInstance;
+    useFormInstance: typeof useFormInstance;
 }
 declare const FormComp: FormComponent;
 export default FormComp;

package/cjs/form/index.js

@@ -36,5 +36,5 @@ FormComp.Submit = Submit;
 FormComp.Reset = Reset;
 FormComp.Flow = FormFlow;
 FormComp.useForm = _hooks.useFormRef;
-FormComp.useFromInstance = _hooks.useFromInstance;
+FormComp.useFormInstance = _hooks.useFormInstance;
 var _default = exports.default = FormComp;

package/cjs/index.js

@@ -500,5 +500,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.5.4-beta.2'
+  version: '3.5.4-beta.3'
 };

package/dist/shineout.js

@@ -12030,7 +12030,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.5.4-beta.2');
+/* harmony default export */ var version = ('3.5.4-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -48036,7 +48036,7 @@ function useFormRef() {
   };
   return [ref.current, setFormRef];
 }
-function useFromInstance() {
+function useFormInstance() {
   var formCtx = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useContext(FormContext);
   return formCtx;
 }
@@ -48132,10 +48132,25 @@ var Form = function Form(props) {
     handleFormModalInfo();
   }, [props.disabled, props.pending]);
   var rootClass = classnames_default()([formClasses === null || formClasses === void 0 ? void 0 : formClasses.rootClass, formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapper, className, props.inline && (formClasses === null || formClasses === void 0 ? void 0 : formClasses.wrapperInline)]);
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("form", objectSpread2_default()(objectSpread2_default()({}, getFormProps({
+  var formProps = getFormProps({
     className: rootClass,
     style: style
+  });
+  var formElRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (formElRef.current instanceof HTMLFormElement) {
+      formElRef.current.addEventListener('submit', formProps.onSubmit);
+    }
+    return function () {
+      if (formElRef.current instanceof HTMLFormElement) {
+        formElRef.current.removeEventListener('submit', formProps.onSubmit);
+      }
+    };
+  }, [formProps.onSubmit]);
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
+    onSubmit: true
   })), {}, {
+    ref: formElRef,
     children: /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
         value: formRefObj,
@@ -48691,6 +48706,11 @@ var FormButton = function FormButton(props) {
     if (formFunc && props.htmlType === 'button') {
       formFunc.submit();
     }
+    if (formFunc && props.htmlType === 'reset') {
+      // 阻止默认的form reset，改用formFunc.reset。处理嵌套form的reset问题。
+      e.preventDefault();
+      formFunc.reset();
+    }
     if (props.onClick) {
       props.onClick(e);
     }
@@ -48763,7 +48783,7 @@ FormComp.Submit = form_Submit;
 FormComp.Reset = form_Reset;
 FormComp.Flow = form_FormFlow;
 FormComp.useForm = useFormRef;
-FormComp.useFromInstance = useFromInstance;
+FormComp.useFormInstance = useFormInstance;
 /* harmony default export */ var src_form_0 = (FormComp);
 ;// CONCATENATED MODULE: ../base/src/gap/support.ts
 function support_flexGapSupport() {
@@ -66970,7 +66990,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.4-beta.2'
+  version: '3.5.4-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;