@dreamtree-org/twreact-ui 1.1.70 → 1.1.72

package/dist/index.esm.js

@@ -3171,8 +3171,8 @@ function cn$1() {
 }
 
 var _excluded$A = ["id", "className", "type", "label", "placeholder", "error", "success", "disabled", "required", "clearable", "icon", "iconPosition", "onClear", "showCount", "maxLength", "readOnly", "onChange", "value", "defaultValue"];
-function ownKeys$F(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$F(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$F(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$F(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$G(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$G(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$G(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$G(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Input = /*#__PURE__*/forwardRef(function (props, forwardedRef) {
   var _ref$current$value2, _ref$current;
   var id = props.id,
@@ -3287,7 +3287,7 @@ var Input = /*#__PURE__*/forwardRef(function (props, forwardedRef) {
           className: "text-primary-400",
           children: icon
         })
-      }), jsx("input", _objectSpread$F({
+      }), jsx("input", _objectSpread$G({
         id: inputId,
         ref: ref,
         type: inputType,
@@ -3348,8 +3348,8 @@ var Input = /*#__PURE__*/forwardRef(function (props, forwardedRef) {
 });
 
 var _excluded$z = ["className", "variant", "size", "disabled", "loading", "children", "leftIcon", "rightIcon", "fullWidth"];
-function ownKeys$E(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$E(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$E(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$E(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$F(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$F(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$F(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$F(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Button = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var className = _ref.className,
     _ref$variant = _ref.variant,
@@ -3379,7 +3379,7 @@ var Button = /*#__PURE__*/forwardRef(function (_ref, ref) {
     // Full width
     'w-full': fullWidth
   }, className);
-  return jsxs("button", _objectSpread$E(_objectSpread$E({
+  return jsxs("button", _objectSpread$F(_objectSpread$F({
     ref: ref,
     className: baseClasses,
     disabled: disabled || loading
@@ -3414,8 +3414,8 @@ function _toConsumableArray$1(r) {
 }
 
 var _excluded$y = ["options", "value", "onChange", "placeholder", "label", "error", "disabled", "required", "multiSelect", "searchable", "grouped", "onMenuItemRender", "className", "allowClear", "creatable", "onCreateOption", "onSearch", "loading", "selectAllOption", "closeOnSelect", "maxTagCount", "renderGroupLabel", "name"];
-function ownKeys$D(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$D(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$D(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$D(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$E(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$E(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$E(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$E(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
  * Enhanced Select component (debounce removed)
  * - Supports single and multi select
@@ -3436,7 +3436,7 @@ var flattenGroups = function flattenGroups() {
   return groups.reduce(function (acc, g) {
     var groupLabel = g.label;
     g.options.forEach(function (opt) {
-      return acc.push(_objectSpread$D(_objectSpread$D({}, opt), {}, {
+      return acc.push(_objectSpread$E(_objectSpread$E({}, opt), {}, {
         _group: groupLabel
       }));
     });
@@ -3532,7 +3532,7 @@ var Select = /*#__PURE__*/React__default.forwardRef(function (_ref, forwardedRef
   var flatOptions = useMemo(function () {
     if (grouped) return flattenGroups(options);
     return options.map(function (opt) {
-      return _objectSpread$D({}, opt);
+      return _objectSpread$E({}, opt);
     });
   }, [options, grouped]);
   var selectedValues = multiSelect ? Array.isArray(value) ? value : [] : value;
@@ -3557,7 +3557,7 @@ var Select = /*#__PURE__*/React__default.forwardRef(function (_ref, forwardedRef
     }
     if (grouped) {
       return options.map(function (g) {
-        return _objectSpread$D(_objectSpread$D({}, g), {}, {
+        return _objectSpread$E(_objectSpread$E({}, g), {}, {
           options: g.options.filter(function (o) {
             return o.label.toLowerCase().includes(searchTerm.toLowerCase());
           })
@@ -3827,7 +3827,7 @@ var Select = /*#__PURE__*/React__default.forwardRef(function (_ref, forwardedRef
               className: "text-xs border border-slate-200 p-0.5 rounded-md cursor-pointer hover:bg-gray-100",
               onClick: function onClick() {
                 return setCollapsedGroups(function (prev) {
-                  return _objectSpread$D(_objectSpread$D({}, prev), {}, _defineProperty$4({}, group.label, !prev[group.label]));
+                  return _objectSpread$E(_objectSpread$E({}, prev), {}, _defineProperty$4({}, group.label, !prev[group.label]));
                 });
               },
               children: jsx(ChevronDown, {
@@ -3921,7 +3921,7 @@ var Select = /*#__PURE__*/React__default.forwardRef(function (_ref, forwardedRef
     }), jsxs("div", {
       ref: selectRef,
       className: "relative",
-      children: [jsxs("button", _objectSpread$D(_objectSpread$D({
+      children: [jsxs("button", _objectSpread$E(_objectSpread$E({
         type: "button",
         "aria-haspopup": "listbox",
         "aria-expanded": isOpen,
@@ -3988,7 +3988,7 @@ var Select = /*#__PURE__*/React__default.forwardRef(function (_ref, forwardedRef
         // escapes any ancestor overflow:hidden|auto|scroll. Coordinates
         // are anchored to the trigger's viewport rect; width matches the
         // trigger; maxHeight is driven by available space.
-        style: _objectSpread$D({
+        style: _objectSpread$E({
           left: menuCoords ? "".concat(menuCoords.left, "px") : undefined,
           top: menuCoords ? "".concat(menuCoords.top, "px") : undefined,
           width: menuCoords ? "".concat(menuCoords.width, "px") : undefined
@@ -4470,8 +4470,8 @@ var DEFAULT_ACTIONS = [{
   })
 }];
 
-function ownKeys$C(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$C(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$C(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$C(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$D(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$D(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$D(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$D(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper$1(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$1(r)) || e) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: true } : { done: false, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = true, u = false; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = true, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$1(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$1(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$1(r, a) : void 0; } }
 function _arrayLikeToArray$1(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -4535,7 +4535,7 @@ var mergeDefaultActions = function mergeDefaultActions(overrides, defaults) {
     _iterator.f();
   }
   var merged = defaults.map(function (d) {
-    return d !== null && d !== void 0 && d.name && byName.has(d.name) ? _objectSpread$C(_objectSpread$C({}, d), byName.get(d.name)) : d;
+    return d !== null && d !== void 0 && d.name && byName.has(d.name) ? _objectSpread$D(_objectSpread$D({}, d), byName.get(d.name)) : d;
   });
   var defaultNames = new Set(defaults.map(function (d) {
     return d === null || d === void 0 ? void 0 : d.name;
@@ -4577,7 +4577,7 @@ var resolveActions = function resolveActions(actions, row, index) {
       var action = _step2.value;
       if (!action || _typeof$4(action) !== "object") continue;
       if (callIfFn(action.hidden, row, index)) continue;
-      var resolved = _objectSpread$C(_objectSpread$C({}, action), {}, {
+      var resolved = _objectSpread$D(_objectSpread$D({}, action), {}, {
         label: callIfFn(action.label, row, index),
         icon: callIfFn(action.icon, row, index),
         disabled: !!callIfFn(action.disabled, row, index),
@@ -5114,6 +5114,8 @@ function ActionMenu(_ref) {
   }), document.body);
 }
 
+function ownKeys$C(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$C(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$C(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$C(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
  * Desktop table row component
  */
@@ -5162,6 +5164,8 @@ function TableRow(_ref) {
     renderInteractiveCellInput = _ref$renderInteractiv === void 0 ? null : _ref$renderInteractiv,
     _ref$invalidCellSet = _ref.invalidCellSet,
     invalidCellSet = _ref$invalidCellSet === void 0 ? null : _ref$invalidCellSet,
+    _ref$pendingEdits = _ref.pendingEdits,
+    pendingEdits = _ref$pendingEdits === void 0 ? null : _ref$pendingEdits,
     _ref$isNewRow = _ref.isNewRow,
     isNewRow = _ref$isNewRow === void 0 ? false : _ref$isNewRow,
     _ref$onDeleteNewRow = _ref.onDeleteNewRow,
@@ -5189,6 +5193,10 @@ function TableRow(_ref) {
   var stripeBg = stripedRows && !isSelected && Array.isArray(stripeColors) && stripeColors.length > 0 ? stripeColors[globalIndex % stripeColors.length] : undefined;
   var rowKey = isNewRow ? row._key : key;
   var isRowActive = interactive && (activeCell === null || activeCell === void 0 ? void 0 : activeCell.rowKey) === rowKey;
+  var effectiveRow = React__default.useMemo(function () {
+    if (!interactive || !pendingEdits || !pendingEdits[rowKey]) return row;
+    return _objectSpread$C(_objectSpread$C({}, row), pendingEdits[rowKey]);
+  }, [interactive, pendingEdits, rowKey, row]);
   return jsxs(React__default.Fragment, {
     children: [jsxs("tr", {
       style: stripeBg ? {
@@ -5201,7 +5209,7 @@ function TableRow(_ref) {
         "bg-amber-50/40": isNewRow && !isSelected && !isRowActive
       }, safeExtraRowClass),
       onClick: function onClick() {
-        return onRowClick === null || onRowClick === void 0 ? void 0 : onRowClick(row, globalIndex);
+        return onRowClick === null || onRowClick === void 0 ? void 0 : onRowClick(effectiveRow, globalIndex);
       },
       children: [hasDetailsColumn && jsx("td", {
         className: "px-4 py-4 text-sm",
@@ -5209,7 +5217,7 @@ function TableRow(_ref) {
           type: "button",
           onClick: function onClick(e) {
             e.stopPropagation();
-            toggleExpandRow(row, rowIndexInPage);
+            toggleExpandRow(effectiveRow, rowIndexInPage);
           },
           "aria-expanded": isExpanded,
           "aria-label": isExpanded ? "Collapse row details" : "Expand row details",
@@ -5229,12 +5237,12 @@ function TableRow(_ref) {
           className: "rounded border-gray-300",
           checked: isSelected,
           onChange: function onChange() {
-            return handleSelectRow(row, rowIndexInPage);
+            return handleSelectRow(effectiveRow, rowIndexInPage);
           }
         })
       }), visibleColumns.map(function (column, columnIndex) {
         var extraCellClass = typeof cellClass === "function" ? cellClass({
-          row: row,
+          row: effectiveRow,
           rowIndex: globalIndex,
           column: column,
           columnIndex: columnIndex
@@ -5253,15 +5261,15 @@ function TableRow(_ref) {
           }, safeExtraCellClass),
           onClick: function onClick(e) {
             if (interactive && onCellClick) {
-              onCellClick(rowKey, column.key, row, column, globalIndex);
+              onCellClick(rowKey, column.key, effectiveRow, column, globalIndex);
             }
           },
           onDoubleClick: function onDoubleClick(e) {
             if (interactive && onCellDoubleClick && column.editable !== false) {
-              onCellDoubleClick(rowKey, column.key, row, column, globalIndex);
+              onCellDoubleClick(rowKey, column.key, effectiveRow, column, globalIndex);
             }
           },
-          children: isCellEditing && renderInteractiveCellInput ? renderInteractiveCellInput(column, row, globalIndex, rowKey) : renderCell(column, row, globalIndex)
+          children: isCellEditing && renderInteractiveCellInput ? renderInteractiveCellInput(column, effectiveRow, globalIndex, rowKey) : renderCell(column, effectiveRow, globalIndex)
         }, column.key);
       }), jsx("td", {
         className: "px-4 py-4"
@@ -5532,6 +5540,7 @@ function FieldInput(_ref) {
   var column = _ref.column,
     value = _ref.value,
     _onChange = _ref.onChange,
+    onKeyDown = _ref.onKeyDown,
     _ref$isEditing = _ref.isEditing,
     isEditing = _ref$isEditing === void 0 ? true : _ref$isEditing,
     _ref$row = _ref.row,
@@ -5544,14 +5553,22 @@ function FieldInput(_ref) {
     autoFocus = _ref$autoFocus === void 0 ? false : _ref$autoFocus;
   var currentValue = value !== null && value !== void 0 ? value : "";
   var inputType = column.type || column.inputType || "text";
+  var stopProp = function stopProp(e) {
+    e.stopPropagation();
+  };
   // Check if custom onRender renderer is provided on the column definition
   if (typeof column.onRender === "function") {
-    return column.onRender(row, rowIndex, column, {
-      value: currentValue,
-      onChange: function onChange(newVal) {
-        return _onChange === null || _onChange === void 0 ? void 0 : _onChange(newVal);
-      },
-      isEditing: isEditing
+    return jsx("div", {
+      onClick: stopProp,
+      onMouseDown: stopProp,
+      children: column.onRender(row, rowIndex, column, {
+        value: currentValue,
+        onChange: function onChange(newVal) {
+          return _onChange === null || _onChange === void 0 ? void 0 : _onChange(newVal);
+        },
+        onKeyDown: onKeyDown,
+        isEditing: isEditing
+      })
     });
   }
   // Textarea / Longtext
@@ -5563,6 +5580,9 @@ function FieldInput(_ref) {
       onChange: function onChange(e) {
         return _onChange === null || _onChange === void 0 ? void 0 : _onChange(e.target.value);
       },
+      onKeyDown: onKeyDown,
+      onClick: stopProp,
+      onMouseDown: stopProp,
       placeholder: "Enter ".concat(column.label || column.key, "..."),
       className: cn$1("w-full px-2 py-1 text-sm border rounded outline-none transition-all focus:ring-2 focus:ring-primary-500 bg-white resize-y min-h-[2.5rem]", className)
     });
@@ -5581,6 +5601,9 @@ function FieldInput(_ref) {
       onChange: function onChange(e) {
         return _onChange === null || _onChange === void 0 ? void 0 : _onChange(e.target.value);
       },
+      onKeyDown: onKeyDown,
+      onClick: stopProp,
+      onMouseDown: stopProp,
       className: cn$1("w-full px-2 py-1 text-sm border rounded outline-none focus:ring-2 focus:ring-primary-500 bg-white", className),
       children: [jsxs("option", {
         value: "",
@@ -5598,6 +5621,8 @@ function FieldInput(_ref) {
     var checked = Boolean(currentValue);
     return jsx("div", {
       className: cn$1("flex items-center justify-center py-1", className),
+      onClick: stopProp,
+      onMouseDown: stopProp,
       children: jsx("input", {
         type: "checkbox",
         autoFocus: autoFocus,
@@ -5605,6 +5630,7 @@ function FieldInput(_ref) {
         onChange: function onChange(e) {
           return _onChange === null || _onChange === void 0 ? void 0 : _onChange(e.target.checked);
         },
+        onKeyDown: onKeyDown,
         className: "w-4 h-4 text-primary-600 border-gray-300 rounded focus:ring-primary-500 cursor-pointer"
       })
     });
@@ -5618,6 +5644,9 @@ function FieldInput(_ref) {
       onChange: function onChange(e) {
         return _onChange === null || _onChange === void 0 ? void 0 : _onChange(e.target.value);
       },
+      onKeyDown: onKeyDown,
+      onClick: stopProp,
+      onMouseDown: stopProp,
       className: cn$1("w-full px-2 py-1 text-sm border rounded outline-none focus:ring-2 focus:ring-primary-500 bg-white", className)
     });
   }
@@ -5630,6 +5659,9 @@ function FieldInput(_ref) {
       onChange: function onChange(e) {
         return _onChange === null || _onChange === void 0 ? void 0 : _onChange(e.target.value === "" ? "" : Number(e.target.value));
       },
+      onKeyDown: onKeyDown,
+      onClick: stopProp,
+      onMouseDown: stopProp,
       placeholder: "Enter ".concat(column.label || column.key, "..."),
       className: cn$1("w-full px-2 py-1 text-sm border rounded outline-none focus:ring-2 focus:ring-primary-500 bg-white", className)
     });
@@ -5642,12 +5674,15 @@ function FieldInput(_ref) {
     onChange: function onChange(e) {
       return _onChange === null || _onChange === void 0 ? void 0 : _onChange(e.target.value);
     },
+    onKeyDown: onKeyDown,
+    onClick: stopProp,
+    onMouseDown: stopProp,
     placeholder: "Enter ".concat(column.label || column.key, "..."),
     className: cn$1("w-full px-2 py-1 text-sm border rounded outline-none focus:ring-2 focus:ring-primary-500 bg-white", className)
   });
 }
 
-var _excluded$x = ["data", "columns", "sortable", "filterable", "selectable", "pagination", "pageSize", "onSort", "onFilter", "onFetch", "onFilterChange", "onSelectionChange", "onRowClick", "hasDetails", "DetailsComponent", "className", "withAction", "onAction", "actions", "replaceDefaultActions", "showSerial", "cellClass", "rowClass", "globalSearch", "limitOptions", "showLimitSelector", "onLimitChange", "showReloadButton", "renderReloadButton", "onReload", "stripedRows", "theme", "responsiveBreakpoint", "serverSide", "totalRecords", "pageNumber", "onPageChange", "TheadComponent", "TfootComponent", "interactive", "onSave", "onRowAdd", "onRowDelete"],
+var _excluded$x = ["data", "columns", "sortable", "filterable", "selectable", "pagination", "pageSize", "onSort", "onFilter", "onFetch", "onFilterChange", "onSelectionChange", "onRowClick", "hasDetails", "DetailsComponent", "className", "withAction", "onAction", "actions", "replaceDefaultActions", "showSerial", "cellClass", "rowClass", "globalSearch", "limitOptions", "showLimitSelector", "onLimitChange", "showReloadButton", "renderReloadButton", "onReload", "stripedRows", "theme", "responsiveBreakpoint", "serverSide", "totalRecords", "pageNumber", "onPageChange", "TheadComponent", "TfootComponent", "interactive", "onSave", "onEdit", "onRowAdd", "onRowDelete"],
   _excluded2$4 = ["_key", "_isNew"];
 function ownKeys$B(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$B(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$B(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$B(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -5727,6 +5762,7 @@ var Table = function Table(_ref) {
     _ref$interactive = _ref.interactive,
     interactive = _ref$interactive === void 0 ? false : _ref$interactive,
     onSave = _ref.onSave,
+    onEdit = _ref.onEdit,
     onRowAdd = _ref.onRowAdd,
     onRowDelete = _ref.onRowDelete,
     props = _objectWithoutProperties$1(_ref, _excluded$x);
@@ -5979,15 +6015,33 @@ var Table = function Table(_ref) {
       setNewRows(function (prev) {
         var next = _toConsumableArray$1(prev);
         next[newRowIdx] = _objectSpread$B(_objectSpread$B({}, next[newRowIdx]), {}, _defineProperty$4({}, colKey, newValue));
+        onEdit === null || onEdit === void 0 || onEdit({
+          rowKey: rowKey,
+          colKey: colKey,
+          newValue: newValue,
+          row: next[newRowIdx],
+          isNew: true
+        });
         return next;
       });
       return;
     }
     setPendingEdits(function (prev) {
       var nextRowEdits = _objectSpread$B(_objectSpread$B({}, prev[rowKey] || {}), {}, _defineProperty$4({}, colKey, newValue));
+      var origRow = tableData.find(function (r, i) {
+        return getRowKey(r, i) === rowKey;
+      });
+      var updatedRow = _objectSpread$B(_objectSpread$B({}, origRow), nextRowEdits);
+      onEdit === null || onEdit === void 0 || onEdit({
+        rowKey: rowKey,
+        colKey: colKey,
+        newValue: newValue,
+        row: updatedRow,
+        isNew: false
+      });
       return _objectSpread$B(_objectSpread$B({}, prev), {}, _defineProperty$4({}, rowKey, nextRowEdits));
     });
-  }, [newRows]);
+  }, [newRows, tableData, onEdit]);
   var handleAddRow = useCallback(function () {
     var _columnsState$find, _columnsState$;
     var newKey = "new-".concat(Date.now());
@@ -6035,7 +6089,7 @@ var Table = function Table(_ref) {
     onRowDelete === null || onRowDelete === void 0 || onRowDelete(rowKey);
   }, [activeCell, onRowDelete]);
   var handleSave = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var updatedTableData, finalNewRows, finalData, _t;
+    var _customSaveResult, _customSaveResult2, updatedTableData, finalNewRows, finalData, customSaveResult, nextData, _t;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -6062,43 +6116,59 @@ var Table = function Table(_ref) {
           });
           finalData = [].concat(_toConsumableArray$1(updatedTableData), _toConsumableArray$1(finalNewRows));
           if (!onSave) {
-            _context.next = 3;
+            _context.next = 4;
             break;
           }
           _context.next = 3;
           return onSave({
             updatedRows: dirtyEdits,
             newRows: finalNewRows,
-            allData: finalData
+            allData: finalData,
+            tableData: updatedTableData
           });
         case 3:
-          setTableData(finalData);
+          customSaveResult = _context.sent;
+        case 4:
+          nextData = Array.isArray(customSaveResult) ? customSaveResult : ((_customSaveResult = customSaveResult) === null || _customSaveResult === void 0 ? void 0 : _customSaveResult.data) || ((_customSaveResult2 = customSaveResult) === null || _customSaveResult2 === void 0 ? void 0 : _customSaveResult2.allData) || finalData;
+          setTableData(nextData);
+          initialDataRef.current = nextData;
           setPendingEdits({});
           setNewRows([]);
           setEditingCell(null);
-          _context.next = 5;
+          _context.next = 6;
           break;
-        case 4:
-          _context.prev = 4;
-          _t = _context["catch"](2);
-          console.error("Save error:", _t);
         case 5:
           _context.prev = 5;
-          setIsSaving(false);
-          return _context.finish(5);
+          _t = _context["catch"](2);
+          console.error("Save error:", _t);
         case 6:
+          _context.prev = 6;
+          setIsSaving(false);
+          return _context.finish(6);
+        case 7:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 4, 5, 6]]);
+    }, _callee, null, [[2, 5, 6, 7]]);
   })), [isDirty, isSaving, tableData, dirtyEdits, newRows, onSave]);
+  var handleClearChanges = useCallback(function () {
+    setPendingEdits({});
+    setNewRows([]);
+    setEditingCell(null);
+    setActiveCell(null);
+  }, []);
   var handleCellClick = useCallback(function (rowKey, colKey, row, column, globalIndex) {
     setActiveCell({
       rowKey: rowKey,
       colKey: colKey,
       rowIndex: globalIndex
     });
-    setEditingCell(null);
+    setEditingCell(function (prev) {
+      if (prev && prev.rowKey === rowKey && prev.colKey === colKey) {
+        return prev;
+      }
+      return null;
+    });
   }, []);
   var handleCellDoubleClick = useCallback(function (rowKey, colKey, row, column, globalIndex) {
     setActiveCell({
@@ -6114,21 +6184,6 @@ var Table = function Table(_ref) {
       });
     }
   }, []);
-  var renderInteractiveCellInput = useCallback(function (column, row, globalIndex, rowKey) {
-    var _row$column$key;
-    var value = pendingEdits[rowKey] && pendingEdits[rowKey][column.key] !== undefined ? pendingEdits[rowKey][column.key] : (_row$column$key = row[column.key]) !== null && _row$column$key !== void 0 ? _row$column$key : "";
-    return jsx(FieldInput, {
-      column: column,
-      value: value,
-      onChange: function onChange(newVal) {
-        return handleCellValueChange(rowKey, column.key, newVal);
-      },
-      isEditing: true,
-      row: row,
-      rowIndex: globalIndex,
-      autoFocus: (editingCell === null || editingCell === void 0 ? void 0 : editingCell.rowKey) === rowKey && (editingCell === null || editingCell === void 0 ? void 0 : editingCell.colKey) === column.key
-    });
-  }, [pendingEdits, handleCellValueChange, editingCell]);
   useClickOutside([tableContainerRef], interactive && Boolean(editingCell), function () {
     setEditingCell(null);
   });
@@ -6279,6 +6334,129 @@ var Table = function Table(_ref) {
       };
     });
   }, [limitOptions]);
+  var handleTableKeyDown = useCallback(function (e) {
+    if (!interactive) return;
+    var key = e.key,
+      shiftKey = e.shiftKey;
+    // Escape: stop editing
+    if (key === "Escape") {
+      if (editingCell) {
+        e.preventDefault();
+        setEditingCell(null);
+      }
+      return;
+    }
+    // Enter: Save changes only when there are modified changes (isDirty)
+    if (key === "Enter") {
+      var _e$target;
+      if (((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.tagName) === "TEXTAREA" && shiftKey) {
+        return;
+      }
+      if (isDirty) {
+        e.preventDefault();
+        setEditingCell(null);
+        if (isValid && !isSaving) {
+          handleSave();
+        }
+      }
+      return;
+    }
+    var currentCell = activeCell || editingCell;
+    if (!currentCell) return;
+    var allRows = [].concat(_toConsumableArray$1(paginatedData), _toConsumableArray$1(newRows));
+    if (allRows.length === 0 || visibleColumns.length === 0) return;
+    var rIdx = allRows.findIndex(function (r, idx) {
+      var rKey = r._key || getRowKey(r, startIndex + idx);
+      return rKey === currentCell.rowKey;
+    });
+    var cIdx = visibleColumns.findIndex(function (c) {
+      return c.key === currentCell.colKey;
+    });
+    if (rIdx === -1 || cIdx === -1) return;
+    var nextRIdx = rIdx;
+    var nextCIdx = cIdx;
+    if (key === "Tab") {
+      e.preventDefault();
+      if (shiftKey) {
+        if (cIdx > 0) {
+          nextCIdx = cIdx - 1;
+        } else if (rIdx > 0) {
+          nextRIdx = rIdx - 1;
+          nextCIdx = visibleColumns.length - 1;
+        }
+      } else {
+        if (cIdx < visibleColumns.length - 1) {
+          nextCIdx = cIdx + 1;
+        } else if (rIdx < allRows.length - 1) {
+          nextRIdx = rIdx + 1;
+          nextCIdx = 0;
+        }
+      }
+    } else if (key === "ArrowRight") {
+      var _e$target2, _e$target$value;
+      if (editingCell && ((_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.selectionStart) !== undefined && e.target.selectionStart < String((_e$target$value = e.target.value) !== null && _e$target$value !== void 0 ? _e$target$value : "").length) {
+        return;
+      }
+      if (cIdx < visibleColumns.length - 1) {
+        e.preventDefault();
+        nextCIdx = cIdx + 1;
+      }
+    } else if (key === "ArrowLeft") {
+      var _e$target3;
+      if (editingCell && ((_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.selectionStart) !== undefined && e.target.selectionStart > 0) {
+        return;
+      }
+      if (cIdx > 0) {
+        e.preventDefault();
+        nextCIdx = cIdx - 1;
+      }
+    } else if (key === "ArrowDown") {
+      var _e$target4;
+      if (((_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : _e$target4.tagName) === "SELECT") return;
+      if (rIdx < allRows.length - 1) {
+        e.preventDefault();
+        nextRIdx = rIdx + 1;
+      }
+    } else if (key === "ArrowUp") {
+      var _e$target5;
+      if (((_e$target5 = e.target) === null || _e$target5 === void 0 ? void 0 : _e$target5.tagName) === "SELECT") return;
+      if (rIdx > 0) {
+        e.preventDefault();
+        nextRIdx = rIdx - 1;
+      }
+    } else {
+      return;
+    }
+    var targetRow = allRows[nextRIdx];
+    var targetCol = visibleColumns[nextCIdx];
+    if (!targetRow || !targetCol) return;
+    var targetRowKey = targetRow._key || getRowKey(targetRow, startIndex + nextRIdx);
+    var nextCellObj = {
+      rowKey: targetRowKey,
+      colKey: targetCol.key,
+      rowIndex: startIndex + nextRIdx
+    };
+    setActiveCell(nextCellObj);
+    if (editingCell && targetCol.editable !== false) {
+      setEditingCell(nextCellObj);
+    }
+  }, [interactive, editingCell, activeCell, isDirty, isValid, isSaving, handleSave, paginatedData, newRows, visibleColumns, startIndex]);
+  var renderInteractiveCellInput = useCallback(function (column, row, globalIndex, rowKey) {
+    var _row$column$key;
+    var value = pendingEdits[rowKey] && pendingEdits[rowKey][column.key] !== undefined ? pendingEdits[rowKey][column.key] : (_row$column$key = row[column.key]) !== null && _row$column$key !== void 0 ? _row$column$key : "";
+    return jsx(FieldInput, {
+      column: column,
+      value: value,
+      onChange: function onChange(newVal) {
+        return handleCellValueChange(rowKey, column.key, newVal);
+      },
+      onKeyDown: handleTableKeyDown,
+      isEditing: true,
+      row: row,
+      rowIndex: globalIndex,
+      autoFocus: (editingCell === null || editingCell === void 0 ? void 0 : editingCell.rowKey) === rowKey && (editingCell === null || editingCell === void 0 ? void 0 : editingCell.colKey) === column.key
+    });
+  }, [pendingEdits, handleCellValueChange, handleTableKeyDown, editingCell]);
   // Callbacks
   var toggleColumnVisibility = useCallback(function (key) {
     setColumnsState(function (prev) {
@@ -6383,12 +6561,40 @@ var Table = function Table(_ref) {
       action: action,
       row: row
     });
+    if ((action === null || action === void 0 ? void 0 : action.name) === "edit" || (action === null || action === void 0 ? void 0 : action.name) === "Edit") {
+      if (interactive) {
+        var _columnsState$find2, _columnsState$2;
+        var firstColKey = ((_columnsState$find2 = columnsState.find(function (c) {
+          return c.isVisible !== false && c.editable !== false;
+        })) === null || _columnsState$find2 === void 0 ? void 0 : _columnsState$find2.key) || ((_columnsState$2 = columnsState[0]) === null || _columnsState$2 === void 0 ? void 0 : _columnsState$2.key);
+        var globalIndex = tableData.findIndex(function (r, i) {
+          return getRowKey(r, i) === getRowKey(row);
+        });
+        if (firstColKey && globalIndex !== -1) {
+          var rKey = getRowKey(row, globalIndex);
+          setActiveCell({
+            rowKey: rKey,
+            colKey: firstColKey,
+            rowIndex: globalIndex
+          });
+          setEditingCell({
+            rowKey: rKey,
+            colKey: firstColKey,
+            rowIndex: globalIndex
+          });
+        }
+      }
+      onEdit === null || onEdit === void 0 || onEdit({
+        action: action,
+        row: row
+      });
+    }
     onAction === null || onAction === void 0 || onAction({
       action: action,
       row: row
     });
     setActiveActionRowKey(null);
-  }, [onAction]);
+  }, [onAction, onEdit, interactive, columnsState, tableData]);
   var handleLimitChange = useCallback(function (nextLimit) {
     var parsed = Number(nextLimit);
     if (!Number.isFinite(parsed) || parsed <= 0) return;
@@ -6473,11 +6679,14 @@ var Table = function Table(_ref) {
     onCellClick: handleCellClick,
     onCellDoubleClick: handleCellDoubleClick,
     renderInteractiveCellInput: renderInteractiveCellInput,
-    invalidCellSet: invalidCellSet
+    invalidCellSet: invalidCellSet,
+    pendingEdits: pendingEdits
   };
   return jsxs("div", {
     ref: tableContainerRef,
-    className: cn$1("w-full border rounded-lg md:rounded-md", className),
+    tabIndex: interactive ? 0 : undefined,
+    onKeyDown: handleTableKeyDown,
+    className: cn$1("w-full border rounded-lg md:rounded-md outline-none focus:ring-1 focus:ring-primary-400", className),
     children: [TheadComponent && typeof TheadComponent === "function" ? jsx(TheadComponent, {
       columns: columnsState,
       data: filteredData
@@ -6524,15 +6733,26 @@ var Table = function Table(_ref) {
             onClick: handleSave,
             disabled: !isValid || isSaving,
             title: !isValid ? "Cannot save: ".concat(((_validationErrors$ = validationErrors[0]) === null || _validationErrors$ === void 0 ? void 0 : _validationErrors$.message) || "Validation failed") : "Save changes",
-            className: cn$1("px-4 py-2 font-medium rounded-lg text-sm flex items-center gap-2 transition-all shadow-sm", isValid ? "bg-success-600 hover:bg-success-700 active:bg-success-800 text-white cursor-pointer" : "bg-gray-200 text-gray-400 border border-gray-300 cursor-not-allowed opacity-75"),
+            className: cn$1("px-4 py-2 font-medium rounded-lg text-sm flex items-center gap-2 transition-all shadow-sm", isValid ? "bg-primary-600 hover:bg-primary-700 active:bg-primary-800 text-white cursor-pointer" : "bg-gray-200 text-gray-400 border border-gray-300 cursor-not-allowed opacity-75"),
             children: [jsx(Save, {
               className: "w-4 h-4"
             }), jsx("span", {
               children: isSaving ? "Saving..." : "Save Changes"
             }), pendingCount > 0 && jsx("span", {
-              className: cn$1("ml-1 px-2 py-0.5 text-xs rounded-full font-bold", isValid ? "bg-success-700 text-white" : "bg-gray-300 text-gray-600"),
+              className: cn$1("ml-1 px-2 py-0.5 text-xs rounded-full font-bold", isValid ? "bg-primary-700 text-white" : "bg-gray-300 text-gray-600"),
               children: pendingCount
             })]
+          }), jsxs("button", {
+            type: "button",
+            onClick: handleClearChanges,
+            disabled: isSaving,
+            title: "Discard all pending modifications",
+            className: "px-4 py-2 font-medium rounded-lg text-sm flex items-center gap-2 transition-all border border-primary-300 text-primary-700 bg-white hover:bg-primary-50 active:bg-primary-100 cursor-pointer shadow-sm disabled:opacity-50",
+            children: [jsx(X, {
+              className: "w-4 h-4 text-primary-600"
+            }), jsx("span", {
+              children: "Clear Changes"
+            })]
           }), !isValid && validationErrors.length > 0 && jsxs("div", {
             className: "flex items-center gap-1.5 px-3 py-1.5 bg-warning-50 border border-warning-200 text-warning-800 rounded-md text-xs font-medium",
             children: [jsx(AlertCircle, {
@@ -6758,9 +6978,9 @@ var Table = function Table(_ref) {
             className: "bg-primary-50/40 hover:bg-primary-100/70 active:bg-primary-100 transition-colors border-t-2 border-dashed border-primary-300 cursor-pointer group",
             children: jsx("td", {
               colSpan: visibleCount,
-              className: "px-6 py-3.5 text-center text-sm font-semibold text-primary-700 group-hover:text-primary-800",
+              className: "px-6 py-3.5 text-left text-sm font-semibold text-primary-700 group-hover:text-primary-800",
               children: jsxs("div", {
-                className: "flex items-center justify-center gap-2",
+                className: "flex items-center justify-start gap-2",
                 children: [jsx(Plus, {
                   className: "w-4 h-4 text-primary-600 group-hover:scale-110 transition-transform"
                 }), jsx("span", {
@@ -12585,7 +12805,7 @@ var DatePicker = /*#__PURE__*/React__default.forwardRef(function (_ref, forwarde
   });
 });
 
-var _excluded$v = ["id", "name", "checked", "defaultChecked", "onChange", "disabled", "size", "trackClass", "thumbClass", "className", "topLabel", "bottomLabel", "rightLabel", "leftLabel", "ariaLabel"];
+var _excluded$v = ["id", "name", "checked", "defaultChecked", "onChange", "disabled", "size", "color", "trackClass", "thumbClass", "className", "topLabel", "bottomLabel", "rightLabel", "leftLabel", "ariaLabel"];
 function ownKeys$z(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$z(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$z(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$z(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -12617,6 +12837,52 @@ var SIZE_MAP$2 = {
     knobTranslate: "translate-x-6"
   }
 };
+var COLOR_PRESETS$1 = {
+  primary: {
+    bg: "bg-primary-600",
+    ring: "focus-visible:ring-primary-300"
+  },
+  secondary: {
+    bg: "bg-secondary-600",
+    ring: "focus-visible:ring-secondary-300"
+  },
+  success: {
+    bg: "bg-success-600",
+    ring: "focus-visible:ring-success-300"
+  },
+  green: {
+    bg: "bg-success-600",
+    ring: "focus-visible:ring-success-300"
+  },
+  error: {
+    bg: "bg-error-600",
+    ring: "focus-visible:ring-error-300"
+  },
+  danger: {
+    bg: "bg-error-600",
+    ring: "focus-visible:ring-error-300"
+  },
+  red: {
+    bg: "bg-error-600",
+    ring: "focus-visible:ring-error-300"
+  },
+  warning: {
+    bg: "bg-warning-600",
+    ring: "focus-visible:ring-warning-300"
+  },
+  blue: {
+    bg: "bg-blue-600",
+    ring: "focus-visible:ring-blue-300"
+  },
+  indigo: {
+    bg: "bg-indigo-600",
+    ring: "focus-visible:ring-indigo-300"
+  },
+  purple: {
+    bg: "bg-purple-600",
+    ring: "focus-visible:ring-purple-300"
+  }
+};
 var Switch = /*#__PURE__*/forwardRef(function Switch(props, ref) {
   var id = props.id,
     name = props.name,
@@ -12628,6 +12894,8 @@ var Switch = /*#__PURE__*/forwardRef(function Switch(props, ref) {
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     _props$size = props.size,
     size = _props$size === void 0 ? "md" : _props$size,
+    _props$color = props.color,
+    color = _props$color === void 0 ? "primary" : _props$color,
     trackClass = props.trackClass,
     thumbClass = props.thumbClass,
     _props$className = props.className,
@@ -12663,16 +12931,18 @@ var Switch = /*#__PURE__*/forwardRef(function Switch(props, ref) {
     }
   };
   var sizeStuff = SIZE_MAP$2[size] || SIZE_MAP$2.md;
+  var isPreset = COLOR_PRESETS$1[color];
   // Classes for the track (we use inline style for arbitrary trackClass when ON)
-  var trackClasses = cn$1("relative inline-flex items-center rounded-full transition-colors duration-200 ease-in-out", sizeStuff.track, isOn ? "" : "bg-gray-100", disabled ? "opacity-50 cursor-not-allowed" : "cursor-pointer", trackClass // Accepting trackClass as a class name
+  var trackClasses = cn$1("relative inline-flex items-center rounded-full transition-colors duration-200 ease-in-out", sizeStuff.track, isOn ? trackClass ? "" : isPreset ? isPreset.bg : "" : "bg-gray-100", disabled ? "opacity-50 cursor-not-allowed" : "cursor-pointer", trackClass // Accepting trackClass as a class name
   );
   // Knob classes (thumb)
   var knobBase = cn$1("inline-block rounded-full bg-white shadow transform ring-0 transition-transform duration-200 ease-in-out", sizeStuff.knob, thumbClass // Accepting thumbClass as a class name
   );
   var knobTransform = isOn ? sizeStuff.knobTranslate : "translate-x-1";
-  var focusClasses = disabled ? "" : "focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-sky-300";
-  var trackStyle = isOn && !trackClass ? {
-    backgroundColor: "rgb(14, 165, 233)"
+  var ringClass = isPreset ? isPreset.ring : "focus-visible:ring-primary-300";
+  var focusClasses = disabled ? "" : "focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 ".concat(ringClass);
+  var trackStyle = isOn && !trackClass && !isPreset ? {
+    backgroundColor: color
   } : undefined; // Fallback to default trackClass if trackClass is not a class
   var accessibleLabel = ariaLabel || rightLabel || leftLabel || topLabel || bottomLabel || "Toggle";
   var containerIsColumn = Boolean(topLabel || bottomLabel);
@@ -13387,7 +13657,7 @@ var Accordion = /*#__PURE__*/forwardRef(function Accordion(_ref, ref) {
 });
 Accordion.displayName = "Accordion";
 
-var _excluded$s = ["id", "name", "label", "checked", "defaultChecked", "onChange", "disabled", "required", "className", "size", "labelPosition", "value", "ariaLabel", "variant", "indeterminate", "borderColor", "iconClass", "checkedClass"];
+var _excluded$s = ["id", "name", "label", "checked", "defaultChecked", "onChange", "disabled", "required", "className", "size", "labelPosition", "value", "ariaLabel", "variant", "indeterminate", "borderColor", "color", "iconClass", "checkedClass"];
 function ownKeys$w(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$w(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$w(Object(t), true).forEach(function (r) { _defineProperty$4(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$w(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SIZE_CLASSES = {
@@ -13407,6 +13677,52 @@ var SIZE_CLASSES = {
     icon: "w-4 h-4"
   }
 };
+var COLOR_PRESETS = {
+  primary: {
+    checked: "peer-checked:bg-primary-600 peer-checked:border-primary-600 peer-checked:text-white",
+    ring: "peer-focus:ring-primary-300"
+  },
+  secondary: {
+    checked: "peer-checked:bg-secondary-600 peer-checked:border-secondary-600 peer-checked:text-white",
+    ring: "peer-focus:ring-secondary-300"
+  },
+  success: {
+    checked: "peer-checked:bg-success-600 peer-checked:border-success-600 peer-checked:text-white",
+    ring: "peer-focus:ring-success-300"
+  },
+  green: {
+    checked: "peer-checked:bg-success-600 peer-checked:border-success-600 peer-checked:text-white",
+    ring: "peer-focus:ring-success-300"
+  },
+  error: {
+    checked: "peer-checked:bg-error-600 peer-checked:border-error-600 peer-checked:text-white",
+    ring: "peer-focus:ring-error-300"
+  },
+  danger: {
+    checked: "peer-checked:bg-error-600 peer-checked:border-error-600 peer-checked:text-white",
+    ring: "peer-focus:ring-error-300"
+  },
+  red: {
+    checked: "peer-checked:bg-error-600 peer-checked:border-error-600 peer-checked:text-white",
+    ring: "peer-focus:ring-error-300"
+  },
+  warning: {
+    checked: "peer-checked:bg-warning-600 peer-checked:border-warning-600 peer-checked:text-white",
+    ring: "peer-focus:ring-warning-300"
+  },
+  blue: {
+    checked: "peer-checked:bg-blue-600 peer-checked:border-blue-600 peer-checked:text-white",
+    ring: "peer-focus:ring-blue-300"
+  },
+  indigo: {
+    checked: "peer-checked:bg-indigo-600 peer-checked:border-indigo-600 peer-checked:text-white",
+    ring: "peer-focus:ring-indigo-300"
+  },
+  purple: {
+    checked: "peer-checked:bg-purple-600 peer-checked:border-purple-600 peer-checked:text-white",
+    ring: "peer-focus:ring-purple-300"
+  }
+};
 var Checkbox = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _props$wrapperProps;
   var id = _ref.id,
@@ -13432,6 +13748,8 @@ var Checkbox = /*#__PURE__*/forwardRef(function (_ref, ref) {
     indeterminate = _ref$indeterminate === void 0 ? false : _ref$indeterminate,
     _ref$borderColor = _ref.borderColor,
     borderColor = _ref$borderColor === void 0 ? "#ccc" : _ref$borderColor,
+    _ref$color = _ref.color,
+    color = _ref$color === void 0 ? "primary" : _ref$color,
     iconClass = _ref.iconClass,
     checkedClass = _ref.checkedClass,
     props = _objectWithoutProperties$1(_ref, _excluded$s);
@@ -13465,6 +13783,13 @@ var Checkbox = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var iconBase = "pointer-events-none transform transition-all duration-150 ease-out";
   var iconShown = "opacity-100 scale-100";
   var iconHidden = "opacity-0 scale-75";
+  var isPreset = COLOR_PRESETS[color];
+  var colorClasses = isPreset ? "".concat(isPreset.checked, " peer-focus:ring-2 peer-focus:ring-offset-1 ").concat(isPreset.ring) : "peer-focus:ring-2 peer-focus:ring-offset-1 peer-focus:ring-primary-300";
+  var customColorStyle = currentChecked && !isPreset && !checkedClass ? {
+    backgroundColor: color,
+    borderColor: color,
+    color: "#ffffff"
+  } : {};
   return jsxs("div", _objectSpread$w(_objectSpread$w({
     className: wrapperCls
   }, (_props$wrapperProps = props === null || props === void 0 ? void 0 : props.wrapperProps) !== null && _props$wrapperProps !== void 0 ? _props$wrapperProps : {}), {}, {
@@ -13475,7 +13800,7 @@ var Checkbox = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }), jsxs("div", {
       className: boxOuterCls,
       style: disabled ? {} : {
-        borderColor: borderColor
+        borderColor: currentChecked && (isPreset || customColorStyle.borderColor) ? undefined : borderColor
       },
       "aria-disabled": disabled,
       children: [jsx("input", _objectSpread$w({
@@ -13494,11 +13819,11 @@ var Checkbox = /*#__PURE__*/forwardRef(function (_ref, ref) {
         "aria-label": ariaLabel,
         "aria-checked": Boolean(currentChecked)
       }, props)), jsx("div", {
-        className: "pointer-events-none z-0 flex items-center justify-center rounded-sm w-full h-full transition-colors duration-150 ease-in-out " + "peer-checked:bg-green-600 peer-checked:border-green-600 peer-checked:text-white " + "peer-focus:ring-2 peer-focus:ring-offset-1 peer-focus:ring-green-300 " + "".concat(disabled ? "bg-gray-100 border-gray-400 text-primary-400" : "bg-white border-gray-500", " ").concat(checkedClass ? checkedClass : ""),
+        className: "pointer-events-none z-0 flex items-center justify-center rounded-sm w-full h-full transition-colors duration-150 ease-in-out " + "".concat(colorClasses, " ") + "".concat(disabled ? "bg-gray-100 border-gray-400 text-primary-400" : "bg-white border-gray-500", " ").concat(checkedClass ? checkedClass : ""),
         style: currentChecked && checkedClass ? {
           backgroundColor: "",
           borderColor: ""
-        } : {},
+        } : customColorStyle,
         "aria-hidden": "true",
         children: jsx(Check, {
           className: "".concat(sizeClass.icon, " ").concat(iconBase, " ").concat(currentChecked ? iconShown : iconHidden, " ").concat(iconClass || ""),