Skip to content

Commit

Permalink
export types
Browse files Browse the repository at this point in the history
  • Loading branch information
kenglxn committed Nov 22, 2024
1 parent 07270bf commit 0a2077b
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 25 deletions.
2 changes: 1 addition & 1 deletion lib/Enheter/Underenhet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styles from "./Underenhet.module.css";
import { formatOrgNr } from "../Virksomhetsvelger/util";
import { CheckmarkCircleIcon } from "@navikt/aksel-icons";
import { OrganisasjonMedState } from "../Virksomhetsvelger/useTastaturNavigasjon";
import { Organisasjon } from "../Virksomhetsvelger/VirksomhetsvelgerContext";
import { Organisasjon } from "../Virksomhetsvelger/Virksomhetsvelger";

type UnderenhetProps = {
onClick: (underenhet: Organisasjon) => void;
Expand Down
13 changes: 8 additions & 5 deletions lib/Virksomhetsvelger/Virksomhetsvelger.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import { formatOrgNr } from "./util";

import styles from "./Virksomhetsvelger.module.css";
import { EnhetMedUnderenheter } from "../Enheter/EnheterMedUnderenheter";
import {
Organisasjon,
VirksomhetsvelgerContext,
} from "./VirksomhetsvelgerContext.ts";
import { VirksomhetsvelgerProvider } from "./VirksomhetsvelgerProvider.tsx";
import { VirksomhetsvelgerContext } from "./VirksomhetsvelgerContext";
import { VirksomhetsvelgerProvider } from "./VirksomhetsvelgerProvider";

const Velger = ({ friKomponent }: { friKomponent?: boolean }) => {
const dropdownId = "VirksomhetsvelgerPopup";
Expand Down Expand Up @@ -180,6 +177,12 @@ export interface ValgtVirksomhet {
navn: string;
}

export interface Organisasjon {
orgnr: string;
navn: string;
underenheter: Organisasjon[];
}

export const Virksomhetsvelger = ({
organisasjoner,
onChange,
Expand Down
7 changes: 1 addition & 6 deletions lib/Virksomhetsvelger/VirksomhetsvelgerContext.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import { createContext } from "react";

export interface Organisasjon {
orgnr: string;
navn: string;
underenheter: Organisasjon[];
}
import { Organisasjon } from "./Virksomhetsvelger";

export const VirksomhetsvelgerContext = createContext<{
aktivtOrganisasjonstre: Organisasjon[];
Expand Down
6 changes: 2 additions & 4 deletions lib/Virksomhetsvelger/VirksomhetsvelgerProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { ReactNode, useEffect, useMemo, useState } from "react";
import { filterRecursive, flatUtHierarki } from "./util";
import {
Organisasjon,
VirksomhetsvelgerContext,
} from "./VirksomhetsvelgerContext";
import { VirksomhetsvelgerContext } from "./VirksomhetsvelgerContext";
import { Organisasjon } from "./Virksomhetsvelger";

export const VirksomhetsvelgerProvider = ({
children,
Expand Down
6 changes: 2 additions & 4 deletions lib/Virksomhetsvelger/useTastaturNavigasjon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import {
useCallback,
} from "react";
import { findLastRecursive, findRecursive, mapRecursive } from "./util";
import {
Organisasjon,
VirksomhetsvelgerContext,
} from "./VirksomhetsvelgerContext";
import { VirksomhetsvelgerContext } from "./VirksomhetsvelgerContext";
import { Organisasjon } from "./Virksomhetsvelger";

export interface OrganisasjonMedState extends Organisasjon {
index: number;
Expand Down
2 changes: 1 addition & 1 deletion lib/Virksomhetsvelger/util.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { OrganisasjonMedState } from "./useTastaturNavigasjon";
import { Organisasjon } from "./VirksomhetsvelgerContext";
import { Organisasjon } from "./Virksomhetsvelger";

export const formatOrgNr = (orgNr: string) => orgNr.match(/.{1,3}/g)?.join(" ");

Expand Down
2 changes: 1 addition & 1 deletion lib/main.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export { Banner } from "./Banner/Banner";
export { Virksomhetsvelger } from "./Virksomhetsvelger/Virksomhetsvelger";
export * from "./Virksomhetsvelger/Virksomhetsvelger";
export * from "./Virksomhetsvelger/util";
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@navikt/virksomhetsvelger",
"private": false,
"version": "0.0.11",
"version": "0.0.12",
"type": "module",
"main": "./dist/main.js",
"types": "./dist/main.d.ts",
Expand Down

0 comments on commit 0a2077b

Please sign in to comment.