Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#9529 A Text input field with Numeric mask ignores the maxLength restriction #9548

Merged
merged 1 commit into from
Mar 4, 2025
Merged

#9529 A Text input field with Numeric mask ignores the maxLength restriction #9548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions functionalTests/questions/input_mask.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,37 @@ frameworks.forEach((framework) => {
.expect(Selector("input").value).eql(emptyValue);
});

test("mask and maxlength", async (t) => {
await initSurvey(framework, {
focusFirstQuestionAutomatic: true,
"pages": [
{
"name": "page1",
"elements": [
{
"type": "text",
"name": "question1",
"maskType": "numeric",
"maxLength": 2
}
]
}
]
});

await t
.expect(Selector("input").value).eql("")

.pressKey("1")
.expect(Selector("input").value).eql("1")

.pressKey("2")
.expect(Selector("input").value).eql("12")

.pressKey("3")
.expect(Selector("input").value).eql("12");
});

test("Test mask in western timezone", async (t) => {
if (framework === "vue") return;
const oldTimeZone = await getTimeZone();
Expand Down
14 changes: 10 additions & 4 deletions packages/survey-core/src/mask/input_element_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@ import { ITextInputParams } from "./mask_utils";
export class InputElementAdapter {
private prevUnmaskedValue: string = undefined;

private setInputValue(value: string) {
if (this.inputElement.maxLength >= 0 && this.inputElement.maxLength < value.length) {
value = value.slice(0, this.inputElement.maxLength);
}
this.inputElement.value = value;
}
constructor(private inputMaskInstance: InputMaskBase, private inputElement: HTMLInputElement, value?: any) {
let _value: any = value;
if (_value === null || _value === undefined) {
_value = "";
}
this.inputElement.value = inputMaskInstance.getMaskedValue(_value);
this.setInputValue(inputMaskInstance.getMaskedValue(_value));
this.prevUnmaskedValue = _value;

inputMaskInstance.onPropertyChanged.add(this.inputMaskInstancePropertyChangedHandler);
Expand All @@ -19,7 +25,7 @@ export class InputElementAdapter {
inputMaskInstancePropertyChangedHandler = (sender: any, options: any) => {
if (options.name !== "saveMaskedValue") {
const maskedValue = this.inputMaskInstance.getMaskedValue(this.prevUnmaskedValue);
this.inputElement.value = maskedValue;
this.setInputValue(maskedValue);
}
}

Expand All @@ -32,7 +38,7 @@ export class InputElementAdapter {
beforeInputHandler = (event: any) => {
const args = this.createArgs(event);
const result = this.inputMaskInstance.processInput(args);
this.inputElement.value = result.value;
this.setInputValue(result.value);
this.inputElement.setSelectionRange(result.caretPosition, result.caretPosition);
if (!result.cancelPreventDefault) {
event.preventDefault();
Expand All @@ -41,7 +47,7 @@ export class InputElementAdapter {

changeHandler = (event: any) => {
const result = this.inputMaskInstance.processInput({ prevValue: "", insertedChars: event.target.value, selectionStart: 0, selectionEnd: 0 });
this.inputElement.value = result.value;
this.setInputValue(result.value);
}

public createArgs(event: any): ITextInputParams {
Expand Down