@sheinx/base 3.5.4-beta.1 → 3.5.4-beta.3

package/cjs/form/form-button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["form-button.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,QAAA,MAAM,UAAU,UAAW,WAAW,gBAarC,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["form-button.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,QAAA,MAAM,UAAU,UAAW,WAAW,gBAmBrC,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/cjs/form/form-button.js

@@ -25,6 +25,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);
     }

package/cjs/form/form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["form.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,QAAA,MAAM,IAAI,4DA4FT,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["form.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,QAAA,MAAM,IAAI,4DA8GT,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/cjs/form/form.js

@@ -104,10 +104,25 @@ var Form = function Form(props) {
     handleFormModalInfo();
   }, [props.disabled, props.pending]);
   var rootClass = (0, _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, _jsxRuntime.jsx)("form", _objectSpread(_objectSpread({}, getFormProps({
+  var formProps = getFormProps({
     className: rootClass,
     style: style
+  });
+  var formElRef = (0, _react.useRef)(null);
+  (0, _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, _jsxRuntime.jsx)("form", _objectSpread(_objectSpread({}, _hooks.util.removeProps(formProps, {
+    onSubmit: true
   })), {}, {
+    ref: formElRef,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Provider, _objectSpread(_objectSpread({}, ProviderProps), {}, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_hooks.FormContext.Provider, {
         value: formRefObj,

package/cjs/sticky/sticky.js

@@ -245,7 +245,7 @@ var Sticky = function Sticky(props) {
     cancelFixedObserver();
     context.fixedObserver = new IntersectionObserver(handleFixedInter, {
       root: null,
-      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
       threshold: 1.0
     });
   };
@@ -281,7 +281,7 @@ var Sticky = function Sticky(props) {
       if (window.IntersectionObserver) {
         var observer = new IntersectionObserver(handleTargetPosition, {
           root: context.target,
-          rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+          rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
           threshold: 1.0
         });
         context.targetObserver = observer;
@@ -299,7 +299,7 @@ var Sticky = function Sticky(props) {
     cancelParentObserver();
     context.parentObserver = new IntersectionObserver(handleParentVisible, {
       root: context.target,
-      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
       threshold: 0
     });
     context.parentObserver.observe(props.parent);

package/esm/form/form-button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["form-button.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,QAAA,MAAM,UAAU,UAAW,WAAW,gBAarC,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["form-button.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,QAAA,MAAM,UAAU,UAAW,WAAW,gBAmBrC,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/esm/form/form-button.js

@@ -18,6 +18,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);
     }

package/esm/form/form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["form.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,QAAA,MAAM,IAAI,4DA4FT,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["form.tsx"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,QAAA,MAAM,IAAI,4DA8GT,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/esm/form/form.js

@@ -7,10 +7,10 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
-import { FormContext, useForm, useInputAble, useLatestObj, usePersistFn } from '@sheinx/hooks';
+import { FormContext, useForm, useInputAble, useLatestObj, usePersistFn, util } from '@sheinx/hooks';
 import classNames from 'classnames';
 import { useFormFooter } from "./form-footer-context";
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 var Form = function Form(props) {
   var _jssStyle$form;
@@ -95,10 +95,25 @@ var Form = function Form(props) {
     handleFormModalInfo();
   }, [props.disabled, props.pending]);
   var rootClass = classNames([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__*/_jsx("form", _objectSpread(_objectSpread({}, getFormProps({
+  var formProps = getFormProps({
     className: rootClass,
     style: style
+  });
+  var formElRef = useRef(null);
+  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__*/_jsx("form", _objectSpread(_objectSpread({}, util.removeProps(formProps, {
+    onSubmit: true
   })), {}, {
+    ref: formElRef,
     children: /*#__PURE__*/_jsx(Provider, _objectSpread(_objectSpread({}, ProviderProps), {}, {
       children: /*#__PURE__*/_jsx(FormContext.Provider, {
         value: formRefObj,

package/esm/sticky/sticky.js

@@ -239,7 +239,7 @@ var Sticky = function Sticky(props) {
     cancelFixedObserver();
     context.fixedObserver = new IntersectionObserver(handleFixedInter, {
       root: null,
-      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
       threshold: 1.0
     });
   };
@@ -275,7 +275,7 @@ var Sticky = function Sticky(props) {
       if (window.IntersectionObserver) {
         var observer = new IntersectionObserver(handleTargetPosition, {
           root: context.target,
-          rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+          rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
           threshold: 1.0
         });
         context.targetObserver = observer;
@@ -293,7 +293,7 @@ var Sticky = function Sticky(props) {
     cancelParentObserver();
     context.parentObserver = new IntersectionObserver(handleParentVisible, {
       root: context.target,
-      rootMargin: "-".concat(top || 0, "px 0px -").concat(bottom || 0, "px 0px"),
+      rootMargin: "".concat(-(top || 0), "px 0px ").concat(-(bottom || 0), "px 0px"),
       threshold: 0
     });
     context.parentObserver.observe(props.parent);

package/package.json

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