@sheinx/base 3.9.9 → 3.9.10-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjs/config/index.d.ts +20 -0
- package/cjs/config/index.d.ts.map +1 -1
- package/cjs/config/index.js +7 -0
- package/cjs/modal/modal-content.d.ts.map +1 -1
- package/cjs/modal/modal-content.js +7 -3
- package/cjs/modal/modal-func.d.ts.map +1 -1
- package/cjs/modal/modal-func.js +8 -4
- package/cjs/modal/modal.type.d.ts +10 -0
- package/cjs/modal/modal.type.d.ts.map +1 -1
- package/esm/config/index.d.ts +20 -0
- package/esm/config/index.d.ts.map +1 -1
- package/esm/config/index.js +7 -0
- package/esm/modal/modal-content.d.ts.map +1 -1
- package/esm/modal/modal-content.js +7 -3
- package/esm/modal/modal-func.d.ts.map +1 -1
- package/esm/modal/modal-func.js +8 -4
- package/esm/modal/modal.type.d.ts +10 -0
- package/esm/modal/modal.type.d.ts.map +1 -1
- package/package.json +2 -2
package/cjs/config/index.d.ts
CHANGED
|
@@ -11,6 +11,20 @@ export type SpinConfig = SpinNameType | {
|
|
|
11
11
|
type TooltipConfig = {
|
|
12
12
|
persistent?: boolean;
|
|
13
13
|
};
|
|
14
|
+
/**
|
|
15
|
+
* @en Global configuration for Modal component
|
|
16
|
+
* @cn Modal组件的全局配置
|
|
17
|
+
* @version 3.9.10
|
|
18
|
+
*/
|
|
19
|
+
export type ModalConfig = {
|
|
20
|
+
/**
|
|
21
|
+
* @en Global default mask setting for Modal component. false to hide mask, { blur: true } to show blurred mask
|
|
22
|
+
* @cn Modal组件的全局默认遮罩设置。false 隐藏遮罩,{ blur: true } 显示模糊遮罩
|
|
23
|
+
*/
|
|
24
|
+
mask?: boolean | {
|
|
25
|
+
blur?: boolean;
|
|
26
|
+
};
|
|
27
|
+
};
|
|
14
28
|
/**
|
|
15
29
|
* @en Global configuration for Popover component
|
|
16
30
|
* @cn Popover组件的全局配置
|
|
@@ -48,6 +62,12 @@ export interface ConfigOption {
|
|
|
48
62
|
spin?: SpinConfig;
|
|
49
63
|
tooltip?: TooltipConfig;
|
|
50
64
|
popover?: PopoverConfig;
|
|
65
|
+
/**
|
|
66
|
+
* @en Global configuration for Modal component
|
|
67
|
+
* @cn Modal组件的全局配置
|
|
68
|
+
* @version 3.9.10
|
|
69
|
+
*/
|
|
70
|
+
modal?: ModalConfig;
|
|
51
71
|
/**
|
|
52
72
|
* @en Global configuration for Empty component
|
|
53
73
|
* @cn Empty组件的全局配置
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,UAAU,GAClB,YAAY,GACZ;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,KAAK,aAAa,GAAG;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAA;AAED;;;;GAIG;AACH,KAAK,WAAW,GAAG;IACjB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAC7B;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC;CACzC,CAAA;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC;CAClE;AAID,eAAO,MAAM,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,UAAU,GAClB,YAAY,GACZ;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,KAAK,aAAa,GAAG;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CACrC,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAA;AAED;;;;GAIG;AACH,KAAK,WAAW,GAAG;IACjB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAC7B;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC;CACzC,CAAA;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC;CAClE;AAID,eAAO,MAAM,aAAa,EAAE,YAY3B,CAAC;AAIF,eAAO,IAAI,MAAM,EAAE,YAAqC,CAAC;AAMzD,wBAAgB,mBAAmB,uBAWlC;AAED,eAAO,MAAM,SAAS,oBAErB,CAAC;AAEF,eAAO,MAAM,SAAS,WAAY,QAAQ,YAAY,CAAC,SAQtD,CAAC;AAEF,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC"}
|
package/cjs/config/index.js
CHANGED
|
@@ -30,6 +30,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
|
30
30
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
31
31
|
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
32
32
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
33
|
+
/**
|
|
34
|
+
* @en Global configuration for Modal component
|
|
35
|
+
* @cn Modal组件的全局配置
|
|
36
|
+
* @version 3.9.10
|
|
37
|
+
*/
|
|
38
|
+
|
|
33
39
|
/**
|
|
34
40
|
* @en Global configuration for Popover component
|
|
35
41
|
* @cn Popover组件的全局配置
|
|
@@ -51,6 +57,7 @@ var defaultConfig = exports.defaultConfig = {
|
|
|
51
57
|
spin: 'ring',
|
|
52
58
|
tooltip: undefined,
|
|
53
59
|
popover: {},
|
|
60
|
+
modal: {},
|
|
54
61
|
empty: {},
|
|
55
62
|
direction: 'ltr',
|
|
56
63
|
popupContainer: null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAmF9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,
|
|
1
|
+
{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAmF9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDA8btC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -83,7 +83,7 @@ if (_hooks.util.isBrowser()) {
|
|
|
83
83
|
document.addEventListener('click', getClickPosition, true);
|
|
84
84
|
}
|
|
85
85
|
var Modal = function Modal(props) {
|
|
86
|
-
var _props$jssStyle, _props$jssStyle$modal;
|
|
86
|
+
var _props$jssStyle, _props$jssStyle$modal, _props$mask, _globalConfig$modal;
|
|
87
87
|
var modalClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$modal = _props$jssStyle.modal) === null || _props$jssStyle$modal === void 0 ? void 0 : _props$jssStyle$modal.call(_props$jssStyle);
|
|
88
88
|
var panelRef = (0, _react.useRef)(null);
|
|
89
89
|
var wrapperRef = (0, _react.useRef)(null);
|
|
@@ -262,8 +262,11 @@ var Modal = function Modal(props) {
|
|
|
262
262
|
doc.style.paddingRight = originDocumentStyle.paddingRight;
|
|
263
263
|
}
|
|
264
264
|
});
|
|
265
|
+
var maskProp = (_props$mask = props.mask) !== null && _props$mask !== void 0 ? _props$mask : (_globalConfig$modal = globalConfig.modal) === null || _globalConfig$modal === void 0 ? void 0 : _globalConfig$modal.mask;
|
|
266
|
+
var hideMask = props.hideMask || maskProp === false;
|
|
267
|
+
var maskBlur = _typeof(maskProp) === 'object' && (maskProp === null || maskProp === void 0 ? void 0 : maskProp.blur);
|
|
265
268
|
(0, _react.useEffect)(function () {
|
|
266
|
-
if (!
|
|
269
|
+
if (!hideMask) {
|
|
267
270
|
if (visible) {
|
|
268
271
|
setDocumentOverflow();
|
|
269
272
|
} else {
|
|
@@ -298,6 +301,7 @@ var Modal = function Modal(props) {
|
|
|
298
301
|
if (props.setInnerClose) {
|
|
299
302
|
props.setInnerClose(function () {
|
|
300
303
|
setVisible(false);
|
|
304
|
+
setAnimation(true);
|
|
301
305
|
});
|
|
302
306
|
}
|
|
303
307
|
}, [props.setInnerClose]);
|
|
@@ -450,7 +454,7 @@ var Modal = function Modal(props) {
|
|
|
450
454
|
onClick: function onClick(e) {
|
|
451
455
|
e.stopPropagation();
|
|
452
456
|
},
|
|
453
|
-
className: (0, _classnames.default)(props.rootClassName, modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.rootClass, modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapper, animation && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperAnimation), visible ? modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperShow : modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperHide, showMask && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperIsMask), props.fullScreen && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperFullScreen), props.moveable && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperMoveable),
|
|
457
|
+
className: (0, _classnames.default)(props.rootClassName, modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.rootClass, modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapper, animation && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperAnimation), visible ? modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperShow : modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperHide, showMask && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperIsMask), props.fullScreen && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperFullScreen), props.moveable && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperMoveable), hideMask && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperHideMask), maskBlur && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperMaskBlur), props.zoom && !props.moveable && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperZoom), (isPositionX || isPositionY) && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperDrawer), props.position === 'left' && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperDrawerLeft), props.position === 'right' && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperDrawerRight), props.position === 'top' && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperDrawerTop), props.position === 'bottom' && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperDrawerBottom)),
|
|
454
458
|
onAnimationEnd: handleAnimationEnd,
|
|
455
459
|
style: {
|
|
456
460
|
background: props.maskBackground,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modal-func.d.ts","sourceRoot":"","sources":["modal-func.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAYtD,eAAO,MAAM,QAAQ,YAIpB,CAAC;AA8CF,KAAK,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;;;;;
|
|
1
|
+
{"version":3,"file":"modal-func.d.ts","sourceRoot":"","sources":["modal-func.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAYtD,eAAO,MAAM,QAAQ,YAIpB,CAAC;AA8CF,KAAK,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;;;;;AA+EhF,wBAGE"}
|
package/cjs/modal/modal-func.js
CHANGED
|
@@ -88,15 +88,19 @@ var method = function method(type, jssStyle) {
|
|
|
88
88
|
return function (options) {
|
|
89
89
|
var id = _hooks.util.getUidStr();
|
|
90
90
|
var innerClose;
|
|
91
|
+
var destroyed = false;
|
|
91
92
|
var root = (0, _useContainer.getRoot)({
|
|
92
93
|
container: options.container
|
|
93
94
|
});
|
|
94
95
|
if (!root) return;
|
|
96
|
+
var doDestroy = function doDestroy() {
|
|
97
|
+
if (destroyed) return;
|
|
98
|
+
destroyed = true;
|
|
99
|
+
destroy(root);
|
|
100
|
+
};
|
|
95
101
|
var destroyModal = function destroyModal() {
|
|
96
102
|
if (innerClose) innerClose();
|
|
97
|
-
setTimeout(
|
|
98
|
-
destroy(root);
|
|
99
|
-
}, 300);
|
|
103
|
+
setTimeout(doDestroy, 300);
|
|
100
104
|
};
|
|
101
105
|
modals.add(root);
|
|
102
106
|
var btnOptions = {
|
|
@@ -123,7 +127,7 @@ var method = function method(type, jssStyle) {
|
|
|
123
127
|
type: type,
|
|
124
128
|
footer: footer,
|
|
125
129
|
shouldDestroy: function shouldDestroy(can) {
|
|
126
|
-
if (can)
|
|
130
|
+
if (can) doDestroy();
|
|
127
131
|
},
|
|
128
132
|
setInnerClose: function setInnerClose(close) {
|
|
129
133
|
innerClose = close;
|
|
@@ -15,6 +15,7 @@ export interface ModalClasses {
|
|
|
15
15
|
wrapperZoom: string;
|
|
16
16
|
wrapperIsMask: string;
|
|
17
17
|
wrapperHideMask: string;
|
|
18
|
+
wrapperMaskBlur: string;
|
|
18
19
|
wrapperDrawer: string;
|
|
19
20
|
wrapperDrawerLeft: string;
|
|
20
21
|
wrapperDrawerRight: string;
|
|
@@ -44,8 +45,17 @@ export interface ModalProps extends Pick<CommonType, 'className' | 'style'> {
|
|
|
44
45
|
* @en Whether to hide mask
|
|
45
46
|
* @cn 是否隐藏遮罩
|
|
46
47
|
* @default false
|
|
48
|
+
* @deprecated 推荐使用 mask={false} 来隐藏遮罩
|
|
47
49
|
*/
|
|
48
50
|
hideMask?: boolean;
|
|
51
|
+
/**
|
|
52
|
+
* @en Control mask display. false to hide mask, { blur: true } to show blurred mask
|
|
53
|
+
* @cn 控制遮罩显示。false 隐藏遮罩,{ blur: true } 显示模糊遮罩
|
|
54
|
+
* @version 3.9.10
|
|
55
|
+
*/
|
|
56
|
+
mask?: boolean | {
|
|
57
|
+
blur?: boolean;
|
|
58
|
+
};
|
|
49
59
|
/**
|
|
50
60
|
* @en Whether to force the mask transparency (in multi-layer Modal, the transparency of other Modal masks except the first layer will be adjusted to 0.01)
|
|
51
61
|
* @cn 是否强制设置遮罩透明度(多层Modal中,除第一层外的其他弹出层遮罩透明度会被调整为0.01)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modal.type.d.ts","sourceRoot":"","sources":["modal.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEtF,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAE5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IAEf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAc,SAAQ,cAAc,EAAE,aAAa,EAAE,SAAS;IAC7E,KAAK,CAAC,EAAE,MAAM,YAAY,CAAC;CAC5B;AAED,MAAM,WAAW,UAAW,SAAQ,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC;IACzE,QAAQ,CAAC,EAAE,aAAa,CAAC;IAEzB;;;;OAIG;IACH,
|
|
1
|
+
{"version":3,"file":"modal.type.d.ts","sourceRoot":"","sources":["modal.type.ts"],"names":[],"mappings":"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"}
|
package/esm/config/index.d.ts
CHANGED
|
@@ -11,6 +11,20 @@ export type SpinConfig = SpinNameType | {
|
|
|
11
11
|
type TooltipConfig = {
|
|
12
12
|
persistent?: boolean;
|
|
13
13
|
};
|
|
14
|
+
/**
|
|
15
|
+
* @en Global configuration for Modal component
|
|
16
|
+
* @cn Modal组件的全局配置
|
|
17
|
+
* @version 3.9.10
|
|
18
|
+
*/
|
|
19
|
+
export type ModalConfig = {
|
|
20
|
+
/**
|
|
21
|
+
* @en Global default mask setting for Modal component. false to hide mask, { blur: true } to show blurred mask
|
|
22
|
+
* @cn Modal组件的全局默认遮罩设置。false 隐藏遮罩,{ blur: true } 显示模糊遮罩
|
|
23
|
+
*/
|
|
24
|
+
mask?: boolean | {
|
|
25
|
+
blur?: boolean;
|
|
26
|
+
};
|
|
27
|
+
};
|
|
14
28
|
/**
|
|
15
29
|
* @en Global configuration for Popover component
|
|
16
30
|
* @cn Popover组件的全局配置
|
|
@@ -48,6 +62,12 @@ export interface ConfigOption {
|
|
|
48
62
|
spin?: SpinConfig;
|
|
49
63
|
tooltip?: TooltipConfig;
|
|
50
64
|
popover?: PopoverConfig;
|
|
65
|
+
/**
|
|
66
|
+
* @en Global configuration for Modal component
|
|
67
|
+
* @cn Modal组件的全局配置
|
|
68
|
+
* @version 3.9.10
|
|
69
|
+
*/
|
|
70
|
+
modal?: ModalConfig;
|
|
51
71
|
/**
|
|
52
72
|
* @en Global configuration for Empty component
|
|
53
73
|
* @cn Empty组件的全局配置
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,UAAU,GAClB,YAAY,GACZ;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,KAAK,aAAa,GAAG;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAA;AAED;;;;GAIG;AACH,KAAK,WAAW,GAAG;IACjB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAC7B;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC;CACzC,CAAA;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC;CAClE;AAID,eAAO,MAAM,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,UAAU,GAClB,YAAY,GACZ;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,KAAK,aAAa,GAAG;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CACrC,CAAA;AAED;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAA;AAED;;;;GAIG;AACH,KAAK,WAAW,GAAG;IACjB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAC7B;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC;CACzC,CAAA;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC;CAClE;AAID,eAAO,MAAM,aAAa,EAAE,YAY3B,CAAC;AAIF,eAAO,IAAI,MAAM,EAAE,YAAqC,CAAC;AAMzD,wBAAgB,mBAAmB,uBAWlC;AAED,eAAO,MAAM,SAAS,oBAErB,CAAC;AAEF,eAAO,MAAM,SAAS,WAAY,QAAQ,YAAY,CAAC,SAQtD,CAAC;AAEF,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC"}
|
package/esm/config/index.js
CHANGED
|
@@ -9,6 +9,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
9
9
|
import { util } from '@sheinx/hooks';
|
|
10
10
|
import { create, snapshot } from '@shined/reactive';
|
|
11
11
|
|
|
12
|
+
/**
|
|
13
|
+
* @en Global configuration for Modal component
|
|
14
|
+
* @cn Modal组件的全局配置
|
|
15
|
+
* @version 3.9.10
|
|
16
|
+
*/
|
|
17
|
+
|
|
12
18
|
/**
|
|
13
19
|
* @en Global configuration for Popover component
|
|
14
20
|
* @cn Popover组件的全局配置
|
|
@@ -30,6 +36,7 @@ export var defaultConfig = {
|
|
|
30
36
|
spin: 'ring',
|
|
31
37
|
tooltip: undefined,
|
|
32
38
|
popover: {},
|
|
39
|
+
modal: {},
|
|
33
40
|
empty: {},
|
|
34
41
|
direction: 'ltr',
|
|
35
42
|
popupContainer: null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAmF9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,
|
|
1
|
+
{"version":3,"file":"modal-content.d.ts","sourceRoot":"","sources":["modal-content.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAmF9D,QAAA,MAAM,KAAK,UAAW,iBAAiB,mDA8btC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -78,7 +78,7 @@ if (util.isBrowser()) {
|
|
|
78
78
|
document.addEventListener('click', getClickPosition, true);
|
|
79
79
|
}
|
|
80
80
|
var Modal = function Modal(props) {
|
|
81
|
-
var _props$jssStyle, _props$jssStyle$modal;
|
|
81
|
+
var _props$jssStyle, _props$jssStyle$modal, _props$mask, _globalConfig$modal;
|
|
82
82
|
var modalClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$modal = _props$jssStyle.modal) === null || _props$jssStyle$modal === void 0 ? void 0 : _props$jssStyle$modal.call(_props$jssStyle);
|
|
83
83
|
var panelRef = useRef(null);
|
|
84
84
|
var wrapperRef = useRef(null);
|
|
@@ -257,8 +257,11 @@ var Modal = function Modal(props) {
|
|
|
257
257
|
doc.style.paddingRight = originDocumentStyle.paddingRight;
|
|
258
258
|
}
|
|
259
259
|
});
|
|
260
|
+
var maskProp = (_props$mask = props.mask) !== null && _props$mask !== void 0 ? _props$mask : (_globalConfig$modal = globalConfig.modal) === null || _globalConfig$modal === void 0 ? void 0 : _globalConfig$modal.mask;
|
|
261
|
+
var hideMask = props.hideMask || maskProp === false;
|
|
262
|
+
var maskBlur = _typeof(maskProp) === 'object' && (maskProp === null || maskProp === void 0 ? void 0 : maskProp.blur);
|
|
260
263
|
useEffect(function () {
|
|
261
|
-
if (!
|
|
264
|
+
if (!hideMask) {
|
|
262
265
|
if (visible) {
|
|
263
266
|
setDocumentOverflow();
|
|
264
267
|
} else {
|
|
@@ -293,6 +296,7 @@ var Modal = function Modal(props) {
|
|
|
293
296
|
if (props.setInnerClose) {
|
|
294
297
|
props.setInnerClose(function () {
|
|
295
298
|
setVisible(false);
|
|
299
|
+
setAnimation(true);
|
|
296
300
|
});
|
|
297
301
|
}
|
|
298
302
|
}, [props.setInnerClose]);
|
|
@@ -445,7 +449,7 @@ var Modal = function Modal(props) {
|
|
|
445
449
|
onClick: function onClick(e) {
|
|
446
450
|
e.stopPropagation();
|
|
447
451
|
},
|
|
448
|
-
className: classNames(props.rootClassName, modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.rootClass, modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapper, animation && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperAnimation), visible ? modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperShow : modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperHide, showMask && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperIsMask), props.fullScreen && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperFullScreen), props.moveable && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperMoveable),
|
|
452
|
+
className: classNames(props.rootClassName, modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.rootClass, modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapper, animation && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperAnimation), visible ? modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperShow : modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperHide, showMask && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperIsMask), props.fullScreen && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperFullScreen), props.moveable && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperMoveable), hideMask && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperHideMask), maskBlur && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperMaskBlur), props.zoom && !props.moveable && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperZoom), (isPositionX || isPositionY) && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperDrawer), props.position === 'left' && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperDrawerLeft), props.position === 'right' && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperDrawerRight), props.position === 'top' && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperDrawerTop), props.position === 'bottom' && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.wrapperDrawerBottom)),
|
|
449
453
|
onAnimationEnd: handleAnimationEnd,
|
|
450
454
|
style: {
|
|
451
455
|
background: props.maskBackground,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modal-func.d.ts","sourceRoot":"","sources":["modal-func.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAYtD,eAAO,MAAM,QAAQ,YAIpB,CAAC;AA8CF,KAAK,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;;;;;
|
|
1
|
+
{"version":3,"file":"modal-func.d.ts","sourceRoot":"","sources":["modal-func.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAYtD,eAAO,MAAM,QAAQ,YAIpB,CAAC;AA8CF,KAAK,UAAU,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;;;;;AA+EhF,wBAGE"}
|
package/esm/modal/modal-func.js
CHANGED
|
@@ -82,15 +82,19 @@ var method = function method(type, jssStyle) {
|
|
|
82
82
|
return function (options) {
|
|
83
83
|
var id = util.getUidStr();
|
|
84
84
|
var innerClose;
|
|
85
|
+
var destroyed = false;
|
|
85
86
|
var root = getRoot({
|
|
86
87
|
container: options.container
|
|
87
88
|
});
|
|
88
89
|
if (!root) return;
|
|
90
|
+
var doDestroy = function doDestroy() {
|
|
91
|
+
if (destroyed) return;
|
|
92
|
+
destroyed = true;
|
|
93
|
+
destroy(root);
|
|
94
|
+
};
|
|
89
95
|
var destroyModal = function destroyModal() {
|
|
90
96
|
if (innerClose) innerClose();
|
|
91
|
-
setTimeout(
|
|
92
|
-
destroy(root);
|
|
93
|
-
}, 300);
|
|
97
|
+
setTimeout(doDestroy, 300);
|
|
94
98
|
};
|
|
95
99
|
modals.add(root);
|
|
96
100
|
var btnOptions = {
|
|
@@ -117,7 +121,7 @@ var method = function method(type, jssStyle) {
|
|
|
117
121
|
type: type,
|
|
118
122
|
footer: footer,
|
|
119
123
|
shouldDestroy: function shouldDestroy(can) {
|
|
120
|
-
if (can)
|
|
124
|
+
if (can) doDestroy();
|
|
121
125
|
},
|
|
122
126
|
setInnerClose: function setInnerClose(close) {
|
|
123
127
|
innerClose = close;
|
|
@@ -15,6 +15,7 @@ export interface ModalClasses {
|
|
|
15
15
|
wrapperZoom: string;
|
|
16
16
|
wrapperIsMask: string;
|
|
17
17
|
wrapperHideMask: string;
|
|
18
|
+
wrapperMaskBlur: string;
|
|
18
19
|
wrapperDrawer: string;
|
|
19
20
|
wrapperDrawerLeft: string;
|
|
20
21
|
wrapperDrawerRight: string;
|
|
@@ -44,8 +45,17 @@ export interface ModalProps extends Pick<CommonType, 'className' | 'style'> {
|
|
|
44
45
|
* @en Whether to hide mask
|
|
45
46
|
* @cn 是否隐藏遮罩
|
|
46
47
|
* @default false
|
|
48
|
+
* @deprecated 推荐使用 mask={false} 来隐藏遮罩
|
|
47
49
|
*/
|
|
48
50
|
hideMask?: boolean;
|
|
51
|
+
/**
|
|
52
|
+
* @en Control mask display. false to hide mask, { blur: true } to show blurred mask
|
|
53
|
+
* @cn 控制遮罩显示。false 隐藏遮罩,{ blur: true } 显示模糊遮罩
|
|
54
|
+
* @version 3.9.10
|
|
55
|
+
*/
|
|
56
|
+
mask?: boolean | {
|
|
57
|
+
blur?: boolean;
|
|
58
|
+
};
|
|
49
59
|
/**
|
|
50
60
|
* @en Whether to force the mask transparency (in multi-layer Modal, the transparency of other Modal masks except the first layer will be adjusted to 0.01)
|
|
51
61
|
* @cn 是否强制设置遮罩透明度(多层Modal中,除第一层外的其他弹出层遮罩透明度会被调整为0.01)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modal.type.d.ts","sourceRoot":"","sources":["modal.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,MAAM,MAAM,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEtF,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAE5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IAEf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAc,SAAQ,cAAc,EAAE,aAAa,EAAE,SAAS;IAC7E,KAAK,CAAC,EAAE,MAAM,YAAY,CAAC;CAC5B;AAED,MAAM,WAAW,UAAW,SAAQ,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC;IACzE,QAAQ,CAAC,EAAE,aAAa,CAAC;IAEzB;;;;OAIG;IACH,
|
|
1
|
+
{"version":3,"file":"modal.type.d.ts","sourceRoot":"","sources":["modal.type.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sheinx/base",
|
|
3
|
-
"version": "3.9.
|
|
3
|
+
"version": "3.9.10-beta.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"license": "MIT",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"module": "./esm/index.js",
|
|
11
11
|
"typings": "./cjs/index.d.ts",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@sheinx/hooks": "3.9.
|
|
13
|
+
"@sheinx/hooks": "3.9.10-beta.1",
|
|
14
14
|
"immer": "^10.0.0",
|
|
15
15
|
"classnames": "^2.0.0",
|
|
16
16
|
"@shined/reactive": "^0.3.3"
|