@cmssy/react 16.0.0 → 16.1.1

package/dist/client.cjs

@@ -44,19 +44,20 @@ var TRANSPARENT = 0.01;
 var VISIBLE_TEXT_FRACTION = 0.5;
 var MEDIA = "img,svg,video,canvas,picture,iframe";
 var UNPAINTED_TEXT = /* @__PURE__ */ new Set(["SCRIPT", "STYLE", "TEMPLATE", "NOSCRIPT"]);
-function effectiveOpacity(node) {
-  let value = 1;
+var NOT_LAID_OUT = { laidOut: false, opacity: 0 };
+function paint(node) {
+  let opacity = 1;
   let current = node;
   while (current) {
     const style = getComputedStyle(current);
-    if (style.display === "none" || style.visibility === "hidden") return 0;
+    if (style.display === "none") return NOT_LAID_OUT;
+    if (style.visibility === "hidden") opacity = 0;
     const own = Number.parseFloat(style.opacity);
-    if (Number.isFinite(own)) value *= own;
-    if (value <= TRANSPARENT) return 0;
+    if (Number.isFinite(own)) opacity *= own;
     if (current === document.documentElement) break;
     current = current.parentElement;
   }
-  return value;
+  return { laidOut: true, opacity: opacity <= TRANSPARENT ? 0 : opacity };
 }
 function holdsText(el) {
   for (const node of el.childNodes) {
@@ -81,15 +82,18 @@ function collectMedia(block) {
   for (const el of block.querySelectorAll(MEDIA)) media.push(el);
   return media;
 }
+function laidOut(elements) {
+  return elements.map(paint).filter((state) => state.laidOut);
+}
 function isBlockPainted(block) {
-  const copy = collectCopy(block);
+  const copy = laidOut(collectCopy(block));
   if (copy.length > 0) {
-    const visible2 = copy.filter((el) => effectiveOpacity(el) > TRANSPARENT);
+    const visible2 = copy.filter((state) => state.opacity > TRANSPARENT);
     return visible2.length >= copy.length * VISIBLE_TEXT_FRACTION;
   }
-  const media = collectMedia(block);
+  const media = laidOut(collectMedia(block));
   if (media.length === 0) return true;
-  return media.some((el) => effectiveOpacity(el) > TRANSPARENT);
+  return media.some((state) => state.opacity > TRANSPARENT);
 }
 
 // src/bridge/use-invisible-blocks.ts

package/dist/client.js

@@ -42,19 +42,20 @@ var TRANSPARENT = 0.01;
 var VISIBLE_TEXT_FRACTION = 0.5;
 var MEDIA = "img,svg,video,canvas,picture,iframe";
 var UNPAINTED_TEXT = /* @__PURE__ */ new Set(["SCRIPT", "STYLE", "TEMPLATE", "NOSCRIPT"]);
-function effectiveOpacity(node) {
-  let value = 1;
+var NOT_LAID_OUT = { laidOut: false, opacity: 0 };
+function paint(node) {
+  let opacity = 1;
   let current = node;
   while (current) {
     const style = getComputedStyle(current);
-    if (style.display === "none" || style.visibility === "hidden") return 0;
+    if (style.display === "none") return NOT_LAID_OUT;
+    if (style.visibility === "hidden") opacity = 0;
     const own = Number.parseFloat(style.opacity);
-    if (Number.isFinite(own)) value *= own;
-    if (value <= TRANSPARENT) return 0;
+    if (Number.isFinite(own)) opacity *= own;
     if (current === document.documentElement) break;
     current = current.parentElement;
   }
-  return value;
+  return { laidOut: true, opacity: opacity <= TRANSPARENT ? 0 : opacity };
 }
 function holdsText(el) {
   for (const node of el.childNodes) {
@@ -79,15 +80,18 @@ function collectMedia(block) {
   for (const el of block.querySelectorAll(MEDIA)) media.push(el);
   return media;
 }
+function laidOut(elements) {
+  return elements.map(paint).filter((state) => state.laidOut);
+}
 function isBlockPainted(block) {
-  const copy = collectCopy(block);
+  const copy = laidOut(collectCopy(block));
   if (copy.length > 0) {
-    const visible2 = copy.filter((el) => effectiveOpacity(el) > TRANSPARENT);
+    const visible2 = copy.filter((state) => state.opacity > TRANSPARENT);
     return visible2.length >= copy.length * VISIBLE_TEXT_FRACTION;
   }
-  const media = collectMedia(block);
+  const media = laidOut(collectMedia(block));
   if (media.length === 0) return true;
-  return media.some((el) => effectiveOpacity(el) > TRANSPARENT);
+  return media.some((state) => state.opacity > TRANSPARENT);
 }
 
 // src/bridge/use-invisible-blocks.ts

package/dist/index.cjs

@@ -396,9 +396,13 @@ async function resolveCmssyLayoutSlot(config, options) {
     appContext,
     path,
     locale: explicitLocale,
-    retry
+    retry,
+    fetch: fetchImpl
   } = options;
-  const requestOptions = { retry: retry ?? "build" };
+  const requestOptions = {
+    retry: retry ?? "build",
+    ...fetchImpl ? { fetch: fetchImpl } : {}
+  };
   const siteLocales = await locale.resolveSiteLocales(config, requestOptions);
   const fromPath = path ? locale.splitLocaleFromPath(path, siteLocales) : { locale: siteLocales.defaultLocale, path: [] };
   const locale$1 = explicitLocale ?? fromPath.locale;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, CmssyBlockPage, RetryOption, CmssyConfig, CmssyRegionOf, CmssyRegionSettingsOf, RawBlock, CmssyBlockContext } from '@cmssy/core';
+import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, CmssyBlockPage, RetryOption, FetchLike, 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, 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';
@@ -32,6 +32,7 @@ interface ResolveCmssyLayoutSlotBase {
     forms?: Record<string, CmssyFormDefinition>;
     appContext?: Record<string, unknown>;
     retry?: RetryOption;
+    fetch?: FetchLike;
 }
 type CmssyLayoutSlotLocaleSource = {
     path: string[];

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, CmssyBlockPage, RetryOption, CmssyConfig, CmssyRegionOf, CmssyRegionSettingsOf, RawBlock, CmssyBlockContext } from '@cmssy/core';
+import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, CmssyBlockPage, RetryOption, FetchLike, 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, 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';
@@ -32,6 +32,7 @@ interface ResolveCmssyLayoutSlotBase {
     forms?: Record<string, CmssyFormDefinition>;
     appContext?: Record<string, unknown>;
     retry?: RetryOption;
+    fetch?: FetchLike;
 }
 type CmssyLayoutSlotLocaleSource = {
     path: string[];

package/dist/index.js

@@ -396,9 +396,13 @@ async function resolveCmssyLayoutSlot(config, options) {
     appContext,
     path,
     locale: explicitLocale,
-    retry
+    retry,
+    fetch: fetchImpl
   } = options;
-  const requestOptions = { retry: retry ?? "build" };
+  const requestOptions = {
+    retry: retry ?? "build",
+    ...fetchImpl ? { fetch: fetchImpl } : {}
+  };
   const siteLocales = await resolveSiteLocales(config, requestOptions);
   const fromPath = path ? splitLocaleFromPath(path, siteLocales) : { locale: siteLocales.defaultLocale, path: [] };
   const locale = explicitLocale ?? fromPath.locale;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "16.0.0",
+  "version": "16.1.1",
   "description": "React blocks, renderers, data client and editor bridge for cmssy headless sites",
   "keywords": [
     "cmssy",
@@ -97,7 +97,7 @@
   },
   "dependencies": {
     "@cmssy/types": "0.41.0",
-    "@cmssy/core": "16.0.0"
+    "@cmssy/core": "16.1.1"
   },
   "scripts": {
     "build": "tsup",