work for #4842

surveyjs · Feb 7, 2024 · 9bdce6d · 9bdce6d
1 parent 19cd675
commit 9bdce6d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/mask/mask_manager.ts b/src/mask/mask_manager.ts
@@ -37,7 +37,7 @@ export class MaskManagerType {
     return new InputMaskBase(maskOption);
   }
   public getAllTypes(): Array<string> {
-    var result = new Array<string>();
+    var result = ["none"];
     for (var key in this.creatorHash) {
       result.push(key);
     }

diff --git a/src/mask/mask_number.ts b/src/mask/mask_number.ts
@@ -212,7 +212,7 @@ export class InputMaskNumber extends InputMaskBase {
   }
 
   public getNumberMaskedValue(src: string | number, matchWholeMask: boolean = false): string {
-    const input = src.toString();
+    const input = (src === undefined || src === null) ? "" : src.toString();
     const parsedNumber = this.parseNumber(input);
     const displayText = this.displayNumber(parsedNumber, true, matchWholeMask);
     return displayText;

diff --git a/src/mask/mask_pattern.ts b/src/mask/mask_pattern.ts
@@ -39,7 +39,8 @@ function getFirstMatch(str: string, strIndex: number, literal: IMaskLiteral): nu
   return strIndex;
 }
 
-export function getMaskedValueByPattern(str: string, pattern: string | Array<IMaskLiteral>, matchWholeMask:boolean): string {
+export function getMaskedValueByPattern(src: string, pattern: string | Array<IMaskLiteral>, matchWholeMask:boolean): string {
+  const input = (src === undefined || src === null) ? "" : src;
   let result = "";
   let strIndex = 0;
   const literals: Array<IMaskLiteral> = (typeof pattern === "string") ? getLiterals(pattern) : pattern;
@@ -48,11 +49,11 @@ export function getMaskedValueByPattern(str: string, pattern: string | Array<IMa
   for(let maskIndex = 0; maskIndex < literals.length; maskIndex++) {
     switch(literals[maskIndex].type) {
       case "regex" :
-        if(strIndex < str.length) {
-          strIndex = getFirstMatch(str, strIndex, literals[maskIndex]);
+        if(strIndex < input.length) {
+          strIndex = getFirstMatch(input, strIndex, literals[maskIndex]);
         }
-        if(strIndex < str.length) {
-          result += str[strIndex];
+        if(strIndex < input.length) {
+          result += input[strIndex];
         } else if(matchWholeMask) {
           result += settings.placeholderChar;
         } else {
@@ -65,7 +66,7 @@ export function getMaskedValueByPattern(str: string, pattern: string | Array<IMa
       case "const":
       case "fixed":
         result += literals[maskIndex].value;
-        if(literals[maskIndex].value === str[strIndex]) {
+        if(literals[maskIndex].value === input[strIndex]) {
           strIndex++;
         }
         break;

diff --git a/src/mask/mask_settings.ts b/src/mask/mask_settings.ts
@@ -88,7 +88,12 @@ Serializer.addClass(
     },
     { name: "dataToSave",
       choices: ["masked", "unmasked"],
-      defaultValue: "unmasked"
+      defaultValue: "unmasked",
+      dependsOn: "type",
+      visibleIf: function(obj: any) {
+        if (!obj) return false;
+        return obj.type !== "none";
+      },
     },
     { name: "allowNegative:boolean",
       dependsOn: "type",