@elliemae/ds-query-builder 2.0.0-rc.8 → 2.0.1

package/cjs/components/AndOrController/AndOrController.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var _jsx = require('@babel/runtime/helpers/jsx');
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var React = require('react');
 var dsClassnames = require('@elliemae/ds-classnames');
 var DSTooltip = require('@elliemae/ds-tooltip');
@@ -18,7 +17,6 @@ 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 _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var DSTooltip__default = /*#__PURE__*/_interopDefaultLegacy(DSTooltip);
 var DSButton__default = /*#__PURE__*/_interopDefaultLegacy(DSButton);
@@ -42,11 +40,11 @@ class AndOrController extends React.Component {
   constructor(props) {
     super(props);
 
-    _defineProperty__default["default"](this, "handleMouseEnterRow", e => {
+    this.handleMouseEnterRow = e => {
       this.handleTooltipRow(true); // this.handleMouseMove(e)
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleMouseMove", e => {
+    this.handleMouseMove = e => {
       if (!this.contenerRef.current) return;
       const mouse = e.clientY;
       const {
@@ -58,13 +56,13 @@ class AndOrController extends React.Component {
       this.setState({
         top: mouse - topDiff - refHeight / 2 - delta
       });
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleMouseLeaveRow", () => {
+    this.handleMouseLeaveRow = () => {
       this.handleTooltipRow(false);
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleTooltipRow", isOpen => {
+    this.handleTooltipRow = isOpen => {
       this.setState({
         isOpen
       });
@@ -72,7 +70,7 @@ class AndOrController extends React.Component {
         handleTooltipGroup
       } = this.props;
       handleTooltipGroup(isOpen);
-    });
+    };
 
     this.contenerRef = /*#__PURE__*/React__default["default"].createRef();
     this.myRef = /*#__PURE__*/React__default["default"].createRef();
@@ -198,7 +196,7 @@ class AndOrController extends React.Component {
 
 }
 
-_defineProperty__default["default"](AndOrController, "defaultProps", {
+AndOrController.defaultProps = {
   isMain: false,
   handleRuleContainerOperator: () => null,
   handleRuleContainerUnGroup: () => null,
@@ -219,6 +217,6 @@ _defineProperty__default["default"](AndOrController, "defaultProps", {
   toolBarAnimationDuration: constants.TOOLBAR_ANIMATION_DURATION,
   toolBarInteractionType: dsPopper.PopperInteractions.CLICK,
   toolBarPosition: dsPopper.PopperPositions.LEFT
-});
+};
 
 module.exports = AndOrController;

package/cjs/components/DisplayOutput/DisplayOutput.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var _jsx = require('@babel/runtime/helpers/jsx');
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var React = require('react');
 var dsGrid = require('@elliemae/ds-grid');
 var dsClassnames = require('@elliemae/ds-classnames');
@@ -12,7 +11,6 @@ var QueryBuilderContext = require('../QueryBuilderContext/QueryBuilderContext.js
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 
 const {
   cssClassName
@@ -22,7 +20,7 @@ class DisplayOutput extends React.Component {
   constructor(props) {
     super(props);
 
-    _defineProperty__default["default"](this, "handleChange", () => {
+    this.handleChange = () => {
       this.setState(_ref => {
         let {
           show
@@ -31,7 +29,7 @@ class DisplayOutput extends React.Component {
           show: !show
         };
       });
-    });
+    };
 
     this.state = {
       show: props.show

package/cjs/components/Nestable/Nestable.js

@@ -39,43 +39,43 @@ class Nestable extends React.Component {
   constructor(props) {
     super(props);
 
-    _defineProperty__default["default"](this, "onDragStart", (e, item) => {
+    this.onDragStart = (e, item) => {
       events.onDragStart.call(this, e, item);
-    });
+    };
 
-    _defineProperty__default["default"](this, "onDragEnd", (e, isCancel) => events.onDragEnd.call(this, e, isCancel));
+    this.onDragEnd = (e, isCancel) => events.onDragEnd.call(this, e, isCancel);
 
-    _defineProperty__default["default"](this, "onMouseMove", e => events.onMouseMove.call(this, e));
+    this.onMouseMove = e => events.onMouseMove.call(this, e);
 
-    _defineProperty__default["default"](this, "onMouseEnter", (e, item) => events.onMouseEnter.call(this, e, item));
+    this.onMouseEnter = (e, item) => events.onMouseEnter.call(this, e, item);
 
-    _defineProperty__default["default"](this, "onToggleCollapse", (item, isGetter) => events.onToggleCollapse.call(this, item, isGetter));
+    this.onToggleCollapse = (item, isGetter) => events.onToggleCollapse.call(this, item, isGetter);
 
-    _defineProperty__default["default"](this, "onKeyDown", e => events.onKeyDown.call(this, e));
+    this.onKeyDown = e => events.onKeyDown.call(this, e);
 
-    _defineProperty__default["default"](this, "getDefaultItems", () => {
+    this.getDefaultItems = () => {
       const {
         items
       } = this.state;
       return items;
-    });
+    };
 
-    _defineProperty__default["default"](this, "getItemDepth", item => paths.getItemDepth.call(this, item));
+    this.getItemDepth = item => paths.getItemDepth.call(this, item);
 
-    _defineProperty__default["default"](this, "startTrackMouse", () => {
+    this.startTrackMouse = () => {
       document.addEventListener('mousemove', this.onMouseMove);
       document.addEventListener('mouseup', this.onDragEnd);
       document.addEventListener('keydown', this.onKeyDown);
-    });
+    };
 
-    _defineProperty__default["default"](this, "stopTrackMouse", () => {
+    this.stopTrackMouse = () => {
       document.removeEventListener('mousemove', this.onMouseMove);
       document.removeEventListener('mouseup', this.onDragEnd);
       document.removeEventListener('keydown', this.onKeyDown);
       this.elCopyStyles = null;
-    });
+    };
 
-    _defineProperty__default["default"](this, "isCollapsed", item => {
+    this.isCollapsed = item => {
       const {
         collapsed
       } = this.props;
@@ -83,9 +83,9 @@ class Nestable extends React.Component {
         collapsedGroups
       } = this.state;
       return !!(collapsedGroups.indexOf(item.id) > -1 ^ collapsed);
-    });
+    };
 
-    _defineProperty__default["default"](this, "checkFilterChildren", items => items.find(current => {
+    this.checkFilterChildren = items => items.find(current => {
       const {
         element: {
           type
@@ -94,9 +94,9 @@ class Nestable extends React.Component {
       } = current;
       if (type === 'filter' && children.length > 0) return true;
       return this.checkFilterChildren(children);
-    }));
+    });
 
-    _defineProperty__default["default"](this, "dragRevert", () => {
+    this.dragRevert = () => {
       const {
         itemsOld
       } = this.state;
@@ -106,7 +106,7 @@ class Nestable extends React.Component {
         dragItem: null,
         isDirty: false
       });
-    });
+    };
 
     this.state = {
       items: [],

package/cjs/components/QueryBuilderImpl.js

@@ -33,26 +33,25 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 class QueryBuilderImpl extends React.Component {
   constructor(props) {
     super(props);
+    this.isDraggableItem = true;
 
-    _defineProperty__default["default"](this, "isDraggableItem", true);
-
-    _defineProperty__default["default"](this, "onOrderDragAndDrop", (items, item) => {
+    this.onOrderDragAndDrop = (items, item) => {
       const newFilters = this.store.onOrderDragAndDrop(items, item);
       this.sendCall('reOrderOnDragAndDrop', {
         items
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "onAddFilterToGroup", idGroup => {
+    this.onAddFilterToGroup = idGroup => {
       const newFilters = this.store.addFilter(idGroup);
       this.sendCall('onAddFilterToGroup', {
         idGroup
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "onAddFilter", (idGroup, idFilter) => {
+    this.onAddFilter = (idGroup, idFilter) => {
       const {
         addFilterMethod
       } = this.props;
@@ -62,9 +61,9 @@ class QueryBuilderImpl extends React.Component {
         idFilter
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "onAddRuleContainer", (idGroup, idFilter) => {
+    this.onAddRuleContainer = (idGroup, idFilter) => {
       const {
         groupFilterMethod
       } = this.props;
@@ -74,17 +73,17 @@ class QueryBuilderImpl extends React.Component {
         idFilter
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "onRemoveFilter", idFilter => {
+    this.onRemoveFilter = idFilter => {
       const newFilters = this.store.onRemoveFilter(idFilter);
       this.sendCall('onRemoveFilter', {
         idFilter
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleFieldChange", data => {
+    this.handleFieldChange = data => {
       const {
         fieldsSharedActions
       } = this.props;
@@ -95,26 +94,26 @@ class QueryBuilderImpl extends React.Component {
         data
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleRuleContainerOperator", (idGroup, value) => {
+    this.handleRuleContainerOperator = (idGroup, value) => {
       const newFilters = this.store.changeGroupOperator(idGroup, value);
       this.sendCall('handleRuleContainerOperator', {
         idGroup,
         value
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleRuleContainerUnGroup", idGroup => {
+    this.handleRuleContainerUnGroup = idGroup => {
       const newFilters = this.store.unGroup(idGroup);
       this.sendCall('handleRuleContainerUnGroup', {
         idGroup
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleDropFilter", (filter, dragTo) => {
+    this.handleDropFilter = (filter, dragTo) => {
       const {
         position: oldPosition,
         idGroup,
@@ -130,9 +129,9 @@ class QueryBuilderImpl extends React.Component {
         dragTo
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleDropGroup", (group, dragTo) => {
+    this.handleDropGroup = (group, dragTo) => {
       const {
         position: oldPosition,
         idFilter,
@@ -148,17 +147,17 @@ class QueryBuilderImpl extends React.Component {
         dragTo
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleDrop", (dragElement, dragTo) => {
+    this.handleDrop = (dragElement, dragTo) => {
       const {
         type
       } = dragElement;
       if (type === types.QB_DRAG_TYPES.FILTER) return this.handleDropFilter(dragElement, dragTo);
       return this.handleDropGroup(dragElement, dragTo);
-    });
+    };
 
-    _defineProperty__default["default"](this, "sendChange", _ref => {
+    this.sendChange = _ref => {
       let {
         format
       } = _ref,
@@ -171,16 +170,16 @@ class QueryBuilderImpl extends React.Component {
         onChange
       } = this.props;
       onChange(format, newFilters);
-    });
+    };
 
-    _defineProperty__default["default"](this, "sendCall", (action, data) => {
+    this.sendCall = (action, data) => {
       const {
         [action]: callback
       } = this.props;
       if (callback) callback(data);
-    });
+    };
 
-    _defineProperty__default["default"](this, "setDraggableItems", drag => {
+    this.setDraggableItems = drag => {
       this.isDraggableItem = true;
 
       try {
@@ -203,7 +202,7 @@ class QueryBuilderImpl extends React.Component {
       } catch (error) {
         this.isDraggableItem = true;
       }
-    });
+    };
 
     this.store = new store(props.init, props.format);
     this.state = this.store.getInitialState();

package/cjs/components/QueryBuilderRow/QueryBuilderRow.js

@@ -114,31 +114,31 @@ class QueryBuilderRow extends React.Component {
   constructor(props) {
     super(props);
 
-    _defineProperty__default["default"](this, "handleMouseEnterRow", () => {});
+    this.handleMouseEnterRow = () => {};
 
-    _defineProperty__default["default"](this, "handleMouseLeaveRow", () => {
+    this.handleMouseLeaveRow = () => {
       this.handleTooltipRow(false);
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleMouseEnterInput", () => {
+    this.handleMouseEnterInput = () => {
       const {
         setDraggableItems
       } = this.props;
       setDraggableItems(false);
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleMouseLeaveInput", () => {
+    this.handleMouseLeaveInput = () => {
       const {
         setDraggableItems
       } = this.props;
       setDraggableItems(true);
-    });
+    };
 
-    _defineProperty__default["default"](this, "handleTooltipRow", isOpen => {
+    this.handleTooltipRow = isOpen => {
       this.setState({
         isOpen
       });
-    });
+    };
 
     this.state = {
       isOpen: false

package/cjs/components/format/format.js

@@ -1,35 +1,29 @@
 'use strict';
 
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var sqlFormat = require('./sqlFormat.js');
 var xmlFormat = require('./xmlFormat.js');
 var sqlSafeFormat = require('./sqlSafeFormat.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
-
 class QueryBuilderFormat {
   constructor() {
-    _defineProperty__default["default"](this, "format", {
+    this.format = {
       defaultFormat: query => query,
       sqlFormat: sqlFormat.sqlFormat,
       xmlFormat: xmlFormat.xmlFormat,
       sqlSafeFormat: sqlSafeFormat.sqlSafeFormat
-    });
-
-    _defineProperty__default["default"](this, "currentFormat", 'sqlFormat');
+    };
+    this.currentFormat = 'sqlFormat';
 
-    _defineProperty__default["default"](this, "setDefaultFormat", formatName => {
+    this.setDefaultFormat = formatName => {
       if (this.format[formatName]) this.currentFormat = formatName;
-    });
+    };
 
-    _defineProperty__default["default"](this, "addFormat", (formatName, format) => this.format[formatName] = format);
+    this.addFormat = (formatName, format) => this.format[formatName] = format;
 
-    _defineProperty__default["default"](this, "run", (query, formatName) => {
+    this.run = (query, formatName) => {
       if (this.format[formatName]) return this.format[formatName](query);
       return this.format[this.currentFormat](query);
-    });
+    };
   }
 
 }

package/cjs/components/helpers/store.js

@@ -30,36 +30,30 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 class QueryBuilderStore {
   constructor(init, _format) {
-    _defineProperty__default["default"](this, "items", []);
+    this.items = [];
+    this.step = 0;
+    this.steps = {};
+    this.mapFilters = {};
+    this.mapGroups = {};
+    this.main = null;
+    this.format = null;
 
-    _defineProperty__default["default"](this, "step", 0);
+    this.createNewFilter = idGroup => actions.createNewFilter.call(this, idGroup);
 
-    _defineProperty__default["default"](this, "steps", {});
+    this.createNewGroup = parentIdGroup => actions.createNewGroup.call(this, parentIdGroup);
 
-    _defineProperty__default["default"](this, "mapFilters", {});
-
-    _defineProperty__default["default"](this, "mapGroups", {});
-
-    _defineProperty__default["default"](this, "main", null);
-
-    _defineProperty__default["default"](this, "format", null);
-
-    _defineProperty__default["default"](this, "createNewFilter", idGroup => actions.createNewFilter.call(this, idGroup));
-
-    _defineProperty__default["default"](this, "createNewGroup", parentIdGroup => actions.createNewGroup.call(this, parentIdGroup));
-
-    _defineProperty__default["default"](this, "onOrderDragAndDrop", items => {
+    this.onOrderDragAndDrop = items => {
       this.items = items;
       return this.getState();
-    });
+    };
 
-    _defineProperty__default["default"](this, "addFilterNextToFilterId", (idGroup, idFilter) => {
+    this.addFilterNextToFilterId = (idGroup, idFilter) => {
       // eslint-disable-line
       this.addFilter(idGroup);
       return this.getState();
-    });
+    };
 
-    _defineProperty__default["default"](this, "addFilter", idGroup => {
+    this.addFilter = idGroup => {
       const newFilter = this.createNewFilter(idGroup);
       actions.addFilterToMap.call(this, newFilter); // new API
 
@@ -74,22 +68,22 @@ class QueryBuilderStore {
       }
 
       return this.getState();
-    });
+    };
 
-    _defineProperty__default["default"](this, "onRemoveFilter", idFilter => {
+    this.onRemoveFilter = idFilter => {
       // new API
       actions.removeFilterItem.call(this, idFilter);
       return this.getState();
-    });
+    };
 
-    _defineProperty__default["default"](this, "addRuleContainerInPlace", (idGroup, idFilter) => {
+    this.addRuleContainerInPlace = (idGroup, idFilter) => {
       // Create a new group
       const newGroup = this.createNewGroup(idGroup);
       actions.addGroupFilterToItem.call(this, idGroup, idFilter, newGroup);
       return this.getState();
-    });
+    };
 
-    _defineProperty__default["default"](this, "addRuleContainer", (idGroup, idFilter) => {
+    this.addRuleContainer = (idGroup, idFilter) => {
       // eslint-disable-line
       const newGroup = this.createNewGroup(idGroup);
       actions.addGroupToMap.call(this, newGroup);
@@ -105,33 +99,33 @@ class QueryBuilderStore {
       }
 
       return this.getState();
-    });
+    };
 
-    _defineProperty__default["default"](this, "unGroup", idGroup => {
+    this.unGroup = idGroup => {
       actions.unGroupFilterToItem.call(this, idGroup);
       return this.getState();
-    });
+    };
 
-    _defineProperty__default["default"](this, "changeGroupOperator", (idGroup, value) => {
+    this.changeGroupOperator = (idGroup, value) => {
       this.getGroupById(idGroup).condition = value;
       actions.changeGroupOperator.call(this, idGroup, value);
       return this.getState();
-    });
+    };
 
-    _defineProperty__default["default"](this, "changeFilter", data => {
+    this.changeFilter = data => {
       const {
         idFilter
       } = data;
       this.mapFilters[idFilter] = _objectSpread(_objectSpread({}, this.mapFilters[idFilter]), data);
       actions.changeFilterItem.call(this, data);
       return this.getState();
-    });
+    };
 
-    _defineProperty__default["default"](this, "getGroupById", idGroup => this.mapGroups[idGroup] || {});
+    this.getGroupById = idGroup => this.mapGroups[idGroup] || {};
 
-    _defineProperty__default["default"](this, "getFilterById", idFilter => this.mapFilters[idFilter]);
+    this.getFilterById = idFilter => this.mapFilters[idFilter];
 
-    _defineProperty__default["default"](this, "getInitialState", () => {
+    this.getInitialState = () => {
       const newFilters = {
         step: this.step,
         mapFilters: _objectSpread({}, this.mapFilters),
@@ -143,9 +137,9 @@ class QueryBuilderStore {
       return _objectSpread(_objectSpread({}, newFilters), {}, {
         format: format$1
       });
-    });
+    };
 
-    _defineProperty__default["default"](this, "getState", () => {
+    this.getState = () => {
       this.step += 1;
       const newFilters = {
         step: this.step,
@@ -158,7 +152,7 @@ class QueryBuilderStore {
       return _objectSpread(_objectSpread({}, newFilters), {}, {
         format: format$1
       });
-    });
+    };
 
     this.firstLoad = true;
     this.format = _format;

package/esm/components/AndOrController/AndOrController.js

@@ -1,5 +1,4 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
-import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import React, { Component } from 'react';
 import { convertPropToCssClassName } from '@elliemae/ds-classnames';
 import DSTooltip, { TooltipType } from '@elliemae/ds-tooltip';
@@ -32,11 +31,11 @@ class AndOrController extends Component {
   constructor(props) {
     super(props);
 
-    _defineProperty(this, "handleMouseEnterRow", e => {
+    this.handleMouseEnterRow = e => {
       this.handleTooltipRow(true); // this.handleMouseMove(e)
-    });
+    };
 
-    _defineProperty(this, "handleMouseMove", e => {
+    this.handleMouseMove = e => {
       if (!this.contenerRef.current) return;
       const mouse = e.clientY;
       const {
@@ -48,13 +47,13 @@ class AndOrController extends Component {
       this.setState({
         top: mouse - topDiff - refHeight / 2 - delta
       });
-    });
+    };
 
-    _defineProperty(this, "handleMouseLeaveRow", () => {
+    this.handleMouseLeaveRow = () => {
       this.handleTooltipRow(false);
-    });
+    };
 
-    _defineProperty(this, "handleTooltipRow", isOpen => {
+    this.handleTooltipRow = isOpen => {
       this.setState({
         isOpen
       });
@@ -62,7 +61,7 @@ class AndOrController extends Component {
         handleTooltipGroup
       } = this.props;
       handleTooltipGroup(isOpen);
-    });
+    };
 
     this.contenerRef = /*#__PURE__*/React.createRef();
     this.myRef = /*#__PURE__*/React.createRef();
@@ -188,7 +187,7 @@ class AndOrController extends Component {
 
 }
 
-_defineProperty(AndOrController, "defaultProps", {
+AndOrController.defaultProps = {
   isMain: false,
   handleRuleContainerOperator: () => null,
   handleRuleContainerUnGroup: () => null,
@@ -209,6 +208,6 @@ _defineProperty(AndOrController, "defaultProps", {
   toolBarAnimationDuration: TOOLBAR_ANIMATION_DURATION,
   toolBarInteractionType: PopperInteractions.CLICK,
   toolBarPosition: PopperPositions.LEFT
-});
+};
 
 export { AndOrController as default };

package/esm/components/DisplayOutput/DisplayOutput.js

@@ -1,5 +1,4 @@
 import _jsx from '@babel/runtime/helpers/esm/jsx';
-import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import { Component } from 'react';
 import { Grid } from '@elliemae/ds-grid';
 import { convertPropToCssClassName } from '@elliemae/ds-classnames';
@@ -15,7 +14,7 @@ class DisplayOutput extends Component {
   constructor(props) {
     super(props);
 
-    _defineProperty(this, "handleChange", () => {
+    this.handleChange = () => {
       this.setState(_ref => {
         let {
           show
@@ -24,7 +23,7 @@ class DisplayOutput extends Component {
           show: !show
         };
       });
-    });
+    };
 
     this.state = {
       show: props.show

package/esm/components/Nestable/Nestable.js

@@ -31,43 +31,43 @@ class Nestable extends Component {
   constructor(props) {
     super(props);
 
-    _defineProperty(this, "onDragStart", (e, item) => {
+    this.onDragStart = (e, item) => {
       onDragStart.call(this, e, item);
-    });
+    };
 
-    _defineProperty(this, "onDragEnd", (e, isCancel) => onDragEnd.call(this, e, isCancel));
+    this.onDragEnd = (e, isCancel) => onDragEnd.call(this, e, isCancel);
 
-    _defineProperty(this, "onMouseMove", e => onMouseMove.call(this, e));
+    this.onMouseMove = e => onMouseMove.call(this, e);
 
-    _defineProperty(this, "onMouseEnter", (e, item) => onMouseEnter.call(this, e, item));
+    this.onMouseEnter = (e, item) => onMouseEnter.call(this, e, item);
 
-    _defineProperty(this, "onToggleCollapse", (item, isGetter) => onToggleCollapse.call(this, item, isGetter));
+    this.onToggleCollapse = (item, isGetter) => onToggleCollapse.call(this, item, isGetter);
 
-    _defineProperty(this, "onKeyDown", e => onKeyDown.call(this, e));
+    this.onKeyDown = e => onKeyDown.call(this, e);
 
-    _defineProperty(this, "getDefaultItems", () => {
+    this.getDefaultItems = () => {
       const {
         items
       } = this.state;
       return items;
-    });
+    };
 
-    _defineProperty(this, "getItemDepth", item => getItemDepth.call(this, item));
+    this.getItemDepth = item => getItemDepth.call(this, item);
 
-    _defineProperty(this, "startTrackMouse", () => {
+    this.startTrackMouse = () => {
       document.addEventListener('mousemove', this.onMouseMove);
       document.addEventListener('mouseup', this.onDragEnd);
       document.addEventListener('keydown', this.onKeyDown);
-    });
+    };
 
-    _defineProperty(this, "stopTrackMouse", () => {
+    this.stopTrackMouse = () => {
       document.removeEventListener('mousemove', this.onMouseMove);
       document.removeEventListener('mouseup', this.onDragEnd);
       document.removeEventListener('keydown', this.onKeyDown);
       this.elCopyStyles = null;
-    });
+    };
 
-    _defineProperty(this, "isCollapsed", item => {
+    this.isCollapsed = item => {
       const {
         collapsed
       } = this.props;
@@ -75,9 +75,9 @@ class Nestable extends Component {
         collapsedGroups
       } = this.state;
       return !!(collapsedGroups.indexOf(item.id) > -1 ^ collapsed);
-    });
+    };
 
-    _defineProperty(this, "checkFilterChildren", items => items.find(current => {
+    this.checkFilterChildren = items => items.find(current => {
       const {
         element: {
           type
@@ -86,9 +86,9 @@ class Nestable extends Component {
       } = current;
       if (type === 'filter' && children.length > 0) return true;
       return this.checkFilterChildren(children);
-    }));
+    });
 
-    _defineProperty(this, "dragRevert", () => {
+    this.dragRevert = () => {
       const {
         itemsOld
       } = this.state;
@@ -98,7 +98,7 @@ class Nestable extends Component {
         dragItem: null,
         isDirty: false
       });
-    });
+    };
 
     this.state = {
       items: [],

package/esm/components/QueryBuilderImpl.js

@@ -25,26 +25,25 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 class QueryBuilderImpl extends Component {
   constructor(props) {
     super(props);
+    this.isDraggableItem = true;
 
-    _defineProperty(this, "isDraggableItem", true);
-
-    _defineProperty(this, "onOrderDragAndDrop", (items, item) => {
+    this.onOrderDragAndDrop = (items, item) => {
       const newFilters = this.store.onOrderDragAndDrop(items, item);
       this.sendCall('reOrderOnDragAndDrop', {
         items
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty(this, "onAddFilterToGroup", idGroup => {
+    this.onAddFilterToGroup = idGroup => {
       const newFilters = this.store.addFilter(idGroup);
       this.sendCall('onAddFilterToGroup', {
         idGroup
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty(this, "onAddFilter", (idGroup, idFilter) => {
+    this.onAddFilter = (idGroup, idFilter) => {
       const {
         addFilterMethod
       } = this.props;
@@ -54,9 +53,9 @@ class QueryBuilderImpl extends Component {
         idFilter
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty(this, "onAddRuleContainer", (idGroup, idFilter) => {
+    this.onAddRuleContainer = (idGroup, idFilter) => {
       const {
         groupFilterMethod
       } = this.props;
@@ -66,17 +65,17 @@ class QueryBuilderImpl extends Component {
         idFilter
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty(this, "onRemoveFilter", idFilter => {
+    this.onRemoveFilter = idFilter => {
       const newFilters = this.store.onRemoveFilter(idFilter);
       this.sendCall('onRemoveFilter', {
         idFilter
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty(this, "handleFieldChange", data => {
+    this.handleFieldChange = data => {
       const {
         fieldsSharedActions
       } = this.props;
@@ -87,26 +86,26 @@ class QueryBuilderImpl extends Component {
         data
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty(this, "handleRuleContainerOperator", (idGroup, value) => {
+    this.handleRuleContainerOperator = (idGroup, value) => {
       const newFilters = this.store.changeGroupOperator(idGroup, value);
       this.sendCall('handleRuleContainerOperator', {
         idGroup,
         value
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty(this, "handleRuleContainerUnGroup", idGroup => {
+    this.handleRuleContainerUnGroup = idGroup => {
       const newFilters = this.store.unGroup(idGroup);
       this.sendCall('handleRuleContainerUnGroup', {
         idGroup
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty(this, "handleDropFilter", (filter, dragTo) => {
+    this.handleDropFilter = (filter, dragTo) => {
       const {
         position: oldPosition,
         idGroup,
@@ -122,9 +121,9 @@ class QueryBuilderImpl extends Component {
         dragTo
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty(this, "handleDropGroup", (group, dragTo) => {
+    this.handleDropGroup = (group, dragTo) => {
       const {
         position: oldPosition,
         idFilter,
@@ -140,17 +139,17 @@ class QueryBuilderImpl extends Component {
         dragTo
       });
       this.sendChange(newFilters);
-    });
+    };
 
-    _defineProperty(this, "handleDrop", (dragElement, dragTo) => {
+    this.handleDrop = (dragElement, dragTo) => {
       const {
         type
       } = dragElement;
       if (type === QB_DRAG_TYPES.FILTER) return this.handleDropFilter(dragElement, dragTo);
       return this.handleDropGroup(dragElement, dragTo);
-    });
+    };
 
-    _defineProperty(this, "sendChange", _ref => {
+    this.sendChange = _ref => {
       let {
         format
       } = _ref,
@@ -163,16 +162,16 @@ class QueryBuilderImpl extends Component {
         onChange
       } = this.props;
       onChange(format, newFilters);
-    });
+    };
 
-    _defineProperty(this, "sendCall", (action, data) => {
+    this.sendCall = (action, data) => {
       const {
         [action]: callback
       } = this.props;
       if (callback) callback(data);
-    });
+    };
 
-    _defineProperty(this, "setDraggableItems", drag => {
+    this.setDraggableItems = drag => {
       this.isDraggableItem = true;
 
       try {
@@ -195,7 +194,7 @@ class QueryBuilderImpl extends Component {
       } catch (error) {
         this.isDraggableItem = true;
       }
-    });
+    };
 
     this.store = new QueryBuilderStore(props.init, props.format);
     this.state = this.store.getInitialState();

package/esm/components/QueryBuilderRow/QueryBuilderRow.js

@@ -106,31 +106,31 @@ class QueryBuilderRow extends Component {
   constructor(props) {
     super(props);
 
-    _defineProperty(this, "handleMouseEnterRow", () => {});
+    this.handleMouseEnterRow = () => {};
 
-    _defineProperty(this, "handleMouseLeaveRow", () => {
+    this.handleMouseLeaveRow = () => {
       this.handleTooltipRow(false);
-    });
+    };
 
-    _defineProperty(this, "handleMouseEnterInput", () => {
+    this.handleMouseEnterInput = () => {
       const {
         setDraggableItems
       } = this.props;
       setDraggableItems(false);
-    });
+    };
 
-    _defineProperty(this, "handleMouseLeaveInput", () => {
+    this.handleMouseLeaveInput = () => {
       const {
         setDraggableItems
       } = this.props;
       setDraggableItems(true);
-    });
+    };
 
-    _defineProperty(this, "handleTooltipRow", isOpen => {
+    this.handleTooltipRow = isOpen => {
       this.setState({
         isOpen
       });
-    });
+    };
 
     this.state = {
       isOpen: false

package/esm/components/format/format.js

@@ -1,29 +1,27 @@
-import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import { sqlFormat } from './sqlFormat.js';
 import { xmlFormat } from './xmlFormat.js';
 import { sqlSafeFormat } from './sqlSafeFormat.js';
 
 class QueryBuilderFormat {
   constructor() {
-    _defineProperty(this, "format", {
+    this.format = {
       defaultFormat: query => query,
       sqlFormat,
       xmlFormat,
       sqlSafeFormat
-    });
+    };
+    this.currentFormat = 'sqlFormat';
 
-    _defineProperty(this, "currentFormat", 'sqlFormat');
-
-    _defineProperty(this, "setDefaultFormat", formatName => {
+    this.setDefaultFormat = formatName => {
       if (this.format[formatName]) this.currentFormat = formatName;
-    });
+    };
 
-    _defineProperty(this, "addFormat", (formatName, format) => this.format[formatName] = format);
+    this.addFormat = (formatName, format) => this.format[formatName] = format;
 
-    _defineProperty(this, "run", (query, formatName) => {
+    this.run = (query, formatName) => {
       if (this.format[formatName]) return this.format[formatName](query);
       return this.format[this.currentFormat](query);
-    });
+    };
   }
 
 }

package/esm/components/helpers/store.js

@@ -24,36 +24,30 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 class QueryBuilderStore {
   constructor(init, _format) {
-    _defineProperty(this, "items", []);
+    this.items = [];
+    this.step = 0;
+    this.steps = {};
+    this.mapFilters = {};
+    this.mapGroups = {};
+    this.main = null;
+    this.format = null;
 
-    _defineProperty(this, "step", 0);
+    this.createNewFilter = idGroup => createNewFilter.call(this, idGroup);
 
-    _defineProperty(this, "steps", {});
+    this.createNewGroup = parentIdGroup => createNewGroup.call(this, parentIdGroup);
 
-    _defineProperty(this, "mapFilters", {});
-
-    _defineProperty(this, "mapGroups", {});
-
-    _defineProperty(this, "main", null);
-
-    _defineProperty(this, "format", null);
-
-    _defineProperty(this, "createNewFilter", idGroup => createNewFilter.call(this, idGroup));
-
-    _defineProperty(this, "createNewGroup", parentIdGroup => createNewGroup.call(this, parentIdGroup));
-
-    _defineProperty(this, "onOrderDragAndDrop", items => {
+    this.onOrderDragAndDrop = items => {
       this.items = items;
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "addFilterNextToFilterId", (idGroup, idFilter) => {
+    this.addFilterNextToFilterId = (idGroup, idFilter) => {
       // eslint-disable-line
       this.addFilter(idGroup);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "addFilter", idGroup => {
+    this.addFilter = idGroup => {
       const newFilter = this.createNewFilter(idGroup);
       addFilterToMap.call(this, newFilter); // new API
 
@@ -68,22 +62,22 @@ class QueryBuilderStore {
       }
 
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "onRemoveFilter", idFilter => {
+    this.onRemoveFilter = idFilter => {
       // new API
       removeFilterItem.call(this, idFilter);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "addRuleContainerInPlace", (idGroup, idFilter) => {
+    this.addRuleContainerInPlace = (idGroup, idFilter) => {
       // Create a new group
       const newGroup = this.createNewGroup(idGroup);
       addGroupFilterToItem.call(this, idGroup, idFilter, newGroup);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "addRuleContainer", (idGroup, idFilter) => {
+    this.addRuleContainer = (idGroup, idFilter) => {
       // eslint-disable-line
       const newGroup = this.createNewGroup(idGroup);
       addGroupToMap.call(this, newGroup);
@@ -99,33 +93,33 @@ class QueryBuilderStore {
       }
 
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "unGroup", idGroup => {
+    this.unGroup = idGroup => {
       unGroupFilterToItem.call(this, idGroup);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "changeGroupOperator", (idGroup, value) => {
+    this.changeGroupOperator = (idGroup, value) => {
       this.getGroupById(idGroup).condition = value;
       changeGroupOperator.call(this, idGroup, value);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "changeFilter", data => {
+    this.changeFilter = data => {
       const {
         idFilter
       } = data;
       this.mapFilters[idFilter] = _objectSpread(_objectSpread({}, this.mapFilters[idFilter]), data);
       changeFilterItem.call(this, data);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "getGroupById", idGroup => this.mapGroups[idGroup] || {});
+    this.getGroupById = idGroup => this.mapGroups[idGroup] || {};
 
-    _defineProperty(this, "getFilterById", idFilter => this.mapFilters[idFilter]);
+    this.getFilterById = idFilter => this.mapFilters[idFilter];
 
-    _defineProperty(this, "getInitialState", () => {
+    this.getInitialState = () => {
       const newFilters = {
         step: this.step,
         mapFilters: _objectSpread({}, this.mapFilters),
@@ -137,9 +131,9 @@ class QueryBuilderStore {
       return _objectSpread(_objectSpread({}, newFilters), {}, {
         format
       });
-    });
+    };
 
-    _defineProperty(this, "getState", () => {
+    this.getState = () => {
       this.step += 1;
       const newFilters = {
         step: this.step,
@@ -152,7 +146,7 @@ class QueryBuilderStore {
       return _objectSpread(_objectSpread({}, newFilters), {}, {
         format
       });
-    });
+    };
 
     this.firstLoad = true;
     this.format = _format;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-query-builder",
-  "version": "2.0.0-rc.8",
+  "version": "2.0.1",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Query Builder",
   "module": "./esm/index.js",
@@ -168,12 +168,17 @@
     "build": "node ../../scripts/build/build.js"
   },
   "dependencies": {
-    "@elliemae/ds-basic": "2.0.0-rc.8",
-    "@elliemae/ds-classnames": "2.0.0-rc.8",
-    "@elliemae/ds-grid": "2.0.0-rc.8",
-    "@elliemae/ds-icons": "2.0.0-rc.8",
-    "@elliemae/ds-shared": "2.0.0-rc.8",
-    "@elliemae/ds-utilities": "2.0.0-rc.8",
+    "@elliemae/ds-accordion": "2.0.1",
+    "@elliemae/ds-button": "2.0.1",
+    "@elliemae/ds-classnames": "2.0.1",
+    "@elliemae/ds-form": "2.0.1",
+    "@elliemae/ds-grid": "2.0.1",
+    "@elliemae/ds-icon": "2.0.1",
+    "@elliemae/ds-icons": "2.0.1",
+    "@elliemae/ds-popper": "2.0.1",
+    "@elliemae/ds-shared": "2.0.1",
+    "@elliemae/ds-tooltip": "2.0.1",
+    "@elliemae/ds-utilities": "2.0.1",
     "classnames": "~2.2.6",
     "prop-types": "~15.7.2",
     "react-addons-update": "~15.6.3",