@contember/react-board 2.0.0-alpha.9 → 2.0.0-beta.2

package/dist/types/types/BoardColumnNode.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { EntityAccessor } from '@contember/binding';
+import { EntityAccessor } from '@contember/react-binding';
 import { BoardItemNode } from './BoardItemNode';
 export type BoardStaticColumnValue = {
     value: string;

package/dist/types/types/BoardColumnNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoardColumnNode.d.ts","sourceRoot":"","sources":["../../../src/types/BoardColumnNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,MAAM,MAAM,sBAAsB,GAAG;IACpC,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,SAAS,CAAA;CACjB,CAAA;AACD,MAAM,MAAM,gBAAgB,GAAG,sBAAsB,GAAG,cAAc,CAAA;AAEtE,MAAM,MAAM,eAAe,CAAC,WAAW,SAAS,gBAAgB,GAAG,gBAAgB,IAAI;IACtF,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,WAAW,GAAG,IAAI,CAAA;IACzB,KAAK,EAAE,aAAa,EAAE,CAAA;CACtB,CAAA"}
+{"version":3,"file":"BoardColumnNode.d.ts","sourceRoot":"","sources":["../../../src/types/BoardColumnNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,MAAM,MAAM,sBAAsB,GAAG;IACpC,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,SAAS,CAAA;CACjB,CAAA;AACD,MAAM,MAAM,gBAAgB,GAAG,sBAAsB,GAAG,cAAc,CAAA;AAEtE,MAAM,MAAM,eAAe,CAAC,WAAW,SAAS,gBAAgB,GAAG,gBAAgB,IAAI;IACtF,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,WAAW,GAAG,IAAI,CAAA;IACzB,KAAK,EAAE,aAAa,EAAE,CAAA;CACtB,CAAA"}

package/dist/types/types/BoardItemNode.d.ts

@@ -1,4 +1,4 @@
-import { EntityAccessor } from '@contember/binding';
+import { EntityAccessor } from '@contember/react-binding';
 export type BoardItemNode = {
     id: string | number;
     index: number;

package/dist/types/types/BoardItemNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoardItemNode.d.ts","sourceRoot":"","sources":["../../../src/types/BoardItemNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD,MAAM,MAAM,aAAa,GAAG;IAC3B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,cAAc,CAAA;CACrB,CAAA"}
+{"version":3,"file":"BoardItemNode.d.ts","sourceRoot":"","sources":["../../../src/types/BoardItemNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAEzD,MAAM,MAAM,aAAa,GAAG;IAC3B,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,cAAc,CAAA;CACrB,CAAA"}

package/dist/types/types/BoardMethods.d.ts

@@ -1,4 +1,4 @@
-import { EntityAccessor } from '@contember/binding';
+import { EntityAccessor } from '@contember/react-binding';
 import { BoardColumnValue } from './BoardColumnNode';
 export type BoardAddColumnMethod = (index: number | undefined, preprocess?: EntityAccessor.BatchUpdatesHandler) => void;
 export type BoardMoveColumnMethod = (entity: EntityAccessor, index: number) => void;

package/dist/types/types/BoardMethods.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BoardMethods.d.ts","sourceRoot":"","sources":["../../../src/types/BoardMethods.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEpD,MAAM,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,CAAC,EAAE,cAAc,CAAC,mBAAmB,KAAK,IAAI,CAAA;AACvH,MAAM,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;AACnF,MAAM,MAAM,uBAAuB,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;AACtE,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,gBAAgB,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;AACnJ,MAAM,MAAM,kBAAkB,CAAC,WAAW,SAAS,gBAAgB,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,CAAC,EAAE,cAAc,CAAC,mBAAmB,KAAK,IAAI,CAAA;AACvL,MAAM,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;AAEpE,MAAM,MAAM,YAAY,CAAC,WAAW,SAAS,gBAAgB,GAAG,gBAAgB,IAAI;IACnF,UAAU,CAAC,EAAE,qBAAqB,CAAA;IAClC,SAAS,CAAC,EAAE,oBAAoB,CAAA;IAChC,YAAY,CAAC,EAAE,uBAAuB,CAAA;IAEtC,QAAQ,CAAC,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAA;IAC3C,OAAO,CAAC,EAAE,kBAAkB,CAAC,WAAW,CAAC,CAAA;IACzC,UAAU,CAAC,EAAE,qBAAqB,CAAA;CAClC,CAAA"}
+{"version":3,"file":"BoardMethods.d.ts","sourceRoot":"","sources":["../../../src/types/BoardMethods.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEpD,MAAM,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,CAAC,EAAE,cAAc,CAAC,mBAAmB,KAAK,IAAI,CAAA;AACvH,MAAM,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;AACnF,MAAM,MAAM,uBAAuB,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;AACtE,MAAM,MAAM,mBAAmB,CAAC,WAAW,SAAS,gBAAgB,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;AACnJ,MAAM,MAAM,kBAAkB,CAAC,WAAW,SAAS,gBAAgB,IAAI,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,CAAC,EAAE,cAAc,CAAC,mBAAmB,KAAK,IAAI,CAAA;AACvL,MAAM,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;AAEpE,MAAM,MAAM,YAAY,CAAC,WAAW,SAAS,gBAAgB,GAAG,gBAAgB,IAAI;IACnF,UAAU,CAAC,EAAE,qBAAqB,CAAA;IAClC,SAAS,CAAC,EAAE,oBAAoB,CAAA;IAChC,YAAY,CAAC,EAAE,uBAAuB,CAAA;IAEtC,QAAQ,CAAC,EAAE,mBAAmB,CAAC,WAAW,CAAC,CAAA;IAC3C,OAAO,CAAC,EAAE,kBAAkB,CAAC,WAAW,CAAC,CAAA;IACzC,UAAU,CAAC,EAAE,qBAAqB,CAAA;CAClC,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contember/react-board",
   "license": "Apache-2.0",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.2",
   "type": "module",
   "sideEffects": false,
   "main": "./dist/production/index.js",
@@ -11,7 +11,15 @@
         "types": "./dist/types/index.d.ts",
         "development": "./dist/development/index.js",
         "production": "./dist/production/index.js",
+        "typescript": "./src/index.ts",
         "default": "./dist/production/index.js"
+      },
+      "require": {
+        "types": "./dist/types/index.d.ts",
+        "development": "./dist/development/index.cjs",
+        "production": "./dist/production/index.cjs",
+        "typescript": "./src/index.ts",
+        "default": "./dist/production/index.cjs"
       }
     }
   },
@@ -26,10 +34,9 @@
     "directory": "packages/react-board"
   },
   "dependencies": {
-    "@contember/binding": "2.0.0-alpha.9",
-    "@contember/react-binding": "2.0.0-alpha.9",
-    "@contember/react-multipass-rendering": "2.0.0-alpha.9",
-    "@contember/react-utils": "2.0.0-alpha.9"
+    "@contember/react-binding": "2.0.0-beta.2",
+    "@contember/react-multipass-rendering": "2.0.0-beta.2",
+    "@contember/react-utils": "2.0.0-beta.2"
   },
   "peerDependencies": {
     "react": "^18 || ^19",
@@ -39,4 +46,4 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }
-}
+}

package/src/components/BoardEachColumn.tsx

@@ -1,4 +1,4 @@
-import { EntityAccessor } from '@contember/binding'
+import { EntityAccessor, isEntityAccessor } from '@contember/react-binding'
 import { Entity } from '@contember/react-binding'
 import { BoardCurrentColumnContext, useBoardColumns } from '../contexts'
 import { ReactNode } from 'react'
@@ -17,7 +17,7 @@ export const BoardEachColumn = ({ children }: {
 			}
 			return (
 				<BoardCurrentColumnContext.Provider value={column} key={column.id}>
-					{column.value instanceof EntityAccessor ? (
+					{isEntityAccessor(column.value) ? (
 						<Entity accessor={column.value}>
 							{children}
 						</Entity>

package/src/internal/boardAnalyzer.ts

@@ -1,4 +1,4 @@
-import { Environment } from '@contember/binding'
+import { Environment } from '@contember/react-binding'
 import { ChildrenAnalyzer, Leaf } from '@contember/react-multipass-rendering'
 import { BoardItem } from '../components/BoardItem'
 import { ReactNode } from 'react'

package/src/internal/useDynamicBoard.ts

@@ -57,7 +57,7 @@ export const useDynamicBoard = ({
 	const exitingColumnIds = useMemo(() => new Set(Array.from(columnEntities).map(it => it.id)), [columnEntities])
 
 	const getDiscriminatorValue = useCallback((entity: EntityAccessor) => {
-		const entityId = entity.getRelativeSingleEntity(desugaredDiscriminationField).id
+		const entityId = entity.getEntity(desugaredDiscriminationField).id
 		return exitingColumnIds.has(entityId) ? entityId : null
 	}, [desugaredDiscriminationField, exitingColumnIds])
 
@@ -85,7 +85,7 @@ export const useDynamicBoard = ({
 
 	const connectItemToColumn = useCallback((item: EntityAccessor, column: EntityAccessor | null) => {
 		const hasOne = desugaredDiscriminationField.hasOneRelationPath
-		const parentEntity = item.getRelativeSingleEntity({ hasOneRelationPath: hasOne.slice(0, -1) })
+		const parentEntity = item.getEntity({ hasOneRelationPath: hasOne.slice(0, -1) })
 		if (column) {
 			parentEntity.connectEntityAtField(hasOne[hasOne.length - 1].field, column)
 		} else {

package/src/internal/useStaticBoard.ts

@@ -27,7 +27,7 @@ export const useStaticBoard = ({
 	const desugaredDiscriminationField = useDesugaredRelativeSingleField(discriminationField)
 
 	const getDiscriminatorValue = useCallback((entity: EntityAccessor) => {
-		return entity.getRelativeSingleField<string>(desugaredDiscriminationField).value
+		return entity.getField<string>(desugaredDiscriminationField).value
 	}, [desugaredDiscriminationField])
 
 	const groupItemsByColumn = useGroupItemsByColumn(getDiscriminatorValue, desugaredSortableByField)
@@ -40,7 +40,7 @@ export const useStaticBoard = ({
 	})
 
 	const connectItemToColumn = useCallback((item: EntityAccessor, column: BoardStaticColumnValue | null) => {
-		item.getRelativeSingleField(desugaredDiscriminationField).updateValue(column?.value ?? null)
+		item.getField(desugaredDiscriminationField).updateValue(column?.value ?? null)
 	}, [desugaredDiscriminationField])
 
 	const { addItem, moveItem, removeItem } = useBoardItemsMethods({

package/src/tsconfig.json

@@ -4,7 +4,6 @@
 		"outDir": "../dist/types"
 	},
 	"references": [
-		{ "path": "../../binding/src" },
 		{ "path": "../../react-binding/src" },
 		{ "path": "../../react-multipass-rendering/src" },
 		{ "path": "../../react-utils/src" },

package/src/types/BoardColumnNode.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react'
-import { EntityAccessor } from '@contember/binding'
+import { EntityAccessor } from '@contember/react-binding'
 import { BoardItemNode } from './BoardItemNode'
 
 export type BoardStaticColumnValue = {

package/src/types/BoardItemNode.ts

@@ -1,4 +1,4 @@
-import { EntityAccessor } from '@contember/binding'
+import { EntityAccessor } from '@contember/react-binding'
 
 export type BoardItemNode = {
 	id: string | number

package/src/types/BoardMethods.ts

@@ -1,4 +1,4 @@
-import { EntityAccessor } from '@contember/binding'
+import { EntityAccessor } from '@contember/react-binding'
 import { BoardColumnValue } from './BoardColumnNode'
 
 export type BoardAddColumnMethod = (index: number | undefined, preprocess?: EntityAccessor.BatchUpdatesHandler) => void