npm - @digigov/nextjs - Versions diffs - 1.1.5-rc.17 → 1.1.5-rc.30 - Mend

@digigov/nextjs 1.1.5-rc.17 → 1.1.5-rc.30

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.

Files changed (20) hide show

package/App/index.js CHANGED Viewed

@@ -1,14 +1,19 @@
 import React from "react";
 import App from "next/app";
 import Head from "next/head";
+import { useRouter } from "next/router";
 import { withTranslation } from "react-i18next";
 import NextLink from "@digigov/nextjs/Link";
 import DigiGOVApp, { StaticApp } from "@digigov/ui/app/App";
 import { I18NProvider } from "@digigov/ui/i18n";
 import { LinkProvider } from "@digigov/ui/navigation/Link";
-class DigiGOVNextApp extends App {
+class DigiGOVNextAppClass extends App {
   render() {
-    const { Component, pageProps, t, i18n: i18n2, ssr = false } = this.props;
+    const { Component, pageProps, t, i18n: i18n2, ssr = false, router } = this.props;
+    const { locale } = router;
+    if (locale && i18n2.language != locale) {
+      i18n2.changeLanguage(locale);
+    }
     return /* @__PURE__ */ React.createElement(
       I18NProvider,
       {
@@ -25,8 +30,12 @@ class DigiGOVNextApp extends App {
     );
   }
 }
-const DigiGOVNextAppWithTranslation = withTranslation()(DigiGOVNextApp);
-var App_default = DigiGOVNextAppWithTranslation;
+const DigiGOVNextAppWithTranslation = withTranslation()(DigiGOVNextAppClass);
+const DigiGOVNextApp = (props) => {
+  const router = useRouter();
+  return /* @__PURE__ */ React.createElement(DigiGOVNextAppWithTranslation, { ...props, router });
+};
+var App_default = DigiGOVNextApp;
 export {
   App_default as default
 };

package/App.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import React from 'react';
 import { i18n, TFunction } from 'i18next';
+import { NextRouter } from 'next/router';
 import { WithTranslation } from 'react-i18next';
 import type { AppProps } from '@digigov/ui/app/App';
 export interface DigiGOVNextAppProps extends AppProps, WithTranslation {
@@ -7,11 +8,7 @@ export interface DigiGOVNextAppProps extends AppProps, WithTranslation {
     t: TFunction;
     i18n: i18n;
     ssr: boolean;
+    router: NextRouter;
 }
-declare const DigiGOVNextAppWithTranslation: React.ComponentType<import("react-i18next").Omit<DigiGOVNextAppProps & import("next/app").AppInitialProps & {
-    Component: import("next").NextComponentType<import("next").NextPageContext, any, {}>;
-    router: import("next/router").Router;
-    __N_SSG?: boolean | undefined;
-    __N_SSP?: boolean | undefined;
-}, keyof WithTranslation> & import("react-i18next").WithTranslationProps>;
-export default DigiGOVNextAppWithTranslation;
+declare const DigiGOVNextApp: (props: any) => React.JSX.Element;
+export default DigiGOVNextApp;

package/App.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/App.tsx"],
-  "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';\n\nexport interface DigiGOVNextAppProps extends AppProps, WithTranslation {\n  children?: React.ReactNode;\n  t: TFunction;\n  i18n: i18n;\n  ssr: boolean;\n}\nclass DigiGOVNextApp extends App<DigiGOVNextAppProps> {\n  render(): React.ReactElement {\n    const { Component, pageProps, t, i18n, ssr = false } = this.props;\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}\nconst DigiGOVNextAppWithTranslation = withTranslation()(DigiGOVNextApp);\nexport default DigiGOVNextAppWithTranslation;\n"],
-  "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;AAQ7B,MAAM,uBAAuB,IAAyB;AAAA,EACpD,SAA6B;AAC3B,UAAM,EAAE,WAAW,WAAW,GAAG,MAAAA,OAAM,MAAM,MAAM,IAAI,KAAK;AAC5D,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;AACA,MAAM,gCAAgC,gBAAgB,EAAE,cAAc;AACtE,IAAO,cAAQ;",
+  "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"],
+  "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;",
   "names": ["i18n"]
 }

package/Document.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from 'react';
 import Document from 'next/document';
 export default class DigiGOVDocument extends Document {
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/Image/index.js CHANGED Viewed

@@ -2,8 +2,8 @@ import React from "react";
 import NextImage from "next/image";
 import { useBasePath } from "@digigov/nextjs/hooks";
 const Image = ({ src, ...rest }) => {
-  const basePathSrc = useBasePath(src);
-  return /* @__PURE__ */ React.createElement(NextImage, { src: basePathSrc, ...rest });
+  const basePathSrc = useBasePath(typeof src === "string" ? src : "");
+  return /* @__PURE__ */ React.createElement(NextImage, { src: typeof src === "string" ? basePathSrc : src, ...rest });
 };
 var Image_default = Image;
 export {

package/Image.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/Image.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport NextImage, { ImageProps } from 'next/image';\nimport { useBasePath } from '@digigov/nextjs/hooks';\n\nconst Image: React.FC<ImageProps> = ({ src, ...rest }) => {\n  const basePathSrc = useBasePath(src);\n  return <NextImage src={basePathSrc} {...rest} />;\n};\n\nexport default Image;\n"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,OAAO,eAA+B;AACtC,SAAS,mBAAmB;AAE5B,MAAM,QAA8B,CAAC,EAAE,KAAK,GAAG,KAAK,MAAM;AACxD,QAAM,cAAc,YAAY,GAAG;AACnC,SAAO,oCAAC,aAAU,KAAK,aAAc,GAAG,MAAM;AAChD;AAEA,IAAO,gBAAQ;",
+  "sourcesContent": ["import React from 'react';\nimport NextImage, { ImageProps } from 'next/image';\nimport { useBasePath } from '@digigov/nextjs/hooks';\n\nconst Image: React.FC<ImageProps> = ({ src, ...rest }) => {\n  const basePathSrc = useBasePath(typeof src === 'string' ? src : '');\n  return (\n    <NextImage src={typeof src === 'string' ? basePathSrc : src} {...rest} />\n  );\n};\n\nexport default Image;\n"],
+  "mappings": "AAAA,OAAO,WAAW;AAClB,OAAO,eAA+B;AACtC,SAAS,mBAAmB;AAE5B,MAAM,QAA8B,CAAC,EAAE,KAAK,GAAG,KAAK,MAAM;AACxD,QAAM,cAAc,YAAY,OAAO,QAAQ,WAAW,MAAM,EAAE;AAClE,SACE,oCAAC,aAAU,KAAK,OAAO,QAAQ,WAAW,cAAc,KAAM,GAAG,MAAM;AAE3E;AAEA,IAAO,gBAAQ;",
   "names": []
 }

package/Link/index.js CHANGED Viewed

@@ -1,25 +1,20 @@
 import React, { useEffect } from "react";
-import Link from "next/link";
+import NextRouterLink from "next/link";
 import { useRouter } from "next/router";
-import LinkBase from "@digigov/react-core/LinkBase";
+import { Link } from "@digigov/ui/navigation/Link";
 const NextLink = (props, ref) => {
-  const { href, ...other } = props;
-  const isExternalLink = (
-    //check if url has a file extension
-    /^(?:[a-z]+:)?\/\/|.pdf|.docx?|.xlsx?/i.test(href || "") || // or if props has a target or rel
-    other.target === "_blank"
-  );
+  const { href, as, ...other } = props;
+  const isExternalLink = /^(?:[a-z]+:)?\/\/|\.pdf|\.docx?|\.xlsx?|^mailto:/i.test(href || "") || other.target === "_blank";
   const router = useRouter();
   useEffect(() => {
     const path = router.asPath;
-    if (path && path.includes("#")) {
+    if (path.includes("#")) {
       setTimeout(() => {
         const id = path.replace("#", "");
-        const el = window.document.getElementById(id);
-        const r = el?.getBoundingClientRect();
-        if (r) {
-          window.top?.scroll({
-            top: scrollY + r.top,
+        const el = document.getElementById(id);
+        if (el) {
+          window.scroll({
+            top: scrollY + el.getBoundingClientRect().top,
             behavior: "smooth"
           });
         }
@@ -27,9 +22,9 @@ const NextLink = (props, ref) => {
     }
   }, [router.asPath]);
   if (isExternalLink) {
-    return /* @__PURE__ */ React.createElement(LinkBase, { ref, href: href || "#", ...other }, props.children);
+    return /* @__PURE__ */ React.createElement(Link, { ref, href: href || "#", ...other }, props.children);
   }
-  return /* @__PURE__ */ React.createElement(Link, { href: href || "#", ...other }, /* @__PURE__ */ React.createElement(LinkBase, { ref, ...other }, props.children));
+  return /* @__PURE__ */ React.createElement(NextRouterLink, { href: href || "#", as: void 0, ...other }, /* @__PURE__ */ React.createElement(Link, { ref, ...other, as }, props.children));
 };
 var Link_default = React.forwardRef(NextLink);
 export {

package/Link.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import React from 'react';
 import { LinkProps } from '@digigov/ui/navigation/Link';
-declare const _default: React.ForwardRefExoticComponent<Pick<LinkProps, "p" | "slot" | "style" | "title" | "as" | "className" | "color" | "id" | "lang" | "media" | "target" | "type" | "role" | "tabIndex" | "href" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "placeholder" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "download" | "hrefLang" | "ping" | "rel" | "referrerPolicy" | "margin" | "marginTop" | "marginBottom" | "marginLeft" | "marginRight" | "m" | "mt" | "mb" | "ml" | "mr" | "mx" | "my" | "padding" | "paddingTop" | "paddingBottom" | "paddingLeft" | "paddingRight" | "pt" | "pb" | "pl" | "pr" | "px" | "py" | "printHidden" | "printVisible" | "xsUpHidden" | "smUpHidden" | "mdUpHidden" | "lgUpHidden" | "xlUpHidden" | "xsHidden" | "smHidden" | "mdHidden" | "lgHidden" | "xlHidden" | "underline"> & React.RefAttributes<HTMLAnchorElement>>;
+declare const _default: React.ForwardRefExoticComponent<Omit<LinkProps, "ref"> & React.RefAttributes<HTMLAnchorElement>>;
 export default _default;

package/Link.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/Link.tsx"],
-  "sourcesContent": ["import React, { useEffect } from 'react';\nimport Link from 'next/link';\nimport { useRouter } from 'next/router';\nimport LinkBase from '@digigov/react-core/LinkBase';\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]+:)?\\/\\/|.pdf|.docx?|.xlsx?/i.test(href || '') ||\n    // or if props has a target or rel\n    other.target === '_blank';\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  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"],
-  "mappings": "AAAA,OAAO,SAAS,iBAAiB;AACjC,OAAO,UAAU;AACjB,SAAS,iBAAiB;AAC1B,OAAO,cAAc;AAGrB,MAAM,WAAyE,CAC7E,OACA,QACG;AACH,QAAM,EAAE,MAAM,GAAG,MAAM,IAAI;AAC3B,QAAM;AAAA;AAAA,IAEJ,wCAAwC,KAAK,QAAQ,EAAE;AAAA,IAEvD,MAAM,WAAW;AAAA;AACnB,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;AACA,SACE,oCAAC,QAAK,MAAM,QAAQ,KAAM,GAAG,SAC3B,oCAAC,YAAS,KAAW,GAAG,SACrB,MAAM,QACT,CACF;AAEJ;AAEA,IAAO,eAAQ,MAAM,WAAW,QAAQ;",
+  "sourcesContent": ["import React, { useEffect } from 'react';\nimport NextRouterLink from 'next/link';\nimport { useRouter } from 'next/router';\nimport { Link, LinkProps } from '@digigov/ui/navigation/Link';\n\nconst NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (\n  props,\n  ref\n) => {\n  const { href, as, ...other } = props;\n  const isExternalLink =\n    /^(?:[a-z]+:)?\\/\\/|\\.pdf|\\.docx?|\\.xlsx?|^mailto:/i.test(href || '') ||\n    other.target === '_blank';\n\n  const router = useRouter();\n\n  useEffect(() => {\n    const path = router.asPath;\n    if (path.includes('#')) {\n      setTimeout(() => {\n        const id = path.replace('#', '');\n        const el = document.getElementById(id);\n        if (el) {\n          window.scroll({\n            top: scrollY + el.getBoundingClientRect().top,\n            behavior: 'smooth',\n          });\n        }\n      }, 600);\n    }\n  }, [router.asPath]);\n\n  if (isExternalLink) {\n    return (\n      <Link ref={ref} href={href || '#'} {...other}>\n        {props.children}\n      </Link>\n    );\n  }\n\n  return (\n    <NextRouterLink href={href || '#'} as={undefined} {...other}>\n      <Link ref={ref} {...other} as={as}>\n        {props.children}\n      </Link>\n    </NextRouterLink>\n  );\n};\n\nexport default React.forwardRef(NextLink);\n"],
+  "mappings": "AAAA,OAAO,SAAS,iBAAiB;AACjC,OAAO,oBAAoB;AAC3B,SAAS,iBAAiB;AAC1B,SAAS,YAAuB;AAEhC,MAAM,WAAyE,CAC7E,OACA,QACG;AACH,QAAM,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;AAC/B,QAAM,iBACJ,oDAAoD,KAAK,QAAQ,EAAE,KACnE,MAAM,WAAW;AAEnB,QAAM,SAAS,UAAU;AAEzB,YAAU,MAAM;AACd,UAAM,OAAO,OAAO;AACpB,QAAI,KAAK,SAAS,GAAG,GAAG;AACtB,iBAAW,MAAM;AACf,cAAM,KAAK,KAAK,QAAQ,KAAK,EAAE;AAC/B,cAAM,KAAK,SAAS,eAAe,EAAE;AACrC,YAAI,IAAI;AACN,iBAAO,OAAO;AAAA,YACZ,KAAK,UAAU,GAAG,sBAAsB,EAAE;AAAA,YAC1C,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,QAAK,KAAU,MAAM,QAAQ,KAAM,GAAG,SACpC,MAAM,QACT;AAAA,EAEJ;AAEA,SACE,oCAAC,kBAAe,MAAM,QAAQ,KAAK,IAAI,QAAY,GAAG,SACpD,oCAAC,QAAK,KAAW,GAAG,OAAO,MACxB,MAAM,QACT,CACF;AAEJ;AAEA,IAAO,eAAQ,MAAM,WAAW,QAAQ;",
   "names": []
 }

package/cjs/App/index.js CHANGED Viewed

@@ -33,14 +33,19 @@ module.exports = __toCommonJS(App_exports);
 var import_react = __toESM(require("react"));
 var import_app = __toESM(require("next/app"));
 var import_head = __toESM(require("next/head"));
+var import_router = require("next/router");
 var import_react_i18next = require("react-i18next");
 var import_Link = __toESM(require("@digigov/nextjs/Link"));
 var import_App = __toESM(require("@digigov/ui/app/App"));
 var import_i18n = require("@digigov/ui/i18n");
 var import_Link2 = require("@digigov/ui/navigation/Link");
-class DigiGOVNextApp extends import_app.default {
+class DigiGOVNextAppClass extends import_app.default {
   render() {
-    const { Component, pageProps, t, i18n: i18n2, ssr = false } = this.props;
+    const { Component, pageProps, t, i18n: i18n2, ssr = false, router } = this.props;
+    const { locale } = router;
+    if (locale && i18n2.language != locale) {
+      i18n2.changeLanguage(locale);
+    }
     return /* @__PURE__ */ import_react.default.createElement(
       import_i18n.I18NProvider,
       {
@@ -57,6 +62,10 @@ class DigiGOVNextApp extends import_app.default {
     );
   }
 }
-const DigiGOVNextAppWithTranslation = (0, import_react_i18next.withTranslation)()(DigiGOVNextApp);
-var App_default = DigiGOVNextAppWithTranslation;
+const DigiGOVNextAppWithTranslation = (0, import_react_i18next.withTranslation)()(DigiGOVNextAppClass);
+const DigiGOVNextApp = (props) => {
+  const router = (0, import_router.useRouter)();
+  return /* @__PURE__ */ import_react.default.createElement(DigiGOVNextAppWithTranslation, { ...props, router });
+};
+var App_default = DigiGOVNextApp;
 //# sourceMappingURL=App.js.map

package/cjs/App.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/App.tsx"],
-  "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';\n\nexport interface DigiGOVNextAppProps extends AppProps, WithTranslation {\n  children?: React.ReactNode;\n  t: TFunction;\n  i18n: i18n;\n  ssr: boolean;\n}\nclass DigiGOVNextApp extends App<DigiGOVNextAppProps> {\n  render(): React.ReactElement {\n    const { Component, pageProps, t, i18n, ssr = false } = this.props;\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}\nconst DigiGOVNextAppWithTranslation = withTranslation()(DigiGOVNextApp);\nexport default DigiGOVNextAppWithTranslation;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,iBAAgB;AAChB,kBAAiB;AACjB,2BAAiD;AACjD,kBAAqB;AACrB,iBAAsC;AAEtC,kBAA6B;AAC7B,IAAAA,eAA6B;AAQ7B,MAAM,uBAAuB,WAAAC,QAAyB;AAAA,EACpD,SAA6B;AAC3B,UAAM,EAAE,WAAW,WAAW,GAAG,MAAAC,OAAM,MAAM,MAAM,IAAI,KAAK;AAC5D,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;AACA,MAAM,oCAAgC,sCAAgB,EAAE,cAAc;AACtE,IAAO,cAAQ;",
+  "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"],
+  "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;",
   "names": ["import_Link", "App", "i18n", "React", "NextLink", "Head", "DigiGOVApp"]
 }

package/cjs/Image/index.js CHANGED Viewed

@@ -34,8 +34,8 @@ var import_react = __toESM(require("react"));
 var import_image = __toESM(require("next/image"));
 var import_hooks = require("@digigov/nextjs/hooks");
 const Image = ({ src, ...rest }) => {
-  const basePathSrc = (0, import_hooks.useBasePath)(src);
-  return /* @__PURE__ */ import_react.default.createElement(import_image.default, { src: basePathSrc, ...rest });
+  const basePathSrc = (0, import_hooks.useBasePath)(typeof src === "string" ? src : "");
+  return /* @__PURE__ */ import_react.default.createElement(import_image.default, { src: typeof src === "string" ? basePathSrc : src, ...rest });
 };
 var Image_default = Image;
 //# sourceMappingURL=Image.js.map

package/cjs/Image.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Image.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport NextImage, { ImageProps } from 'next/image';\nimport { useBasePath } from '@digigov/nextjs/hooks';\n\nconst Image: React.FC<ImageProps> = ({ src, ...rest }) => {\n  const basePathSrc = useBasePath(src);\n  return <NextImage src={basePathSrc} {...rest} />;\n};\n\nexport default Image;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,mBAAsC;AACtC,mBAA4B;AAE5B,MAAM,QAA8B,CAAC,EAAE,KAAK,GAAG,KAAK,MAAM;AACxD,QAAM,kBAAc,0BAAY,GAAG;AACnC,SAAO,6BAAAA,QAAA,cAAC,aAAAC,SAAA,EAAU,KAAK,aAAc,GAAG,MAAM;AAChD;AAEA,IAAO,gBAAQ;",
+  "sourcesContent": ["import React from 'react';\nimport NextImage, { ImageProps } from 'next/image';\nimport { useBasePath } from '@digigov/nextjs/hooks';\n\nconst Image: React.FC<ImageProps> = ({ src, ...rest }) => {\n  const basePathSrc = useBasePath(typeof src === 'string' ? src : '');\n  return (\n    <NextImage src={typeof src === 'string' ? basePathSrc : src} {...rest} />\n  );\n};\n\nexport default Image;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAClB,mBAAsC;AACtC,mBAA4B;AAE5B,MAAM,QAA8B,CAAC,EAAE,KAAK,GAAG,KAAK,MAAM;AACxD,QAAM,kBAAc,0BAAY,OAAO,QAAQ,WAAW,MAAM,EAAE;AAClE,SACE,6BAAAA,QAAA,cAAC,aAAAC,SAAA,EAAU,KAAK,OAAO,QAAQ,WAAW,cAAc,KAAM,GAAG,MAAM;AAE3E;AAEA,IAAO,gBAAQ;",
   "names": ["React", "NextImage"]
 }

package/cjs/Link/index.js CHANGED Viewed

@@ -33,25 +33,20 @@ module.exports = __toCommonJS(Link_exports);
 var import_react = __toESM(require("react"));
 var import_link = __toESM(require("next/link"));
 var import_router = require("next/router");
-var import_LinkBase = __toESM(require("@digigov/react-core/LinkBase"));
+var import_Link = require("@digigov/ui/navigation/Link");
 const NextLink = (props, ref) => {
-  const { href, ...other } = props;
-  const isExternalLink = (
-    //check if url has a file extension
-    /^(?:[a-z]+:)?\/\/|.pdf|.docx?|.xlsx?/i.test(href || "") || // or if props has a target or rel
-    other.target === "_blank"
-  );
+  const { href, as, ...other } = props;
+  const isExternalLink = /^(?:[a-z]+:)?\/\/|\.pdf|\.docx?|\.xlsx?|^mailto:/i.test(href || "") || other.target === "_blank";
   const router = (0, import_router.useRouter)();
   (0, import_react.useEffect)(() => {
     const path = router.asPath;
-    if (path && path.includes("#")) {
+    if (path.includes("#")) {
       setTimeout(() => {
         const id = path.replace("#", "");
-        const el = window.document.getElementById(id);
-        const r = el?.getBoundingClientRect();
-        if (r) {
-          window.top?.scroll({
-            top: scrollY + r.top,
+        const el = document.getElementById(id);
+        if (el) {
+          window.scroll({
+            top: scrollY + el.getBoundingClientRect().top,
             behavior: "smooth"
           });
         }
@@ -59,9 +54,9 @@ const NextLink = (props, ref) => {
     }
   }, [router.asPath]);
   if (isExternalLink) {
-    return /* @__PURE__ */ import_react.default.createElement(import_LinkBase.default, { ref, href: href || "#", ...other }, props.children);
+    return /* @__PURE__ */ import_react.default.createElement(import_Link.Link, { ref, href: href || "#", ...other }, props.children);
   }
-  return /* @__PURE__ */ import_react.default.createElement(import_link.default, { href: href || "#", ...other }, /* @__PURE__ */ import_react.default.createElement(import_LinkBase.default, { ref, ...other }, props.children));
+  return /* @__PURE__ */ import_react.default.createElement(import_link.default, { href: href || "#", as: void 0, ...other }, /* @__PURE__ */ import_react.default.createElement(import_Link.Link, { ref, ...other, as }, props.children));
 };
 var Link_default = import_react.default.forwardRef(NextLink);
 //# sourceMappingURL=Link.js.map

package/cjs/Link.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/Link.tsx"],
-  "sourcesContent": ["import React, { useEffect } from 'react';\nimport Link from 'next/link';\nimport { useRouter } from 'next/router';\nimport LinkBase from '@digigov/react-core/LinkBase';\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]+:)?\\/\\/|.pdf|.docx?|.xlsx?/i.test(href || '') ||\n    // or if props has a target or rel\n    other.target === '_blank';\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  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"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAiC;AACjC,kBAAiB;AACjB,oBAA0B;AAC1B,sBAAqB;AAGrB,MAAM,WAAyE,CAC7E,OACA,QACG;AACH,QAAM,EAAE,MAAM,GAAG,MAAM,IAAI;AAC3B,QAAM;AAAA;AAAA,IAEJ,wCAAwC,KAAK,QAAQ,EAAE;AAAA,IAEvD,MAAM,WAAW;AAAA;AACnB,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,gBAAAC,SAAA,EAAS,KAAU,MAAM,QAAQ,KAAM,GAAG,SACxC,MAAM,QACT;AAAA,EAEJ;AACA,SACE,6BAAAD,QAAA,cAAC,YAAAE,SAAA,EAAK,MAAM,QAAQ,KAAM,GAAG,SAC3B,6BAAAF,QAAA,cAAC,gBAAAC,SAAA,EAAS,KAAW,GAAG,SACrB,MAAM,QACT,CACF;AAEJ;AAEA,IAAO,eAAQ,aAAAD,QAAM,WAAW,QAAQ;",
-  "names": ["React", "LinkBase", "Link"]
+  "sourcesContent": ["import React, { useEffect } from 'react';\nimport NextRouterLink from 'next/link';\nimport { useRouter } from 'next/router';\nimport { Link, LinkProps } from '@digigov/ui/navigation/Link';\n\nconst NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (\n  props,\n  ref\n) => {\n  const { href, as, ...other } = props;\n  const isExternalLink =\n    /^(?:[a-z]+:)?\\/\\/|\\.pdf|\\.docx?|\\.xlsx?|^mailto:/i.test(href || '') ||\n    other.target === '_blank';\n\n  const router = useRouter();\n\n  useEffect(() => {\n    const path = router.asPath;\n    if (path.includes('#')) {\n      setTimeout(() => {\n        const id = path.replace('#', '');\n        const el = document.getElementById(id);\n        if (el) {\n          window.scroll({\n            top: scrollY + el.getBoundingClientRect().top,\n            behavior: 'smooth',\n          });\n        }\n      }, 600);\n    }\n  }, [router.asPath]);\n\n  if (isExternalLink) {\n    return (\n      <Link ref={ref} href={href || '#'} {...other}>\n        {props.children}\n      </Link>\n    );\n  }\n\n  return (\n    <NextRouterLink href={href || '#'} as={undefined} {...other}>\n      <Link ref={ref} {...other} as={as}>\n        {props.children}\n      </Link>\n    </NextRouterLink>\n  );\n};\n\nexport default React.forwardRef(NextLink);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAiC;AACjC,kBAA2B;AAC3B,oBAA0B;AAC1B,kBAAgC;AAEhC,MAAM,WAAyE,CAC7E,OACA,QACG;AACH,QAAM,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;AAC/B,QAAM,iBACJ,oDAAoD,KAAK,QAAQ,EAAE,KACnE,MAAM,WAAW;AAEnB,QAAM,aAAS,yBAAU;AAEzB,8BAAU,MAAM;AACd,UAAM,OAAO,OAAO;AACpB,QAAI,KAAK,SAAS,GAAG,GAAG;AACtB,iBAAW,MAAM;AACf,cAAM,KAAK,KAAK,QAAQ,KAAK,EAAE;AAC/B,cAAM,KAAK,SAAS,eAAe,EAAE;AACrC,YAAI,IAAI;AACN,iBAAO,OAAO;AAAA,YACZ,KAAK,UAAU,GAAG,sBAAsB,EAAE;AAAA,YAC1C,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,oBAAK,KAAU,MAAM,QAAQ,KAAM,GAAG,SACpC,MAAM,QACT;AAAA,EAEJ;AAEA,SACE,6BAAAA,QAAA,cAAC,YAAAC,SAAA,EAAe,MAAM,QAAQ,KAAK,IAAI,QAAY,GAAG,SACpD,6BAAAD,QAAA,cAAC,oBAAK,KAAW,GAAG,OAAO,MACxB,MAAM,QACT,CACF;AAEJ;AAEA,IAAO,eAAQ,aAAAA,QAAM,WAAW,QAAQ;",
+  "names": ["React", "NextRouterLink"]
 }

package/index.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/** @license Digigov v1.1.5-rc.17
+/** @license Digigov v1.1.5-rc.30
  *
  * This source code is licensed under the BSD-2-Clause license found in the
  * LICENSE file in the root directory of this source tree.

package/package.json CHANGED Viewed

@@ -1,19 +1,19 @@
 {
   "name": "@digigov/nextjs",
-  "version": "1.1.5-rc.17",
+  "version": "1.1.5-rc.30",
   "description": "next specific utilities for @digigov apps",
   "author": "GRNET Developers <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "peerDependencies": {
-    "@digigov/ui": "2.0.0-rc.17",
-    "@digigov/react-core": "2.0.0-rc.17",
+    "@digigov/ui": "2.0.0-rc.30",
+    "@digigov/react-core": "2.0.0-rc.30",
     "clsx": "1.1.1",
     "i18next": "19.1.0",
-    "react": "^16.8.0 || ^17.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0",
-    "next": "10.0.9",
+    "react": ">=16.8.0 <19.0.0",
+    "react-dom": ">=16.8.0 <19.0.0",
+    "next": "13.1.1",
     "react-i18next": "11.3.3"
   },
   "gitHead": "7237a2d58c6b30979837579e51251543aff0c240",

package/src/App.tsx CHANGED Viewed

@@ -2,6 +2,7 @@ import React from 'react';
 import { i18n, TFunction } from 'i18next';
 import App from 'next/app';
 import Head from 'next/head';
+import { NextRouter, useRouter } from 'next/router';
 import { withTranslation, WithTranslation } from 'react-i18next';
 import NextLink from '@digigov/nextjs/Link';
 import DigiGOVApp, { StaticApp } from '@digigov/ui/app/App';
@@ -14,10 +15,16 @@ export interface DigiGOVNextAppProps extends AppProps, WithTranslation {
   t: TFunction;
   i18n: i18n;
   ssr: boolean;
+  router: NextRouter;
 }
-class DigiGOVNextApp extends App<DigiGOVNextAppProps> {
+class DigiGOVNextAppClass extends App<DigiGOVNextAppProps> {
   render(): React.ReactElement {
-    const { Component, pageProps, t, i18n, ssr = false } = this.props;
+    const { Component, pageProps, t, i18n, ssr = false, router } = this.props;
+    const { locale } = router;
+    if (locale && i18n.language != locale) {
+      i18n.changeLanguage(locale);
+    }
     return (
       <I18NProvider
         t={(str) => (typeof str === 'string' ? t(str) : str)}
@@ -44,5 +51,10 @@ class DigiGOVNextApp extends App<DigiGOVNextAppProps> {
     );
   }
 }
-const DigiGOVNextAppWithTranslation = withTranslation()(DigiGOVNextApp);
-export default DigiGOVNextAppWithTranslation;
+const DigiGOVNextAppWithTranslation = withTranslation()(DigiGOVNextAppClass);
+const DigiGOVNextApp = (props) => {
+  const router = useRouter();
+  return <DigiGOVNextAppWithTranslation {...props} router={router} />;
+};
+export default DigiGOVNextApp;

package/src/Image.tsx CHANGED Viewed

@@ -3,8 +3,10 @@ import NextImage, { ImageProps } from 'next/image';
 import { useBasePath } from '@digigov/nextjs/hooks';
 const Image: React.FC<ImageProps> = ({ src, ...rest }) => {
-  const basePathSrc = useBasePath(src);
-  return <NextImage src={basePathSrc} {...rest} />;
+  const basePathSrc = useBasePath(typeof src === 'string' ? src : '');
+  return (
+    <NextImage src={typeof src === 'string' ? basePathSrc : src} {...rest} />
+  );
 };
 export default Image;

package/src/Link.tsx CHANGED Viewed

@@ -1,31 +1,28 @@
 import React, { useEffect } from 'react';
-import Link from 'next/link';
+import NextRouterLink from 'next/link';
 import { useRouter } from 'next/router';
-import LinkBase from '@digigov/react-core/LinkBase';
-import { LinkProps } from '@digigov/ui/navigation/Link';
+import { Link, LinkProps } from '@digigov/ui/navigation/Link';
 const NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (
   props,
   ref
 ) => {
-  const { href, ...other } = props;
+  const { href, as, ...other } = props;
   const isExternalLink =
-    //check if url has a file extension
-    /^(?:[a-z]+:)?\/\/|.pdf|.docx?|.xlsx?/i.test(href || '') ||
-    // or if props has a target or rel
+    /^(?:[a-z]+:)?\/\/|\.pdf|\.docx?|\.xlsx?|^mailto:/i.test(href || '') ||
     other.target === '_blank';
   const router = useRouter();
   useEffect(() => {
     const path = router.asPath;
-    if (path && path.includes('#')) {
+    if (path.includes('#')) {
       setTimeout(() => {
         const id = path.replace('#', '');
-        const el = window.document.getElementById(id);
-        const r = el?.getBoundingClientRect();
-        if (r) {
-          window.top?.scroll({
-            top: scrollY + r.top,
+        const el = document.getElementById(id);
+        if (el) {
+          window.scroll({
+            top: scrollY + el.getBoundingClientRect().top,
             behavior: 'smooth',
           });
         }
@@ -35,17 +32,18 @@ const NextLink: React.ForwardRefRenderFunction<HTMLAnchorElement, LinkProps> = (
   if (isExternalLink) {
     return (
-      <LinkBase ref={ref} href={href || '#'} {...other}>
+      <Link ref={ref} href={href || '#'} {...other}>
         {props.children}
-      </LinkBase>
+      </Link>
     );
   }
   return (
-    <Link href={href || '#'} {...other}>
-      <LinkBase ref={ref} {...other}>
+    <NextRouterLink href={href || '#'} as={undefined} {...other}>
+      <Link ref={ref} {...other} as={as}>
         {props.children}
-      </LinkBase>
-    </Link>
+      </Link>
+    </NextRouterLink>
   );
 };