@trionesdev/antd-taro-react 0.0.2-beta.1 → 0.0.2-beta.11

package/dist/Calendar/touchable-calendar-grid.js

@@ -15,30 +15,32 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { memo, useEffect, useRef, useState } from 'react';
 import Taro from '@tarojs/taro';
 import { CalendarGrid } from "../Calendar";
-import { useTaro } from "../hooks/useTaro";
+import { useTaro } from "../hooks";
 import { RandomUtils } from "../utils/random-utils";
 import classNames from "classnames";
-/**
- * 可以手势滑动的日历组件
+import dayjs from "dayjs";
+var monthLines = 6;
+
+/**
+ * 可以手势滑动的日历组件
  */
 export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
   var _wrapperRef$current3;
-  var _ref$mouth = _ref.mouth,
-    mouth = _ref$mouth === void 0 ? new Date() : _ref$mouth,
+  var month = _ref.month,
     value = _ref.value,
     defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
-    onMouthChange = _ref.onMouthChange,
+    onMonthChange = _ref.onMonthChange,
     range = _ref.range;
   var _useTaro = useTaro(),
     isTaroEnv = _useTaro.isTaroEnv,
     isTaroWeApp = _useTaro.isTaroWeApp;
   var wrapperRef = useRef();
   var wrapperUniqueRef = React.useRef(RandomUtils.random());
-  var _useState = useState(mouth),
+  var _useState = useState(month || dayjs()),
     _useState2 = _slicedToArray(_useState, 2),
-    currentMouth = _useState2[0],
-    setCurrentMouth = _useState2[1];
+    currentMonth = _useState2[0],
+    setCurrentMonth = _useState2[1];
   var waiting = false;
   var _useState3 = useState(200),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -65,8 +67,8 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
     mouths = _useState10[0],
     setMouths = _useState10[1];
 
-  /**
-   * 计算出每个格子的大小
+  /**
+   * 计算出每个格子的大小
    */
   var cellSize = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -99,8 +101,8 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  /**
-   * 计算出最大的translateY，默认为wrapperRef.current?.clientHeight
+  /**
+   * 计算出最大的translateY，默认为wrapperRef.current?.clientHeight
    */
   var minTranslateY = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -134,21 +136,21 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
     };
   }();
 
-  /**
-   * 计算出该月的行数
-   * @param mouth
+  /**
+   * 计算出该月的行数
+   * @param mouth
    */
   var mouthLines = function mouthLines(mouth) {
-    var firstDate = new Date(mouth.getFullYear(), mouth.getMonth(), 1);
-    var lastDate = new Date(mouth.getFullYear(), mouth.getMonth() + 1, 0);
-    var beforeDays = firstDate.getDay();
-    var afterDays = 6 - lastDate.getDay();
-    var countDays = beforeDays + lastDate.getDate() + afterDays;
+    var firstDate = dayjs(new Date(mouth.year(), mouth.month(), 1));
+    var lastDate = dayjs(new Date(mouth.year(), mouth.month() + 1, 0));
+    var beforeDays = firstDate.day();
+    var afterDays = 6 - lastDate.day();
+    var countDays = beforeDays + lastDate.date() + afterDays;
     return Math.ceil(countDays / 7);
   };
   var handleInsertMouth = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var firstMouth, insertMouth, newMouths, insertMouthLines, insertMouthHeight;
+      var firstMouth, insertMouth, newMouths, insertMouthHeight;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -158,19 +160,19 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
             // debugger
             // waiting = true
             firstMouth = mouths[0];
-            insertMouth = new Date(firstMouth.getFullYear(), firstMouth.getMonth() - 1, 1);
+            insertMouth = dayjs(new Date(firstMouth.year(), firstMouth.month() - 1, 1));
             newMouths = [insertMouth].concat(_toConsumableArray(mouths));
             setMouths(newMouths);
-            insertMouthLines = mouthLines(insertMouth);
-            _context3.t0 = insertMouthLines;
-            _context3.next = 8;
+            // const insertMouthLines = mouthLines(insertMouth);
+            _context3.t0 = monthLines;
+            _context3.next = 7;
             return cellSize();
-          case 8:
+          case 7:
             _context3.t1 = _context3.sent;
             insertMouthHeight = _context3.t0 * _context3.t1;
             setTranslateY(translateY - insertMouthHeight);
             // waiting  = false
-          case 11:
+          case 10:
           case "end":
             return _context3.stop();
         }
@@ -186,13 +188,13 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
     // }
     // waiting = true
     var lastMouth = mouths[mouths.length - 1];
-    var appendMouth = new Date(lastMouth.getFullYear(), lastMouth.getMonth() + 1, 1);
+    var appendMouth = lastMouth.add(1, 'month');
     var newMouths = [].concat(_toConsumableArray(mouths), [appendMouth]);
     setMouths(newMouths);
     // waiting = false
   };
   useEffect(function () {
-    var initMouths = [new Date(currentMouth.getFullYear(), currentMouth.getMonth() - 1, 1), new Date(currentMouth.getFullYear(), currentMouth.getMonth(), 1), new Date(currentMouth.getFullYear(), currentMouth.getMonth() + 1, 1)];
+    var initMouths = [currentMonth.clone().subtract(1, 'month'), currentMonth.clone(), currentMonth.clone().add(1, 'month')];
     Promise.all([]).then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var firstMouthHeight;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -200,14 +202,14 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
           case 0:
             setMouths(initMouths);
             _context4.t0 = setMouthHeight;
-            _context4.t1 = mouthLines(currentMouth);
+            _context4.t1 = monthLines;
             _context4.next = 5;
             return cellSize();
           case 5:
             _context4.t2 = _context4.sent;
             _context4.t3 = _context4.t1 * _context4.t2;
             (0, _context4.t0)(_context4.t3);
-            _context4.t4 = mouthLines(initMouths[0]);
+            _context4.t4 = monthLines;
             _context4.next = 11;
             return cellSize();
           case 11:
@@ -220,15 +222,15 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
         }
       }, _callee4);
     })));
-  }, [currentMouth]);
+  }, [currentMonth]);
   useEffect(function () {
-    if (mouth !== undefined) {
-      var newMouth = new Date(mouth.getFullYear(), mouth.getMonth(), 1);
-      if (currentMouth === null || !(currentMouth.getFullYear() === newMouth.getFullYear() && currentMouth.getMonth() === newMouth.getMonth())) {
-        setCurrentMouth(newMouth);
+    if (month !== undefined) {
+      var newMouth = dayjs(new Date(month.year(), month.month(), 1));
+      if (currentMonth === null || !(currentMonth !== null && currentMonth !== void 0 && currentMonth.isSame(newMouth, 'month'))) {
+        setCurrentMonth(newMouth);
       }
     }
-  }, [mouth]);
+  }, [month]);
   useEffect(function () {
     if (value !== undefined) {}
   }, [value]);
@@ -265,7 +267,7 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
               event.preventDefault();
               event.stopPropagation();
               if (!touching) {
-                _context5.next = 33;
+                _context5.next = 30;
                 break;
               }
               movePoint = {
@@ -291,38 +293,36 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
               }
               return _context5.abrupt("return");
             case 14:
-              console.log('move', movePoint.clientY - touchPoint.clientY);
+              // console.log('move', movePoint.clientY - touchPoint.clientY);
               newTranslateY = translateY + (movePoint.clientY - touchPoint.clientY);
               setTranslateY(newTranslateY);
               setTouchPoint(movePoint);
               // console.log(newTranslateY,minTranslateY())
               if (!(newTranslateY > -10)) {
-                _context5.next = 24;
+                _context5.next = 22;
                 break;
               }
-              //当向下滑动，顶部距离视窗顶部距离小于10，则插入上一个月份
-              console.log('insert');
-              _context5.next = 22;
+              _context5.next = 20;
               return handleInsertMouth();
-            case 22:
-              _context5.next = 33;
+            case 20:
+              _context5.next = 30;
               break;
-            case 24:
+            case 22:
               _context5.t4 = newTranslateY;
-              _context5.next = 27;
+              _context5.next = 25;
               return minTranslateY();
-            case 27:
+            case 25:
               _context5.t5 = _context5.sent;
               _context5.t6 = 0 - _context5.t5;
               _context5.t7 = _context5.t6 + 10;
               if (!(_context5.t4 < _context5.t7)) {
-                _context5.next = 33;
+                _context5.next = 30;
                 break;
               }
               //当向下滑动，底部距离视窗底部距离小于10，则追加下一个月份
-              console.log('append');
+              // console.log('append');
               handleAppendMouth();
-            case 33:
+            case 30:
             case "end":
               return _context5.stop();
           }
@@ -351,66 +351,67 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
               i = 0;
             case 6:
               if (!(i < mouths.length)) {
-                _context6.next = 40;
+                _context6.next = 28;
                 break;
               }
-              console.log('mouthHeight', mouthHeight);
-              console.log('mouths[i]', mouths[i], i);
-              _context6.t0 = mouthLines(mouths[i]);
-              _context6.next = 12;
+              _context6.t0 = monthLines;
+              _context6.next = 10;
               return cellSize();
-            case 12:
+            case 10:
               _context6.t1 = _context6.sent;
               _mouthHeight = _context6.t0 * _context6.t1;
               _mouthHeightSum += _mouthHeight;
-              console.log('_mouthHeightSum', _mouthHeightSum);
-              console.log('translateY', translateY);
+              // console.log('_mouthHeightSum', _mouthHeightSum);
+              // console.log('translateY', translateY);
               _topLineY = 0 - (_mouthHeightSum - _mouthHeight); //该月份区域顶部，对于顶点的偏移量
-              console.log('_topLineY', _topLineY);
+              // console.log('_topLineY', _topLineY);
               if (!(_topLineY <= translateY && _topLineY >= translateY - mouthHeight)) {
-                _context6.next = 27;
+                _context6.next = 19;
                 break;
               }
               //该月份区域的顶部在视窗内
-              console.log('top_in');
+              // console.log('top_in');
               _windowDisplayHeight = _mouthHeightSum - (0 - translateY); //该月份区域底部距离视窗顶部的距离
-              console.log('_windowDisplayHeight——top', _windowDisplayHeight);
+              // console.log('_windowDisplayHeight——top', _windowDisplayHeight);
               if (!(_windowDisplayHeight >= mouthHeight / 2)) {
-                _context6.next = 27;
+                _context6.next = 19;
                 break;
               }
-              console.log('displayMouth', mouths[i]);
+              // console.log('displayMouth', mouths[i]);
               displayMouth = mouths[i];
-              return _context6.abrupt("break", 40);
-            case 27:
+              return _context6.abrupt("break", 28);
+            case 19:
               _bottomLineY = 0 - _mouthHeightSum; //该月份区域底部，对于顶点的偏移量
-              console.log('_bottomLineY', _bottomLineY);
+              // console.log('_bottomLineY', _bottomLineY);
               if (!(_bottomLineY <= translateY && _bottomLineY >= translateY - mouthHeight)) {
-                _context6.next = 37;
+                _context6.next = 25;
                 break;
               }
               //该月份区域的底部在视窗内
-              console.log('bottom_in');
+              // console.log('bottom_in');
               _windowDisplayHeight2 = _mouthHeightSum - (0 - translateY); //该月份区域底部距离视窗顶部的距离
-              console.log('_windowDisplayHeight-bottom', _windowDisplayHeight2);
+              // console.log(
+              //   '_windowDisplayHeight-bottom',
+              //   _windowDisplayHeight,
+              // );
               if (!(_windowDisplayHeight2 >= mouthHeight / 2)) {
-                _context6.next = 37;
+                _context6.next = 25;
                 break;
               }
-              console.log('displayMouth', mouths[i]);
+              // console.log('displayMouth', mouths[i]);
               displayMouth = mouths[i];
-              return _context6.abrupt("break", 40);
-            case 37:
+              return _context6.abrupt("break", 28);
+            case 25:
               i++;
               _context6.next = 6;
               break;
-            case 40:
+            case 28:
               //endregion
               if (displayMouth) {
-                setCurrentMouth(displayMouth);
-                onMouthChange === null || onMouthChange === void 0 || onMouthChange(displayMouth);
+                setCurrentMonth(displayMouth);
+                onMonthChange === null || onMonthChange === void 0 || onMonthChange(displayMouth);
               }
-            case 41:
+            case 29:
             case "end":
               return _context6.stop();
           }
@@ -423,7 +424,7 @@ export var TouchableCalendarGrid = /*#__PURE__*/memo(function (_ref) {
   }, mouths.map(function (mouth, index) {
     return /*#__PURE__*/React.createElement(CalendarGrid, {
       key: index,
-      mouth: mouth,
+      month: mouth,
       value: value,
       defaultValue: defaultValue,
       onChange: onChange,

package/dist/CalendarDatetimePicker/CalendarDatetimePicker.d.ts

@@ -1,11 +1,11 @@
 import { FC } from 'react';
 import './style.scss';
+import dayjs from "dayjs";
 export type CalendarDatetimePickerProps = {
-    open?: boolean;
-    afterOpenChange?: (open: boolean) => void;
-    value?: Date;
-    onOk?: (value?: Date) => void;
-    onClose?: () => void;
+    placeholder?: string;
+    value?: dayjs.Dayjs | Date;
+    format?: string;
+    onChange?: (value?: dayjs.Dayjs) => void;
+    align?: 'left' | 'right' | 'center';
 };
 export declare const CalendarDatetimePicker: FC<CalendarDatetimePickerProps>;
-//# sourceMappingURL=CalendarDatetimePicker.d.ts.map

package/dist/CalendarDatetimePicker/CalendarDatetimePicker.js

@@ -1,181 +1,68 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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; }
 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; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { CustomWrapper } from '@tarojs/components';
-import Taro from '@tarojs/taro';
 import classNames from 'classnames';
-import React, { useEffect, useRef, useState } from 'react';
-import Calendar from "../Calendar";
-import ConfigProvider from "../ConfigProvider";
-import { useTaro } from "../hooks/useTaro";
-import PickerView from "../PickerView";
-import Popup from "../Popup";
-import { DatetimeUtils } from "../utils/datetime-utils";
-import { DateTimeSwitch } from "./DateTimeSwitch";
+import React, { useEffect, useState } from 'react';
 import "./style.scss";
-import { cls, Mode } from "./types";
+import { cls } from "./types";
+import CalendarDatetimePopup from "../CalendarDatetimePopup";
+import dayjs from "dayjs";
+import { isSame } from "../utils/dayjs";
 export var CalendarDatetimePicker = function CalendarDatetimePicker(_ref) {
-  var _bodyRef$current;
-  var open = _ref.open,
-    afterOpenChange = _ref.afterOpenChange,
-    _ref$value = _ref.value,
-    value = _ref$value === void 0 ? new Date() : _ref$value,
-    onOk = _ref.onOk,
-    _onClose = _ref.onClose;
-  var _ConfigProvider$useCo = ConfigProvider.useConfig(),
-    locale = _ConfigProvider$useCo.locale;
-  var _useTaro = useTaro(),
-    isTaroEnv = _useTaro.isTaroEnv,
-    isTaroWeApp = _useTaro.isTaroWeApp;
-  var _React$useState = React.useState(open || false),
+  var _ref$placeholder = _ref.placeholder,
+    placeholder = _ref$placeholder === void 0 ? '请选择' : _ref$placeholder,
+    value = _ref.value,
+    _ref$format = _ref.format,
+    format = _ref$format === void 0 ? 'YYYY-MM-DD HH:mm' : _ref$format,
+    onChange = _ref.onChange,
+    _ref$align = _ref.align,
+    align = _ref$align === void 0 ? 'left' : _ref$align;
+  var _React$useState = React.useState(false),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     innerOpen = _React$useState2[0],
     setInnerOpen = _React$useState2[1];
-  var _useState = useState(Mode.date),
+  var _useState = useState(value ? dayjs(value) : undefined),
     _useState2 = _slicedToArray(_useState, 2),
-    mode = _useState2[0],
-    setMode = _useState2[1];
-  var valueRef = useRef(value || new Date());
-  var bodyRef = useRef(null);
-  var datetimeSwitchRef = useRef();
-  var _useState3 = useState(300),
-    _useState4 = _slicedToArray(_useState3, 2),
-    bodyHeight = _useState4[0],
-    setBodyHeight = _useState4[1];
-  var handleClose = function handleClose() {
-    setInnerOpen(false);
-    _onClose === null || _onClose === void 0 || _onClose();
-  };
-  var handleOk = function handleOk() {
-    onOk === null || onOk === void 0 || onOk(valueRef.current);
-    handleClose();
-  };
-  var handleComputeBodyHeight = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!(isTaroEnv && isTaroWeApp)) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return", new Promise(function (resolve) {
-              Taro.createSelectorQuery().in(bodyRef.current.ctx).select(".".concat(cls, "-body")).boundingClientRect()
-              // .fields({ node: true, size: true })
-              .exec(function (res) {
-                var _res$;
-                console.log(res);
-                resolve(res === null || res === void 0 || (_res$ = res[0]) === null || _res$ === void 0 ? void 0 : _res$.height);
-              });
-            }));
-          case 2:
-            return _context.abrupt("return", Promise.resolve(bodyRef.current.offsetHeight));
-          case 3:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function handleComputeBodyHeight() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-  useEffect(function () {
-    afterOpenChange === null || afterOpenChange === void 0 || afterOpenChange(innerOpen);
-    if (!innerOpen) {
-      _onClose === null || _onClose === void 0 || _onClose();
+    internalValue = _useState2[0],
+    setInternalValue = _useState2[1];
+  var handleValueRender = function handleValueRender() {
+    if (internalValue) {
+      return internalValue.format(format);
     }
-  }, [innerOpen]);
+    return null;
+  };
   useEffect(function () {
-    if (open === undefined) {
+    if (value === undefined) {
       return;
     }
-    if (open === innerOpen) {
-      return;
+    if (!isSame(value, internalValue)) {
+      setInternalValue(dayjs(value));
     }
-    setInnerOpen(open);
-  }, [open]);
-  useEffect(function () {
-    if (datetimeSwitchRef.current) {
-      datetimeSwitchRef.current.setDatetime(valueRef.current);
-    }
-  }, []);
-  var bodyRender = function bodyRender() {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, mode === Mode.date && /*#__PURE__*/React.createElement("div", {
-      style: {}
-    }, /*#__PURE__*/React.createElement(Calendar, {
-      mouth: value,
-      value: value,
-      onChange: function onChange(date) {
-        var _datetimeSwitchRef$cu;
-        valueRef.current = new Date(date.getFullYear(), date.getMonth(), date.getDate(), valueRef.current.getHours(), valueRef.current.getMinutes());
-        (_datetimeSwitchRef$cu = datetimeSwitchRef.current) === null || _datetimeSwitchRef$cu === void 0 || _datetimeSwitchRef$cu.setDatetime(valueRef.current);
-      }
-    })), mode === Mode.time && /*#__PURE__*/React.createElement("div", {
-      style: {
-        height: bodyHeight
-      }
-    }, /*#__PURE__*/React.createElement(PickerView, {
-      columns: [Array(24).fill(0).map(function (_, i) {
-        return {
-          label: "".concat(DatetimeUtils.twoDigits(i)),
-          value: "".concat(i)
-        };
-      }), Array(60).fill(0).map(function (_, i) {
-        return {
-          label: "".concat(DatetimeUtils.twoDigits(i)),
-          value: "".concat(i)
-        };
-      })],
-      labelInValue: false,
-      value: ["".concat(valueRef === null || valueRef === void 0 ? void 0 : valueRef.current.getHours()), "".concat(valueRef === null || valueRef === void 0 ? void 0 : valueRef.current.getMinutes())],
-      onChange: function onChange(v) {
-        var _datetimeSwitchRef$cu2;
-        valueRef.current = new Date(valueRef.current.getFullYear(), valueRef.current.getMonth(), valueRef.current.getDate(), v[0], v[1]);
-        (_datetimeSwitchRef$cu2 = datetimeSwitchRef.current) === null || _datetimeSwitchRef$cu2 === void 0 || _datetimeSwitchRef$cu2.setDatetime(valueRef.current);
-      }
-    })));
-  };
-  return /*#__PURE__*/React.createElement(Popup, {
+  }, [value]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CalendarDatetimePopup, {
     open: innerOpen,
+    value: internalValue || dayjs(),
     onClose: function onClose() {
       setInnerOpen(false);
-      _onClose === null || _onClose === void 0 || _onClose();
-    }
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classNames(cls)
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls, "-header")
-  }, /*#__PURE__*/React.createElement(DateTimeSwitch, {
-    ref: datetimeSwitchRef,
-    mode: mode,
-    value: valueRef.current,
-    onDateTabTap: function onDateTabTap() {
-      return setMode(Mode.date);
     },
-    onTimeTabTap: function onTimeTabTap() {
-      handleComputeBodyHeight().then(function (height) {
-        setBodyHeight(height);
-        setMode(Mode.time);
-      });
+    onOk: function onOk(date) {
+      setInternalValue(date);
+      setInnerOpen(false);
+      onChange === null || onChange === void 0 || onChange(date);
+    }
+  }), /*#__PURE__*/React.createElement("div", {
+    className: classNames(cls, _defineProperty({}, "".concat(cls, "-").concat(align), true)),
+    onClick: function onClick() {
+      setInnerOpen(true);
     }
-  }), /*#__PURE__*/React.createElement("a", {
-    className: classNames("".concat(cls, "-header-button"), "".concat(cls, "-header-button-ok")),
-    onClick: handleOk
-  }, locale.common.confirm)), isTaroEnv ? /*#__PURE__*/React.createElement(CustomWrapper, {
-    ref: bodyRef
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls, "-body")
-  }, bodyRender())) : /*#__PURE__*/React.createElement("div", {
-    className: "".concat(cls, "-body"),
-    ref: bodyRef,
-    id: (_bodyRef$current = bodyRef.current) === null || _bodyRef$current === void 0 ? void 0 : _bodyRef$current.uid
-  }, bodyRender())));
+  }, !internalValue ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(cls, "-placeholder")
+  }, placeholder) : /*#__PURE__*/React.createElement("div", null, handleValueRender())));
 };

package/dist/CalendarDatetimePicker/index.d.ts

@@ -1,4 +1,3 @@
 import { CalendarDatetimePicker, CalendarDatetimePickerProps } from "./CalendarDatetimePicker";
 export type { CalendarDatetimePickerProps };
 export default CalendarDatetimePicker;
-//# sourceMappingURL=index.d.ts.map