@true-engineering/true-react-common-ui-kit 3.33.0 → 3.33.2

package/README.md

@@ -11,13 +11,25 @@
 
 # Release Notes
 
+## 3.33.2
+
+### Changes
+
+- **FlexibleTableCell**: Кастомизирована проверка необходимости отрисовки
+
+## 3.33.1
+
+### Changes
+
+- **FlexibleTable**: Поведение пропсы `position` стало таким же как `isFirstColumnSticky`
+
 ## 3.33.0
 
 ### Changes
 
-- **WithPopup**: Пропсы триггера разделены на referenceProps (для тегов) и triggerProps (для компонентов)
-- **WithPopup**: Для isActive триггера добавлен класс active
-- **WithPopup**: Для flip добавлен fallbackAxisSideDirection
+- **WithPopup**: Пропсы триггера разделены на `referenceProps` (для тегов) и `triggerProps` (для компонентов)
+- **WithPopup**: Для `isActive` триггера добавлен класс `active`
+- **WithPopup**: Для `flip` добавлен `fallbackAxisSideDirection`
 - **ICommonProps**: Разделены на составляющие (чтоб не пикать/омитить)
 
 ## 3.32.0

package/dist/components/FlexibleTable/FlexibleTable.stories.d.ts

@@ -4,6 +4,8 @@ interface ITableContent {
     contractCode: string;
     validFrom: Date;
     validTo: Date;
+    validTo1?: Date;
+    validTo2?: Date;
     title: string;
     signDate: Date;
     partner: string;
@@ -11,5 +13,7 @@ interface ITableContent {
     parentContract: string;
     currency: string;
     status: string;
+    note?: string;
+    publicNote?: string;
 }
 export declare const Default: import("@storybook/types").AnnotatedStoryFn<import("@storybook/react/dist/types-0fc72a6d").R, import("./FlexibleTable").IFlexibleTableProps<ITableContent, Partial<Record<keyof ITableContent, unknown>>, keyof ITableContent>>;

package/dist/components/FlexibleTable/components/FlexibleTableCell/FlexibleTableCell.d.ts

@@ -11,4 +11,4 @@ export interface IFlexibleTableCellProps<Row extends ITableRow, HeaderContent ex
     isSticky?: boolean;
     isLoading?: boolean;
 }
-export declare function FlexibleTableCell<Row extends ITableRow, HeaderContent extends IHeaderContent<Row>>({ row, columnName, config, renderMode, isSecond, isSticky, isLoading, tweakStyles, ...valueComponentProps }: IFlexibleTableCellProps<Row, HeaderContent>): JSX.Element;
+export declare function FlexibleTableCell<Row extends ITableRow, HeaderContent extends IHeaderContent<Row>>({ row, columnName, config, renderMode, isSecond, isSticky: isOldSticky, isLoading, tweakStyles, ...valueComponentProps }: IFlexibleTableCellProps<Row, HeaderContent>): JSX.Element;

package/dist/components/FlexibleTable/components/FlexibleTableRow/FlexibleTableRow.d.ts

@@ -11,7 +11,8 @@ export interface IFlexibleTableRowProps<Row extends ITableRow, HeaderContent ext
     isActive?: boolean;
     /** @default false */
     isFocusable?: boolean;
-    /** @default false */
+    /** @deprecated Use {@position}
+     * @default false */
     isFirstColumnSticky?: boolean;
     /** @default false */
     isLoading?: boolean;

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

@@ -31,6 +31,12 @@ export interface IFlexibleTableRowConfig<Values extends ITableRow, Key extends k
     right?: number;
     left?: number;
     shouldRenderDataId?: boolean;
+    /**
+     * Проверка, нужно ли отрисовать component
+     * @description **Не влияет на типизацию `component`, лучше использовать `row`**
+     * @default isNotEmpty
+     */
+    shouldRenderComponent?: boolean | ((value: Values[Key], values: Values, key: Key) => boolean);
 }
 export type IFlexibleTableConfigType<Values extends ITableRow, HeaderContent extends IHeaderContent<Values> = IHeaderContent<Values>> = {
     [Key in keyof Values]?: IFlexibleTableRowConfig<Values, Key, HeaderContent>;

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

@@ -25938,7 +25938,8 @@ var useStyles$i = createThemedStyles("FlexibleTableCell", {
   sticky: _object_spread_props$k(_object_spread$l({
     zIndex: 19,
     paddingLeft: 24,
-    paddingRight: 12
+    paddingRight: 12,
+    left: 0
   }, getTransition([
     "box-shadow"
   ])), {
@@ -26039,7 +26040,7 @@ function _object_without_properties_loose$7(source, excluded) {
   return target;
 }
 function FlexibleTableCell(_param) {
-  var row = _param.row, columnName = _param.columnName, config = _param.config, renderMode = _param.renderMode, isSecond = _param.isSecond, isSticky = _param.isSticky, isLoading = _param.isLoading, tweakStyles = _param.tweakStyles, valueComponentProps = _object_without_properties$7(_param, [
+  var row = _param.row, columnName = _param.columnName, config = _param.config, renderMode = _param.renderMode, isSecond = _param.isSecond, isOldSticky = _param.isSticky, isLoading = _param.isLoading, tweakStyles = _param.tweakStyles, valueComponentProps = _object_without_properties$7(_param, [
     "row",
     "columnName",
     "config",
@@ -26054,7 +26055,8 @@ function FlexibleTableCell(_param) {
   });
   var value = row[columnName];
   var _config_columnName;
-  var _ref = (_config_columnName = config[columnName]) !== null && _config_columnName !== void 0 ? _config_columnName : {}, _ref_component = _ref.component, component = _ref_component === void 0 ? formatCellContent(value, config[columnName]) : _ref_component, left2 = _ref.left, right2 = _ref.right, position = _ref.position, cellAlign = _ref.cellAlign, cellVerticalAlign = _ref.cellVerticalAlign, shouldRenderDataId = _ref.shouldRenderDataId;
+  var _ref = (_config_columnName = config[columnName]) !== null && _config_columnName !== void 0 ? _config_columnName : {}, _ref_component = _ref.component, component = _ref_component === void 0 ? formatCellContent(value, config[columnName]) : _ref_component, left2 = _ref.left, right2 = _ref.right, position = _ref.position, cellAlign = _ref.cellAlign, cellVerticalAlign = _ref.cellVerticalAlign, shouldRenderDataId = _ref.shouldRenderDataId, _ref_shouldRenderComponent = _ref.shouldRenderComponent, shouldRenderComponent = _ref_shouldRenderComponent === void 0 ? isNotEmpty : _ref_shouldRenderComponent;
+  var isSticky = isOldSticky || position === "sticky";
   var Table = TableRenders[renderMode];
   var _obj2;
   return /* @__PURE__ */ jsx(Table.Cell, _object_spread_props$j(_object_spread$k({
@@ -26063,7 +26065,7 @@ function FlexibleTableCell(_param) {
       textAlign: cellAlign,
       position: isSticky ? "sticky" : position,
       right: right2,
-      left: isSticky ? 0 : left2,
+      left: left2,
       verticalAlign: cellVerticalAlign
     }
   }, addDataAttributes({
@@ -26072,7 +26074,7 @@ function FlexibleTableCell(_param) {
     children: isLoading ? /* @__PURE__ */ jsx("div", {
       className: classes.skeleton,
       children: /* @__PURE__ */ jsx(Skeleton, {})
-    }) : isNotEmpty(value) && applyAction(component, _object_spread_props$j(_object_spread$k({}, valueComponentProps), {
+    }) : applyAction(shouldRenderComponent, value, row, columnName) && applyAction(component, _object_spread_props$j(_object_spread$k({}, valueComponentProps), {
       value,
       row
     }))
@@ -26547,24 +26549,28 @@ function FlexibleTable(_param) {
           children: /* @__PURE__ */ jsx(Table.Row, {
             className: classes.headerRow,
             children: columns.map(function(key, i) {
-              var itemConfig = config === null || config === void 0 ? void 0 : config[key];
-              var _itemConfig_titleAlign, _itemConfig_title;
+              var _config_key;
+              var _ref = (_config_key = config === null || config === void 0 ? void 0 : config[key]) !== null && _config_key !== void 0 ? _config_key : {}, position = _ref.position, minWidth = _ref.minWidth, width = _ref.width, maxWidth = _ref.maxWidth, _ref_titleAlign = _ref.titleAlign, titleAlign = _ref_titleAlign === void 0 ? "left" : _ref_titleAlign, right2 = _ref.right, left2 = _ref.left, _ref_title = _ref.title, title = _ref_title === void 0 ? "" : _ref_title, shouldRenderDataId = _ref.shouldRenderDataId;
+              var isSticky = position === "sticky" || isFirstColumnSticky && i === 0;
               var _obj2;
               return /* @__PURE__ */ jsx(Table.Header, _object_spread_props$h(_object_spread$i({
-                className: clsx(classes.header, (_obj2 = {}, _define_property$j(_obj2, classes.headerSticky, isFirstColumnSticky && i === 0), _define_property$j(_obj2, classes.headerSecond, isFirstColumnSticky && i === 1), _obj2)),
+                className: clsx(classes.header, (_obj2 = {}, _define_property$j(_obj2, classes.headerSticky, isSticky), _define_property$j(_obj2, classes.headerSecond, isFirstColumnSticky && i === 1), _obj2)),
                 style: {
-                  minWidth: itemConfig === null || itemConfig === void 0 ? void 0 : itemConfig.minWidth,
-                  width: itemConfig === null || itemConfig === void 0 ? void 0 : itemConfig.width,
-                  maxWidth: itemConfig === null || itemConfig === void 0 ? void 0 : itemConfig.maxWidth,
-                  textAlign: (_itemConfig_titleAlign = itemConfig === null || itemConfig === void 0 ? void 0 : itemConfig.titleAlign) !== null && _itemConfig_titleAlign !== void 0 ? _itemConfig_titleAlign : "left"
+                  minWidth,
+                  width,
+                  maxWidth,
+                  textAlign: titleAlign,
+                  position: isSticky ? "sticky" : position,
+                  right: right2,
+                  left: left2
                 },
                 onClick: isNotEmpty(onHeadClick) ? function() {
                   return onHeadClick(key);
                 } : void 0
               }, addDataAttributes({
-                id: (itemConfig === null || itemConfig === void 0 ? void 0 : itemConfig.shouldRenderDataId) ? key : void 0
+                id: shouldRenderDataId ? key : void 0
               })), {
-                children: applyAction((_itemConfig_title = itemConfig === null || itemConfig === void 0 ? void 0 : itemConfig.title) !== null && _itemConfig_title !== void 0 ? _itemConfig_title : "", {
+                children: applyAction(title, {
                   value: headerContent === null || headerContent === void 0 ? void 0 : headerContent[key]
                 })
               }), key);