Skip to content

Commit 09cc28b

Browse files
author
Joakim Lindquister
committed
Legg til ekspanderbart nedtrekkspanel for visittkort
Det er dratt inn fra nav-frontend-moduler. Per nå så opplever jeg litt krøll med komponenten, sannsynligvis fordi den ikke er skrevet i React. InteliJ rapporterer at 'EkspanderbartpanelBase does not have any construct or call signature'. Det funker fint å kompilere og kjøre, men skriptet feiler ved hot-reload av visittkort-komponenten. Det kan være relatert til denne: microsoft/TypeScript#14558. Denne har blitt merget inn i master, men er ikke ute i en release enda. Det eksisterer også en PR i nav-frontend på å skrive om panelet til typecript som forhåpentligvis vil løse problemet: navikt/aksel#233
1 parent 0dce895 commit 09cc28b

File tree

7 files changed

+89
-4
lines changed

7 files changed

+89
-4
lines changed

package-lock.json

Lines changed: 45 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,23 @@
55
"dependencies": {
66
"@types/storybook__react": "^3.0.7",
77
"classnames": "^2.2.5",
8-
"lodash.throttle": "^4.1.1",
98
"copyfiles": "^1.2.0",
9+
"lodash.throttle": "^4.1.1",
10+
"nav-frontend-chevron-style": "^0.3.4",
1011
"nav-frontend-core": "^4.0.5",
12+
"nav-frontend-ekspanderbartpanel": "0.2.21",
13+
"nav-frontend-ekspanderbartpanel-style": "0.3.8",
1114
"nav-frontend-js-utils": "^1.0.3",
1215
"nav-frontend-knapper": "^1.0.3",
1316
"nav-frontend-knapper-style": "^0.3.6",
17+
"nav-frontend-paneler-style": "^0.3.7",
1418
"nav-frontend-typografi": "^2.0.2",
1519
"nav-frontend-typografi-style": "^1.0.7",
1620
"prop-types": "^15.6.1",
1721
"react": "^16.2.0",
22+
"react-collapse": "^4.0.3",
1823
"react-dom": "^16.2.0",
24+
"react-motion": "^0.5.2",
1925
"react-router": "^4.2.0",
2026
"react-router-dom": "^4.2.2",
2127
"react-scripts-ts": "2.13.0",
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
declare module 'nav-frontend-ekspanderbartpanel' {
2+
import * as React from "react";
3+
4+
export interface EkspanderbartpanelProps {
5+
}
6+
export default class EkspanderbartPanel extends React.Component<EkspanderbartpanelProps, {}>{}
7+
8+
export class EkspanderbartpanelBase extends React.Component<EkspanderbartpanelProps, {}>{
9+
10+
}
11+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.visittkort {
2+
margin-left: auto;
3+
margin-right: auto;
4+
width: 900px;
5+
padding-top: 50px;
6+
}
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
11
import * as React from 'react';
22
import { Person } from '../../models/person';
3-
import Innholdstittel from 'nav-frontend-typografi/lib/innholdstittel';
3+
import Innholdstittel from 'nav-frontend-typografi';
4+
5+
import { EkspanderbartpanelBase } from 'nav-frontend-ekspanderbartpanel';
46

57
interface VisittkortProps {
68
person: Person;
79
}
810

9-
function Visittkort({person}: VisittkortProps) {
11+
function Tittel({person}: VisittkortProps) {
1012
return (
1113
<div>
12-
<Innholdstittel>{person.fornavn} {person.etternavn}</Innholdstittel>
14+
<Innholdstittel type={"innholdstittel"}>{person.fornavn} {person.etternavn}</Innholdstittel>
1315
<p>{person.fodselsnummer}</p>
1416
</div>
1517
);
1618
}
1719

20+
function Visittkort({person}: VisittkortProps) {
21+
return (
22+
<div className="visittkort">
23+
<EkspanderbartpanelBase apen={true} heading={<Tittel person={person}/>} ariaTittel="Visittkort">
24+
<p>Mer personinformasjon her..</p>
25+
</EkspanderbartpanelBase>
26+
</div>
27+
);
28+
}
29+
1830
export default Visittkort;

src/index.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
@import '../node_modules/nav-frontend-core/less/core';
55
@import '../node_modules/nav-frontend-typografi-style/src/index';
66
@import '../node_modules/nav-frontend-knapper-style/src/index';
7+
@import '../node_modules/nav-frontend-ekspanderbartpanel-style/src/index';
78

89
@import './App.less';
910
@import './components/underarbeid/UnderArbeid.less';
1011
@import './components/startbilde/startbilde.less';
12+
@import './components/visittkort/Visittkort';
1113

1214

1315
body {

tsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
"suppressImplicitAnyIndexErrors": true,
1818
"noUnusedLocals": true
1919
},
20+
"include" : [
21+
"src/@types/*"
22+
],
2023
"exclude": [
2124
"node_modules",
2225
"build",

0 commit comments

Comments
 (0)