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

Jump to bottom

Slightly Improved phone validator. #115

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Slightly Improved phone validator. #115

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
2 changes: 1 addition & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ export class MvcValidationProviders {
return false;
}

let r = /^\+?[0-9\-\s]+$/;
let r = element.pattern ? new RegExp(element.pattern) : /^\+?[0-9\-\s]+$/;
Copy link
Owner

@haacked haacked Jun 2, 2024 •
edited by dahlbyk
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it should be:

Suggested change
let r = element.pattern ? new RegExp(element.pattern) : /^\+?[0-9\-\s]+$/;
let pattern = element.getAttribute('pattern');
let r = pattern ? new RegExp(pattern) : /^\+?[0-9\-\s]+$/;

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But why is it trying to get the pattern attribute from a select?

Property 'pattern' does not exist on type 'HTMLSelectElement'.

Because element: ValidatableElement and only HTMLInputElement has pattern:

aspnet-client-validation/src/index.ts

Line 32 in 061c242

export type ValidatableElement = HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement;

The getAttribute solution works, but you can make TS happy with either:

Suggested change
let r = element.pattern ? new RegExp(element.pattern) : /^\+?[0-9\-\s]+$/;
let r = 'pattern' in element && element.pattern ? new RegExp(element.pattern) : /^\+?[0-9\-\s]+$/;

or

Suggested change
let r = element.pattern ? new RegExp(element.pattern) : /^\+?[0-9\-\s]+$/;
let r = element instanceof HTMLInputElement && element.pattern ? new RegExp(element.pattern) : /^\+?[0-9\-\s]+$/;

While we're in the area, it could be handy to assign/use the default pattern as something like static phonePattern to allow overriding everywhere by assigning MvcValidationProviders.phonePattern.

return r.test(value);
}

Expand Down
Loading