@burojs/ui-shadcn 0.7.0 → 0.8.0

package/dist/{relation-picker-D-tBBZW_.js → relation-picker-x7P5HKie.js}

@@ -3,8 +3,9 @@ import { l as useLinkComponent, m as PopoverTrigger, p as PopoverContent, u as P
 import { t as Button } from "./button-MWVeZaqj.js";
 import { C as CommandEmpty, D as CommandList, E as CommandItem, T as CommandInput, a as namesHiddenField, m as useRowTitle, r as RelationViewButton, t as RelationCreateButton, x as Command, y as LoadError } from "./relation-create-C43cdPQt.js";
 import { t as Skeleton } from "./skeleton-U2noefj5.js";
-import { t as LazyRelationPickerDialog } from "./lazy-relation-picker-dialog-CAScLPb2.js";
+import { t as LazyRelationPickerDialog } from "./lazy-relation-picker-dialog-DN4bvQfg.js";
 import { t as useRelationSelect } from "./relation-select-B8Fq4o-t.js";
+import { r as useRowSubtitle, t as optionSubtitle } from "./use-record-subtitle-gIaCGgbI.js";
 import { composeListFilter, normalizeFixedFilters, relationOpenOf, resolveResourceLabel, resourceKey, routeResourceKey } from "@burojs/core";
 import { useApp, useI18nCaps, useList, useOptionalT, useRelatedRecord } from "@burojs/react";
 import { IconCheck, IconChevronDown, IconLoader2 } from "@tabler/icons-react";
@@ -12,7 +13,7 @@ import * as React from "react";
 import { Suspense, lazy } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region src/fields/lazy-candidates-picker.tsx
-const CandidatesRelationPicker = lazy(() => import("./candidates-relation-picker-CS_JZ4Fd.js").then((module) => ({ default: module.CandidatesRelationPicker })));
+const CandidatesRelationPicker = lazy(() => import("./candidates-relation-picker-CGXItMN0.js").then((module) => ({ default: module.CandidatesRelationPicker })));
 function LazyCandidatesRelationPicker(props) {
 	return jsx(Suspense, {
 		fallback: jsx(Skeleton, {
@@ -26,13 +27,14 @@ function LazyCandidatesRelationPicker(props) {
 //#endregion
 //#region src/fields/relation-picker.tsx
 const DEBOUNCE_MS = 250;
-function RelationPicker({ to: toInput, value, onChange, by, searchField, pageSize = 10, clearable = true, placeholder, name, id, testid, fixedFilters, createSeeds, candidatesGate, rowFits, fieldName, open: openMode, scope = "context", disabled, required, className, ariaInvalid, ariaDescribedBy, ariaErrorMessage }) {
+function RelationPicker({ to: toInput, value, onChange, by, searchField, pageSize = 10, clearable = true, placeholder, name, id, testid, fixedFilters, createSeeds, candidatesGate, rowFits, fieldName, open: openMode, optionSubtitle: optionSubtitle$1, scope = "context", disabled, required, className, ariaInvalid, ariaDescribedBy, ariaErrorMessage }) {
 	const to = routeResourceKey(toInput);
 	const app = useApp();
 	const caps = useI18nCaps();
 	const t = useOptionalT();
 	const targetDef = app.registry.get(to);
 	const rowTitle = useRowTitle(to, targetDef?.displayField);
+	const rowSubtitle = useRowSubtitle(to, optionSubtitle$1);
 	const targetLabel = resolveResourceLabel(caps, to, "single", targetDef).toLowerCase();
 	const RouterLink = useLinkComponent();
 	const tid = testid ?? `relation-picker:${to}`;
@@ -294,6 +296,7 @@ function RelationPicker({ to: toInput, value, onChange, by, searchField, pageSiz
 									if (rowId === null || rowId === void 0 || rowId === "") return null;
 									const idStr = String(rowId);
 									const label = rowTitle(row);
+									const subtitle = optionSubtitle(rowSubtitle(row), label, idStr);
 									const isSelected = value != null && String(value) === idStr;
 									return jsxs(CommandItem, {
 										value: `${label} ${idStr}`,
@@ -308,9 +311,9 @@ function RelationPicker({ to: toInput, value, onChange, by, searchField, pageSiz
 												className: "truncate",
 												children: label
 											}),
-											label === idStr ? null : jsxs("span", {
+											subtitle === null ? null : jsx("span", {
 												className: "ml-auto shrink-0 pl-2 text-xs text-muted-foreground",
-												children: ["#", idStr]
+												children: subtitle
 											})
 										]
 									}, idStr);
@@ -428,6 +431,7 @@ function FieldRelationPicker({ props, to, extra }) {
 	const { name, id, value, onChange, testid, field, disabled, required, relationSeeds } = props;
 	const { ariaInvalid, ariaDescribedBy, ariaErrorMessage } = props;
 	const meta = field?.meta;
+	const subtitle = props.optionSubtitle;
 	return jsx(RelationPicker, {
 		to,
 		value,
@@ -444,6 +448,7 @@ function FieldRelationPicker({ props, to, extra }) {
 		...relationSeeds === void 0 ? {} : { createSeeds: relationSeeds },
 		fieldName: field?.name ?? name,
 		open: relationOpenOf(field ?? {}),
+		...subtitle === void 0 ? {} : { optionSubtitle: subtitle },
 		disabled,
 		required,
 		ariaInvalid,
@@ -454,4 +459,4 @@ function FieldRelationPicker({ props, to, extra }) {
 //#endregion
 export { RelationPicker as n, RelationPickerInput as r, FieldRelationPicker as t };
 
-//# sourceMappingURL=relation-picker-D-tBBZW_.js.map
+//# sourceMappingURL=relation-picker-x7P5HKie.js.map

package/dist/relation-picker-x7P5HKie.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"relation-picker-x7P5HKie.js","names":["optionSubtitle","optionSubtitleText"],"sources":["../src/fields/lazy-candidates-picker.tsx","../src/fields/relation-picker.tsx"],"sourcesContent":["import { type ReactElement, Suspense, lazy } from 'react';\nimport type { FieldInputProps } from './registry.js';\nimport { Skeleton } from '../primitives/skeleton.js';\n\nconst CandidatesRelationPicker = lazy(() =>\n  import('./candidates-relation-picker.js').then((module) => ({\n    default: module.CandidatesRelationPicker,\n  })),\n);\n\n/**\n * A relation select whose field declares `candidates`: the candidates path is a chunk of its own,\n * so a form without candidates never loads it. Until it arrives a skeleton stands in; no read\n * is sent for the options meanwhile.\n */\nexport function LazyCandidatesRelationPicker(props: FieldInputProps): ReactElement {\n  return (\n    <Suspense\n      fallback={\n        <Skeleton\n          data-buro-skeleton=\"\"\n          data-testid=\"relation-candidates-loading\"\n          className=\"h-9 w-full\"\n        />\n      }\n    >\n      <CandidatesRelationPicker {...props} />\n    </Suspense>\n  );\n}\n","'use client';\n\nimport * as React from 'react';\nimport { IconCheck, IconChevronDown, IconLoader2 } from '@tabler/icons-react';\nimport {\n  composeListFilter,\n  normalizeFixedFilters,\n  resolveResourceLabel,\n  resourceKey,\n  type ErasedResourceHandle,\n  type FilterExpression,\n  type FixedFilterInput,\n  type RelationOpen,\n  relationOpenOf,\n  type ResourceRefInput,\n  type ScopeSource,\n  routeResourceKey,\n  type ResourceNameOrRef,\n} from '@burojs/core';\nimport { useApp, useI18nCaps, useList, useOptionalT, useRelatedRecord } from '@burojs/react';\nimport { LoadError } from '../load-error/load-error-view.js';\nimport type { CandidatesGate } from './candidates-gate.js';\nimport { namesHiddenField } from './search-access.js';\nimport {\n  optionSubtitle as optionSubtitleText,\n  type RecordSubtitleFn,\n  useRowSubtitle,\n} from '../resource/use-record-subtitle.js';\nimport { useRowTitle } from '../resource/use-row-title.js';\nimport { cn } from '../lib/cn.js';\nimport { useLinkComponent } from '../layout/link-component.js';\nimport { Button } from '../primitives/button.js';\nimport {\n  Command,\n  CommandEmpty,\n  CommandInput,\n  CommandItem,\n  CommandList,\n} from '../primitives/command.js';\nimport { Popover, PopoverContent, PopoverTrigger } from '../primitives/popover.js';\nimport { LazyCandidatesRelationPicker } from './lazy-candidates-picker.js';\nimport { LazyRelationPickerDialog } from './lazy-relation-picker-dialog.js';\nimport { RelationCreateButton } from './relation-create.js';\nimport { useRelationSelect } from './relation-select.js';\nimport { RelationViewButton } from './relation-view-button.js';\nimport type { FieldInputProps } from './registry.js';\n\n/** The portable erased AST — the only `fixedFilters` shape this module deals in. */\ntype ErasedExpression = FilterExpression<ErasedResourceHandle>;\n\n/**\n * Single-select relation picker (Relations item 2, v1).\n *\n * Renders a dropdown trigger labelled with the currently-selected\n * record's display name. Clicking opens a popover containing:\n *  - a debounced search input that filters target rows by `searchField`\n *    (defaults to the target's `displayField`) using the data\n *    provider's `contains` operator,\n *  - up to `pageSize` (default 10) result rows,\n *  - a \"Clear\" button when `clearable` is true and a value is set,\n *  - a \"View all\" link to the target's standalone list page so\n *    operators can fall back to the full list when the inline search\n *    can't find what they need.\n *\n * Multi-select / fuller modal / quick-create are deferred to v2 — see\n * docs/superpowers/specs/2026-05-04-relation-picker.md.\n *\n * Failure modes (mirrors RelationDisplay's fail-soft policy):\n *  - target not registered → trigger renders the raw value, picker\n *    is disabled. Caller still gets onChange(null) only via clear.\n *  - useList errors → popover shows muted \"Failed to load\" with the\n *    error message in the title; \"View all\" still works.\n *  - target row for `value` not found → trigger shows the raw id\n *    (so the operator can at least see what was stored).\n */\n\nexport interface RelationPickerProps<N extends string = string> {\n  /** Target resource name (matches `f.relation({ to: '...' })`). */\n  to: ResourceNameOrRef<N>;\n  /** Currently-selected FK value, or null/undefined when empty. */\n  value: string | number | null | undefined;\n  /** Called with the new selected id (or `by` value), or null when cleared. */\n  onChange: (next: string | number | null) => void;\n  /**\n   * The target field the value holds (`meta.by`, spec 4.2): options write `row[by]` and the\n   * selected value is resolved by it. Absent: the target's id field.\n   */\n  by?: string;\n  /**\n   * Field whose value is matched against the search text. Defaults to\n   * the target's `displayField` (which is what the trigger label\n   * already shows, so it's the natural search target).\n   */\n  searchField?: string;\n  /** Initial fetch / max visible rows. Defaults to 10. */\n  pageSize?: number;\n  /** Show a clear button. Defaults to true. */\n  clearable?: boolean;\n  /** Trigger placeholder when value is empty. */\n  placeholder?: string;\n  /** HTML name attribute for the trigger button. */\n  name?: string;\n  /** HTML id attribute. */\n  id?: string;\n  /** Test-id override. Defaults to `relation-picker:<to>`. */\n  testid?: string;\n  /**\n   * Extra filters ANDed onto every query (inline popover + advanced modal) —\n   * the same `FixedFilterInput` shape `useResourceList` takes: a bare AST\n   * expression (`@burojs/core`'s `FilterExpression`, e.g.\n   * `{ field: 'is_active', op: 'eq', value: true }`), or `{ filter, lock?,\n   * label? }` for finer control. A bare expression defaults to `lock: true`\n   * — the field is hidden from the modal's filter builder, with no badge —\n   * which is what keeps the picker from ever offering an out-of-scope\n   * record. Pass `{ filter, lock: false }` to keep the field open to the\n   * user, and add `label` to render it as an undeletable badge instead.\n   */\n  fixedFilters?: readonly FixedFilterInput[];\n  /**\n   * The trusted `defaults` of a create opened from this select (P6-31): the registry field's\n   * static `eq` literals, handed down by the form controller. Never read from `fixedFilters` or\n   * `field.meta`.\n   */\n  createSeeds?: Readonly<Record<string, unknown>>;\n  /**\n   * What the field's `candidates` say about reading the target right now (P7 3.4): `pending`\n   * draws a disabled trigger, `empty` a popover that says what to choose first, `forbidden` a\n   * disabled trigger and why. While set, nothing is read for the options. Absent: read normally.\n   */\n  candidatesGate?: CandidatesGate;\n  /**\n   * Whether a loaded row fits the resolved candidate filters (already in `fixedFilters`):\n   * `false` makes the field say the chosen row \"does not match the current filter\" (P7 3.4).\n   */\n  rowFits?: (row: Record<string, unknown>) => boolean | undefined;\n  /** The form field holding the key (the \"view\" and \"+ create\" test ids); defaults to `name`. */\n  fieldName?: string;\n  /** The field's `ui.open` (P7 3.6): what the \"view\" button opens, or no button for `none`. */\n  open?: RelationOpen;\n  /**\n   * The options' second line over the target row (a relation field's `optionSubtitle`): wins over\n   * the target's `recordSubtitle`; without either, `#<id>`.\n   */\n  optionSubtitle?: RecordSubtitleFn;\n  /**\n   * The read scope of the option reads (the popover, \"Advanced search\" and the create hand-back).\n   * Default `'context'`: the record around the picker narrows its options, except by the field\n   * the picker itself edits (`fieldName`, else `name`). `'none'` reads every row the provider\n   * allows; `'session'` the session's scope selection.\n   */\n  scope?: ScopeSource;\n  disabled?: boolean;\n  required?: boolean;\n  className?: string;\n  /** Forwarded to the trigger button when the field is in an invalid state. */\n  ariaInvalid?: boolean;\n  /** Forwarded to the trigger button as `aria-describedby` (help text only; error id goes via ariaErrorMessage). */\n  ariaDescribedBy?: string;\n  /** Forwarded to the trigger button as `aria-errormessage` (WAI-ARIA 1.2). */\n  ariaErrorMessage?: string;\n}\n\nconst DEBOUNCE_MS = 250;\n\nexport function RelationPicker<const N extends string = string>({\n  to: toInput,\n  value,\n  onChange,\n  by,\n  searchField,\n  pageSize = 10,\n  clearable = true,\n  placeholder,\n  name,\n  id,\n  testid,\n  fixedFilters,\n  createSeeds,\n  candidatesGate,\n  rowFits,\n  fieldName,\n  open: openMode,\n  optionSubtitle,\n  scope = 'context',\n  disabled,\n  required,\n  className,\n  ariaInvalid,\n  ariaDescribedBy,\n  ariaErrorMessage,\n}: RelationPickerProps<N>): React.ReactElement {\n  const to = routeResourceKey(toInput);\n  const app = useApp();\n  const caps = useI18nCaps();\n  const t = useOptionalT();\n  const targetDef = app.registry.get(to);\n  const rowTitle = useRowTitle(to, targetDef?.displayField);\n  const rowSubtitle = useRowSubtitle(to, optionSubtitle);\n  // Lowercased: the label sits mid-sentence in «Select location…».\n  const targetLabel = resolveResourceLabel(caps, to, 'single', targetDef).toLowerCase();\n  const RouterLink = useLinkComponent();\n  // Trigger testid honours the prop override (so callers like\n  // the record form get a deterministic per-field id like\n  // `form-field-input:<resource>:<view>:<field>`), but child elements\n  // (search, options, view-all, clear) keep a stable per-target prefix\n  // so e2e tests don't have to know the parent form's testid path.\n  const tid = testid ?? `relation-picker:${to}`;\n  const childPrefix = `relation-picker:${to}`;\n\n  const triggerRef = React.useRef<HTMLButtonElement | null>(null);\n  // An overlay opened from this select returns focus to the trigger when it closes: the shell\n  // records the focused element as it mounts.\n  const focusTrigger = React.useCallback(() => triggerRef.current?.focus(), []);\n  const [open, setOpen] = React.useState(false);\n  const [dialogOpen, setDialogOpen] = React.useState(false);\n  // The dialog is mounted on its first open, and only while no candidates gate holds the read:\n  // without the candidate filters it would list rows the field must not offer.\n  const gated = candidatesGate !== undefined;\n  const [dialogMounted, setDialogMounted] = React.useState(false);\n  React.useEffect(() => {\n    if (gated) setDialogOpen(false);\n  }, [gated]);\n  React.useEffect(() => {\n    if (dialogOpen) setDialogMounted(true);\n  }, [dialogOpen]);\n  const [search, setSearch] = React.useState('');\n  const [debouncedSearch, setDebouncedSearch] = React.useState('');\n\n  // Debounce the search text so each keystroke doesn't fire a request —\n  // react-query will dedup but the popover can flicker.\n  React.useEffect(() => {\n    const handle = setTimeout(() => setDebouncedSearch(search), DEBOUNCE_MS);\n    return () => clearTimeout(handle);\n  }, [search]);\n\n  // Reset search when the popover closes so reopening starts clean.\n  React.useEffect(() => {\n    if (!open) {\n      setSearch('');\n      setDebouncedSearch('');\n    }\n  }, [open]);\n\n  // Trigger label: fetch the currently-selected target row to show its\n  // display name. Skipped when value is empty (useRelatedRecord handles\n  // that). Same hook RelationDisplay uses, so the cache is shared.\n  // An input resolves the selected value whatever the field's `resolve` says (spec 4.3).\n  const { record: selectedRecord, isLoading: selectedLoading } = useRelatedRecord(\n    to,\n    value,\n    by === undefined ? undefined : { by },\n  );\n  // The record field this picker writes: a record's own scope field never narrows its options.\n  const scopeField = fieldName ?? name;\n  // The value field, the search set and the select's one pending create, shared by the popover\n  // and the \"Advanced search\" dialog (and by `useRelationPicker`).\n  const {\n    access,\n    valueField,\n    searchDecl,\n    create,\n    reader: createReader,\n  } = useRelationSelect({\n    to,\n    by,\n    searchField,\n    fixedFilters,\n    scope,\n    scopeField,\n    held: gated,\n    // As a pick does: the value is written and the \"Advanced search\" dialog, when the create\n    // came from it, is done.\n    onValue: (picked) => {\n      onChange(picked);\n      setDialogOpen(false);\n    },\n  });\n  const accessReady = access.status === 'ready';\n  // List the picker options. `useList` returns `{ data: { data, total } }`.\n  //\n  // Composed through the SAME `composeListFilter` core the dialog\n  // (`RelationPickerDialog`/`useDialogFilterState`) and the list page use —\n  // this popover is a distinct composition SITE (fixed scope + free-text\n  // search only, no builder group), not a second set of rules. Search\n  // resolution mirrors the dialog's: the target's declared\n  // `views.list.search` always wins; the `searchField` prop, else\n  // `displayField`, else `'name'` is the fallback (`useRelationSelect`),\n  // wrapped as a single-field declaration so it goes through the exact same\n  // `searchToFilter` path a real declaration would. Before this, the popover\n  // hand-rolled `{ field: <search field>, op: 'contains', value }`\n  // unconditionally, ignoring a declared `views.list.search` entirely — one\n  // control (popover vs. \"advanced search\") giving two different answers\n  // for the same typed text.\n  const filter = React.useMemo<ErasedExpression | undefined>(\n    () =>\n      composeListFilter({\n        fixed: normalizeFixedFilters(fixedFilters),\n        search: debouncedSearch,\n        searchDecl,\n        searchContext: { resource: to, def: targetDef },\n      }),\n    [fixedFilters, debouncedSearch, searchDecl, to, targetDef],\n  );\n  // An author predicate or a function search naming a hidden field forbids the read.\n  const blocked =\n    !accessReady ||\n    candidatesGate !== undefined ||\n    namesHiddenField(filter, (name) => access.fieldVisible(name));\n\n  const listQuery = useList(to, {\n    ...(filter ? { filter } : {}),\n    pagination: { kind: 'offset', page: 1, pageSize },\n    scope,\n    ...(scopeField === undefined ? {} : { scopeField }),\n    enabled: open && targetDef != null && !blocked,\n  });\n\n  const rows = (listQuery.data?.data ?? []) as Array<{ id: unknown } & Record<string, unknown>>;\n  // ⚠️ The rows the popover already loaded are a better label source than a\n  // second round-trip. `selectedRecord` comes from the batched relation\n  // aggregator; immediately after picking an option that batch has not\n  // resolved the new id yet, so the trigger fell through to its raw-id\n  // fallback and showed «4» instead of «Finished goods warehouse». The picker\n  // is holding the chosen record in `rows` — use it.\n  const triggerLabel = renderTriggerLabel({\n    rowTitle,\n    optionRows: rows,\n    valueField,\n    value,\n    selectedRecord,\n    selectedLoading,\n    targetDef,\n    targetLabel,\n    placeholder,\n    t,\n  });\n\n  // Target not registered — degrade gracefully: render a disabled\n  // trigger with the raw value so the operator can still SEE the\n  // stored FK, but they can't pick a new one because we have no\n  // basePath to drive a \"View all\" link or a useList query.\n  if (!targetDef) {\n    if (process.env.NODE_ENV !== 'production') {\n      // eslint-disable-next-line no-console\n      console.warn(`[RelationPicker] target resource '${to}' not registered — picker disabled`);\n    }\n    return (\n      <Button\n        type=\"button\"\n        variant=\"outline\"\n        disabled\n        data-testid={`${childPrefix}:unregistered`}\n        className={cn('w-full justify-between font-normal', className)}\n        name={name}\n        id={id}\n        aria-required={required}\n      >\n        <span className=\"truncate text-muted-foreground\">\n          {value == null || value === ''\n            ? (placeholder ?? t('field.select', { defaultValue: 'Select…' }))\n            : String(value)}\n        </span>\n        <IconChevronDown className=\"h-4 w-4 opacity-50\" aria-hidden />\n      </Button>\n    );\n  }\n\n  // The candidates say the target must not be read yet (P7 3.4): a disabled trigger, no popover.\n  if (candidatesGate?.kind === 'pending') {\n    return (\n      <Button\n        type=\"button\"\n        variant=\"outline\"\n        disabled\n        data-testid={tid}\n        data-buro-candidates=\"pending\"\n        className={cn('w-full justify-between font-normal', className)}\n        name={name}\n        id={id}\n        aria-required={required}\n        aria-busy=\"true\"\n      >\n        <span className=\"truncate text-muted-foreground\">{triggerLabel}</span>\n        <IconLoader2 className=\"h-4 w-4 shrink-0 animate-spin opacity-50\" aria-hidden />\n      </Button>\n    );\n  }\n  if (candidatesGate?.kind === 'forbidden') {\n    return (\n      <div className=\"flex flex-col gap-1\">\n        <Button\n          type=\"button\"\n          variant=\"outline\"\n          disabled\n          data-testid={tid}\n          data-buro-candidates=\"forbidden\"\n          className={cn('w-full justify-between font-normal', className)}\n          name={name}\n          id={id}\n          aria-required={required}\n          aria-describedby={candidatesGate.testId}\n        >\n          <span className={cn('truncate text-left', value == null && 'text-muted-foreground')}>\n            {triggerLabel}\n          </span>\n          <IconChevronDown className=\"h-4 w-4 shrink-0 opacity-50\" aria-hidden />\n        </Button>\n        <p\n          id={candidatesGate.testId}\n          data-testid={candidatesGate.testId}\n          className=\"text-xs text-muted-foreground\"\n        >\n          {candidatesGate.message}\n        </p>\n      </div>\n    );\n  }\n\n  const targetBasePath = targetDef.basePath ?? `/${to}`;\n  // The chosen row stays as it is when it falls outside the candidates; the field says so.\n  const outside =\n    rowFits !== undefined &&\n    value != null &&\n    value !== '' &&\n    selectedRecord != null &&\n    rowFits(selectedRecord as Record<string, unknown>) === false;\n  const isLoading = listQuery.isLoading || listQuery.isFetching;\n  const error = listQuery.isError ? (listQuery.error as unknown as Error) : null;\n\n  function handleSelect(rowId: unknown): void {\n    // IDs arrive as strings or numbers depending on the data provider.\n    // Pass through as-is so callers can compare to their\n    // schema (e.g. UUID strings stay strings).\n    onChange(rowId as string | number);\n    setOpen(false);\n  }\n\n  function handleClear(): void {\n    onChange(null);\n    setOpen(false);\n  }\n\n  return (\n    <Popover open={open} onOpenChange={setOpen}>\n      <div className=\"flex items-center gap-1\">\n        <PopoverTrigger asChild>\n          <Button\n            ref={triggerRef}\n            type=\"button\"\n            variant=\"outline\"\n            role=\"combobox\"\n            aria-expanded={open}\n            aria-haspopup=\"listbox\"\n            aria-required={required}\n            aria-invalid={ariaInvalid || undefined}\n            aria-describedby={ariaDescribedBy}\n            {...(ariaErrorMessage ? { 'aria-errormessage': ariaErrorMessage } : {})}\n            disabled={disabled}\n            data-testid={tid}\n            name={name}\n            id={id}\n            className={cn('w-full justify-between font-normal', className)}\n          >\n            <span className={cn('truncate text-left', value == null && 'text-muted-foreground')}>\n              {triggerLabel}\n            </span>\n            <IconChevronDown className=\"h-4 w-4 shrink-0 opacity-50\" aria-hidden />\n          </Button>\n        </PopoverTrigger>\n        {!disabled && (\n          <RelationViewButton\n            to={to}\n            value={value}\n            by={by}\n            fieldName={fieldName ?? name ?? to}\n            beforeOpen={focusTrigger}\n            {...(openMode === undefined ? {} : { open: openMode })}\n          />\n        )}\n      </div>\n      {outside && (\n        <p\n          className=\"mt-1 text-xs text-muted-foreground\"\n          data-testid={`${childPrefix}:not-matching`}\n        >\n          {t('relationPicker.notMatching', { defaultValue: 'Does not match the current filter' })}\n        </p>\n      )}\n      <PopoverContent className=\"w-[var(--radix-popover-trigger-width)] p-0\" align=\"start\">\n        {candidatesGate?.kind === 'empty' ? (\n          <p\n            className=\"px-3 py-6 text-center text-sm text-muted-foreground\"\n            data-testid={candidatesGate.testId}\n          >\n            {candidatesGate.message}\n          </p>\n        ) : (\n          /* shouldFilter={false}: cmdk's built-in client filter is disabled\n            because filtering happens server-side via useList's `contains`\n            operator. cmdk still drives keyboard navigation, focus,\n            highlighted-item state, and Enter-to-select. */\n          <Command shouldFilter={false}>\n            {searchDecl !== undefined && (\n              <CommandInput\n                value={search}\n                onValueChange={setSearch}\n                placeholder={t('toolbar.search', {\n                  params: { name: targetLabel },\n                  defaultValue: `Search ${targetLabel}…`,\n                })}\n                data-testid={`${childPrefix}:search`}\n                aria-label={t('toolbar.search', {\n                  params: { name: targetLabel },\n                  defaultValue: `Search ${targetLabel}`,\n                })}\n              />\n            )}\n            <CommandList data-testid={`${childPrefix}:list`}>\n              {isLoading && (\n                <div\n                  className=\"flex items-center justify-center gap-2 py-6 text-sm text-muted-foreground\"\n                  data-testid={`${childPrefix}:loading`}\n                >\n                  <IconLoader2 className=\"h-4 w-4 animate-spin\" aria-hidden />\n                  <span>{t('table.loading', { defaultValue: 'Loading…' })}</span>\n                </div>\n              )}\n              {!isLoading && error && (\n                <LoadError\n                  surface=\"picker\"\n                  error={error}\n                  testId={`${childPrefix}:error`}\n                  className=\"block px-3 py-6 text-center text-sm text-muted-foreground\"\n                  fallback={{ key: 'relation.failed', default: 'Failed to load options.' }}\n                />\n              )}\n              {!isLoading && !error && rows.length === 0 && (\n                <CommandEmpty data-testid={`${childPrefix}:empty`}>\n                  {t('relation.noResults', { defaultValue: 'No results.' })}\n                </CommandEmpty>\n              )}\n              {!isLoading &&\n                !error &&\n                rows.map((row) => {\n                  const rowId = row[valueField];\n                  // A row without the value the field stores cannot be chosen (no fallback to id).\n                  if (rowId === null || rowId === undefined || rowId === '') return null;\n                  const idStr = String(rowId);\n                  const label = rowTitle(row);\n                  const subtitle = optionSubtitleText(rowSubtitle(row), label, idStr);\n                  const isSelected = value != null && String(value) === idStr;\n                  return (\n                    <CommandItem\n                      key={idStr}\n                      // cmdk uses `value` for keyboard-search semantics;\n                      // setting it to `${label} ${idStr}` lets users type\n                      // either the label OR the id and the highlighted\n                      // option still tracks correctly across renders.\n                      value={`${label} ${idStr}`}\n                      data-testid={`${childPrefix}:option:${idStr}`}\n                      onSelect={() => handleSelect(rowId)}\n                    >\n                      <IconCheck\n                        className={cn(\n                          'mr-2 h-4 w-4 shrink-0',\n                          isSelected ? 'opacity-100' : 'opacity-0',\n                        )}\n                        aria-hidden\n                      />\n                      <span className=\"truncate\">{label}</span>\n                      {/* The declared subtitle, else `#<id>` unless the label already is the id\n                          (REF-40). */}\n                      {subtitle === null ? null : (\n                        <span className=\"ml-auto shrink-0 pl-2 text-xs text-muted-foreground\">\n                          {subtitle}\n                        </span>\n                      )}\n                    </CommandItem>\n                  );\n                })}\n            </CommandList>\n            {/* Wraps at narrow widths: four actions do not fit one line of a small popover. */}\n            <div className=\"flex flex-wrap items-center justify-between gap-x-2 gap-y-1 border-t px-3 py-2 text-sm\">\n              {clearable && value != null && value !== '' ? (\n                <button\n                  type=\"button\"\n                  onClick={handleClear}\n                  data-testid={`${childPrefix}:clear`}\n                  className=\"text-muted-foreground hover:text-foreground focus:outline-hidden focus-visible:underline\"\n                >\n                  {t('relationPicker.clear', { defaultValue: 'Clear' })}\n                </button>\n              ) : (\n                <span aria-hidden />\n              )}\n              <div className=\"flex flex-wrap items-center gap-x-3 gap-y-1\">\n                {/* #11 — escalation to the full-list modal: search + sort +\n                  paginate + create, for when the inline popover isn't enough. */}\n                <button\n                  type=\"button\"\n                  onClick={() => {\n                    setOpen(false);\n                    setDialogOpen(true);\n                  }}\n                  data-testid={`${childPrefix}:advanced`}\n                  className=\"text-foreground hover:underline focus:outline-hidden focus-visible:underline\"\n                >\n                  {t('relationPicker.advancedSearch', { defaultValue: 'Advanced search' })}\n                </button>\n                {!disabled && (\n                  <RelationCreateButton\n                    to={to}\n                    fieldName={fieldName ?? name ?? to}\n                    create={create}\n                    seeds={createSeeds}\n                    search={search}\n                    beforeOpen={() => {\n                      setOpen(false);\n                      focusTrigger();\n                    }}\n                    className=\"text-foreground hover:underline focus:outline-hidden focus-visible:underline disabled:opacity-50\"\n                  />\n                )}\n                <RouterLink\n                  href={targetBasePath}\n                  data-testid={`${childPrefix}:view-all`}\n                  className=\"text-muted-foreground hover:text-foreground hover:underline focus:outline-hidden focus-visible:underline\"\n                >\n                  {t('relationPicker.viewAll', { defaultValue: 'Open list' })} →\n                </RouterLink>\n              </div>\n            </div>\n          </Command>\n        )}\n      </PopoverContent>\n      {/*\n        The RAW `searchField` prop, not the resolved fallback — the dialog\n        (Task 5, SP3) does its OWN target-declaration → prop → displayField\n        resolution via `useDialogFilterState`, so handing it an already-\n        resolved value here would just have this component's own\n        `displayField ?? 'name'` fallback (built for the POPOVER's simpler\n        contains-only search) silently stand in for the dialog's, rather\n        than letting the target's declared `views.list.search` win when the\n        caller passed no override at all.\n      */}\n      {dialogMounted && !gated && (\n        <LazyRelationPickerDialog\n          to={to}\n          open={dialogOpen}\n          onOpenChange={setDialogOpen}\n          onSelect={(rowId) => onChange(rowId)}\n          valueField={valueField}\n          searchField={searchField}\n          fixedFilters={fixedFilters}\n          scope={scope}\n          {...(scopeField === undefined ? {} : { scopeField })}\n          {...(disabled ? {} : { create })}\n          createSeeds={createSeeds}\n          fieldName={fieldName ?? name ?? to}\n          onBeforeCreate={focusTrigger}\n        />\n      )}\n      {createReader}\n    </Popover>\n  );\n}\n\ninterface TriggerLabelArgs {\n  value: string | number | null | undefined;\n  selectedRecord: ReturnType<typeof useRelatedRecord>['record'];\n  selectedLoading: boolean;\n  /** Rows already loaded for the popover; used as a same-tick label source. */\n  optionRows?: Array<{ id: unknown } & Record<string, unknown>>;\n  /** The row field the value holds (`by`, else the id field). */\n  valueField: string;\n  targetDef: ReturnType<ReturnType<typeof useApp>['registry']['get']>;\n  /** The resolved, lowercased target label. */\n  targetLabel: string;\n  placeholder?: string;\n  /** The row title under the viewer's field view (id when the display field is hidden). */\n  rowTitle: (row: Record<string, unknown>) => string;\n  t: (key: string, options?: { params?: Record<string, unknown>; defaultValue?: string }) => string;\n}\n\nfunction renderTriggerLabel({\n  value,\n  selectedRecord,\n  selectedLoading,\n  targetLabel,\n  placeholder,\n  optionRows,\n  valueField,\n  t,\n  rowTitle,\n}: TriggerLabelArgs): React.ReactNode {\n  if (value == null || value === '') {\n    return (\n      placeholder ??\n      t('relation.select', {\n        params: { name: targetLabel },\n        defaultValue: `Select ${targetLabel}…`,\n      })\n    );\n  }\n  if (selectedLoading) {\n    return t('table.loading', { defaultValue: 'Loading…' });\n  }\n  if (selectedRecord) {\n    return rowTitle(selectedRecord);\n  }\n  // Not resolved by the aggregator yet (or at all). If the popover already\n  // loaded this record as an option — which it always has right after the\n  // user picked it — label from that instead of showing a bare id.\n  const fromOptions = optionRows?.find((r) => String(r[valueField]) === String(value));\n  if (fromOptions) {\n    return rowTitle(fromOptions);\n  }\n  // Genuinely unknown (404 / not in the loaded page) — show the raw id so the\n  // operator can at least see what was stored.\n  return String(value);\n}\n\n/**\n * Form-field adapter wrapping `<RelationPicker>` for use as a default\n * Input renderer in the field registry. Reads `field.meta.to` for the\n * target resource name. When `meta.to` is absent we degrade to a plain\n * (disabled) text representation of the value with a console warning —\n * same fail-soft as RelationDisplay.\n */\nexport function RelationPickerInput(props: FieldInputProps): React.ReactElement {\n  const { name, id, value, testid, field, required } = props;\n  const meta = field?.meta as { to?: ResourceRefInput; candidates?: unknown } | undefined;\n  let to: string | undefined;\n  try {\n    to = meta?.to === undefined ? undefined : resourceKey(meta.to);\n  } catch {\n    to = undefined;\n  }\n\n  if (!to) {\n    if (process.env.NODE_ENV !== 'production') {\n      // eslint-disable-next-line no-console\n      console.warn(\n        `[RelationPickerInput] no meta.to on field '${field?.name ?? name}' — relation picker disabled`,\n      );\n    }\n    return (\n      <Button\n        type=\"button\"\n        variant=\"outline\"\n        disabled\n        data-testid={`${testid ?? `relation-picker:${name}`}:no-target`}\n        className=\"w-full justify-between font-normal\"\n        name={name}\n        id={id}\n        aria-required={required}\n      >\n        <span className=\"truncate text-muted-foreground\">\n          {value == null || value === '' ? '—' : String(value)}\n        </span>\n      </Button>\n    );\n  }\n\n  // The candidates path is loaded only for a field that declares candidates.\n  if (Array.isArray(meta?.candidates) && meta.candidates.length > 0)\n    return <LazyCandidatesRelationPicker {...props} />;\n  return <FieldRelationPicker props={props} to={to} />;\n}\n\n/** The form field's props as `RelationPicker` takes them; `extra` carries the candidates' part. */\nexport function FieldRelationPicker({\n  props,\n  to,\n  extra,\n}: {\n  props: FieldInputProps;\n  to: string;\n  extra?: {\n    fixedFilters: FieldInputProps['fixedFilters'];\n    candidatesGate?: CandidatesGate;\n    rowFits?: (row: Record<string, unknown>) => boolean | undefined;\n  };\n}): React.ReactElement {\n  const { name, id, value, onChange, testid, field, disabled, required, relationSeeds } = props;\n  const { ariaInvalid, ariaDescribedBy, ariaErrorMessage } = props;\n  const meta = field?.meta as\n    | { by?: unknown; searchField?: string; scope?: ScopeSource }\n    | undefined;\n  const subtitle = props.optionSubtitle;\n  return (\n    <RelationPicker\n      to={to}\n      value={value as string | number | null | undefined}\n      onChange={(v) => onChange(v)}\n      {...(typeof meta?.by === 'string' ? { by: meta.by } : {})}\n      name={name}\n      id={id}\n      testid={testid ?? `relation-picker:${to}`}\n      searchField={meta?.searchField}\n      {...(meta?.scope === undefined ? {} : { scope: meta.scope })}\n      fixedFilters={extra === undefined ? props.fixedFilters : extra.fixedFilters}\n      {...(extra?.candidatesGate === undefined ? {} : { candidatesGate: extra.candidatesGate })}\n      {...(extra?.rowFits === undefined ? {} : { rowFits: extra.rowFits })}\n      {...(relationSeeds === undefined ? {} : { createSeeds: relationSeeds })}\n      fieldName={field?.name ?? name}\n      open={relationOpenOf(field ?? {})}\n      {...(subtitle === undefined ? {} : { optionSubtitle: subtitle })}\n      disabled={disabled}\n      required={required}\n      ariaInvalid={ariaInvalid}\n      ariaDescribedBy={ariaDescribedBy}\n      ariaErrorMessage={ariaErrorMessage}\n    />\n  );\n}\n"],"mappings":"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"}

package/dist/{resource-page-router-Diw6S6TK.js → resource-page-router-BRpUnhay.js}

@@ -1,13 +1,13 @@
 import { l as cn } from "./use-theme-dnE3Od3I.js";
 import { l as useLinkComponent } from "./toaster-Ct_YHGs6.js";
-import { D as loadPageFlowRoute, k as useLoaded, o as canonicalResourceName, t as CheckConfirmDialog, v as FlowBoundary, w as loadFailedText } from "./check-confirm-dialog-2j0gOd7x.js";
+import { D as loadPageFlowRoute, k as useLoaded, o as canonicalResourceName, t as CheckConfirmDialog, v as FlowBoundary, w as loadFailedText } from "./check-confirm-dialog-CtiRzOAt.js";
 import { t as Button } from "./button-MWVeZaqj.js";
 import { b as RecordState, m as useRowTitle, v as InvalidRouteId, y as LoadError } from "./relation-create-C43cdPQt.js";
 import { t as Skeleton } from "./skeleton-U2noefj5.js";
-import { Ct as recordReturnTarget, Dt as useShownItemActions, G as RouteScreenClaimContext, H as ScreenTree, J as FormControlProvider, K as RouteScreenContext, Pt as FieldDisplay, S as useFrameChrome, St as listTarget, Tt as showTarget, U as useTabsUrlState, W as QuickScreenClaimContext, X as useFormControlOf, d as resolveFrameView, g as UndeclaredTypeNotice, h as TypeChromeDrawnContext, ht as PageHeader, i as RouteListContext, jt as DeepLinkScope, m as HeaderTypeNotice, n as viewOf, p as ChangeTypeButton, q as useIsRouteScreen, t as selectImplementation, u as isBuiltinRecordView, v as FormActions, wt as recordRouteAvailable, x as FrameChromeContext, xt as isShowAvailable } from "./place-node-CfzQvh4Y.js";
+import { Ct as useShownItemActions, G as RouteScreenClaimContext, H as ScreenTree, J as FormControlProvider, K as RouteScreenContext, Mt as FieldDisplay, S as useFrameChrome, U as useTabsUrlState, W as QuickScreenClaimContext, X as useFormControlOf, d as resolveFrameView, g as UndeclaredTypeNotice, gt as PageHeader, h as TypeChromeDrawnContext, i as RouteListContext, kt as DeepLinkScope, m as HeaderTypeNotice, n as viewOf, p as ChangeTypeButton, q as useIsRouteScreen, t as selectImplementation, u as isBuiltinRecordView, v as FormActions, x as FrameChromeContext } from "./place-node-BdxT-30h.js";
 import { t as useNoticeSink } from "./success-notices-LDEgEkc4.js";
-import { FORM_SLOT, addressesCapability, builtinFrames, canonicalEntityNodeKey, compilePageScreen, declaredText, dtoFields, evaluateVisible, fieldSensitivity, formatEntityRef, hasListPage, hrefFor, humanizeKey, isCustomPageDef, isScreenFailure, issueOfInput, matchPath, navHrefFor, normalizeEntityRef, normalizeIssueInputs, pageParamNames, parsePageParams, resolveNavLabel, resourceKey, routeResourceKey, routeServerIssues, scopeColumnOf, snapshotAppFrames, snapshotBlockLookup, snapshotFrameLookup, successNoticesOf } from "@burojs/core";
-import { ActionRouteContext, ComponentsContext, FrameCheckContext, RecordFrameContext, RecordScopeProvider, ResourceContext, RouteSourceContext, ScreenStateProvider, maybeThen, pageAccessFor, policyRecordOf, recordKeyOf, resolveRoute, retryRecordRead, settle, useApp, useApplicationSnapshot, useAvailabilityResolver, useChromeT, useComponent, useCtx, useCurrentUserId, useFieldAccess, useFormController, useFrameImplementations, useFrameT, useI18nCaps, useList, useNavigationGuardText, useOne, useOptionalDataRuntime, useOptionalRouterAdapter, useOptionalT, usePageAccess, usePageScreen, usePermissions, usePlatformStorage, useProjectedRecord, usePublishDocVariant, useQuickEntry, useRecordFrame, useRecordTitle, useRouteListImplementation, useRouteNavigate, useRouteRecordId, useScope, useT, useTestIds, useTranslate, useVisibilityCtx } from "@burojs/react";
+import { FORM_SLOT, addressesCapability, builtinFrames, canonicalEntityNodeKey, compilePageScreen, declaredText, dtoFields, evaluateVisible, fieldSensitivity, formatEntityRef, hasListPage, hrefFor, humanizeKey, isCustomPageDef, isScreenFailure, issueOfInput, matchPath, navHrefFor, normalizeEntityRef, normalizeIssueInputs, pageParamNames, parsePageParams, resolveNavLabel, resolveResourceLabel, resourceKey, routeResourceKey, routeServerIssues, scopeColumnOf, snapshotAppFrames, snapshotBlockLookup, snapshotFrameLookup, successNoticesOf } from "@burojs/core";
+import { ActionRouteContext, ComponentsContext, FrameCheckContext, ORIGIN_DEPTH, RecordFrameContext, RecordScopeProvider, ResourceContext, RouteSourceContext, ScreenStateProvider, maybeThen, pageAccessFor, policyRecordOf, recordKeyOf, recordRouteAvailable, resolveRoute, retryRecordRead, settle, useApp, useApplicationSnapshot, useAvailabilityResolver, useChromeT, useComponent, useCtx, useCurrentUserId, useFieldAccess, useFormController, useFrameImplementations, useFrameT, useI18nCaps, useList, useNavigationGuardText, useOne, useOptionalDataRuntime, useOptionalRouterAdapter, useOptionalT, usePageAccess, usePageScreen, usePermissions, usePlatformStorage, useProjectedRecord, usePublishDocVariant, useQuickEntry, useRecordFrame, useRecordTitle, useReturnTarget, useRouteListImplementation, useRouteNavigate, useRouteRecordId, useScope, useT, useTestIds, useTranslate, useVisibilityCtx } from "@burojs/react";
 import { Suspense, createContext, useCallback, useContext, useEffect, useId, useMemo, useRef, useState, useSyncExternalStore } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 //#region src/resource-key.ts
@@ -951,15 +951,21 @@ function RecordFrameHost(props) {
 		edited
 	]);
 	const notify = useNoticeSink(resource);
+	const routeScreen = useIsRouteScreen();
+	const leavesOnCreate = mode === "create" && routeScreen;
+	const [created, setCreated] = useState(false);
+	const createdRef = useRef(false);
 	const latest = useRef({
 		controller,
 		onSuccess: props.onSuccess,
-		notify
+		notify,
+		leavesOnCreate
 	});
 	latest.current = {
 		controller,
 		onSuccess: props.onSuccess,
-		notify
+		notify,
+		leavesOnCreate
 	};
 	const mounted = useRef(true);
 	useEffect(() => {
@@ -969,6 +975,7 @@ function RecordFrameHost(props) {
 		};
 	}, []);
 	const submit = useCallback(async () => {
+		if (createdRef.current) return;
 		setSubmitError(void 0);
 		setSubmitApplied(void 0);
 		setFailed(NO_ISSUES);
@@ -976,6 +983,10 @@ function RecordFrameHost(props) {
 		atFailure.current = {};
 		const outcome = await latest.current.controller.submit();
 		if (!mounted.current) return;
+		if (latest.current.leavesOnCreate && (outcome.status === "submitted" || outcome.status === "failed" && outcome.applied === "yes")) {
+			createdRef.current = true;
+			setCreated(true);
+		}
 		if (outcome.status === "submitted") {
 			const notices = successNoticesOf(outcome.result);
 			if (notices.length > 0) latest.current.notify(notices);
@@ -1015,7 +1026,6 @@ function RecordFrameHost(props) {
 	]);
 	const { chooseType } = props;
 	const typedAndAccepted = mode === "create" && controller.typeOffer !== null && controller.failure === null;
-	const routeScreen = useIsRouteScreen();
 	const adapter = useOptionalRouterAdapter();
 	const hostRouter = routeScreen ? adapter : null;
 	const guardText = useNavigationGuardText();
@@ -1057,6 +1067,7 @@ function RecordFrameHost(props) {
 		submitError,
 		...submitApplied === void 0 ? {} : { submitApplied },
 		serverIssues: shownFailed,
+		...created ? { created: true } : {},
 		submit,
 		root
 	}), [
@@ -1070,6 +1081,7 @@ function RecordFrameHost(props) {
 		submitError,
 		submitApplied,
 		shownFailed,
+		created,
 		submit
 	]);
 	usePublishDocVariant(mode === "show" ? resource : void 0, record);
@@ -1257,6 +1269,24 @@ function usePublishedRecordTrail(key) {
 	return current !== null && current.key === key ? current : null;
 }
 //#endregion
+//#region src/layout/record-targets.ts
+function isShowAvailable(registry, resource) {
+	return recordRouteAvailable(registry, resource, "show");
+}
+function showTarget(resource, id) {
+	return {
+		resource,
+		action: "show",
+		params: { id }
+	};
+}
+function listTarget(resource) {
+	return {
+		resource,
+		action: "list"
+	};
+}
+//#endregion
 //#region src/layout/route-trail.ts
 function useTrailContext() {
 	const app = useApp();
@@ -1284,7 +1314,8 @@ function groupCrumbs(ctx, chain) {
 		const key = canonicalNavKey(group);
 		return {
 			label: resolveNavLabel(ctx.caps, `groups.${key}`, declaredText("chrome", group, "label")),
-			href: groupCrumbHref(ctx.registry, key, ctx.isVisible)
+			href: groupCrumbHref(ctx.registry, key, ctx.isVisible),
+			jump: true
 		};
 	});
 }
@@ -1300,8 +1331,68 @@ function recordActionOf(match) {
 		default: return;
 	}
 }
+function pathOf(href) {
+	const path = href.split(/[?#]/, 1)[0] ?? "";
+	return path.length > 1 && path.endsWith("/") ? path.slice(0, -1) : path;
+}
+function originTrail(ctx, origin, depth = ORIGIN_DEPTH) {
+	const match = matchPath(ctx.registry, pathOf(origin.href), { isVisible: ctx.isVisible });
+	if (match === null) return void 0;
+	switch (match.kind) {
+		case "resource": {
+			const key = canonicalNavKey(match);
+			if (match.action === "list") return {
+				leading: groupCrumbs(ctx, match.groupChain),
+				resource: key,
+				resourceHref: origin.href,
+				segments: []
+			};
+			const def = ctx.registry.get(key);
+			const crumb = {
+				label: match.action === "create" ? ctx.t("breadcrumbs.create") : origin.title || (match.id === void 0 ? "" : `#${match.id}`),
+				href: origin.href
+			};
+			const parent = depth > 1 && origin.origin !== void 0 ? originTrail(ctx, origin.origin, depth - 1) : void 0;
+			if (parent !== void 0) return {
+				...parent,
+				segments: [...parent.segments, crumb]
+			};
+			return {
+				leading: groupCrumbs(ctx, match.groupChain),
+				resource: key,
+				...def !== void 0 && hasListPage(def) ? { resourceHref: hrefFor(ctx.registry, key) } : {},
+				segments: [crumb]
+			};
+		}
+		case "custom-page": {
+			const trail = headerTrail(ctx, match);
+			if (trail === null || trail.pageLabel === void 0) return void 0;
+			return {
+				leading: trail.leadingSegments ?? [],
+				segments: [{
+					label: trail.pageLabel,
+					href: origin.href
+				}]
+			};
+		}
+		case "group-index": {
+			const crumbs = groupCrumbs(ctx, match.groupChain);
+			const own = crumbs[crumbs.length - 1];
+			if (own === void 0) return void 0;
+			return {
+				leading: crumbs.slice(0, -1),
+				segments: [{
+					label: own.label,
+					href: origin.href
+				}]
+			};
+		}
+		default: return;
+	}
+}
 function recordTrail(ctx, input) {
-	const { resource, action, id } = input;
+	const { resource, action, id, origin } = input;
+	if (origin !== void 0 && (action === "create" || id !== "")) return originRooted(ctx, input, origin);
 	const leadingSegments = nonEmpty(groupCrumbs(ctx, input.groupChain));
 	if (action !== "create" && id === "") return {
 		resource,
@@ -1321,6 +1412,42 @@ function recordTrail(ctx, input) {
 		middleSegments
 	};
 }
+function originRooted(ctx, input, origin) {
+	const { resource, action, id } = input;
+	const recordLabel = input.title || id;
+	const drawn = new Set(origin.segments.flatMap((crumb) => crumb.href === void 0 ? [] : [pathOf(crumb.href)]));
+	const own = action === "edit" ? [isShowAvailable(ctx.registry, resource) ? {
+		label: recordLabel,
+		href: resolveRoute(showTarget(resource, id), ctx.registry)
+	} : { label: recordLabel }].filter((crumb) => crumb.href === void 0 || !drawn.has(pathOf(crumb.href))) : [];
+	const pageLabel = action === "create" ? ctx.t("breadcrumbs.create") : action === "edit" ? ctx.t("breadcrumbs.edit") : recordLabel;
+	const recordId = action === "create" ? void 0 : id;
+	const middleSegments = nonEmpty([...origin.segments, ...own]);
+	if (origin.resource !== void 0 && ctx.registry.get(origin.resource) === ctx.registry.get(resource)) return {
+		resource,
+		recordId,
+		pageLabel,
+		leadingSegments: nonEmpty([...origin.leading]),
+		...origin.resourceHref === void 0 ? {} : { resourceHref: origin.resourceHref },
+		middleSegments
+	};
+	const def = origin.resource === void 0 ? void 0 : ctx.registry.get(origin.resource);
+	const resourceCrumb = origin.resource === void 0 ? [] : [{
+		label: resolveResourceLabel(ctx.caps, origin.resource, "plural", def),
+		...origin.resourceHref === void 0 ? {} : { href: origin.resourceHref }
+	}];
+	return {
+		resource,
+		recordId,
+		pageLabel,
+		rootSegments: [
+			...origin.leading,
+			...resourceCrumb,
+			...origin.segments,
+			...own
+		]
+	};
+}
 function recordTrailRoute(registry, match) {
 	if (match === null || match.kind !== "resource") return null;
 	const resource = canonicalNavKey(match);
@@ -1514,10 +1641,9 @@ function RecordShow({ resource, id, recordId, record, shown }) {
 	})] });
 }
 function RecordEdit({ resource, id, recordId, record, shown }) {
-	const app = useApp();
 	const navigate = useRouteNavigate();
 	const mounted = useMountedRef();
-	const back = recordReturnTarget(app.registry, resource, id);
+	const back = useReturnTarget(resource, "edit", id);
 	return jsxs("div", { children: [jsx(RecordRouteHeader, {
 		resource,
 		action: "edit",
@@ -1528,9 +1654,9 @@ function RecordEdit({ resource, id, recordId, record, shown }) {
 		mode: "edit",
 		recordId,
 		record,
-		onCancel: () => navigate(back),
+		onCancel: () => navigate(back, { origin: "inherit" }),
 		onSuccess: () => {
-			if (mounted.current) navigate(back);
+			if (mounted.current) navigate(back, { origin: "inherit" });
 		}
 	})] });
 }
@@ -1544,6 +1670,7 @@ function RecordCreate({ resource, defaults }) {
 	const mounted = useMountedRef();
 	const adapter = useOptionalRouterAdapter();
 	const list = listTarget(resource);
+	const back = useReturnTarget(resource, "create");
 	const type = adapter?.searchParams.get("type") ?? void 0;
 	return jsxs("div", { children: [jsx(RecordRouteHeader, {
 		resource,
@@ -1556,11 +1683,11 @@ function RecordCreate({ resource, defaults }) {
 			mode: "create",
 			...type === void 0 ? {} : { type },
 			...defaults === void 0 ? {} : { defaults },
-			onCancel: () => navigate(list),
+			onCancel: () => navigate(back, { origin: "inherit" }),
 			onSuccess: (result) => {
 				if (!mounted.current) return;
 				const id = createdId(result);
-				navigate(id === void 0 ? list : recordReturnTarget(app.registry, resource, id));
+				navigate(id !== void 0 && isShowAvailable(app.registry, resource) ? showTarget(resource, id) : list, { origin: "inherit" });
 			}
 		})
 	})] });
@@ -1826,6 +1953,6 @@ function NavAreaPage() {
 	});
 }
 //#endregion
-export { TabsLayout as A, usePageAllowed as C, useLayout as D, layoutSlot as E, canonicalNavKey as M, canonicalResourceKey$1 as N, useLayoutResolver as O, useNavVisible as S, BUILTIN_LAYOUTS as T, PlannedBody as _, useRecordVisit as a, useHref as b, headerTrail as c, useTrailContext as d, recordTrailKey as f, useResourceDimensionOptions as g, RecordScreen as h, RecordPage as i, SecondarySidebarLayout as j, useReportUnresolvedLayouts as k, recordTrail as l, usePublishedRecordTrail as m, NavAreaPage as n, RECENT_LABEL_KEYS as o, usePublishRecordTrail as p, ResourcePageRouter as r, readRecentRecords as s, NavAreaNotFound as t, recordTrailRoute as u, ResourceListPage as v, useResourceVisible as w, useMatch as x, NavChromeMountedProvider as y };
+export { useLayoutResolver as A, useMatch as C, BUILTIN_LAYOUTS as D, useResourceVisible as E, canonicalResourceKey$1 as F, TabsLayout as M, SecondarySidebarLayout as N, layoutSlot as O, canonicalNavKey as P, useHref as S, usePageAllowed as T, RecordScreen as _, useRecordVisit as a, ResourceListPage as b, headerTrail as c, recordTrailRoute as d, useTrailContext as f, usePublishedRecordTrail as g, usePublishRecordTrail as h, RecordPage as i, useReportUnresolvedLayouts as j, useLayout as k, originTrail as l, recordTrailKey as m, NavAreaPage as n, RECENT_LABEL_KEYS as o, isShowAvailable as p, ResourcePageRouter as r, readRecentRecords as s, NavAreaNotFound as t, recordTrail as u, useResourceDimensionOptions as v, useNavVisible as w, NavChromeMountedProvider as x, PlannedBody as y };
 
-//# sourceMappingURL=resource-page-router-Diw6S6TK.js.map
+//# sourceMappingURL=resource-page-router-BRpUnhay.js.map