@webstudio-is/sdk-components-react-remix 0.100.1-c4ae8b2.0 → 0.101.0

package/lib/components.js

@@ -2,25 +2,19 @@
 import { Link as BaseLink } from "@webstudio-is/sdk-components-react";
 
 // src/shared/remix-link.tsx
-import { forwardRef } from "react";
+import { forwardRef, useContext } from "react";
 import { NavLink as RemixLink } from "@remix-run/react";
-import {
-  usePropUrl,
-  getInstanceIdFromComponentProps
-} from "@webstudio-is/react-sdk";
+import { ReactSdkContext } from "@webstudio-is/react-sdk";
 import { jsx } from "react/jsx-runtime";
 var wrapLinkComponent = (BaseLink3) => {
   const Component = forwardRef((props, ref) => {
-    const href = usePropUrl(getInstanceIdFromComponentProps(props), "href");
-    if (href?.type === "page") {
-      let to = href.page.path === "" ? "/" : href.page.path;
-      const urlTo = new URL(to, "https://any-valid.url");
-      to = urlTo.pathname;
-      if (href.hash !== void 0) {
-        urlTo.hash = encodeURIComponent(href.hash);
-        to = `${urlTo.pathname}${urlTo.hash}`;
+    const { pagesPaths } = useContext(ReactSdkContext);
+    const href = props.href;
+    if (href !== void 0) {
+      const url = new URL(href, "https://any-valid.url");
+      if (pagesPaths.has(url.pathname === "/" ? "" : url.pathname)) {
+        return /* @__PURE__ */ jsx(RemixLink, { ...props, to: href, ref });
       }
-      return /* @__PURE__ */ jsx(RemixLink, { ...props, to, ref });
     }
     const { prefetch, reloadDocument, replace, preventScrollReset, ...rest } = props;
     return /* @__PURE__ */ jsx(BaseLink3, { ...rest, ref });
@@ -44,7 +38,7 @@ import {
 } from "react";
 import { useFetcher } from "@remix-run/react";
 import { formIdFieldName } from "@webstudio-is/form-handlers";
-import { getInstanceIdFromComponentProps as getInstanceIdFromComponentProps2 } from "@webstudio-is/react-sdk";
+import { getInstanceIdFromComponentProps } from "@webstudio-is/react-sdk";
 import { jsx as jsx2, jsxs } from "react/jsx-runtime";
 var useOnFetchEnd = (fetcher, handler) => {
   const latestHandler = useRef(handler);
@@ -60,7 +54,7 @@ var useOnFetchEnd = (fetcher, handler) => {
 var Form = forwardRef2(
   ({ children, action, method, state = "initial", onStateChange, ...rest }, ref) => {
     const fetcher = useFetcher();
-    const instanceId = getInstanceIdFromComponentProps2(rest);
+    const instanceId = getInstanceIdFromComponentProps(rest);
     useOnFetchEnd(fetcher, (data) => {
       const state2 = data?.success === true ? "success" : "error";
       onStateChange?.(state2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/sdk-components-react-remix",
-  "version": "0.100.1-c4ae8b2.0",
+  "version": "0.101.0",
   "description": "Webstudio components for Remix",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -14,19 +14,19 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "source": "./src/components.ts",
+      "webstudio": "./src/components.ts",
       "types": "./lib/types/components.d.ts",
       "import": "./lib/components.js",
       "require": "./lib/components.js"
     },
     "./metas": {
-      "source": "./src/metas.ts",
+      "webstudio": "./src/metas.ts",
       "types": "./lib/types/metas.d.ts",
       "import": "./lib/metas.js",
       "require": "./lib/metas.js"
     },
     "./props": {
-      "source": "./src/props.ts",
+      "webstudio": "./src/props.ts",
       "types": "./lib/types/props.d.ts",
       "import": "./lib/props.js",
       "require": "./lib/props.js"
@@ -38,10 +38,10 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@webstudio-is/form-handlers": "0.100.1-c4ae8b2.0",
-    "@webstudio-is/icons": "0.100.1-c4ae8b2.0",
-    "@webstudio-is/react-sdk": "0.100.1-c4ae8b2.0",
-    "@webstudio-is/sdk-components-react": "0.100.1-c4ae8b2.0"
+    "@webstudio-is/form-handlers": "0.101.0",
+    "@webstudio-is/icons": "0.101.0",
+    "@webstudio-is/react-sdk": "0.101.0",
+    "@webstudio-is/sdk-components-react": "0.101.0"
   },
   "devDependencies": {
     "@remix-run/react": "^1.19.2",
@@ -50,13 +50,13 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "5.2.2",
-    "@webstudio-is/generate-arg-types": "0.100.1-c4ae8b2.0",
-    "@webstudio-is/tsconfig": "1.0.8-c4ae8b2.0"
+    "@webstudio-is/generate-arg-types": "0.101.0",
+    "@webstudio-is/tsconfig": "1.0.7"
   },
   "scripts": {
     "dev": "rm -rf lib && esbuild 'src/**/*.ts' 'src/**/*.tsx' --outdir=lib --watch",
     "build": "rm -rf lib && esbuild src/components.ts src/metas.ts src/props.ts --outdir=lib --bundle --format=esm --packages=external",
-    "build:args": "NODE_OPTIONS=--conditions=source generate-arg-types './src/*.tsx !./src/**/*.stories.tsx !./src/**/*.ws.tsx' && prettier --write \"**/*.props.ts\"",
+    "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/**/*.stories.tsx !./src/**/*.ws.tsx' && prettier --write \"**/*.props.ts\"",
     "dts": "tsc --project tsconfig.dts.json",
     "typecheck": "tsc",
     "checks": "pnpm typecheck"