@chaibuilder/sdk 2.0.0-beta.96 → 2.0.0-beta.98

package/dist/core.cjs

@@ -5102,12 +5102,12 @@ const BlockRenderer = ({ blockAtom, children }) => {
   if (lodashEs.isNull(Component2) || hiddenBlocks.includes(block._id) || editingBlockId === block._id) return null;
   return /* @__PURE__ */ jsxRuntime.jsx(React.Suspense, { children: React.createElement(Component2, { ...props, children }) });
 };
-const GlobalBlocksRenderer = ({ blockAtom }) => {
+const GlobalBlocksRenderer = ({ globalBlockId }) => {
   const { getGlobalBlocks } = useGlobalBlocksStore();
-  const [block] = jotai.useAtom(blockAtom);
-  const globalBlocks = React.useMemo(() => getGlobalBlocks((block == null ? void 0 : block.globalBlock) ?? ""), [getGlobalBlocks, block == null ? void 0 : block.globalBlock]);
-  const blocksAtoms = React.useMemo(() => splitAtom(jotai.atom(globalBlocks)), [globalBlocks]);
-  return /* @__PURE__ */ jsxRuntime.jsx(BlocksRenderer, { splitAtoms: blocksAtoms, blocks: globalBlocks });
+  const globalBlocks = React.useMemo(() => getGlobalBlocks(globalBlockId), [getGlobalBlocks, globalBlockId]);
+  const globalBlocksAtoms = React.useMemo(() => splitAtom(jotai.atom(globalBlocks)), [globalBlocks]);
+  if (lodashEs.isEmpty(globalBlocks)) return null;
+  return /* @__PURE__ */ jsxRuntime.jsx(BlocksRenderer, { splitAtoms: globalBlocksAtoms, blocks: globalBlocks });
 };
 const BlocksRenderer = ({
   blocks,
@@ -5116,19 +5116,18 @@ const BlocksRenderer = ({
 }) => {
   const getBlockAtom = useGetBlockAtom(splitAtoms);
   const filteredBlocks = React.useMemo(
-    () => lodashEs.filter(blocks, (block) => lodashEs.isString(parent) ? block._parent === parent : !block._parent),
+    () => lodashEs.filter(blocks, (block) => !lodashEs.isEmpty(parent) ? block._parent === parent : !block._parent),
     [blocks, parent]
   );
   const hasChildren = React.useCallback((block) => lodashEs.filter(blocks, (b) => b._parent === block._id).length > 0, [blocks]);
   return lodashEs.map(filteredBlocks, (block) => {
     const blockAtom = getBlockAtom(block._id);
     if (!blockAtom) return null;
-    return /* @__PURE__ */ jsxRuntime.jsx(BlockRenderer, { blockAtom, children: block._type === "GlobalBlock" ? /* @__PURE__ */ jsxRuntime.jsx(GlobalBlocksRenderer, { blockAtom: getBlockAtom(block._id) }) : hasChildren(block) ? /* @__PURE__ */ jsxRuntime.jsx(BlocksRenderer, { splitAtoms, blocks, parent: block._id }) : null }, block._id);
+    return /* @__PURE__ */ jsxRuntime.jsx(BlockRenderer, { blockAtom, children: block._type === "GlobalBlock" ? /* @__PURE__ */ jsxRuntime.jsx(jotai.Provider, { store: builderStore, children: /* @__PURE__ */ jsxRuntime.jsx(GlobalBlocksRenderer, { globalBlockId: lodashEs.get(block, "globalBlock", "") }) }) : hasChildren(block) ? /* @__PURE__ */ jsxRuntime.jsx(BlocksRenderer, { splitAtoms, blocks, parent: block._id }) : null }, block._id);
   });
 };
 const PageBlocksRenderer = () => {
   const [blocks] = useBlocksStore();
-  console.log(jotai.useAtomValue(pageBlocksAtomsAtom));
   return /* @__PURE__ */ jsxRuntime.jsx(BlocksRenderer, { splitAtoms: pageBlocksAtomsAtom, blocks });
 };
 const StaticBlocksRenderer = () => {

package/dist/core.js

@@ -5,9 +5,9 @@ import { jsx, Fragment, jsxs } from "react/jsx-runtime";
 import * as React from "react";
 import React__default, { createContext, useReducer, useEffect, useDebugValue, useCallback, useContext, useMemo, Component, Children, useState, useRef, Suspense, createElement, memo, lazy } from "react";
 import { ag as useToast, S as Skeleton, B as Button, L as Label, D as Dialog, s as DialogTrigger, a as DialogContent, h as Badge, T as Textarea, O as Tooltip, P as TooltipTrigger, Q as TooltipContent, V as Popover, W as PopoverTrigger, X as PopoverContent, I as Input$1, U as TooltipPortal, e as AccordionItem, f as AccordionTrigger, g as AccordionContent, $ as DropdownMenu, a0 as DropdownMenuTrigger, a1 as DropdownMenuContent, G as ScrollArea, a5 as DropdownMenuLabel, a6 as DropdownMenuSeparator, a8 as DropdownMenuGroup, a2 as DropdownMenuItem, a7 as DropdownMenuShortcut, A as Accordion, C as Card, x as CardHeader, E as CardDescription, F as CardContent, y as CardFooter, J as Tabs, K as TabsList, M as TabsTrigger, N as TabsContent, aj as ContextMenu, ak as ContextMenuTrigger, al as ContextMenuContent, am as ContextMenuItem, j as AlertDialog, k as AlertDialogTrigger, l as AlertDialogContent, m as AlertDialogHeader, o as AlertDialogTitle, p as AlertDialogDescription, n as AlertDialogFooter, r as AlertDialogCancel, q as AlertDialogAction, a3 as DropdownMenuCheckboxItem, Y as HoverCard, Z as HoverCardTrigger, _ as HoverCardContent, b as Switch, ae as Separator, R as TooltipProvider, ai as Toaster } from "./context-menu-DHla8ofZ.js";
-import { atom as atom$1, useAtomValue as useAtomValue$1, useAtom as useAtom$1, getDefaultStore as getDefaultStore$1, useSetAtom as useSetAtom$1 } from "jotai";
+import { atom as atom$1, useAtomValue as useAtomValue$1, useAtom as useAtom$1, getDefaultStore as getDefaultStore$1, useSetAtom as useSetAtom$1, Provider } from "jotai";
 import { has, get, find, filter, flatten, map, omit, isString, includes, without, compact, each, set, first, isObject, memoize, isEmpty, noop, keys, range, values, flattenDeep, startsWith, isNull, forEach, unset, chunk, cloneDeep, pick, throttle, isFunction as isFunction$1, reverse, startCase, debounce, capitalize, split, findIndex, take, nth, toLower, isNumber, parseInt as parseInt$1, isNaN as isNaN$1, findLast, intersection, groupBy, uniq, flatMapDeep, some, reject, sortBy, toUpper, round } from "lodash-es";
-import { Provider } from "react-wrap-balancer";
+import { Provider as Provider$1 } from "react-wrap-balancer";
 import { g as generateUUID, a as getBreakpointValue, c as cn, G as GenIcon } from "./iconBase-CWgVxu0A.js";
 import { useTranslation, initReactI18next } from "react-i18next";
 import { useTranslation as useTranslation2 } from "react-i18next";
@@ -5087,12 +5087,12 @@ const BlockRenderer = ({ blockAtom, children }) => {
   if (isNull(Component3) || hiddenBlocks.includes(block._id) || editingBlockId === block._id) return null;
   return /* @__PURE__ */ jsx(Suspense, { children: createElement(Component3, { ...props, children }) });
 };
-const GlobalBlocksRenderer = ({ blockAtom }) => {
+const GlobalBlocksRenderer = ({ globalBlockId }) => {
   const { getGlobalBlocks } = useGlobalBlocksStore();
-  const [block] = useAtom$1(blockAtom);
-  const globalBlocks = useMemo(() => getGlobalBlocks((block == null ? void 0 : block.globalBlock) ?? ""), [getGlobalBlocks, block == null ? void 0 : block.globalBlock]);
-  const blocksAtoms = useMemo(() => splitAtom(atom$1(globalBlocks)), [globalBlocks]);
-  return /* @__PURE__ */ jsx(BlocksRenderer, { splitAtoms: blocksAtoms, blocks: globalBlocks });
+  const globalBlocks = useMemo(() => getGlobalBlocks(globalBlockId), [getGlobalBlocks, globalBlockId]);
+  const globalBlocksAtoms = useMemo(() => splitAtom(atom$1(globalBlocks)), [globalBlocks]);
+  if (isEmpty(globalBlocks)) return null;
+  return /* @__PURE__ */ jsx(BlocksRenderer, { splitAtoms: globalBlocksAtoms, blocks: globalBlocks });
 };
 const BlocksRenderer = ({
   blocks,
@@ -5101,19 +5101,18 @@ const BlocksRenderer = ({
 }) => {
   const getBlockAtom = useGetBlockAtom(splitAtoms);
   const filteredBlocks = useMemo(
-    () => filter(blocks, (block) => isString(parent) ? block._parent === parent : !block._parent),
+    () => filter(blocks, (block) => !isEmpty(parent) ? block._parent === parent : !block._parent),
     [blocks, parent]
   );
   const hasChildren = useCallback((block) => filter(blocks, (b) => b._parent === block._id).length > 0, [blocks]);
   return map(filteredBlocks, (block) => {
     const blockAtom = getBlockAtom(block._id);
     if (!blockAtom) return null;
-    return /* @__PURE__ */ jsx(BlockRenderer, { blockAtom, children: block._type === "GlobalBlock" ? /* @__PURE__ */ jsx(GlobalBlocksRenderer, { blockAtom: getBlockAtom(block._id) }) : hasChildren(block) ? /* @__PURE__ */ jsx(BlocksRenderer, { splitAtoms, blocks, parent: block._id }) : null }, block._id);
+    return /* @__PURE__ */ jsx(BlockRenderer, { blockAtom, children: block._type === "GlobalBlock" ? /* @__PURE__ */ jsx(Provider, { store: builderStore, children: /* @__PURE__ */ jsx(GlobalBlocksRenderer, { globalBlockId: get(block, "globalBlock", "") }) }) : hasChildren(block) ? /* @__PURE__ */ jsx(BlocksRenderer, { splitAtoms, blocks, parent: block._id }) : null }, block._id);
   });
 };
 const PageBlocksRenderer = () => {
   const [blocks] = useBlocksStore();
-  console.log(useAtomValue$1(pageBlocksAtomsAtom));
   return /* @__PURE__ */ jsx(BlocksRenderer, { splitAtoms: pageBlocksAtomsAtom, blocks });
 };
 const StaticBlocksRenderer = () => {
@@ -5253,7 +5252,7 @@ const StaticCanvas = () => {
               }
             ),
             /* @__PURE__ */ jsx(HeadTags, {}),
-            /* @__PURE__ */ jsx(Provider, { children: /* @__PURE__ */ jsxs(Canvas, { children: [
+            /* @__PURE__ */ jsx(Provider$1, { children: /* @__PURE__ */ jsxs(Canvas, { children: [
               loadingCanvas ? /* @__PURE__ */ jsx("div", { className: "h-full p-4", children: /* @__PURE__ */ jsx(Skeleton, { className: "h-full" }) }) : /* @__PURE__ */ jsx(StaticBlocksRenderer, {}),
               /* @__PURE__ */ jsx(AddBlockAtBottom, {}),
               /* @__PURE__ */ jsx("br", {}),

package/package.json

@@ -5,7 +5,7 @@
   "author": "Suraj Air",
   "license": "BSD-3-Clause",
   "homepage": "https://chaibuilder.com",
-  "version": "2.0.0-beta.96",
+  "version": "2.0.0-beta.98",
   "type": "module",
   "repository": {
     "type": "git",