@contember/bindx-repeater 0.1.10 → 0.1.11

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,EAAE,KAAK,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AACvH,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;AA8D1H,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,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"}

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,EAAE,KAAK,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AACvH,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;AAyD3G,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,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@contember/bindx-repeater",
-	"version": "0.1.10",
+	"version": "0.1.11",
 	"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.10",
-		"@contember/bindx-react": "0.1.10"
+		"@contember/bindx": "0.1.11",
+		"@contember/bindx-react": "0.1.11"
 	},
 	"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, type SelectionProvider } from '@contember/bindx-react'
+import { createCollectorProxy, mergeSelections, BINDX_COMPONENT, SCOPE_REF, type SelectionProvider } from '@contember/bindx-react'
 import type {
 	BlockRepeaterProps,
 	BlockRepeaterItems,
@@ -206,8 +206,13 @@ const blockRepeaterWithSelection = BlockRepeater as typeof BlockRepeater & Selec
 blockRepeaterWithSelection.getSelection = (
 	props: BlockRepeaterProps<unknown>,
 	collectNested: (children: ReactNode) => SelectionMeta,
-): SelectionFieldMeta => {
-	const meta = props.field[FIELD_REF_META]
+): SelectionFieldMeta | null => {
+	// Check if the field is a collector proxy with a scope reference (collection phase).
+	// When present, we merge the collected selection directly into the scope tree,
+	// which correctly handles deeply nested relations (e.g., page.blocks.items).
+	const fieldScope = props.field && typeof props.field === 'object' && SCOPE_REF in props.field
+		? (props.field as Record<symbol, unknown>)[SCOPE_REF] as SelectionScope
+		: null
 
 	const scope = new SelectionScope()
 	const collectorEntity = createCollectorProxy<unknown>(scope)
@@ -245,12 +250,31 @@ blockRepeaterWithSelection.getSelection = (
 	nestedSelection.fields.set(props.discriminationField, {
 		fieldName: props.discriminationField,
 		alias: props.discriminationField,
-		path: [...meta.path, meta.fieldName],
+		path: [props.discriminationField],
 		isArray: false,
 		isRelation: false,
-		nested: { fields: new Map() },
 	})
 
+	// Add sortableBy field to selection if specified
+	if (props.sortableBy) {
+		nestedSelection.fields.set(props.sortableBy, {
+			fieldName: props.sortableBy,
+			alias: props.sortableBy,
+			path: [props.sortableBy],
+			isArray: false,
+			isRelation: false,
+		})
+	}
+
+	// If we have a scope reference, merge directly into the scope tree and return null
+	// (no flat SelectionFieldMeta needed — the scope tree captures the full nesting)
+	if (fieldScope) {
+		fieldScope.mergeFromSelectionMeta(nestedSelection)
+		return null
+	}
+
+	// Fallback: return SelectionFieldMeta for non-collector refs (e.g., explicit selection)
+	const meta = props.field[FIELD_REF_META]
 	return {
 		fieldName: meta.fieldName,
 		alias: meta.fieldName,

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, type SelectionProvider } from '@contember/bindx-react'
+import { createCollectorProxy, mergeSelections, BINDX_COMPONENT, SCOPE_REF, type SelectionProvider } from '@contember/bindx-react'
 import type {
 	RepeaterProps,
 	RepeaterItems,
@@ -186,8 +186,11 @@ const repeaterWithSelection = Repeater as typeof Repeater & SelectionProvider &
 repeaterWithSelection.getSelection = (
 	props: RepeaterProps<unknown>,
 	collectNested: (children: ReactNode) => SelectionMeta,
-): SelectionFieldMeta => {
-	const meta = props.field[FIELD_REF_META]
+): SelectionFieldMeta | null => {
+	// Check if the field is a collector proxy with a scope reference (collection phase).
+	const fieldScope = props.field && typeof props.field === 'object' && SCOPE_REF in props.field
+		? (props.field as Record<symbol, unknown>)[SCOPE_REF] as SelectionScope
+		: null
 
 	// Create scope and collector proxy
 	const scope = new SelectionScope()
@@ -226,6 +229,25 @@ repeaterWithSelection.getSelection = (
 	const nestedSelection = scope.toSelectionMeta()
 	mergeSelections(nestedSelection, jsxSelection)
 
+	// Add sortableBy field to selection if specified
+	if (props.sortableBy) {
+		nestedSelection.fields.set(props.sortableBy, {
+			fieldName: props.sortableBy,
+			alias: props.sortableBy,
+			path: [props.sortableBy],
+			isArray: false,
+			isRelation: false,
+		})
+	}
+
+	// If we have a scope reference, merge directly into the scope tree and return null
+	if (fieldScope) {
+		fieldScope.mergeFromSelectionMeta(nestedSelection)
+		return null
+	}
+
+	// Fallback: return SelectionFieldMeta for non-collector refs
+	const meta = props.field[FIELD_REF_META]
 	return {
 		fieldName: meta.fieldName,
 		alias: meta.fieldName,