@sheinx/base 3.6.0-beta.8 → 3.6.0-beta.9

package/cjs/form/form-field-context.js

@@ -9,4 +9,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var FormFieldContext = exports.FormFieldContext = /*#__PURE__*/_react.default.createContext({
   fieldId: undefined,
   separator: '__separator__'
-});
+});
+FormFieldContext.displayName = 'FormFieldContext';

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

@@ -1 +1 @@
-{"version":3,"file":"form-field.d.ts","sourceRoot":"","sources":["form-field.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAqB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGtE,QAAA,MAAM,SAAS,oEA6Ed,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"form-field.d.ts","sourceRoot":"","sources":["form-field.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAqB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGtE,QAAA,MAAM,SAAS,oEAoFd,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/cjs/form/form-field.js

@@ -45,6 +45,7 @@ var FormField = function FormField(props) {
   var error = (_childrenProps$error = childrenProps.error) !== null && _childrenProps$error !== void 0 ? _childrenProps$error : formControl.error;
   var status = (_childrenProps$status = childrenProps.status) !== null && _childrenProps$status !== void 0 ? _childrenProps$status : formControl.error ? 'error' : undefined;
   var _useContext = (0, _react.useContext)(_formFieldContext.FormFieldContext),
+    fieldId = _useContext.fieldId,
     separator = _useContext.separator;
   var formFieldId = (0, _react.useMemo)(function () {
     if (!formConfig.formName) return;
@@ -56,6 +57,12 @@ var FormField = function FormField(props) {
     }
     return _hooks.util.getFieldId(formControl.name, formConfig.formName);
   }, [formControl.name, formConfig.formName, childrenProps.id]);
+  var _useContext2 = (0, _react.useContext)(_hooks.FieldsetContext),
+    fieldsetPath = _useContext2.path;
+  var fieldsetPathId = (0, _react.useMemo)(function () {
+    if (!formConfig.formName) return;
+    return _hooks.util.getFieldId(fieldsetPath, formConfig.formName);
+  }, [fieldsetPath, formConfig.formName]);
   var cloneProps = {
     onChange: handleChange,
     status: status,
@@ -77,7 +84,7 @@ var FormField = function FormField(props) {
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_formFieldContext.FormFieldContext.Provider, {
     value: {
-      fieldId: formFieldId,
+      fieldId: formFieldId || fieldId || fieldsetPathId,
       separator: separator
     },
     children: finalChildren

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

@@ -1,5 +1,8 @@
 /// <reference types="react" />
 import { SimpleInputProps } from './input.type';
-declare const Input: (props: SimpleInputProps) => JSX.Element;
+declare const Input: {
+    (props: SimpleInputProps): JSX.Element;
+    displayName: string;
+};
 export default Input;
 //# sourceMappingURL=simple-input.d.ts.map

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,UAAW,gBAAgB,gBA+FrC,CAAC;AAEF,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;;CA+FrC,CAAC;AAGF,eAAe,KAAK,CAAC"}

package/cjs/input/simple-input.js

@@ -96,4 +96,5 @@ var Input = function Input(props) {
     }), addEnd]
   }));
 };
+Input.displayName = 'SimpleInput';
 var _default = exports.default = Input;

package/cjs/spin/spin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spin.d.ts","sourceRoot":"","sources":["spin.tsx"],"names":[],"mappings":";AACA,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAIrD,QAAA,MAAM,IAAI,WAAW,SAAS,uBAuH7B,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"spin.d.ts","sourceRoot":"","sources":["spin.tsx"],"names":[],"mappings":";AACA,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAIrD,QAAA,MAAM,IAAI,WAAW,SAAS,uBAiI7B,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/cjs/spin/spin.js

@@ -70,15 +70,14 @@ var Spin = function Spin() {
   var color = colorProps !== null && colorProps !== void 0 ? colorProps : getSpinColor();
   var mode = (_ref2 = modeProps !== null && modeProps !== void 0 ? modeProps : getSpinMode()) !== null && _ref2 !== void 0 ? _ref2 : 'vertical';
   var spinStyle = (jssStyle === null || jssStyle === void 0 || (_jssStyle$spin = jssStyle.spin) === null || _jssStyle$spin === void 0 ? void 0 : _jssStyle$spin.call(jssStyle)) || {};
-  var contentClass = (0, _classnames.default)(className, spinStyle.rootClass, spinStyle.content, _defineProperty(_defineProperty({}, spinStyle.vertical, mode === 'vertical'), spinStyle.horizontal, mode === 'horizontal'));
-  var renderSpin = function renderSpin() {
+  var renderSpin = function renderSpin(isRoot) {
     var n = name;
     if (_spins.default[n]) {
       var Comp = _spins.default[n];
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, _objectSpread(_objectSpread({}, props), {}, {
         color: color,
         style: style,
-        className: !tip ? className : undefined
+        className: isRoot ? className : undefined
       }));
     }
     return null;
@@ -94,27 +93,28 @@ var Spin = function Spin() {
       }) : tip
     });
   };
-  var renderContent = function renderContent() {
+  var renderContent = function renderContent(isRoot) {
+    var contentClass = (0, _classnames.default)(isRoot && className, _defineProperty(_defineProperty(_defineProperty({}, spinStyle.rootClass, isRoot), spinStyle.vertical, mode === 'vertical'), spinStyle.horizontal, mode === 'horizontal'), spinStyle.content);
     if (tip) {
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: contentClass,
-        children: [renderSpin(), tip && renderTip()]
+        children: [renderSpin(false), tip && renderTip()]
       });
     }
-    return renderSpin();
+    return renderSpin(isRoot);
   };
   var renderContainer = function renderContainer() {
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: (0, _classnames.default)(className, spinStyle.container),
+      className: (0, _classnames.default)(className, spinStyle.rootClass, spinStyle.container),
       children: [children, loading && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: spinStyle.loading,
-        children: renderContent()
+        children: renderContent(false)
       })]
     });
   };
   if (children) {
     return renderContainer();
   }
-  return renderContent();
+  return renderContent(true);
 };
 var _default = exports.default = Spin;

package/cjs/transfer/transfer-list.js

@@ -79,7 +79,7 @@ var TransferList = function TransferList(props) {
     var containerBottom = listContainerRef.current.getBoundingClientRect().bottom;
     var listBottom = ($list === null || $list === void 0 ? void 0 : $list.getBoundingClientRect().bottom) || containerBottom;
     if (containerBottom - listBottom > 1) {
-      setAddonHeight(containerBottom - listBottom);
+      setAddonHeight(containerBottom - listBottom - 1);
     }
   }, []);
   var listHeight = listHeightProp + addonHeight;

package/esm/form/form-field-context.js

@@ -2,4 +2,5 @@ import React from 'react';
 export var FormFieldContext = /*#__PURE__*/React.createContext({
   fieldId: undefined,
   separator: '__separator__'
-});
+});
+FormFieldContext.displayName = 'FormFieldContext';

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

@@ -1 +1 @@
-{"version":3,"file":"form-field.d.ts","sourceRoot":"","sources":["form-field.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAqB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGtE,QAAA,MAAM,SAAS,oEA6Ed,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"form-field.d.ts","sourceRoot":"","sources":["form-field.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAqB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGtE,QAAA,MAAM,SAAS,oEAoFd,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/esm/form/form-field.js

@@ -1,5 +1,5 @@
 import React, { useContext, useMemo } from 'react';
-import { useFormConfig, useFormControl, usePersistFn, util } from '@sheinx/hooks';
+import { useFormConfig, useFormControl, usePersistFn, util, FieldsetContext } from '@sheinx/hooks';
 import { FormFieldContext } from "./form-field-context";
 import { jsx as _jsx } from "react/jsx-runtime";
 var FormField = function FormField(props) {
@@ -36,6 +36,7 @@ var FormField = function FormField(props) {
   var error = (_childrenProps$error = childrenProps.error) !== null && _childrenProps$error !== void 0 ? _childrenProps$error : formControl.error;
   var status = (_childrenProps$status = childrenProps.status) !== null && _childrenProps$status !== void 0 ? _childrenProps$status : formControl.error ? 'error' : undefined;
   var _useContext = useContext(FormFieldContext),
+    fieldId = _useContext.fieldId,
     separator = _useContext.separator;
   var formFieldId = useMemo(function () {
     if (!formConfig.formName) return;
@@ -47,6 +48,12 @@ var FormField = function FormField(props) {
     }
     return util.getFieldId(formControl.name, formConfig.formName);
   }, [formControl.name, formConfig.formName, childrenProps.id]);
+  var _useContext2 = useContext(FieldsetContext),
+    fieldsetPath = _useContext2.path;
+  var fieldsetPathId = useMemo(function () {
+    if (!formConfig.formName) return;
+    return util.getFieldId(fieldsetPath, formConfig.formName);
+  }, [fieldsetPath, formConfig.formName]);
   var cloneProps = {
     onChange: handleChange,
     status: status,
@@ -68,7 +75,7 @@ var FormField = function FormField(props) {
   }
   return /*#__PURE__*/_jsx(FormFieldContext.Provider, {
     value: {
-      fieldId: formFieldId,
+      fieldId: formFieldId || fieldId || fieldsetPathId,
       separator: separator
     },
     children: finalChildren

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

@@ -1,5 +1,8 @@
 /// <reference types="react" />
 import { SimpleInputProps } from './input.type';
-declare const Input: (props: SimpleInputProps) => JSX.Element;
+declare const Input: {
+    (props: SimpleInputProps): JSX.Element;
+    displayName: string;
+};
 export default Input;
 //# sourceMappingURL=simple-input.d.ts.map

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,UAAW,gBAAgB,gBA+FrC,CAAC;AAEF,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;;CA+FrC,CAAC;AAGF,eAAe,KAAK,CAAC"}

package/esm/input/simple-input.js

@@ -88,4 +88,5 @@ var Input = function Input(props) {
     }), addEnd]
   }));
 };
+Input.displayName = 'SimpleInput';
 export default Input;

package/esm/spin/spin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spin.d.ts","sourceRoot":"","sources":["spin.tsx"],"names":[],"mappings":";AACA,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAIrD,QAAA,MAAM,IAAI,WAAW,SAAS,uBAuH7B,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"spin.d.ts","sourceRoot":"","sources":["spin.tsx"],"names":[],"mappings":";AACA,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAIrD,QAAA,MAAM,IAAI,WAAW,SAAS,uBAiI7B,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/esm/spin/spin.js

@@ -64,15 +64,14 @@ var Spin = function Spin() {
   var color = colorProps !== null && colorProps !== void 0 ? colorProps : getSpinColor();
   var mode = (_ref2 = modeProps !== null && modeProps !== void 0 ? modeProps : getSpinMode()) !== null && _ref2 !== void 0 ? _ref2 : 'vertical';
   var spinStyle = (jssStyle === null || jssStyle === void 0 || (_jssStyle$spin = jssStyle.spin) === null || _jssStyle$spin === void 0 ? void 0 : _jssStyle$spin.call(jssStyle)) || {};
-  var contentClass = classNames(className, spinStyle.rootClass, spinStyle.content, _defineProperty(_defineProperty({}, spinStyle.vertical, mode === 'vertical'), spinStyle.horizontal, mode === 'horizontal'));
-  var renderSpin = function renderSpin() {
+  var renderSpin = function renderSpin(isRoot) {
     var n = name;
     if (Spins[n]) {
       var Comp = Spins[n];
       return /*#__PURE__*/_jsx(Comp, _objectSpread(_objectSpread({}, props), {}, {
         color: color,
         style: style,
-        className: !tip ? className : undefined
+        className: isRoot ? className : undefined
       }));
     }
     return null;
@@ -88,27 +87,28 @@ var Spin = function Spin() {
       }) : tip
     });
   };
-  var renderContent = function renderContent() {
+  var renderContent = function renderContent(isRoot) {
+    var contentClass = classNames(isRoot && className, _defineProperty(_defineProperty(_defineProperty({}, spinStyle.rootClass, isRoot), spinStyle.vertical, mode === 'vertical'), spinStyle.horizontal, mode === 'horizontal'), spinStyle.content);
     if (tip) {
       return /*#__PURE__*/_jsxs("div", {
         className: contentClass,
-        children: [renderSpin(), tip && renderTip()]
+        children: [renderSpin(false), tip && renderTip()]
       });
     }
-    return renderSpin();
+    return renderSpin(isRoot);
   };
   var renderContainer = function renderContainer() {
     return /*#__PURE__*/_jsxs("div", {
-      className: classNames(className, spinStyle.container),
+      className: classNames(className, spinStyle.rootClass, spinStyle.container),
       children: [children, loading && /*#__PURE__*/_jsx("div", {
         className: spinStyle.loading,
-        children: renderContent()
+        children: renderContent(false)
       })]
     });
   };
   if (children) {
     return renderContainer();
   }
-  return renderContent();
+  return renderContent(true);
 };
 export default Spin;

package/esm/transfer/transfer-list.js

@@ -73,7 +73,7 @@ var TransferList = function TransferList(props) {
     var containerBottom = listContainerRef.current.getBoundingClientRect().bottom;
     var listBottom = ($list === null || $list === void 0 ? void 0 : $list.getBoundingClientRect().bottom) || containerBottom;
     if (containerBottom - listBottom > 1) {
-      setAddonHeight(containerBottom - listBottom);
+      setAddonHeight(containerBottom - listBottom - 1);
     }
   }, []);
   var listHeight = listHeightProp + addonHeight;

package/package.json

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