@freelygive/canvas-utils 0.3.0-dev.3a2544d4 → 0.3.3-dev.770641bc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelygive/canvas-utils",
-  "version": "0.3.0-dev.3a2544d4",
+  "version": "0.3.3-dev.770641bc",
   "description": "Canvas utility components and test helpers for Drupal Canvas projects.",
   "type": "module",
   "files": [

package/src/components/utils_entity/index.jsx

@@ -5,20 +5,23 @@ import useSWR from 'swr';
 /**
  * Fetch the main entity for the current page using SWR.
  * Uses Canvas mainEntity (when available) with fallback to title-based lookup.
- * @param {string} entityType - The JSON:API entity type (e.g., 'node--news_article')
- * @param {object} options - Fetch options
- * @param {string[]} options.includes - Relationships to include
- * @param {object} options.fields - Sparse fieldset map (e.g., { 'node--news_article': ['title'] })
+ *
+ * @param {string} entityType - The JSON:API entity type (e.g., 'node--news_article').
+ * @param {Object} [options] - Fetch options.
+ * @param {string[]} [options.includes] - Relationships to include.
+ * @param {Object} [options.fields] - Sparse fieldset map (e.g., { 'node--news_article': ['title'] }).
  * @returns {{ data: object|undefined, error: Error|undefined, isLoading: boolean }}
  */
 export const useMainEntity = (
   entityType,
   { includes = [], fields = {} } = {},
 ) => {
-  const pageData = getPageData();
-  const { pageTitle } = pageData;
-  // mainEntity will be available in future Canvas versions
-  const mainEntity = pageData.mainEntity;
+  // mainEntity will be available in future Canvas versions.
+  const pageData =
+    /** @type {{ pageTitle: string, mainEntity?: { uuid: string } }} */ (
+      getPageData()
+    );
+  const { pageTitle, mainEntity } = pageData;
   const entityId = mainEntity?.uuid || pageTitle || null;
 
   return useSWR(

package/src/components/utils_slots/index.jsx

@@ -11,8 +11,9 @@ const flattenChildren = (children) => {
   React.Children.forEach(children, (child) => {
     if (!child) return;
     // Check if it's a Fragment (type is Symbol(react.fragment))
-    if (child?.type === React.Fragment) {
-      result.push(...flattenChildren(child.props.children));
+    const el = /** @type {React.ReactElement} */ (child);
+    if (el.type === React.Fragment) {
+      result.push(...flattenChildren(el.props.children));
     } else {
       result.push(child);
     }