Skip to content

Commit 59a6644

Browse files
committed
Cleanup
1 parent f88855d commit 59a6644

File tree

2 files changed

+2
-26
lines changed

2 files changed

+2
-26
lines changed

apps/omsorgspengesoknad/src/app/søknad/steps/om-barnet/spørsmål/HøyereRisikoForFraværBeskrivelseSpørsmål.tsx

+2-5
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,13 @@ const HøyereRisikoForFraværBeskrivelseSpørsmål = () => {
1818
return (
1919
<Textarea
2020
name={OmBarnetFormFields.høyereRisikoForFraværBeskrivelse}
21-
validate={async (value) => {
21+
validate={(value) => {
2222
const error = getStringValidator({
2323
required: true,
2424
minLength: 5,
2525
maxLength: 1000,
26-
noUnicodeCharacters: true,
2726
})(value);
28-
if (error) {
29-
return error;
30-
}
27+
return error;
3128
}}
3229
maxLength={1000}
3330
label={text('steg.omBarnet.spm.høyereRisikoForFraværBeskrivelse.label')}

packages/sif-validation/src/getStringValidator.ts

-21
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,13 @@ interface Options {
2828
minLength?: number;
2929
maxLength?: number;
3030
formatRegExp?: RegExp;
31-
noUnicodeCharacters?: boolean;
32-
/** Deprecated */
3331
disallowUnicodeCharacters?: boolean;
3432
}
3533

3634
const containsNonLatinCodepoints = (s: string): boolean => {
3735
return /[^u0000-\u00ff\s]/.test(s);
3836
};
3937

40-
const containsUnwantedCharacters = (s: string): boolean => {
41-
return /[^\p{L}\p{N}\p{P}\p{Z}\p{M}«»§\n\r~]/gu.test(s);
42-
// return /^[\p{L}\p{N}\p{P}\p{Z}\p{M}«»§]+$/u.test(s) === false; // /^[A-Za-z0-9\u00C0-\u024F\u1E00-\u1EFF\s\p{Pd}\p{Ps}\p{Pe}«»"§]+$/u.test(s) === false;
43-
};
44-
45-
const supportsUnicodeRegex = (() => {
46-
try {
47-
new RegExp('\\p{L}', 'u');
48-
return true;
49-
} catch {
50-
return false;
51-
}
52-
})();
53-
5438
const getStringValidator =
5539
(options: Options = {}): ValidationFunction<StringValidationResult> =>
5640
(value: any) => {
@@ -77,11 +61,6 @@ const getStringValidator =
7761
return ValidateStringError.stringHasInvalidFormat;
7862
}
7963
}
80-
if (options.noUnicodeCharacters) {
81-
if (supportsUnicodeRegex && containsUnwantedCharacters(value)) {
82-
return ValidateStringError.stringContainsUnicodeChacters;
83-
}
84-
}
8564
if (options.disallowUnicodeCharacters) {
8665
if (containsNonLatinCodepoints(value)) {
8766
return ValidateStringError.stringContainsUnicodeChacters;

0 commit comments

Comments
 (0)