@digigov/nextjs 1.1.5-85c27c19 → 1.1.5-aefd0709
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/App/index.js +1 -1
- package/App.d.ts +1 -1
- package/App.js.map +2 -2
- package/Link/index.js +2 -2
- package/Link.js.map +2 -2
- package/cjs/App/index.js +1 -1
- package/cjs/App.js.map +2 -2
- package/cjs/Link/index.js +2 -2
- package/cjs/Link.js.map +2 -2
- package/index.js +1 -1
- package/package.json +3 -3
- package/src/App.tsx +7 -7
- package/src/Link.tsx +6 -3
package/App/index.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import App from "next/app";
|
|
3
3
|
import Head from "next/head";
|
|
4
|
+
import { useRouter } from "next/router";
|
|
4
5
|
import { withTranslation } from "react-i18next";
|
|
5
6
|
import NextLink from "@digigov/nextjs/Link";
|
|
6
7
|
import DigiGOVApp, { StaticApp } from "@digigov/ui/app/App";
|
|
7
8
|
import { I18NProvider } from "@digigov/ui/i18n";
|
|
8
9
|
import { LinkProvider } from "@digigov/ui/navigation/Link";
|
|
9
|
-
import { useRouter } from "next/router";
|
|
10
10
|
class DigiGOVNextAppClass extends App {
|
|
11
11
|
render() {
|
|
12
12
|
const { Component, pageProps, t, i18n: i18n2, ssr = false, router } = this.props;
|
package/App.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { i18n, TFunction } from 'i18next';
|
|
3
|
+
import { NextRouter } from 'next/router';
|
|
3
4
|
import { WithTranslation } from 'react-i18next';
|
|
4
5
|
import type { AppProps } from '@digigov/ui/app/App';
|
|
5
|
-
import { NextRouter } from 'next/router';
|
|
6
6
|
export interface DigiGOVNextAppProps extends AppProps, WithTranslation {
|
|
7
7
|
children?: React.ReactNode;
|
|
8
8
|
t: TFunction;
|
package/App.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/App.tsx"],
|
|
4
|
-
"sourcesContent": ["import React from 'react';\nimport { i18n, TFunction } from 'i18next';\nimport App from 'next/app';\nimport Head from 'next/head';\nimport { withTranslation, WithTranslation } from 'react-i18next';\nimport NextLink from '@digigov/nextjs/Link';\nimport DigiGOVApp, { StaticApp } from '@digigov/ui/app/App';\nimport type { AppProps } from '@digigov/ui/app/App';\nimport { I18NProvider } from '@digigov/ui/i18n';\nimport { LinkProvider } from '@digigov/ui/navigation/Link';\
|
|
5
|
-
"mappings": "AAAA,OAAO,WAAW;AAElB,OAAO,SAAS;AAChB,OAAO,UAAU;AACjB,SAAS,uBAAwC;AACjD,OAAO,cAAc;AACrB,OAAO,cAAc,iBAAiB;AAEtC,SAAS,oBAAoB;AAC7B,SAAS,oBAAoB;
|
|
4
|
+
"sourcesContent": ["import React from 'react';\nimport { i18n, TFunction } from 'i18next';\nimport App from 'next/app';\nimport Head from 'next/head';\nimport { NextRouter, useRouter } from 'next/router';\nimport { withTranslation, WithTranslation } from 'react-i18next';\nimport NextLink from '@digigov/nextjs/Link';\nimport DigiGOVApp, { StaticApp } from '@digigov/ui/app/App';\nimport type { AppProps } from '@digigov/ui/app/App';\nimport { I18NProvider } from '@digigov/ui/i18n';\nimport { LinkProvider } from '@digigov/ui/navigation/Link';\n\nexport interface DigiGOVNextAppProps extends AppProps, WithTranslation {\n children?: React.ReactNode;\n t: TFunction;\n i18n: i18n;\n ssr: boolean;\n router: NextRouter;\n}\nclass DigiGOVNextAppClass extends App<DigiGOVNextAppProps> {\n render(): React.ReactElement {\n const { Component, pageProps, t, i18n, ssr = false, router } = this.props;\n const { locale } = router;\n\n if (locale && i18n.language != locale) {\n i18n.changeLanguage(locale);\n }\n return (\n <I18NProvider\n t={(str) => (typeof str === 'string' ? t(str) : str)}\n i18n={i18n}\n >\n <LinkProvider component={NextLink}>\n <Head>\n <meta\n name=\"viewport\"\n content=\"minimum-scale=1, initial-scale=1, width=device-width\"\n />\n </Head>\n {ssr ? (\n <DigiGOVApp>\n <Component {...pageProps} />\n </DigiGOVApp>\n ) : (\n <StaticApp>\n <Component {...pageProps} />\n </StaticApp>\n )}\n </LinkProvider>\n </I18NProvider>\n );\n }\n}\n\nconst DigiGOVNextAppWithTranslation = withTranslation()(DigiGOVNextAppClass);\nconst DigiGOVNextApp = (props) => {\n const router = useRouter();\n return <DigiGOVNextAppWithTranslation {...props} router={router} />;\n};\nexport default DigiGOVNextApp;\n"],
|
|
5
|
+
"mappings": "AAAA,OAAO,WAAW;AAElB,OAAO,SAAS;AAChB,OAAO,UAAU;AACjB,SAAqB,iBAAiB;AACtC,SAAS,uBAAwC;AACjD,OAAO,cAAc;AACrB,OAAO,cAAc,iBAAiB;AAEtC,SAAS,oBAAoB;AAC7B,SAAS,oBAAoB;AAS7B,MAAM,4BAA4B,IAAyB;AAAA,EACzD,SAA6B;AAC3B,UAAM,EAAE,WAAW,WAAW,GAAG,MAAAA,OAAM,MAAM,OAAO,OAAO,IAAI,KAAK;AACpE,UAAM,EAAE,OAAO,IAAI;AAEnB,QAAI,UAAUA,MAAK,YAAY,QAAQ;AACrC,MAAAA,MAAK,eAAe,MAAM;AAAA,IAC5B;AACA,WACE;AAAA,MAAC;AAAA;AAAA,QACC,GAAG,CAAC,QAAS,OAAO,QAAQ,WAAW,EAAE,GAAG,IAAI;AAAA,QAChD,MAAMA;AAAA;AAAA,MAEN,oCAAC,gBAAa,WAAW,YACvB,oCAAC,YACC;AAAA,QAAC;AAAA;AAAA,UACC,MAAK;AAAA,UACL,SAAQ;AAAA;AAAA,MACV,CACF,GACC,MACC,oCAAC,kBACC,oCAAC,aAAW,GAAG,WAAW,CAC5B,IAEA,oCAAC,iBACC,oCAAC,aAAW,GAAG,WAAW,CAC5B,CAEJ;AAAA,IACF;AAAA,EAEJ;AACF;AAEA,MAAM,gCAAgC,gBAAgB,EAAE,mBAAmB;AAC3E,MAAM,iBAAiB,CAAC,UAAU;AAChC,QAAM,SAAS,UAAU;AACzB,SAAO,oCAAC,iCAA+B,GAAG,OAAO,QAAgB;AACnE;AACA,IAAO,cAAQ;",
|
|
6
6
|
"names": ["i18n"]
|
|
7
7
|
}
|
package/Link/index.js
CHANGED
|
@@ -5,8 +5,8 @@ import { LinkBase } from "@digigov/ui/navigation/Link";
|
|
|
5
5
|
const NextLink = (props, ref) => {
|
|
6
6
|
const { href, ...other } = props;
|
|
7
7
|
const isExternalLink = (
|
|
8
|
-
//check if url has a file extension
|
|
9
|
-
/^(?:[a-z]+:)
|
|
8
|
+
//check if url has a file extension or starts with mailto
|
|
9
|
+
/^(?:[a-z]+:)?\/\/|\.pdf|\.docx?|\.xlsx?|^mailto:/i.test(href || "") || // or if props has a target or rel
|
|
10
10
|
other.target === "_blank"
|
|
11
11
|
);
|
|
12
12
|
const router = useRouter();
|
package/Link.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/Link.tsx"],
|
|
4
|
-
"sourcesContent": ["import React, { useEffect } from 'react';\nimport Link from 'next/link';\nimport { useRouter } from 'next/router';\nimport {LinkBase} from '@digigov/ui/navigation/Link';\nimport { LinkProps } from '@digigov/ui/navigation/Link';\n\nconst NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (\n props,\n ref\n) => {\n const { href, ...other } = props;\n const isExternalLink =\n //check if url has a file extension\n /^(?:[a-z]+:)
|
|
5
|
-
"mappings": "AAAA,OAAO,SAAS,iBAAiB;AACjC,OAAO,UAAU;AACjB,SAAS,iBAAiB;AAC1B,
|
|
4
|
+
"sourcesContent": ["import React, { useEffect } from 'react';\nimport Link from 'next/link';\nimport { useRouter } from 'next/router';\nimport { LinkBase } from '@digigov/ui/navigation/Link';\nimport { LinkProps } from '@digigov/ui/navigation/Link';\n\nconst NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (\n props,\n ref\n) => {\n const { href, ...other } = props;\n\n const isExternalLink =\n //check if url has a file extension or starts with mailto\n /^(?:[a-z]+:)?\\/\\/|\\.pdf|\\.docx?|\\.xlsx?|^mailto:/i.test(href || '') ||\n // or if props has a target or rel\n other.target === '_blank';\n\n const router = useRouter();\n\n useEffect(() => {\n const path = router.asPath;\n if (path && path.includes('#')) {\n setTimeout(() => {\n const id = path.replace('#', '');\n const el = window.document.getElementById(id);\n const r = el?.getBoundingClientRect();\n if (r) {\n window.top?.scroll({\n top: scrollY + r.top,\n behavior: 'smooth',\n });\n }\n }, 600);\n }\n }, [router.asPath]);\n\n if (isExternalLink) {\n return (\n <LinkBase ref={ref} href={href || '#'} {...other}>\n {props.children}\n </LinkBase>\n );\n }\n\n return (\n <Link href={href || '#'} {...other}>\n <LinkBase ref={ref} {...other}>\n {props.children}\n </LinkBase>\n </Link>\n );\n};\n\nexport default React.forwardRef(NextLink);\n"],
|
|
5
|
+
"mappings": "AAAA,OAAO,SAAS,iBAAiB;AACjC,OAAO,UAAU;AACjB,SAAS,iBAAiB;AAC1B,SAAS,gBAAgB;AAGzB,MAAM,WAAyE,CAC7E,OACA,QACG;AACH,QAAM,EAAE,MAAM,GAAG,MAAM,IAAI;AAE3B,QAAM;AAAA;AAAA,IAEJ,oDAAoD,KAAK,QAAQ,EAAE;AAAA,IAEnE,MAAM,WAAW;AAAA;AAEnB,QAAM,SAAS,UAAU;AAEzB,YAAU,MAAM;AACd,UAAM,OAAO,OAAO;AACpB,QAAI,QAAQ,KAAK,SAAS,GAAG,GAAG;AAC9B,iBAAW,MAAM;AACf,cAAM,KAAK,KAAK,QAAQ,KAAK,EAAE;AAC/B,cAAM,KAAK,OAAO,SAAS,eAAe,EAAE;AAC5C,cAAM,IAAI,IAAI,sBAAsB;AACpC,YAAI,GAAG;AACL,iBAAO,KAAK,OAAO;AAAA,YACjB,KAAK,UAAU,EAAE;AAAA,YACjB,UAAU;AAAA,UACZ,CAAC;AAAA,QACH;AAAA,MACF,GAAG,GAAG;AAAA,IACR;AAAA,EACF,GAAG,CAAC,OAAO,MAAM,CAAC;AAElB,MAAI,gBAAgB;AAClB,WACE,oCAAC,YAAS,KAAU,MAAM,QAAQ,KAAM,GAAG,SACxC,MAAM,QACT;AAAA,EAEJ;AAEA,SACE,oCAAC,QAAK,MAAM,QAAQ,KAAM,GAAG,SAC3B,oCAAC,YAAS,KAAW,GAAG,SACrB,MAAM,QACT,CACF;AAEJ;AAEA,IAAO,eAAQ,MAAM,WAAW,QAAQ;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/cjs/App/index.js
CHANGED
|
@@ -33,12 +33,12 @@ module.exports = __toCommonJS(App_exports);
|
|
|
33
33
|
var import_react = __toESM(require("react"));
|
|
34
34
|
var import_app = __toESM(require("next/app"));
|
|
35
35
|
var import_head = __toESM(require("next/head"));
|
|
36
|
+
var import_router = require("next/router");
|
|
36
37
|
var import_react_i18next = require("react-i18next");
|
|
37
38
|
var import_Link = __toESM(require("@digigov/nextjs/Link"));
|
|
38
39
|
var import_App = __toESM(require("@digigov/ui/app/App"));
|
|
39
40
|
var import_i18n = require("@digigov/ui/i18n");
|
|
40
41
|
var import_Link2 = require("@digigov/ui/navigation/Link");
|
|
41
|
-
var import_router = require("next/router");
|
|
42
42
|
class DigiGOVNextAppClass extends import_app.default {
|
|
43
43
|
render() {
|
|
44
44
|
const { Component, pageProps, t, i18n: i18n2, ssr = false, router } = this.props;
|
package/cjs/App.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/App.tsx"],
|
|
4
|
-
"sourcesContent": ["import React from 'react';\nimport { i18n, TFunction } from 'i18next';\nimport App from 'next/app';\nimport Head from 'next/head';\nimport { withTranslation, WithTranslation } from 'react-i18next';\nimport NextLink from '@digigov/nextjs/Link';\nimport DigiGOVApp, { StaticApp } from '@digigov/ui/app/App';\nimport type { AppProps } from '@digigov/ui/app/App';\nimport { I18NProvider } from '@digigov/ui/i18n';\nimport { LinkProvider } from '@digigov/ui/navigation/Link';\
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,iBAAgB;AAChB,kBAAiB;AACjB,2BAAiD;AACjD,kBAAqB;AACrB,iBAAsC;AAEtC,kBAA6B;AAC7B,IAAAA,eAA6B;
|
|
4
|
+
"sourcesContent": ["import React from 'react';\nimport { i18n, TFunction } from 'i18next';\nimport App from 'next/app';\nimport Head from 'next/head';\nimport { NextRouter, useRouter } from 'next/router';\nimport { withTranslation, WithTranslation } from 'react-i18next';\nimport NextLink from '@digigov/nextjs/Link';\nimport DigiGOVApp, { StaticApp } from '@digigov/ui/app/App';\nimport type { AppProps } from '@digigov/ui/app/App';\nimport { I18NProvider } from '@digigov/ui/i18n';\nimport { LinkProvider } from '@digigov/ui/navigation/Link';\n\nexport interface DigiGOVNextAppProps extends AppProps, WithTranslation {\n children?: React.ReactNode;\n t: TFunction;\n i18n: i18n;\n ssr: boolean;\n router: NextRouter;\n}\nclass DigiGOVNextAppClass extends App<DigiGOVNextAppProps> {\n render(): React.ReactElement {\n const { Component, pageProps, t, i18n, ssr = false, router } = this.props;\n const { locale } = router;\n\n if (locale && i18n.language != locale) {\n i18n.changeLanguage(locale);\n }\n return (\n <I18NProvider\n t={(str) => (typeof str === 'string' ? t(str) : str)}\n i18n={i18n}\n >\n <LinkProvider component={NextLink}>\n <Head>\n <meta\n name=\"viewport\"\n content=\"minimum-scale=1, initial-scale=1, width=device-width\"\n />\n </Head>\n {ssr ? (\n <DigiGOVApp>\n <Component {...pageProps} />\n </DigiGOVApp>\n ) : (\n <StaticApp>\n <Component {...pageProps} />\n </StaticApp>\n )}\n </LinkProvider>\n </I18NProvider>\n );\n }\n}\n\nconst DigiGOVNextAppWithTranslation = withTranslation()(DigiGOVNextAppClass);\nconst DigiGOVNextApp = (props) => {\n const router = useRouter();\n return <DigiGOVNextAppWithTranslation {...props} router={router} />;\n};\nexport default DigiGOVNextApp;\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,iBAAgB;AAChB,kBAAiB;AACjB,oBAAsC;AACtC,2BAAiD;AACjD,kBAAqB;AACrB,iBAAsC;AAEtC,kBAA6B;AAC7B,IAAAA,eAA6B;AAS7B,MAAM,4BAA4B,WAAAC,QAAyB;AAAA,EACzD,SAA6B;AAC3B,UAAM,EAAE,WAAW,WAAW,GAAG,MAAAC,OAAM,MAAM,OAAO,OAAO,IAAI,KAAK;AACpE,UAAM,EAAE,OAAO,IAAI;AAEnB,QAAI,UAAUA,MAAK,YAAY,QAAQ;AACrC,MAAAA,MAAK,eAAe,MAAM;AAAA,IAC5B;AACA,WACE,6BAAAC,QAAA;AAAA,MAAC;AAAA;AAAA,QACC,GAAG,CAAC,QAAS,OAAO,QAAQ,WAAW,EAAE,GAAG,IAAI;AAAA,QAChD,MAAMD;AAAA;AAAA,MAEN,6BAAAC,QAAA,cAAC,6BAAa,WAAW,YAAAC,WACvB,6BAAAD,QAAA,cAAC,YAAAE,SAAA,MACC,6BAAAF,QAAA;AAAA,QAAC;AAAA;AAAA,UACC,MAAK;AAAA,UACL,SAAQ;AAAA;AAAA,MACV,CACF,GACC,MACC,6BAAAA,QAAA,cAAC,WAAAG,SAAA,MACC,6BAAAH,QAAA,cAAC,aAAW,GAAG,WAAW,CAC5B,IAEA,6BAAAA,QAAA,cAAC,4BACC,6BAAAA,QAAA,cAAC,aAAW,GAAG,WAAW,CAC5B,CAEJ;AAAA,IACF;AAAA,EAEJ;AACF;AAEA,MAAM,oCAAgC,sCAAgB,EAAE,mBAAmB;AAC3E,MAAM,iBAAiB,CAAC,UAAU;AAChC,QAAM,aAAS,yBAAU;AACzB,SAAO,6BAAAA,QAAA,cAAC,iCAA+B,GAAG,OAAO,QAAgB;AACnE;AACA,IAAO,cAAQ;",
|
|
6
6
|
"names": ["import_Link", "App", "i18n", "React", "NextLink", "Head", "DigiGOVApp"]
|
|
7
7
|
}
|
package/cjs/Link/index.js
CHANGED
|
@@ -37,8 +37,8 @@ var import_Link = require("@digigov/ui/navigation/Link");
|
|
|
37
37
|
const NextLink = (props, ref) => {
|
|
38
38
|
const { href, ...other } = props;
|
|
39
39
|
const isExternalLink = (
|
|
40
|
-
//check if url has a file extension
|
|
41
|
-
/^(?:[a-z]+:)
|
|
40
|
+
//check if url has a file extension or starts with mailto
|
|
41
|
+
/^(?:[a-z]+:)?\/\/|\.pdf|\.docx?|\.xlsx?|^mailto:/i.test(href || "") || // or if props has a target or rel
|
|
42
42
|
other.target === "_blank"
|
|
43
43
|
);
|
|
44
44
|
const router = (0, import_router.useRouter)();
|
package/cjs/Link.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Link.tsx"],
|
|
4
|
-
"sourcesContent": ["import React, { useEffect } from 'react';\nimport Link from 'next/link';\nimport { useRouter } from 'next/router';\nimport {LinkBase} from '@digigov/ui/navigation/Link';\nimport { LinkProps } from '@digigov/ui/navigation/Link';\n\nconst NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (\n props,\n ref\n) => {\n const { href, ...other } = props;\n const isExternalLink =\n //check if url has a file extension\n /^(?:[a-z]+:)
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAiC;AACjC,kBAAiB;AACjB,oBAA0B;AAC1B,
|
|
4
|
+
"sourcesContent": ["import React, { useEffect } from 'react';\nimport Link from 'next/link';\nimport { useRouter } from 'next/router';\nimport { LinkBase } from '@digigov/ui/navigation/Link';\nimport { LinkProps } from '@digigov/ui/navigation/Link';\n\nconst NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (\n props,\n ref\n) => {\n const { href, ...other } = props;\n\n const isExternalLink =\n //check if url has a file extension or starts with mailto\n /^(?:[a-z]+:)?\\/\\/|\\.pdf|\\.docx?|\\.xlsx?|^mailto:/i.test(href || '') ||\n // or if props has a target or rel\n other.target === '_blank';\n\n const router = useRouter();\n\n useEffect(() => {\n const path = router.asPath;\n if (path && path.includes('#')) {\n setTimeout(() => {\n const id = path.replace('#', '');\n const el = window.document.getElementById(id);\n const r = el?.getBoundingClientRect();\n if (r) {\n window.top?.scroll({\n top: scrollY + r.top,\n behavior: 'smooth',\n });\n }\n }, 600);\n }\n }, [router.asPath]);\n\n if (isExternalLink) {\n return (\n <LinkBase ref={ref} href={href || '#'} {...other}>\n {props.children}\n </LinkBase>\n );\n }\n\n return (\n <Link href={href || '#'} {...other}>\n <LinkBase ref={ref} {...other}>\n {props.children}\n </LinkBase>\n </Link>\n );\n};\n\nexport default React.forwardRef(NextLink);\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAiC;AACjC,kBAAiB;AACjB,oBAA0B;AAC1B,kBAAyB;AAGzB,MAAM,WAAyE,CAC7E,OACA,QACG;AACH,QAAM,EAAE,MAAM,GAAG,MAAM,IAAI;AAE3B,QAAM;AAAA;AAAA,IAEJ,oDAAoD,KAAK,QAAQ,EAAE;AAAA,IAEnE,MAAM,WAAW;AAAA;AAEnB,QAAM,aAAS,yBAAU;AAEzB,8BAAU,MAAM;AACd,UAAM,OAAO,OAAO;AACpB,QAAI,QAAQ,KAAK,SAAS,GAAG,GAAG;AAC9B,iBAAW,MAAM;AACf,cAAM,KAAK,KAAK,QAAQ,KAAK,EAAE;AAC/B,cAAM,KAAK,OAAO,SAAS,eAAe,EAAE;AAC5C,cAAM,IAAI,IAAI,sBAAsB;AACpC,YAAI,GAAG;AACL,iBAAO,KAAK,OAAO;AAAA,YACjB,KAAK,UAAU,EAAE;AAAA,YACjB,UAAU;AAAA,UACZ,CAAC;AAAA,QACH;AAAA,MACF,GAAG,GAAG;AAAA,IACR;AAAA,EACF,GAAG,CAAC,OAAO,MAAM,CAAC;AAElB,MAAI,gBAAgB;AAClB,WACE,6BAAAA,QAAA,cAAC,wBAAS,KAAU,MAAM,QAAQ,KAAM,GAAG,SACxC,MAAM,QACT;AAAA,EAEJ;AAEA,SACE,6BAAAA,QAAA,cAAC,YAAAC,SAAA,EAAK,MAAM,QAAQ,KAAM,GAAG,SAC3B,6BAAAD,QAAA,cAAC,wBAAS,KAAW,GAAG,SACrB,MAAM,QACT,CACF;AAEJ;AAEA,IAAO,eAAQ,aAAAA,QAAM,WAAW,QAAQ;",
|
|
6
6
|
"names": ["React", "Link"]
|
|
7
7
|
}
|
package/index.js
CHANGED
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@digigov/nextjs",
|
|
3
|
-
"version": "1.1.5-
|
|
3
|
+
"version": "1.1.5-aefd0709",
|
|
4
4
|
"description": "next specific utilities for @digigov apps",
|
|
5
5
|
"author": "GRNET Developers <devs@lists.grnet.gr>",
|
|
6
6
|
"license": "BSD-2-Clause",
|
|
7
7
|
"main": "./cjs/index.js",
|
|
8
8
|
"module": "./index.js",
|
|
9
9
|
"peerDependencies": {
|
|
10
|
-
"@digigov/ui": "2.0.0-
|
|
11
|
-
"@digigov/react-core": "2.0.0-
|
|
10
|
+
"@digigov/ui": "2.0.0-aefd0709",
|
|
11
|
+
"@digigov/react-core": "2.0.0-aefd0709",
|
|
12
12
|
"clsx": "1.1.1",
|
|
13
13
|
"i18next": "19.1.0",
|
|
14
14
|
"react": ">=16.8.0 <19.0.0",
|
package/src/App.tsx
CHANGED
|
@@ -2,13 +2,13 @@ import React from 'react';
|
|
|
2
2
|
import { i18n, TFunction } from 'i18next';
|
|
3
3
|
import App from 'next/app';
|
|
4
4
|
import Head from 'next/head';
|
|
5
|
+
import { NextRouter, useRouter } from 'next/router';
|
|
5
6
|
import { withTranslation, WithTranslation } from 'react-i18next';
|
|
6
7
|
import NextLink from '@digigov/nextjs/Link';
|
|
7
8
|
import DigiGOVApp, { StaticApp } from '@digigov/ui/app/App';
|
|
8
9
|
import type { AppProps } from '@digigov/ui/app/App';
|
|
9
10
|
import { I18NProvider } from '@digigov/ui/i18n';
|
|
10
11
|
import { LinkProvider } from '@digigov/ui/navigation/Link';
|
|
11
|
-
import { NextRouter, useRouter } from 'next/router';
|
|
12
12
|
|
|
13
13
|
export interface DigiGOVNextAppProps extends AppProps, WithTranslation {
|
|
14
14
|
children?: React.ReactNode;
|
|
@@ -20,9 +20,9 @@ export interface DigiGOVNextAppProps extends AppProps, WithTranslation {
|
|
|
20
20
|
class DigiGOVNextAppClass extends App<DigiGOVNextAppProps> {
|
|
21
21
|
render(): React.ReactElement {
|
|
22
22
|
const { Component, pageProps, t, i18n, ssr = false, router } = this.props;
|
|
23
|
-
const {locale} = router;
|
|
24
|
-
|
|
25
|
-
if (locale && i18n.language != locale) {
|
|
23
|
+
const { locale } = router;
|
|
24
|
+
|
|
25
|
+
if (locale && i18n.language != locale) {
|
|
26
26
|
i18n.changeLanguage(locale);
|
|
27
27
|
}
|
|
28
28
|
return (
|
|
@@ -54,7 +54,7 @@ class DigiGOVNextAppClass extends App<DigiGOVNextAppProps> {
|
|
|
54
54
|
|
|
55
55
|
const DigiGOVNextAppWithTranslation = withTranslation()(DigiGOVNextAppClass);
|
|
56
56
|
const DigiGOVNextApp = (props) => {
|
|
57
|
-
const router = useRouter()
|
|
58
|
-
return <DigiGOVNextAppWithTranslation {...props} router={router}
|
|
59
|
-
}
|
|
57
|
+
const router = useRouter();
|
|
58
|
+
return <DigiGOVNextAppWithTranslation {...props} router={router} />;
|
|
59
|
+
};
|
|
60
60
|
export default DigiGOVNextApp;
|
package/src/Link.tsx
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useEffect } from 'react';
|
|
2
2
|
import Link from 'next/link';
|
|
3
3
|
import { useRouter } from 'next/router';
|
|
4
|
-
import {LinkBase} from '@digigov/ui/navigation/Link';
|
|
4
|
+
import { LinkBase } from '@digigov/ui/navigation/Link';
|
|
5
5
|
import { LinkProps } from '@digigov/ui/navigation/Link';
|
|
6
6
|
|
|
7
7
|
const NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (
|
|
@@ -9,11 +9,13 @@ const NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (
|
|
|
9
9
|
ref
|
|
10
10
|
) => {
|
|
11
11
|
const { href, ...other } = props;
|
|
12
|
+
|
|
12
13
|
const isExternalLink =
|
|
13
|
-
//check if url has a file extension
|
|
14
|
-
/^(?:[a-z]+:)
|
|
14
|
+
//check if url has a file extension or starts with mailto
|
|
15
|
+
/^(?:[a-z]+:)?\/\/|\.pdf|\.docx?|\.xlsx?|^mailto:/i.test(href || '') ||
|
|
15
16
|
// or if props has a target or rel
|
|
16
17
|
other.target === '_blank';
|
|
18
|
+
|
|
17
19
|
const router = useRouter();
|
|
18
20
|
|
|
19
21
|
useEffect(() => {
|
|
@@ -40,6 +42,7 @@ const NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (
|
|
|
40
42
|
</LinkBase>
|
|
41
43
|
);
|
|
42
44
|
}
|
|
45
|
+
|
|
43
46
|
return (
|
|
44
47
|
<Link href={href || '#'} {...other}>
|
|
45
48
|
<LinkBase ref={ref} {...other}>
|