Skip to content

Commit

Permalink
feat(familielesefelt, familieradiogruppe, familieselect, familietexta…
Browse files Browse the repository at this point in the history
…rea): sletter FamilieLesefelt (#1514)

sletter FamilieLesefelt, bruk Label og Bodyshort fra designsystemet i stedet

BREAKING CHANGE: sletter FamilieLesefelt, bruk Label og Bodyshort fra designsystemet i stedet
  • Loading branch information
ViktorGSolberg authored Jul 1, 2024
1 parent 60efe60 commit b3a6daf
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 58 deletions.
1 change: 0 additions & 1 deletion packages/familie-form-elements/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export * from './knapp';
export * from './lesefelt';
export * from './måned-år-velger';
export * from './radiogruppe';
export * from './select';
Expand Down
18 changes: 0 additions & 18 deletions packages/familie-form-elements/src/lesefelt/FamilieLesefelt.tsx

This file was deleted.

1 change: 0 additions & 1 deletion packages/familie-form-elements/src/lesefelt/index.ts

This file was deleted.

19 changes: 0 additions & 19 deletions packages/familie-form-elements/src/lesefelt/lesefelt.stories.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import { RadioGroup, RadioGroupProps } from '@navikt/ds-react';
import { FamilieLesefelt } from '../lesefelt';
import { BodyShort, Label, RadioGroup, RadioGroupProps } from '@navikt/ds-react';

export interface IRadioGruppeProps extends RadioGroupProps {
erLesevisning: boolean;
Expand All @@ -14,7 +13,10 @@ export const FamilieRadioGruppe: React.FC<IRadioGruppeProps> = ({
...props
}) => {
return erLesevisning ? (
<FamilieLesefelt className={className} label={legend} verdi={value} {...props} />
<div className={className}>
{legend && <Label>{legend}</Label>}
<BodyShort>{value}</BodyShort>
</div>
) : (
<RadioGroup className={className} value={value} legend={legend} {...props}>
{children}
Expand Down
13 changes: 5 additions & 8 deletions packages/familie-form-elements/src/select/FamilieSelect.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import { Select, SelectProps } from '@navikt/ds-react';
import { FamilieLesefelt } from '../lesefelt';
import { BodyShort, Label, Select, SelectProps } from '@navikt/ds-react';

export interface IFamilieSelectProps extends SelectProps {
erLesevisning?: boolean;
Expand All @@ -19,12 +18,10 @@ export const FamilieSelect: React.FC<IFamilieSelectProps> = ({
...props
}) => {
return erLesevisning ? (
<FamilieLesefelt
label={!hideLabel && label}
verdi={lesevisningVerdi ? lesevisningVerdi : value}
className={className}
size={size}
/>
<div className={className}>
{!hideLabel && label && <Label size={size}>{label}</Label>}
<BodyShort size={size}>{lesevisningVerdi ? lesevisningVerdi : value}</BodyShort>
</div>
) : (
<Select
className={className}
Expand Down
13 changes: 5 additions & 8 deletions packages/familie-form-elements/src/textarea/FamilieTextarea.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import { Textarea, TextareaProps } from '@navikt/ds-react';
import { FamilieLesefelt } from '../lesefelt';
import { BodyShort, Label, Textarea, TextareaProps } from '@navikt/ds-react';

export interface IFamilieTextareaProps extends TextareaProps {
erLesevisning: boolean;
Expand All @@ -18,12 +17,10 @@ export const FamilieTextarea: React.FC<IFamilieTextareaProps> = ({
...props
}) => {
return erLesevisning ? (
<FamilieLesefelt
className={className}
label={label}
verdi={value === '' ? tekstLesevisning : value}
size={size}
/>
<div className={className}>
{label && <Label size={size}>{label}</Label>}
<BodyShort size={size}>{value === '' ? tekstLesevisning : value}</BodyShort>
</div>
) : (
<Textarea className={className} label={label} value={value} size={size} {...props}>
{children}
Expand Down

0 comments on commit b3a6daf

Please sign in to comment.