@nutui/nutui-react-taro 1.5.7 → 1.5.8-beta.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.5.8
+`2023-06-07`
+
+* :bug: fix(watermark): 修复小程序下画布尺寸问题 (#1073) @Eiinu
+* :bug: fix: calendar 日历组件上下滑动回弹 (#1078) @xiaoyatong
+
+
 # v1.5.7
 `2023-05-31`
 

package/dist/esm/Calendar.js

@@ -1,4 +1,4 @@
-import { C as Calendar } from './calendar.taro-670842ea.js';
+import { C as Calendar } from './calendar.taro-2a19ee22.js';
 import 'react';
 import './popup.taro-01676bff.js';
 import 'react-dom';
@@ -10,11 +10,11 @@ import '@bem-react/classname';
 import '@tarojs/components';
 import './icon.taro-296a1bec.js';
 import './typings-b9828dba.js';
-import './calendaritem.taro-2a603571.js';
+import './calendaritem.taro-e3f13a3b.js';
+import '@tarojs/taro';
 import './configprovider.taro-8d71eb49.js';
 import 'lodash.kebabcase';
 import './zh-CN-c779e6c1.js';
-import '@tarojs/taro';
 
 
 

package/dist/esm/CalendarItem.js

@@ -1,13 +1,13 @@
-import { C as CalendarItem } from './calendaritem.taro-2a603571.js';
+import { C as CalendarItem } from './calendaritem.taro-e3f13a3b.js';
 import 'react';
 import 'classnames';
 import '@tarojs/components';
+import '@tarojs/taro';
 import './bem-350c1702.js';
 import '@bem-react/classname';
 import './configprovider.taro-8d71eb49.js';
 import 'lodash.kebabcase';
 import './zh-CN-c779e6c1.js';
-import '@tarojs/taro';
 
 
 

package/dist/esm/WaterMark.js

@@ -1,4 +1,4 @@
-import { W as WaterMark } from './watermark.taro-9ce2ae37.js';
+import { W as WaterMark } from './watermark.taro-fb932c31.js';
 import 'react';
 import '@tarojs/taro';
 import 'classnames';

package/dist/esm/{calendar.taro-670842ea.js → calendar.taro-2a19ee22.js}

@@ -1,6 +1,6 @@
 import React__default, { useRef } from 'react';
 import { P as Popup } from './popup.taro-01676bff.js';
-import { U as Utils, C as CalendarItem } from './calendaritem.taro-2a603571.js';
+import { U as Utils, C as CalendarItem } from './calendaritem.taro-e3f13a3b.js';
 import { u as useConfig } from './configprovider.taro-8d71eb49.js';
 
 const defaultProps = {

package/dist/esm/{calendaritem.taro-2a603571.js → calendaritem.taro-e3f13a3b.js}

@@ -1,9 +1,9 @@
 import React__default, { useState, useRef, useEffect } from 'react';
 import classNames from 'classnames';
 import { ScrollView } from '@tarojs/components';
+import { nextTick } from '@tarojs/taro';
 import { c as cn } from './bem-350c1702.js';
 import { u as useConfig } from './configprovider.taro-8d71eb49.js';
-import { nextTick } from '@tarojs/taro';
 
 const Utils = {
     /**
@@ -519,12 +519,6 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
         }
         else {
             const viewPosition = Math.round(currentScrollTop + viewHeight);
-            if (viewPosition <
-                state.monthsData[current].cssScrollHeight +
-                    state.monthsData[current].cssHeight &&
-                currentScrollTop > state.monthsData[current - 1].cssScrollHeight) {
-                current -= 1;
-            }
             if (current + 1 <= state.monthsNum &&
                 viewPosition >=
                     state.monthsData[current + 1].cssScrollHeight +

package/dist/esm/nutui-react.es.js

@@ -27,8 +27,8 @@ export { T as Tabbar } from './tabbar.taro-9acfc2fa.js';
 export { T as TabbarItem } from './tabbaritem.taro-bf517487.js';
 export { T as TabPane } from './tabpane.taro-4ca340ef.js';
 export { T as Tabs } from './tabs.taro-6a7524a4.js';
-export { C as Calendar } from './calendar.taro-670842ea.js';
-export { C as CalendarItem } from './calendaritem.taro-2a603571.js';
+export { C as Calendar } from './calendar.taro-2a19ee22.js';
+export { C as CalendarItem } from './calendaritem.taro-e3f13a3b.js';
 export { C as Cascader } from './cascader.taro-a5553aa5.js';
 export { C as Checkbox, a as CheckboxGroup } from './checkbox.taro-6120e3e3.js';
 export { D as DatePicker } from './datepicker.taro-94aca24a.js';
@@ -82,7 +82,7 @@ export { T as Tag } from './tag.taro-23ba0834.js';
 export { T as TrendArrow } from './trendarrow.taro-b8c5ccd9.js';
 export { V as Video } from './video-f1be8a91.js';
 export { V as VirtualList } from './virtuallist.taro-c420257c.js';
-export { W as WaterMark } from './watermark.taro-9ce2ae37.js';
+export { W as WaterMark } from './watermark.taro-fb932c31.js';
 export { A as Address } from './address.taro-d74c7760.js';
 export { B as Barrage } from './barrage.taro-0495a1b2.js';
 export { C as Card } from './card.taro-e4c76dad.js';

package/dist/esm/{watermark.taro-9ce2ae37.js → watermark.taro-fb932c31.js}

@@ -42,8 +42,8 @@ const WaterMark = (props) => {
         let ratio = 1;
         getSystemInfo().then((res) => {
             ratio = res.pixelRatio;
-            const canvasWidth = `${(gapX + width) * ratio}px`;
-            const canvasHeight = `${(gapY + height) * ratio}px`;
+            const canvasWidth = `${(gapX + width) * ratio}`;
+            const canvasHeight = `${(gapY + height) * ratio}`;
             const markWidth = width * ratio;
             const markHeight = height * ratio;
             let ctx;
@@ -51,8 +51,8 @@ const WaterMark = (props) => {
             if (process.env.TARO_ENV === 'h5') {
                 canvas = document.createElement('canvas');
                 ctx = canvas.getContext('2d');
-                canvas.setAttribute('width', canvasWidth);
-                canvas.setAttribute('height', canvasHeight);
+                canvas.setAttribute('width', `${canvasWidth}px`);
+                canvas.setAttribute('height', `${canvasHeight}px`);
             }
             else {
                 canvas = createOffscreenCanvas({

package/dist/locales/base.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.7 Wed May 31 2023 14:34:16 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v1.5.8-beta.0 Wed Jun 07 2023 10:04:24 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/en-US.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.7 Wed May 31 2023 14:34:16 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v1.5.8-beta.0 Wed Jun 07 2023 10:04:24 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/id-ID.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.7 Wed May 31 2023 14:34:16 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v1.5.8-beta.0 Wed Jun 07 2023 10:04:24 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-CN.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.7 Wed May 31 2023 14:34:16 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v1.5.8-beta.0 Wed Jun 07 2023 10:04:24 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-TW.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.7 Wed May 31 2023 14:34:16 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v1.5.8-beta.0 Wed Jun 07 2023 10:04:24 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-UG.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.7 Wed May 31 2023 14:34:16 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v1.5.8-beta.0 Wed Jun 07 2023 10:04:24 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/nutui.react.mjs

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v1.5.7 Wed May 31 2023 14:33:56 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v1.5.8-beta.0 Wed Jun 07 2023 10:04:01 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -5495,9 +5495,6 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
       }
     } else {
       const viewPosition = Math.round(currentScrollTop + viewHeight);
-      if (viewPosition < state.monthsData[current].cssScrollHeight + state.monthsData[current].cssHeight && currentScrollTop > state.monthsData[current - 1].cssScrollHeight) {
-        current -= 1;
-      }
       if (current + 1 <= state.monthsNum && viewPosition >= state.monthsData[current + 1].cssScrollHeight + state.monthsData[current + 1].cssHeight) {
         current += 1;
       }
@@ -20226,8 +20223,8 @@ const WaterMark = (props) => {
     let ratio = 1;
     getSystemInfo().then((res) => {
       ratio = res.pixelRatio;
-      const canvasWidth = `${(gapX + width) * ratio}px`;
-      const canvasHeight = `${(gapY + height) * ratio}px`;
+      const canvasWidth = `${(gapX + width) * ratio}`;
+      const canvasHeight = `${(gapY + height) * ratio}`;
       const markWidth = width * ratio;
       const markHeight = height * ratio;
       let ctx2;
@@ -20235,8 +20232,8 @@ const WaterMark = (props) => {
       if (process.env.TARO_ENV === "h5") {
         canvas = document.createElement("canvas");
         ctx2 = canvas.getContext("2d");
-        canvas.setAttribute("width", canvasWidth);
-        canvas.setAttribute("height", canvasHeight);
+        canvas.setAttribute("width", `${canvasWidth}px`);
+        canvas.setAttribute("height", `${canvasHeight}px`);
       } else {
         canvas = createOffscreenCanvas({
           type: "2d",

package/dist/nutui.react.umd.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v1.5.7 Wed May 31 2023 14:33:56 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v1.5.8-beta.0 Wed Jun 07 2023 10:04:01 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -5511,9 +5511,6 @@ var __publicField = (obj, key, value) => {
         }
       } else {
         const viewPosition = Math.round(currentScrollTop + viewHeight);
-        if (viewPosition < state.monthsData[current].cssScrollHeight + state.monthsData[current].cssHeight && currentScrollTop > state.monthsData[current - 1].cssScrollHeight) {
-          current -= 1;
-        }
         if (current + 1 <= state.monthsNum && viewPosition >= state.monthsData[current + 1].cssScrollHeight + state.monthsData[current + 1].cssHeight) {
           current += 1;
         }
@@ -20242,8 +20239,8 @@ This message will only show in development mode. It won't appear in production.
       let ratio = 1;
       Taro.getSystemInfo().then((res) => {
         ratio = res.pixelRatio;
-        const canvasWidth = `${(gapX + width) * ratio}px`;
-        const canvasHeight = `${(gapY + height) * ratio}px`;
+        const canvasWidth = `${(gapX + width) * ratio}`;
+        const canvasHeight = `${(gapY + height) * ratio}`;
         const markWidth = width * ratio;
         const markHeight = height * ratio;
         let ctx2;
@@ -20251,8 +20248,8 @@ This message will only show in development mode. It won't appear in production.
         if (process.env.TARO_ENV === "h5") {
           canvas = document.createElement("canvas");
           ctx2 = canvas.getContext("2d");
-          canvas.setAttribute("width", canvasWidth);
-          canvas.setAttribute("height", canvasHeight);
+          canvas.setAttribute("width", `${canvasWidth}px`);
+          canvas.setAttribute("height", `${canvasHeight}px`);
         } else {
           canvas = Taro.createOffscreenCanvas({
             type: "2d",

package/dist/style.mjs

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v1.5.7 Wed May 31 2023 14:34:07 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v1.5.8-beta.0 Wed Jun 07 2023 10:04:13 GMT+0800 (中国标准时间)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react-taro",
-  "version": "1.5.7",
+  "version": "1.5.8-beta.0",
   "description": "京东风格的轻量级移动端 React 组件库，支持一套代码生成 H5 和小程序",
   "title": "NutUI-React",
   "keywords": [