@true-engineering/true-react-common-ui-kit 3.48.0 → 3.49.0

package/README.md

@@ -11,6 +11,14 @@
 
 # Release Notes
 
+## 3.49.0
+
+### Changes
+
+- **FiltersPane**: Добавлен `getSelectedValue` для удобного рендера значения в `custom`-фильтре с `valueViewType: 'multiple'`
+- **FiltersPane**: Добавлен экспорт `ICustomComponentProps` для `CustomComponent` в `ICustomConfigItem`
+- **FiltersPane**: Кастомный фильтр разделён на два типа `ICustomRangeConfigItem` и `ICustomMultipleConfigItem`
+
 ## 3.48.0
 
 ### Changes

package/dist/components/FiltersPane/types.d.ts

@@ -54,20 +54,30 @@ export type IDateRangeConfigItem<Value> = IConfigItemBasicBase<Value> & {
     type: 'dateRange';
     dateFormat?: string;
 } & Omit<IFilterWithPeriodProps, 'value' | 'onChange' | 'setIsOpen'>;
-export type CustomComponent<Value> = FC<{
+export interface ICustomComponentProps<Value> {
     value?: Value;
     onChange: (v?: Value) => void;
     onClose?: () => void;
     filter: ICustomConfigItem<Value>;
     localeKey?: IFilterLocaleKey;
     locale?: IPartialFilterLocale;
-}>;
-export interface ICustomConfigItem<Value> extends IConfigItemBasicBase<Value> {
-    [key: string]: any;
+}
+export type CustomComponent<Value> = FC<ICustomComponentProps<Value>>;
+export type ICustomValue<V> = V extends Array<infer T> ? T : never;
+export interface ICustomRangeConfigItem<Value> extends IConfigItemBasicBase<Value> {
+    [key: string & {}]: any;
+    type: 'custom';
+    component: CustomComponent<Value>;
+    valueViewType?: 'range';
+}
+export interface ICustomMultipleConfigItem<Value> extends IConfigItemBasicBase<Value> {
+    [key: string & {}]: any;
     type: 'custom';
     component: CustomComponent<Value>;
-    valueViewType?: 'range' | 'multiple';
+    valueViewType?: 'multiple';
+    getSelectedValue?: (v: ICustomValue<Value>) => ReactNode;
 }
+export type ICustomConfigItem<Value> = ICustomRangeConfigItem<Value> | ICustomMultipleConfigItem<Value>;
 export type ConfigItem<Value> = ISelectConfigItem<Value> | IMultiSelectConfigItem<Value> | ICustomConfigItem<Value> | IDateRangeWithoutPeriodConfigItem<Value> | IDateRangeConfigItem<Value> | IIntervalConfigItem<Value> | IBooleanConfigItem<Value>;
 export type ConfigType<Values> = {
     [K in keyof Values]: ConfigItem<Values[K]>;

package/dist/true-react-common-ui-kit.js

@@ -19060,7 +19060,7 @@ function FilterValueView(param) {
   if (isEmpty(value)) {
     return /* @__PURE__ */ jsx(Fragment, {});
   }
-  if (filter.getSelectedValueView !== void 0) {
+  if (isNotEmpty(filter.getSelectedValueView)) {
     return /* @__PURE__ */ jsx("span", {
       className: classes.text,
       children: filter.getSelectedValueView(value)
@@ -19129,22 +19129,6 @@ function FilterValueView(param) {
       children: intervals.join(" ")
     });
   }
-  if (isMultiple) {
-    return /* @__PURE__ */ jsx(Fragment, {
-      children: Array.isArray(value) && value.length > 0 && /* @__PURE__ */ jsxs(Fragment, {
-        children: [
-          /* @__PURE__ */ jsx("span", {
-            className: classes.text,
-            children: displayValue(value[0])
-          }),
-          /* @__PURE__ */ jsx("span", {
-            className: classes.count,
-            children: value.length > 1 && " (+".concat(value.length - 1, ")")
-          })
-        ]
-      })
-    });
-  }
   if (isDate) {
     var from = value.from, to = value.to, periodType = value.periodType, label = value.label;
     var hasFrom = from !== void 0 && from !== null;
@@ -19175,6 +19159,24 @@ function FilterValueView(param) {
       children: range.join(" ")
     });
   }
+  if (isMultiple) {
+    var _filter_getSelectedValue;
+    var convertValue = (_filter_getSelectedValue = filter.getSelectedValue) !== null && _filter_getSelectedValue !== void 0 ? _filter_getSelectedValue : displayValue;
+    return /* @__PURE__ */ jsx(Fragment, {
+      children: Array.isArray(value) && value.length > 0 && /* @__PURE__ */ jsxs(Fragment, {
+        children: [
+          /* @__PURE__ */ jsx("span", {
+            className: classes.text,
+            children: convertValue(value[0])
+          }),
+          /* @__PURE__ */ jsx("span", {
+            className: classes.count,
+            children: value.length > 1 && " (+".concat(value.length - 1, ")")
+          })
+        ]
+      })
+    });
+  }
   if (isRange && Array.isArray(value)) {
     var rangeValue = value;
     var rangeValueFrom = rangeValue[0];