Merge branch 'remix-run:main' into fix/double-encoding

Author: ynakoo

docs/api/components/Form.md

@@ -62,17 +62,17 @@ closest route in context.
 
 ### discover
 
-Defines the link discovery behavior. See [`DiscoverBehavior`](https://api.reactrouter.com/v7/types/react_router.DiscoverBehavior.html).
+Defines the form [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+
+- **render** — default, discover the route when the form renders
+- **none** — don't eagerly discover, only discover if the form is submitted
 
 ```tsx
-<Link /> // default ("render")
-<Link discover="render" />
-<Link discover="none" />
+<Form /> // default ("render")
+<Form discover="render" />
+<Form discover="none" />
 ```
 
-- **render** — default, discover the route when the link renders
-- **none** — don't eagerly discover, only discover if the link is clicked
-
 ### encType
 
 The encoding type to use for the form submission.

docs/api/components/Link.md

@@ -45,17 +45,17 @@ import { Link } from "react-router";
 
 [modes: framework]
 
-Defines the link discovery behavior
+Defines the link [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+
+- **render** — default, discover the route when the link renders
+- **none** — don't eagerly discover, only discover if the link is clicked
 
 ```tsx
 <Link /> // default ("render")
 <Link discover="render" />
 <Link discover="none" />
 ```
 
-- **render** — default, discover the route when the link renders
-- **none** — don't eagerly discover, only discover if the link is clicked
-
 ### prefetch
 
 [modes: framework]

docs/api/components/NavLink.md

@@ -109,17 +109,17 @@ returns the `className`:
 
 [modes: framework]
 
-Defines the link discovery behavior
+Defines the link [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+
+- **render** — default, discover the route when the link renders
+- **none** — don't eagerly discover, only discover if the link is clicked
 
 ```tsx
 <Link /> // default ("render")
 <Link discover="render" />
 <Link discover="none" />
 ```
 
-- **render** — default, discover the route when the link renders
-- **none** — don't eagerly discover, only discover if the link is clicked
-
 ### end
 
 [modes: framework, data, declarative]

packages/react-router/lib/dom/lib.tsx

@@ -1039,16 +1039,16 @@ HistoryRouter.displayName = "unstable_HistoryRouter";
 export interface LinkProps
   extends Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href"> {
   /**
-   * Defines the link discovery behavior
+   * Defines the link [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+   *
+   * - **render** — default, discover the route when the link renders
+   * - **none** — don't eagerly discover, only discover if the link is clicked
    *
    * ```tsx
    * <Link /> // default ("render")
    * <Link discover="render" />
    * <Link discover="none" />
    * ```
-   *
-   * - **render** — default, discover the route when the link renders
-   * - **none** — don't eagerly discover, only discover if the link is clicked
    */
   discover?: DiscoverBehavior;
 
@@ -1687,16 +1687,16 @@ export interface FetcherFormProps extends SharedFormProps {}
  */
 export interface FormProps extends SharedFormProps {
   /**
-   * Defines the link discovery behavior. See {@link DiscoverBehavior}.
+   * Defines the form [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+   *
+   * - **render** — default, discover the route when the form renders
+   * - **none** — don't eagerly discover, only discover if the form is submitted
    *
    * ```tsx
-   * <Link /> // default ("render")
-   * <Link discover="render" />
-   * <Link discover="none" />
+   * <Form /> // default ("render")
+   * <Form discover="render" />
+   * <Form discover="none" />
    * ```
-   *
-   * - **render** — default, discover the route when the link renders
-   * - **none** — don't eagerly discover, only discover if the link is clicked
    */
   discover?: DiscoverBehavior;
 

packages/react-router/lib/dom/ssr/components.tsx

@@ -76,7 +76,8 @@ export function useFrameworkContext(): FrameworkContextObject {
 // Public API
 
 /**
- * Defines the discovery behavior of the link:
+ * Defines the [lazy route discovery](../../explanation/lazy-route-discovery)
+ * behavior of the link/form:
  *
  * - "render" - default, discover the route when the link renders
  * - "none" - don't eagerly discover, only discover if the link is clicked