@react-querybuilder/antd 6.5.3 → 6.5.4

package/dist/react-querybuilder_antd.mjs

@@ -32,7 +32,7 @@ var require_dayjs_min = __commonJS({
       "object" == typeof exports && "undefined" != typeof module ? module.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
     }(exports, function() {
       "use strict";
-      var t = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", f = "month", h = "quarter", c = "year", d = "date", l = "Invalid Date", $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(t2) {
+      var t = 1e3, e = 6e4, n = 36e5, r = "millisecond", i = "second", s = "minute", u = "hour", a = "day", o = "week", c = "month", f = "quarter", h = "year", d = "date", l = "Invalid Date", $ = /^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/, y = /\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g, M = { name: "en", weekdays: "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), months: "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), ordinal: function(t2) {
         var e2 = ["th", "st", "nd", "rd"], n2 = t2 % 100;
         return "[" + t2 + (e2[(n2 - 20) % 10] || e2[n2] || e2[0]) + "]";
       } }, m = function(t2, e2, n2) {
@@ -44,19 +44,19 @@ var require_dayjs_min = __commonJS({
       }, m: function t2(e2, n2) {
         if (e2.date() < n2.date())
           return -t2(n2, e2);
-        var r2 = 12 * (n2.year() - e2.year()) + (n2.month() - e2.month()), i2 = e2.clone().add(r2, f), s2 = n2 - i2 < 0, u2 = e2.clone().add(r2 + (s2 ? -1 : 1), f);
+        var r2 = 12 * (n2.year() - e2.year()) + (n2.month() - e2.month()), i2 = e2.clone().add(r2, c), s2 = n2 - i2 < 0, u2 = e2.clone().add(r2 + (s2 ? -1 : 1), c);
         return +(-(r2 + (n2 - i2) / (s2 ? i2 - u2 : u2 - i2)) || 0);
       }, a: function(t2) {
         return t2 < 0 ? Math.ceil(t2) || 0 : Math.floor(t2);
       }, p: function(t2) {
-        return { M: f, y: c, w: o, d: a, D: d, h: u, m: s, s: i, ms: r, Q: h }[t2] || String(t2 || "").toLowerCase().replace(/s$/, "");
+        return { M: c, y: h, w: o, d: a, D: d, h: u, m: s, s: i, ms: r, Q: f }[t2] || String(t2 || "").toLowerCase().replace(/s$/, "");
       }, u: function(t2) {
         return void 0 === t2;
       } }, g = "en", D = {};
       D[g] = M;
-      var p = function(t2) {
-        return t2 instanceof _;
-      }, S = function t2(e2, n2, r2) {
+      var p = "$isDayjsObject", S = function(t2) {
+        return t2 instanceof _ || !(!t2 || !t2[p]);
+      }, w = function t2(e2, n2, r2) {
         var i2;
         if (!e2)
           return g;
@@ -71,18 +71,18 @@ var require_dayjs_min = __commonJS({
           D[a2] = e2, i2 = a2;
         }
         return !r2 && i2 && (g = i2), i2 || !r2 && g;
-      }, w = function(t2, e2) {
-        if (p(t2))
+      }, O = function(t2, e2) {
+        if (S(t2))
           return t2.clone();
         var n2 = "object" == typeof e2 ? e2 : {};
         return n2.date = t2, n2.args = arguments, new _(n2);
-      }, O = v;
-      O.l = S, O.i = p, O.w = function(t2, e2) {
-        return w(t2, { locale: e2.$L, utc: e2.$u, x: e2.$x, $offset: e2.$offset });
+      }, b = v;
+      b.l = w, b.i = S, b.w = function(t2, e2) {
+        return O(t2, { locale: e2.$L, utc: e2.$u, x: e2.$x, $offset: e2.$offset });
       };
       var _ = function() {
         function M2(t2) {
-          this.$L = S(t2.locale, null, true), this.parse(t2);
+          this.$L = w(t2.locale, null, true), this.parse(t2), this.$x = this.$x || t2.x || {}, this[p] = true;
         }
         var m2 = M2.prototype;
         return m2.parse = function(t2) {
@@ -90,7 +90,7 @@ var require_dayjs_min = __commonJS({
             var e2 = t3.date, n2 = t3.utc;
             if (null === e2)
               return /* @__PURE__ */ new Date(NaN);
-            if (O.u(e2))
+            if (b.u(e2))
               return /* @__PURE__ */ new Date();
             if (e2 instanceof Date)
               return new Date(e2);
@@ -102,38 +102,38 @@ var require_dayjs_min = __commonJS({
               }
             }
             return new Date(e2);
-          }(t2), this.$x = t2.x || {}, this.init();
+          }(t2), this.init();
         }, m2.init = function() {
           var t2 = this.$d;
           this.$y = t2.getFullYear(), this.$M = t2.getMonth(), this.$D = t2.getDate(), this.$W = t2.getDay(), this.$H = t2.getHours(), this.$m = t2.getMinutes(), this.$s = t2.getSeconds(), this.$ms = t2.getMilliseconds();
         }, m2.$utils = function() {
-          return O;
+          return b;
         }, m2.isValid = function() {
           return !(this.$d.toString() === l);
         }, m2.isSame = function(t2, e2) {
-          var n2 = w(t2);
+          var n2 = O(t2);
           return this.startOf(e2) <= n2 && n2 <= this.endOf(e2);
         }, m2.isAfter = function(t2, e2) {
-          return w(t2) < this.startOf(e2);
+          return O(t2) < this.startOf(e2);
         }, m2.isBefore = function(t2, e2) {
-          return this.endOf(e2) < w(t2);
+          return this.endOf(e2) < O(t2);
         }, m2.$g = function(t2, e2, n2) {
-          return O.u(t2) ? this[e2] : this.set(n2, t2);
+          return b.u(t2) ? this[e2] : this.set(n2, t2);
         }, m2.unix = function() {
           return Math.floor(this.valueOf() / 1e3);
         }, m2.valueOf = function() {
           return this.$d.getTime();
         }, m2.startOf = function(t2, e2) {
-          var n2 = this, r2 = !!O.u(e2) || e2, h2 = O.p(t2), l2 = function(t3, e3) {
-            var i2 = O.w(n2.$u ? Date.UTC(n2.$y, e3, t3) : new Date(n2.$y, e3, t3), n2);
+          var n2 = this, r2 = !!b.u(e2) || e2, f2 = b.p(t2), l2 = function(t3, e3) {
+            var i2 = b.w(n2.$u ? Date.UTC(n2.$y, e3, t3) : new Date(n2.$y, e3, t3), n2);
             return r2 ? i2 : i2.endOf(a);
           }, $2 = function(t3, e3) {
-            return O.w(n2.toDate()[t3].apply(n2.toDate("s"), (r2 ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e3)), n2);
+            return b.w(n2.toDate()[t3].apply(n2.toDate("s"), (r2 ? [0, 0, 0, 0] : [23, 59, 59, 999]).slice(e3)), n2);
           }, y2 = this.$W, M3 = this.$M, m3 = this.$D, v2 = "set" + (this.$u ? "UTC" : "");
-          switch (h2) {
-            case c:
+          switch (f2) {
+            case h:
               return r2 ? l2(1, 0) : l2(31, 11);
-            case f:
+            case c:
               return r2 ? l2(1, M3) : l2(0, M3 + 1);
             case o:
               var g2 = this.$locale().weekStart || 0, D2 = (y2 < g2 ? y2 + 7 : y2) - g2;
@@ -153,8 +153,8 @@ var require_dayjs_min = __commonJS({
         }, m2.endOf = function(t2) {
           return this.startOf(t2, false);
         }, m2.$set = function(t2, e2) {
-          var n2, o2 = O.p(t2), h2 = "set" + (this.$u ? "UTC" : ""), l2 = (n2 = {}, n2[a] = h2 + "Date", n2[d] = h2 + "Date", n2[f] = h2 + "Month", n2[c] = h2 + "FullYear", n2[u] = h2 + "Hours", n2[s] = h2 + "Minutes", n2[i] = h2 + "Seconds", n2[r] = h2 + "Milliseconds", n2)[o2], $2 = o2 === a ? this.$D + (e2 - this.$W) : e2;
-          if (o2 === f || o2 === c) {
+          var n2, o2 = b.p(t2), f2 = "set" + (this.$u ? "UTC" : ""), l2 = (n2 = {}, n2[a] = f2 + "Date", n2[d] = f2 + "Date", n2[c] = f2 + "Month", n2[h] = f2 + "FullYear", n2[u] = f2 + "Hours", n2[s] = f2 + "Minutes", n2[i] = f2 + "Seconds", n2[r] = f2 + "Milliseconds", n2)[o2], $2 = o2 === a ? this.$D + (e2 - this.$W) : e2;
+          if (o2 === c || o2 === h) {
             var y2 = this.clone().set(d, 1);
             y2.$d[l2]($2), y2.init(), this.$d = y2.set(d, Math.min(this.$D, y2.daysInMonth())).$d;
           } else
@@ -163,57 +163,139 @@ var require_dayjs_min = __commonJS({
         }, m2.set = function(t2, e2) {
           return this.clone().$set(t2, e2);
         }, m2.get = function(t2) {
-          return this[O.p(t2)]();
-        }, m2.add = function(r2, h2) {
+          return this[b.p(t2)]();
+        }, m2.add = function(r2, f2) {
           var d2, l2 = this;
           r2 = Number(r2);
-          var $2 = O.p(h2), y2 = function(t2) {
-            var e2 = w(l2);
-            return O.w(e2.date(e2.date() + Math.round(t2 * r2)), l2);
+          var $2 = b.p(f2), y2 = function(t2) {
+            var e2 = O(l2);
+            return b.w(e2.date(e2.date() + Math.round(t2 * r2)), l2);
           };
-          if ($2 === f)
-            return this.set(f, this.$M + r2);
           if ($2 === c)
-            return this.set(c, this.$y + r2);
+            return this.set(c, this.$M + r2);
+          if ($2 === h)
+            return this.set(h, this.$y + r2);
           if ($2 === a)
             return y2(1);
           if ($2 === o)
             return y2(7);
           var M3 = (d2 = {}, d2[s] = e, d2[u] = n, d2[i] = t, d2)[$2] || 1, m3 = this.$d.getTime() + r2 * M3;
-          return O.w(m3, this);
+          return b.w(m3, this);
         }, m2.subtract = function(t2, e2) {
           return this.add(-1 * t2, e2);
         }, m2.format = function(t2) {
           var e2 = this, n2 = this.$locale();
           if (!this.isValid())
             return n2.invalidDate || l;
-          var r2 = t2 || "YYYY-MM-DDTHH:mm:ssZ", i2 = O.z(this), s2 = this.$H, u2 = this.$m, a2 = this.$M, o2 = n2.weekdays, f2 = n2.months, h2 = function(t3, n3, i3, s3) {
+          var r2 = t2 || "YYYY-MM-DDTHH:mm:ssZ", i2 = b.z(this), s2 = this.$H, u2 = this.$m, a2 = this.$M, o2 = n2.weekdays, c2 = n2.months, f2 = n2.meridiem, h2 = function(t3, n3, i3, s3) {
             return t3 && (t3[n3] || t3(e2, r2)) || i3[n3].slice(0, s3);
-          }, c2 = function(t3) {
-            return O.s(s2 % 12 || 12, t3, "0");
-          }, d2 = n2.meridiem || function(t3, e3, n3) {
+          }, d2 = function(t3) {
+            return b.s(s2 % 12 || 12, t3, "0");
+          }, $2 = f2 || function(t3, e3, n3) {
             var r3 = t3 < 12 ? "AM" : "PM";
             return n3 ? r3.toLowerCase() : r3;
-          }, $2 = { YY: String(this.$y).slice(-2), YYYY: O.s(this.$y, 4, "0"), M: a2 + 1, MM: O.s(a2 + 1, 2, "0"), MMM: h2(n2.monthsShort, a2, f2, 3), MMMM: h2(f2, a2), D: this.$D, DD: O.s(this.$D, 2, "0"), d: String(this.$W), dd: h2(n2.weekdaysMin, this.$W, o2, 2), ddd: h2(n2.weekdaysShort, this.$W, o2, 3), dddd: o2[this.$W], H: String(s2), HH: O.s(s2, 2, "0"), h: c2(1), hh: c2(2), a: d2(s2, u2, true), A: d2(s2, u2, false), m: String(u2), mm: O.s(u2, 2, "0"), s: String(this.$s), ss: O.s(this.$s, 2, "0"), SSS: O.s(this.$ms, 3, "0"), Z: i2 };
-          return r2.replace(y, function(t3, e3) {
-            return e3 || $2[t3] || i2.replace(":", "");
+          };
+          return r2.replace(y, function(t3, r3) {
+            return r3 || function(t4) {
+              switch (t4) {
+                case "YY":
+                  return String(e2.$y).slice(-2);
+                case "YYYY":
+                  return b.s(e2.$y, 4, "0");
+                case "M":
+                  return a2 + 1;
+                case "MM":
+                  return b.s(a2 + 1, 2, "0");
+                case "MMM":
+                  return h2(n2.monthsShort, a2, c2, 3);
+                case "MMMM":
+                  return h2(c2, a2);
+                case "D":
+                  return e2.$D;
+                case "DD":
+                  return b.s(e2.$D, 2, "0");
+                case "d":
+                  return String(e2.$W);
+                case "dd":
+                  return h2(n2.weekdaysMin, e2.$W, o2, 2);
+                case "ddd":
+                  return h2(n2.weekdaysShort, e2.$W, o2, 3);
+                case "dddd":
+                  return o2[e2.$W];
+                case "H":
+                  return String(s2);
+                case "HH":
+                  return b.s(s2, 2, "0");
+                case "h":
+                  return d2(1);
+                case "hh":
+                  return d2(2);
+                case "a":
+                  return $2(s2, u2, true);
+                case "A":
+                  return $2(s2, u2, false);
+                case "m":
+                  return String(u2);
+                case "mm":
+                  return b.s(u2, 2, "0");
+                case "s":
+                  return String(e2.$s);
+                case "ss":
+                  return b.s(e2.$s, 2, "0");
+                case "SSS":
+                  return b.s(e2.$ms, 3, "0");
+                case "Z":
+                  return i2;
+              }
+              return null;
+            }(t3) || i2.replace(":", "");
           });
         }, m2.utcOffset = function() {
           return 15 * -Math.round(this.$d.getTimezoneOffset() / 15);
         }, m2.diff = function(r2, d2, l2) {
-          var $2, y2 = O.p(d2), M3 = w(r2), m3 = (M3.utcOffset() - this.utcOffset()) * e, v2 = this - M3, g2 = O.m(this, M3);
-          return g2 = ($2 = {}, $2[c] = g2 / 12, $2[f] = g2, $2[h] = g2 / 3, $2[o] = (v2 - m3) / 6048e5, $2[a] = (v2 - m3) / 864e5, $2[u] = v2 / n, $2[s] = v2 / e, $2[i] = v2 / t, $2)[y2] || v2, l2 ? g2 : O.a(g2);
+          var $2, y2 = this, M3 = b.p(d2), m3 = O(r2), v2 = (m3.utcOffset() - this.utcOffset()) * e, g2 = this - m3, D2 = function() {
+            return b.m(y2, m3);
+          };
+          switch (M3) {
+            case h:
+              $2 = D2() / 12;
+              break;
+            case c:
+              $2 = D2();
+              break;
+            case f:
+              $2 = D2() / 3;
+              break;
+            case o:
+              $2 = (g2 - v2) / 6048e5;
+              break;
+            case a:
+              $2 = (g2 - v2) / 864e5;
+              break;
+            case u:
+              $2 = g2 / n;
+              break;
+            case s:
+              $2 = g2 / e;
+              break;
+            case i:
+              $2 = g2 / t;
+              break;
+            default:
+              $2 = g2;
+          }
+          return l2 ? $2 : b.a($2);
         }, m2.daysInMonth = function() {
-          return this.endOf(f).$D;
+          return this.endOf(c).$D;
         }, m2.$locale = function() {
           return D[this.$L];
         }, m2.locale = function(t2, e2) {
           if (!t2)
             return this.$L;
-          var n2 = this.clone(), r2 = S(t2, e2, true);
+          var n2 = this.clone(), r2 = w(t2, e2, true);
           return r2 && (n2.$L = r2), n2;
         }, m2.clone = function() {
-          return O.w(this.$d, this);
+          return b.w(this.$d, this);
         }, m2.toDate = function() {
           return new Date(this.valueOf());
         }, m2.toJSON = function() {
@@ -223,16 +305,16 @@ var require_dayjs_min = __commonJS({
         }, m2.toString = function() {
           return this.$d.toUTCString();
         }, M2;
-      }(), T = _.prototype;
-      return w.prototype = T, [["$ms", r], ["$s", i], ["$m", s], ["$H", u], ["$W", a], ["$M", f], ["$y", c], ["$D", d]].forEach(function(t2) {
-        T[t2[1]] = function(e2) {
+      }(), k = _.prototype;
+      return O.prototype = k, [["$ms", r], ["$s", i], ["$m", s], ["$H", u], ["$W", a], ["$M", c], ["$y", h], ["$D", d]].forEach(function(t2) {
+        k[t2[1]] = function(e2) {
           return this.$g(e2, t2[0], t2[1]);
         };
-      }), w.extend = function(t2, e2) {
-        return t2.$i || (t2(e2, _, w), t2.$i = true), w;
-      }, w.locale = S, w.isDayjs = p, w.unix = function(t2) {
-        return w(1e3 * t2);
-      }, w.en = D[g], w.Ls = D, w.p = {}, w;
+      }), O.extend = function(t2, e2) {
+        return t2.$i || (t2(e2, _, O), t2.$i = true), O;
+      }, O.locale = w, O.isDayjs = S, O.unix = function(t2) {
+        return O(1e3 * t2);
+      }, O.en = D[g], O.Ls = D, O.p = {}, O;
     });
   }
 });
@@ -877,8 +959,7 @@ var require_dayjs = __commonJS({
         }
       }
     };
-    var _default = generateConfig;
-    exports.default = _default;
+    var _default = exports.default = generateConfig;
   }
 });
 
@@ -978,14 +1059,10 @@ AntDNotToggle.displayName = "AntDNotToggle";
 // src/AntDValueEditor.tsx
 var import_dayjs = __toESM(require_dayjs_min());
 var import_dayjs2 = __toESM(require_dayjs());
-import { DatePicker as AntdDatePicker, Checkbox, Input, Radio, Switch as Switch2, TimePicker } from "antd";
+import { Checkbox, Input, Radio, Switch as Switch2 } from "antd";
+import generatePicker from "antd/es/date-picker/generatePicker/index.js";
 import * as React6 from "react";
-import {
-  getFirstOption,
-  standardClassnames,
-  toArray,
-  useValueEditor
-} from "react-querybuilder";
+import { getFirstOption, joinWith, standardClassnames, useValueEditor } from "react-querybuilder";
 
 // src/AntDValueSelector.tsx
 import { Select as Select2 } from "antd";
@@ -1031,7 +1108,7 @@ var AntDValueSelector = ({
     Select2,
     {
       ...modeObj,
-      dropdownMatchSelectWidth: false,
+      popupMatchSelectWidth: false,
       disabled,
       value: val,
       onChange,
@@ -1043,7 +1120,7 @@ var AntDValueSelector = ({
 AntDValueSelector.displayName = "AntDValueSelector";
 
 // src/AntDValueEditor.tsx
-var DatePicker = AntdDatePicker.generatePicker(import_dayjs2.default);
+var DatePicker = generatePicker(import_dayjs2.default);
 var AntDValueEditor = ({
   fieldData,
   operator,
@@ -1084,7 +1161,7 @@ var AntDValueEditor = ({
       if (type === "text") {
         if (inputTypeCoerced === "time") {
           return /* @__PURE__ */ React6.createElement(
-            TimePicker,
+            DatePicker.TimePicker,
             {
               key,
               value: valueAsArray[i] ? (0, import_dayjs.default)(valueAsArray[i], "HH:mm:ss") : null,
@@ -1189,28 +1266,36 @@ var AntDValueEditor = ({
   }
   switch (inputTypeCoerced) {
     case "date":
-    case "datetime-local":
-      return operator === "between" || operator === "notBetween" ? /* @__PURE__ */ React6.createElement(
-        DatePicker.RangePicker,
-        {
-          value: toArray(value)?.length >= 2 ? toArray(value).map((v) => (0, import_dayjs.default)(v)) : void 0,
-          showTime: inputTypeCoerced === "datetime-local",
-          className,
-          disabled,
-          placeholder: [placeHolderText, placeHolderText],
-          onChange: (
-            /* istanbul ignore next */
-            (dates) => {
-              const format = `YYYY-MM-DD${inputTypeCoerced === "datetime-local" ? "THH:mm:ss" : ""}`;
-              const dateArray = dates?.map((d) => d?.format(format));
-              handleOnChange(dateArray ? listsAsArrays ? dateArray : dateArray.join(",") : dates);
-            }
-          )
-        }
-      ) : /* @__PURE__ */ React6.createElement(
+    case "datetime-local": {
+      if (operator === "between" || operator === "notBetween") {
+        const dayjsArray = valueAsArray.slice(0, 2).map(import_dayjs.default);
+        return /* @__PURE__ */ React6.createElement(
+          DatePicker.RangePicker,
+          {
+            value: dayjsArray.every((d) => d.isValid()) ? dayjsArray : void 0,
+            showTime: inputTypeCoerced === "datetime-local",
+            className,
+            disabled,
+            placeholder: [placeHolderText, placeHolderText],
+            onChange: (
+              /* istanbul ignore next */
+              (dates) => {
+                const timeFormat = inputTypeCoerced === "datetime-local" ? "THH:mm:ss" : "";
+                const format = `YYYY-MM-DD${timeFormat}`;
+                const dateArray = dates?.map((d) => d?.isValid() ? d.format(format) : void 0);
+                handleOnChange(
+                  dateArray ? listsAsArrays ? dateArray : joinWith(dateArray, ",") : dates
+                );
+              }
+            )
+          }
+        );
+      }
+      const dateValue = (0, import_dayjs.default)(value);
+      return /* @__PURE__ */ React6.createElement(
         DatePicker,
         {
-          value: value ? (0, import_dayjs.default)(value) : null,
+          value: dateValue.isValid() ? dateValue : void 0,
           showTime: inputTypeCoerced === "datetime-local",
           className,
           disabled,
@@ -1218,17 +1303,20 @@ var AntDValueEditor = ({
           onChange: (_d, dateString) => handleOnChange(dateString)
         }
       );
-    case "time":
+    }
+    case "time": {
+      const dateValue = (0, import_dayjs.default)(value, "HH:mm:ss");
       return /* @__PURE__ */ React6.createElement(
-        TimePicker,
+        DatePicker.TimePicker,
         {
-          value: value ? (0, import_dayjs.default)(value, "HH:mm:ss") : null,
+          value: dateValue.isValid() ? dateValue : void 0,
           className,
           disabled,
           placeholder: placeHolderText,
           onChange: (d) => handleOnChange(d?.format("HH:mm:ss") ?? "")
         }
       );
+    }
   }
   return /* @__PURE__ */ React6.createElement(
     Input,