@synerise/ds-condition 0.26.3 → 0.27.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.27.0](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.26.4...@synerise/ds-condition@0.27.0) (2025-01-29)
+
+
+### Features
+
+* antd@4.24 react@18 ([d97a667](https://github.com/Synerise/synerise-design/commit/d97a667b1f33aed3177e1851de3b6f60be2d46a6))
+
+
+
+
+
+## [0.26.4](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.26.3...@synerise/ds-condition@0.26.4) (2025-01-21)
+
+**Note:** Version bump only for package @synerise/ds-condition
+
+
+
+
+
 ## [0.26.3](https://github.com/Synerise/synerise-design/compare/@synerise/ds-condition@0.26.2...@synerise/ds-condition@0.26.3) (2025-01-15)
 
 **Note:** Version bump only for package @synerise/ds-condition

package/dist/Condition.js

@@ -1,16 +1,10 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-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(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; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React, { useEffect, useState, useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { ReactSortable } from 'react-sortablejs';
 import Icon, { Add3M } from '@synerise/ds-icon';
 import Button from '@synerise/ds-button';
-import { NOOP } from '@synerise/ds-utils';
-import usePrevious from '@synerise/ds-utils/dist/usePrevious/usePrevious';
+import { NOOP, usePrevious } from '@synerise/ds-utils';
 import { ConditionStep } from './ConditionStep';
 import * as S from './Condition.style';
 import { SORTABLE_CONFIG, DEFAULT_CONDITION, DEFAULT_FIELD, DEFAULT_STEP, OPERATOR, FACTOR, PARAMETER, SUBJECT, DEFAULT_INPUT_PROPS, ACTION_ATTRIBUTE } from './constants';
@@ -52,7 +46,7 @@ var Condition = function Condition(props) {
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var text = useMemo(function () {
-    return _objectSpread({
+    return _extends({
       addStep: formatMessage({
         id: 'DS.CONDITION.ADD-STEP',
         defaultMessage: 'and then...'
@@ -178,7 +172,7 @@ var Condition = function Condition(props) {
     }
   }, [autoClearCondition, onChangeFactorValue, onChangeOperator, onChangeParameter]);
   var selectOperator = useCallback(function (stepId, conditionId, value) {
-    if (conditionId && onChangeOperator) {
+    if (conditionId && onChangeOperator && value && 'groupId' in value) {
       autoClearCondition && onChangeFactorValue && onChangeFactorValue(stepId, conditionId, undefined);
       onChangeOperator(stepId, conditionId, value);
       setCurrentConditionId(conditionId);
@@ -265,7 +259,7 @@ var Condition = function Condition(props) {
         onDeactivate: handleClearActiveCondition,
         showSuffix: showSuffix,
         hoverDisabled: hoverDisabled || currentStepId !== step.id && currentStepId !== undefined,
-        inputProps: _objectSpread({}, DEFAULT_INPUT_PROPS, {}, inputProps),
+        inputProps: _extends({}, DEFAULT_INPUT_PROPS, inputProps),
         readOnly: readOnly,
         singleStepCondition: singleStepCondition,
         showActionAttribute: showActionAttribute,

package/dist/ConditionStep/ConditionRow/ConditionRow.js

@@ -1,9 +1,4 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-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(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; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React, { useMemo } from 'react';
 import Factors from '@synerise/ds-factors';
 import Operators from '@synerise/ds-operators';
@@ -80,8 +75,8 @@ export var ConditionRow = function ConditionRow(_ref) {
   }
   var conditionFactorProps = useMemo(function () {
     var _conditionFactor$para, _conditionFactor$para2;
-    return _objectSpread({}, conditionFactor, {
-      parameters: (conditionFactor == null ? void 0 : conditionFactor.parameters) && _objectSpread({}, conditionFactor.parameters, {
+    return _extends({}, conditionFactor, {
+      parameters: (conditionFactor == null ? void 0 : conditionFactor.parameters) && _extends({}, conditionFactor.parameters, {
         selectedButtonColored: ((_conditionFactor$para = conditionFactor.parameters) == null ? void 0 : _conditionFactor$para.selectedButtonColored) === undefined ? true : (_conditionFactor$para2 = conditionFactor.parameters) == null ? void 0 : _conditionFactor$para2.selectedButtonColored
       })
     });
@@ -102,7 +97,11 @@ export var ConditionRow = function ConditionRow(_ref) {
   }), /*#__PURE__*/React.createElement(S.ConditionRowLine, null, /*#__PURE__*/React.createElement(S.ConditionRowDefinition, null, /*#__PURE__*/React.createElement(S.ConditionWrapper, {
     "data-testid": "condition-parameter-wrapper",
     withRemoveTrigger: lastConditionWrapper === 'parameter'
-  }, renderConditionParameterWrapper && /*#__PURE__*/React.createElement(Factors, _extends({}, conditionParameter, {
+  }, renderConditionParameterWrapper && /*#__PURE__*/React.createElement(Factors, _extends({
+    selectedFactorType: "",
+    defaultFactorType: "",
+    value: ""
+  }, conditionParameter, {
     inputProps: inputProps,
     getPopupContainerOverride: getPopupContainerOverride || getPopupContainer,
     onActivate: function onActivate() {
@@ -114,11 +113,14 @@ export var ConditionRow = function ConditionRow(_ref) {
     },
     opened: hasPriority && stepId === currentStepId && conditionId === currentConditionId && currentField === PARAMETER,
     readOnly: readOnly,
-    error: Boolean(conditionParameter.errorText)
+    error: Boolean(conditionParameter == null ? void 0 : conditionParameter.errorText)
   })), lastConditionWrapper === 'parameter' && removeConditionTrigger), renderConditionOperatorWrapper && /*#__PURE__*/React.createElement(S.ConditionWrapper, {
     "data-testid": "condition-operator-wrapper",
     withRemoveTrigger: lastConditionWrapper === 'operator'
-  }, /*#__PURE__*/React.createElement(Operators, _extends({}, conditionOperator, {
+  }, /*#__PURE__*/React.createElement(Operators, _extends({
+    groups: [],
+    items: []
+  }, conditionOperator, {
     getPopupContainerOverride: getPopupContainerOverride || getPopupContainer,
     onActivate: function onActivate() {
       return _onActivate && _onActivate(OPERATOR);
@@ -129,11 +131,15 @@ export var ConditionRow = function ConditionRow(_ref) {
     },
     opened: hasPriority && stepId === currentStepId && conditionId === currentConditionId && currentField === OPERATOR,
     readOnly: readOnly,
-    errorText: conditionOperator.errorText
+    errorText: conditionOperator == null ? void 0 : conditionOperator.errorText
   })), lastConditionWrapper === 'operator' && removeConditionTrigger), renderConditionFactorWrapper && /*#__PURE__*/React.createElement(S.ConditionWrapper, {
     "data-testid": "condition-factor-wrapper",
     withRemoveTrigger: lastConditionWrapper === 'factor'
-  }, (conditionFactor == null ? void 0 : conditionFactor.withCustomFactor) || /*#__PURE__*/React.createElement(Factors, _extends({}, conditionFactorProps, {
+  }, (conditionFactor == null ? void 0 : conditionFactor.withCustomFactor) || /*#__PURE__*/React.createElement(Factors, _extends({
+    selectedFactorType: "",
+    defaultFactorType: "",
+    value: ""
+  }, conditionFactorProps, {
     inputProps: inputProps,
     getPopupContainerOverride: getPopupContainerOverride || getPopupContainer,
     onActivate: function onActivate() {

package/dist/ConditionStep/ConditionRow/ConditionRow.types.d.ts

@@ -10,9 +10,9 @@ export type ConditionRowProps = {
     onDeactivate?: () => void;
     conditionId: React.ReactText;
     addCondition?: (stepId: React.ReactText) => void;
-    conditionParameter: FactorsProps;
-    conditionOperator: OperatorsProps;
-    conditionFactor: FactorsProps;
+    conditionParameter?: Omit<FactorsProps, 'onChangeValue'>;
+    conditionOperator?: Omit<OperatorsProps, 'onChange'>;
+    conditionFactor?: Omit<FactorsProps, 'onChangeValue'>;
     removeCondition: ConditionProps['removeCondition'];
     minConditionLength: ConditionProps['minConditionsLength'];
     maxConditionLength: ConditionProps['maxConditionsLength'];

package/dist/ConditionStep/ConditionStep.js

@@ -1,13 +1,8 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-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(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; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React, { useCallback, useMemo } from 'react';
+import { useIntl } from 'react-intl';
 import Subject from '@synerise/ds-subject';
 import ContextSelector from '@synerise/ds-context-selector';
-import { useIntl } from 'react-intl';
 import { DragHandleM } from '@synerise/ds-icon';
 import Factors from '@synerise/ds-factors';
 import * as S from '../Condition.style';
@@ -58,7 +53,7 @@ export var ConditionStep = function ConditionStep(_ref) {
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var text = useMemo(function () {
-    return _objectSpread({
+    return _extends({
       stepNamePlaceholder: formatMessage({
         id: 'DS.CONDITION.STEP_NAME-PLACEHOLDER',
         defaultMessage: 'Step name'

package/dist/modules.d.js

@@ -1 +1 @@
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synerise/ds-condition",
-  "version": "0.26.3",
+  "version": "0.27.0",
   "description": "Condition UI Component for the Synerise Design System",
   "license": "ISC",
   "repository": "Synerise/synerise-design",
@@ -34,26 +34,26 @@
   ],
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@synerise/ds-button": "^0.22.2",
-    "@synerise/ds-context-selector": "^0.25.24",
-    "@synerise/ds-cruds": "^0.5.34",
-    "@synerise/ds-factors": "^0.27.11",
-    "@synerise/ds-icon": "^0.69.1",
-    "@synerise/ds-inline-edit": "^0.9.7",
-    "@synerise/ds-input": "^0.24.20",
-    "@synerise/ds-operators": "^0.14.8",
-    "@synerise/ds-subject": "^0.10.30",
-    "@synerise/ds-tooltip": "^0.14.54",
-    "@synerise/ds-utils": "^0.31.2",
+    "@synerise/ds-button": "^0.23.0",
+    "@synerise/ds-context-selector": "^0.26.0",
+    "@synerise/ds-cruds": "^0.6.0",
+    "@synerise/ds-factors": "^0.28.0",
+    "@synerise/ds-icon": "^0.71.0",
+    "@synerise/ds-inline-edit": "^0.10.0",
+    "@synerise/ds-input": "^0.25.0",
+    "@synerise/ds-operators": "^0.15.0",
+    "@synerise/ds-subject": "^0.11.0",
+    "@synerise/ds-tooltip": "^0.15.0",
+    "@synerise/ds-utils": "^0.32.0",
     "lodash": "^4.17.19",
     "react-sortablejs": "^6.0.0",
     "sortablejs": "1.15.1"
   },
   "peerDependencies": {
     "@synerise/ds-core": "*",
-    "react": ">=16.9.0 <= 17.0.2",
+    "react": ">=16.9.0 <= 18.3.1",
     "react-intl": ">=3.12.0 <= 6.8",
-    "styled-components": "5.0.1"
+    "styled-components": "^5.3.3"
   },
-  "gitHead": "f591d14d24d6a14aab76edcb60f04aaadec8336d"
+  "gitHead": "fbde34e126b492edaf148e469ab96247a891d6df"
 }