@dragonmastery/zinia-forms-core 0.5.7 → 0.5.9

package/dist/index.d.ts

@@ -2685,6 +2685,7 @@ declare function useForm<T extends z.ZodObject<any>, CalcType = (values: z.infer
             isFieldCollapsed: boolean;
             collapsedItems: number[];
             defaultCollapsedInitialized: boolean;
+            lastAddedIndex?: number;
         }>;
         readonly undoHistory: Record<string, {
             type: "add" | "remove" | "swap";
@@ -2916,6 +2917,7 @@ interface FormState<T, CalcType = any, ExtraDataType = any> {
         isFieldCollapsed: boolean;
         collapsedItems: number[];
         defaultCollapsedInitialized: boolean;
+        lastAddedIndex?: number;
     }>;
     undoHistory: Record<string, {
         type: 'add' | 'remove' | 'swap';

package/dist/index.js

@@ -2672,7 +2672,14 @@ function createDaisyUIArrayField() {
     }
     const collapseState = formState.collapsedFields[fieldName];
     if (props.defaultCollapsed && !collapseState.defaultCollapsedInitialized && arrayValue.length > 0) {
-      collapseState.collapsedItems = arrayValue.map((_, index) => index);
+      const indicesToCollapse = arrayValue.map((_, index) => index);
+      const lastAdded = collapseState.lastAddedIndex;
+      if (lastAdded !== void 0) {
+        const pos = indicesToCollapse.indexOf(lastAdded);
+        if (pos > -1) indicesToCollapse.splice(pos, 1);
+        delete collapseState.lastAddedIndex;
+      }
+      collapseState.collapsedItems = indicesToCollapse;
       collapseState.defaultCollapsedInitialized = true;
     }
     const toggleFieldCollapse = () => {
@@ -2882,6 +2889,7 @@ function createDaisyUIArrayField() {
       const newArray = [...currentArray, itemCopy];
       const newItemIndex = newArray.length - 1;
       formState.addArrayItemId(props.name, newItemIndex);
+      collapseState.lastAddedIndex = newItemIndex;
       const collapsedIndex = collapseState.collapsedItems.indexOf(newItemIndex);
       if (collapsedIndex > -1) {
         collapseState.collapsedItems.splice(collapsedIndex, 1);
@@ -8976,6 +8984,7 @@ var EnumMultiSelectFilter = (props) => {
                     e.preventDefault();
                     e.stopPropagation();
                     closeDropdown();
+                    document.activeElement?.blur();
                   },
                   onMousedown: (e) => {
                     e.preventDefault();
@@ -10248,6 +10257,10 @@ function convertToDataType(metadataType) {
   }
 }
 var FilterDrawer = (props) => {
+  const handleClose = () => {
+    props.onClose();
+    document.activeElement?.blur();
+  };
   const injectedFilterOptionsState = inject(
     ZINIA_DATA_TABLE_FILTER_OPTIONS_STATE_KEY,
     void 0
@@ -10269,7 +10282,7 @@ var FilterDrawer = (props) => {
           "div",
           {
             class: "absolute inset-0 bg-black/50 transition-opacity opacity-100 pointer-events-auto",
-            onClick: () => props.onClose()
+            onClick: handleClose
           }
         ),
         /* @__PURE__ */ jsxs(
@@ -10321,7 +10334,7 @@ var FilterDrawer = (props) => {
                     "button",
                     {
                       class: "btn btn-ghost btn-sm btn-circle hover:bg-base-300",
-                      onClick: () => props.onClose(),
+                      onClick: handleClose,
                       "aria-label": "Close filters",
                       children: /* @__PURE__ */ jsx(
                         "svg",
@@ -10466,7 +10479,7 @@ var FilterDrawer = (props) => {
                 "button",
                 {
                   class: "btn btn-primary w-full btn-sm text-xs md:text-sm",
-                  onClick: () => props.onClose(),
+                  onClick: handleClose,
                   "data-testid": `${props.tableName || "datatable"}-filter-drawer-apply`,
                   children: "Done"
                 }
@@ -10716,6 +10729,10 @@ var LoadingSkeletons = (props) => {
   ] });
 };
 var SortDrawer = (props) => {
+  const handleClose = () => {
+    props.onClose();
+    document.activeElement?.blur();
+  };
   watch(
     () => props.isOpen,
     (isOpen) => {
@@ -10727,7 +10744,7 @@ var SortDrawer = (props) => {
     }
   );
   if (!props.isOpen) return null;
-  return /* @__PURE__ */ jsx(Teleport, { to: "body", children: /* @__PURE__ */ jsx("div", { class: "fixed inset-0 z-50 bg-black/50", onClick: () => props.onClose(), children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(Teleport, { to: "body", children: /* @__PURE__ */ jsx("div", { class: "fixed inset-0 z-50 bg-black/50", onClick: handleClose, children: /* @__PURE__ */ jsx(
     "div",
     {
       class: "fixed bottom-0 left-0 right-0 bg-base-100 rounded-t-lg animate-slide-up",
@@ -10736,7 +10753,7 @@ var SortDrawer = (props) => {
       children: /* @__PURE__ */ jsxs("div", { class: "p-4", children: [
         /* @__PURE__ */ jsxs("div", { class: "flex items-center justify-between mb-4", children: [
           /* @__PURE__ */ jsx("h3", { class: "text-lg font-semibold", children: "Sort Options" }),
-          /* @__PURE__ */ jsx("button", { class: "btn btn-ghost btn-sm btn-circle", onClick: () => props.onClose(), children: "\u2715" })
+          /* @__PURE__ */ jsx("button", { class: "btn btn-ghost btn-sm btn-circle", onClick: handleClose, children: "\u2715" })
         ] }),
         /* @__PURE__ */ jsxs("div", { class: "space-y-2 max-h-96 overflow-y-auto", children: [
           /* @__PURE__ */ jsxs(
@@ -10745,7 +10762,7 @@ var SortDrawer = (props) => {
               class: `w-full text-left p-3 rounded-lg transition-colors ${!props.sortingField ? "bg-primary text-primary-content" : "hover:bg-base-200"}`,
               onClick: () => {
                 props.onClearSort();
-                props.onClose();
+                handleClose();
               },
               "data-testid": `${props.tableName || "datatable"}-sort-drawer-clear`,
               children: [
@@ -10766,7 +10783,7 @@ var SortDrawer = (props) => {
                   class: `w-full text-left p-3 rounded-lg transition-colors ${props.sortingField === field && props.sortingDirection === "asc" ? "bg-primary text-primary-content" : "hover:bg-base-200"}`,
                   onClick: () => {
                     props.onSort(field, "asc");
-                    props.onClose();
+                    handleClose();
                   },
                   "data-testid": `${props.tableName || "datatable"}-sort-drawer-${field}-asc`,
                   children: /* @__PURE__ */ jsxs("div", { class: "font-medium", children: [
@@ -10784,7 +10801,7 @@ var SortDrawer = (props) => {
                   class: `w-full text-left p-3 rounded-lg transition-colors ${props.sortingField === field && props.sortingDirection === "desc" ? "bg-primary text-primary-content" : "hover:bg-base-200"}`,
                   onClick: () => {
                     props.onSort(field, "desc");
-                    props.onClose();
+                    handleClose();
                   },
                   "data-testid": `${props.tableName || "datatable"}-sort-drawer-${field}-desc`,
                   children: /* @__PURE__ */ jsxs("div", { class: "font-medium", children: [