@elliemae/ds-query-builder 2.2.0-alpha.4 → 3.0.0-next.2

package/cjs/components/Nestable/index.js

@@ -1,36 +1,7 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
-  }
-  return target;
-};
-var __toESM = (module2, isNodeMode) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-var __toCommonJS = /* @__PURE__ */ ((cache) => {
-  return (module2, temp) => {
-    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
-var Nestable_exports = {};
-__export(Nestable_exports, {
-  default: () => Nestable_default
-});
-var React = __toESM(require("react"));
-var import_Nestable = __toESM(require("./Nestable"));
-var Nestable_default = import_Nestable.default;
-module.exports = __toCommonJS(Nestable_exports);
-//# sourceMappingURL=index.js.map
+'use strict';
+
+var Nestable = require('./Nestable.js');
+
+
+
+module.exports = Nestable;

package/cjs/components/QueryBuilderContext/QueryBuilderContext.js

@@ -1,36 +1,13 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
-  }
-  return target;
-};
-var __toESM = (module2, isNodeMode) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-var __toCommonJS = /* @__PURE__ */ ((cache) => {
-  return (module2, temp) => {
-    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
-var QueryBuilderContext_exports = {};
-__export(QueryBuilderContext_exports, {
-  QueryBuilderContext: () => QueryBuilderContext
-});
-var React = __toESM(require("react"));
-var import_react = __toESM(require("react"));
-const QueryBuilderContext = import_react.default.createContext({});
-module.exports = __toCommonJS(QueryBuilderContext_exports);
-//# sourceMappingURL=QueryBuilderContext.js.map
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+const QueryBuilderContext = /*#__PURE__*/React__default["default"].createContext({});
+
+exports.QueryBuilderContext = QueryBuilderContext;

package/cjs/components/QueryBuilderImpl.js

@@ -1,158 +1,239 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __reExport = (target, module2, copyDefault, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
-  }
-  return target;
-};
-var __toESM = (module2, isNodeMode) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", !isNodeMode && module2 && module2.__esModule ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-var __toCommonJS = /* @__PURE__ */ ((cache) => {
-  return (module2, temp) => {
-    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
-  };
-})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
-var QueryBuilderImpl_exports = {};
-__export(QueryBuilderImpl_exports, {
-  default: () => QueryBuilderImpl_default
-});
-var React = __toESM(require("react"));
-var import_react = __toESM(require("react"));
-var import_Nestable = __toESM(require("./Nestable"));
-var import_QueryBuilderContext = require("./QueryBuilderContext/QueryBuilderContext");
-var import_types = require("./helpers/types");
-var import_store = __toESM(require("./helpers/store"));
-var import_AndOrController = __toESM(require("./AndOrController/AndOrController"));
-var import_QueryBuilderItem = __toESM(require("./QueryBuilderItem/QueryBuilderItem"));
-var import_DisplayOutput = __toESM(require("./DisplayOutput/DisplayOutput"));
-class QueryBuilderImpl extends import_react.Component {
+'use strict';
+
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
+var _jsx = require('@babel/runtime/helpers/jsx');
+var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var React = require('react');
+var Nestable = require('./Nestable/Nestable.js');
+var QueryBuilderContext = require('./QueryBuilderContext/QueryBuilderContext.js');
+var types = require('./helpers/types.js');
+var store = require('./helpers/store.js');
+var AndOrController = require('./AndOrController/AndOrController.js');
+var QueryBuilderItem = require('./QueryBuilderItem/QueryBuilderItem.js');
+var DisplayOutput = require('./DisplayOutput/DisplayOutput.js');
+var jsxRuntime = require('react/jsx-runtime');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
+var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+
+const _excluded = ["format"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+class QueryBuilderImpl extends React.Component {
   constructor(props) {
     super(props);
     this.isDraggableItem = true;
+
     this.onOrderDragAndDrop = (items, item) => {
       const newFilters = this.store.onOrderDragAndDrop(items, item);
-      this.sendCall("reOrderOnDragAndDrop", { items });
+      this.sendCall('reOrderOnDragAndDrop', {
+        items
+      });
       this.sendChange(newFilters);
     };
-    this.onAddFilterToGroup = (idGroup) => {
+
+    this.onAddFilterToGroup = idGroup => {
       const newFilters = this.store.addFilter(idGroup);
-      this.sendCall("onAddFilterToGroup", { idGroup });
+      this.sendCall('onAddFilterToGroup', {
+        idGroup
+      });
       this.sendChange(newFilters);
     };
+
     this.onAddFilter = (idGroup, idFilter) => {
-      const { addFilterMethod } = this.props;
-      const newFilters = addFilterMethod === import_types.QB_ADD_FILTER_METHOD_TYPES.IN_PLACE ? this.store.addFilterNextToFilterId(idGroup, idFilter) : this.onAddFilterToGroup(idGroup);
-      this.sendCall("onAddFilter", { idGroup, idFilter });
+      const {
+        addFilterMethod
+      } = this.props;
+      const newFilters = addFilterMethod === types.QB_ADD_FILTER_METHOD_TYPES.IN_PLACE ? this.store.addFilterNextToFilterId(idGroup, idFilter) : this.onAddFilterToGroup(idGroup);
+      this.sendCall('onAddFilter', {
+        idGroup,
+        idFilter
+      });
       this.sendChange(newFilters);
     };
+
     this.onAddRuleContainer = (idGroup, idFilter) => {
-      const { groupFilterMethod } = this.props;
-      const newFilters = groupFilterMethod === import_types.QB_GROUP_FILTER_METHOD_TYPES.IN_PLACE ? this.store.addRuleContainerInPlace(idGroup, idFilter) : this.store.addRuleContainer(idGroup, idFilter);
-      this.sendCall("onAddRuleContainer", { idGroup, idFilter });
+      const {
+        groupFilterMethod
+      } = this.props;
+      const newFilters = groupFilterMethod === types.QB_GROUP_FILTER_METHOD_TYPES.IN_PLACE ? this.store.addRuleContainerInPlace(idGroup, idFilter) : this.store.addRuleContainer(idGroup, idFilter);
+      this.sendCall('onAddRuleContainer', {
+        idGroup,
+        idFilter
+      });
       this.sendChange(newFilters);
     };
-    this.onRemoveFilter = (idFilter) => {
+
+    this.onRemoveFilter = idFilter => {
       const newFilters = this.store.onRemoveFilter(idFilter);
-      this.sendCall("onRemoveFilter", { idFilter });
+      this.sendCall('onRemoveFilter', {
+        idFilter
+      });
       this.sendChange(newFilters);
     };
-    this.handleFieldChange = (data) => {
-      const { fieldsSharedActions } = this.props;
-      const newFilters = this.store.changeFilter({
-        ...data,
+
+    this.handleFieldChange = data => {
+      const {
         fieldsSharedActions
+      } = this.props;
+      const newFilters = this.store.changeFilter(_objectSpread(_objectSpread({}, data), {}, {
+        fieldsSharedActions
+      }));
+      this.sendCall('handleFieldChange', {
+        data
       });
-      this.sendCall("handleFieldChange", { data });
       this.sendChange(newFilters);
     };
+
     this.handleRuleContainerOperator = (idGroup, value) => {
       const newFilters = this.store.changeGroupOperator(idGroup, value);
-      this.sendCall("handleRuleContainerOperator", { idGroup, value });
+      this.sendCall('handleRuleContainerOperator', {
+        idGroup,
+        value
+      });
       this.sendChange(newFilters);
     };
-    this.handleRuleContainerUnGroup = (idGroup) => {
+
+    this.handleRuleContainerUnGroup = idGroup => {
       const newFilters = this.store.unGroup(idGroup);
-      this.sendCall("handleRuleContainerUnGroup", { idGroup });
+      this.sendCall('handleRuleContainerUnGroup', {
+        idGroup
+      });
       this.sendChange(newFilters);
     };
+
     this.handleDropFilter = (filter, dragTo) => {
-      const { position: oldPosition, idGroup, idFilter } = filter;
-      const { position: newPosition, targetIdGroup } = dragTo;
+      const {
+        position: oldPosition,
+        idGroup,
+        idFilter
+      } = filter;
+      const {
+        position: newPosition,
+        targetIdGroup
+      } = dragTo;
       const newFilters = this.store.reOrderFilter(idFilter, idGroup, oldPosition, newPosition, targetIdGroup);
-      this.sendCall("handleDropFilter", { filter, dragTo });
+      this.sendCall('handleDropFilter', {
+        filter,
+        dragTo
+      });
       this.sendChange(newFilters);
     };
+
     this.handleDropGroup = (group, dragTo) => {
-      const { position: oldPosition, idFilter, idGroup } = group;
-      const { position: newPosition, targetIdGroup } = dragTo;
+      const {
+        position: oldPosition,
+        idFilter,
+        idGroup
+      } = group;
+      const {
+        position: newPosition,
+        targetIdGroup
+      } = dragTo;
       const newFilters = this.store.reOrderFilter(idFilter, idGroup, oldPosition, newPosition, targetIdGroup);
-      this.sendCall("handleDropGroup", { group, dragTo });
+      this.sendCall('handleDropGroup', {
+        group,
+        dragTo
+      });
       this.sendChange(newFilters);
     };
+
     this.handleDrop = (dragElement, dragTo) => {
-      const { type } = dragElement;
-      if (type === import_types.QB_DRAG_TYPES.FILTER)
-        return this.handleDropFilter(dragElement, dragTo);
+      const {
+        type
+      } = dragElement;
+      if (type === types.QB_DRAG_TYPES.FILTER) return this.handleDropFilter(dragElement, dragTo);
       return this.handleDropGroup(dragElement, dragTo);
     };
-    this.sendChange = ({ format, ...newFilters }) => {
-      this.setState({ format, ...newFilters });
-      const { onChange } = this.props;
+
+    this.sendChange = _ref => {
+      let {
+        format
+      } = _ref,
+          newFilters = _objectWithoutProperties__default["default"](_ref, _excluded);
+
+      this.setState(_objectSpread({
+        format
+      }, newFilters));
+      const {
+        onChange
+      } = this.props;
       onChange(format, newFilters);
     };
+
     this.sendCall = (action, data) => {
-      const { [action]: callback } = this.props;
-      if (callback)
-        callback(data);
+      const {
+        [action]: callback
+      } = this.props;
+      if (callback) callback(data);
     };
-    this.setDraggableItems = (drag) => {
+
+    this.setDraggableItems = drag => {
       this.isDraggableItem = true;
+
       try {
         const ua = window.navigator.userAgent;
-        const msie = ua.indexOf("MSIE ");
+        const msie = ua.indexOf('MSIE '); // eslint-disable-next-line no-useless-escape
+
         if (msie > 0 || !!navigator.userAgent.match(/Trident.*rv\:11\./)) {
-          const { isDraggableItem } = this.state;
+          const {
+            isDraggableItem
+          } = this.state;
+
           if (drag !== isDraggableItem) {
-            this.setState({ isDraggableItem: drag });
+            this.setState({
+              isDraggableItem: drag
+            });
           }
+
           this.isDraggableItem = drag;
         }
       } catch (error) {
         this.isDraggableItem = true;
       }
     };
-    this.store = new import_store.default(props.init, props.format);
+
+    this.store = new store(props.init, props.format);
     this.state = this.store.getInitialState();
   }
+
   static getDerivedStateFromProps(props, state) {
-    if (props.init && props.init.step !== void 0 && Number.isInteger(props.init.step) && props.init.step !== state.step) {
-      const store = new import_store.default(props.init, props.format);
-      QueryBuilderImpl.recalculateStore = store;
-      return store.getInitialState();
+    if (props.init && props.init.step !== undefined && Number.isInteger(props.init.step) && props.init.step !== state.step) {
+      const store$1 = new store(props.init, props.format);
+      QueryBuilderImpl.recalculateStore = store$1;
+      return store$1.getInitialState();
     }
+
     return null;
   }
+
   componentDidUpdate() {
     if (QueryBuilderImpl.recalculateStore) {
       this.store = QueryBuilderImpl.recalculateStore;
       QueryBuilderImpl.recalculateStore = null;
     }
   }
+
   render() {
-    const { mapGroups, main, mapFilters, step, items, format } = this.state;
+    const {
+      mapGroups,
+      main,
+      mapFilters,
+      step,
+      items,
+      format
+    } = this.state;
     const {
       containerProps,
       ruleContainerClassName,
@@ -162,9 +243,12 @@ class QueryBuilderImpl extends import_react.Component {
       displayOutputLabel,
       singleRow,
       toolTipZIndex
-    } = this.props;
-    const { condition } = mapGroups[main];
-    return /* @__PURE__ */ import_react.default.createElement(import_QueryBuilderContext.QueryBuilderContext.Provider, {
+    } = this.props; // const { children } = items[0]
+
+    const {
+      condition
+    } = mapGroups[main];
+    return /*#__PURE__*/_jsx__default["default"](QueryBuilderContext.QueryBuilderContext.Provider, {
       value: {
         toolTipZIndex,
         fields,
@@ -187,39 +271,39 @@ class QueryBuilderImpl extends import_react.Component {
         setDraggableItems: this.setDraggableItems,
         singleRow
       }
-    }, /* @__PURE__ */ import_react.default.createElement("div", {
-      ...containerProps,
-      className: `nested-main-group ${condition !== true ? "is-or-group" : "is-and-groupL"} ${singleRow ? "query-main-single-row" : "query-main-multiple-row"}`
-    }, /* @__PURE__ */ import_react.default.createElement(import_Nestable.default, {
-      isAndItem: condition === true,
-      isDraggableItem: this.isDraggableItem,
-      isOrItem: condition !== true,
-      items,
-      onChange: this.onOrderDragAndDrop,
-      renderItem: import_QueryBuilderItem.default,
-      setDraggableItems: this.setDraggableItems,
-      step,
-      singleRow
-    }), !singleRow && /* @__PURE__ */ import_react.default.createElement("div", {
-      className: "rule-container-options"
-    }, /* @__PURE__ */ import_react.default.createElement(import_AndOrController.default, {
-      allowUnGroup: false,
-      condition,
-      handleRuleContainerOperator: (value) => this.handleRuleContainerOperator(main, value),
-      handleRuleContainerUnGroup: () => this.handleRuleContainerUnGroup(main),
-      isMain: true,
-      onAddFilter: () => this.onAddFilterToGroup(main),
-      showDragController: false,
-      step,
-      toolTipZIndex
-    }))), (displayOutput || displayFixedOutput) && /* @__PURE__ */ import_react.default.createElement(import_DisplayOutput.default, {
-      displayFixedOutput,
+    }, void 0, /*#__PURE__*/jsxRuntime.jsxs("div", _objectSpread(_objectSpread({}, containerProps), {}, {
+      className: "nested-main-group ".concat(condition !== true ? 'is-or-group' : 'is-and-groupL', " ").concat(singleRow ? 'query-main-single-row' : 'query-main-multiple-row'),
+      children: [/*#__PURE__*/_jsx__default["default"](Nestable, {
+        isAndItem: condition === true,
+        isDraggableItem: this.isDraggableItem,
+        isOrItem: condition !== true,
+        items: items,
+        onChange: this.onOrderDragAndDrop,
+        renderItem: QueryBuilderItem,
+        setDraggableItems: this.setDraggableItems,
+        step: step,
+        singleRow: singleRow
+      }), !singleRow && /*#__PURE__*/_jsx__default["default"]("div", {
+        className: "rule-container-options"
+      }, void 0, /*#__PURE__*/_jsx__default["default"](AndOrController, {
+        allowUnGroup: false,
+        condition: condition,
+        handleRuleContainerOperator: value => this.handleRuleContainerOperator(main, value),
+        handleRuleContainerUnGroup: () => this.handleRuleContainerUnGroup(main),
+        isMain: true,
+        onAddFilter: () => this.onAddFilterToGroup(main),
+        showDragController: false,
+        step: step,
+        toolTipZIndex: toolTipZIndex
+      }))]
+    })), (displayOutput || displayFixedOutput) && /*#__PURE__*/_jsx__default["default"](DisplayOutput, {
+      displayFixedOutput: displayFixedOutput,
       hideLabel: displayOutputLabel.hide,
       showLabel: displayOutputLabel.show,
       show: displayOutputLabel.open
     }));
   }
+
 }
-var QueryBuilderImpl_default = QueryBuilderImpl;
-module.exports = __toCommonJS(QueryBuilderImpl_exports);
-//# sourceMappingURL=QueryBuilderImpl.js.map
+
+module.exports = QueryBuilderImpl;