@nutui/nutui-react-taro 1.4.2 → 1.4.3

package/dist/esm/pulltorefresh.taro-f26a20dd.js

@@ -122,82 +122,88 @@ var PullToRefresh = function PullToRefresh(p) {
   function _doRefresh() {
     _doRefresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
-          case 0:
-            api.start({
-              height: headHeight
-            });
-            setStatus('refreshing');
-            _context3.prev = 2;
-            _context3.next = 5;
-            return props.onRefresh();
-          case 5:
-            setStatus('complete');
-            _context3.next = 12;
-            break;
-          case 8:
-            _context3.prev = 8;
-            _context3.t0 = _context3["catch"](2);
-            api.start({
-              to: function () {
-                var _to = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(next) {
-                  return _regeneratorRuntime.wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
-                      case 0:
-                        _context.next = 2;
-                        return next({
-                          height: 0
-                        });
-                      case 2:
-                        setStatus('pulling');
-                      case 3:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }, _callee);
-                }));
-                function to(_x) {
-                  return _to.apply(this, arguments);
-                }
-                return to;
-              }()
-            });
-            throw _context3.t0;
-          case 12:
-            if (!(props.completeDelay > 0)) {
-              _context3.next = 15;
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              api.start({
+                height: headHeight
+              });
+              setStatus('refreshing');
+              _context3.prev = 2;
+              _context3.next = 5;
+              return props.onRefresh();
+            case 5:
+              setStatus('complete');
+              _context3.next = 12;
               break;
-            }
-            _context3.next = 15;
-            return sleep(props.completeDelay);
-          case 15:
-            api.start({
-              to: function () {
-                var _to2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(next) {
-                  return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-                    while (1) switch (_context2.prev = _context2.next) {
-                      case 0:
-                        _context2.next = 2;
-                        return next({
-                          height: 0
-                        });
-                      case 2:
-                        setStatus('pulling');
-                      case 3:
-                      case "end":
-                        return _context2.stop();
-                    }
-                  }, _callee2);
-                }));
-                function to(_x2) {
-                  return _to2.apply(this, arguments);
-                }
-                return to;
-              }()
-            });
-          case 16:
-          case "end":
-            return _context3.stop();
+            case 8:
+              _context3.prev = 8;
+              _context3.t0 = _context3["catch"](2);
+              api.start({
+                to: function () {
+                  var _to = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(next) {
+                    return _regeneratorRuntime.wrap(function _callee$(_context) {
+                      while (1) {
+                        switch (_context.prev = _context.next) {
+                          case 0:
+                            _context.next = 2;
+                            return next({
+                              height: 0
+                            });
+                          case 2:
+                            setStatus('pulling');
+                          case 3:
+                          case "end":
+                            return _context.stop();
+                        }
+                      }
+                    }, _callee);
+                  }));
+                  function to(_x) {
+                    return _to.apply(this, arguments);
+                  }
+                  return to;
+                }()
+              });
+              throw _context3.t0;
+            case 12:
+              if (!(props.completeDelay > 0)) {
+                _context3.next = 15;
+                break;
+              }
+              _context3.next = 15;
+              return sleep(props.completeDelay);
+            case 15:
+              api.start({
+                to: function () {
+                  var _to2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(next) {
+                    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+                      while (1) {
+                        switch (_context2.prev = _context2.next) {
+                          case 0:
+                            _context2.next = 2;
+                            return next({
+                              height: 0
+                            });
+                          case 2:
+                            setStatus('pulling');
+                          case 3:
+                          case "end":
+                            return _context2.stop();
+                        }
+                      }
+                    }, _callee2);
+                  }));
+                  function to(_x2) {
+                    return _to2.apply(this, arguments);
+                  }
+                  return to;
+                }()
+              });
+            case 16:
+            case "end":
+              return _context3.stop();
+          }
         }
       }, _callee3, null, [[2, 8]]);
     }));

package/dist/esm/{range.taro-4cbe2469.js → range.taro-c41e9b90.js}

@@ -7,7 +7,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React__default, { useState, useRef, useEffect, useCallback } from 'react';
 import { u as useTouch } from './useTouch-a2ea68c6.js';
 import { g as getRectByTaro } from './useClientRect-bf69d7b3.js';
-import { T as Toast } from './toast.taro-86862dff.js';
+import { T as Toast } from './toast.taro-0804b6b4.js';
 import { u as useConfig } from './configprovider.taro-8bdb3a28.js';
 var defaultProps = {
   range: false,
@@ -244,41 +244,43 @@ var Range = function Range(props) {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event) {
       var rect, delta, total, value, _currentValue, _currentValue2, left, right, middle;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!(disabled || !root.current)) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return");
-          case 2:
-            SetDragStatus('');
-            _context.next = 5;
-            return getRectByTaro(root.current);
-          case 5:
-            rect = _context.sent;
-            delta = (event.detail.x ? event.detail.x : event.clientX) - rect.left;
-            total = rect.width;
-            if (vertical) {
-              delta = (event.detail.y ? event.detail.y : event.clientY) - rect.top;
-              total = rect.height;
-            }
-            value = Number(min) + delta / total * scope();
-            currentValue = initValue || initValue === 0 ? initValue : modelValue;
-            if (isRange(currentValue)) {
-              _currentValue = currentValue, _currentValue2 = _slicedToArray(_currentValue, 2), left = _currentValue2[0], right = _currentValue2[1];
-              middle = (left + right) / 2;
-              if (value <= middle) {
-                updateValue([value, right], true);
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(disabled || !root.current)) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return");
+            case 2:
+              SetDragStatus('');
+              _context.next = 5;
+              return getRectByTaro(root.current);
+            case 5:
+              rect = _context.sent;
+              delta = (event.detail.x ? event.detail.x : event.clientX) - rect.left;
+              total = rect.width;
+              if (vertical) {
+                delta = (event.detail.y ? event.detail.y : event.clientY) - rect.top;
+                total = rect.height;
+              }
+              value = Number(min) + delta / total * scope();
+              currentValue = initValue || initValue === 0 ? initValue : modelValue;
+              if (isRange(currentValue)) {
+                _currentValue = currentValue, _currentValue2 = _slicedToArray(_currentValue, 2), left = _currentValue2[0], right = _currentValue2[1];
+                middle = (left + right) / 2;
+                if (value <= middle) {
+                  updateValue([value, right], true);
+                } else {
+                  updateValue([left, value], true);
+                }
               } else {
-                updateValue([left, value], true);
+                updateValue(value, true);
               }
-            } else {
-              updateValue(value, true);
-            }
-          case 12:
-          case "end":
-            return _context.stop();
+            case 12:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));
@@ -303,41 +305,43 @@ var Range = function Range(props) {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(event) {
       var rect, delta, total, diff;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            if (!(disabled || !root.current)) {
-              _context2.next = 2;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 2:
-            if (dragStatus === 'start') {
-              dragStart && dragStart();
-              onDragStart && onDragStart();
-            }
-            touch.move(event);
-            SetDragStatus('draging');
-            _context2.next = 7;
-            return getRectByTaro(root.current);
-          case 7:
-            rect = _context2.sent;
-            delta = touch.deltaX;
-            total = rect.width;
-            diff = delta / total * scope();
-            if (vertical) {
-              delta = touch.deltaY;
-              total = rect.height;
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!(disabled || !root.current)) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 2:
+              if (dragStatus === 'start') {
+                dragStart && dragStart();
+                onDragStart && onDragStart();
+              }
+              touch.move(event);
+              SetDragStatus('draging');
+              _context2.next = 7;
+              return getRectByTaro(root.current);
+            case 7:
+              rect = _context2.sent;
+              delta = touch.deltaX;
+              total = rect.width;
               diff = delta / total * scope();
-            }
-            if (isRange(startValue)) {
-              currentValue[buttonIndex] = startValue[buttonIndex] + diff;
-            } else {
-              currentValue = startValue + diff;
-            }
-            updateValue(currentValue);
-          case 14:
-          case "end":
-            return _context2.stop();
+              if (vertical) {
+                delta = touch.deltaY;
+                total = rect.height;
+                diff = delta / total * scope();
+              }
+              if (isRange(startValue)) {
+                currentValue[buttonIndex] = startValue[buttonIndex] + diff;
+              } else {
+                currentValue = startValue + diff;
+              }
+              updateValue(currentValue);
+            case 14:
+            case "end":
+              return _context2.stop();
+          }
         }
       }, _callee2);
     }));

package/dist/esm/{shortpassword.taro-4bd513ae.js → shortpassword.taro-3a3bf412.js}

@@ -7,7 +7,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import React__default, { useRef, useState, useEffect } from 'react';
 import { c as cn } from './bem-893ad28d.js';
-import { P as Popup } from './popup.taro-33d0bbc8.js';
+import { P as Popup } from './popup.taro-cb777e09.js';
 import { I as Icon } from './icon.taro-1d0d4fb7.js';
 import { u as useConfig } from './configprovider.taro-8bdb3a28.js';
 import { C as ComponentDefaults } from './typings-1c5f2628.js';

package/dist/esm/{sidenavbar.taro-3b1f1218.js → sidenavbar.taro-06026f31.js}

@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import React__default, { useState } from 'react';
 import { u as useConfig } from './configprovider.taro-8bdb3a28.js';
-import { P as Popup } from './popup.taro-33d0bbc8.js';
+import { P as Popup } from './popup.taro-cb777e09.js';
 import { O as OffsetContext } from './offsetContext-bfb02c25.js';
 var defaultProps = {
   showhead: false,

package/dist/esm/{signature.taro-504357dc.js → signature.taro-17648cac.js}

@@ -4,13 +4,15 @@ import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProper
 var _excluded = ["canvasId", "type", "lineWidth", "strokeStyle", "unSupportTpl", "className", "confirm", "clear", "onConfirm", "onClear"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import React__default, { useRef, useState } from 'react';
-import Taro, { useReady } from '@tarojs/taro';
+import React__default, { useRef, useState, useEffect } from 'react';
+import Taro from '@tarojs/taro';
 import { B as Button } from './button.taro-4ce133b9.js';
 import { c as cn } from './bem-893ad28d.js';
 import { u as useConfig } from './configprovider.taro-8bdb3a28.js';
+
+/* eslint-disable react/no-unknown-property */
 var defaultProps = {
-  canvasId: 'weappCanvas',
+  canvasId: 'spcanvas',
   type: 'png',
   lineWidth: 2,
   strokeStyle: '#000',
@@ -32,7 +34,7 @@ var Signature = function Signature(props) {
     onClear = _defaultProps$props.onClear,
     rest = _objectWithoutProperties(_defaultProps$props, _excluded);
   var b = cn('signature');
-  useRef(null);
+  var canvasRef = useRef(null);
   var wrapRef = useRef(null);
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -43,8 +45,10 @@ var Signature = function Signature(props) {
     canvasWidth = _useState4[0],
     setCanvasWidth = _useState4[1];
   var ctx = useRef(null);
+  var _useState5 = useState('true'),
+    _useState6 = _slicedToArray(_useState5, 1),
+    disalbeScroll = _useState6[0];
   var startEventHandler = function startEventHandler(event) {
-    event.preventDefault();
     if (ctx.current) {
       ctx.current.beginPath();
       ctx.current.lineWidth = lineWidth;
@@ -52,15 +56,25 @@ var Signature = function Signature(props) {
     }
   };
   var moveEventHandler = function moveEventHandler(event) {
-    event.preventDefault();
     if (ctx.current) {
-      ctx.current.lineTo(event.changedTouches[0].x, event.changedTouches[0].y);
-      ctx.current.stroke();
+      var evt = event.changedTouches[0];
+      var mouseX = evt.x || evt.clientX;
+      var mouseY = evt.y || evt.clientY;
+      if (Taro.getEnv() === 'WEB' && canvasRef.current) {
+        var coverPos = canvasRef.current.getBoundingClientRect();
+        mouseX = evt.clientX - coverPos.left;
+        mouseY = evt.clientY - coverPos.top;
+      }
+      Taro.nextTick(function () {
+        var _ctx$current, _ctx$current2;
+        // ctx.current.lineCap = 'round'
+        // ctx.current.lineJoin = 'round'
+        (_ctx$current = ctx.current) === null || _ctx$current === void 0 ? void 0 : _ctx$current.lineTo(mouseX, mouseY);
+        (_ctx$current2 = ctx.current) === null || _ctx$current2 === void 0 ? void 0 : _ctx$current2.stroke();
+      });
     }
   };
-  var endEventHandler = function endEventHandler(event) {
-    event.preventDefault();
-  };
+  var endEventHandler = function endEventHandler(event) {};
   var handleClearBtn = function handleClearBtn() {
     if (ctx.current) {
       ctx.current.clearRect(0, 0, canvasWidth, canvasHeight);
@@ -80,6 +94,7 @@ var Signature = function Signature(props) {
       Taro.canvasToTempFilePath({
         canvas: res[0].node,
         fileType: props.type,
+        canvasId: "".concat(canvasId),
         success: function success(res) {
           handleClearBtn();
           confirm && confirm(res.tempFilePath);
@@ -91,48 +106,73 @@ var Signature = function Signature(props) {
       });
     });
   };
-  useReady(function () {
-    initCanvas();
-  });
-  //   useEffect(() => {
-  //     eventCenter.once((getCurrentInstanceTaro() as any).router.onReady, () => {
+  var canvasSetting = function canvasSetting(canvasDom, width, height) {
+    var canvas = canvasDom;
+    canvas.current = canvas;
+    ctx.current = canvas.getContext('2d');
+    setCanvasWidth(width);
+    setCanvasHeight(height);
+    canvas.width = width;
+    canvas.height = height;
+    if (ctx.current) {
+      ctx.current.clearRect(0, 0, width, height);
+      ctx.current.beginPath();
+      ctx.current.lineWidth = lineWidth;
+      ctx.current.strokeStyle = strokeStyle;
+    }
+  };
   var initCanvas = function initCanvas() {
-    Taro.createSelectorQuery().select("#".concat(canvasId)).fields({
-      node: true,
-      size: true
-    }, function (res) {
-      var canvas = res.node;
-      canvas.current = canvas;
-      ctx.current = canvas.getContext('2d');
-      setCanvasWidth(res.width);
-      setCanvasHeight(res.height);
-      if (ctx.current) {
-        ctx.current.clearRect(0, 0, canvasWidth, canvasHeight);
-        ctx.current.beginPath();
-        ctx.current.lineWidth = lineWidth;
-        ctx.current.strokeStyle = strokeStyle;
-      }
-    }).exec();
+    Taro.nextTick(function () {
+      setTimeout(function () {
+        if (Taro.getEnv() === 'WEAPP' || Taro.getEnv() === 'JD') {
+          Taro.createSelectorQuery().select("#".concat(canvasId)).fields({
+            node: true,
+            size: true
+          }, function (res) {
+            var node = res.node,
+              width = res.width,
+              height = res.height;
+            canvasSetting(node, width, height);
+          }).exec();
+        } else {
+          var canvasDom = document.getElementById("".concat(canvasId));
+          var canvas = canvasDom;
+          if ((canvasDom === null || canvasDom === void 0 ? void 0 : canvasDom.tagName) !== 'CANVAS') {
+            canvas = canvasDom === null || canvasDom === void 0 ? void 0 : canvasDom.getElementsByTagName('canvas')[0];
+          }
+          canvasSetting(canvas, canvasDom === null || canvasDom === void 0 ? void 0 : canvasDom.offsetWidth, canvasDom === null || canvasDom === void 0 ? void 0 : canvasDom.offsetHeight);
+        }
+      }, 1000);
+    });
   };
-  //     })
-  //   }, [])
+  useEffect(function () {
+    initCanvas();
+  }, []);
   return React__default.createElement("div", _objectSpread({
     className: "".concat(b(), " ").concat(className)
   }, rest), React__default.createElement("div", {
-    className: "".concat(b('inner')),
+    className: "".concat(b('inner'), " spcanvas_WEAPP"),
     ref: wrapRef
-  }, React__default.createElement("canvas", {
+  }, Taro.getEnv() === 'WEAPP' || Taro.getEnv() === 'JD' ? React__default.createElement("canvas", {
     id: canvasId,
+    ref: canvasRef,
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    // eslint-disable-next-line react/no-unknown-property
     canvasId: canvasId,
-    // eslint-disable-next-line react/no-unknown-property
-    disableScroll: true,
+    disalbeScroll: true,
     type: "2d",
     onTouchStart: startEventHandler,
     onTouchMove: moveEventHandler,
     onTouchEnd: endEventHandler
+  }) : React__default.createElement("canvas", {
+    id: canvasId,
+    ref: canvasRef,
+    "canvas-id": canvasId,
+    "disalbe-scroll": disalbeScroll,
+    onTouchStart: startEventHandler,
+    onTouchMove: moveEventHandler,
+    onTouchEnd: endEventHandler,
+    onTouchCancel: endEventHandler
   })), React__default.createElement(Button, {
     className: "".concat(b('btn')),
     type: "default",

package/dist/esm/swipe.taro-83bc248f.js

@@ -60,43 +60,45 @@ var Swipe = forwardRef(function (props, instanceRef) {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event) {
       var leftRect, rightRect;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!leftWrapper.current) {
-              _context.next = 5;
-              break;
-            }
-            _context.next = 3;
-            return getRectByTaro(leftWrapper.current);
-          case 3:
-            leftRect = _context.sent;
-            setActionWidth(function (v) {
-              return _objectSpread(_objectSpread({}, v), {}, {
-                left: leftRect.width
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!leftWrapper.current) {
+                _context.next = 5;
+                break;
+              }
+              _context.next = 3;
+              return getRectByTaro(leftWrapper.current);
+            case 3:
+              leftRect = _context.sent;
+              setActionWidth(function (v) {
+                return _objectSpread(_objectSpread({}, v), {}, {
+                  left: leftRect.width
+                });
               });
-            });
-          case 5:
-            if (!rightWrapper.current) {
-              _context.next = 10;
-              break;
-            }
-            _context.next = 8;
-            return getRectByTaro(rightWrapper.current);
-          case 8:
-            rightRect = _context.sent;
-            setActionWidth(function (v) {
-              return _objectSpread(_objectSpread({}, v), {}, {
-                right: rightRect.width
+            case 5:
+              if (!rightWrapper.current) {
+                _context.next = 10;
+                break;
+              }
+              _context.next = 8;
+              return getRectByTaro(rightWrapper.current);
+            case 8:
+              rightRect = _context.sent;
+              setActionWidth(function (v) {
+                return _objectSpread(_objectSpread({}, v), {}, {
+                  right: rightRect.width
+                });
               });
-            });
-          case 10:
-            if (!props.disabled) {
-              startOffset.current = state.offset;
-              touch.start(event);
-            }
-          case 11:
-          case "end":
-            return _context.stop();
+            case 10:
+              if (!props.disabled) {
+                startOffset.current = state.offset;
+                touch.start(event);
+              }
+            case 11:
+            case "end":
+              return _context.stop();
+          }
         }
       }, _callee);
     }));