@react-querybuilder/antd 7.0.0-alpha.0 → 7.0.0-alpha.2

package/dist/react-querybuilder_antd.mjs

@@ -959,12 +959,20 @@ var require_dayjs = __commonJS({
         }
       }
     };
-    var _default = generateConfig;
-    exports.default = _default;
+    var _default = exports.default = generateConfig;
   }
 });
 
-// src/index.ts
+// src/index.tsx
+import {
+  CloseOutlined,
+  CopyOutlined,
+  DownOutlined,
+  LockOutlined,
+  UnlockOutlined,
+  UpOutlined
+} from "@ant-design/icons";
+import * as React8 from "react";
 import { getCompatContextProvider } from "react-querybuilder";
 
 // src/AntDActionElement.tsx
@@ -1058,63 +1066,48 @@ var AntDNotToggle = ({
 AntDNotToggle.displayName = "AntDNotToggle";
 
 // src/AntDShiftActions.tsx
-import { CaretDownOutlined, CaretUpOutlined } from "@ant-design/icons";
 import { Button as Button2 } from "antd";
 import * as React4 from "react";
-import { useShiftActions } from "react-querybuilder";
 var AntDShiftActions = ({
-  path,
+  shiftUp,
+  shiftDown,
+  shiftUpDisabled,
+  shiftDownDisabled,
   disabled,
   className,
-  // labels, // Labels are hard-coded in this component
+  labels,
   titles,
-  testID,
-  lastInGroup,
-  schema: { combinators, dispatchQuery, getQuery }
-}) => {
-  const { shiftUp, shiftUpDisabled, shiftDown, shiftDownDisabled } = useShiftActions({
-    combinators,
-    disabled,
-    dispatchQuery,
-    getQuery,
-    lastInGroup,
-    path
-  });
-  return /* @__PURE__ */ React4.createElement("div", { "data-testid": testID, className }, /* @__PURE__ */ React4.createElement(
-    Button2,
-    {
-      type: "primary",
-      size: "small",
-      title: titles?.shiftUp,
-      onClick: shiftUp,
-      disabled: shiftUpDisabled
-    },
-    /* @__PURE__ */ React4.createElement(CaretUpOutlined, null)
-  ), /* @__PURE__ */ React4.createElement(
-    Button2,
-    {
-      type: "primary",
-      size: "small",
-      title: titles?.shiftDown,
-      onClick: shiftDown,
-      disabled: shiftDownDisabled
-    },
-    /* @__PURE__ */ React4.createElement(CaretDownOutlined, null)
-  ));
-};
+  testID
+}) => /* @__PURE__ */ React4.createElement("div", { "data-testid": testID, className }, /* @__PURE__ */ React4.createElement(
+  Button2,
+  {
+    type: "primary",
+    size: "small",
+    title: titles?.shiftUp,
+    onClick: shiftUp,
+    disabled: disabled || shiftUpDisabled
+  },
+  labels?.shiftUp
+), /* @__PURE__ */ React4.createElement(
+  Button2,
+  {
+    type: "primary",
+    size: "small",
+    title: titles?.shiftDown,
+    onClick: shiftDown,
+    disabled: disabled || shiftDownDisabled
+  },
+  labels?.shiftDown
+));
 AntDShiftActions.displayName = "AntDShiftActions";
 
 // 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 React7 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";
@@ -1173,7 +1166,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,
@@ -1214,7 +1207,7 @@ var AntDValueEditor = ({
       if (type === "text") {
         if (inputTypeCoerced === "time") {
           return /* @__PURE__ */ React7.createElement(
-            TimePicker,
+            DatePicker.TimePicker,
             {
               key,
               value: valueAsArray[i] ? (0, import_dayjs.default)(valueAsArray[i], "HH:mm:ss") : null,
@@ -1319,28 +1312,36 @@ var AntDValueEditor = ({
   }
   switch (inputTypeCoerced) {
     case "date":
-    case "datetime-local":
-      return operator === "between" || operator === "notBetween" ? /* @__PURE__ */ React7.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__ */ React7.createElement(
+    case "datetime-local": {
+      if (operator === "between" || operator === "notBetween") {
+        const dayjsArray = valueAsArray.slice(0, 2).map(import_dayjs.default);
+        return /* @__PURE__ */ React7.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__ */ React7.createElement(
         DatePicker,
         {
-          value: value ? (0, import_dayjs.default)(value) : null,
+          value: dateValue.isValid() ? dateValue : void 0,
           showTime: inputTypeCoerced === "datetime-local",
           className,
           disabled,
@@ -1348,17 +1349,20 @@ var AntDValueEditor = ({
           onChange: (_d, dateString) => handleOnChange(dateString)
         }
       );
-    case "time":
+    }
+    case "time": {
+      const dateValue = (0, import_dayjs.default)(value, "HH:mm:ss");
       return /* @__PURE__ */ React7.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__ */ React7.createElement(
     Input,
@@ -1375,7 +1379,7 @@ var AntDValueEditor = ({
 };
 AntDValueEditor.displayName = "AntDValueEditor";
 
-// src/index.ts
+// src/index.tsx
 var antdControlElements = {
   addGroupAction: AntDActionElement,
   addRuleAction: AntDActionElement,
@@ -1394,9 +1398,22 @@ var antdControlElements = {
   valueSourceSelector: AntDValueSelector,
   shiftActions: AntDShiftActions
 };
+var antdTranslations = {
+  removeGroup: { label: /* @__PURE__ */ React8.createElement(CloseOutlined, null) },
+  removeRule: { label: /* @__PURE__ */ React8.createElement(CloseOutlined, null) },
+  cloneRule: { label: /* @__PURE__ */ React8.createElement(CopyOutlined, null) },
+  cloneRuleGroup: { label: /* @__PURE__ */ React8.createElement(CopyOutlined, null) },
+  lockGroup: { label: /* @__PURE__ */ React8.createElement(UnlockOutlined, null) },
+  lockRule: { label: /* @__PURE__ */ React8.createElement(UnlockOutlined, null) },
+  lockGroupDisabled: { label: /* @__PURE__ */ React8.createElement(LockOutlined, null) },
+  lockRuleDisabled: { label: /* @__PURE__ */ React8.createElement(LockOutlined, null) },
+  shiftActionUp: { label: /* @__PURE__ */ React8.createElement(UpOutlined, null) },
+  shiftActionDown: { label: /* @__PURE__ */ React8.createElement(DownOutlined, null) }
+};
 var QueryBuilderAntD = getCompatContextProvider({
   key: "antd",
-  controlElements: antdControlElements
+  controlElements: antdControlElements,
+  translations: antdTranslations
 });
 export {
   AntDActionElement,
@@ -1406,6 +1423,7 @@ export {
   AntDValueEditor,
   AntDValueSelector,
   QueryBuilderAntD,
-  antdControlElements
+  antdControlElements,
+  antdTranslations
 };
 //# sourceMappingURL=react-querybuilder_antd.mjs.map