@contember/bindx-repeater 0.1.14 → 0.1.15

package/dist/components/BlockRepeater.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BlockRepeater.d.ts","sourceRoot":"","sources":["../../src/components/BlockRepeater.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAW,KAAK,YAAY,EAAkB,MAAM,OAAO,CAAA;AACzE,OAAO,KAAK,EAGX,QAAQ,EAIR,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAyC,eAAe,EAAa,KAAK,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAClI,OAAO,KAAK,EACX,kBAAkB,EAMlB,MAAM,aAAa,CAAA;AAMpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,wBAAgB,aAAa,CAC5B,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,SAAS,GAAG,OAAO,EACnB,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAClC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/D,WAAW,SAAS,MAAM,GAAG,MAAM,EAClC,EACD,KAAK,EACL,mBAAmB,EACnB,UAAU,EACV,MAAM,EACN,QAAQ,GACR,EAAE,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,CAAC,GAAG,YAAY,CA+HlG;AAGD,QAAA,MAAM,0BAA0B,EAAoB,OAAO,aAAa,GAAG,iBAAiB,GAAG;IAAE,CAAC,eAAe,CAAC,EAAE,IAAI,CAAA;CAAE,CAAA;AAsF1H,OAAO,EAAE,0BAA0B,IAAI,qBAAqB,EAAE,CAAA"}
+{"version":3,"file":"BlockRepeater.d.ts","sourceRoot":"","sources":["../../src/components/BlockRepeater.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAW,KAAK,YAAY,EAAkB,MAAM,OAAO,CAAA;AACzE,OAAO,KAAK,EAGX,QAAQ,EAIR,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAyC,eAAe,EAAa,KAAK,iBAAiB,EAAwB,MAAM,wBAAwB,CAAA;AACxJ,OAAO,KAAK,EACX,kBAAkB,EAMlB,MAAM,aAAa,CAAA;AAMpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,wBAAgB,aAAa,CAC5B,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,SAAS,GAAG,OAAO,EACnB,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAClC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/D,WAAW,SAAS,MAAM,GAAG,MAAM,EAClC,EACD,KAAK,EACL,mBAAmB,EACnB,UAAU,EACV,MAAM,EACN,QAAQ,GACR,EAAE,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,CAAC,GAAG,YAAY,CAgIlG;AAGD,QAAA,MAAM,0BAA0B,EAAoB,OAAO,aAAa,GAAG,iBAAiB,GAAG;IAAE,CAAC,eAAe,CAAC,EAAE,IAAI,CAAA;CAAE,CAAA;AAkG1H,OAAO,EAAE,0BAA0B,IAAI,qBAAqB,EAAE,CAAA"}

package/dist/components/Repeater.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Repeater.d.ts","sourceRoot":"","sources":["../../src/components/Repeater.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAW,KAAK,YAAY,EAAkB,MAAM,OAAO,CAAA;AACzE,OAAO,KAAK,EAGX,QAAQ,EAGR,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAyC,eAAe,EAAa,KAAK,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAClI,OAAO,KAAK,EACX,aAAa,EAMb,MAAM,aAAa,CAAA;AAMpB;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,QAAQ,CACvB,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,SAAS,GAAG,OAAO,EACnB,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAClC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9D,EACD,KAAK,EACL,UAAU,EACV,QAAQ,GACR,EAAE,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,YAAY,CAuHhF;AAGD,QAAA,MAAM,qBAAqB,EAAe,OAAO,QAAQ,GAAG,iBAAiB,GAAG;IAAE,CAAC,eAAe,CAAC,EAAE,IAAI,CAAA;CAAE,CAAA;AA+E3G,OAAO,EAAE,qBAAqB,IAAI,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"Repeater.d.ts","sourceRoot":"","sources":["../../src/components/Repeater.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAW,KAAK,YAAY,EAAkB,MAAM,OAAO,CAAA;AACzE,OAAO,KAAK,EAGX,QAAQ,EAGR,MAAM,kBAAkB,CAAA;AAEzB,OAAO,EAAyC,eAAe,EAAa,KAAK,iBAAiB,EAAc,MAAM,wBAAwB,CAAA;AAC9I,OAAO,KAAK,EACX,aAAa,EAMb,MAAM,aAAa,CAAA;AAMpB;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,QAAQ,CACvB,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,SAAS,GAAG,OAAO,EACnB,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAClC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9D,EACD,KAAK,EACL,UAAU,EACV,QAAQ,GACR,EAAE,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,YAAY,CAwHhF;AAGD,QAAA,MAAM,qBAAqB,EAAe,OAAO,QAAQ,GAAG,iBAAiB,GAAG;IAAE,CAAC,eAAe,CAAC,EAAE,IAAI,CAAA;CAAE,CAAA;AA+E3G,OAAO,EAAE,qBAAqB,IAAI,gBAAgB,EAAE,CAAA"}

package/dist/hooks/useSortedItems.d.ts

@@ -1,4 +1,4 @@
-import type { EntityAccessor, HasManyRef, AnyBrand } from '@contember/bindx';
+import type { EntityAccessor, HasManyAccessor, AnyBrand } from '@contember/bindx';
 /**
  * Hook that returns sorted items from a has-many ref and repairs order field values.
  *
@@ -6,5 +6,5 @@ import type { EntityAccessor, HasManyRef, AnyBrand } from '@contember/bindx';
  * @param orderField - Optional field name for sorting
  * @returns Sorted array of entity accessors
  */
-export declare function useSortedItems<T extends object, S = T, TBrand extends AnyBrand = AnyBrand, TEntityName extends string = string, TSchema extends Record<string, object> = Record<string, object>>(hasMany: HasManyRef<T, S, TBrand, TEntityName, TSchema>, orderField: string | undefined): EntityAccessor<T, S, TBrand, TEntityName, TSchema>[];
+export declare function useSortedItems<T extends object, S = T, TBrand extends AnyBrand = AnyBrand, TEntityName extends string = string, TSchema extends Record<string, object> = Record<string, object>>(hasMany: HasManyAccessor<T, S, TBrand, TEntityName, TSchema>, orderField: string | undefined): EntityAccessor<T, S, TBrand, TEntityName, TSchema>[];
 //# sourceMappingURL=useSortedItems.d.ts.map

package/dist/hooks/useSortedItems.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSortedItems.d.ts","sourceRoot":"","sources":["../../src/hooks/useSortedItems.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAI5E;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC7B,CAAC,SAAS,MAAM,EAChB,CAAC,GAAG,CAAC,EACL,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAClC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAE/D,OAAO,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,EACvD,UAAU,EAAE,MAAM,GAAG,SAAS,GAC5B,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAgBtD"}
+{"version":3,"file":"useSortedItems.d.ts","sourceRoot":"","sources":["../../src/hooks/useSortedItems.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAIjF;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC7B,CAAC,SAAS,MAAM,EAChB,CAAC,GAAG,CAAC,EACL,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAClC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAE/D,OAAO,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,EAC5D,UAAU,EAAE,MAAM,GAAG,SAAS,GAC5B,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAiBtD"}

package/dist/types.d.ts

@@ -80,10 +80,15 @@ export interface RepeaterProps<TEntity, TSelected = TEntity, TBrand extends AnyB
     children: RepeaterRenderFn<TEntity, TSelected, TBrand, TEntityName, TSchema>;
 }
 /**
- * Minimal block definition for headless use.
+ * Block definition for headless use.
+ * Optional render/form functions declare block-specific field selections.
  */
-export interface BlockDefinition {
+export interface BlockDefinition<TEntity extends object = object, TSelected = TEntity> {
     label?: ReactNode;
+    /** Render function for block preview. Used for selection collection. */
+    render?: (entity: EntityAccessor<TEntity, TSelected>) => ReactNode;
+    /** Form function for block editing. Used for selection collection. */
+    form?: (entity: EntityAccessor<TEntity, TSelected>) => ReactNode;
 }
 /**
  * Extended item info with block type discrimination.

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/utils/repairEntitiesOrder.d.ts

@@ -1,10 +1,7 @@
-import type { EntityAccessor } from '@contember/bindx';
+import type { EntityAccessor, AnyBrand } from '@contember/bindx';
 /**
  * Repairs the order field values of entities to be sequential (0, 1, 2, ...).
  * Only updates values that differ from their expected index.
- *
- * @param items - Array of entity accessors (already sorted)
- * @param orderField - Name of the numeric field to update
  */
-export declare function repairEntitiesOrder<T extends object, S = T>(items: EntityAccessor<T, S>[], orderField: string): void;
+export declare function repairEntitiesOrder<T extends object, S = T, TBrand extends AnyBrand = AnyBrand, TEntityName extends string = string, TSchema extends Record<string, object> = Record<string, object>>(items: EntityAccessor<T, S, TBrand, TEntityName, TSchema>[], orderField: string): void;
 //# sourceMappingURL=repairEntitiesOrder.d.ts.map

package/dist/utils/repairEntitiesOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repairEntitiesOrder.d.ts","sourceRoot":"","sources":["../../src/utils/repairEntitiesOrder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAY,MAAM,kBAAkB,CAAA;AAEhE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,GAAG,CAAC,EAC1D,KAAK,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAC7B,UAAU,EAAE,MAAM,GAChB,IAAI,CASN"}
+{"version":3,"file":"repairEntitiesOrder.d.ts","sourceRoot":"","sources":["../../src/utils/repairEntitiesOrder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAiB,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAE/E;;;GAGG;AACH,wBAAgB,mBAAmB,CAClC,CAAC,SAAS,MAAM,EAChB,CAAC,GAAG,CAAC,EACL,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAClC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAE/D,KAAK,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,EAC3D,UAAU,EAAE,MAAM,GAChB,IAAI,CASN"}

package/dist/utils/sortEntities.d.ts

@@ -1,11 +1,7 @@
-import type { EntityAccessor } from '@contember/bindx';
+import type { EntityAccessor, AnyBrand } from '@contember/bindx';
 /**
  * Sorts entities by a numeric order field.
  * Returns a new sorted array.
- *
- * @param items - Array of entity accessors
- * @param orderField - Name of the numeric field to sort by
- * @returns New sorted array of entities
  */
-export declare function sortEntities<T extends object, S = T>(items: EntityAccessor<T, S>[], orderField: string | undefined): EntityAccessor<T, S>[];
+export declare function sortEntities<T extends object, S = T, TBrand extends AnyBrand = AnyBrand, TEntityName extends string = string, TSchema extends Record<string, object> = Record<string, object>>(items: EntityAccessor<T, S, TBrand, TEntityName, TSchema>[], orderField: string | undefined): EntityAccessor<T, S, TBrand, TEntityName, TSchema>[];
 //# sourceMappingURL=sortEntities.d.ts.map

package/dist/utils/sortEntities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sortEntities.d.ts","sourceRoot":"","sources":["../../src/utils/sortEntities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAY,MAAM,kBAAkB,CAAA;AAEhE;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,GAAG,CAAC,EACnD,KAAK,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAC7B,UAAU,EAAE,MAAM,GAAG,SAAS,GAC5B,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAcxB"}
+{"version":3,"file":"sortEntities.d.ts","sourceRoot":"","sources":["../../src/utils/sortEntities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAiB,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAE/E;;;GAGG;AACH,wBAAgB,YAAY,CAC3B,CAAC,SAAS,MAAM,EAChB,CAAC,GAAG,CAAC,EACL,MAAM,SAAS,QAAQ,GAAG,QAAQ,EAClC,WAAW,SAAS,MAAM,GAAG,MAAM,EACnC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAE/D,KAAK,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,EAC3D,UAAU,EAAE,MAAM,GAAG,SAAS,GAC5B,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAiBtD"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@contember/bindx-repeater",
-	"version": "0.1.14",
+	"version": "0.1.15",
 	"description": "Repeater components for has-many list management",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -15,8 +15,8 @@
 		"react": ">=18.0.0"
 	},
 	"dependencies": {
-		"@contember/bindx": "0.1.14",
-		"@contember/bindx-react": "0.1.14"
+		"@contember/bindx": "0.1.15",
+		"@contember/bindx-react": "0.1.15"
 	},
 	"files": [
 		"dist",

package/src/components/BlockRepeater.tsx

@@ -8,7 +8,7 @@ import type {
 	FieldRef,
 } from '@contember/bindx'
 import { SelectionScope, FIELD_REF_META } from '@contember/bindx'
-import { createCollectorProxy, mergeSelections, BINDX_COMPONENT, SCOPE_REF, type SelectionProvider } from '@contember/bindx-react'
+import { createCollectorProxy, mergeSelections, BINDX_COMPONENT, SCOPE_REF, type SelectionProvider, useHasMany, useField } from '@contember/bindx-react'
 import type {
 	BlockRepeaterProps,
 	BlockRepeaterItems,
@@ -72,7 +72,8 @@ export function BlockRepeater<
 	blocks,
 	children,
 }: BlockRepeaterProps<TEntity, TSelected, TBrand, TEntityName, TSchema, TBlockNames>): ReactElement {
-	const sortedItems = useSortedItems(field, sortableBy)
+	const fieldAccessor = useHasMany(field)
+	const sortedItems = useSortedItems(fieldAccessor, sortableBy)
 
 	const items = useMemo((): BlockRepeaterItems<TEntity, TSelected, TBrand, TEntityName, TSchema> => {
 		const createItemInfo = (
@@ -82,7 +83,7 @@ export function BlockRepeater<
 			const isFirst = index === 0
 			const isLast = index === sortedItems.length - 1
 
-			const discriminationRef = (entity.$fields as Record<string, unknown>)[discriminationField] as FieldRef<string> | undefined
+			const discriminationRef = (entity.$fields as Record<string, unknown>)[discriminationField] as import('@contember/bindx').FieldAccessor<string> | undefined
 			const blockType = discriminationRef?.value ?? null
 			const blockDef = blockType !== null ? (blocks as Record<string, BlockDefinition>)[blockType] : undefined
 			const block = blockDef !== undefined && blockType !== null
@@ -91,7 +92,7 @@ export function BlockRepeater<
 
 			const remove = (): void => {
 				if (sortableBy) {
-					const items = sortEntities(field.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
+					const items = sortEntities(fieldAccessor.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
 					const currentIndex = items.findIndex(item => item.id === entity.id)
 					if (currentIndex !== -1) {
 						items.splice(currentIndex, 1)
@@ -103,7 +104,7 @@ export function BlockRepeater<
 
 			const moveUp = (): void => {
 				if (!sortableBy || isFirst) return
-				const items = sortEntities(field.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
+				const items = sortEntities(fieldAccessor.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
 				const currentIndex = items.findIndex(item => item.id === entity.id)
 				if (currentIndex === -1 || currentIndex === 0) return
 				const newItems = arrayMove(items, currentIndex, currentIndex - 1)
@@ -112,7 +113,7 @@ export function BlockRepeater<
 
 			const moveDown = (): void => {
 				if (!sortableBy || isLast) return
-				const items = sortEntities(field.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
+				const items = sortEntities(fieldAccessor.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
 				const currentIndex = items.findIndex(item => item.id === entity.id)
 				if (currentIndex === -1 || currentIndex === items.length - 1) return
 				const newItems = arrayMove(items, currentIndex, currentIndex + 1)
@@ -151,10 +152,10 @@ export function BlockRepeater<
 			if (!sortableBy) {
 				if (index === 'last' || index === undefined) {
 					const entityId = field.add()
-					const items = field.items
+					const items = fieldAccessor.items
 					const newEntity = items.find(item => item.id === entityId)
 					if (newEntity) {
-						const discriminationRef = (newEntity.$fields as Record<string, unknown>)[discriminationField] as FieldRef<string> | undefined
+						const discriminationRef = (newEntity.$fields as Record<string, unknown>)[discriminationField] as import('@contember/bindx').FieldAccessor<string> | undefined
 						discriminationRef?.setValue(type)
 					}
 					return
@@ -162,7 +163,7 @@ export function BlockRepeater<
 				throw new Error('Cannot add item at specific index without sortableBy field')
 			}
 
-			const currentItems = sortEntities(field.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
+			const currentItems = sortEntities(fieldAccessor.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
 
 			const resolvedIndex = (() => {
 				switch (index) {
@@ -177,7 +178,7 @@ export function BlockRepeater<
 			})()
 
 			const entityId = field.add()
-			const items = field.items
+			const items = fieldAccessor.items
 			const newEntity = items.find(item => item.id === entityId)
 
 			if (newEntity) {
@@ -185,14 +186,14 @@ export function BlockRepeater<
 				newSortedItems.splice(resolvedIndex, 0, newEntity as EntityAccessor<TEntity, TSelected>)
 				repairEntitiesOrder(newSortedItems, sortableBy)
 
-				const discriminationRef = (newEntity.$fields as Record<string, unknown>)[discriminationField] as FieldRef<string> | undefined
+				const discriminationRef = (newEntity.$fields as Record<string, unknown>)[discriminationField] as import('@contember/bindx').FieldAccessor<string> | undefined
 				discriminationRef?.setValue(type)
 			}
 		}
 
 		return {
 			addItem,
-			isEmpty: field.length === 0,
+			isEmpty: fieldAccessor.length === 0,
 			blockList,
 		}
 	}, [field, sortableBy, blocks, discriminationField])
@@ -243,6 +244,18 @@ blockRepeaterWithSelection.getSelection = (
 	const syntheticChildren = props.children(mockItems, mockMethods)
 	const jsxSelection = collectNested(syntheticChildren)
 
+	// Collect field selections from block render/form functions
+	for (const blockDef of Object.values(props.blocks) as BlockDefinition[]) {
+		if (blockDef.render) {
+			const renderJsx = blockDef.render(collectorEntity as EntityAccessor<object>)
+			if (renderJsx) mergeSelections(scope.toSelectionMeta(), collectNested(renderJsx))
+		}
+		if (blockDef.form) {
+			const formJsx = blockDef.form(collectorEntity as EntityAccessor<object>)
+			if (formJsx) mergeSelections(scope.toSelectionMeta(), collectNested(formJsx))
+		}
+	}
+
 	const nestedSelection = scope.toSelectionMeta()
 	mergeSelections(nestedSelection, jsxSelection)
 

package/src/components/Repeater.tsx

@@ -7,7 +7,7 @@ import type {
 	SelectionMeta,
 } from '@contember/bindx'
 import { SelectionScope, FIELD_REF_META } from '@contember/bindx'
-import { createCollectorProxy, mergeSelections, BINDX_COMPONENT, SCOPE_REF, type SelectionProvider } from '@contember/bindx-react'
+import { createCollectorProxy, mergeSelections, BINDX_COMPONENT, SCOPE_REF, type SelectionProvider, useHasMany } from '@contember/bindx-react'
 import type {
 	RepeaterProps,
 	RepeaterItems,
@@ -60,7 +60,8 @@ export function Repeater<
 	sortableBy,
 	children,
 }: RepeaterProps<TEntity, TSelected, TBrand, TEntityName, TSchema>): ReactElement {
-	const sortedItems = useSortedItems(field, sortableBy)
+	const fieldAccessor = useHasMany(field)
+	const sortedItems = useSortedItems(fieldAccessor, sortableBy)
 
 	// Create stable items collection object
 	const items = useMemo((): RepeaterItems<TEntity, TSelected, TBrand, TEntityName, TSchema> => {
@@ -73,7 +74,7 @@ export function Repeater<
 
 			const remove = (): void => {
 				if (sortableBy) {
-					const items = sortEntities(field.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
+					const items = sortEntities(fieldAccessor.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
 					const currentIndex = items.findIndex(item => item.id === entity.id)
 					if (currentIndex !== -1) {
 						items.splice(currentIndex, 1)
@@ -85,7 +86,7 @@ export function Repeater<
 
 			const moveUp = (): void => {
 				if (!sortableBy || isFirst) return
-				const items = sortEntities(field.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
+				const items = sortEntities(fieldAccessor.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
 				const currentIndex = items.findIndex(item => item.id === entity.id)
 				if (currentIndex === -1 || currentIndex === 0) return
 				const newItems = arrayMove(items, currentIndex, currentIndex - 1)
@@ -94,7 +95,7 @@ export function Repeater<
 
 			const moveDown = (): void => {
 				if (!sortableBy || isLast) return
-				const items = sortEntities(field.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
+				const items = sortEntities(fieldAccessor.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
 				const currentIndex = items.findIndex(item => item.id === entity.id)
 				if (currentIndex === -1 || currentIndex === items.length - 1) return
 				const newItems = arrayMove(items, currentIndex, currentIndex + 1)
@@ -130,7 +131,7 @@ export function Repeater<
 				if (index === 'last' || index === undefined) {
 					const entityId = field.add()
 					if (preprocess) {
-						const items = field.items
+						const items = fieldAccessor.items
 						const newEntity = items.find(item => item.id === entityId)
 						if (newEntity) {
 							preprocess(newEntity as unknown as EntityAccessor<TEntity>)
@@ -141,7 +142,7 @@ export function Repeater<
 				throw new Error('Cannot add item at specific index without sortableBy field')
 			}
 
-			const sortedItems = sortEntities(field.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
+			const sortedItems = sortEntities(fieldAccessor.items, sortableBy) as EntityAccessor<TEntity, TSelected>[]
 
 			const resolvedIndex = (() => {
 				switch (index) {
@@ -156,7 +157,7 @@ export function Repeater<
 			})()
 
 			const entityId = field.add()
-			const items = field.items
+			const items = fieldAccessor.items
 			const newEntity = items.find(item => item.id === entityId)
 
 			if (newEntity) {
@@ -172,7 +173,7 @@ export function Repeater<
 
 		return {
 			addItem,
-			isEmpty: field.length === 0,
+			isEmpty: fieldAccessor.length === 0,
 		}
 	}, [field, sortableBy])
 

package/src/hooks/useSortedItems.ts

@@ -1,5 +1,5 @@
 import { useEffect, useMemo } from 'react'
-import type { EntityAccessor, HasManyRef, AnyBrand } from '@contember/bindx'
+import type { EntityAccessor, HasManyAccessor, AnyBrand } from '@contember/bindx'
 import { sortEntities } from '../utils/sortEntities.js'
 import { repairEntitiesOrder } from '../utils/repairEntitiesOrder.js'
 
@@ -17,10 +17,11 @@ export function useSortedItems<
 	TEntityName extends string = string,
 	TSchema extends Record<string, object> = Record<string, object>,
 >(
-	hasMany: HasManyRef<T, S, TBrand, TEntityName, TSchema>,
+	hasMany: HasManyAccessor<T, S, TBrand, TEntityName, TSchema>,
 	orderField: string | undefined,
 ): EntityAccessor<T, S, TBrand, TEntityName, TSchema>[] {
-	const items = hasMany.items
+	const rawItems = hasMany?.items
+	const items = Array.isArray(rawItems) ? rawItems : []
 
 	const sortedItems = useMemo(
 		() => sortEntities(items, orderField) as EntityAccessor<T, S, TBrand, TEntityName, TSchema>[],

package/src/types.ts

@@ -128,10 +128,15 @@ export interface RepeaterProps<
 // ============================================================================
 
 /**
- * Minimal block definition for headless use.
+ * Block definition for headless use.
+ * Optional render/form functions declare block-specific field selections.
  */
-export interface BlockDefinition {
+export interface BlockDefinition<TEntity extends object = object, TSelected = TEntity> {
 	label?: ReactNode
+	/** Render function for block preview. Used for selection collection. */
+	render?: (entity: EntityAccessor<TEntity, TSelected>) => ReactNode
+	/** Form function for block editing. Used for selection collection. */
+	form?: (entity: EntityAccessor<TEntity, TSelected>) => ReactNode
 }
 
 /**

package/src/utils/repairEntitiesOrder.ts

@@ -1,19 +1,22 @@
-import type { EntityAccessor, FieldRef } from '@contember/bindx'
+import type { EntityAccessor, FieldAccessor, AnyBrand } from '@contember/bindx'
 
 /**
  * Repairs the order field values of entities to be sequential (0, 1, 2, ...).
  * Only updates values that differ from their expected index.
- *
- * @param items - Array of entity accessors (already sorted)
- * @param orderField - Name of the numeric field to update
  */
-export function repairEntitiesOrder<T extends object, S = T>(
-	items: EntityAccessor<T, S>[],
+export function repairEntitiesOrder<
+	T extends object,
+	S = T,
+	TBrand extends AnyBrand = AnyBrand,
+	TEntityName extends string = string,
+	TSchema extends Record<string, object> = Record<string, object>,
+>(
+	items: EntityAccessor<T, S, TBrand, TEntityName, TSchema>[],
 	orderField: string,
 ): void {
 	for (let i = 0; i < items.length; i++) {
 		const entity = items[i]!
-		const field = (entity as Record<string, unknown>)[orderField] as FieldRef<number> | undefined
+		const field = (entity as unknown as Record<string, unknown>)[orderField] as FieldAccessor<number> | undefined
 
 		if (field && field.value !== i) {
 			field.setValue(i)

package/src/utils/sortEntities.ts

@@ -1,24 +1,29 @@
-import type { EntityAccessor, FieldRef } from '@contember/bindx'
+import type { EntityAccessor, FieldAccessor, AnyBrand } from '@contember/bindx'
 
 /**
  * Sorts entities by a numeric order field.
  * Returns a new sorted array.
- *
- * @param items - Array of entity accessors
- * @param orderField - Name of the numeric field to sort by
- * @returns New sorted array of entities
  */
-export function sortEntities<T extends object, S = T>(
-	items: EntityAccessor<T, S>[],
+export function sortEntities<
+	T extends object,
+	S = T,
+	TBrand extends AnyBrand = AnyBrand,
+	TEntityName extends string = string,
+	TSchema extends Record<string, object> = Record<string, object>,
+>(
+	items: EntityAccessor<T, S, TBrand, TEntityName, TSchema>[],
 	orderField: string | undefined,
-): EntityAccessor<T, S>[] {
+): EntityAccessor<T, S, TBrand, TEntityName, TSchema>[] {
 	if (!orderField) {
 		return items
 	}
 
+	if (!Array.isArray(items)) {
+		return []
+	}
 	return [...items].sort((a, b) => {
-		const aField = (a as Record<string, unknown>)[orderField] as FieldRef<number> | undefined
-		const bField = (b as Record<string, unknown>)[orderField] as FieldRef<number> | undefined
+		const aField = (a as unknown as Record<string, unknown>)[orderField] as FieldAccessor<number> | undefined
+		const bField = (b as unknown as Record<string, unknown>)[orderField] as FieldAccessor<number> | undefined
 
 		const aValue = aField?.value ?? Number.MAX_SAFE_INTEGER
 		const bValue = bField?.value ?? Number.MAX_SAFE_INTEGER