@react-querybuilder/antd 8.1.0 → 8.2.0

package/dist/react-querybuilder_antd.mjs

@@ -87,7 +87,7 @@ var require_warning = __commonJS({
 });
 
 // src/index.tsx
-import { jsx as jsx8 } from "react/jsx-runtime";
+import { jsx as jsx7 } from "react/jsx-runtime";
 import { CloseOutlined, CopyOutlined, DownOutlined, LockOutlined, UnlockOutlined, UpOutlined } from "@ant-design/icons";
 import { getCompatContextProvider } from "react-querybuilder";
 
@@ -145,8 +145,8 @@ function _objectWithoutProperties(e, t) {
   if (null == e) return {};
   var o, r, i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
-    var s = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var n = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -154,7 +154,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.includes(n)) continue;
+    if (-1 !== e.indexOf(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -221,8 +221,8 @@ function _objectWithoutProperties2(e, t) {
   if (null == e) return {};
   var o, r, i = _objectWithoutPropertiesLoose2(e, t);
   if (Object.getOwnPropertySymbols) {
-    var s = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var n = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -230,7 +230,7 @@ function _objectWithoutPropertiesLoose2(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.includes(n)) continue;
+    if (-1 !== e.indexOf(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -294,8 +294,8 @@ function _objectWithoutProperties3(e, t) {
   if (null == e) return {};
   var o, r, i = _objectWithoutPropertiesLoose3(e, t);
   if (Object.getOwnPropertySymbols) {
-    var s = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var n = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -303,7 +303,7 @@ function _objectWithoutPropertiesLoose3(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.includes(n)) continue;
+    if (-1 !== e.indexOf(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -323,24 +323,6 @@ var AntDShiftActions = function AntDShiftActions2(_ref) {
   return /* @__PURE__ */ jsxs("div", { "data-testid": testID, className, children: [/* @__PURE__ */ jsx4(Button2, { type: "primary", size: "small", title: titles === null || titles === void 0 ? void 0 : titles.shiftUp, onClick: shiftUp, disabled: disabled || shiftUpDisabled, children: labels === null || labels === void 0 ? void 0 : labels.shiftUp }), /* @__PURE__ */ jsx4(Button2, { type: "primary", size: "small", title: titles === null || titles === void 0 ? void 0 : titles.shiftDown, onClick: shiftDown, disabled: disabled || shiftDownDisabled, children: labels === null || labels === void 0 ? void 0 : labels.shiftDown })] });
 };
 
-// ../../utils/react-compiler/react-compiler-runtime.ts
-import * as React from "react";
-var $empty = Symbol["for"]("react.memo_cache_sentinel");
-function c(size) {
-  return React.useMemo(
-    function() {
-      var $ = Array.from({ length: size });
-      for (var ii = 0; ii < size; ii++) {
-        $[ii] = $empty;
-      }
-      $[$empty] = true;
-      return $;
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  );
-}
-
 // src/AntDValueEditor.tsx
 import { jsx as jsx5, jsxs as jsxs2 } from "react/jsx-runtime";
 import { Checkbox, Input, InputNumber, Radio, Switch as Switch2 } from "antd";
@@ -622,6 +604,7 @@ function _typeof4(o) {
     return o2 && "function" == typeof Symbol && o2.constructor === Symbol && o2 !== Symbol.prototype ? "symbol" : typeof o2;
   }, _typeof4(o);
 }
+var _excluded4 = ["fieldData", "operator", "value", "handleOnChange", "title", "className", "type", "values", "listsAsArrays", "separator", "valueSource", "disabled", "testID", "selectorComponent", "extraProps", "inputType", "parseNumbers"];
 function ownKeys4(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
@@ -660,377 +643,145 @@ function _toPrimitive4(t, r) {
   }
   return ("string" === r ? String : Number)(t);
 }
+function _objectWithoutProperties4(e, t) {
+  if (null == e) return {};
+  var o, r, i = _objectWithoutPropertiesLoose4(e, t);
+  if (Object.getOwnPropertySymbols) {
+    var n = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+  }
+  return i;
+}
+function _objectWithoutPropertiesLoose4(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (-1 !== e.indexOf(n)) continue;
+    t[n] = r[n];
+  }
+  return t;
+}
 var DatePicker = generatePicker(dayjs_default);
 var AntDValueEditor = function AntDValueEditor2(allProps) {
   var _fieldData$placeholde;
-  var $ = c(111);
-  var fieldData = allProps.fieldData, operator = allProps.operator, value = allProps.value, handleOnChange = allProps.handleOnChange, title = allProps.title, className = allProps.className, type = allProps.type, t0 = allProps.values, listsAsArrays = allProps.listsAsArrays, separator = allProps.separator, disabled = allProps.disabled, testID = allProps.testID, extraProps = allProps.extraProps;
-  var t1;
-  if ($[0] !== t0) {
-    t1 = t0 === void 0 ? [] : t0;
-    $[0] = t0;
-    $[1] = t1;
-  } else {
-    t1 = $[1];
-  }
-  var values = t1;
+  var fieldData = allProps.fieldData, operator = allProps.operator, value = allProps.value, handleOnChange = allProps.handleOnChange, title = allProps.title, className = allProps.className, type = allProps.type, _allProps$values = allProps.values, values = _allProps$values === void 0 ? [] : _allProps$values, listsAsArrays = allProps.listsAsArrays, separator = allProps.separator, _vs = allProps.valueSource, disabled = allProps.disabled, testID = allProps.testID, _allProps$selectorCom = allProps.selectorComponent, SelectorComponent = _allProps$selectorCom === void 0 ? allProps.schema.controls.valueSelector : _allProps$selectorCom, extraProps = allProps.extraProps, _inputType = allProps.inputType, _parseNumbers = allProps.parseNumbers, propsForValueSelector = _objectWithoutProperties4(allProps, _excluded4);
   var _useValueEditor = useValueEditor(allProps), valueAsArray = _useValueEditor.valueAsArray, multiValueHandler = _useValueEditor.multiValueHandler, valueListItemClassName = _useValueEditor.valueListItemClassName, inputTypeCoerced = _useValueEditor.inputTypeCoerced;
   if (operator === "null" || operator === "notNull") {
     return null;
   }
   var placeHolderText = (_fieldData$placeholde = fieldData === null || fieldData === void 0 ? void 0 : fieldData.placeholder) !== null && _fieldData$placeholde !== void 0 ? _fieldData$placeholde : "";
-  if ((operator === "between" || operator === "notBetween") && (type === "select" || type === "text") && inputTypeCoerced !== "date" && inputTypeCoerced !== "datetime-local") {
+  if ((operator === "between" || operator === "notBetween") && (type === "select" || type === "text") && // Date ranges are handled differently in AntD--see below
+  inputTypeCoerced !== "date" && inputTypeCoerced !== "datetime-local") {
     if (type === "text") {
-      var _t;
-      if ($[2] !== className || $[3] !== disabled || $[4] !== extraProps || $[5] !== inputTypeCoerced || $[6] !== multiValueHandler || $[7] !== placeHolderText || $[8] !== separator || $[9] !== testID || $[10] !== title || $[11] !== valueAsArray || $[12] !== valueListItemClassName) {
-        var editors = ["from", "to"].map(function(key, i) {
-          var _valueAsArray$i2;
-          if (inputTypeCoerced === "time") {
-            return jsx5(DatePicker.TimePicker, _objectSpread4({ value: valueAsArray[i] ? dayjs2(valueAsArray[i], "HH:mm:ss") : null, className: valueListItemClassName, disabled, placeholder: placeHolderText, onChange: function onChange(d) {
-              var _d$format;
-              return multiValueHandler((_d$format = d === null || d === void 0 ? void 0 : d.format("HH:mm:ss")) !== null && _d$format !== void 0 ? _d$format : "", i);
-            } }, extraProps), key);
-          } else {
-            if (inputTypeCoerced === "number") {
-              var _valueAsArray$i;
-              return jsx5(InputNumber, _objectSpread4({ type: inputTypeCoerced, value: (_valueAsArray$i = valueAsArray[i]) !== null && _valueAsArray$i !== void 0 ? _valueAsArray$i : "", className: valueListItemClassName, disabled, placeholder: placeHolderText, onChange: function onChange(v) {
-                return multiValueHandler(v, i);
-              } }, extraProps), key);
-            }
-          }
-          return jsx5(Input, _objectSpread4({ type: inputTypeCoerced, value: (_valueAsArray$i2 = valueAsArray[i]) !== null && _valueAsArray$i2 !== void 0 ? _valueAsArray$i2 : "", className: valueListItemClassName, disabled, placeholder: placeHolderText, onChange: function onChange(e) {
-            return multiValueHandler(e.target.value, i);
+      var editors = ["from", "to"].map(function(key, i) {
+        var _valueAsArray$i2;
+        if (inputTypeCoerced === "time") {
+          return /* @__PURE__ */ jsx5(DatePicker.TimePicker, _objectSpread4({ value: valueAsArray[i] ? dayjs2(valueAsArray[i], "HH:mm:ss") : null, className: valueListItemClassName, disabled, placeholder: placeHolderText, onChange: function onChange(d) {
+            var _d$format;
+            return multiValueHandler((_d$format = d === null || d === void 0 ? void 0 : d.format("HH:mm:ss")) !== null && _d$format !== void 0 ? _d$format : "", i);
           } }, extraProps), key);
-        });
-        _t = jsxs2("span", { "data-testid": testID, className, title, children: [editors[0], separator, editors[1]] });
-        $[2] = className;
-        $[3] = disabled;
-        $[4] = extraProps;
-        $[5] = inputTypeCoerced;
-        $[6] = multiValueHandler;
-        $[7] = placeHolderText;
-        $[8] = separator;
-        $[9] = testID;
-        $[10] = title;
-        $[11] = valueAsArray;
-        $[12] = valueListItemClassName;
-        $[13] = _t;
-      } else {
-        _t = $[13];
-      }
-      return _t;
-    }
-    var _t2;
-    if ($[14] !== allProps) {
-      _t2 = jsx5(ValueEditor, _objectSpread4(_objectSpread4({}, allProps), {}, { skipHook: true }));
-      $[14] = allProps;
-      $[15] = _t2;
-    } else {
-      _t2 = $[15];
+        } else if (inputTypeCoerced === "number") {
+          var _valueAsArray$i;
+          return /* @__PURE__ */ jsx5(InputNumber, _objectSpread4({ type: inputTypeCoerced, value: (_valueAsArray$i = valueAsArray[i]) !== null && _valueAsArray$i !== void 0 ? _valueAsArray$i : "", className: valueListItemClassName, disabled, placeholder: placeHolderText, onChange: function onChange(v) {
+            return multiValueHandler(v, i);
+          } }, extraProps), key);
+        }
+        return /* @__PURE__ */ jsx5(Input, _objectSpread4({ type: inputTypeCoerced, value: (_valueAsArray$i2 = valueAsArray[i]) !== null && _valueAsArray$i2 !== void 0 ? _valueAsArray$i2 : "", className: valueListItemClassName, disabled, placeholder: placeHolderText, onChange: function onChange(e) {
+          return multiValueHandler(e.target.value, i);
+        } }, extraProps), key);
+      });
+      return /* @__PURE__ */ jsxs2("span", { "data-testid": testID, className, title, children: [editors[0], separator, editors[1]] });
     }
-    return _t2;
+    return /* @__PURE__ */ jsx5(ValueEditor, _objectSpread4(_objectSpread4({}, allProps), {}, { skipHook: true }));
   }
   switch (type) {
-    case "select": {
-    }
-    case "multiselect": {
-      var _t3;
-      if ($[16] !== allProps) {
-        _t3 = jsx5(ValueEditor, _objectSpread4(_objectSpread4({}, allProps), {}, { skipHook: true }));
-        $[16] = allProps;
-        $[17] = _t3;
-      } else {
-        _t3 = $[17];
-      }
-      return _t3;
-    }
-    case "textarea": {
-      var _t4;
-      if ($[18] !== handleOnChange) {
-        _t4 = function _t42(e_2) {
-          return handleOnChange(e_2.target.value);
-        };
-        $[18] = handleOnChange;
-        $[19] = _t4;
-      } else {
-        _t4 = $[19];
-      }
-      var _t5;
-      if ($[20] !== className || $[21] !== disabled || $[22] !== extraProps || $[23] !== placeHolderText || $[24] !== _t4 || $[25] !== title || $[26] !== value) {
-        _t5 = jsx5(Input.TextArea, _objectSpread4({ value, title, className, disabled, placeholder: placeHolderText, onChange: _t4 }, extraProps));
-        $[20] = className;
-        $[21] = disabled;
-        $[22] = extraProps;
-        $[23] = placeHolderText;
-        $[24] = _t4;
-        $[25] = title;
-        $[26] = value;
-        $[27] = _t5;
-      } else {
-        _t5 = $[27];
-      }
-      return _t5;
-    }
-    case "switch": {
-      var _t6 = !!value;
-      var _t7;
-      if ($[28] !== handleOnChange) {
-        _t7 = function _t72(v_1) {
-          return handleOnChange(v_1);
-        };
-        $[28] = handleOnChange;
-        $[29] = _t7;
-      } else {
-        _t7 = $[29];
-      }
-      var t4;
-      if ($[30] !== className || $[31] !== disabled || $[32] !== extraProps || $[33] !== _t6 || $[34] !== _t7 || $[35] !== title) {
-        t4 = jsx5(Switch2, _objectSpread4({ checked: _t6, title, className, disabled, onChange: _t7 }, extraProps));
-        $[30] = className;
-        $[31] = disabled;
-        $[32] = extraProps;
-        $[33] = _t6;
-        $[34] = _t7;
-        $[35] = title;
-        $[36] = t4;
-      } else {
-        t4 = $[36];
-      }
-      return t4;
-    }
-    case "checkbox": {
-      var _t8;
-      if ($[37] !== handleOnChange) {
-        _t8 = function _t82(e_1) {
-          return handleOnChange(e_1.target.checked);
-        };
-        $[37] = handleOnChange;
-        $[38] = _t8;
-      } else {
-        _t8 = $[38];
-      }
-      var _t9 = !!value;
-      var _t10;
-      if ($[39] !== className || $[40] !== disabled || $[41] !== extraProps || $[42] !== _t8 || $[43] !== _t9 || $[44] !== title) {
-        _t10 = jsx5("span", { title, className, children: jsx5(Checkbox, _objectSpread4({ type: "checkbox", disabled, onChange: _t8, checked: _t9 }, extraProps)) });
-        $[39] = className;
-        $[40] = disabled;
-        $[41] = extraProps;
-        $[42] = _t8;
-        $[43] = _t9;
-        $[44] = title;
-        $[45] = _t10;
-      } else {
-        _t10 = $[45];
-      }
-      return _t10;
-    }
-    case "radio": {
-      var _t11;
-      if ($[46] !== className || $[47] !== disabled || $[48] !== extraProps || $[49] !== handleOnChange || $[50] !== title || $[51] !== value || $[52] !== values) {
-        var _t12;
-        if ($[54] !== disabled || $[55] !== extraProps || $[56] !== handleOnChange || $[57] !== value) {
-          _t12 = function _t122(v_0) {
-            return jsx5(Radio, _objectSpread4(_objectSpread4({ value: v_0.name, checked: value === v_0.name, disabled, onChange: function onChange(e_0) {
-              return handleOnChange(e_0.target.value);
-            } }, extraProps), {}, { children: v_0.label }), v_0.name);
-          };
-          $[54] = disabled;
-          $[55] = extraProps;
-          $[56] = handleOnChange;
-          $[57] = value;
-          $[58] = _t12;
-        } else {
-          _t12 = $[58];
-        }
-        _t11 = jsx5("span", { className, title, children: values.map(_t12) });
-        $[46] = className;
-        $[47] = disabled;
-        $[48] = extraProps;
-        $[49] = handleOnChange;
-        $[50] = title;
-        $[51] = value;
-        $[52] = values;
-        $[53] = _t11;
-      } else {
-        _t11 = $[53];
-      }
-      return _t11;
-    }
+    case "select":
+    case "multiselect":
+      return /* @__PURE__ */ jsx5(SelectorComponent, _objectSpread4(_objectSpread4({}, propsForValueSelector), {}, { className, title, value, disabled, listsAsArrays, multiple: type === "multiselect", handleOnChange, options: values }, extraProps));
+    case "textarea":
+      return /* @__PURE__ */ jsx5(Input.TextArea, _objectSpread4({ value, title, className, disabled, placeholder: placeHolderText, onChange: function onChange(e_2) {
+        return handleOnChange(e_2.target.value);
+      } }, extraProps));
+    case "switch":
+      return /* @__PURE__ */ jsx5(Switch2, _objectSpread4({ checked: !!value, title, className, disabled, onChange: function onChange(v_1) {
+        return handleOnChange(v_1);
+      } }, extraProps));
+    case "checkbox":
+      return /* @__PURE__ */ jsx5("span", { title, className, children: /* @__PURE__ */ jsx5(Checkbox, _objectSpread4({ type: "checkbox", disabled, onChange: function onChange(e_1) {
+        return handleOnChange(e_1.target.checked);
+      }, checked: !!value }, extraProps)) });
+    case "radio":
+      return /* @__PURE__ */ jsx5("span", { className, title, children: values.map(function(v_0) {
+        return /* @__PURE__ */ jsx5(Radio, _objectSpread4(_objectSpread4({ value: v_0.name, checked: value === v_0.name, disabled, onChange: function onChange(e_0) {
+          return handleOnChange(e_0.target.value);
+        } }, extraProps), {}, { children: v_0.label }), v_0.name);
+      }) });
   }
   switch (inputTypeCoerced) {
-    case "date": {
-    }
+    case "date":
     case "datetime-local": {
       if (operator === "between" || operator === "notBetween") {
-        var _t13;
-        if ($[59] !== className || $[60] !== disabled || $[61] !== extraProps || $[62] !== handleOnChange || $[63] !== inputTypeCoerced || $[64] !== listsAsArrays || $[65] !== placeHolderText || $[66] !== valueAsArray) {
-          var dayjsArray = valueAsArray.slice(0, 2).map(_temp);
-          var _t14;
-          if ($[68] !== handleOnChange || $[69] !== inputTypeCoerced || $[70] !== listsAsArrays) {
-            _t14 = function _t142(dates) {
-              var timeFormat = inputTypeCoerced === "datetime-local" ? "THH:mm:ss" : "";
-              var format2 = "YYYY-MM-DD".concat(timeFormat);
-              var dateArray = dates === null || dates === void 0 ? void 0 : dates.map(function(d_2) {
-                return d_2 !== null && d_2 !== void 0 && d_2.isValid() ? d_2.format(format2) : void 0;
-              });
-              handleOnChange(dateArray ? listsAsArrays ? dateArray : joinWith(dateArray, ",") : dates);
-            };
-            $[68] = handleOnChange;
-            $[69] = inputTypeCoerced;
-            $[70] = listsAsArrays;
-            $[71] = _t14;
-          } else {
-            _t14 = $[71];
+        var dayjsArray = valueAsArray.slice(0, 2).map(function(v_2) {
+          return dayjs2(v_2);
+        });
+        return /* @__PURE__ */ jsx5(DatePicker.RangePicker, _objectSpread4({ value: dayjsArray.every(function(d_1) {
+          return d_1.isValid();
+        }) ? dayjsArray : void 0, showTime: inputTypeCoerced === "datetime-local", className, disabled, placeholder: [placeHolderText, placeHolderText], onChange: (
+          /* istanbul ignore next */
+          function onChange(dates) {
+            var timeFormat = inputTypeCoerced === "datetime-local" ? "THH:mm:ss" : "";
+            var format2 = "YYYY-MM-DD".concat(timeFormat);
+            var dateArray = dates === null || dates === void 0 ? void 0 : dates.map(function(d_2) {
+              return d_2 !== null && d_2 !== void 0 && d_2.isValid() ? d_2.format(format2) : void 0;
+            });
+            handleOnChange(dateArray ? listsAsArrays ? dateArray : joinWith(dateArray, ",") : dates);
           }
-          _t13 = jsx5(DatePicker.RangePicker, _objectSpread4({ value: dayjsArray.every(_temp2) ? dayjsArray : void 0, showTime: inputTypeCoerced === "datetime-local", className, disabled, placeholder: [placeHolderText, placeHolderText], onChange: _t14 }, extraProps));
-          $[59] = className;
-          $[60] = disabled;
-          $[61] = extraProps;
-          $[62] = handleOnChange;
-          $[63] = inputTypeCoerced;
-          $[64] = listsAsArrays;
-          $[65] = placeHolderText;
-          $[66] = valueAsArray;
-          $[67] = _t13;
-        } else {
-          _t13 = $[67];
-        }
-        return _t13;
-      }
-      var _t15;
-      if ($[72] !== className || $[73] !== disabled || $[74] !== extraProps || $[75] !== handleOnChange || $[76] !== inputTypeCoerced || $[77] !== placeHolderText || $[78] !== value) {
-        var dateValue_0 = dayjs2(value);
-        var _t16;
-        if ($[80] !== handleOnChange) {
-          _t16 = function _t162(_d, dateString) {
-            return handleOnChange(dateString);
-          };
-          $[80] = handleOnChange;
-          $[81] = _t16;
-        } else {
-          _t16 = $[81];
-        }
-        _t15 = jsx5(DatePicker, _objectSpread4({ value: dateValue_0.isValid() ? dateValue_0 : void 0, showTime: inputTypeCoerced === "datetime-local", className, disabled, placeholder: placeHolderText, onChange: _t16 }, extraProps));
-        $[72] = className;
-        $[73] = disabled;
-        $[74] = extraProps;
-        $[75] = handleOnChange;
-        $[76] = inputTypeCoerced;
-        $[77] = placeHolderText;
-        $[78] = value;
-        $[79] = _t15;
-      } else {
-        _t15 = $[79];
+        ) }, extraProps));
       }
-      return _t15;
+      var dateValue_0 = dayjs2(value);
+      return /* @__PURE__ */ jsx5(DatePicker, _objectSpread4({ value: dateValue_0.isValid() ? dateValue_0 : void 0, showTime: inputTypeCoerced === "datetime-local", className, disabled, placeholder: placeHolderText, onChange: function onChange(_d, dateString) {
+        return handleOnChange(dateString);
+      } }, extraProps));
     }
     case "time": {
-      var _t17;
-      if ($[82] !== className || $[83] !== disabled || $[84] !== extraProps || $[85] !== handleOnChange || $[86] !== placeHolderText || $[87] !== value) {
-        var dateValue = dayjs2(value, "HH:mm:ss");
-        var _t18;
-        if ($[89] !== handleOnChange) {
-          _t18 = function _t182(d_0) {
-            var _d_0$format;
-            return handleOnChange((_d_0$format = d_0 === null || d_0 === void 0 ? void 0 : d_0.format("HH:mm:ss")) !== null && _d_0$format !== void 0 ? _d_0$format : "");
-          };
-          $[89] = handleOnChange;
-          $[90] = _t18;
-        } else {
-          _t18 = $[90];
-        }
-        _t17 = jsx5(DatePicker.TimePicker, _objectSpread4({ value: dateValue.isValid() ? dateValue : void 0, className, disabled, placeholder: placeHolderText, onChange: _t18 }, extraProps));
-        $[82] = className;
-        $[83] = disabled;
-        $[84] = extraProps;
-        $[85] = handleOnChange;
-        $[86] = placeHolderText;
-        $[87] = value;
-        $[88] = _t17;
-      } else {
-        _t17 = $[88];
-      }
-      return _t17;
+      var dateValue = dayjs2(value, "HH:mm:ss");
+      return /* @__PURE__ */ jsx5(DatePicker.TimePicker, _objectSpread4({ value: dateValue.isValid() ? dateValue : void 0, className, disabled, placeholder: placeHolderText, onChange: function onChange(d_0) {
+        var _d_0$format;
+        return handleOnChange((_d_0$format = d_0 === null || d_0 === void 0 ? void 0 : d_0.format("HH:mm:ss")) !== null && _d_0$format !== void 0 ? _d_0$format : "");
+      } }, extraProps));
     }
     case "number": {
-      var _t19;
-      if ($[91] !== className || $[92] !== disabled || $[93] !== extraProps || $[94] !== handleOnChange || $[95] !== inputTypeCoerced || $[96] !== placeHolderText || $[97] !== title || $[98] !== value) {
-        _t19 = jsx5(InputNumber, _objectSpread4({ type: inputTypeCoerced, value, title, className, disabled, placeholder: placeHolderText, onChange: handleOnChange }, extraProps));
-        $[91] = className;
-        $[92] = disabled;
-        $[93] = extraProps;
-        $[94] = handleOnChange;
-        $[95] = inputTypeCoerced;
-        $[96] = placeHolderText;
-        $[97] = title;
-        $[98] = value;
-        $[99] = _t19;
-      } else {
-        _t19 = $[99];
-      }
-      return _t19;
+      return /* @__PURE__ */ jsx5(InputNumber, _objectSpread4({ type: inputTypeCoerced, value, title, className, disabled, placeholder: placeHolderText, onChange: handleOnChange }, extraProps));
     }
   }
-  var t2;
-  if ($[100] !== handleOnChange) {
-    t2 = function t22(e_3) {
-      return handleOnChange(e_3.target.value);
-    };
-    $[100] = handleOnChange;
-    $[101] = t2;
-  } else {
-    t2 = $[101];
-  }
-  var t3;
-  if ($[102] !== className || $[103] !== disabled || $[104] !== extraProps || $[105] !== inputTypeCoerced || $[106] !== placeHolderText || $[107] !== t2 || $[108] !== title || $[109] !== value) {
-    t3 = jsx5(Input, _objectSpread4({ type: inputTypeCoerced, value, title, className, disabled, placeholder: placeHolderText, onChange: t2 }, extraProps));
-    $[102] = className;
-    $[103] = disabled;
-    $[104] = extraProps;
-    $[105] = inputTypeCoerced;
-    $[106] = placeHolderText;
-    $[107] = t2;
-    $[108] = title;
-    $[109] = value;
-    $[110] = t3;
-  } else {
-    t3 = $[110];
-  }
-  return t3;
+  return /* @__PURE__ */ jsx5(Input, _objectSpread4({ type: inputTypeCoerced, value, title, className, disabled, placeholder: placeHolderText, onChange: function onChange(e_3) {
+    return handleOnChange(e_3.target.value);
+  } }, extraProps));
 };
-function _temp(v_2) {
-  return dayjs2(v_2);
-}
-function _temp2(d_1) {
-  return d_1.isValid();
+
+// ../../utils/react-compiler/react-compiler-runtime.ts
+import * as React from "react";
+var $empty = Symbol["for"]("react.memo_cache_sentinel");
+function c(size) {
+  return React.useMemo(
+    function() {
+      var $ = Array.from({ length: size });
+      for (var ii = 0; ii < size; ii++) {
+        $[ii] = $empty;
+      }
+      $[$empty] = true;
+      return $;
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
 }
 
 // src/AntDValueSelector.tsx
-import { jsx as jsx7 } from "react/jsx-runtime";
-import { Select as Select2 } from "antd";
-import { useValueSelector } from "react-querybuilder";
-
-// src/utils.tsx
 import { jsx as jsx6 } from "react/jsx-runtime";
 import { Select } from "antd";
-import { isOptionGroupArray } from "react-querybuilder";
-var OptGroup = Select.OptGroup;
-var Option = Select.Option;
-var toOptions = function toOptions2(arr) {
-  return isOptionGroupArray(arr) ? arr.map(function(og) {
-    return /* @__PURE__ */ jsx6(OptGroup, { label: og.label, children: og.options.map(function(opt) {
-      return /* @__PURE__ */ jsx6(Option, { value: opt.name, children: opt.label }, opt.name);
-    }) }, og.label);
-  }) : Array.isArray(arr) ? arr.map(function(opt) {
-    return /* @__PURE__ */ jsx6(Option, { value: opt.name, children: opt.label }, opt.name);
-  }) : (
-    /* istanbul ignore next */
-    null
-  );
-};
-
-// src/AntDValueSelector.tsx
+import * as React2 from "react";
+import { joinWith as joinWith2, useValueSelector } from "react-querybuilder";
 function _typeof5(o) {
   "@babel/helpers - typeof";
   return _typeof5 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o2) {
@@ -1039,7 +790,7 @@ function _typeof5(o) {
     return o2 && "function" == typeof Symbol && o2.constructor === Symbol && o2 !== Symbol.prototype ? "symbol" : typeof o2;
   }, _typeof5(o);
 }
-var _excluded4 = ["className", "handleOnChange", "options", "value", "title", "disabled", "multiple", "listsAsArrays", "testID", "rule", "rules", "level", "path", "context", "validation", "operator", "field", "fieldData", "schema"];
+var _excluded5 = ["className", "handleOnChange", "options", "value", "title", "disabled", "multiple", "listsAsArrays", "testID", "rule", "rules", "level", "path", "context", "validation", "operator", "field", "fieldData", "schema"];
 function ownKeys5(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
@@ -1078,26 +829,26 @@ function _toPrimitive5(t, r) {
   }
   return ("string" === r ? String : Number)(t);
 }
-function _objectWithoutProperties4(e, t) {
+function _objectWithoutProperties5(e, t) {
   if (null == e) return {};
-  var o, r, i = _objectWithoutPropertiesLoose4(e, t);
+  var o, r, i = _objectWithoutPropertiesLoose5(e, t);
   if (Object.getOwnPropertySymbols) {
-    var s = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var n = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
-function _objectWithoutPropertiesLoose4(r, e) {
+function _objectWithoutPropertiesLoose5(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.includes(n)) continue;
+    if (-1 !== e.indexOf(n)) continue;
     t[n] = r[n];
   }
   return t;
 }
 var AntDValueSelector = function AntDValueSelector2(t0) {
-  var $ = c(24);
+  var $ = c(32);
   var className;
   var disabled;
   var extraProps;
@@ -1108,12 +859,12 @@ var AntDValueSelector = function AntDValueSelector2(t0) {
   var title;
   var value;
   if ($[0] !== t0) {
-    var _t = t0.className, _t2 = t0.handleOnChange, t3 = t0.options, t4 = t0.value, t5 = t0.title, t6 = t0.disabled, t7 = t0.multiple, t8 = t0.listsAsArrays, _testID = t0.testID, _rule = t0.rule, _rules = t0.rules, _level = t0.level, _path = t0.path, _context = t0.context, _validation = t0.validation, _operator = t0.operator, _field = t0.field, _fieldData = t0.fieldData, _schema = t0.schema, t9 = _objectWithoutProperties4(t0, _excluded4);
+    var _t = t0.className, _t2 = t0.handleOnChange, _t3 = t0.options, _t4 = t0.value, _t5 = t0.title, t6 = t0.disabled, t7 = t0.multiple, t8 = t0.listsAsArrays, _testID = t0.testID, _rule = t0.rule, _rules = t0.rules, _level = t0.level, _path = t0.path, _context = t0.context, _validation = t0.validation, _operator = t0.operator, _field = t0.field, _fieldData = t0.fieldData, _schema = t0.schema, t9 = _objectWithoutProperties5(t0, _excluded5);
     className = _t;
     handleOnChange = _t2;
-    options = t3;
-    value = t4;
-    title = t5;
+    options = _t3;
+    value = _t4;
+    title = _t5;
     disabled = t6;
     multiple = t7;
     listsAsArrays = t8;
@@ -1140,39 +891,67 @@ var AntDValueSelector = function AntDValueSelector2(t0) {
     value = $[9];
   }
   var t1;
-  if ($[10] !== handleOnChange || $[11] !== listsAsArrays || $[12] !== multiple || $[13] !== value) {
-    t1 = { handleOnChange, listsAsArrays, multiple, value };
+  if ($[10] !== handleOnChange || $[11] !== value) {
+    t1 = { handleOnChange, listsAsArrays: false, multiple: false, value };
     $[10] = handleOnChange;
-    $[11] = listsAsArrays;
-    $[12] = multiple;
-    $[13] = value;
-    $[14] = t1;
+    $[11] = value;
+    $[12] = t1;
   } else {
-    t1 = $[14];
+    t1 = $[12];
   }
-  var _useValueSelector = useValueSelector(t1), onChange = _useValueSelector.onChange, val = _useValueSelector.val;
-  var t2;
-  if ($[15] !== className || $[16] !== disabled || $[17] !== extraProps || $[18] !== multiple || $[19] !== onChange || $[20] !== options || $[21] !== title || $[22] !== val) {
-    var modeObj = multiple ? { mode: "multiple" } : {};
-    t2 = jsx7("span", { title, className, children: jsx7(Select2, _objectSpread5(_objectSpread5(_objectSpread5({}, modeObj), {}, { popupMatchSelectWidth: false, disabled, value: val, onChange }, extraProps), {}, { children: toOptions(options) })) });
-    $[15] = className;
-    $[16] = disabled;
-    $[17] = extraProps;
-    $[18] = multiple;
-    $[19] = onChange;
-    $[20] = options;
-    $[21] = title;
-    $[22] = val;
-    $[23] = t2;
+  var _useValueSelector = useValueSelector(t1), onChangeNoArrays = _useValueSelector.onChange;
+  var t2 = multiple || listsAsArrays;
+  var t3;
+  if ($[13] !== handleOnChange || $[14] !== multiple || $[15] !== t2 || $[16] !== value) {
+    t3 = { handleOnChange, listsAsArrays: t2, multiple, value };
+    $[13] = handleOnChange;
+    $[14] = multiple;
+    $[15] = t2;
+    $[16] = value;
+    $[17] = t3;
+  } else {
+    t3 = $[17];
+  }
+  var _useValueSelector2 = useValueSelector(t3), onChangeNormal = _useValueSelector2.onChange, val = _useValueSelector2.val;
+  var t4;
+  if ($[18] !== listsAsArrays || $[19] !== multiple || $[20] !== onChangeNoArrays || $[21] !== onChangeNormal) {
+    t4 = function t42(v) {
+      if (multiple && !listsAsArrays && Array.isArray(v)) {
+        onChangeNoArrays(joinWith2(v));
+      } else {
+        onChangeNormal(v);
+      }
+    };
+    $[18] = listsAsArrays;
+    $[19] = multiple;
+    $[20] = onChangeNoArrays;
+    $[21] = onChangeNormal;
+    $[22] = t4;
+  } else {
+    t4 = $[22];
+  }
+  var onChange = t4;
+  var t5;
+  if ($[23] !== className || $[24] !== disabled || $[25] !== extraProps || $[26] !== multiple || $[27] !== onChange || $[28] !== options || $[29] !== title || $[30] !== val) {
+    t5 = jsx6(Select, _objectSpread5(_objectSpread5({}, multiple ? { mode: "multiple", allowClear: true } : {}), {}, { title, className, popupMatchSelectWidth: false, disabled, value: val, onChange, optionFilterProp: "label", options }, extraProps));
+    $[23] = className;
+    $[24] = disabled;
+    $[25] = extraProps;
+    $[26] = multiple;
+    $[27] = onChange;
+    $[28] = options;
+    $[29] = title;
+    $[30] = val;
+    $[31] = t5;
   } else {
-    t2 = $[23];
+    t5 = $[31];
   }
-  return t2;
+  return t5;
 };
 
 // src/index.tsx
 var antdControlElements = { actionElement: AntDActionElement, dragHandle: AntDDragHandle, notToggle: AntDNotToggle, shiftActions: AntDShiftActions, valueEditor: AntDValueEditor, valueSelector: AntDValueSelector };
-var antdTranslations = { removeGroup: { label: /* @__PURE__ */ jsx8(CloseOutlined, {}) }, removeRule: { label: /* @__PURE__ */ jsx8(CloseOutlined, {}) }, cloneRule: { label: /* @__PURE__ */ jsx8(CopyOutlined, {}) }, cloneRuleGroup: { label: /* @__PURE__ */ jsx8(CopyOutlined, {}) }, lockGroup: { label: /* @__PURE__ */ jsx8(UnlockOutlined, {}) }, lockRule: { label: /* @__PURE__ */ jsx8(UnlockOutlined, {}) }, lockGroupDisabled: { label: /* @__PURE__ */ jsx8(LockOutlined, {}) }, lockRuleDisabled: { label: /* @__PURE__ */ jsx8(LockOutlined, {}) }, shiftActionUp: { label: /* @__PURE__ */ jsx8(UpOutlined, {}) }, shiftActionDown: { label: /* @__PURE__ */ jsx8(DownOutlined, {}) } };
+var antdTranslations = { removeGroup: { label: /* @__PURE__ */ jsx7(CloseOutlined, {}) }, removeRule: { label: /* @__PURE__ */ jsx7(CloseOutlined, {}) }, cloneRule: { label: /* @__PURE__ */ jsx7(CopyOutlined, {}) }, cloneRuleGroup: { label: /* @__PURE__ */ jsx7(CopyOutlined, {}) }, lockGroup: { label: /* @__PURE__ */ jsx7(UnlockOutlined, {}) }, lockRule: { label: /* @__PURE__ */ jsx7(UnlockOutlined, {}) }, lockGroupDisabled: { label: /* @__PURE__ */ jsx7(LockOutlined, {}) }, lockRuleDisabled: { label: /* @__PURE__ */ jsx7(LockOutlined, {}) }, shiftActionUp: { label: /* @__PURE__ */ jsx7(UpOutlined, {}) }, shiftActionDown: { label: /* @__PURE__ */ jsx7(DownOutlined, {}) } };
 var QueryBuilderAntD = getCompatContextProvider({ controlElements: antdControlElements, translations: antdTranslations });
 export {
   AntDActionElement,