@almadar/ui 4.15.5 → 4.16.0

package/dist/avl/index.cjs

@@ -21998,6 +21998,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  React127.useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -22016,17 +22027,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "text-center py-12", children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  React127.useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -22926,7 +22926,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -23738,7 +23738,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsxRuntime.jsx(
           Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,
@@ -52070,10 +52070,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           ...payload !== void 0 ? { payload } : {},
           timestamp: Date.now()
         };
-        const pdata = payload?.data;
-        if (Array.isArray(pdata) && binding.linkedEntity) {
-          snap.data[binding.linkedEntity] = pdata;
-        }
         const listensEntry = (binding.trait.listens ?? []).find(
           (l) => l.event === normalizedEvent || l.triggers === normalizedEvent
         );
@@ -52167,9 +52163,53 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
             notify: clientHandlers.notify
           };
         }
+        const writeFetchResultToSnap = (fetchedEntityType, fetchResult) => {
+          if (!fetchResult) return;
+          const snapNow = traitSnapshotDataRef.current.get(traitName);
+          if (!snapNow) return;
+          const rows = Array.isArray(fetchResult.rows) ? fetchResult.rows : [fetchResult.rows];
+          snapNow.data[fetchedEntityType] = rows;
+        };
+        const baseFetch = handlers.fetch;
+        const baseRef = handlers.ref;
+        const baseDeref = handlers.deref;
+        handlers = {
+          ...handlers,
+          ...baseFetch ? {
+            fetch: async (entityType, options2) => {
+              const r2 = await baseFetch(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {},
+          ...baseRef ? {
+            ref: async (entityType, options2) => {
+              const r2 = await baseRef(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {},
+          ...baseDeref ? {
+            deref: async (entityType, options2) => {
+              const r2 = await baseDeref(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {}
+        };
         const entityFromPayload = payload ?? {};
+        const reducerSnap = traitSnapshotDataRef.current.get(traitName);
+        const persistedRows = linkedEntity ? reducerSnap?.data[linkedEntity] : void 0;
+        let entityForBinding = entityFromPayload;
+        if (persistedRows && persistedRows.length > 0) {
+          const hybrid = Object.assign(
+            [...persistedRows],
+            persistedRows[0]
+          );
+          entityForBinding = hybrid;
+        }
         const bindingCtx = {
-          entity: entityFromPayload,
+          entity: entityForBinding,
           payload: payload || {},
           state: result.previousState
         };

package/dist/avl/index.js

@@ -21952,6 +21952,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -21970,17 +21981,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsx(Box, { className: "text-center py-12", children: /* @__PURE__ */ jsx(Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -22880,7 +22880,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -23692,7 +23692,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsx(
           Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,
@@ -52024,10 +52024,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           ...payload !== void 0 ? { payload } : {},
           timestamp: Date.now()
         };
-        const pdata = payload?.data;
-        if (Array.isArray(pdata) && binding.linkedEntity) {
-          snap.data[binding.linkedEntity] = pdata;
-        }
         const listensEntry = (binding.trait.listens ?? []).find(
           (l) => l.event === normalizedEvent || l.triggers === normalizedEvent
         );
@@ -52121,9 +52117,53 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
             notify: clientHandlers.notify
           };
         }
+        const writeFetchResultToSnap = (fetchedEntityType, fetchResult) => {
+          if (!fetchResult) return;
+          const snapNow = traitSnapshotDataRef.current.get(traitName);
+          if (!snapNow) return;
+          const rows = Array.isArray(fetchResult.rows) ? fetchResult.rows : [fetchResult.rows];
+          snapNow.data[fetchedEntityType] = rows;
+        };
+        const baseFetch = handlers.fetch;
+        const baseRef = handlers.ref;
+        const baseDeref = handlers.deref;
+        handlers = {
+          ...handlers,
+          ...baseFetch ? {
+            fetch: async (entityType, options2) => {
+              const r2 = await baseFetch(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {},
+          ...baseRef ? {
+            ref: async (entityType, options2) => {
+              const r2 = await baseRef(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {},
+          ...baseDeref ? {
+            deref: async (entityType, options2) => {
+              const r2 = await baseDeref(entityType, options2);
+              writeFetchResultToSnap(entityType, r2);
+              return r2;
+            }
+          } : {}
+        };
         const entityFromPayload = payload ?? {};
+        const reducerSnap = traitSnapshotDataRef.current.get(traitName);
+        const persistedRows = linkedEntity ? reducerSnap?.data[linkedEntity] : void 0;
+        let entityForBinding = entityFromPayload;
+        if (persistedRows && persistedRows.length > 0) {
+          const hybrid = Object.assign(
+            [...persistedRows],
+            persistedRows[0]
+          );
+          entityForBinding = hybrid;
+        }
         const bindingCtx = {
-          entity: entityFromPayload,
+          entity: entityForBinding,
           payload: payload || {},
           state: result.previousState
         };

package/dist/components/index.cjs

@@ -17426,6 +17426,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  React110.useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -17444,17 +17455,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsxRuntime.jsx(exports.Box, { className: "text-center py-12", children: /* @__PURE__ */ jsxRuntime.jsx(exports.Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  React110.useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -18362,7 +18362,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -19174,7 +19174,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsxRuntime.jsx(
           exports.Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,

package/dist/components/index.js

@@ -17381,6 +17381,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -17399,17 +17410,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsx(Box, { className: "text-center py-12", children: /* @__PURE__ */ jsx(Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -18317,7 +18317,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -19129,7 +19129,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsx(
           Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,

package/dist/providers/index.cjs

@@ -18749,6 +18749,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  React115.useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -18767,17 +18778,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "text-center py-12", children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  React115.useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -19677,7 +19677,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -20489,7 +20489,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsxRuntime.jsx(
           Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,

package/dist/providers/index.js

@@ -18704,6 +18704,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -18722,17 +18733,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsx(Box, { className: "text-center py-12", children: /* @__PURE__ */ jsx(Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -19632,7 +19632,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -20444,7 +20444,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsx(
           Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,

package/dist/runtime/index.cjs

@@ -18525,6 +18525,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  React113.useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -18543,17 +18554,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "text-center py-12", children: /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  React113.useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -19389,7 +19389,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -20201,7 +20201,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsxRuntime.jsx(
           Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,
@@ -38597,10 +38597,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           ...payload !== void 0 ? { payload } : {},
           timestamp: Date.now()
         };
-        const pdata = payload?.data;
-        if (Array.isArray(pdata) && binding.linkedEntity) {
-          snap.data[binding.linkedEntity] = pdata;
-        }
         const listensEntry = (binding.trait.listens ?? []).find(
           (l) => l.event === normalizedEvent || l.triggers === normalizedEvent
         );
@@ -38694,9 +38690,53 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
             notify: clientHandlers.notify
           };
         }
+        const writeFetchResultToSnap = (fetchedEntityType, fetchResult) => {
+          if (!fetchResult) return;
+          const snapNow = traitSnapshotDataRef.current.get(traitName);
+          if (!snapNow) return;
+          const rows = Array.isArray(fetchResult.rows) ? fetchResult.rows : [fetchResult.rows];
+          snapNow.data[fetchedEntityType] = rows;
+        };
+        const baseFetch = handlers.fetch;
+        const baseRef = handlers.ref;
+        const baseDeref = handlers.deref;
+        handlers = {
+          ...handlers,
+          ...baseFetch ? {
+            fetch: async (entityType, options2) => {
+              const r = await baseFetch(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {},
+          ...baseRef ? {
+            ref: async (entityType, options2) => {
+              const r = await baseRef(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {},
+          ...baseDeref ? {
+            deref: async (entityType, options2) => {
+              const r = await baseDeref(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {}
+        };
         const entityFromPayload = payload ?? {};
+        const reducerSnap = traitSnapshotDataRef.current.get(traitName);
+        const persistedRows = linkedEntity ? reducerSnap?.data[linkedEntity] : void 0;
+        let entityForBinding = entityFromPayload;
+        if (persistedRows && persistedRows.length > 0) {
+          const hybrid = Object.assign(
+            [...persistedRows],
+            persistedRows[0]
+          );
+          entityForBinding = hybrid;
+        }
         const bindingCtx = {
-          entity: entityFromPayload,
+          entity: entityForBinding,
           payload: payload || {},
           state: result.previousState
         };

package/dist/runtime/index.js

@@ -18480,6 +18480,17 @@ function DataGrid({
     };
     eventBus.emit(`UI:${action.event}`, payload);
   };
+  const hasRenderProp = typeof children === "function";
+  useEffect(() => {
+    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
+      const renderItemRaw = schemaRenderItem;
+      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
+      dataGridLog.warn("renderItem-unresolved", {
+        rowCount: data.length,
+        renderItemIsFnLambda: isFnLambda
+      });
+    }
+  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const gridTemplateColumns = cols ? void 0 : `repeat(auto-fit, minmax(min(${minCardWidth}px, 100%), 1fr))`;
   const colsClass = cols ? {
     1: "grid-cols-1",
@@ -18498,17 +18509,6 @@ function DataGrid({
   if (data.length === 0) {
     return /* @__PURE__ */ jsx(Box, { className: "text-center py-12", children: /* @__PURE__ */ jsx(Typography, { variant: "body", color: "secondary", children: t("empty.noItems") || "No items found" }) });
   }
-  const hasRenderProp = typeof children === "function";
-  useEffect(() => {
-    if (data.length > 0 && !hasRenderProp && (!fields || fields.length === 0)) {
-      const renderItemRaw = schemaRenderItem;
-      const isFnLambda = Array.isArray(renderItemRaw) && renderItemRaw.length >= 3 && (renderItemRaw[0] === "fn" || renderItemRaw[0] === "lambda");
-      dataGridLog.warn("renderItem-unresolved", {
-        rowCount: data.length,
-        renderItemIsFnLambda: isFnLambda
-      });
-    }
-  }, [data, hasRenderProp, schemaRenderItem, fields]);
   const allIds = data.map((item, i) => item.id || String(i));
   const allSelected = allIds.length > 0 && allIds.every((id) => selectedIds.has(id));
   const someSelected = selectedIds.size > 0;
@@ -19344,7 +19344,7 @@ var init_FilterGroup = __esm({
           eventBus.emit("UI:FILTER", {
             entity,
             field,
-            value: value === "all" ? null : value,
+            value: value === "all" || value === null ? "" : value,
             query
           });
         },
@@ -20156,7 +20156,7 @@ var init_SearchInput = __esm({
         /* @__PURE__ */ jsx(
           Input,
           {
-            type: "search",
+            type: "text",
             value: searchValue,
             onChange: handleChange,
             placeholder: resolvedPlaceholder,
@@ -38552,10 +38552,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           ...payload !== void 0 ? { payload } : {},
           timestamp: Date.now()
         };
-        const pdata = payload?.data;
-        if (Array.isArray(pdata) && binding.linkedEntity) {
-          snap.data[binding.linkedEntity] = pdata;
-        }
         const listensEntry = (binding.trait.listens ?? []).find(
           (l) => l.event === normalizedEvent || l.triggers === normalizedEvent
         );
@@ -38649,9 +38645,53 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
             notify: clientHandlers.notify
           };
         }
+        const writeFetchResultToSnap = (fetchedEntityType, fetchResult) => {
+          if (!fetchResult) return;
+          const snapNow = traitSnapshotDataRef.current.get(traitName);
+          if (!snapNow) return;
+          const rows = Array.isArray(fetchResult.rows) ? fetchResult.rows : [fetchResult.rows];
+          snapNow.data[fetchedEntityType] = rows;
+        };
+        const baseFetch = handlers.fetch;
+        const baseRef = handlers.ref;
+        const baseDeref = handlers.deref;
+        handlers = {
+          ...handlers,
+          ...baseFetch ? {
+            fetch: async (entityType, options2) => {
+              const r = await baseFetch(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {},
+          ...baseRef ? {
+            ref: async (entityType, options2) => {
+              const r = await baseRef(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {},
+          ...baseDeref ? {
+            deref: async (entityType, options2) => {
+              const r = await baseDeref(entityType, options2);
+              writeFetchResultToSnap(entityType, r);
+              return r;
+            }
+          } : {}
+        };
         const entityFromPayload = payload ?? {};
+        const reducerSnap = traitSnapshotDataRef.current.get(traitName);
+        const persistedRows = linkedEntity ? reducerSnap?.data[linkedEntity] : void 0;
+        let entityForBinding = entityFromPayload;
+        if (persistedRows && persistedRows.length > 0) {
+          const hybrid = Object.assign(
+            [...persistedRows],
+            persistedRows[0]
+          );
+          entityForBinding = hybrid;
+        }
         const bindingCtx = {
-          entity: entityFromPayload,
+          entity: entityForBinding,
           payload: payload || {},
           state: result.previousState
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "4.15.5",
+  "version": "4.16.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "main": "./dist/components/index.js",
@@ -118,10 +118,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@almadar/core": "^7.5.1",
+    "@almadar/core": "^7.7.1",
     "@almadar/evaluator": ">=2.9.2",
     "@almadar/patterns": ">=2.17.1",
-    "@almadar/runtime": "^5.8.4",
+    "@almadar/runtime": "^5.11.1",
     "@almadar/std": ">=6.4.1",
     "@almadar/syntax": ">=1.3.1",
     "@xyflow/react": "12.10.1",