@true-engineering/true-react-common-ui-kit 1.7.0 → 1.8.1

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

@@ -12,7 +12,7 @@ export declare type IValueComponent<Values, Value> = (props: {
     isNestedComponentExpanded: boolean;
     isRowNestedComponentExpanded: boolean;
     onSetNestedComponent: (component?: ReactNode) => void;
-}) => JSX.Element | null;
+}) => JSX.Element | ReactNode;
 export declare type FlexibleTableConfigType<Values> = {
     [Key in keyof Values]?: {
         title?: ReactNode;

package/dist/components/Select/Select.d.ts

@@ -31,4 +31,4 @@ export interface ISelectProps<Value> extends Omit<IInputProps, 'value' | 'onChan
     convertValueToReactNode?(value: Value, isDisabled: boolean): ReactNode;
     convertValueToId?(value: Value): string | undefined;
 }
-export declare function Select<Value>({ options, value, defaultOptionLabel, debounceTime, optionsMode, noMatchesLabel, loadingLabel, tweakStyles, testId, isDisabled, dropdownOptions, minSymbolsCountToOpenList, dropdownIcon, shouldScrollToList, searchInput, onChange, onFocus, onBlur, onType, onOpen, isOptionDisabled, compareValuesOnChange, convertValueToString, convertValueToId, convertValueToReactNode, optionsFilter, ...inputProps }: ISelectProps<Value>): JSX.Element;
+export declare function Select<Value>({ options, value, defaultOptionLabel, debounceTime, optionsMode, noMatchesLabel, loadingLabel, tweakStyles, testId, isReadonly, isDisabled, dropdownOptions, minSymbolsCountToOpenList, dropdownIcon, shouldScrollToList, searchInput, onChange, onFocus, onBlur, onType, onOpen, isOptionDisabled, compareValuesOnChange, convertValueToString, convertValueToId, convertValueToReactNode, optionsFilter, ...inputProps }: ISelectProps<Value>): JSX.Element;

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

@@ -7649,7 +7649,7 @@ var __generator$4 = globalThis && globalThis.__generator || function(thisArg, bo
   }
 };
 function Select(_param) {
-  var options = _param.options, value = _param.value, defaultOptionLabel = _param.defaultOptionLabel, _param_debounceTime = _param.debounceTime, debounceTime = _param_debounceTime === void 0 ? 400 : _param_debounceTime, _param_optionsMode = _param.optionsMode, optionsMode = _param_optionsMode === void 0 ? "normal" : _param_optionsMode, noMatchesLabel = _param.noMatchesLabel, loadingLabel = _param.loadingLabel, tweakStyles = _param.tweakStyles, testId = _param.testId, isDisabled = _param.isDisabled, dropdownOptions = _param.dropdownOptions, _param_minSymbolsCountToOpenList = _param.minSymbolsCountToOpenList, minSymbolsCountToOpenList = _param_minSymbolsCountToOpenList === void 0 ? 0 : _param_minSymbolsCountToOpenList, _param_dropdownIcon = _param.dropdownIcon, dropdownIcon = _param_dropdownIcon === void 0 ? "chevron-down" : _param_dropdownIcon, _param_shouldScrollToList = _param.shouldScrollToList, shouldScrollToList = _param_shouldScrollToList === void 0 ? true : _param_shouldScrollToList, searchInput = _param.searchInput, onChange = _param.onChange, onFocus = _param.onFocus, onBlur = _param.onBlur, onType = _param.onType, onOpen = _param.onOpen, _param_isOptionDisabled = _param.isOptionDisabled, isOptionDisabled = _param_isOptionDisabled === void 0 ? defaultIsOptionDisabled : _param_isOptionDisabled, _param_compareValuesOnChange = _param.compareValuesOnChange, compareValuesOnChange = _param_compareValuesOnChange === void 0 ? defaultCompareFunction : _param_compareValuesOnChange, _param_convertValueToString = _param.convertValueToString, convertValueToString = _param_convertValueToString === void 0 ? defaultConvertFunction$2 : _param_convertValueToString, convertValueToId = _param.convertValueToId, convertValueToReactNode = _param.convertValueToReactNode, optionsFilter = _param.optionsFilter, inputProps = _object_without_properties$5(_param, [
+  var options = _param.options, value = _param.value, defaultOptionLabel = _param.defaultOptionLabel, _param_debounceTime = _param.debounceTime, debounceTime = _param_debounceTime === void 0 ? 400 : _param_debounceTime, _param_optionsMode = _param.optionsMode, optionsMode = _param_optionsMode === void 0 ? "normal" : _param_optionsMode, noMatchesLabel = _param.noMatchesLabel, loadingLabel = _param.loadingLabel, tweakStyles = _param.tweakStyles, testId = _param.testId, isReadonly = _param.isReadonly, isDisabled = _param.isDisabled, dropdownOptions = _param.dropdownOptions, _param_minSymbolsCountToOpenList = _param.minSymbolsCountToOpenList, minSymbolsCountToOpenList = _param_minSymbolsCountToOpenList === void 0 ? 0 : _param_minSymbolsCountToOpenList, _param_dropdownIcon = _param.dropdownIcon, dropdownIcon = _param_dropdownIcon === void 0 ? "chevron-down" : _param_dropdownIcon, _param_shouldScrollToList = _param.shouldScrollToList, shouldScrollToList = _param_shouldScrollToList === void 0 ? true : _param_shouldScrollToList, searchInput = _param.searchInput, onChange = _param.onChange, onFocus = _param.onFocus, onBlur = _param.onBlur, onType = _param.onType, onOpen = _param.onOpen, _param_isOptionDisabled = _param.isOptionDisabled, isOptionDisabled = _param_isOptionDisabled === void 0 ? defaultIsOptionDisabled : _param_isOptionDisabled, _param_compareValuesOnChange = _param.compareValuesOnChange, compareValuesOnChange = _param_compareValuesOnChange === void 0 ? defaultCompareFunction : _param_compareValuesOnChange, _param_convertValueToString = _param.convertValueToString, convertValueToString = _param_convertValueToString === void 0 ? defaultConvertFunction$2 : _param_convertValueToString, convertValueToId = _param.convertValueToId, convertValueToReactNode = _param.convertValueToReactNode, optionsFilter = _param.optionsFilter, inputProps = _object_without_properties$5(_param, [
     "options",
     "value",
     "defaultOptionLabel",
@@ -7659,6 +7659,7 @@ function Select(_param) {
     "loadingLabel",
     "tweakStyles",
     "testId",
+    "isReadonly",
     "isDisabled",
     "dropdownOptions",
     "minSymbolsCountToOpenList",
@@ -7897,17 +7898,16 @@ function Select(_param) {
     hasSearchInputInList) && // Последняя проверка на случай, если мы че то ищем в опциях
     (optionsMode === "normal" || hasEnoughSymbolsToSearch)
   );
-  var _inputProps_isReadonly = inputProps.isReadonly, isReadonly = _inputProps_isReadonly === void 0 ? true : _inputProps_isReadonly;
-  var shouldUsePointerCursor = (optionsMode === "normal" || shouldRenderSearchInputInList) && isReadonly;
+  var hasReadonlyInput = isReadonly || optionsMode === "normal" || shouldRenderSearchInputInList;
   var tweakInputStyles = useMemo(function() {
-    return merge({}, componentStyles.tweakInput, _object_spread$u({}, shouldUsePointerCursor ? {
+    return merge({}, componentStyles.tweakInput, _object_spread$u({}, hasReadonlyInput && {
       input: {
         cursor: "pointer"
       }
-    } : void 0), tweakStyles === null || tweakStyles === void 0 ? void 0 : tweakStyles.tweakInput);
+    }), tweakStyles === null || tweakStyles === void 0 ? void 0 : tweakStyles.tweakInput);
   }, [
     tweakStyles === null || tweakStyles === void 0 ? void 0 : tweakStyles.tweakInput,
-    shouldUsePointerCursor
+    hasReadonlyInput
   ]);
   var tweakSearchInputStyles = useTweakStyles(componentStyles, tweakStyles, "tweakSearchInput");
   var _ref = dropdownOptions !== null && dropdownOptions !== void 0 ? dropdownOptions : {}, _ref_shouldUsePopper = _ref.shouldUsePopper, shouldUsePopper = _ref_shouldUsePopper === void 0 ? false : _ref_shouldUsePopper, _ref_shouldRenderInBody = _ref.shouldRenderInBody, shouldRenderInBody = _ref_shouldRenderInBody === void 0 ? false : _ref_shouldRenderInBody, _ref_shouldHideOnScroll = _ref.shouldHideOnScroll, shouldHideOnScroll = _ref_shouldHideOnScroll === void 0 ? false : _ref_shouldHideOnScroll;
@@ -7974,7 +7974,7 @@ function Select(_param) {
             value: searchValue !== "" && !shouldRenderSearchInputInList ? searchValue : stringValue,
             onChange: handleInputChange,
             isActive: isListOpen,
-            isReadonly: isReadonly !== null && isReadonly !== void 0 ? isReadonly : optionsMode === "normal" || shouldRenderSearchInputInList,
+            isReadonly: hasReadonlyInput,
             onFocus: handleFocus,
             onBlur: handleBlur,
             isDisabled,
@@ -20268,7 +20268,7 @@ function TableValue(param) {
   var content = null;
   if (itemConfig === null || itemConfig === void 0 ? void 0 : itemConfig.component) {
     var ValueComponent = itemConfig === null || itemConfig === void 0 ? void 0 : itemConfig.component;
-    content = /* @__PURE__ */ jsx(ValueComponent, {
+    content = ValueComponent({
       value,
       row: item,
       isFocusedRow,

package/dist/true-react-common-ui-kit.umd.cjs

@@ -7639,7 +7639,7 @@
     }
   };
   function Select(_param) {
-    var options = _param.options, value = _param.value, defaultOptionLabel = _param.defaultOptionLabel, _param_debounceTime = _param.debounceTime, debounceTime = _param_debounceTime === void 0 ? 400 : _param_debounceTime, _param_optionsMode = _param.optionsMode, optionsMode = _param_optionsMode === void 0 ? "normal" : _param_optionsMode, noMatchesLabel = _param.noMatchesLabel, loadingLabel = _param.loadingLabel, tweakStyles = _param.tweakStyles, testId = _param.testId, isDisabled = _param.isDisabled, dropdownOptions = _param.dropdownOptions, _param_minSymbolsCountToOpenList = _param.minSymbolsCountToOpenList, minSymbolsCountToOpenList = _param_minSymbolsCountToOpenList === void 0 ? 0 : _param_minSymbolsCountToOpenList, _param_dropdownIcon = _param.dropdownIcon, dropdownIcon = _param_dropdownIcon === void 0 ? "chevron-down" : _param_dropdownIcon, _param_shouldScrollToList = _param.shouldScrollToList, shouldScrollToList = _param_shouldScrollToList === void 0 ? true : _param_shouldScrollToList, searchInput = _param.searchInput, onChange = _param.onChange, onFocus = _param.onFocus, onBlur = _param.onBlur, onType = _param.onType, onOpen = _param.onOpen, _param_isOptionDisabled = _param.isOptionDisabled, isOptionDisabled = _param_isOptionDisabled === void 0 ? defaultIsOptionDisabled : _param_isOptionDisabled, _param_compareValuesOnChange = _param.compareValuesOnChange, compareValuesOnChange = _param_compareValuesOnChange === void 0 ? defaultCompareFunction : _param_compareValuesOnChange, _param_convertValueToString = _param.convertValueToString, convertValueToString = _param_convertValueToString === void 0 ? defaultConvertFunction$2 : _param_convertValueToString, convertValueToId = _param.convertValueToId, convertValueToReactNode = _param.convertValueToReactNode, optionsFilter = _param.optionsFilter, inputProps = _object_without_properties$5(_param, [
+    var options = _param.options, value = _param.value, defaultOptionLabel = _param.defaultOptionLabel, _param_debounceTime = _param.debounceTime, debounceTime = _param_debounceTime === void 0 ? 400 : _param_debounceTime, _param_optionsMode = _param.optionsMode, optionsMode = _param_optionsMode === void 0 ? "normal" : _param_optionsMode, noMatchesLabel = _param.noMatchesLabel, loadingLabel = _param.loadingLabel, tweakStyles = _param.tweakStyles, testId = _param.testId, isReadonly = _param.isReadonly, isDisabled = _param.isDisabled, dropdownOptions = _param.dropdownOptions, _param_minSymbolsCountToOpenList = _param.minSymbolsCountToOpenList, minSymbolsCountToOpenList = _param_minSymbolsCountToOpenList === void 0 ? 0 : _param_minSymbolsCountToOpenList, _param_dropdownIcon = _param.dropdownIcon, dropdownIcon = _param_dropdownIcon === void 0 ? "chevron-down" : _param_dropdownIcon, _param_shouldScrollToList = _param.shouldScrollToList, shouldScrollToList = _param_shouldScrollToList === void 0 ? true : _param_shouldScrollToList, searchInput = _param.searchInput, onChange = _param.onChange, onFocus = _param.onFocus, onBlur = _param.onBlur, onType = _param.onType, onOpen = _param.onOpen, _param_isOptionDisabled = _param.isOptionDisabled, isOptionDisabled = _param_isOptionDisabled === void 0 ? defaultIsOptionDisabled : _param_isOptionDisabled, _param_compareValuesOnChange = _param.compareValuesOnChange, compareValuesOnChange = _param_compareValuesOnChange === void 0 ? defaultCompareFunction : _param_compareValuesOnChange, _param_convertValueToString = _param.convertValueToString, convertValueToString = _param_convertValueToString === void 0 ? defaultConvertFunction$2 : _param_convertValueToString, convertValueToId = _param.convertValueToId, convertValueToReactNode = _param.convertValueToReactNode, optionsFilter = _param.optionsFilter, inputProps = _object_without_properties$5(_param, [
       "options",
       "value",
       "defaultOptionLabel",
@@ -7649,6 +7649,7 @@
       "loadingLabel",
       "tweakStyles",
       "testId",
+      "isReadonly",
       "isDisabled",
       "dropdownOptions",
       "minSymbolsCountToOpenList",
@@ -7887,17 +7888,16 @@
       hasSearchInputInList) && // Последняя проверка на случай, если мы че то ищем в опциях
       (optionsMode === "normal" || hasEnoughSymbolsToSearch)
     );
-    var _inputProps_isReadonly = inputProps.isReadonly, isReadonly = _inputProps_isReadonly === void 0 ? true : _inputProps_isReadonly;
-    var shouldUsePointerCursor = (optionsMode === "normal" || shouldRenderSearchInputInList) && isReadonly;
+    var hasReadonlyInput = isReadonly || optionsMode === "normal" || shouldRenderSearchInputInList;
     var tweakInputStyles = React.useMemo(function() {
-      return lodash.merge({}, componentStyles.tweakInput, _object_spread$u({}, shouldUsePointerCursor ? {
+      return lodash.merge({}, componentStyles.tweakInput, _object_spread$u({}, hasReadonlyInput && {
         input: {
           cursor: "pointer"
         }
-      } : void 0), tweakStyles === null || tweakStyles === void 0 ? void 0 : tweakStyles.tweakInput);
+      }), tweakStyles === null || tweakStyles === void 0 ? void 0 : tweakStyles.tweakInput);
     }, [
       tweakStyles === null || tweakStyles === void 0 ? void 0 : tweakStyles.tweakInput,
-      shouldUsePointerCursor
+      hasReadonlyInput
     ]);
     var tweakSearchInputStyles = useTweakStyles(componentStyles, tweakStyles, "tweakSearchInput");
     var _ref = dropdownOptions !== null && dropdownOptions !== void 0 ? dropdownOptions : {}, _ref_shouldUsePopper = _ref.shouldUsePopper, shouldUsePopper = _ref_shouldUsePopper === void 0 ? false : _ref_shouldUsePopper, _ref_shouldRenderInBody = _ref.shouldRenderInBody, shouldRenderInBody = _ref_shouldRenderInBody === void 0 ? false : _ref_shouldRenderInBody, _ref_shouldHideOnScroll = _ref.shouldHideOnScroll, shouldHideOnScroll = _ref_shouldHideOnScroll === void 0 ? false : _ref_shouldHideOnScroll;
@@ -7964,7 +7964,7 @@
               value: searchValue !== "" && !shouldRenderSearchInputInList ? searchValue : stringValue,
               onChange: handleInputChange,
               isActive: isListOpen,
-              isReadonly: isReadonly !== null && isReadonly !== void 0 ? isReadonly : optionsMode === "normal" || shouldRenderSearchInputInList,
+              isReadonly: hasReadonlyInput,
               onFocus: handleFocus,
               onBlur: handleBlur,
               isDisabled,
@@ -20258,7 +20258,7 @@
     var content = null;
     if (itemConfig === null || itemConfig === void 0 ? void 0 : itemConfig.component) {
       var ValueComponent = itemConfig === null || itemConfig === void 0 ? void 0 : itemConfig.component;
-      content = /* @__PURE__ */ jsx(ValueComponent, {
+      content = ValueComponent({
         value,
         row: item,
         isFocusedRow,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@true-engineering/true-react-common-ui-kit",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "True Engineering React UI Kit with theming support",
   "author": "True Engineering (https://trueengineering.ru)",
   "keywords": [

package/src/components/FlexibleTable/TableValue.tsx

@@ -43,16 +43,14 @@ function TableValue<Values extends Record<string, any>>({
 
   if (itemConfig?.component) {
     const ValueComponent = itemConfig?.component;
-    content = (
-      <ValueComponent
-        value={value}
-        row={item}
-        isFocusedRow={isFocusedRow}
-        isNestedComponentExpanded={isNestedComponentExpanded}
-        isRowNestedComponentExpanded={isRowNestedComponentExpanded}
-        onSetNestedComponent={onSetNestedComponent}
-      />
-    );
+    content = ValueComponent({
+      value,
+      row: item,
+      isFocusedRow,
+      isNestedComponentExpanded,
+      isRowNestedComponentExpanded,
+      onSetNestedComponent,
+    });
   } else if (typeof value === 'string' || typeof value === 'number') {
     content = value;
   } else if ((value as any) instanceof Date) {

package/src/components/FlexibleTable/types.ts

@@ -23,7 +23,7 @@ export type IValueComponent<Values, Value> = (props: {
   isNestedComponentExpanded: boolean;
   isRowNestedComponentExpanded: boolean;
   onSetNestedComponent: (component?: ReactNode) => void;
-}) => JSX.Element | null;
+}) => JSX.Element | ReactNode;
 
 export type FlexibleTableConfigType<Values> = {
   [Key in keyof Values]?: {

package/src/components/Select/Select.tsx

@@ -78,6 +78,7 @@ export function Select<Value>({
   loadingLabel,
   tweakStyles,
   testId,
+  isReadonly,
   isDisabled,
   dropdownOptions,
   minSymbolsCountToOpenList = 0,
@@ -364,23 +365,18 @@ export function Select<Value>({
     // Последняя проверка на случай, если мы че то ищем в опциях
     (optionsMode === 'normal' || hasEnoughSymbolsToSearch);
 
-  const { isReadonly = true } = inputProps;
-  const shouldUsePointerCursor =
-    (optionsMode === 'normal' || shouldRenderSearchInputInList) && isReadonly;
+  const hasReadonlyInput =
+    isReadonly || optionsMode === 'normal' || shouldRenderSearchInputInList;
 
   const tweakInputStyles = useMemo(
     () =>
       merge(
         {},
         componentStyles.tweakInput,
-        {
-          ...(shouldUsePointerCursor
-            ? { input: { cursor: 'pointer' } }
-            : undefined),
-        },
+        { ...(hasReadonlyInput && { input: { cursor: 'pointer' } }) },
         tweakStyles?.tweakInput,
       ) as Styles,
-    [tweakStyles?.tweakInput, shouldUsePointerCursor],
+    [tweakStyles?.tweakInput, hasReadonlyInput],
   );
 
   const tweakSearchInputStyles = useTweakStyles(
@@ -480,10 +476,7 @@ export function Select<Value>({
           }
           onChange={handleInputChange}
           isActive={isListOpen}
-          isReadonly={
-            isReadonly ??
-            (optionsMode === 'normal' || shouldRenderSearchInputInList)
-          }
+          isReadonly={hasReadonlyInput}
           onFocus={handleFocus}
           onBlur={handleBlur}
           isDisabled={isDisabled}