@rebasepro/admin 0.9.1-canary.16c42e9 → 0.9.1-canary.26fe4b2

package/src/components/field_configs.tsx

@@ -42,6 +42,23 @@ import { RelationFieldBinding } from "../form/field_bindings/RelationFieldBindin
 import { UserSelectFieldBinding } from "../form/field_bindings/UserSelectFieldBinding";
 import { mergeDeep } from "@rebasepro/utils";
 
+/**
+ * Every `Field` below is a getter on purpose — do not inline it back to
+ * `Field: SomeBinding`.
+ *
+ * This module and the field bindings form an import cycle: we import the
+ * bindings, the container bindings (map, repeat, block, custom-shaped array)
+ * import `PropertyFieldBinding` to render their children, and that imports
+ * `getFieldConfig` from here. Enter the cycle at a binding rather than here and
+ * this object is built while that binding's module is still initialising.
+ *
+ * As a plain value the binding would be read at that moment. It happens to
+ * survive today only because every binding is declared `export function`, which
+ * hoists; rewriting a single one as `export const` would make the read a
+ * temporal dead zone ReferenceError at import time, surfacing as a blank screen
+ * far from its cause. The getter defers the read to first access, long after
+ * every module has initialised, so declaration style stops mattering.
+ */
 export const DEFAULT_FIELD_CONFIGS: Record<DefaultFieldConfig, PropertyConfig> = {
     text_field: {
         key: "text_field",
@@ -51,7 +68,7 @@ export const DEFAULT_FIELD_CONFIGS: Record<DefaultFieldConfig, PropertyConfig> =
         color: "#2d7ff9",
         property: {
             type: "string",
-            ui: { Field: TextFieldBinding }
+            ui: { get Field() { return TextFieldBinding; } }
         }
     },
     multiline: {
@@ -63,7 +80,7 @@ export const DEFAULT_FIELD_CONFIGS: Record<DefaultFieldConfig, PropertyConfig> =
         property: {
             type: "string",
             ui: { multiline: true,
-Field: TextFieldBinding }
+get Field() { return TextFieldBinding; } }
         }
     },
     markdown: {
@@ -75,7 +92,7 @@ Field: TextFieldBinding }
         property: {
             type: "string",
             ui: { markdown: true,
-Field: MarkdownEditorFieldBinding }
+get Field() { return MarkdownEditorFieldBinding; } }
         }
     },
     url: {
@@ -87,7 +104,7 @@ Field: MarkdownEditorFieldBinding }
         property: {
             type: "string",
             ui: { url: true,
-Field: TextFieldBinding }
+get Field() { return TextFieldBinding; } }
         }
     },
     email: {
@@ -99,7 +116,7 @@ Field: TextFieldBinding }
         property: {
             type: "string",
             email: true,
-            ui: { Field: TextFieldBinding }
+            ui: { get Field() { return TextFieldBinding; } }
         }
     },
     switch: {
@@ -110,7 +127,7 @@ Field: TextFieldBinding }
         color: "#20d9d2",
         property: {
             type: "boolean",
-            ui: { Field: SwitchFieldBinding }
+            ui: { get Field() { return SwitchFieldBinding; } }
         }
     },
     select: {
@@ -122,7 +139,7 @@ Field: TextFieldBinding }
         property: {
             type: "string",
             enum: [],
-            ui: { Field: SelectFieldBinding }
+            ui: { get Field() { return SelectFieldBinding; } }
         }
     },
     multi_select: {
@@ -137,7 +154,7 @@ Field: TextFieldBinding }
                 type: "string",
                 enum: []
             },
-            ui: { Field: MultiSelectFieldBinding }
+            ui: { get Field() { return MultiSelectFieldBinding; } }
         }
     },
     user_select: {
@@ -147,7 +164,7 @@ Field: TextFieldBinding }
         Icon: UserIcon,
         property: {
             type: "string",
-            ui: { Field: UserSelectFieldBinding }
+            ui: { get Field() { return UserSelectFieldBinding; } }
         }
     },
     number_input: {
@@ -158,7 +175,7 @@ Field: TextFieldBinding }
         color: "#bec920",
         property: {
             type: "number",
-            ui: { Field: TextFieldBinding }
+            ui: { get Field() { return TextFieldBinding; } }
         }
     },
     number_select: {
@@ -170,7 +187,7 @@ Field: TextFieldBinding }
         property: {
             type: "number",
             enum: [],
-            ui: { Field: SelectFieldBinding }
+            ui: { get Field() { return SelectFieldBinding; } }
         }
     },
     multi_number_select: {
@@ -185,7 +202,7 @@ Field: TextFieldBinding }
                 type: "number",
                 enum: []
             },
-            ui: { Field: MultiSelectFieldBinding }
+            ui: { get Field() { return MultiSelectFieldBinding; } }
         }
     },
     file_upload: {
@@ -199,7 +216,7 @@ Field: TextFieldBinding }
             storage: {
                 storagePath: "{path}"
             },
-            ui: { Field: StorageUploadFieldBinding }
+            ui: { get Field() { return StorageUploadFieldBinding; } }
         }
     },
     multi_file_upload: {
@@ -216,7 +233,7 @@ Field: TextFieldBinding }
                     storagePath: "{path}"
                 }
             },
-            ui: { Field: StorageUploadFieldBinding }
+            ui: { get Field() { return StorageUploadFieldBinding; } }
         }
     },
     reference: {
@@ -227,7 +244,7 @@ Field: TextFieldBinding }
         color: "#ff0042",
         property: {
             type: "reference",
-            ui: { Field: ReferenceFieldBinding }
+            ui: { get Field() { return ReferenceFieldBinding; } }
         }
     },
     multi_references: {
@@ -241,7 +258,7 @@ Field: TextFieldBinding }
             of: {
                 type: "reference"
             },
-            ui: { Field: ArrayOfReferencesFieldBinding }
+            ui: { get Field() { return ArrayOfReferencesFieldBinding; } }
         }
     },
     relation: {
@@ -253,7 +270,7 @@ Field: TextFieldBinding }
         property: {
             relationName: "",
             type: "relation",
-            ui: { Field: RelationFieldBinding }
+            ui: { get Field() { return RelationFieldBinding; } }
         }
     },
     date_time: {
@@ -264,7 +281,7 @@ Field: TextFieldBinding }
         color: "#8b46ff",
         property: {
             type: "date",
-            ui: { Field: DateTimeFieldBinding }
+            ui: { get Field() { return DateTimeFieldBinding; } }
         }
     },
     group: {
@@ -276,7 +293,7 @@ Field: TextFieldBinding }
         property: {
             type: "map",
             properties: {},
-            ui: { Field: MapFieldBinding }
+            ui: { get Field() { return MapFieldBinding; } }
         }
     },
     key_value: {
@@ -288,7 +305,7 @@ Field: TextFieldBinding }
         property: {
             type: "map",
             keyValue: true,
-            ui: { Field: KeyValueFieldBinding }
+            ui: { get Field() { return KeyValueFieldBinding; } }
         }
     },
     repeat: {
@@ -302,7 +319,7 @@ Field: TextFieldBinding }
             of: {
                 type: "string"
             },
-            ui: { Field: RepeatFieldBinding }
+            ui: { get Field() { return RepeatFieldBinding; } }
         }
     },
     custom_array: {
@@ -313,7 +330,7 @@ Field: TextFieldBinding }
         color: "#ff9408",
         property: {
             type: "array",
-            ui: { Field: ArrayCustomShapedFieldBinding }
+            ui: { get Field() { return ArrayCustomShapedFieldBinding; } }
         }
     },
     block: {
@@ -327,7 +344,7 @@ Field: TextFieldBinding }
             oneOf: {
                 properties: {}
             },
-            ui: { Field: BlockFieldBinding }
+            ui: { get Field() { return BlockFieldBinding; } }
         }
     },
     vector_input: {
@@ -339,7 +356,7 @@ Field: TextFieldBinding }
         property: {
             type: "vector",
             dimensions: 1536,
-            ui: { Field: VectorFieldBinding }
+            ui: { get Field() { return VectorFieldBinding; } }
         }
     }
 };

package/src/components/history/EntityHistoryView.tsx

@@ -7,7 +7,7 @@ import { EntityHistoryEntry } from "./EntityHistoryEntry";
 import { useSnackbarController, useAuthController } from "@rebasepro/app";
 import { ConfirmationDialog } from "@rebasepro/app";
 import { useState } from "react";
-import { useHistory } from "../../index";
+import { useHistory } from "../../hooks/useHistory";
 
 /**
  * Entity history tab view. Shows a paginated list of entity revisions

package/src/contexts/BreacrumbsContext.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo, useState } from "react";
-import { BreadcrumbEntry, BreadcrumbsController } from "../hooks/useBreadcrumbsController";
+import type { BreadcrumbEntry, BreadcrumbsController } from "@rebasepro/types";
 
 const DEFAULT_BREADCRUMBS_CONTROLLER: BreadcrumbsController = {
     breadcrumbs: [],

package/src/data_import/components/ImportNewPropertyFieldPreview.tsx

@@ -1,10 +1,8 @@
 import React from "react";
 import { useCustomizationController } from "@rebasepro/app";
 import { Property } from "@rebasepro/types";
-import {
-    getFieldConfig,
-    PropertyConfigBadge
-} from "../../components";
+import { getFieldConfig } from "../../components/field_configs";
+import { PropertyConfigBadge } from "../../components/PropertyConfigBadge";
 import { ErrorBoundary, IconButton, PencilIcon, TextField } from "@rebasepro/ui";
 
 export function ImportNewPropertyFieldPreview({

package/src/data_import/import/ImportCollectionAction.tsx

@@ -6,11 +6,9 @@ import {
 } from "@rebasepro/app";
 import { getPropertiesWithPropertiesOrder, getPropertyInPath } from "../../util";
 import { CollectionActionsProps, Properties, Property, User, CollectionConfig } from "@rebasepro/types";
-import {
-    getFieldConfig,
-    PropertyConfigBadge,
-    useSelectionController
-} from "../../components";
+import { getFieldConfig } from "../../components/field_configs";
+import { PropertyConfigBadge } from "../../components/PropertyConfigBadge";
+import { useSelectionController } from "../../components/CollectionViewBinding/useSelectionController";
 import { CollectionTableBinding } from "../../components/CollectionTableBinding/CollectionTableBinding";
 import { useCollectionRegistryController } from "../../hooks";
 import {
@@ -32,7 +30,9 @@ import {
 import { buildEntityPropertiesFromData } from "@rebasepro/inference";
 import { useImportConfig } from "../hooks";
 import { convertDataToEntity, getInferenceType } from "../utils";
-import { DataNewPropertiesMapping, ImportFileUpload, ImportSaveInProgress } from "../components";
+import { DataNewPropertiesMapping } from "../components/DataNewPropertiesMapping";
+import { ImportFileUpload } from "../components/ImportFileUpload";
+import { ImportSaveInProgress } from "../components/ImportSaveInProgress";
 import { ImportConfig } from "../types";
 import { slugify } from "@rebasepro/utils";
 

package/src/editor/selectors/color-selector.tsx

@@ -1,5 +1,5 @@
 import type { Dispatch, SetStateAction } from "react";
-import { EditorBubbleItem } from "../components";
+import { EditorBubbleItem } from "../components/editor-bubble-item";
 import { Button, CheckIcon, ChevronDownIcon, Popover } from "@rebasepro/ui";
 import { useProseMirrorContext } from "../hooks/useProseMirrorContext";
 import { isMarkActive, getMarkAttributes, setMark, unsetMark } from "../utils/prosemirror-utils";

package/src/editor/selectors/node-selector.tsx

@@ -1,6 +1,6 @@
 
 import { EditorState, Transaction } from "prosemirror-state";
-import { EditorBubbleItem } from "../components";
+import { EditorBubbleItem } from "../components/editor-bubble-item";
 import { useTranslation } from "@rebasepro/app";
 
 import {

package/src/editor/selectors/text-buttons.tsx

@@ -1,6 +1,6 @@
 
 import { EditorState, Transaction } from "prosemirror-state";
-import { EditorBubbleItem } from "../components";
+import { EditorBubbleItem } from "../components/editor-bubble-item";
 import type { SelectorItem } from "./node-selector";
 import { BoldIcon, Button, cls, CodeIcon, ItalicIcon, StrikethroughIcon, UnderlineIcon } from "@rebasepro/ui";
 import { useProseMirrorContext } from "../hooks/useProseMirrorContext";

package/src/form/EntityForm.tsx

@@ -15,7 +15,10 @@ import { getFormFieldKeys } from "@rebasepro/app";
 import { Alert, Button, Chip, cls, Dialog, DialogActions, DialogContent, DialogTitle, iconSize, paperMixin, Tooltip, Typography } from "@rebasepro/ui";
 import { Formex, FormexController, useCreateFormex } from "@rebasepro/forms";
 
-import { FormEntry, FormLayout, LabelWithIconAndTooltip, PropertyFieldBinding } from "../form";
+import { FormEntry } from "./components/FormEntry";
+import { FormLayout } from "./components/FormLayout";
+import { LabelWithIconAndTooltip } from "./components/LabelWithIconAndTooltip";
+import { PropertyFieldBinding } from "./PropertyFieldBinding";
 import { flattenKeys } from "@rebasepro/app";
 import { ErrorFocus } from "./components/ErrorFocus";
 import { CustomFieldValidator, getEntitySchema } from "./validation";

package/src/form/EntityFormBinding.tsx

@@ -26,7 +26,9 @@ import {
     saveEntityToCache
 } from "@rebasepro/app";
 
-import { useCollectionRegistryController, useSidePanel, useCMSContext } from "../index";
+import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
+import { useSidePanel } from "../hooks/useSidePanel";
+import { useCMSContext } from "../hooks/useCMSContext";
 import { EntityForm } from "./EntityForm";
 import {
     extractTouchedValues,

package/src/form/field_bindings/ArrayCustomShapedFieldBinding.tsx

@@ -2,7 +2,8 @@ import type { FieldProps } from "../../types/fields";
 import type { ArrayProperty, Property } from "@rebasepro/types";
 import React from "react";
 ;
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
 import { ExpandablePanel, Typography } from "@rebasepro/ui";
 import { getArrayResolvedProperties, isReadOnly } from "@rebasepro/common";

package/src/form/field_bindings/ArrayOfReferencesFieldBinding.tsx

@@ -5,7 +5,8 @@ import type { ArrayProperty, Property } from "@rebasepro/types";
 import React, { useCallback, useMemo } from "react";
 import { Entity, EntityReference } from "@rebasepro/types";
 import { ReferencePreview } from "../../preview";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { ArrayContainer, ArrayEntryParams } from "../../components/ArrayContainer";
 import { getIconForProperty } from "../../util/property_utils";
 import { getReferenceFrom } from "@rebasepro/common";
@@ -13,7 +14,7 @@ import { getReferenceFrom } from "@rebasepro/common";
 import { useTranslation, ErrorView } from "@rebasepro/app";
 import { Button, cls, ExpandablePanel, fieldBackgroundMixin, PencilIcon, Typography } from "@rebasepro/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
-import { useCollectionRegistryController } from "../../index";
+import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
 
 type ArrayOfReferencesFieldProps = FieldProps<ArrayProperty, EntityReference[]>;
 

package/src/form/field_bindings/BlockFieldBinding.tsx

@@ -4,7 +4,8 @@ import React, { useEffect, useState } from "react";
 
 import { Field, useFormex } from "@rebasepro/forms";
 
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
 import { EnumValuesChip } from "../../preview";
 

package/src/form/field_bindings/DateTimeFieldBinding.tsx

@@ -4,7 +4,8 @@ import React from "react";
 
 ;
 
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { useCustomizationController } from "@rebasepro/app";
 import { getIconForProperty } from "../../util/property_utils";
 import { DateTimeField } from "@rebasepro/ui";

package/src/form/field_bindings/KeyValueFieldBinding.tsx

@@ -4,7 +4,8 @@ import React, { useEffect, useState } from "react";
 import { DataType, GeoPoint } from "@rebasepro/types";
 
 import { ArrayContainer } from "../../components/ArrayContainer";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import {
     BooleanSwitchWithLabel,
     Button,

package/src/form/field_bindings/MapFieldBinding.tsx

@@ -7,7 +7,8 @@ import { useTranslation } from "@rebasepro/app";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { getIconForProperty } from "../../util/property_utils";
 import { isHidden, isReadOnly } from "@rebasepro/common";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { PropertyFieldBinding } from "../PropertyFieldBinding";
 import { cls, ExpandablePanel } from "@rebasepro/ui";
 

package/src/form/field_bindings/MarkdownEditorFieldBinding.tsx

@@ -1,5 +1,6 @@
 import React, { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { useAuthController, useStorageSource } from "@rebasepro/app";
 import { useStorageSources } from "@rebasepro/app";
 import { resolveStorageSource } from "@rebasepro/common";

package/src/form/field_bindings/MultiSelectFieldBinding.tsx

@@ -3,7 +3,8 @@ import type { ArrayProperty, Property } from "@rebasepro/types";
 import React, { useCallback } from "react";
 
 ;
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { EnumValuesChip } from "../../preview";
 import { getIconForProperty } from "../../util/property_utils";
 import { enumToObjectEntries, getLabelOrConfigFrom } from "@rebasepro/common";

package/src/form/field_bindings/MultipleRelationFieldBinding.tsx

@@ -3,7 +3,8 @@ import type { FieldProps } from "../../types/fields";
 import type { RelationProperty } from "@rebasepro/types";
 import { Entity, getCollectionDataPath, getDataSourceCapabilities } from "@rebasepro/types";
 import React, { useCallback } from "react";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { ArrayContainer, ArrayEntryParams } from "../../components/ArrayContainer";
 import { getIconForProperty } from "../../util/property_utils";
 import { getRelationFrom, resolveRelationProperty } from "@rebasepro/common";

package/src/form/field_bindings/ReadOnlyFieldBinding.tsx

@@ -5,7 +5,8 @@ import React from "react";
 ;
 
 import { PropertyPreview } from "../../preview";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { getIconForProperty } from "../../util/property_utils";
 import { cls } from "@rebasepro/ui";

package/src/form/field_bindings/ReferenceFieldBinding.tsx

@@ -7,7 +7,8 @@ import React, { useCallback, useMemo } from "react";
 import { Entity, EntityReference } from "@rebasepro/types";
 import { ErrorView } from "@rebasepro/app";
 import { ReadOnlyFieldBinding } from "./ReadOnlyFieldBinding";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { EntityPreviewContainer } from "../../components/EntityPreviewBinding";
 import { ReferencePreview } from "../../preview";
 import { IconForView } from "@rebasepro/app";
@@ -15,7 +16,7 @@ import { getIconForProperty } from "../../util/property_utils";
 import { getReferenceFrom } from "@rebasepro/common";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { cls } from "@rebasepro/ui";
-import { useCollectionRegistryController } from "../../index";
+import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
 
 /**
  * Field that opens a reference selection dialog.

package/src/form/field_bindings/RelationFieldBinding.tsx

@@ -3,7 +3,8 @@ import type { FieldProps } from "../../types/fields";
 import type { RelationProperty } from "@rebasepro/types";
 import { Entity, getCollectionDataPath, getDataSourceCapabilities, Relation } from "@rebasepro/types";
 import React, { useCallback } from "react";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { EntityPreviewContainer } from "../../components/EntityPreviewBinding";
 import { ErrorView, IconForView } from "@rebasepro/app";
 import { getIconForProperty } from "../../util/property_utils";

package/src/form/field_bindings/RepeatFieldBinding.tsx

@@ -2,7 +2,8 @@ import type { FieldProps, PropertyFieldBindingProps } from "../../types/fields";
 import type { ArrayProperty } from "@rebasepro/types";
 import React, { useState } from "react";
 ;
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 import { ArrayContainer, ArrayEntryParams } from "../../components/ArrayContainer";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { getArrayResolvedProperties, getDefaultValueFor } from "@rebasepro/common";

package/src/form/field_bindings/SelectFieldBinding.tsx

@@ -3,7 +3,8 @@ import type { NumberProperty, StringProperty } from "@rebasepro/types";
 import React, { useCallback } from "react";
 
 ;
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { EnumValuesChip } from "../../preview";
 import { getIconForProperty } from "../../util/property_utils";
 import { cls, IconButton, Select, SelectItem, XIcon } from "@rebasepro/ui";

package/src/form/field_bindings/StorageUploadFieldBinding.tsx

@@ -5,7 +5,8 @@ import React, { useCallback, useState } from "react";
 import { StorageConfig } from "@rebasepro/types";
 import type { PreviewSize } from "../../types/components/PropertyPreviewProps";
 import { useDropzone } from "react-dropzone";
-import { FieldHelperText, LabelWithIconAndTooltip } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIconAndTooltip } from "../components/LabelWithIconAndTooltip";
 
 import { isReadOnly } from "@rebasepro/common";
 import { getIconForProperty } from "../../util/property_utils";

package/src/form/field_bindings/SwitchFieldBinding.tsx

@@ -4,7 +4,8 @@ import React from "react";
 
 ;
 import { getIconForProperty } from "../../util/property_utils";
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { BooleanSwitchWithLabel } from "@rebasepro/ui";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { PropertyIdCopyTooltip } from "../../components/PropertyIdCopyTooltip";

package/src/form/field_bindings/TextFieldBinding.tsx

@@ -13,7 +13,8 @@ import {
     XIcon
 } from "@rebasepro/ui";
 import { PreviewType } from "@rebasepro/types";
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { PropertyPreview } from "../../preview";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { PropertyIdCopyTooltip } from "../../components/PropertyIdCopyTooltip";

package/src/form/field_bindings/UserSelectFieldBinding.tsx

@@ -2,7 +2,8 @@ import type { FieldProps } from "../../types/fields";
 import type { StringProperty } from "@rebasepro/types";
 import React from "react";
 
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { getIconForProperty } from "../../util/property_utils";
 import { PropertyIdCopyTooltip } from "../../components/PropertyIdCopyTooltip";
 import { UserSelector } from "../../components/UserSelector";

package/src/form/field_bindings/VectorFieldBinding.tsx

@@ -11,7 +11,8 @@ import {
     TextField,
     Trash2Icon
 } from "@rebasepro/ui";
-import { FieldHelperText, LabelWithIcon } from "../components";
+import { FieldHelperText } from "../components/FieldHelperText";
+import { LabelWithIcon } from "../components/LabelWithIcon";
 import { useClearRestoreValue } from "../useClearRestoreValue";
 import { PropertyIdCopyTooltip } from "../../components/PropertyIdCopyTooltip";
 import { getIconForProperty } from "../../util/property_utils";

package/src/hooks/useBuildSidePanel.tsx

@@ -7,6 +7,7 @@ import {
     getNavigationEntriesFromPath,
     NavigationViewInternal,
     removeInitialAndTrailingSlashes,
+    removeTrailingSlash,
     resolveDefaultSelectedView
 } from "@rebasepro/common";
 import { resolvedSelectedEntityView } from "../util/resolutions";
@@ -280,6 +281,13 @@ export function buildSidePanelsFromUrl(path: string, collections: CollectionConf
 
     }
 
+    // `edit` is not a registered view, so the navigation parser skips it. Pick it
+    // up from the raw path so that reloading an edit URL reopens the edit form
+    // rather than silently dropping the user back on the detail view.
+    if (sidePanel && !sidePanel.selectedTab && removeTrailingSlash(path).endsWith("/edit")) {
+        sidePanel.selectedTab = "edit";
+    }
+
     // When the URL doesn't contain a tab segment but the collection has a
     // defaultSelectedView, resolve it so the panel opens with the correct
     // width and the URL is updated on the next replace() cycle.

package/src/hooks/useSelectionDialog.tsx

@@ -1,8 +1,8 @@
-import { SelectionProps, SelectionTableBinding } from "../components";
+import { SelectionProps, SelectionTableBinding } from "../components/ReferenceTable/SelectionTableBinding";
 import type { CollectionConfig } from "@rebasepro/types";
 import { useCallback, useMemo } from "react";
-import { useSideDialogsController } from "../index";
-import { useCollectionRegistryController } from "../index";
+import { useSideDialogsController } from "./useSideDialogsController";
+import { useCollectionRegistryController } from "./navigation/contexts/CollectionRegistryContext";
 
 /**
  * This hook is used to open a side dialog that allows the selection

package/src/preview/components/ImagePreview.tsx

@@ -3,7 +3,7 @@ import React, { CSSProperties, useMemo, useState, useEffect } from "react";impor
 import { PreviewSize } from "../../types/components/PropertyPreviewProps";
 import { getThumbnailMeasure } from "../util";
 import { useTranslation } from "@rebasepro/app";
-import { sanitizeUrl } from "./UrlComponentPreview";
+import { sanitizeUrl } from "../util";
 
 /**
  * @group Preview components

package/src/preview/components/ReferencePreview.tsx

@@ -8,7 +8,7 @@ import { Skeleton } from "@rebasepro/ui";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { ErrorView } from "@rebasepro/app";
 import { EntityPreviewBinding, EntityPreviewContainer } from "../../components/EntityPreviewBinding";
-import { useCollectionRegistryController } from "../../index";
+import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
 import { getEntityTitlePropertyKey } from "../../util/previews";
 import { getValueInPath } from "@rebasepro/utils";