@elliemae/ds-query-builder 2.0.0-alpha.11 → 2.0.0-alpha.12

package/cjs/DSQueryBuilder.js

@@ -15,62 +15,65 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 
-const DSQueryBuilder = ({
-  containerProps = {},
-  addFilterMethod = types.QB_ADD_FILTER_METHOD_TYPES.IN_PLACE,
-  groupFilterMethod = types.QB_GROUP_FILTER_METHOD_TYPES.IN_PLACE,
-  onChange = () => null,
-  fields = [],
-  fieldsSharedActions = {
-    onFieldChange: [],
-    onOperatorChange: [],
-    onValueChange: []
-  },
-  format = types.QB_EXPORT_FORMAT_TYPES.DEFAULT,
-  init = null,
-  ruleContainerClassName = '',
-  handleDrop = () => null,
-  handleDropFilter = () => null,
-  handleDropGroup = () => null,
-  handleFieldChange = () => null,
-  handleRuleContainerOperator = () => null,
-  handleRuleContainerUnGroup = () => null,
-  onAddFilter = () => null,
-  onAddRuleContainer = () => null,
-  onRemoveFilter = () => null,
-  displayFixedOutput,
-  displayOutput = false,
-  displayOutputLabel = {
-    show: 'Show output',
-    hide: 'Hide output'
-  },
-  singleRow = false,
-  toolTipZIndex = 110
-}) => /*#__PURE__*/_jsx__default["default"](QueryBuilderImpl, {
-  addFilterMethod: addFilterMethod,
-  containerProps: containerProps,
-  displayFixedOutput: displayFixedOutput,
-  displayOutput: displayOutput,
-  displayOutputLabel: displayOutputLabel,
-  fields: fields,
-  fieldsSharedActions: fieldsSharedActions,
-  format: format,
-  groupFilterMethod: groupFilterMethod,
-  handleDrop: handleDrop,
-  handleDropFilter: handleDropFilter,
-  handleDropGroup: handleDropGroup,
-  handleFieldChange: handleFieldChange,
-  handleRuleContainerOperator: handleRuleContainerOperator,
-  handleRuleContainerUnGroup: handleRuleContainerUnGroup,
-  init: init,
-  onAddFilter: onAddFilter,
-  onAddRuleContainer: onAddRuleContainer,
-  onChange: onChange,
-  onRemoveFilter: onRemoveFilter,
-  ruleContainerClassName: ruleContainerClassName,
-  singleRow: singleRow,
-  toolTipZIndex: toolTipZIndex
-});
+const DSQueryBuilder = _ref => {
+  let {
+    containerProps = {},
+    addFilterMethod = types.QB_ADD_FILTER_METHOD_TYPES.IN_PLACE,
+    groupFilterMethod = types.QB_GROUP_FILTER_METHOD_TYPES.IN_PLACE,
+    onChange = () => null,
+    fields = [],
+    fieldsSharedActions = {
+      onFieldChange: [],
+      onOperatorChange: [],
+      onValueChange: []
+    },
+    format = types.QB_EXPORT_FORMAT_TYPES.DEFAULT,
+    init = null,
+    ruleContainerClassName = '',
+    handleDrop = () => null,
+    handleDropFilter = () => null,
+    handleDropGroup = () => null,
+    handleFieldChange = () => null,
+    handleRuleContainerOperator = () => null,
+    handleRuleContainerUnGroup = () => null,
+    onAddFilter = () => null,
+    onAddRuleContainer = () => null,
+    onRemoveFilter = () => null,
+    displayFixedOutput,
+    displayOutput = false,
+    displayOutputLabel = {
+      show: 'Show output',
+      hide: 'Hide output'
+    },
+    singleRow = false,
+    toolTipZIndex = 110
+  } = _ref;
+  return /*#__PURE__*/_jsx__default["default"](QueryBuilderImpl, {
+    addFilterMethod: addFilterMethod,
+    containerProps: containerProps,
+    displayFixedOutput: displayFixedOutput,
+    displayOutput: displayOutput,
+    displayOutputLabel: displayOutputLabel,
+    fields: fields,
+    fieldsSharedActions: fieldsSharedActions,
+    format: format,
+    groupFilterMethod: groupFilterMethod,
+    handleDrop: handleDrop,
+    handleDropFilter: handleDropFilter,
+    handleDropGroup: handleDropGroup,
+    handleFieldChange: handleFieldChange,
+    handleRuleContainerOperator: handleRuleContainerOperator,
+    handleRuleContainerUnGroup: handleRuleContainerUnGroup,
+    init: init,
+    onAddFilter: onAddFilter,
+    onAddRuleContainer: onAddRuleContainer,
+    onChange: onChange,
+    onRemoveFilter: onRemoveFilter,
+    ruleContainerClassName: ruleContainerClassName,
+    singleRow: singleRow,
+    toolTipZIndex: toolTipZIndex
+  });
+};
 
 const DSQueryBuilderWithSchema = reactDesc.describe(DSQueryBuilder);
 DSQueryBuilderWithSchema.propTypes = propTypes.props;
@@ -90,5 +93,6 @@ exports.QB_LOAN_VALUES_OPTIONS = selectors.QB_LOAN_VALUES_OPTIONS;
 exports.QB_OPERATOR_OPTIONS = selectors.QB_OPERATOR_OPTIONS;
 exports.QB_SUBJECT_VALUES_OPTIONS = selectors.QB_SUBJECT_VALUES_OPTIONS;
 exports.QueryBuilderFormat = format;
+exports.DSQueryBuilder = DSQueryBuilder;
 exports.DSQueryBuilderWithSchema = DSQueryBuilderWithSchema;
 exports["default"] = DSQueryBuilder;

package/cjs/components/AndOrController/AndOrController.js

@@ -1,17 +1,14 @@
 '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-basic/Tooltip');
-var Popper = require('@elliemae/ds-basic/Popper');
-var DSToggle = require('@elliemae/ds-basic/form/Toggle');
-var DSButton = require('@elliemae/ds-basic/Button');
-var QueryAdd = require('@elliemae/ds-icons/QueryAdd');
-var ParenthesisRemove = require('@elliemae/ds-icons/ParenthesisRemove');
-var MoreOptionsVert = require('@elliemae/ds-icons/MoreOptionsVert');
-var Icon = require('@elliemae/ds-basic/Icon');
+var DSTooltip = require('@elliemae/ds-tooltip');
+var dsPopper = require('@elliemae/ds-popper');
+var dsForm = require('@elliemae/ds-form');
+var DSButton = require('@elliemae/ds-button');
+var dsIcons = require('@elliemae/ds-icons');
+var dsIcon = require('@elliemae/ds-icon');
 var constants = require('../helpers/constants.js');
 var ToolBarAnimation = require('../ToolBarAnimation/ToolBarAnimation.js');
 var DragContainerController = require('../DragContainerController/DragContainerController.js');
@@ -20,14 +17,9 @@ 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 DSToggle__default = /*#__PURE__*/_interopDefaultLegacy(DSToggle);
 var DSButton__default = /*#__PURE__*/_interopDefaultLegacy(DSButton);
-var QueryAdd__default = /*#__PURE__*/_interopDefaultLegacy(QueryAdd);
-var ParenthesisRemove__default = /*#__PURE__*/_interopDefaultLegacy(ParenthesisRemove);
-var MoreOptionsVert__default = /*#__PURE__*/_interopDefaultLegacy(MoreOptionsVert);
 
 var _QueryAdd, _ParenthesisRemove, _div;
 const {
@@ -48,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 {
@@ -64,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
       });
@@ -78,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();
@@ -148,7 +140,7 @@ class AndOrController extends React.Component {
           children: [/*#__PURE__*/_jsx__default["default"](DSButton__default["default"], {
             buttonType: buttonActionType,
             className: classNameElement('add-rule'),
-            icon: _QueryAdd || (_QueryAdd = /*#__PURE__*/_jsx__default["default"](QueryAdd__default["default"], {})),
+            icon: _QueryAdd || (_QueryAdd = /*#__PURE__*/_jsx__default["default"](dsIcons.QueryAdd, {})),
             onClick: onAddFilter,
             size: buttonActionSize,
             containerProps: {
@@ -157,13 +149,13 @@ class AndOrController extends React.Component {
           }), allowUnGroup && /*#__PURE__*/_jsx__default["default"](DSButton__default["default"], {
             buttonType: "text",
             className: classNameElement('ungroup'),
-            icon: _ParenthesisRemove || (_ParenthesisRemove = /*#__PURE__*/_jsx__default["default"](ParenthesisRemove__default["default"], {})),
+            icon: _ParenthesisRemove || (_ParenthesisRemove = /*#__PURE__*/_jsx__default["default"](dsIcons.ParenthesisRemove, {})),
             onClick: handleRuleContainerUnGroup,
             size: buttonActionSize,
             containerProps: {
               'data-testid': 'parenthesis-remove-button'
             }
-          }), /*#__PURE__*/_jsx__default["default"](DSToggle__default["default"], {
+          }), /*#__PURE__*/_jsx__default["default"](dsForm.DSToggle, {
             checked: condition,
             className: classNameElement('and-or-toggle'),
             labelOff: labelOff,
@@ -186,10 +178,10 @@ class AndOrController extends React.Component {
           className: classNameElement('condition-display-step')
         }, void 0, step), _div || (_div = /*#__PURE__*/_jsx__default["default"]("div", {
           className: "separator"
-        })), /*#__PURE__*/_jsx__default["default"](MoreOptionsVert__default["default"], {
-          color: Icon.DSIconColors.NEUTRAL,
+        })), /*#__PURE__*/_jsx__default["default"](dsIcons.MoreOptionsVert, {
+          color: dsIcon.DSIconColors.NEUTRAL,
           onClick: this.handleMouseEnterRow,
-          size: Icon.DSIconSizes.S,
+          size: dsIcon.DSIconSizes.S,
           containerProps: {
             'data-testid': 'and-or-more-options-button'
           }
@@ -204,7 +196,7 @@ class AndOrController extends React.Component {
 
 }
 
-_defineProperty__default["default"](AndOrController, "defaultProps", {
+AndOrController.defaultProps = {
   isMain: false,
   handleRuleContainerOperator: () => null,
   handleRuleContainerUnGroup: () => null,
@@ -214,17 +206,17 @@ _defineProperty__default["default"](AndOrController, "defaultProps", {
   condition: true,
   showDragController: true,
   allowUnGroup: true,
-  buttonActionSize: Icon.DSIconSizes.M,
+  buttonActionSize: dsIcon.DSIconSizes.M,
   buttonActionType: 'text',
-  toogleActionSize: Icon.DSIconSizes.S,
+  toogleActionSize: dsIcon.DSIconSizes.S,
   onAddFilter: () => null,
   multipleSize: false,
   delayClose: constants.DELAY_CLOSE,
   delayOpen: constants.DELAY_OPEN,
   step: null,
   toolBarAnimationDuration: constants.TOOLBAR_ANIMATION_DURATION,
-  toolBarInteractionType: Popper.PopperInteractions.CLICK,
-  toolBarPosition: Popper.PopperPositions.LEFT
-});
+  toolBarInteractionType: dsPopper.PopperInteractions.CLICK,
+  toolBarPosition: dsPopper.PopperPositions.LEFT
+};
 
 module.exports = AndOrController;

package/cjs/components/ConditionController/ConditionController.js

@@ -3,14 +3,11 @@
 var _jsx = require('@babel/runtime/helpers/jsx');
 require('react');
 var dsClassnames = require('@elliemae/ds-classnames');
-var DSTooltip = require('@elliemae/ds-basic/Tooltip');
-var Popper = require('@elliemae/ds-basic/Popper');
-var Icon = require('@elliemae/ds-basic/Icon');
-var DSButton = require('@elliemae/ds-basic/Button');
-var MoreOptionsVert = require('@elliemae/ds-icons/MoreOptionsVert');
-var QueryRemove = require('@elliemae/ds-icons/QueryRemove');
-var QueryAdd = require('@elliemae/ds-icons/QueryAdd');
-var ParenthesisAdd = require('@elliemae/ds-icons/ParenthesisAdd');
+var DSTooltip = require('@elliemae/ds-tooltip');
+var dsPopper = require('@elliemae/ds-popper');
+var dsIcon = require('@elliemae/ds-icon');
+var dsIcons = require('@elliemae/ds-icons');
+var DSButton = require('@elliemae/ds-button');
 var ToolBarAnimation = require('../ToolBarAnimation/ToolBarAnimation.js');
 var constants = require('../helpers/constants.js');
 
@@ -19,27 +16,24 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 var DSTooltip__default = /*#__PURE__*/_interopDefaultLegacy(DSTooltip);
 var DSButton__default = /*#__PURE__*/_interopDefaultLegacy(DSButton);
-var MoreOptionsVert__default = /*#__PURE__*/_interopDefaultLegacy(MoreOptionsVert);
-var QueryRemove__default = /*#__PURE__*/_interopDefaultLegacy(QueryRemove);
-var QueryAdd__default = /*#__PURE__*/_interopDefaultLegacy(QueryAdd);
-var ParenthesisAdd__default = /*#__PURE__*/_interopDefaultLegacy(ParenthesisAdd);
 
 var _ToolBarAnimation, _QueryRemove, _QueryAdd, _ParenthesisAdd;
 
-const ConditionController = ({
-  onAddFilter = () => null,
-  onAddRuleContainer = () => null,
-  onRemoveFilter = () => null,
-  handleTooltipRow = () => null,
-  buttonTriggerSize = Icon.DSIconSizes.M,
-  buttonTriggerType = 'text',
-  buttonActionSize = Icon.DSIconSizes.M,
-  buttonActionType = 'text',
-  delayClose = constants.DELAY_CLOSE,
-  delayOpen = constants.DELAY_OPEN,
-  isOpen = false,
-  toolTipZIndex
-}) => {
+const ConditionController = _ref => {
+  let {
+    onAddFilter = () => null,
+    onAddRuleContainer = () => null,
+    onRemoveFilter = () => null,
+    handleTooltipRow = () => null,
+    buttonTriggerSize = dsIcon.DSIconSizes.M,
+    buttonTriggerType = 'text',
+    buttonActionSize = dsIcon.DSIconSizes.M,
+    buttonActionType = 'text',
+    delayClose = constants.DELAY_CLOSE,
+    delayOpen = constants.DELAY_OPEN,
+    isOpen = false,
+    toolTipZIndex
+  } = _ref;
   const {
     cssClassName,
     classNameBlock,
@@ -50,10 +44,10 @@ const ConditionController = ({
   }, void 0, /*#__PURE__*/_jsx__default["default"](DSTooltip__default["default"], {
     delayClose: delayClose,
     delayOpen: delayOpen,
-    interactionType: Popper.PopperInteractions.CLICK,
+    interactionType: dsPopper.PopperInteractions.CLICK,
     isOpen: isOpen,
     onOpen: handleTooltipRow,
-    placement: Popper.PopperPositions.LEFT,
+    placement: dsPopper.PopperPositions.LEFT,
     springAnimationComponent: _ToolBarAnimation || (_ToolBarAnimation = /*#__PURE__*/_jsx__default["default"](ToolBarAnimation.ToolBarAnimation, {
       duration: constants.TOOLBAR_ANIMATION_DURATION
     })),
@@ -62,7 +56,7 @@ const ConditionController = ({
     }, void 0, /*#__PURE__*/_jsx__default["default"](DSButton__default["default"], {
       buttonType: buttonActionType,
       className: classNameElement('remove-rule'),
-      icon: _QueryRemove || (_QueryRemove = /*#__PURE__*/_jsx__default["default"](QueryRemove__default["default"], {})),
+      icon: _QueryRemove || (_QueryRemove = /*#__PURE__*/_jsx__default["default"](dsIcons.QueryRemove, {})),
       onClick: onRemoveFilter,
       size: buttonActionSize,
       containerProps: {
@@ -71,7 +65,7 @@ const ConditionController = ({
     }), /*#__PURE__*/_jsx__default["default"](DSButton__default["default"], {
       buttonType: buttonActionType,
       className: classNameElement('add-rule'),
-      icon: _QueryAdd || (_QueryAdd = /*#__PURE__*/_jsx__default["default"](QueryAdd__default["default"], {})),
+      icon: _QueryAdd || (_QueryAdd = /*#__PURE__*/_jsx__default["default"](dsIcons.QueryAdd, {})),
       onClick: onAddFilter,
       size: buttonActionSize,
       containerProps: {
@@ -80,7 +74,7 @@ const ConditionController = ({
     }), /*#__PURE__*/_jsx__default["default"](DSButton__default["default"], {
       buttonType: buttonActionType,
       className: "".concat(classNameElement('add-rule-container'), " no-border-right"),
-      icon: _ParenthesisAdd || (_ParenthesisAdd = /*#__PURE__*/_jsx__default["default"](ParenthesisAdd__default["default"], {})),
+      icon: _ParenthesisAdd || (_ParenthesisAdd = /*#__PURE__*/_jsx__default["default"](dsIcons.ParenthesisAdd, {})),
       onClick: onAddRuleContainer,
       size: buttonActionSize,
       containerProps: {
@@ -90,7 +84,7 @@ const ConditionController = ({
     tooltipType: DSTooltip.TooltipType.TOOLBAR,
     triggerComponent: /*#__PURE__*/_jsx__default["default"](DSButton__default["default"], {
       buttonType: buttonTriggerType,
-      icon: /*#__PURE__*/_jsx__default["default"](MoreOptionsVert__default["default"], {
+      icon: /*#__PURE__*/_jsx__default["default"](dsIcons.MoreOptionsVert, {
         color: ['neutral', '500']
       }),
       onClick: handleTooltipRow,

package/cjs/components/DisplayOutput/DisplayOutput.js

@@ -1,21 +1,16 @@
 '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');
-var Accordion = require('@elliemae/ds-basic/Accordion');
-var ChevronDown = require('@elliemae/ds-icons/ChevronDown');
-var ChevronRight = require('@elliemae/ds-icons/ChevronRight');
+var dsAccordion = require('@elliemae/ds-accordion');
+var dsIcons = require('@elliemae/ds-icons');
 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);
-var ChevronDown__default = /*#__PURE__*/_interopDefaultLegacy(ChevronDown);
-var ChevronRight__default = /*#__PURE__*/_interopDefaultLegacy(ChevronRight);
 
 const {
   cssClassName
@@ -25,13 +20,16 @@ class DisplayOutput extends React.Component {
   constructor(props) {
     super(props);
 
-    _defineProperty__default["default"](this, "handleChange", () => {
-      this.setState(({
-        show
-      }) => ({
-        show: !show
-      }));
-    });
+    this.handleChange = () => {
+      this.setState(_ref => {
+        let {
+          show
+        } = _ref;
+        return {
+          show: !show
+        };
+      });
+    };
 
     this.state = {
       show: props.show
@@ -49,9 +47,10 @@ class DisplayOutput extends React.Component {
       hideLabel,
       displayFixedOutput
     } = this.props;
-    return /*#__PURE__*/_jsx__default["default"](QueryBuilderContext.QueryBuilderContext.Consumer, {}, void 0, ({
-      format
-    }) => {
+    return /*#__PURE__*/_jsx__default["default"](QueryBuilderContext.QueryBuilderContext.Consumer, {}, void 0, _ref2 => {
+      let {
+        format
+      } = _ref2;
       let display = '';
 
       try {
@@ -73,12 +72,12 @@ class DisplayOutput extends React.Component {
 
       return /*#__PURE__*/_jsx__default["default"]("div", {
         className: cssClassName
-      }, void 0, /*#__PURE__*/_jsx__default["default"](Accordion.DSAccordion, {
+      }, void 0, /*#__PURE__*/_jsx__default["default"](dsAccordion.DSAccordion, {
         activeValue: show,
         onChange: this.handleChange
-      }, void 0, /*#__PURE__*/_jsx__default["default"](Accordion.DSAccordionItem, {
-        iconClosed: ChevronRight__default["default"],
-        iconOpened: ChevronDown__default["default"],
+      }, void 0, /*#__PURE__*/_jsx__default["default"](dsAccordion.DSAccordionItem, {
+        iconClosed: dsIcons.ChevronRight,
+        iconOpened: dsIcons.ChevronDown,
         title: show ? hideLabel : showLabel,
         value: true
       }, void 0, /*#__PURE__*/_jsx__default["default"]("div", {}, void 0, display))));

package/cjs/components/DragContainerController/DragContainerController.js

@@ -3,40 +3,38 @@
 var _jsx = require('@babel/runtime/helpers/jsx');
 require('react');
 var dsClassnames = require('@elliemae/ds-classnames');
-var MoreOptionsVert = require('@elliemae/ds-icons/MoreOptionsVert');
-var Icon = require('@elliemae/ds-basic/Icon');
-var GripperVertical = require('@elliemae/ds-icons/GripperVertical');
+var dsIcon = require('@elliemae/ds-icon');
+var dsIcons = require('@elliemae/ds-icons');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var MoreOptionsVert__default = /*#__PURE__*/_interopDefaultLegacy(MoreOptionsVert);
-var GripperVertical__default = /*#__PURE__*/_interopDefaultLegacy(GripperVertical);
 
 var _div;
 
-const DragContainerController = ({
-  color = Icon.DSIconColors.NEUTRAL,
-  icon: Icon$1 = GripperVertical__default["default"],
-  size = Icon.DSIconSizes.S,
-  multipleSize = false,
-  onClick
-}) => {
+const DragContainerController = _ref => {
+  let {
+    color = dsIcon.DSIconColors.NEUTRAL,
+    icon: Icon = dsIcons.GripperVertical,
+    size = dsIcon.DSIconSizes.S,
+    multipleSize = false,
+    onClick
+  } = _ref;
   const {
     cssClassName
   } = dsClassnames.convertPropToCssClassName('query-builder-drag-group');
   return /*#__PURE__*/_jsx__default["default"]("div", {
     className: "".concat(cssClassName)
-  }, void 0, /*#__PURE__*/_jsx__default["default"](Icon$1, {
+  }, void 0, /*#__PURE__*/_jsx__default["default"](Icon, {
     color: color,
     size: size
   }), _div || (_div = /*#__PURE__*/_jsx__default["default"]("div", {
     className: "separator"
-  })), /*#__PURE__*/_jsx__default["default"](MoreOptionsVert__default["default"], {
+  })), /*#__PURE__*/_jsx__default["default"](dsIcons.MoreOptionsVert, {
     color: color,
     onClick: onClick,
     size: size
-  }), multipleSize && /*#__PURE__*/_jsx__default["default"](Icon$1, {
+  }), multipleSize && /*#__PURE__*/_jsx__default["default"](Icon, {
     className: "additional-drag",
     color: color,
     onClick: onClick,

package/cjs/components/DragControllerRow/DragControllerRow.js

@@ -1,11 +1,16 @@
 '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 _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _jsx = require('@babel/runtime/helpers/jsx');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 require('react');
-var GripperVertical = require('@elliemae/ds-icons/GripperVertical');
-var Icon = require('@elliemae/ds-basic/Icon');
+var dsIcon = require('@elliemae/ds-icon');
+var dsIcons = require('@elliemae/ds-icons');
 var jsxRuntime = require('react/jsx-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -13,7 +18,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
-var GripperVertical__default = /*#__PURE__*/_interopDefaultLegacy(GripperVertical);
 
 const _excluded = ["className", "color", "icon", "size"];
 
@@ -25,15 +29,15 @@ const DragControllerRow = _ref => {
   let {
     className = 'drag-controller',
     color = ['neutral', '500'],
-    icon: Icon$1 = GripperVertical__default["default"],
-    size = Icon.DSIconSizes.M
+    icon: Icon = dsIcons.GripperVertical,
+    size = dsIcon.DSIconSizes.M
   } = _ref,
       rest = _objectWithoutProperties__default["default"](_ref, _excluded);
 
   return /*#__PURE__*/jsxRuntime.jsx("div", _objectSpread(_objectSpread({
     className: className
   }, rest), {}, {
-    children: /*#__PURE__*/_jsx__default["default"](Icon$1, {
+    children: /*#__PURE__*/_jsx__default["default"](Icon, {
       color: color,
       size: size
     })

package/cjs/components/FieldControllerRow/FieldControllerRow.js

@@ -2,32 +2,32 @@
 
 var _jsx = require('@babel/runtime/helpers/jsx');
 require('react');
-var DSComboBox = require('@elliemae/ds-basic/form/ComboBox');
-var DSTextBox = require('@elliemae/ds-basic/form/TextBox');
+var dsForm = require('@elliemae/ds-form');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var _jsx__default = /*#__PURE__*/_interopDefaultLegacy(_jsx);
-var DSComboBox__default = /*#__PURE__*/_interopDefaultLegacy(DSComboBox);
-var DSTextBox__default = /*#__PURE__*/_interopDefaultLegacy(DSTextBox);
 
-const FieldControllerRow = ({
-  className = '',
-  onChange = () => null,
-  options = [],
-  value = '',
-  type = 'DSComboBox'
-}) => /*#__PURE__*/_jsx__default["default"]("div", {
-  className: className
-}, void 0, type === 'DSComboBox' && /*#__PURE__*/_jsx__default["default"](DSComboBox__default["default"], {
-  onChange: onChange,
-  options: options,
-  value: value
-}), type === 'DSTextBox' && /*#__PURE__*/_jsx__default["default"](DSTextBox__default["default"], {
-  fluidWidth: true,
-  onChange: onChange,
-  options: options,
-  value: value
-}));
+const FieldControllerRow = _ref => {
+  let {
+    className = '',
+    onChange = () => null,
+    options = [],
+    value = '',
+    type = 'DSComboBox'
+  } = _ref;
+  return /*#__PURE__*/_jsx__default["default"]("div", {
+    className: className
+  }, void 0, type === 'DSComboBox' && /*#__PURE__*/_jsx__default["default"](dsForm.DSComboBox, {
+    onChange: onChange,
+    options: options,
+    value: value
+  }), type === 'DSTextBox' && /*#__PURE__*/_jsx__default["default"](dsForm.DSTextBox, {
+    fluidWidth: true,
+    onChange: onChange,
+    options: options,
+    value: value
+  }));
+};
 
 module.exports = FieldControllerRow;