@seafile/seafile-calendar 0.1.3-beta.1 → 0.1.3-beta.2

package/es/calendar/CalendarRightPanel.js

@@ -3,8 +3,6 @@ import _possibleConstructorReturn from 'babel-runtime/helpers/possibleConstructo
 import _inherits from 'babel-runtime/helpers/inherits';
 import React from 'react';
 import PropTypes from 'prop-types';
-import dayjs from 'dayjs';
-import { tokenizeFormattedDate } from '../util';
 
 var CalendarRightPanel = function (_React$Component) {
   _inherits(CalendarRightPanel, _React$Component);
@@ -69,7 +67,6 @@ var CalendarRightPanel = function (_React$Component) {
         prefixCls = _props.prefixCls,
         locale = _props.locale;
 
-    var selectedDate = value.format().slice(0, String(value.format()).indexOf('T'));
     var highlight = this.state.highlightTime;
     var highlightTime = highlight ? highlight.format().slice(11, 16) : null;
     var isZhcn = locale && locale.today === '今天';
@@ -88,8 +85,11 @@ var CalendarRightPanel = function (_React$Component) {
           'ul',
           null,
           this.times.map(function (time) {
-            var parts = tokenizeFormattedDate(selectedDate, _this2.state.localeFormat);
-            var current = dayjs(selectedDate + ' ' + time).year(parts[0]).month(parts[1] - 1).date(parts[2]); // eslint-disable-line max-len
+            var _time$split = time.split(':'),
+                hour = _time$split[0],
+                minute = _time$split[1];
+
+            var current = value.clone().hour(parseInt(hour, 10)).minute(parseInt(minute, 10)).second(0);
             current = isZhcn ? current.locale('zh-cn') : current.locale('en-gb');
             return React.createElement(
               'li',

package/es/util/index.js

@@ -192,11 +192,12 @@ export function hasSpecialChar(str) {
 }
 
 export function validateTime(inputTime) {
+  console.log('validateTime inputTime1:', inputTime);
   if (!inputTime || typeof inputTime !== 'string') {
     return getCurrentTime();
   }
   var trimmed = inputTime.trim();
-  var timeRegex = /^(\d{2}):(\d{2})$/;
+  var timeRegex = /^(\d{1,2}):(\d{1,2})$/;
   var match = trimmed.match(timeRegex);
   if (!match) {
     return getCurrentTime();
@@ -206,7 +207,9 @@ export function validateTime(inputTime) {
   if (hour > 23 || minute > 59) {
     return getCurrentTime();
   }
-  return match[1] + ':' + match[2];
+  var h = String(hour).padStart(2, '0');
+  var m = String(minute).padStart(2, '0');
+  return h + ':' + m;
 }
 
 export function delimate(format) {

package/lib/calendar/CalendarRightPanel.js

@@ -22,12 +22,6 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
-var _dayjs = require('dayjs');
-
-var _dayjs2 = _interopRequireDefault(_dayjs);
-
-var _util = require('../util');
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var CalendarRightPanel = function (_React$Component) {
@@ -93,7 +87,6 @@ var CalendarRightPanel = function (_React$Component) {
         prefixCls = _props.prefixCls,
         locale = _props.locale;
 
-    var selectedDate = value.format().slice(0, String(value.format()).indexOf('T'));
     var highlight = this.state.highlightTime;
     var highlightTime = highlight ? highlight.format().slice(11, 16) : null;
     var isZhcn = locale && locale.today === '今天';
@@ -112,8 +105,11 @@ var CalendarRightPanel = function (_React$Component) {
           'ul',
           null,
           this.times.map(function (time) {
-            var parts = (0, _util.tokenizeFormattedDate)(selectedDate, _this2.state.localeFormat);
-            var current = (0, _dayjs2['default'])(selectedDate + ' ' + time).year(parts[0]).month(parts[1] - 1).date(parts[2]); // eslint-disable-line max-len
+            var _time$split = time.split(':'),
+                hour = _time$split[0],
+                minute = _time$split[1];
+
+            var current = value.clone().hour(parseInt(hour, 10)).minute(parseInt(minute, 10)).second(0);
             current = isZhcn ? current.locale('zh-cn') : current.locale('en-gb');
             return _react2['default'].createElement(
               'li',

package/lib/util/index.js

@@ -227,11 +227,12 @@ function hasSpecialChar(str) {
 }
 
 function validateTime(inputTime) {
+  console.log('validateTime inputTime1:', inputTime);
   if (!inputTime || typeof inputTime !== 'string') {
     return getCurrentTime();
   }
   var trimmed = inputTime.trim();
-  var timeRegex = /^(\d{2}):(\d{2})$/;
+  var timeRegex = /^(\d{1,2}):(\d{1,2})$/;
   var match = trimmed.match(timeRegex);
   if (!match) {
     return getCurrentTime();
@@ -241,7 +242,9 @@ function validateTime(inputTime) {
   if (hour > 23 || minute > 59) {
     return getCurrentTime();
   }
-  return match[1] + ':' + match[2];
+  var h = String(hour).padStart(2, '0');
+  var m = String(minute).padStart(2, '0');
+  return h + ':' + m;
 }
 
 function delimate(format) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-calendar",
-  "version": "0.1.3-beta.1",
+  "version": "0.1.3-beta.2",
   "description": "React Calendar",
   "keywords": [
     "react",