@nutui/nutui-react-taro 2.6.14 → 2.6.15-beta.0

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 (31) hide show
  1. package/dist/esm/Calendar.js +1 -1
  2. package/dist/esm/CalendarItem.js +1 -1
  3. package/dist/esm/InfiniteLoading.js +1 -1
  4. package/dist/esm/Sticky.js +1 -1
  5. package/dist/esm/Uploader/style/style.css +1 -1
  6. package/dist/esm/Uploader.js +1 -1
  7. package/dist/esm/WaterMark.js +1 -1
  8. package/dist/esm/{calendar.taro-Bf5owfGd.js → calendar.taro-BXrHr8bg.js} +1 -1
  9. package/dist/esm/{calendaritem.taro-PLHReAvU.js → calendaritem.taro-CRultyrO.js} +3 -1
  10. package/dist/esm/{infiniteloading.taro-DmDQKk_d.js → infiniteloading.taro-TbcBB0Qr.js} +1 -1
  11. package/dist/esm/nutui-react.es.js +6 -6
  12. package/dist/esm/{sticky.taro-DZzgkigZ.js → sticky.taro-Zbz7wQH8.js} +29 -31
  13. package/dist/esm/{uploader.taro-CiamsRGo.js → uploader.taro-DfO2HWvy.js} +13 -11
  14. package/dist/esm/{watermark.taro-BR12yZQt.js → watermark.taro-CZ6R5FlJ.js} +3 -3
  15. package/dist/locales/base.js +1 -1
  16. package/dist/locales/en-US.js +1 -1
  17. package/dist/locales/id-ID.js +1 -1
  18. package/dist/locales/tr-TR.js +1 -1
  19. package/dist/locales/zh-CN.js +1 -1
  20. package/dist/locales/zh-TW.js +1 -1
  21. package/dist/locales/zh-UG.js +1 -1
  22. package/dist/nutui.react.es.js +50 -44
  23. package/dist/nutui.react.umd.js +50 -44
  24. package/dist/packages/uploader/uploader.scss +3 -1
  25. package/dist/style.css +1 -1
  26. package/dist/types/packages/griditem/types.d.ts +13 -0
  27. package/dist/types/packages/watermark/watermark.d.ts +2 -0
  28. package/dist/types/packages/watermark/watermark.taro.d.ts +10 -0
  29. package/dist/types/utils/get-scroll-parent.d.ts +1 -1
  30. package/dist/types/utils/use-client-rect.d.ts +1 -1
  31. package/package.json +1 -1
@@ -1,4 +1,4 @@
1
- import { C as Calendar } from "./calendar.taro-Bf5owfGd.js";
1
+ import { C as Calendar } from "./calendar.taro-BXrHr8bg.js";
2
2
  export {
3
3
  Calendar as default
4
4
  };
@@ -1,4 +1,4 @@
1
- import { C as CalendarItem } from "./calendaritem.taro-PLHReAvU.js";
1
+ import { C as CalendarItem } from "./calendaritem.taro-CRultyrO.js";
2
2
  export {
3
3
  CalendarItem as default
4
4
  };
@@ -1,4 +1,4 @@
1
- import { I as InfiniteLoading } from "./infiniteloading.taro-DmDQKk_d.js";
1
+ import { I as InfiniteLoading } from "./infiniteloading.taro-TbcBB0Qr.js";
2
2
  export {
3
3
  InfiniteLoading as default
4
4
  };
@@ -1,4 +1,4 @@
1
- import { S as Sticky } from "./sticky.taro-DZzgkigZ.js";
1
+ import { S as Sticky } from "./sticky.taro-Zbz7wQH8.js";
2
2
  export {
3
3
  Sticky as default
4
4
  };
@@ -1 +1 @@
1
- .nut-progress{display:flex;align-items:center;position:relative;width:100%}.nut-progress-outer{flex:auto;border-radius:var(--nutui-progress-border-radius, 12px);height:var(--nutui-progress-height, 10px);background:var(--nutui-progress-background, var(--nutui-gray-3, #f6f6f6))}.nut-progress-outer .nut-progress-active:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border-radius:var(--nutui-progress-border-radius, 12px);animation:progressActive 2s ease-in-out infinite}.nut-progress-inner{height:100%;display:flex;flex-direction:column;justify-content:center;transition:all .4s;border-radius:var(--nutui-progress-border-radius, 12px);background:var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #f53d4d) 0%, var(--nutui-color-primary-stop-2, #fa2c19) 100%))}.nut-progress-text{display:flex;align-items:center;position:absolute;top:var(--nutui-progress-text-position-top, -4px);bottom:var(--nutui-progress-text-position-bottom, -4px);transition:all .4s;transform:translate(-50%)}.nut-progress-text-inner{display:flex;align-items:center;height:100%;width:100%;color:var(--nutui-progress-text-color, var(--nutui-color-primary-text, #ffffff));padding:var(--nutui-progress-text-padding, 0 5px);border-radius:var(--nutui-progress-text-border-radius, 5px);font-size:var(--nutui-progress-text-font-size, 9px);line-height:1;background:var(--nutui-progress-text-background, var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #f53d4d) 0%, var(--nutui-color-primary-stop-2, #fa2c19) 100%)))}@keyframes progressActive{0%{background:#ffffff1a;width:0}20%{background:#ffffff80;width:0}to{background:#fff0;width:100%}}[dir=rtl] .nut-progress-text,.nut-rtl .nut-progress-text{transform:translate(50%)}.nut-uploader{position:relative;display:flex;flex-wrap:wrap}.nut-uploader-slot{position:relative}.nut-uploader-upload{position:relative;display:flex;align-items:center;justify-content:center;background:var(--nutui-uploader-background, var(--nutui-gray-3, #f6f6f6));width:var(--nutui-uploader-image-width, 100px);height:var(--nutui-uploader-image-height, 100px);border:var(--nutui-uploader-image-border, 0px);border-radius:var(--nutui-uploader-image-border-radius, 4px)}.nut-uploader-icon{display:flex;flex-direction:column;justify-content:center;align-items:center;color:var(--nutui-uploader-image-color, var(--nutui-gray-5, #8c8c8c))}.nut-uploader-icon i,.nut-uploader-icon .nut-icon{color:var(--nutui-uploader-image-color, var(--nutui-gray-5, #8c8c8c));margin-bottom:var(--nutui-uploader-image-icon-margin-bottom, 6px)}.nut-uploader-icon-tip{font-size:var(--nutui-uploader-image-icon-tip-font-size, 12px)}.nut-uploader-input{position:absolute!important;top:0;left:0;width:100%!important;height:100%!important;overflow:hidden;cursor:pointer;opacity:0}.nut-uploader-input:disabled{cursor:not-allowed}.nut-uploader-upload-disabled{background:var(--nutui-uploader-background-disabled, var(--nutui-gray-3, #f6f6f6));color:var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #bfbfbf))}.nut-uploader-upload-disabled .nut-uploader-icon i,.nut-uploader-upload-disabled .nut-uploader-icon .nut-icon{color:var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #bfbfbf));margin-bottom:var(--nutui-uploader-image-icon-margin-bottom, 6px)}.nut-uploader-preview{position:relative;margin-right:var(--nutui-uploader-preview-margin-right, 10px);margin-bottom:var(--nutui-uploader-preview-margin-bottom, 10px);border-radius:var(--nutui-uploader-image-border-radius, 4px);box-shadow:0 2px 10px #0000001a}.nut-uploader-preview-progress{position:absolute;left:0;top:0;display:flex;flex-direction:column;align-items:center;justify-content:center;width:100%;height:100%;background:var(--nutui-uploader-preview-progress-background, var(--nutui-black-10, rgba(0, 0, 0, .7)));border-radius:var(--nutui-uploader-image-border-radius, 4px)}.nut-uploader-preview-progress i{margin-bottom:var(--nutui-uploader-image-icon-margin-bottom, 6px)}.nut-uploader-preview-progress-msg{color:var(--nutui-gray-5, #8c8c8c);font-size:12px}.nut-uploader-preview.list{width:100%;margin-right:0;margin-bottom:0;margin-top:10px;box-shadow:0 2px 10px #00000003}.nut-uploader-preview-list{width:100%;height:32px;box-sizing:border-box;display:flex;align-items:center;justify-content:space-between;padding:0 10px;background-color:var(--nutui-gray-2, #f8f8f8)}.nut-uploader-preview-list .nut-uploader-preview-img-file-name{display:flex;align-items:center;-webkit-line-clamp:1;padding:2px;height:24px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.nut-uploader-preview-list .nut-progress{position:absolute;left:0;right:0;bottom:0}.nut-uploader-preview-list .nut-progress .nut-progress-outer{height:2px!important}.nut-uploader-preview .close{position:absolute;right:var(--nutui-uploader-preview-close-right, 0px);top:var(--nutui-uploader-preview-close-top, 0px);transform:translate(50%,-50%);z-index:1}.nut-uploader-preview-img{position:relative;width:var(--nutui-uploader-image-width, 100px);height:var(--nutui-uploader-image-height, 100px);border-radius:var(--nutui-uploader-image-border-radius, 4px);overflow:hidden}.nut-uploader-preview-img i{color:var(--nutui-gray-7, #1a1a1a)}.nut-uploader-preview-img .tips{position:absolute;bottom:0;left:0;font-size:12px;color:#fff;text-align:center;box-sizing:border-box;height:var(--nutui-uploader-preview-tips-height, 24px);line-height:var(--nutui-uploader-preview-tips-height, 24px);border-radius:var(--nutui-uploader-image-border-radius, 4px);border-top-left-radius:0;border-top-right-radius:0;padding:var(--nutui-uploader-preview-tips-padding, 0 5px);background:var(--nutui-uploader-preview-tips-background, var(--nutui-black-7));width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.nut-uploader-preview-img-c{width:100%;height:100%;position:initial;border-radius:var(--nutui-uploader-image-border-radius, 4px)}.nut-uploader-preview-img-file{height:100%;width:100%;display:flex;align-items:center;justify-content:center;transition:all .3s}.nut-uploader-preview-img-file-name{display:flex;width:90%;font-size:12px;color:var(--nutui-gray-6, #595959);display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;word-break:break-all}.nut-uploader-preview-img-file-name.error{color:red!important}.nut-uploader-preview-img-file-name.success{color:#1890ff!important}.nut-uploader-preview-img-file-name .nut-icon-Link{flex-shrink:0}[dir=rtl] .nut-uploader-input,.nut-rtl .nut-uploader-input{left:auto;right:0}[dir=rtl] .nut-uploader-preview,.nut-rtl .nut-uploader-preview{margin-right:0;margin-left:var(--nutui-uploader-preview-margin-right, 10px)}[dir=rtl] .nut-uploader-preview-progress,.nut-rtl .nut-uploader-preview-progress{left:auto;right:0}[dir=rtl] .nut-uploader-preview.list,.nut-rtl .nut-uploader-preview.list{margin-right:0;margin-left:0}[dir=rtl] .nut-uploader-preview .close,.nut-rtl .nut-uploader-preview .close{right:auto;left:var(--nutui-uploader-preview-close-right, 0px);transform:translate(-50%,-50%)}[dir=rtl] .nut-uploader-preview-img .tips,.nut-rtl .nut-uploader-preview-img .tips{left:auto;right:0}
1
+ .nut-progress{display:flex;align-items:center;position:relative;width:100%}.nut-progress-outer{flex:auto;border-radius:var(--nutui-progress-border-radius, 12px);height:var(--nutui-progress-height, 10px);background:var(--nutui-progress-background, var(--nutui-gray-3, #f6f6f6))}.nut-progress-outer .nut-progress-active:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border-radius:var(--nutui-progress-border-radius, 12px);animation:progressActive 2s ease-in-out infinite}.nut-progress-inner{height:100%;display:flex;flex-direction:column;justify-content:center;transition:all .4s;border-radius:var(--nutui-progress-border-radius, 12px);background:var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #f53d4d) 0%, var(--nutui-color-primary-stop-2, #fa2c19) 100%))}.nut-progress-text{display:flex;align-items:center;position:absolute;top:var(--nutui-progress-text-position-top, -4px);bottom:var(--nutui-progress-text-position-bottom, -4px);transition:all .4s;transform:translate(-50%)}.nut-progress-text-inner{display:flex;align-items:center;height:100%;width:100%;color:var(--nutui-progress-text-color, var(--nutui-color-primary-text, #ffffff));padding:var(--nutui-progress-text-padding, 0 5px);border-radius:var(--nutui-progress-text-border-radius, 5px);font-size:var(--nutui-progress-text-font-size, 9px);line-height:1;background:var(--nutui-progress-text-background, var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #f53d4d) 0%, var(--nutui-color-primary-stop-2, #fa2c19) 100%)))}@keyframes progressActive{0%{background:#ffffff1a;width:0}20%{background:#ffffff80;width:0}to{background:#fff0;width:100%}}[dir=rtl] .nut-progress-text,.nut-rtl .nut-progress-text{transform:translate(50%)}.nut-uploader{position:relative;display:flex;flex-wrap:wrap}.nut-uploader-slot{position:relative}.nut-uploader-upload{position:relative;display:flex;align-items:center;justify-content:center;background:var(--nutui-uploader-background, var(--nutui-gray-3, #f6f6f6));width:var(--nutui-uploader-image-width, 100px);height:var(--nutui-uploader-image-height, 100px);border:var(--nutui-uploader-image-border, 0px);border-radius:var(--nutui-uploader-image-border-radius, 4px)}.nut-uploader-icon{display:flex;flex-direction:column;justify-content:center;align-items:center;color:var(--nutui-uploader-image-color, var(--nutui-gray-5, #8c8c8c))}.nut-uploader-icon i,.nut-uploader-icon .nut-icon{color:var(--nutui-uploader-image-color, var(--nutui-gray-5, #8c8c8c));margin-bottom:var(--nutui-uploader-image-icon-margin-bottom, 6px)}.nut-uploader-icon-tip{font-size:var(--nutui-uploader-image-icon-tip-font-size, 12px)}.nut-uploader-input{position:absolute!important;top:0;left:0;width:100%!important;height:100%!important;overflow:hidden;cursor:pointer;opacity:0}.nut-uploader-input:disabled{cursor:not-allowed}.nut-uploader-upload-disabled{background:var(--nutui-uploader-background-disabled, var(--nutui-gray-3, #f6f6f6));color:var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #bfbfbf))}.nut-uploader-upload-disabled .nut-uploader-icon i,.nut-uploader-upload-disabled .nut-uploader-icon .nut-icon{color:var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #bfbfbf));margin-bottom:var(--nutui-uploader-image-icon-margin-bottom, 6px)}.nut-uploader-preview{position:relative;margin-right:var(--nutui-uploader-preview-margin-right, 10px);margin-bottom:var(--nutui-uploader-preview-margin-bottom, 10px);border-radius:var(--nutui-uploader-image-border-radius, 4px);box-shadow:0 2px 10px #0000001a}.nut-uploader-preview-progress{position:absolute;left:0;top:0;display:flex;flex-direction:column;align-items:center;justify-content:center;width:100%;height:100%;background:var(--nutui-uploader-preview-progress-background, var(--nutui-black-10, rgba(0, 0, 0, .7)));border-radius:var(--nutui-uploader-image-border-radius, 4px)}.nut-uploader-preview-progress i{margin-bottom:var(--nutui-uploader-image-icon-margin-bottom, 6px)}.nut-uploader-preview-progress-msg{color:var(--nutui-gray-5, #8c8c8c);font-size:12px}.nut-uploader-preview.list{width:100%;margin-right:0;margin-bottom:0;margin-top:10px;box-shadow:0 2px 10px #00000003}.nut-uploader-preview-list{width:100%;height:32px;box-sizing:border-box;display:flex;align-items:center;justify-content:space-between;padding:0 10px;background-color:var(--nutui-gray-2, #f8f8f8)}.nut-uploader-preview-list .nut-uploader-preview-img-file-name{display:flex;align-items:center;-webkit-line-clamp:1;padding:2px;height:24px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.nut-uploader-preview-list .nut-progress{position:absolute;left:0;right:0;bottom:0}.nut-uploader-preview-list .nut-progress .nut-progress-outer{height:2px!important}.nut-uploader-preview .close{position:absolute;right:var(--nutui-uploader-preview-close-right, 0px);top:var(--nutui-uploader-preview-close-top, 0px);transform:translate(50%,-50%);z-index:1}.nut-uploader-preview-img{position:relative;width:var(--nutui-uploader-image-width, 100px);height:var(--nutui-uploader-image-height, 100px);border-radius:var(--nutui-uploader-image-border-radius, 4px);overflow:hidden}.nut-uploader-preview-img i{color:var(--nutui-gray-7, #1a1a1a)}.nut-uploader-preview-img .tips{position:absolute;bottom:0;left:0;font-size:12px;color:#fff;text-align:center;box-sizing:border-box;height:var(--nutui-uploader-preview-tips-height, 24px);line-height:var(--nutui-uploader-preview-tips-height, 24px);border-radius:var(--nutui-uploader-image-border-radius, 4px);border-top-left-radius:0;border-top-right-radius:0;padding:var(--nutui-uploader-preview-tips-padding, 0 5px);background:var(--nutui-uploader-preview-tips-background, var(--nutui-black-7));width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.nut-uploader-preview-img-c{display:flex;justify-content:center;align-items:center;height:100%;position:initial;border-radius:var(--nutui-uploader-image-border-radius, 4px)}.nut-uploader-preview-img-file{height:100%;width:100%;display:flex;align-items:center;justify-content:center;transition:all .3s}.nut-uploader-preview-img-file-name{display:flex;width:90%;font-size:12px;color:var(--nutui-gray-6, #595959);display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden;word-break:break-all}.nut-uploader-preview-img-file-name.error{color:red!important}.nut-uploader-preview-img-file-name.success{color:#1890ff!important}.nut-uploader-preview-img-file-name .nut-icon-Link{flex-shrink:0}[dir=rtl] .nut-uploader-input,.nut-rtl .nut-uploader-input{left:auto;right:0}[dir=rtl] .nut-uploader-preview,.nut-rtl .nut-uploader-preview{margin-right:0;margin-left:var(--nutui-uploader-preview-margin-right, 10px)}[dir=rtl] .nut-uploader-preview-progress,.nut-rtl .nut-uploader-preview-progress{left:auto;right:0}[dir=rtl] .nut-uploader-preview.list,.nut-rtl .nut-uploader-preview.list{margin-right:0;margin-left:0}[dir=rtl] .nut-uploader-preview .close,.nut-rtl .nut-uploader-preview .close{right:auto;left:var(--nutui-uploader-preview-close-right, 0px);transform:translate(-50%,-50%)}[dir=rtl] .nut-uploader-preview-img .tips,.nut-rtl .nut-uploader-preview-img .tips{left:auto;right:0}
@@ -1,4 +1,4 @@
1
- import { U as Uploader } from "./uploader.taro-CiamsRGo.js";
1
+ import { U as Uploader } from "./uploader.taro-DfO2HWvy.js";
2
2
  export {
3
3
  Uploader as default
4
4
  };
@@ -1,4 +1,4 @@
1
- import { W as WaterMark } from "./watermark.taro-BR12yZQt.js";
1
+ import { W as WaterMark } from "./watermark.taro-CZ6R5FlJ.js";
2
2
  export {
3
3
  WaterMark as default
4
4
  };
@@ -1,6 +1,6 @@
1
1
  import React__default, { useRef } from "react";
2
2
  import { P as Popup } from "./popup.taro-CR3JyuJV.js";
3
- import { C as CalendarItem } from "./calendaritem.taro-PLHReAvU.js";
3
+ import { C as CalendarItem } from "./calendaritem.taro-CRultyrO.js";
4
4
  import { U as Utils } from "./date-CYwRNlGq.js";
5
5
  import { u as useConfig } from "./configprovider.taro-DA4GDDFu.js";
6
6
  import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
@@ -313,8 +313,10 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
313
313
  };
314
314
  useEffect(() => {
315
315
  setCurrentDate(resetDefaultValue() || []);
316
- popup && resetRender();
317
316
  }, [defaultValue]);
317
+ useEffect(() => {
318
+ popup && resetRender();
319
+ }, [currentDate]);
318
320
  const scrollToDate = (date) => {
319
321
  if (Utils.compareDate(date, propStartDate)) {
320
322
  date = propStartDate;
@@ -99,7 +99,7 @@ const InfiniteLoading = (props) => {
99
99
  });
100
100
  return React__default.createElement(
101
101
  ScrollView,
102
- Object.assign({ className: classes, scrollY: true, id: "scroller", type: "list", style: { height: "100%" }, onScroll: scrollAction, onScrollToLower: lower, onTouchStart: touchStart, onTouchMove: touchMove, onTouchEnd: touchEnd }, rest),
102
+ Object.assign({}, rest, { className: classes, scrollY: true, id: "scroller", type: "list", style: { height: "100%" }, onScroll: scrollAction, onScrollToLower: lower, onTouchStart: touchStart, onTouchMove: touchMove, onTouchEnd: touchEnd }),
103
103
  React__default.createElement(
104
104
  "div",
105
105
  { className: "nut-infinite-top", ref: refreshTop, style: getStyle() },
@@ -11,7 +11,7 @@ import { G as G2 } from "./griditem.taro-CcWyYchl.js";
11
11
  import { L } from "./layout.taro-C-aUcOOE.js";
12
12
  import { R } from "./row.taro-ItEq1Bi5.js";
13
13
  import { S } from "./space.taro-B1KsEPZL.js";
14
- import { S as S2 } from "./sticky.taro-DZzgkigZ.js";
14
+ import { S as S2 } from "./sticky.taro-Zbz7wQH8.js";
15
15
  import { S as S3 } from "./safearea.taro-BJpvFsMf.js";
16
16
  import { B as B2 } from "./backtop.taro-jWlJ1ZWG.js";
17
17
  import { E } from "./elevator.taro-Bsc8PcT0.js";
@@ -25,8 +25,8 @@ import { T as T2 } from "./tabbaritem.taro-BZNabTBp.js";
25
25
  import { T as T3 } from "./tabpane.taro-BAe86j3t.js";
26
26
  import { T as T4 } from "./tabs.taro-B2D3AtVV.js";
27
27
  import { A } from "./address.taro-BYzOGUEN.js";
28
- import { C as C5 } from "./calendar.taro-Bf5owfGd.js";
29
- import { C as C6 } from "./calendaritem.taro-PLHReAvU.js";
28
+ import { C as C5 } from "./calendar.taro-BXrHr8bg.js";
29
+ import { C as C6 } from "./calendaritem.taro-CRultyrO.js";
30
30
  import { C as C7 } from "./calendarcard.taro-CbvCWF1k.js";
31
31
  import { C as C8 } from "./cascader.taro-jxe42b68.js";
32
32
  import { C as C9, a as a2 } from "./checkbox.taro-Dc054oRo.js";
@@ -47,13 +47,13 @@ import { S as S8 } from "./shortpassword.taro-DpdtRsQ-.js";
47
47
  import { S as S9 } from "./signature.taro-zgwaJkIE.js";
48
48
  import { S as S10 } from "./switch.taro-CdBmDo18.js";
49
49
  import { T as T5 } from "./textarea.taro-DuceTjAx.js";
50
- import { U } from "./uploader.taro-CiamsRGo.js";
50
+ import { U } from "./uploader.taro-DfO2HWvy.js";
51
51
  import { A as A2 } from "./actionsheet.taro-CJjNsNrH.js";
52
52
  import { B as B3 } from "./badge.taro-BGaxpEYi.js";
53
53
  import { B as B4 } from "./dialog.taro-BW9D2Gsr.js";
54
54
  import { D as D3 } from "./drag.taro-B_TO4Nnu.js";
55
55
  import { E as E2 } from "./empty.taro-CnwDznke.js";
56
- import { I as I4 } from "./infiniteloading.taro-DmDQKk_d.js";
56
+ import { I as I4 } from "./infiniteloading.taro-TbcBB0Qr.js";
57
57
  import { L as L2 } from "./loading.taro-n_qoNgCW.js";
58
58
  import { N as N3 } from "./noticebar.taro-CGUTg60Q.js";
59
59
  import { N as N4 } from "./notify.taro-jP7y9zMU.js";
@@ -92,7 +92,7 @@ import { C as C14 } from "./card.taro-DxcIi5qH.js";
92
92
  import { T as T10 } from "./timedetail.taro-ya5JNy2L.js";
93
93
  import { T as T11 } from "./timeselect.taro-DncKbp3l.js";
94
94
  import { T as T12 } from "./trendarrow.taro-DKx5cGIh.js";
95
- import { W } from "./watermark.taro-BR12yZQt.js";
95
+ import { W } from "./watermark.taro-CZ6R5FlJ.js";
96
96
  import { A as A7 } from "./avatarcropper.taro-CAVcFvKC.js";
97
97
  export {
98
98
  A2 as ActionSheet,
@@ -41,22 +41,21 @@ const Sticky = (props) => {
41
41
  onChange && onChange(fixed);
42
42
  });
43
43
  const rootStyle = useMemo(() => {
44
+ var _a2, _b;
44
45
  if (!fixed) {
45
46
  return {
46
47
  height: "",
47
48
  width: ""
48
49
  };
49
50
  }
50
- const style2 = {};
51
- if (rootRect.height) {
52
- style2.height = rootRect.height;
53
- }
54
- if (rootRect.width) {
55
- style2.width = rootRect.width;
56
- }
51
+ const style2 = {
52
+ height: (_a2 = rootRect.height) !== null && _a2 !== void 0 ? _a2 : "",
53
+ width: (_b = rootRect.width) !== null && _b !== void 0 ? _b : ""
54
+ };
57
55
  return style2;
58
56
  }, [fixed, rootRect.height, rootRect.width]);
59
57
  const stickyStyle = useMemo(() => {
58
+ var _a2, _b;
60
59
  if (!fixed) {
61
60
  return {
62
61
  height: "",
@@ -64,38 +63,37 @@ const Sticky = (props) => {
64
63
  [position]: ""
65
64
  };
66
65
  }
67
- const style2 = {};
68
- if (rootRect.height)
69
- style2.height = rootRect.height;
70
- if (rootRect.width)
71
- style2.width = rootRect.width;
72
- style2.transform = `translate3d(0, ${transform}px, 0)`;
73
- style2[position] = threshold;
74
- style2.zIndex = zIndex;
66
+ const style2 = {
67
+ height: (_a2 = rootRect.height) !== null && _a2 !== void 0 ? _a2 : "",
68
+ width: (_b = rootRect.width) !== null && _b !== void 0 ? _b : "",
69
+ transform: `translate3d(0, ${transform}px, 0)`,
70
+ [position]: threshold,
71
+ zIndex
72
+ };
75
73
  return style2;
76
74
  }, [fixed, rootRect.height, rootRect.width, transform, position]);
77
75
  const handleScroll = (scrollTop) => __awaiter(void 0, void 0, void 0, function* () {
78
76
  const curRootRect = yield getRectByTaro(rootRef.current);
79
77
  const stickyRect = yield getRectByTaro(stickyRef.current);
80
- if (curRootRect && stickyRect) {
81
- setRootRect(curRootRect);
82
- if (position === "top") {
83
- if (container) {
84
- const containerRect = yield getRectByTaro(container.current);
85
- const difference = containerRect.bottom - threshold - curRootRect.height;
86
- const curTransform = difference < 0 ? difference : 0;
87
- setTransform(curTransform);
88
- const curFixed = threshold > curRootRect.top && containerRect.bottom > 0;
89
- setFixed(curFixed);
90
- } else {
91
- setFixed(threshold > curRootRect.top);
92
- }
78
+ if (!curRootRect || !stickyRect) {
79
+ console.warn("getRectByTaro获取失败", { stickyRect, curRootRect });
80
+ return;
81
+ }
82
+ setRootRect(curRootRect);
83
+ if (position === "top") {
84
+ if (container) {
85
+ const containerRect = yield getRectByTaro(container.current);
86
+ const difference = containerRect.bottom - threshold - curRootRect.height;
87
+ const curTransform = difference < 0 ? difference : 0;
88
+ setTransform(curTransform);
89
+ const curFixed = threshold > curRootRect.top && containerRect.bottom > 0;
90
+ setFixed(curFixed);
93
91
  } else {
94
- const windowHeight = getSystemInfoSync().windowHeight;
95
- setFixed(windowHeight - threshold < curRootRect.bottom);
92
+ setFixed(threshold > curRootRect.top);
96
93
  }
97
94
  } else {
98
- console.warn("getRectByTaro获取失败", { stickyRect, curRootRect });
95
+ const windowHeight = getSystemInfoSync().windowHeight;
96
+ setFixed(windowHeight - threshold < curRootRect.bottom);
99
97
  }
100
98
  });
101
99
  const getElement = useCallback(() => {
@@ -1,5 +1,5 @@
1
1
  import { _ as __rest } from "./tslib.es6-iWu3F_1J.js";
2
- import React__default, { useState, useImperativeHandle } from "react";
2
+ import React__default, { useState, useImperativeHandle, useRef, useEffect } from "react";
3
3
  import classNames from "classnames";
4
4
  import Taro, { uploadFile, getEnv, chooseMedia, chooseImage } from "@tarojs/taro";
5
5
  import { Failure, Link, Del, Loading, Photograph } from "@nutui/icons-react-taro";
@@ -225,6 +225,10 @@ const InternalUploader = (props, ref) => {
225
225
  clearUploadQueue();
226
226
  }
227
227
  }));
228
+ const fileListRef = useRef([]);
229
+ useEffect(() => {
230
+ fileListRef.current = fileList;
231
+ }, [fileList]);
228
232
  const clearUploadQueue = (index = -1) => {
229
233
  if (index > -1) {
230
234
  uploadQueue.splice(index, 1);
@@ -300,28 +304,28 @@ const InternalUploader = (props, ref) => {
300
304
  uploadOption.beforeXhrUpload = beforeXhrUpload;
301
305
  uploadOption.onStart = (option) => {
302
306
  clearUploadQueue(index);
303
- setFileList(fileList.map((item) => {
307
+ setFileList(fileListRef.current.map((item) => {
304
308
  if (item.uid === fileItem.uid) {
305
309
  item.status = "ready";
306
310
  item.message = locale.uploader.readyUpload;
307
311
  }
308
312
  return item;
309
313
  }));
310
- onStart && onStart(option);
314
+ onStart === null || onStart === void 0 ? void 0 : onStart(option);
311
315
  };
312
316
  uploadOption.onProgress = (e, option) => {
313
- setFileList(fileList.map((item) => {
317
+ setFileList(fileListRef.current.map((item) => {
314
318
  if (item.uid === fileItem.uid) {
315
319
  item.status = UPLOADING;
316
320
  item.message = locale.uploader.uploading;
317
321
  item.percentage = e.progress;
318
- onProgress && onProgress({ e, option, percentage: item.percentage });
322
+ onProgress === null || onProgress === void 0 ? void 0 : onProgress({ e, option, percentage: item.percentage });
319
323
  }
320
324
  return item;
321
325
  }));
322
326
  };
323
327
  uploadOption.onSuccess = (responseText, option) => {
324
- const list = fileList.map((item) => {
328
+ const list = fileListRef.current.map((item) => {
325
329
  if (item.uid === fileItem.uid) {
326
330
  item.status = SUCCESS;
327
331
  item.message = locale.uploader.success;
@@ -337,7 +341,7 @@ const InternalUploader = (props, ref) => {
337
341
  });
338
342
  };
339
343
  uploadOption.onFailure = (responseText, option) => {
340
- const list = fileList.map((item) => {
344
+ const list = fileListRef.current.map((item) => {
341
345
  if (item.uid === fileItem.uid) {
342
346
  item.status = ERROR;
343
347
  item.message = locale.uploader.error;
@@ -397,8 +401,8 @@ const InternalUploader = (props, ref) => {
397
401
  if (preview) {
398
402
  fileItem.url = fileType === "video" ? file.thumbTempFilePath : filepath;
399
403
  }
400
- setFileList([...fileList, fileItem]);
401
404
  executeUpload(fileItem, index);
405
+ setFileList([...fileList, fileItem]);
402
406
  });
403
407
  };
404
408
  const filterFiles = (files) => {
@@ -412,9 +416,7 @@ const InternalUploader = (props, ref) => {
412
416
  }
413
417
  return true;
414
418
  });
415
- if (oversizes.length) {
416
- onOversize && onOversize(files);
417
- }
419
+ oversizes.length && (onOversize === null || onOversize === void 0 ? void 0 : onOversize(files));
418
420
  const currentFileLength = filterFile.length + fileList.length;
419
421
  if (currentFileLength > maximum) {
420
422
  filterFile.splice(filterFile.length - (currentFileLength - maximum));
@@ -3,10 +3,10 @@ import { getSystemInfo, createOffscreenCanvas } from "@tarojs/taro";
3
3
  import classNames from "classnames";
4
4
  import { u as useConfig } from "./configprovider.taro-DA4GDDFu.js";
5
5
  import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
6
- const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { content: "", fullPage: true, zIndex: 2e3, gapX: 24, gapY: 48, width: 120, height: 64, image: "", imageWidth: 120, imageHeight: 64, rotate: -22, color: "rgba(0,0,0,.15)", fontStyle: "normal", fontWeight: "normal", fontSize: 14 });
6
+ const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { content: "", fullPage: true, zIndex: 2e3, gapX: 24, gapY: 48, width: 120, height: 64, startX: 0, startY: 0, image: "", imageWidth: 120, imageHeight: 64, rotate: -22, color: "rgba(0,0,0,.15)", fontStyle: "normal", fontWeight: "normal", fontSize: 14 });
7
7
  const WaterMark = (props) => {
8
8
  const { locale } = useConfig();
9
- const { content, fullPage, zIndex, className, gapX, gapY, width, height, image, imageWidth, imageHeight, rotate, color, fontStyle, fontFamily, fontWeight, fontSize, style } = Object.assign(Object.assign({}, defaultProps), props);
9
+ const { content, fullPage, zIndex, className, gapX, gapY, startX, startY, width, height, image, imageWidth, imageHeight, rotate, color, fontStyle, fontFamily, fontWeight, fontSize, style } = Object.assign(Object.assign({}, defaultProps), props);
10
10
  const [base64Url, setBase64Url] = useState("");
11
11
  const classPrefix = "nut-watermark";
12
12
  const classes = classNames(classPrefix, {
@@ -65,7 +65,7 @@ const WaterMark = (props) => {
65
65
  const markSize = Number(fontSize) * ratio;
66
66
  ctx.font = `${fontStyle} normal ${fontWeight} ${markSize}px/${markHeight}px ${fontFamily}`;
67
67
  ctx.fillStyle = color;
68
- ctx.fillText(content, 0, 0);
68
+ ctx.fillText(content, startX, startY);
69
69
  ctx.restore();
70
70
  setBase64Url(canvas.toDataURL());
71
71
  }
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui-react-taro v2.6.14 Fri Jul 19 2024 16:24:05 GMT+0800 (China Standard Time)
2
+ * @nutui/nutui-react-taro v2.6.14 Wed Jul 24 2024 13:30:25 GMT+0800 (China Standard Time)
3
3
  * (c) 2023 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui-react-taro v2.6.14 Fri Jul 19 2024 16:24:05 GMT+0800 (China Standard Time)
2
+ * @nutui/nutui-react-taro v2.6.14 Wed Jul 24 2024 13:30:25 GMT+0800 (China Standard Time)
3
3
  * (c) 2023 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui-react-taro v2.6.14 Fri Jul 19 2024 16:24:05 GMT+0800 (China Standard Time)
2
+ * @nutui/nutui-react-taro v2.6.14 Wed Jul 24 2024 13:30:25 GMT+0800 (China Standard Time)
3
3
  * (c) 2023 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui-react-taro v2.6.14 Fri Jul 19 2024 16:24:05 GMT+0800 (China Standard Time)
2
+ * @nutui/nutui-react-taro v2.6.14 Wed Jul 24 2024 13:30:25 GMT+0800 (China Standard Time)
3
3
  * (c) 2023 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui-react-taro v2.6.14 Fri Jul 19 2024 16:24:05 GMT+0800 (China Standard Time)
2
+ * @nutui/nutui-react-taro v2.6.14 Wed Jul 24 2024 13:30:25 GMT+0800 (China Standard Time)
3
3
  * (c) 2023 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui-react-taro v2.6.14 Fri Jul 19 2024 16:24:05 GMT+0800 (China Standard Time)
2
+ * @nutui/nutui-react-taro v2.6.14 Wed Jul 24 2024 13:30:25 GMT+0800 (China Standard Time)
3
3
  * (c) 2023 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui-react-taro v2.6.14 Fri Jul 19 2024 16:24:05 GMT+0800 (China Standard Time)
2
+ * @nutui/nutui-react-taro v2.6.14 Wed Jul 24 2024 13:30:25 GMT+0800 (China Standard Time)
3
3
  * (c) 2023 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * @nutui/nutui-react-taro v2.6.14 Fri Jul 19 2024 16:23:26 GMT+0800 (China Standard Time)
2
+ * @nutui/nutui-react-taro v2.6.14 Wed Jul 24 2024 13:29:51 GMT+0800 (China Standard Time)
3
3
  * (c) 2023 @jdf2e.
4
4
  * Released under the MIT License.
5
5
  */
@@ -3961,13 +3961,10 @@ const Sticky = (props) => {
3961
3961
  width: ""
3962
3962
  };
3963
3963
  }
3964
- const style2 = {};
3965
- if (rootRect.height) {
3966
- style2.height = rootRect.height;
3967
- }
3968
- if (rootRect.width) {
3969
- style2.width = rootRect.width;
3970
- }
3964
+ const style2 = {
3965
+ height: rootRect.height ?? "",
3966
+ width: rootRect.width ?? ""
3967
+ };
3971
3968
  return style2;
3972
3969
  }, [fixed, rootRect.height, rootRect.width]);
3973
3970
  const stickyStyle = useMemo$1(() => {
@@ -3978,36 +3975,37 @@ const Sticky = (props) => {
3978
3975
  [position]: ""
3979
3976
  };
3980
3977
  }
3981
- const style2 = {};
3982
- if (rootRect.height) style2.height = rootRect.height;
3983
- if (rootRect.width) style2.width = rootRect.width;
3984
- style2.transform = `translate3d(0, ${transform}px, 0)`;
3985
- style2[position] = threshold;
3986
- style2.zIndex = zIndex;
3978
+ const style2 = {
3979
+ height: rootRect.height ?? "",
3980
+ width: rootRect.width ?? "",
3981
+ transform: `translate3d(0, ${transform}px, 0)`,
3982
+ [position]: threshold,
3983
+ zIndex
3984
+ };
3987
3985
  return style2;
3988
3986
  }, [fixed, rootRect.height, rootRect.width, transform, position]);
3989
3987
  const handleScroll = async (scrollTop) => {
3990
3988
  const curRootRect = await getRectByTaro(rootRef.current);
3991
3989
  const stickyRect = await getRectByTaro(stickyRef.current);
3992
- if (curRootRect && stickyRect) {
3993
- setRootRect(curRootRect);
3994
- if (position === "top") {
3995
- if (container) {
3996
- const containerRect = await getRectByTaro(container.current);
3997
- const difference = containerRect.bottom - threshold - curRootRect.height;
3998
- const curTransform = difference < 0 ? difference : 0;
3999
- setTransform(curTransform);
4000
- const curFixed = threshold > curRootRect.top && containerRect.bottom > 0;
4001
- setFixed(curFixed);
4002
- } else {
4003
- setFixed(threshold > curRootRect.top);
4004
- }
3990
+ if (!curRootRect || !stickyRect) {
3991
+ console.warn("getRectByTaro获取失败", { stickyRect, curRootRect });
3992
+ return;
3993
+ }
3994
+ setRootRect(curRootRect);
3995
+ if (position === "top") {
3996
+ if (container) {
3997
+ const containerRect = await getRectByTaro(container.current);
3998
+ const difference = containerRect.bottom - threshold - curRootRect.height;
3999
+ const curTransform = difference < 0 ? difference : 0;
4000
+ setTransform(curTransform);
4001
+ const curFixed = threshold > curRootRect.top && containerRect.bottom > 0;
4002
+ setFixed(curFixed);
4005
4003
  } else {
4006
- const windowHeight = getSystemInfoSync().windowHeight;
4007
- setFixed(windowHeight - threshold < curRootRect.bottom);
4004
+ setFixed(threshold > curRootRect.top);
4008
4005
  }
4009
4006
  } else {
4010
- console.warn("getRectByTaro获取失败", { stickyRect, curRootRect });
4007
+ const windowHeight = getSystemInfoSync().windowHeight;
4008
+ setFixed(windowHeight - threshold < curRootRect.bottom);
4011
4009
  }
4012
4010
  };
4013
4011
  const getElement = useCallback(() => {
@@ -6730,8 +6728,10 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
6730
6728
  };
6731
6729
  useEffect(() => {
6732
6730
  setCurrentDate(resetDefaultValue() || []);
6733
- popup && resetRender();
6734
6731
  }, [defaultValue]);
6732
+ useEffect(() => {
6733
+ popup && resetRender();
6734
+ }, [currentDate]);
6735
6735
  const scrollToDate = (date4) => {
6736
6736
  if (Utils.compareDate(date4, propStartDate)) {
6737
6737
  date4 = propStartDate;
@@ -12885,6 +12885,10 @@ const InternalUploader = (props, ref) => {
12885
12885
  clearUploadQueue();
12886
12886
  }
12887
12887
  }));
12888
+ const fileListRef = useRef([]);
12889
+ useEffect(() => {
12890
+ fileListRef.current = fileList;
12891
+ }, [fileList]);
12888
12892
  const clearUploadQueue = (index = -1) => {
12889
12893
  if (index > -1) {
12890
12894
  uploadQueue.splice(index, 1);
@@ -12964,7 +12968,7 @@ const InternalUploader = (props, ref) => {
12964
12968
  uploadOption.onStart = (option) => {
12965
12969
  clearUploadQueue(index);
12966
12970
  setFileList(
12967
- fileList.map((item) => {
12971
+ fileListRef.current.map((item) => {
12968
12972
  if (item.uid === fileItem.uid) {
12969
12973
  item.status = "ready";
12970
12974
  item.message = locale.uploader.readyUpload;
@@ -12972,23 +12976,23 @@ const InternalUploader = (props, ref) => {
12972
12976
  return item;
12973
12977
  })
12974
12978
  );
12975
- onStart && onStart(option);
12979
+ onStart == null ? void 0 : onStart(option);
12976
12980
  };
12977
12981
  uploadOption.onProgress = (e2, option) => {
12978
12982
  setFileList(
12979
- fileList.map((item) => {
12983
+ fileListRef.current.map((item) => {
12980
12984
  if (item.uid === fileItem.uid) {
12981
12985
  item.status = UPLOADING;
12982
12986
  item.message = locale.uploader.uploading;
12983
12987
  item.percentage = e2.progress;
12984
- onProgress && onProgress({ e: e2, option, percentage: item.percentage });
12988
+ onProgress == null ? void 0 : onProgress({ e: e2, option, percentage: item.percentage });
12985
12989
  }
12986
12990
  return item;
12987
12991
  })
12988
12992
  );
12989
12993
  };
12990
12994
  uploadOption.onSuccess = (responseText, option) => {
12991
- const list = fileList.map((item) => {
12995
+ const list = fileListRef.current.map((item) => {
12992
12996
  if (item.uid === fileItem.uid) {
12993
12997
  item.status = SUCCESS;
12994
12998
  item.message = locale.uploader.success;
@@ -13004,7 +13008,7 @@ const InternalUploader = (props, ref) => {
13004
13008
  });
13005
13009
  };
13006
13010
  uploadOption.onFailure = (responseText, option) => {
13007
- const list = fileList.map((item) => {
13011
+ const list = fileListRef.current.map((item) => {
13008
13012
  if (item.uid === fileItem.uid) {
13009
13013
  item.status = ERROR;
13010
13014
  item.message = locale.uploader.error;
@@ -13066,8 +13070,8 @@ const InternalUploader = (props, ref) => {
13066
13070
  if (preview) {
13067
13071
  fileItem.url = fileType === "video" ? file.thumbTempFilePath : filepath;
13068
13072
  }
13069
- setFileList([...fileList, fileItem]);
13070
13073
  executeUpload(fileItem, index);
13074
+ setFileList([...fileList, fileItem]);
13071
13075
  });
13072
13076
  };
13073
13077
  const filterFiles = (files) => {
@@ -13081,9 +13085,7 @@ const InternalUploader = (props, ref) => {
13081
13085
  }
13082
13086
  return true;
13083
13087
  });
13084
- if (oversizes.length) {
13085
- onOversize && onOversize(files);
13086
- }
13088
+ oversizes.length && (onOversize == null ? void 0 : onOversize(files));
13087
13089
  const currentFileLength = filterFile.length + fileList.length;
13088
13090
  if (currentFileLength > maximum) {
13089
13091
  filterFile.splice(filterFile.length - (currentFileLength - maximum));
@@ -13826,6 +13828,7 @@ const InfiniteLoading = (props) => {
13826
13828
  return /* @__PURE__ */ React__default.createElement(
13827
13829
  ScrollView,
13828
13830
  {
13831
+ ...rest,
13829
13832
  className: classes,
13830
13833
  scrollY: true,
13831
13834
  id: "scroller",
@@ -13835,8 +13838,7 @@ const InfiniteLoading = (props) => {
13835
13838
  onScrollToLower: lower,
13836
13839
  onTouchStart: touchStart,
13837
13840
  onTouchMove: touchMove,
13838
- onTouchEnd: touchEnd,
13839
- ...rest
13841
+ onTouchEnd: touchEnd
13840
13842
  },
13841
13843
  /* @__PURE__ */ React__default.createElement("div", { className: "nut-infinite-top", ref: refreshTop, style: getStyle() }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-infinite-top-tips" }, pullingText || locale.infiniteloading.pullRefreshText)),
13842
13844
  /* @__PURE__ */ React__default.createElement("div", { className: "nut-infinite-container" }, children),
@@ -18596,6 +18598,8 @@ const defaultProps$1 = {
18596
18598
  gapY: 48,
18597
18599
  width: 120,
18598
18600
  height: 64,
18601
+ startX: 0,
18602
+ startY: 0,
18599
18603
  image: "",
18600
18604
  imageWidth: 120,
18601
18605
  imageHeight: 64,
@@ -18614,6 +18618,8 @@ const WaterMark = (props) => {
18614
18618
  className,
18615
18619
  gapX,
18616
18620
  gapY,
18621
+ startX,
18622
+ startY,
18617
18623
  width,
18618
18624
  height,
18619
18625
  image,
@@ -18694,7 +18700,7 @@ const WaterMark = (props) => {
18694
18700
  const markSize = Number(fontSize) * ratio;
18695
18701
  ctx.font = `${fontStyle} normal ${fontWeight} ${markSize}px/${markHeight}px ${fontFamily}`;
18696
18702
  ctx.fillStyle = color;
18697
- ctx.fillText(content, 0, 0);
18703
+ ctx.fillText(content, startX, startY);
18698
18704
  ctx.restore();
18699
18705
  setBase64Url(canvas.toDataURL());
18700
18706
  }