@sheinx/base 3.8.0-beta.41 → 3.8.0-beta.43

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.
Files changed (7) hide show
  1. package/cjs/sticky/sticky.js +1 -1
  2. package/cjs/upload/result.d.ts.map +1 -1
  3. package/cjs/upload/result.js +19 -5
  4. package/esm/sticky/sticky.js +1 -1
  5. package/esm/upload/result.d.ts.map +1 -1
  6. package/esm/upload/result.js +20 -6
  7. package/package.json +2 -2
package/cjs/sticky/sticky.js CHANGED
@@ -259,7 +259,7 @@ var Sticky = function Sticky(props) {
259
259
  if (top !== undefined && Math.ceil(selfRect.top) <= top) {
260
260
  setFixedStyle(true, 'top', selfRect.left);
261
261
  return;
262
- } else if (bottom !== undefined && Math.ceil(selfRect.bottom) + bottom > scrollRect.bottom) {
262
+ } else if (bottom !== undefined && (Math.ceil(selfRect.bottom) + bottom > Math.max(window.innerHeight, scrollRect.bottom) || selfRect.bottom + bottom >= window.innerHeight)) {
263
263
  setFixedStyle(true, 'bottom', selfRect.left);
264
264
  return;
265
265
  } else {
package/cjs/upload/result.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAkB,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAIjE,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAEtC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,4CAoKjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAkB,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAIjE,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAEtC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,4CAkLjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
package/cjs/upload/result.js CHANGED
@@ -49,6 +49,23 @@ var Result = function Result(props) {
49
49
  }),
50
50
  context = _useRef.current;
51
51
  var renderText = function renderText() {
52
+ var $loading;
53
+ if (status === 1) {
54
+ if (props.process !== -1) {
55
+ $loading = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
56
+ className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultProgressText,
57
+ children: [Math.min(99, Math.floor(props.process || 0)), "%"]
58
+ });
59
+ } else {
60
+ $loading = /*#__PURE__*/(0, _jsxRuntime.jsx)(_spin.default, {
61
+ size: 'null',
62
+ jssStyle: props.jssStyle,
63
+ name: 'ring',
64
+ ignoreConfig: true,
65
+ className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.imageResultLoading
66
+ });
67
+ }
68
+ }
52
69
  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
53
70
  children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
54
71
  className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultText,
@@ -60,12 +77,9 @@ var Result = function Result(props) {
60
77
  children: [name, message && /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
61
78
  children: ["(", message, ") "]
62
79
  })]
63
- }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
80
+ }), $loading && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
64
81
  className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultTextFooter,
65
- children: status === 1 && props.process !== -1 && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
66
- className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultProgressText,
67
- children: [Math.min(99, Math.floor(props.process || 0)), "%"]
68
- })
82
+ children: $loading
69
83
  })]
70
84
  }), props.removeAble && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
71
85
  className: (0, _classnames.default)(uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultClose, uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.icon, uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.iconHover, status === 3 && (uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultErrorClose)),
package/esm/sticky/sticky.js CHANGED
@@ -253,7 +253,7 @@ var Sticky = function Sticky(props) {
253
253
  if (top !== undefined && Math.ceil(selfRect.top) <= top) {
254
254
  setFixedStyle(true, 'top', selfRect.left);
255
255
  return;
256
- } else if (bottom !== undefined && Math.ceil(selfRect.bottom) + bottom > scrollRect.bottom) {
256
+ } else if (bottom !== undefined && (Math.ceil(selfRect.bottom) + bottom > Math.max(window.innerHeight, scrollRect.bottom) || selfRect.bottom + bottom >= window.innerHeight)) {
257
257
  setFixedStyle(true, 'bottom', selfRect.left);
258
258
  return;
259
259
  } else {
package/esm/upload/result.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAkB,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAIjE,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAEtC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,4CAoKjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2B,MAAM,OAAO,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAkB,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAIjE,UAAU,WAAW;IACnB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;IAEtC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAAC;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACjC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AACD,QAAA,MAAM,MAAM,UAAW,WAAW,4CAkLjC,CAAC;AAEF,eAAe,MAAM,CAAC"}
package/esm/upload/result.js CHANGED
@@ -17,8 +17,8 @@ import Image from "../image";
17
17
  import { PopoverConfirm } from "../popover";
18
18
  import icons from "../icons";
19
19
  import { useConfig } from "../config";
20
- import { jsx as _jsx } from "react/jsx-runtime";
21
20
  import { jsxs as _jsxs } from "react/jsx-runtime";
21
+ import { jsx as _jsx } from "react/jsx-runtime";
22
22
  import { Fragment as _Fragment } from "react/jsx-runtime";
23
23
  var Result = function Result(props) {
24
24
  var _props$jssStyle, _props$jssStyle$uploa;
@@ -42,6 +42,23 @@ var Result = function Result(props) {
42
42
  }),
43
43
  context = _useRef.current;
44
44
  var renderText = function renderText() {
45
+ var $loading;
46
+ if (status === 1) {
47
+ if (props.process !== -1) {
48
+ $loading = /*#__PURE__*/_jsxs("div", {
49
+ className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultProgressText,
50
+ children: [Math.min(99, Math.floor(props.process || 0)), "%"]
51
+ });
52
+ } else {
53
+ $loading = /*#__PURE__*/_jsx(Spin, {
54
+ size: 'null',
55
+ jssStyle: props.jssStyle,
56
+ name: 'ring',
57
+ ignoreConfig: true,
58
+ className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.imageResultLoading
59
+ });
60
+ }
61
+ }
45
62
  return /*#__PURE__*/_jsxs(_Fragment, {
46
63
  children: [/*#__PURE__*/_jsxs("div", {
47
64
  className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultText,
@@ -53,12 +70,9 @@ var Result = function Result(props) {
53
70
  children: [name, message && /*#__PURE__*/_jsxs("span", {
54
71
  children: ["(", message, ") "]
55
72
  })]
56
- }), /*#__PURE__*/_jsx("div", {
73
+ }), $loading && /*#__PURE__*/_jsx("div", {
57
74
  className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultTextFooter,
58
- children: status === 1 && props.process !== -1 && /*#__PURE__*/_jsxs("div", {
59
- className: uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultProgressText,
60
- children: [Math.min(99, Math.floor(props.process || 0)), "%"]
61
- })
75
+ children: $loading
62
76
  })]
63
77
  }), props.removeAble && /*#__PURE__*/_jsxs("div", {
64
78
  className: classNames(uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultClose, uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.icon, uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.iconHover, status === 3 && (uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.resultErrorClose)),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/base",
3
- "version": "3.8.0-beta.41",
3
+ "version": "3.8.0-beta.43",
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.8.0-beta.41",
13
+ "@sheinx/hooks": "3.8.0-beta.43",
14
14
  "immer": "^10.0.0",
15
15
  "classnames": "^2.0.0",
16
16
  "@shined/reactive": "^0.1.3-alpha.0"