@synerise/ds-filter 0.18.31 → 0.18.33

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.18.33](https://github.com/Synerise/synerise-design/compare/@synerise/ds-filter@0.18.32...@synerise/ds-filter@0.18.33) (2024-10-28)
+
+**Note:** Version bump only for package @synerise/ds-filter
+
+
+
+
+
+## [0.18.32](https://github.com/Synerise/synerise-design/compare/@synerise/ds-filter@0.18.31...@synerise/ds-filter@0.18.32) (2024-10-23)
+
+**Note:** Version bump only for package @synerise/ds-filter
+
+
+
+
+
 ## [0.18.31](https://github.com/Synerise/synerise-design/compare/@synerise/ds-filter@0.18.30...@synerise/ds-filter@0.18.31) (2024-10-14)
 
 **Note:** Version bump only for package @synerise/ds-filter

package/dist/Filter.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { FilterProps } from './Filter.types';
-declare const Filter: ({ maxConditionsLimit, expressions, matching, onChangeOrder, onChangeLogic, onChangeStepMatching, onChangeStepName, onDeleteStep, onDuplicateStep, renderStepFooter, renderStepContent, renderStepHeaderRightSide, addFilterComponent, texts, logicOptions, renderHeaderRightSide, visibilityConfig, readOnly, getMoveByLabel, }: FilterProps) => React.JSX.Element;
+declare const Filter: ({ maxConditionsLimit, expressions, matching, onChangeOrder, onChangeLogic, onChangeStepMatching, onChangeStepName, onDeleteStep, onDuplicateStep, renderStepFooter, renderStepContent, renderStepHeaderRightSide, addFilterComponent, texts, logicOptions, renderHeaderRightSide, visibilityConfig, readOnly, singleStepCondition, getMoveByLabel, }: FilterProps) => React.JSX.Element;
 export default Filter;

package/dist/Filter.js

@@ -21,9 +21,9 @@ var component = {
 };
 var TRANSITION_DURATION = 0.5;
 var TRANSITION_DURATION_MAX = 1.5;
-var TOP_TRANSITION_ZINDEX = 10003;
-var BOTTOM_TRANSITION_ZINDEX = 10002;
-var DRAGGING_TRANSITION_ZINDEX = 10004;
+var TOP_TRANSITION_ZINDEX = 1003;
+var BOTTOM_TRANSITION_ZINDEX = 1002;
+var DRAGGING_TRANSITION_ZINDEX = 1004;
 
 var rearrangeItems = function rearrangeItems(sourceArray, oldIndex, newIndex) {
   sourceArray.splice(newIndex, 0, sourceArray.splice(oldIndex, 1)[0]);
@@ -55,6 +55,8 @@ var Filter = function Filter(_ref) {
   } : _ref$visibilityConfig,
       _ref$readOnly = _ref.readOnly,
       readOnly = _ref$readOnly === void 0 ? false : _ref$readOnly,
+      _ref$singleStepCondit = _ref.singleStepCondition,
+      singleStepCondition = _ref$singleStepCondit === void 0 ? false : _ref$singleStepCondit,
       getMoveByLabel = _ref.getMoveByLabel;
   var previousExpressions = usePrevious(expressions);
 
@@ -64,24 +66,26 @@ var Filter = function Filter(_ref) {
 
   var expressionRefs = useRef({});
   var movedExpressionId = useRef(null);
-  var SORTABLE_CONFIG = {
-    ghostClass: 'ghost-element',
-    className: 'sortable-list',
-    handle: '.step-card-drag-handler',
-    animation: 200,
-    forceFallback: true,
-    filter: '.ds-matching-toggle, .step-card-right-side',
-    onStart: function onStart() {
-      movedExpressionId.current = null;
-    },
-    onChoose: function onChoose(evt) {
-      // eslint-disable-next-line no-param-reassign
-      evt.item.style.zIndex = DRAGGING_TRANSITION_ZINDEX;
-    },
-    onUnchoose: function onUnchoose(evt) {
-      evt.item.style.removeProperty('z-index');
-    }
-  };
+  var SORTABLE_CONFIG = useMemo(function () {
+    return {
+      ghostClass: 'ghost-element',
+      className: 'sortable-list',
+      handle: '.step-card-drag-handler',
+      animation: 200,
+      forceFallback: true,
+      filter: '.ds-matching-toggle, .step-card-right-side',
+      onStart: function onStart() {
+        movedExpressionId.current = null;
+      },
+      onChoose: function onChoose(evt) {
+        // eslint-disable-next-line no-param-reassign
+        evt.item.style.zIndex = DRAGGING_TRANSITION_ZINDEX;
+      },
+      onUnchoose: function onUnchoose(evt) {
+        evt.item.style.removeProperty('z-index');
+      }
+    };
+  }, []);
   useEffect(function () {
     if (movedExpressionId.current && previousExpressions != null && previousExpressions.length) {
       var oldIndex = previousExpressions == null ? void 0 : previousExpressions.findIndex(function (expression) {
@@ -259,34 +263,37 @@ var Filter = function Filter(_ref) {
     };
     var props = {
       LOGIC: {
-        onChange: function onChange(value) {
+        onChange: onChangeLogic ? function (value) {
           return onChangeLogic(expression.id, value);
-        },
+        } : undefined,
         options: logicOptions
       },
       STEP: _objectSpread({}, reorderProps, {
-        onChangeMatching: function onChangeMatching(value) {
+        onChangeMatching: onChangeStepMatching ? function (value) {
           return onChangeStepMatching(expression.id, value);
-        },
-        onChangeName: function onChangeName(value) {
+        } : undefined,
+        onChangeName: onChangeStepName ? function (value) {
           return onChangeStepName(expression.id, value);
-        },
-        onDelete: function onDelete() {
+        } : undefined,
+        onDelete: onDeleteStep ? function () {
           return onDeleteStep(expression.id);
-        },
-        onDuplicate: !isLimitExceeded ? function () {
+        } : undefined,
+        onDuplicate: onDuplicateStep && !isLimitExceeded ? function () {
           return onDuplicateStep(expression.id);
         } : undefined,
         footer: renderStepFooter && renderStepFooter(expression),
         children: renderStepContent && renderStepContent(expression, !!activeExpressionId && !isActive(expression)),
         isHeaderVisible: visibilityConfig.isStepCardHeaderVisible,
         headerRightSide: renderStepHeaderRightSide && renderStepHeaderRightSide(expression, index),
+        isDraggable: Boolean(onChangeOrder),
+        singleStepCondition: Boolean(singleStepCondition),
+        additionalFields: expression.data.additionalFields,
         getMoveByLabel: getMoveByLabel,
         texts: _objectSpread({}, text.step, {}, contextTypeTexts)
       })
     };
     return props[expression.type];
-  }, [activeExpressionId, getContextTypeTexts, getMoveByLabel, handleMove, isActive, isLimitExceeded, logicOptions, onChangeLogic, onChangeStepMatching, onChangeStepName, onDeleteStep, onDuplicateStep, renderStepContent, renderStepFooter, renderStepHeaderRightSide, stepExpressionCount, text.step, visibilityConfig.isStepCardHeaderVisible]);
+  }, [activeExpressionId, getContextTypeTexts, getMoveByLabel, handleMove, isActive, isLimitExceeded, logicOptions, onChangeLogic, onChangeStepMatching, onChangeStepName, onDeleteStep, onDuplicateStep, renderStepContent, renderStepFooter, renderStepHeaderRightSide, stepExpressionCount, text.step, visibilityConfig.isStepCardHeaderVisible, singleStepCondition, onChangeOrder]);
   var renderExpression = useCallback(function (expression, index) {
     var Component = component[expression.type];
     var LogicComponent = expression.logic && component[expression.logic.type];
@@ -310,13 +317,20 @@ var Filter = function Filter(_ref) {
       readOnly: readOnly
     }))));
   }, [text.dropMeHere, componentProps, expressions.length, readOnly]);
+  var renderExpressions = useCallback(function () {
+    if (onChangeOrder) {
+      return /*#__PURE__*/React.createElement(ReactSortable, _extends({}, SORTABLE_CONFIG, {
+        list: expressions,
+        setList: onChangeOrder
+      }), expressions.map(renderExpression));
+    }
+
+    return expressions.map(renderExpression);
+  }, [renderExpression, SORTABLE_CONFIG, expressions, onChangeOrder]);
   return /*#__PURE__*/React.createElement(S.FilterWrapper, null, /*#__PURE__*/React.createElement(S.FilterHeader, null, texts != null && (_texts$overwritten = texts.overwritten) != null && _texts$overwritten.filterTitle ? /*#__PURE__*/React.createElement(S.FilterTitle, null, texts.overwritten.filterTitle) : /*#__PURE__*/React.createElement(S.MatchingAndConditionsWrapper, null, /*#__PURE__*/React.createElement(S.MatchingWrapper, null, matching && /*#__PURE__*/React.createElement(Matching, _extends({}, matching, {
     texts: text.matching,
     readOnly: readOnly
-  }))), !!maxConditionsLimit && /*#__PURE__*/React.createElement(S.ConditionsLimit, null, text.conditionsLimit, ":", ' ', /*#__PURE__*/React.createElement(S.ConditionsLimitResults, null, expressions.length, "/", maxConditionsLimit))), renderHeaderRightSide && /*#__PURE__*/React.createElement(S.FilterHeaderRightSide, null, renderHeaderRightSide(expressions))), /*#__PURE__*/React.createElement(React.Fragment, null, expressions.length > 0 ? /*#__PURE__*/React.createElement(ReactSortable, _extends({}, SORTABLE_CONFIG, {
-    list: expressions,
-    setList: onChangeOrder
-  }), expressions.map(renderExpression)) : /*#__PURE__*/React.createElement(Placeholder, {
+  }))), !!maxConditionsLimit && /*#__PURE__*/React.createElement(S.ConditionsLimit, null, text.conditionsLimit, ":", ' ', /*#__PURE__*/React.createElement(S.ConditionsLimitResults, null, expressions.length, "/", maxConditionsLimit))), renderHeaderRightSide && /*#__PURE__*/React.createElement(S.FilterHeaderRightSide, null, renderHeaderRightSide(expressions))), /*#__PURE__*/React.createElement(React.Fragment, null, expressions.length > 0 ? renderExpressions() : /*#__PURE__*/React.createElement(Placeholder, {
     text: text.placeholder.chooseCondition
   }), addFilterComponent && !readOnly && /*#__PURE__*/React.createElement(S.AddButtonWrapper, null, typeof addFilterComponent === 'function' ? addFilterComponent({
     isLimitExceeded: isLimitExceeded

package/dist/Filter.types.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { LogicOperator, LogicOperatorValue, LogicProps } from '@synerise/ds-logic/dist/Logic.types';
-import { StepCardProps } from '@synerise/ds-step-card/dist/StepCard.types';
+import { StepCardProps } from '@synerise/ds-step-card';
 import { MatchingProps, MatchingTexts } from '@synerise/ds-logic/dist/Matching/Matching.types';
 export type LogicType = {
     type: 'LOGIC';
@@ -22,18 +22,19 @@ export type FilterProps = {
     maxConditionsLimit?: number;
     expressions: Expression[];
     matching?: MatchingProps;
-    onChangeOrder: (newOrder: Expression[]) => void;
-    onChangeLogic: (id: string, logic: LogicOperatorValue) => void;
-    onChangeStepMatching: (id: string, matching: boolean) => void;
-    onChangeStepName: (id: string, name: string) => void;
-    onDeleteStep: (id: string) => void;
-    onDuplicateStep: (id: string) => void;
+    onChangeOrder?: (newOrder: Expression[]) => void;
+    onChangeLogic?: (id: string, logic: LogicOperatorValue) => void;
+    onChangeStepMatching?: (id: string, matching: boolean) => void;
+    onChangeStepName?: (id: string, name: string) => void;
+    onDeleteStep?: (id: string) => void;
+    onDuplicateStep?: (id: string) => void;
     renderStepFooter?: (expression: Expression) => React.ReactNode;
     renderStepContent?: (expression: Expression, hoverDisabled?: boolean) => React.ReactNode;
     renderStepHeaderRightSide?: (expression: Expression, index: number) => React.ReactNode;
     addFilterComponent?: React.ReactNode | ((arg: addFilterComponentProps) => React.ReactNode);
     logicOptions?: LogicOperator[];
     readOnly?: boolean;
+    singleStepCondition?: boolean;
     renderHeaderRightSide?: (expressions: Expression[]) => React.ReactNode;
     getMoveByLabel?: (moveByOffset: number) => string;
     texts?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synerise/ds-filter",
-  "version": "0.18.31",
+  "version": "0.18.33",
   "description": "Filter UI Component for the Synerise Design System",
   "license": "ISC",
   "repository": "Synerise/synerise-design",
@@ -34,10 +34,10 @@
   ],
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@synerise/ds-button": "^0.21.13",
-    "@synerise/ds-logic": "^0.8.50",
-    "@synerise/ds-step-card": "^0.11.29",
-    "@synerise/ds-utils": "^0.30.0",
+    "@synerise/ds-button": "^0.21.15",
+    "@synerise/ds-logic": "^0.8.52",
+    "@synerise/ds-step-card": "^0.11.31",
+    "@synerise/ds-utils": "^0.30.1",
     "react-intl": "3.12.0",
     "react-sortablejs": "^6.0.0",
     "sortablejs": "1.15.1"
@@ -48,5 +48,5 @@
     "react": ">=16.9.0 <= 17.0.2",
     "styled-components": "5.0.1"
   },
-  "gitHead": "39c906a3f4d8ec9442e5780c6e6a387584eabce1"
+  "gitHead": "fbadaa2299668c527b52ecc66d61fc2165528bff"
 }