Merge branch 'main' into fix/disabled-elems-selection

gravity-ui · Jul 16, 2024 · 6d55549 · 6d55549
2 parents 02123f0 + 88696a3
commit 6d55549
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/components/TreeSelect/TreeSelect.tsx b/src/components/TreeSelect/TreeSelect.tsx
@@ -47,6 +47,7 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
         items,
         value: propsValue,
         defaultValue,
+        placeholder,
         disabled = false,
         withExpandedState = true,
         defaultExpandedState = 'expanded',
@@ -153,6 +154,7 @@ export const TreeSelect = React.forwardRef(function TreeSelect<T>(
     const controlProps: TreeSelectRenderControlProps<T> = {
         list,
         open,
+        placeholder,
         toggleOpen,
         clearValue: () => list.state.setSelected({}),
         ref: handleControlRef,

diff --git a/src/components/TreeSelect/__stories__/TreeSelect.stories.tsx b/src/components/TreeSelect/__stories__/TreeSelect.stories.tsx
@@ -53,6 +53,7 @@ const DefaultTemplate: StoryFn<
         <Flex>
             <TreeSelect
                 {...props}
+                placeholder="-"
                 items={items}
                 mapItemDataToProps={(x) => x}
                 onItemClick={({id, list}) => {

diff --git a/src/components/TreeSelect/types.ts b/src/components/TreeSelect/types.ts
@@ -15,7 +15,8 @@ import type {UseListParsedStateProps} from '../useList/hooks/useListParsedState'
 export type TreeSelectRenderControlProps<T> = {
     list: UseListResult<T>;
     open: boolean;
-    disabled: boolean;
+    disabled?: boolean;
+    placeholder?: string;
     toggleOpen(): void;
     clearValue(): void;
     ref: React.Ref<HTMLButtonElement>;
@@ -46,6 +47,7 @@ export interface TreeSelectProps<T, P extends {} = {}>
     title?: string;
     value?: ListItemId[];
     disabled?: boolean;
+    placeholder?: string;
     defaultValue?: ListItemId[] | undefined;
     popupClassName?: string;
     popupWidth?: SelectPopupProps['width'];