@maskito/kit - npm Package Compare versions

Comparing version 0.12.0 to 0.12.1

index.esm.js

@@ -787,2 +787,3 @@ import { MASKITO_DEFAULT_OPTIONS, maskitoPipe } from '@maskito/core';
 
+const TRAILING_TIME_SEGMENT_SEPARATOR_REG = new RegExp(`[${TIME_FIXED_CHARACTERS.map(escapeRegExp).join('')}]$`);
 function validateTimeString({
@@ -822,4 +823,5 @@ timeString,
 
-  const validatedTimeString = toTimeString(validatedTimeSegments);
-  const addedDateSegmentSeparators = validatedTimeString.length - timeString.length;
+  const [trailingSegmentSeparator = ''] = timeString.match(TRAILING_TIME_SEGMENT_SEPARATOR_REG) || [];
+  const validatedTimeString = toTimeString(validatedTimeSegments) + trailingSegmentSeparator;
+  const addedDateSegmentSeparators = Math.max(validatedTimeString.length - timeString.length, 0);
   return {
@@ -856,3 +858,12 @@ validatedTimeString,
       const fixedDate = raiseSegmentValueToMin(parsedDate, dateModeTemplate);
-      const fixedValue = toDateString(Object.assign(Object.assign({}, fixedDate), parsedTime), dateModeTemplate, timeMode);
+      const {
+        year,
+        month,
+        day
+      } = isDateStringComplete(dateString, dateModeTemplate) ? dateToSegments(clamp(segmentsToDate(fixedDate), min, max)) : fixedDate;
+      const fixedValue = toDateString(Object.assign({
+        year,
+        month,
+        day
+      }, parsedTime), dateModeTemplate, timeMode);
       const tail = value.slice(fixedValue.length);
@@ -879,2 +890,3 @@ return {
 }) {
+  const invalidCharsRegExp = new RegExp(`[^\\d${TIME_FIXED_CHARACTERS.map(escapeRegExp).join('')}${escapeRegExp(dateSegmentsSeparator)}]+`);
   return ({
@@ -903,3 +915,3 @@ elementState,
 
-    const newCharacters = data.replace(new RegExp(`[^\\d${escapeRegExp(dateSegmentsSeparator)}]`, 'g'), '');
+    const newCharacters = data.replace(invalidCharsRegExp, '');
 
@@ -1379,2 +1391,3 @@ if (!newCharacters) {
   const paddedMaxValues = padTimeSegments(timeSegmentMaxValues);
+  const invalidCharsRegExp = new RegExp(`[^\\d${TIME_FIXED_CHARACTERS.map(escapeRegExp).join('')}]+`);
   return ({
@@ -1415,3 +1428,3 @@ elementState,
 
-    const newCharacters = data.replace(/\D+/g, '');
+    const newCharacters = data.replace(invalidCharsRegExp, '');
     const [from, rawTo] = selection;
@@ -1418,0 +1431,0 @@ let to = rawTo + newCharacters.length; // to be conformed with `overwriteMode: replace`

index.umd.js

@@ -902,2 +902,3 @@ (function (global, factory) {
 
+    var TRAILING_TIME_SEGMENT_SEPARATOR_REG = new RegExp("[" + TIME_FIXED_CHARACTERS.map(escapeRegExp).join('') + "]$");
     function validateTimeString(_a) {
@@ -941,4 +942,6 @@ var timeString = _a.timeString,
 
-      var validatedTimeString = toTimeString(validatedTimeSegments);
-      var addedDateSegmentSeparators = validatedTimeString.length - timeString.length;
+      var _e = (timeString.match(TRAILING_TIME_SEGMENT_SEPARATOR_REG) || [])[0],
+          trailingSegmentSeparator = _e === void 0 ? '' : _e;
+      var validatedTimeString = toTimeString(validatedTimeSegments) + trailingSegmentSeparator;
+      var addedDateSegmentSeparators = Math.max(validatedTimeString.length - timeString.length, 0);
       return {
@@ -981,3 +984,13 @@ validatedTimeString: validatedTimeString,
           var fixedDate = raiseSegmentValueToMin(parsedDate, dateModeTemplate);
-          var fixedValue = toDateString(__assign(__assign({}, fixedDate), parsedTime), dateModeTemplate, timeMode);
+
+          var _c = isDateStringComplete(dateString, dateModeTemplate) ? dateToSegments(clamp(segmentsToDate(fixedDate), min, max)) : fixedDate,
+              year = _c.year,
+              month = _c.month,
+              day = _c.day;
+
+          var fixedValue = toDateString(__assign({
+            year: year,
+            month: month,
+            day: day
+          }, parsedTime), dateModeTemplate, timeMode);
           var tail = value.slice(fixedValue.length);
@@ -1003,2 +1016,3 @@ return {
           dateSegmentsSeparator = _a.dateSegmentsSeparator;
+      var invalidCharsRegExp = new RegExp("[^\\d" + TIME_FIXED_CHARACTERS.map(escapeRegExp).join('') + escapeRegExp(dateSegmentsSeparator) + "]+");
       return function (_a) {
@@ -1024,3 +1038,3 @@ var elementState = _a.elementState,
 
-        var newCharacters = data.replace(new RegExp("[^\\d" + escapeRegExp(dateSegmentsSeparator) + "]", 'g'), '');
+        var newCharacters = data.replace(invalidCharsRegExp, '');
 
@@ -1540,2 +1554,3 @@ if (!newCharacters) {
       var paddedMaxValues = padTimeSegments(timeSegmentMaxValues);
+      var invalidCharsRegExp = new RegExp("[^\\d" + TIME_FIXED_CHARACTERS.map(escapeRegExp).join('') + "]+");
       return function (_a, actionType) {
@@ -1574,3 +1589,3 @@ var elementState = _a.elementState,
 
-        var newCharacters = data.replace(/\D+/g, '');
+        var newCharacters = data.replace(invalidCharsRegExp, '');
         var from = selection[0],
@@ -1577,0 +1592,0 @@ rawTo = selection[1];

package.json

 {
   "name": "@maskito/kit",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "The optional framework-agnostic Maskito's package with ready-to-use masks",
@@ -33,3 +33,3 @@ "keywords": [
   "peerDependencies": {
-    "@maskito/core": "^0.12.0"
+    "@maskito/core": "^0.12.1"
   },
@@ -36,0 +36,0 @@ "main": "./index.umd.js",

No alert changes

Improved metrics

Total package byte prevSize

160113

increased by0.95%

Lines of code

3132

increased by0.84%

No dependency changes