Skip to content

Commit b114355

Browse files
committed
Feilmelding med varseltrekant for custom-komponenter
1 parent 6ebbb4c commit b114355

File tree

4 files changed

+36
-3
lines changed

4 files changed

+36
-3
lines changed

Diff for: frontend/frontend-common/components/SokeSelect.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import classnames from "classnames";
33
import { Ref } from "react";
44
import ReactSelect from "react-select";
55
import Select from "react-select/base";
6+
import { FeilmeldingMedVarselTrekant } from "../../mr-admin-flate/src/components/skjema/FeilmeldingMedVarseltrekant";
67

78
export interface SelectOption<T = string> {
89
value: T;
@@ -148,7 +149,7 @@ export function SokeSelect<T>(props: SelectProps<T> & { childRef?: Ref<Select<Se
148149
fontSize: size === "small" ? "16px" : "18px",
149150
}}
150151
>
151-
<b>{error.message}</b>
152+
<FeilmeldingMedVarselTrekant>{error.message}</FeilmeldingMedVarselTrekant>
152153
</div>
153154
)}
154155
</div>

Diff for: frontend/mr-admin-flate/src/components/portableText/PortableTextEditor.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { withHistory } from "slate-history";
1010
import { Editable, Slate, useSlate, withReact } from "slate-react";
1111
import { portableTextToSlate } from "./portableTextToSlate";
1212
import { slateToPortableText } from "./slateToPortableText";
13+
import { FeilmeldingMedVarselTrekant } from "../skjema/FeilmeldingMedVarseltrekant";
1314

1415
const HOTKEYS: {
1516
[name: string]: string;
@@ -157,7 +158,7 @@ function PortableTextEditor(props: PortableTextEditorProps, _: ForwardedRef<HTML
157158
</Slate>
158159
{error && (
159160
<div className="mt-[8px] text-nav-red">
160-
<b>{error.message}</b>
161+
<FeilmeldingMedVarselTrekant>{error.message}</FeilmeldingMedVarselTrekant>
161162
</div>
162163
)}
163164
</div>

Diff for: frontend/mr-admin-flate/src/components/skjema/ControlledMultiSelect.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { MultiSelect } from "./MultiSelect";
55
import { SelectOption } from "@mr/frontend-common/components/SokeSelect";
66
import { HelpText } from "@navikt/ds-react";
77
import { shallowEquals } from "@mr/frontend-common";
8+
import { FeilmeldingMedVarselTrekant } from "./FeilmeldingMedVarseltrekant";
89

910
export interface MultiSelectProps<T> {
1011
label: string;
@@ -94,7 +95,7 @@ function ControlledMultiSelect<T>(props: MultiSelectProps<T>, _: ForwardedRef<HT
9495
fontSize: size === "small" ? "16px" : "18px",
9596
}}
9697
>
97-
<b>{error.message}</b>
98+
<FeilmeldingMedVarselTrekant>{error.message}</FeilmeldingMedVarselTrekant>
9899
</div>
99100
)}
100101
</>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import { ReactNode } from "react";
2+
3+
export function FeilmeldingMedVarselTrekant({ children }: { children: ReactNode }) {
4+
return (
5+
<b className="flex items-center gap-2">
6+
<Varseltrekant /> {children}
7+
</b>
8+
);
9+
}
10+
11+
function Varseltrekant() {
12+
return (
13+
<svg
14+
viewBox="0 0 17 16"
15+
fill="none"
16+
xmlns="http://www.w3.org/2000/svg"
17+
focusable="false"
18+
aria-hidden="true"
19+
width={"1em"}
20+
height={"1em"}
21+
>
22+
<path
23+
fill-rule="evenodd"
24+
clip-rule="evenodd"
25+
d="M3.49209 11.534L8.11398 2.7594C8.48895 2.04752 9.50833 2.04743 9.88343 2.75924L14.5073 11.5339C14.8582 12.1998 14.3753 13 13.6226 13H4.37685C3.6242 13 3.14132 12.1999 3.49209 11.534ZM9.74855 10.495C9.74855 10.9092 9.41276 11.245 8.99855 11.245C8.58433 11.245 8.24855 10.9092 8.24855 10.495C8.24855 10.0808 8.58433 9.74497 8.99855 9.74497C9.41276 9.74497 9.74855 10.0808 9.74855 10.495ZM9.49988 5.49997C9.49988 5.22383 9.27602 4.99997 8.99988 4.99997C8.72373 4.99997 8.49988 5.22383 8.49988 5.49997V7.99997C8.49988 8.27611 8.72373 8.49997 8.99988 8.49997C9.27602 8.49997 9.49988 8.27611 9.49988 7.99997V5.49997Z"
26+
fill="currentColor"
27+
></path>
28+
</svg>
29+
);
30+
}

0 commit comments

Comments
 (0)