@webstudio-is/sdk-components-react-router 0.268.0 → 0.270.0

package/lib/components.js

@@ -12,28 +12,17 @@ var Body = forwardRef(
 Body.displayName = "Body";
 
 // src/link.tsx
-import { forwardRef as forwardRef2, useContext } from "react";
-import { NavLink as RemixLink } from "react-router";
-import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";
-import { Link as BaseLink } from "@webstudio-is/sdk-components-react";
-import { jsx as jsx2 } from "react/jsx-runtime";
-var Link = forwardRef2((props, ref) => {
-  const { assetBaseUrl } = useContext(ReactSdkContext);
-  const href = String(props.href ?? "");
-  if (
-    // remix appends ?index in runtime but not in ssr
-    href === "" || href.startsWith("?") || href.startsWith("/") && href.startsWith(assetBaseUrl) === false
-  ) {
-    return /* @__PURE__ */ jsx2(RemixLink, { ...props, to: href, ref, end: true });
-  }
-  const { prefetch, reloadDocument, replace, preventScrollReset, ...rest } = props;
-  return /* @__PURE__ */ jsx2(BaseLink, { ...rest, ref });
+import { Link as RouterLink, useLocation, useResolvedPath } from "react-router";
+import { createLink } from "@webstudio-is/sdk-components-react";
+var Link = createLink({
+  Link: RouterLink,
+  useLocation,
+  useResolvedPath
 });
-Link.displayName = BaseLink.displayName;
 
 // src/webhook-form.tsx
 import {
-  forwardRef as forwardRef3,
+  forwardRef as forwardRef2,
   useRef,
   useEffect
 } from "react";
@@ -43,7 +32,7 @@ import {
   formBotFieldName,
   isBraveBrowser
 } from "@webstudio-is/sdk/runtime";
-import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
+import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var useOnFetchEnd = (fetcher, handler) => {
   const latestHandler = useRef(handler);
   latestHandler.current = handler;
@@ -81,7 +70,7 @@ var isJSDom = () => {
   const hasMatchMedia = matchAspectRatio && matchWidthHeight && !matchWidthHeightFail && matchLight !== matchDark;
   return hasMatchMedia === false;
 };
-var WebhookForm = forwardRef3(
+var WebhookForm = forwardRef2(
   ({ children, action, method, state = "initial", onStateChange, ...rest }, ref) => {
     const fetcher = useFetcher();
     useOnFetchEnd(fetcher, (data) => {
@@ -108,7 +97,7 @@ var WebhookForm = forwardRef3(
         ref,
         onSubmit: handleSubmitAndAddHiddenJsField,
         children: [
-          /* @__PURE__ */ jsx3(
+          /* @__PURE__ */ jsx2(
             "input",
             {
               type: "hidden",
@@ -125,15 +114,15 @@ var WebhookForm = forwardRef3(
 WebhookForm.displayName = "WebhookForm";
 
 // src/remix-form.tsx
-import { forwardRef as forwardRef4 } from "react";
+import { forwardRef as forwardRef3 } from "react";
 import { Form } from "react-router";
-import { jsx as jsx4 } from "react/jsx-runtime";
-var RemixForm = forwardRef4(({ action, method, ...props }, ref) => {
+import { jsx as jsx3 } from "react/jsx-runtime";
+var RemixForm = forwardRef3(({ action, method, ...props }, ref) => {
   if (method === "dialog") {
-    return /* @__PURE__ */ jsx4("form", { ...props, ref });
+    return /* @__PURE__ */ jsx3("form", { ...props, ref });
   }
   if (action === void 0 || action === "" || typeof action === "string" && action?.startsWith("/")) {
-    return /* @__PURE__ */ jsx4(
+    return /* @__PURE__ */ jsx3(
       Form,
       {
         action,
@@ -144,7 +133,7 @@ var RemixForm = forwardRef4(({ action, method, ...props }, ref) => {
       }
     );
   }
-  return /* @__PURE__ */ jsx4("form", { ...props, ref });
+  return /* @__PURE__ */ jsx3("form", { ...props, ref });
 });
 RemixForm.displayName = "Form";
 export {

package/lib/types/link.d.ts

@@ -2,15 +2,23 @@ export declare const Link: import("react").ForwardRefExoticComponent<Omit<Omit<O
     target?: "_self" | "_blank" | "_parent" | "_top";
     download?: boolean;
     prefetch?: "none" | "intent" | "render" | "viewport";
+    discover?: "render" | "none";
     preventScrollReset?: boolean;
     reloadDocument?: boolean;
     replace?: boolean;
+    relative?: "route" | "path";
+    state?: unknown;
+    viewTransition?: boolean;
 } & {
     $webstudio$canvasOnly$assetId?: string | undefined;
 }, "ref"> & import("react").RefAttributes<HTMLAnchorElement>, "ref">, "target"> & {
     target?: "_self" | "_blank" | "_parent" | "_top";
     prefetch?: "none" | "intent" | "render" | "viewport";
+    discover?: "render" | "none";
     reloadDocument?: boolean;
     replace?: boolean;
     preventScrollReset?: boolean;
+    relative?: "route" | "path";
+    state?: unknown;
+    viewTransition?: boolean;
 } & import("react").RefAttributes<HTMLAnchorElement>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/sdk-components-react-router",
-  "version": "0.268.0",
+  "version": "0.270.0",
   "description": "Webstudio components for React Router",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -25,20 +25,22 @@
   },
   "dependencies": {
     "react-router": "^7.5.3",
-    "@webstudio-is/react-sdk": "0.268.0",
-    "@webstudio-is/sdk": "0.268.0",
-    "@webstudio-is/sdk-components-react": "0.268.0"
+    "@webstudio-is/react-sdk": "0.270.0",
+    "@webstudio-is/sdk": "0.270.0",
+    "@webstudio-is/sdk-components-react": "0.270.0"
   },
   "devDependencies": {
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
+    "vitest": "^3.1.2",
     "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {
     "build": "rm -rf lib && esbuild src/components.ts --outdir=lib --bundle --format=esm --packages=external",
     "dts": "tsc --project tsconfig.dts.json",
+    "test": "vitest run",
     "typecheck": "tsgo --noEmit"
   }
 }