@cmssy/react 14.2.0 → 16.0.0

package/dist/client.cjs

@@ -211,16 +211,16 @@ function collectLayoutBlocks(rects, pageIds) {
   const out = [];
   if (typeof document === "undefined") return out;
   const seen = /* @__PURE__ */ new Set();
-  for (const el of document.querySelectorAll("[data-layout-position]")) {
+  for (const el of document.querySelectorAll("[data-layout-region]")) {
     const id = el.getAttribute("data-block-id");
     const type = el.getAttribute("data-block-type");
-    const layoutPosition = el.getAttribute("data-layout-position");
-    if (id && type && layoutPosition !== null && !pageIds.has(id) && !seen.has(id)) {
+    const layoutRegion = el.getAttribute("data-layout-region");
+    if (id && type && layoutRegion !== null && !pageIds.has(id) && !seen.has(id)) {
       seen.add(id);
       out.push({
         id,
         type,
-        layoutPosition,
+        layoutRegion,
         bounds: rects.get(id) ?? ZERO_RECT
       });
     }
@@ -308,7 +308,7 @@ function useEditBridge(page, config) {
       if (!message) return;
       postTarget = event.origin;
       if (message.type === "cmssy:patch") {
-        if (message.layoutPosition !== void 0) return;
+        if (message.layoutRegion !== void 0) return;
         setPatches((prev) => ({
           ...prev,
           [message.blockId]: { ...prev[message.blockId], ...message.content }
@@ -379,12 +379,12 @@ function useEditBridge(page, config) {
         event.stopPropagation();
       }
       const r = el.getBoundingClientRect();
-      const layoutPosition = el.getAttribute("data-layout-position");
+      const layoutRegion = el.getAttribute("data-layout-region");
       postSafe({
         type: "cmssy:click",
         blockId: id,
         rect: { x: r.x, y: r.y, width: r.width, height: r.height },
-        ...layoutPosition !== null ? { layoutPosition } : {}
+        ...layoutRegion !== null ? { layoutRegion } : {}
       });
     };
     const onKeyDown = (event) => {
@@ -482,7 +482,7 @@ function visible(el) {
 function blockElements() {
   return Array.from(
     document.querySelectorAll(
-      "[data-block-id]:not([data-layout-position])"
+      "[data-block-id]:not([data-layout-region])"
     )
   ).filter(visible);
 }
@@ -721,7 +721,7 @@ function CmssyBlock({
   schema,
   editable,
   editMode,
-  layoutPosition,
+  layoutRegion,
   context,
   data
 }) {
@@ -733,7 +733,7 @@ function CmssyBlock({
     {
       "data-block-id": block.id,
       "data-block-type": block.type,
-      "data-layout-position": layoutPosition,
+      "data-layout-region": layoutRegion,
       draggable: editable || void 0,
       style: hidden ? { display: "none" } : void 0,
       children
@@ -950,7 +950,7 @@ function CmssyLazyEditor({ load, ...props }) {
     ) : null
   ] });
 }
-function useLayoutPatchBridge(position, config) {
+function useLayoutPatchBridge(region, config) {
   const [patches, setPatches] = react.useState({});
   react.useEffect(() => {
     setPatches({});
@@ -964,7 +964,7 @@ function useLayoutPatchBridge(position, config) {
         editorOrigin
       );
       if (!message) return;
-      if (message.type === "cmssy:patch" && message.layoutPosition === position) {
+      if (message.type === "cmssy:patch" && message.layoutRegion === region) {
         setPatches((prev) => ({
           ...prev,
           [message.blockId]: { ...prev[message.blockId], ...message.content }
@@ -973,13 +973,13 @@ function useLayoutPatchBridge(position, config) {
     };
     window.addEventListener("message", handler);
     return () => window.removeEventListener("message", handler);
-  }, [config.editorOrigin, position]);
+  }, [config.editorOrigin, region]);
   return patches;
 }
 function CmssyEditableLayout({
   groups,
   blocks,
-  position,
+  region,
   page,
   locale = "en",
   defaultLocale = "en",
@@ -995,10 +995,10 @@ function CmssyEditableLayout({
     [edit.schemas, blocks]
   );
   const layoutBlocks = react.useMemo(() => {
-    const group = groups.find((g) => g.position === position);
+    const group = groups.find((g) => g.region === region);
     return group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
-  }, [groups, position]);
-  const patches = useLayoutPatchBridge(position, edit);
+  }, [groups, region]);
+  const patches = useLayoutPatchBridge(region, edit);
   const context = react.useMemo(
     () => internal.buildBlockContext(locale, defaultLocale, enabledLocales, true, void 0, {
       page,
@@ -1018,7 +1018,7 @@ function CmssyEditableLayout({
       resolvedContent: resolvedContent?.[block.id],
       schema: schemas[block.type],
       editMode: true,
-      layoutPosition: position,
+      layoutRegion: region,
       context,
       data: data?.[block.id]
     },
@@ -1055,7 +1055,7 @@ function CmssyLazyLayout({ load, ...props }) {
     /* @__PURE__ */ jsxRuntime.jsx(
       "div",
       {
-        "data-cmssy-layout-slot": props.position,
+        "data-cmssy-layout-slot": props.region,
         "data-cmssy-editor-content": resolvedCount,
         hidden: true
       }

package/dist/client.d.cts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { BlockSchema, BlockMeta, LayoutRegion, CmssyPageData, CmssyFormDefinition, CmssyLayoutGroup } from '@cmssy/core';
-import { B as BlockDefinition, L as LayoutBlockPage } from './internal-server-Hogm3pjD.cjs';
+import { B as BlockDefinition, L as LayoutBlockPage } from './internal-server-Bkracpae.cjs';
 import 'react';
 
 interface EditBridgeConfig {
@@ -71,7 +71,7 @@ declare function CmssyLazyEditor({ load, ...props }: CmssyLazyEditorProps): reac
 interface CmssyEditableLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
-    position: string;
+    region: string;
     page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;
@@ -81,11 +81,11 @@ interface CmssyEditableLayoutProps {
     resolvedContent?: Record<string, Record<string, unknown>>;
     appContext?: Record<string, unknown>;
 }
-declare function CmssyEditableLayout({ groups, blocks, position, page, locale, defaultLocale, enabledLocales, edit, data, resolvedContent, appContext, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyEditableLayout({ groups, blocks, region, page, locale, defaultLocale, enabledLocales, edit, data, resolvedContent, appContext, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
 
 interface CmssyLazyLayoutProps {
     groups: CmssyLayoutGroup[];
-    position: string;
+    region: string;
     page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;

package/dist/client.d.ts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { BlockSchema, BlockMeta, LayoutRegion, CmssyPageData, CmssyFormDefinition, CmssyLayoutGroup } from '@cmssy/core';
-import { B as BlockDefinition, L as LayoutBlockPage } from './internal-server-Hogm3pjD.js';
+import { B as BlockDefinition, L as LayoutBlockPage } from './internal-server-Bkracpae.js';
 import 'react';
 
 interface EditBridgeConfig {
@@ -71,7 +71,7 @@ declare function CmssyLazyEditor({ load, ...props }: CmssyLazyEditorProps): reac
 interface CmssyEditableLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
-    position: string;
+    region: string;
     page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;
@@ -81,11 +81,11 @@ interface CmssyEditableLayoutProps {
     resolvedContent?: Record<string, Record<string, unknown>>;
     appContext?: Record<string, unknown>;
 }
-declare function CmssyEditableLayout({ groups, blocks, position, page, locale, defaultLocale, enabledLocales, edit, data, resolvedContent, appContext, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyEditableLayout({ groups, blocks, region, page, locale, defaultLocale, enabledLocales, edit, data, resolvedContent, appContext, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
 
 interface CmssyLazyLayoutProps {
     groups: CmssyLayoutGroup[];
-    position: string;
+    region: string;
     page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;

package/dist/client.js

@@ -209,16 +209,16 @@ function collectLayoutBlocks(rects, pageIds) {
   const out = [];
   if (typeof document === "undefined") return out;
   const seen = /* @__PURE__ */ new Set();
-  for (const el of document.querySelectorAll("[data-layout-position]")) {
+  for (const el of document.querySelectorAll("[data-layout-region]")) {
     const id = el.getAttribute("data-block-id");
     const type = el.getAttribute("data-block-type");
-    const layoutPosition = el.getAttribute("data-layout-position");
-    if (id && type && layoutPosition !== null && !pageIds.has(id) && !seen.has(id)) {
+    const layoutRegion = el.getAttribute("data-layout-region");
+    if (id && type && layoutRegion !== null && !pageIds.has(id) && !seen.has(id)) {
       seen.add(id);
       out.push({
         id,
         type,
-        layoutPosition,
+        layoutRegion,
         bounds: rects.get(id) ?? ZERO_RECT
       });
     }
@@ -306,7 +306,7 @@ function useEditBridge(page, config) {
       if (!message) return;
       postTarget = event.origin;
       if (message.type === "cmssy:patch") {
-        if (message.layoutPosition !== void 0) return;
+        if (message.layoutRegion !== void 0) return;
         setPatches((prev) => ({
           ...prev,
           [message.blockId]: { ...prev[message.blockId], ...message.content }
@@ -377,12 +377,12 @@ function useEditBridge(page, config) {
         event.stopPropagation();
       }
       const r = el.getBoundingClientRect();
-      const layoutPosition = el.getAttribute("data-layout-position");
+      const layoutRegion = el.getAttribute("data-layout-region");
       postSafe({
         type: "cmssy:click",
         blockId: id,
         rect: { x: r.x, y: r.y, width: r.width, height: r.height },
-        ...layoutPosition !== null ? { layoutPosition } : {}
+        ...layoutRegion !== null ? { layoutRegion } : {}
       });
     };
     const onKeyDown = (event) => {
@@ -480,7 +480,7 @@ function visible(el) {
 function blockElements() {
   return Array.from(
     document.querySelectorAll(
-      "[data-block-id]:not([data-layout-position])"
+      "[data-block-id]:not([data-layout-region])"
     )
   ).filter(visible);
 }
@@ -719,7 +719,7 @@ function CmssyBlock({
   schema,
   editable,
   editMode,
-  layoutPosition,
+  layoutRegion,
   context,
   data
 }) {
@@ -731,7 +731,7 @@ function CmssyBlock({
     {
       "data-block-id": block.id,
       "data-block-type": block.type,
-      "data-layout-position": layoutPosition,
+      "data-layout-region": layoutRegion,
       draggable: editable || void 0,
       style: hidden ? { display: "none" } : void 0,
       children
@@ -948,7 +948,7 @@ function CmssyLazyEditor({ load, ...props }) {
     ) : null
   ] });
 }
-function useLayoutPatchBridge(position, config) {
+function useLayoutPatchBridge(region, config) {
   const [patches, setPatches] = useState({});
   useEffect(() => {
     setPatches({});
@@ -962,7 +962,7 @@ function useLayoutPatchBridge(position, config) {
         editorOrigin
       );
       if (!message) return;
-      if (message.type === "cmssy:patch" && message.layoutPosition === position) {
+      if (message.type === "cmssy:patch" && message.layoutRegion === region) {
         setPatches((prev) => ({
           ...prev,
           [message.blockId]: { ...prev[message.blockId], ...message.content }
@@ -971,13 +971,13 @@ function useLayoutPatchBridge(position, config) {
     };
     window.addEventListener("message", handler);
     return () => window.removeEventListener("message", handler);
-  }, [config.editorOrigin, position]);
+  }, [config.editorOrigin, region]);
   return patches;
 }
 function CmssyEditableLayout({
   groups,
   blocks,
-  position,
+  region,
   page,
   locale = "en",
   defaultLocale = "en",
@@ -993,10 +993,10 @@ function CmssyEditableLayout({
     [edit.schemas, blocks]
   );
   const layoutBlocks = useMemo(() => {
-    const group = groups.find((g) => g.position === position);
+    const group = groups.find((g) => g.region === region);
     return group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
-  }, [groups, position]);
-  const patches = useLayoutPatchBridge(position, edit);
+  }, [groups, region]);
+  const patches = useLayoutPatchBridge(region, edit);
   const context = useMemo(
     () => buildBlockContext(locale, defaultLocale, enabledLocales, true, void 0, {
       page,
@@ -1016,7 +1016,7 @@ function CmssyEditableLayout({
       resolvedContent: resolvedContent?.[block.id],
       schema: schemas[block.type],
       editMode: true,
-      layoutPosition: position,
+      layoutRegion: region,
       context,
       data: data?.[block.id]
     },
@@ -1053,7 +1053,7 @@ function CmssyLazyLayout({ load, ...props }) {
     /* @__PURE__ */ jsx(
       "div",
       {
-        "data-cmssy-layout-slot": props.position,
+        "data-cmssy-layout-slot": props.region,
         "data-cmssy-editor-content": resolvedCount,
         hidden: true
       }

package/dist/index.cjs

@@ -349,7 +349,7 @@ async function resolveEditorBlockData({
 async function resolveEditorLayoutBlockData({
   groups,
   blocks,
-  position,
+  region,
   page,
   locale,
   defaultLocale,
@@ -359,7 +359,7 @@ async function resolveEditorLayoutBlockData({
   config,
   appContext
 }) {
-  const group = groups.find((g) => g.position === position);
+  const group = groups.find((g) => g.region === region);
   const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);
@@ -387,7 +387,7 @@ function layoutSlotPage(slug) {
 }
 async function resolveCmssyLayoutSlot(config, options) {
   const {
-    position,
+    region,
     blocks,
     editMode,
     preview = false,
@@ -410,7 +410,7 @@ async function resolveCmssyLayoutSlot(config, options) {
   });
   const base = {
     groups,
-    settings: groups.find((g) => g.position === position)?.settings ?? null,
+    settings: groups.find((g) => g.region === region)?.settings ?? null,
     page,
     locale: locale$1,
     defaultLocale: siteLocales.defaultLocale,
@@ -421,7 +421,7 @@ async function resolveCmssyLayoutSlot(config, options) {
   const editorData = await resolveEditorLayoutBlockData({
     groups,
     blocks,
-    position,
+    region,
     page,
     locale: locale$1,
     defaultLocale: siteLocales.defaultLocale,
@@ -441,7 +441,7 @@ async function resolveCmssyLayoutSlot(config, options) {
 async function CmssyServerLayout({
   groups,
   blocks,
-  position,
+  region,
   page,
   locale: localeProp,
   defaultLocale: defaultLocaleProp,
@@ -457,7 +457,7 @@ async function CmssyServerLayout({
     enabledLocales: enabledLocalesProp,
     config
   });
-  const group = groups.find((g) => g.position === position);
+  const group = groups.find((g) => g.region === region);
   const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return null;
   const map = buildBlockMap(blocks);
@@ -504,7 +504,7 @@ async function resolveCmssyLayout(config, options) {
   const { groups, settings, page, locale, defaultLocale, enabledLocales } = resolved;
   const shared = {
     groups,
-    position: options.position,
+    region: options.region,
     page,
     locale,
     defaultLocale,
@@ -550,7 +550,7 @@ function CmssyBlock({
   schema,
   editable,
   editMode,
-  layoutPosition,
+  layoutRegion,
   context,
   data
 }) {
@@ -562,7 +562,7 @@ function CmssyBlock({
     {
       "data-block-id": block.id,
       "data-block-type": block.type,
-      "data-layout-position": layoutPosition,
+      "data-layout-region": layoutRegion,
       draggable: editable || void 0,
       style: hidden ? { display: "none" } : void 0,
       children

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, CmssyBlockPage, RetryOption, CmssyConfig, CmssyRegionOf, CmssyRegionSettingsOf, RawBlock, CmssyBlockContext } from '@cmssy/core';
-export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayout, CmssyLayoutGroup, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRegionSettingsOf, CmssyRequestError, CmssyRetryMode, CmssySiteConfig, CmssyTypedDocument, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, LayoutPosition, LayoutRegion, MediaLike, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryOption, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, defineCmssyLayout, fields, graphqlRequest, isProtocolCompatible, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-import { B as BlockDefinition, L as LayoutBlockPage, a as BlockMap } from './internal-server-Hogm3pjD.cjs';
-export { b as BlockProps, E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, d as buildBlockMap, e as defineBlock, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData } from './internal-server-Hogm3pjD.cjs';
+export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayout, CmssyLayoutGroup, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRegionSettingsOf, CmssyRequestError, CmssyRetryMode, CmssySiteConfig, CmssyTypedDocument, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, LayoutRegion, LayoutRegionId, MediaLike, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryOption, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, defineCmssyLayout, fields, graphqlRequest, isProtocolCompatible, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
+import { B as BlockDefinition, L as LayoutBlockPage, a as BlockMap } from './internal-server-Bkracpae.cjs';
+export { b as BlockProps, E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, d as buildBlockMap, e as defineBlock, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData } from './internal-server-Bkracpae.cjs';
 import { FieldDefinition } from '@cmssy/types';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic } from '@cmssy/types';
 export { buildBlockContext } from '@cmssy/core/internal';
@@ -24,7 +24,7 @@ interface CmssyServerPageProps {
 declare function CmssyServerPage({ page, blocks, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, forms, auth, workspace, appContext, editMode, }: CmssyServerPageProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
 interface ResolveCmssyLayoutSlotBase {
-    position: string;
+    region: string;
     blocks: BlockDefinition[];
     editMode: boolean;
     preview?: boolean;
@@ -57,7 +57,7 @@ declare function resolveCmssyLayoutSlot(config: CmssyConfig, options: ResolveCms
 
 interface CmssyLayoutEditableProps {
     groups: CmssyLayoutGroup[];
-    position: string;
+    region: string;
     page?: CmssyBlockPage;
     locale: string;
     defaultLocale: string;
@@ -69,8 +69,8 @@ interface CmssyLayoutEditableProps {
     resolvedContent?: Record<string, Record<string, unknown>>;
     appContext?: Record<string, unknown>;
 }
-type ResolveCmssyLayoutOptions<C extends CmssyConfig, P extends CmssyRegionOf<C>> = Omit<ResolveCmssyLayoutSlotOptions, "position" | keyof CmssyLayoutSlotLocaleSource> & CmssyLayoutSlotLocaleSource & {
-    position: P;
+type ResolveCmssyLayoutOptions<C extends CmssyConfig, P extends CmssyRegionOf<C>> = Omit<ResolveCmssyLayoutSlotOptions, "region" | keyof CmssyLayoutSlotLocaleSource> & CmssyLayoutSlotLocaleSource & {
+    region: P;
     editable?: ComponentType<CmssyLayoutEditableProps>;
 };
 interface CmssyLayoutResolution<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> {
@@ -87,7 +87,7 @@ declare function resolveCmssyLayout<C extends CmssyConfig, P extends CmssyRegion
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
-    position: string;
+    region: string;
     page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;
@@ -97,7 +97,7 @@ interface CmssyServerLayoutProps {
     editMode?: boolean;
     preview?: boolean;
 }
-declare function CmssyServerLayout({ groups, blocks, position, page, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, appContext, editMode, preview, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
+declare function CmssyServerLayout({ groups, blocks, region, page, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, appContext, editMode, preview, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
 interface CmssyBlockProps {
     block: RawBlock;
@@ -111,11 +111,11 @@ interface CmssyBlockProps {
     schema?: Record<string, FieldDefinition>;
     editable?: boolean;
     editMode?: boolean;
-    layoutPosition?: string;
+    layoutRegion?: string;
     context?: CmssyBlockContext;
     data?: unknown;
 }
-declare function CmssyBlock({ block, locale, defaultLocale, blockMap, patchedContent, patchedStyle, patchedAdvanced, resolvedContent, schema, editable, editMode, layoutPosition, context, data, }: CmssyBlockProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyBlock({ block, locale, defaultLocale, blockMap, patchedContent, patchedStyle, patchedAdvanced, resolvedContent, schema, editable, editMode, layoutRegion, context, data, }: CmssyBlockProps): react_jsx_runtime.JSX.Element | null;
 
 interface UnknownBlockProps {
     type: string;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, CmssyBlockPage, RetryOption, CmssyConfig, CmssyRegionOf, CmssyRegionSettingsOf, RawBlock, CmssyBlockContext } from '@cmssy/core';
-export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayout, CmssyLayoutGroup, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRegionSettingsOf, CmssyRequestError, CmssyRetryMode, CmssySiteConfig, CmssyTypedDocument, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, LayoutPosition, LayoutRegion, MediaLike, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryOption, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, defineCmssyLayout, fields, graphqlRequest, isProtocolCompatible, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-import { B as BlockDefinition, L as LayoutBlockPage, a as BlockMap } from './internal-server-Hogm3pjD.js';
-export { b as BlockProps, E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, d as buildBlockMap, e as defineBlock, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData } from './internal-server-Hogm3pjD.js';
+export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayout, CmssyLayoutGroup, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRegionSettingsOf, CmssyRequestError, CmssyRetryMode, CmssySiteConfig, CmssyTypedDocument, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, LayoutRegion, LayoutRegionId, MediaLike, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryOption, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, defineCmssyLayout, fields, graphqlRequest, isProtocolCompatible, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
+import { B as BlockDefinition, L as LayoutBlockPage, a as BlockMap } from './internal-server-Bkracpae.js';
+export { b as BlockProps, E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, d as buildBlockMap, e as defineBlock, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData } from './internal-server-Bkracpae.js';
 import { FieldDefinition } from '@cmssy/types';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic } from '@cmssy/types';
 export { buildBlockContext } from '@cmssy/core/internal';
@@ -24,7 +24,7 @@ interface CmssyServerPageProps {
 declare function CmssyServerPage({ page, blocks, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, forms, auth, workspace, appContext, editMode, }: CmssyServerPageProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
 interface ResolveCmssyLayoutSlotBase {
-    position: string;
+    region: string;
     blocks: BlockDefinition[];
     editMode: boolean;
     preview?: boolean;
@@ -57,7 +57,7 @@ declare function resolveCmssyLayoutSlot(config: CmssyConfig, options: ResolveCms
 
 interface CmssyLayoutEditableProps {
     groups: CmssyLayoutGroup[];
-    position: string;
+    region: string;
     page?: CmssyBlockPage;
     locale: string;
     defaultLocale: string;
@@ -69,8 +69,8 @@ interface CmssyLayoutEditableProps {
     resolvedContent?: Record<string, Record<string, unknown>>;
     appContext?: Record<string, unknown>;
 }
-type ResolveCmssyLayoutOptions<C extends CmssyConfig, P extends CmssyRegionOf<C>> = Omit<ResolveCmssyLayoutSlotOptions, "position" | keyof CmssyLayoutSlotLocaleSource> & CmssyLayoutSlotLocaleSource & {
-    position: P;
+type ResolveCmssyLayoutOptions<C extends CmssyConfig, P extends CmssyRegionOf<C>> = Omit<ResolveCmssyLayoutSlotOptions, "region" | keyof CmssyLayoutSlotLocaleSource> & CmssyLayoutSlotLocaleSource & {
+    region: P;
     editable?: ComponentType<CmssyLayoutEditableProps>;
 };
 interface CmssyLayoutResolution<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> {
@@ -87,7 +87,7 @@ declare function resolveCmssyLayout<C extends CmssyConfig, P extends CmssyRegion
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
-    position: string;
+    region: string;
     page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;
@@ -97,7 +97,7 @@ interface CmssyServerLayoutProps {
     editMode?: boolean;
     preview?: boolean;
 }
-declare function CmssyServerLayout({ groups, blocks, position, page, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, appContext, editMode, preview, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
+declare function CmssyServerLayout({ groups, blocks, region, page, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, appContext, editMode, preview, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
 interface CmssyBlockProps {
     block: RawBlock;
@@ -111,11 +111,11 @@ interface CmssyBlockProps {
     schema?: Record<string, FieldDefinition>;
     editable?: boolean;
     editMode?: boolean;
-    layoutPosition?: string;
+    layoutRegion?: string;
     context?: CmssyBlockContext;
     data?: unknown;
 }
-declare function CmssyBlock({ block, locale, defaultLocale, blockMap, patchedContent, patchedStyle, patchedAdvanced, resolvedContent, schema, editable, editMode, layoutPosition, context, data, }: CmssyBlockProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyBlock({ block, locale, defaultLocale, blockMap, patchedContent, patchedStyle, patchedAdvanced, resolvedContent, schema, editable, editMode, layoutRegion, context, data, }: CmssyBlockProps): react_jsx_runtime.JSX.Element | null;
 
 interface UnknownBlockProps {
     type: string;

package/dist/index.js

@@ -349,7 +349,7 @@ async function resolveEditorBlockData({
 async function resolveEditorLayoutBlockData({
   groups,
   blocks,
-  position,
+  region,
   page,
   locale,
   defaultLocale,
@@ -359,7 +359,7 @@ async function resolveEditorLayoutBlockData({
   config,
   appContext
 }) {
-  const group = groups.find((g) => g.position === position);
+  const group = groups.find((g) => g.region === region);
   const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);
@@ -387,7 +387,7 @@ function layoutSlotPage(slug) {
 }
 async function resolveCmssyLayoutSlot(config, options) {
   const {
-    position,
+    region,
     blocks,
     editMode,
     preview = false,
@@ -410,7 +410,7 @@ async function resolveCmssyLayoutSlot(config, options) {
   });
   const base = {
     groups,
-    settings: groups.find((g) => g.position === position)?.settings ?? null,
+    settings: groups.find((g) => g.region === region)?.settings ?? null,
     page,
     locale,
     defaultLocale: siteLocales.defaultLocale,
@@ -421,7 +421,7 @@ async function resolveCmssyLayoutSlot(config, options) {
   const editorData = await resolveEditorLayoutBlockData({
     groups,
     blocks,
-    position,
+    region,
     page,
     locale,
     defaultLocale: siteLocales.defaultLocale,
@@ -441,7 +441,7 @@ async function resolveCmssyLayoutSlot(config, options) {
 async function CmssyServerLayout({
   groups,
   blocks,
-  position,
+  region,
   page,
   locale: localeProp,
   defaultLocale: defaultLocaleProp,
@@ -457,7 +457,7 @@ async function CmssyServerLayout({
     enabledLocales: enabledLocalesProp,
     config
   });
-  const group = groups.find((g) => g.position === position);
+  const group = groups.find((g) => g.region === region);
   const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return null;
   const map = buildBlockMap(blocks);
@@ -504,7 +504,7 @@ async function resolveCmssyLayout(config, options) {
   const { groups, settings, page, locale, defaultLocale, enabledLocales } = resolved;
   const shared = {
     groups,
-    position: options.position,
+    region: options.region,
     page,
     locale,
     defaultLocale,
@@ -550,7 +550,7 @@ function CmssyBlock({
   schema,
   editable,
   editMode,
-  layoutPosition,
+  layoutRegion,
   context,
   data
 }) {
@@ -562,7 +562,7 @@ function CmssyBlock({
     {
       "data-block-id": block.id,
       "data-block-type": block.type,
-      "data-layout-position": layoutPosition,
+      "data-layout-region": layoutRegion,
       draggable: editable || void 0,
       style: hidden ? { display: "none" } : void 0,
       children

package/dist/{internal-server-Hogm3pjD.d.cts → internal-server-Bkracpae.d.cts}

@@ -25,7 +25,7 @@ interface BlockDefinition {
     label?: string;
     category?: string;
     icon?: string;
-    layoutPositions?: string[];
+    layoutRegions?: string[];
     description?: string;
     props: Record<string, FieldDefinition>;
     loader?: BlockLoader;
@@ -42,7 +42,7 @@ declare function defineBlock<P extends BlockPropsSchema, C = InferBlockContent<P
     label?: string;
     category?: string;
     icon?: string;
-    layoutPositions?: string[];
+    layoutRegions?: string[];
     description?: string;
     props: P;
     loader?: (args: {
@@ -87,7 +87,7 @@ declare function resolveBlockData(options: ResolveBlockDataOptions): Promise<Rec
 interface ResolveLayoutBlockDataOptions {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
-    position: string;
+    region: string;
     page?: LayoutBlockPage;
     locale: string;
     defaultLocale: string;
@@ -97,7 +97,7 @@ interface ResolveLayoutBlockDataOptions {
     config?: CmssyClientConfig;
     appContext?: Record<string, unknown>;
 }
-declare function resolveEditorLayoutBlockData({ groups, blocks, position, page, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveLayoutBlockDataOptions): Promise<EditorBlockData>;
+declare function resolveEditorLayoutBlockData({ groups, blocks, region, page, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveLayoutBlockDataOptions): Promise<EditorBlockData>;
 declare function resolveLayoutBlockData(options: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
 
 export { type BlockDefinition as B, type EditorBlockData as E, type LayoutBlockPage as L, type ResolveBlockDataOptions as R, type BlockMap as a, type BlockProps as b, type ResolveLayoutBlockDataOptions as c, buildBlockMap as d, defineBlock as e, resolveEditorLayoutBlockData as f, resolveBlockData as g, resolveLayoutBlockData as h, resolveEditorBlockData as r };

package/dist/{internal-server-Hogm3pjD.d.ts → internal-server-Bkracpae.d.ts}

@@ -25,7 +25,7 @@ interface BlockDefinition {
     label?: string;
     category?: string;
     icon?: string;
-    layoutPositions?: string[];
+    layoutRegions?: string[];
     description?: string;
     props: Record<string, FieldDefinition>;
     loader?: BlockLoader;
@@ -42,7 +42,7 @@ declare function defineBlock<P extends BlockPropsSchema, C = InferBlockContent<P
     label?: string;
     category?: string;
     icon?: string;
-    layoutPositions?: string[];
+    layoutRegions?: string[];
     description?: string;
     props: P;
     loader?: (args: {
@@ -87,7 +87,7 @@ declare function resolveBlockData(options: ResolveBlockDataOptions): Promise<Rec
 interface ResolveLayoutBlockDataOptions {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
-    position: string;
+    region: string;
     page?: LayoutBlockPage;
     locale: string;
     defaultLocale: string;
@@ -97,7 +97,7 @@ interface ResolveLayoutBlockDataOptions {
     config?: CmssyClientConfig;
     appContext?: Record<string, unknown>;
 }
-declare function resolveEditorLayoutBlockData({ groups, blocks, position, page, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveLayoutBlockDataOptions): Promise<EditorBlockData>;
+declare function resolveEditorLayoutBlockData({ groups, blocks, region, page, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveLayoutBlockDataOptions): Promise<EditorBlockData>;
 declare function resolveLayoutBlockData(options: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
 
 export { type BlockDefinition as B, type EditorBlockData as E, type LayoutBlockPage as L, type ResolveBlockDataOptions as R, type BlockMap as a, type BlockProps as b, type ResolveLayoutBlockDataOptions as c, buildBlockMap as d, defineBlock as e, resolveEditorLayoutBlockData as f, resolveBlockData as g, resolveLayoutBlockData as h, resolveEditorBlockData as r };

package/dist/internal-server.cjs

@@ -123,7 +123,7 @@ async function resolveBlockData(options) {
 async function resolveEditorLayoutBlockData({
   groups,
   blocks,
-  position,
+  region,
   page,
   locale,
   defaultLocale,
@@ -133,7 +133,7 @@ async function resolveEditorLayoutBlockData({
   config,
   appContext
 }) {
-  const group = groups.find((g) => g.position === position);
+  const group = groups.find((g) => g.region === region);
   const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);

package/dist/internal-server.d.cts

@@ -1,3 +1,3 @@
-export { E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, g as resolveBlockData, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData, h as resolveLayoutBlockData } from './internal-server-Hogm3pjD.cjs';
+export { E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, g as resolveBlockData, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData, h as resolveLayoutBlockData } from './internal-server-Bkracpae.cjs';
 export { blocksToSchemas } from '@cmssy/core';
 import 'react';

package/dist/internal-server.d.ts

@@ -1,3 +1,3 @@
-export { E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, g as resolveBlockData, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData, h as resolveLayoutBlockData } from './internal-server-Hogm3pjD.js';
+export { E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, g as resolveBlockData, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData, h as resolveLayoutBlockData } from './internal-server-Bkracpae.js';
 export { blocksToSchemas } from '@cmssy/core';
 import 'react';

package/dist/internal-server.js

@@ -122,7 +122,7 @@ async function resolveBlockData(options) {
 async function resolveEditorLayoutBlockData({
   groups,
   blocks,
-  position,
+  region,
   page,
   locale,
   defaultLocale,
@@ -132,7 +132,7 @@ async function resolveEditorLayoutBlockData({
   config,
   appContext
 }) {
-  const group = groups.find((g) => g.position === position);
+  const group = groups.find((g) => g.region === region);
   const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "14.2.0",
+  "version": "16.0.0",
   "description": "React blocks, renderers, data client and editor bridge for cmssy headless sites",
   "keywords": [
     "cmssy",
@@ -96,8 +96,8 @@
     "vitest": "^2.1.0"
   },
   "dependencies": {
-    "@cmssy/types": "0.39.0",
-    "@cmssy/core": "14.2.0"
+    "@cmssy/types": "0.41.0",
+    "@cmssy/core": "16.0.0"
   },
   "scripts": {
     "build": "tsup",