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

package/README.md

@@ -31,7 +31,7 @@ const App = () => {
 
   return (
     <QueryBuilderAntD>
-      <QueryBuilder fields={fields} query={query} onQueryChange={q => setQuery(q)} />
+      <QueryBuilder fields={fields} query={query} onQueryChange={setQuery} />
     </QueryBuilderAntD>
   );
 };

package/dist/cjs/react-querybuilder_antd.cjs.development.d.ts

@@ -2,7 +2,7 @@ import { HolderOutlined } from '@ant-design/icons';
 import * as React from 'react';
 import { ComponentPropsWithRef, ComponentPropsWithoutRef } from 'react';
 import * as react_querybuilder from 'react-querybuilder';
-import { DragHandleProps, NotToggleProps, VersatileSelectorProps, ActionWithRulesProps, ShiftActionsProps, ValueEditorProps } from 'react-querybuilder';
+import { DragHandleProps, NotToggleProps, VersatileSelectorProps, ActionWithRulesProps, ShiftActionsProps, ValueEditorProps, Field } from 'react-querybuilder';
 import { Switch, Select, Button } from 'antd';
 
 type AntDDragHandleProps = DragHandleProps & {
@@ -32,7 +32,7 @@ declare const AntDActionElement: {
 };
 
 declare const AntDShiftActions: {
-    ({ path, disabled, className, labels, titles, testID, lastInGroup, schema: { combinators, dispatchQuery, getQuery }, }: ShiftActionsProps): React.JSX.Element;
+    ({ shiftUp, shiftDown, shiftUpDisabled, shiftDownDisabled, disabled, className, labels, titles, testID, }: ShiftActionsProps): React.JSX.Element;
     displayName: string;
 };
 
@@ -91,7 +91,7 @@ declare const antdControlElements: {
         displayName: string;
     };
     valueEditor: {
-        ({ fieldData, operator, value, handleOnChange, title, className, type, inputType, values, listsAsArrays, parseNumbers, separator, valueSource: _vs, disabled, testID, selectorComponent: SelectorComponent, ...props }: react_querybuilder.ValueEditorProps<react_querybuilder.Field<string, string, string, react_querybuilder.Option<string>, react_querybuilder.Option<string>>, string>): React.JSX.Element | null;
+        ({ fieldData, operator, value, handleOnChange, title, className, type, inputType, values, listsAsArrays, parseNumbers, separator, valueSource: _vs, disabled, testID, selectorComponent: SelectorComponent, ...props }: react_querybuilder.ValueEditorProps<Field<string, string, string, react_querybuilder.Option<string>, react_querybuilder.Option<string>>, string>): React.JSX.Element | null;
         displayName: string;
     };
     dragHandle: React.ForwardRefExoticComponent<Omit<AntDDragHandleProps, "ref"> & React.RefAttributes<HTMLSpanElement>>;
@@ -100,7 +100,7 @@ declare const antdControlElements: {
         displayName: string;
     };
     shiftActions: {
-        ({ path, disabled, className, labels, titles, testID, lastInGroup, schema: { combinators, dispatchQuery, getQuery }, }: react_querybuilder.ShiftActionsProps): React.JSX.Element;
+        ({ shiftUp, shiftDown, shiftUpDisabled, shiftDownDisabled, disabled, className, labels, titles, testID, }: react_querybuilder.ShiftActionsProps): React.JSX.Element;
         displayName: string;
     };
 };

package/dist/cjs/react-querybuilder_antd.cjs.development.js

@@ -985,7 +985,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_icons2 = require("@ant-design/icons");
 var React8 = __toESM(require("react"));
-var import_react_querybuilder5 = require("react-querybuilder");
+var import_react_querybuilder4 = require("react-querybuilder");
 
 // src/AntDActionElement.tsx
 var import_antd = require("antd");
@@ -1080,47 +1080,37 @@ AntDNotToggle.displayName = "AntDNotToggle";
 // src/AntDShiftActions.tsx
 var import_antd3 = require("antd");
 var React4 = __toESM(require("react"));
-var import_react_querybuilder = require("react-querybuilder");
 var AntDShiftActions = ({
-  path,
+  shiftUp,
+  shiftDown,
+  shiftUpDisabled,
+  shiftDownDisabled,
   disabled,
   className,
   labels,
   titles,
-  testID,
-  lastInGroup,
-  schema: { combinators, dispatchQuery, getQuery }
-}) => {
-  const { shiftUp, shiftUpDisabled, shiftDown, shiftDownDisabled } = (0, import_react_querybuilder.useShiftActions)({
-    combinators,
-    disabled,
-    dispatchQuery,
-    getQuery,
-    lastInGroup,
-    path
-  });
-  return /* @__PURE__ */ React4.createElement("div", { "data-testid": testID, className }, /* @__PURE__ */ React4.createElement(
-    import_antd3.Button,
-    {
-      type: "primary",
-      size: "small",
-      title: titles?.shiftUp,
-      onClick: shiftUp,
-      disabled: shiftUpDisabled
-    },
-    labels?.shiftUp
-  ), /* @__PURE__ */ React4.createElement(
-    import_antd3.Button,
-    {
-      type: "primary",
-      size: "small",
-      title: titles?.shiftDown,
-      onClick: shiftDown,
-      disabled: shiftDownDisabled
-    },
-    labels?.shiftDown
-  ));
-};
+  testID
+}) => /* @__PURE__ */ React4.createElement("div", { "data-testid": testID, className }, /* @__PURE__ */ React4.createElement(
+  import_antd3.Button,
+  {
+    type: "primary",
+    size: "small",
+    title: titles?.shiftUp,
+    onClick: shiftUp,
+    disabled: disabled || shiftUpDisabled
+  },
+  labels?.shiftUp
+), /* @__PURE__ */ React4.createElement(
+  import_antd3.Button,
+  {
+    type: "primary",
+    size: "small",
+    title: titles?.shiftDown,
+    onClick: shiftDown,
+    disabled: disabled || shiftDownDisabled
+  },
+  labels?.shiftDown
+));
 AntDShiftActions.displayName = "AntDShiftActions";
 
 // src/AntDValueEditor.tsx
@@ -1129,19 +1119,19 @@ var import_generatePicker = __toESM(require("antd/es/date-picker/generatePicker/
 var import_dayjs = __toESM(require_dayjs_min());
 var import_dayjs2 = __toESM(require_dayjs());
 var React7 = __toESM(require("react"));
-var import_react_querybuilder4 = require("react-querybuilder");
+var import_react_querybuilder3 = require("react-querybuilder");
 
 // src/AntDValueSelector.tsx
 var import_antd5 = require("antd");
 var React6 = __toESM(require("react"));
-var import_react_querybuilder3 = require("react-querybuilder");
+var import_react_querybuilder2 = require("react-querybuilder");
 
 // src/utils.tsx
 var import_antd4 = require("antd");
 var React5 = __toESM(require("react"));
-var import_react_querybuilder2 = require("react-querybuilder");
+var import_react_querybuilder = require("react-querybuilder");
 var { OptGroup, Option } = import_antd4.Select;
-var toOptions = (arr) => (0, import_react_querybuilder2.isOptionGroupArray)(arr) ? arr.map((og) => /* @__PURE__ */ React5.createElement(OptGroup, { key: og.label, label: og.label }, og.options.map((opt) => /* @__PURE__ */ React5.createElement(Option, { key: opt.name, value: opt.name }, opt.label)))) : Array.isArray(arr) ? arr.map((opt) => /* @__PURE__ */ React5.createElement(Option, { key: opt.name, value: opt.name }, opt.label)) : (
+var toOptions = (arr) => (0, import_react_querybuilder.isOptionGroupArray)(arr) ? arr.map((og) => /* @__PURE__ */ React5.createElement(OptGroup, { key: og.label, label: og.label }, og.options.map((opt) => /* @__PURE__ */ React5.createElement(Option, { key: opt.name, value: opt.name }, opt.label)))) : Array.isArray(arr) ? arr.map((opt) => /* @__PURE__ */ React5.createElement(Option, { key: opt.name, value: opt.name }, opt.label)) : (
   /* istanbul ignore next */
   null
 );
@@ -1170,7 +1160,7 @@ var AntDValueSelector = ({
   schema: _schema,
   ...extraProps
 }) => {
-  const { onChange, val } = (0, import_react_querybuilder3.useValueSelector)({ handleOnChange, listsAsArrays, multiple, value });
+  const { onChange, val } = (0, import_react_querybuilder2.useValueSelector)({ handleOnChange, listsAsArrays, multiple, value });
   const modeObj = multiple ? { mode: "multiple" } : {};
   return /* @__PURE__ */ React6.createElement("span", { title, className }, /* @__PURE__ */ React6.createElement(
     import_antd5.Select,
@@ -1208,7 +1198,7 @@ var AntDValueEditor = ({
   selectorComponent: SelectorComponent = AntDValueSelector,
   ...props
 }) => {
-  const { valueAsArray, multiValueHandler } = (0, import_react_querybuilder4.useValueEditor)({
+  const { valueAsArray, multiValueHandler } = (0, import_react_querybuilder3.useValueEditor)({
     handleOnChange,
     inputType,
     operator,
@@ -1233,7 +1223,7 @@ var AntDValueEditor = ({
             {
               key,
               value: valueAsArray[i] ? (0, import_dayjs.default)(valueAsArray[i], "HH:mm:ss") : null,
-              className: import_react_querybuilder4.standardClassnames.valueListItem,
+              className: import_react_querybuilder3.standardClassnames.valueListItem,
               disabled,
               placeholder: placeHolderText,
               onChange: (d) => multiValueHandler(d?.format("HH:mm:ss") ?? "", i)
@@ -1246,7 +1236,7 @@ var AntDValueEditor = ({
             key,
             type: inputTypeCoerced,
             value: valueAsArray[i] ?? "",
-            className: import_react_querybuilder4.standardClassnames.valueListItem,
+            className: import_react_querybuilder3.standardClassnames.valueListItem,
             disabled,
             placeholder: placeHolderText,
             onChange: (e) => multiValueHandler(e.target.value, i)
@@ -1258,10 +1248,10 @@ var AntDValueEditor = ({
         {
           ...props,
           key,
-          className: import_react_querybuilder4.standardClassnames.valueListItem,
+          className: import_react_querybuilder3.standardClassnames.valueListItem,
           handleOnChange: (v) => multiValueHandler(v, i),
           disabled,
-          value: valueAsArray[i] ?? (0, import_react_querybuilder4.getFirstOption)(values),
+          value: valueAsArray[i] ?? (0, import_react_querybuilder3.getFirstOption)(values),
           options: values,
           listsAsArrays
         }
@@ -1352,7 +1342,7 @@ var AntDValueEditor = ({
                 const format = `YYYY-MM-DD${timeFormat}`;
                 const dateArray = dates?.map((d) => d?.isValid() ? d.format(format) : void 0);
                 handleOnChange(
-                  dateArray ? listsAsArrays ? dateArray : (0, import_react_querybuilder4.joinWith)(dateArray, ",") : dates
+                  dateArray ? listsAsArrays ? dateArray : (0, import_react_querybuilder3.joinWith)(dateArray, ",") : dates
                 );
               }
             )
@@ -1432,7 +1422,7 @@ var antdTranslations = {
   shiftActionUp: { label: /* @__PURE__ */ React8.createElement(import_icons2.UpOutlined, null) },
   shiftActionDown: { label: /* @__PURE__ */ React8.createElement(import_icons2.DownOutlined, null) }
 };
-var QueryBuilderAntD = (0, import_react_querybuilder5.getCompatContextProvider)({
+var QueryBuilderAntD = (0, import_react_querybuilder4.getCompatContextProvider)({
   key: "antd",
   controlElements: antdControlElements,
   translations: antdTranslations