@okam/next-component 1.0.15 → 1.1.1

package/index.esm.js

@@ -4,6 +4,7 @@ import Image from 'next/image';
 import NextLink from 'next/link';
 import { useState, useCallback, useEffect, forwardRef } from 'react';
 import { usePathname, useSearchParams, useParams } from 'next/navigation';
+import { useLocale } from 'react-aria';
 import { useEvent } from 'react-use';
 
 function _define_property$1(obj, key, value) {
@@ -196,7 +197,7 @@ function scrollToTop(behavior) {
     });
 }
 function getParamsLocale(params) {
-    var locale = params.locale;
+    var locale = (params !== null && params !== void 0 ? params : {}).locale;
     if (Array.isArray(locale)) return locale[0];
     return locale;
 }
@@ -210,16 +211,25 @@ function getParamsLocale(params) {
     var locale = props.locale;
     var params = useParams();
     var paramsLocale = getParamsLocale(params);
-    if (locale === false) return false;
-    var _ref;
-    return (_ref = locale !== null && locale !== void 0 ? locale : paramsLocale) !== null && _ref !== void 0 ? _ref : false;
+    var _useLocale = useLocale(), ctxLocale = _useLocale.locale;
+    var _ref, _ref1;
+    return (_ref1 = (_ref = locale !== null && locale !== void 0 ? locale : ctxLocale) !== null && _ref !== void 0 ? _ref : paramsLocale) !== null && _ref1 !== void 0 ? _ref1 : false;
+}
+function localizeHref(href, locale) {
+    var hrefString = href.toString();
+    var isExternal = /^[a-z]+:\/\//i.test(hrefString) || hrefString.startsWith('//');
+    if (isExternal) return hrefString;
+    if (locale) {
+        return "/".concat(locale).concat(hrefString);
+    }
+    return hrefString;
 }
 /**
  * @params {props.locale} - The direct locale prop always gets priority. If no `locale` prop is provided, the prop will try to fall back to react-aria `useLocale` and then next/navigation `useParams`. If a locale is found, it will be automatically prepended to the href. Otherwise, href will be returned as is.
  */ function useLink(props) {
     var _props_scroll = props.scroll, scroll = _props_scroll === void 0 ? true : _props_scroll, onMouseEnter = props.onMouseEnter, onTouchStart = props.onTouchStart, onClick = props.onClick, onPathnameChange = props.onPathnameChange, onHashChange = props.onHashChange, onSearchParamsChange = props.onSearchParamsChange, href = props.href, urlDecorator = props.urlDecorator, replace = props.replace, prefetch = props.prefetch, shallow = props.shallow, passHref = props.passHref, legacyBehavior = props.legacyBehavior, _props_behavior = props.behavior, behavior = _props_behavior === void 0 ? 'instant' : _props_behavior;
     var locale = useLinkLocale(props);
-    var localizedHref = locale ? "/".concat(locale).concat(href) : href;
+    var localizedHref = localizeHref(href, locale);
     var pathname = usePathname();
     var searchParams = useSearchParams();
     var hash = useHash();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okam/next-component",
-  "version": "1.0.15",
+  "version": "1.1.1",
   "publishConfig": {
     "access": "public"
   },
@@ -8,11 +8,12 @@
     "url": "https://github.com/OKAMca/stack.git"
   },
   "dependencies": {
-    "@okam/stack-ui": "1.41.1",
+    "@okam/stack-ui": "1.41.2",
     "next": "^14.1.1",
     "react": "18.3.1",
     "react-use": "17.5.1",
-    "tailwind-variants": "^0.3.0"
+    "tailwind-variants": "^0.3.0",
+    "react-aria": "^3.39.0"
   },
   "module": "./index.esm.js",
   "type": "module",

package/src/hooks/useLink/index.d.ts

@@ -1,3 +1,4 @@
+import type { LinkProps } from 'next/link';
 import type { TLink, TUseLinkReturn } from './interface';
 /**
  * Tries to get the locale, in order of priority:
@@ -6,7 +7,8 @@ import type { TLink, TUseLinkReturn } from './interface';
  * 3. The locale from next/navigation `useParams`
  * @returns The best matched locale
  */
-export declare function useLinkLocale(props: TLink): any;
+export declare function useLinkLocale(props: TLink): string | false;
+export declare function localizeHref(href: LinkProps['href'], locale: LinkProps['locale']): string;
 /**
  * @params {props.locale} - The direct locale prop always gets priority. If no `locale` prop is provided, the prop will try to fall back to react-aria `useLocale` and then next/navigation `useParams`. If a locale is found, it will be automatically prepended to the href. Otherwise, href will be returned as is.
  */