Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
},
"dependencies": {
"classnames": "2.x",
"@rc-component/select": "~1.0.0",
"@rc-component/tree": "~1.0.0",
"@rc-component/select": "~1.0.2",
"@rc-component/tree": "~1.0.1",
"@rc-component/util": "^1.2.1"
},
"devDependencies": {
Expand Down
4 changes: 4 additions & 0 deletions src/OptionList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
leftMaxCount,
leafCountOnly,
valueEntities,
classNames: treeClassNames,
styles,
} = React.useContext(TreeSelectContext);

const {
Expand Down Expand Up @@ -342,6 +344,8 @@ const OptionList: React.ForwardRefRenderFunction<ReviseRefOptionListProps> = (_,
)}
<UnstableContext.Provider value={{ nodeDisabled }}>
<Tree
classNames={treeClassNames}
styles={styles}
ref={treeRef}
focusable={false}
prefixCls={`${prefixCls}-tree`}
Expand Down
17 changes: 17 additions & 0 deletions src/TreeSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
treeTitleRender,

onPopupScroll,

classNames: treeSelectClassNames,
styles,
...restProps
} = props;

Expand Down Expand Up @@ -623,6 +626,8 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
leafCountOnly:
mergedShowCheckedStrategy === 'SHOW_CHILD' && !treeCheckStrictly && !!treeCheckable,
valueEntities,
classNames: treeSelectClassNames,
styles,
};
}, [
virtual,
Expand All @@ -642,6 +647,8 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
treeCheckStrictly,
treeCheckable,
valueEntities,
treeSelectClassNames,
styles,
]);

// ======================= Legacy Context =======================
Expand Down Expand Up @@ -693,6 +700,16 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
<BaseSelect
ref={ref}
{...restProps}
classNames={{
prefix: treeSelectClassNames?.prefix,
suffix: treeSelectClassNames?.suffix,
input: treeSelectClassNames?.input,
}}
styles={{
prefix: styles?.prefix,
suffix: styles?.suffix,
input: styles?.input,
}}
// >>> MISC
id={mergedId}
prefixCls={prefixCls}
Expand Down
3 changes: 3 additions & 0 deletions src/TreeSelectContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type { ExpandAction } from '@rc-component/tree/lib/Tree';
import type { DataNode, FieldNames, Key } from './interface';
import type useDataEntities from './hooks/useDataEntities';

export type SemanticName = 'item' | 'itemTitle' | 'input' | 'prefix' | 'suffix';
export interface TreeSelectContextProps {
virtual?: boolean;
popupMatchSelectWidth?: boolean | number;
Expand All @@ -21,6 +22,8 @@ export interface TreeSelectContextProps {
/** When `true`, only take leaf node as count, or take all as count with `maxCount` limitation */
leafCountOnly: boolean;
valueEntities: ReturnType<typeof useDataEntities>['valueEntities'];
styles?: Partial<Record<SemanticName, React.CSSProperties>>;
classNames?: Partial<Record<SemanticName, string>>;
}

const TreeSelectContext = React.createContext<TreeSelectContextProps>(null as any);
Expand Down
67 changes: 67 additions & 0 deletions tests/Select.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -638,4 +638,71 @@ describe('TreeSelect.basic', () => {
const { container } = render(<TreeSelect ref={treeSelectRef} />);
expect(treeSelectRef.current.nativeElement).toBe(container.querySelector('.rc-tree-select'));
});

it('support classNames and styles', () => {
const treeData = [
{
value: 'parent 1',
title: 'parent 1',
children: [
{
value: 'parent 1-0',
title: 'parent 1-0',
children: [
{
value: 'leaf1',
title: 'my leaf',
},
{
value: 'leaf2',
title: 'your leaf',
},
],
},
],
},
];
const customClassNames = {
prefix: 'test-prefix',
input: 'test-input',
suffix: 'test-suffix',
item: 'test-item',
itemTitle: 'test-item-title',
};
const customStyles = {
prefix: { color: 'green' },
input: { color: 'blue' },
suffix: { color: 'yellow' },
item: { color: 'black' },
itemTitle: { color: 'purple' },
};
const { container } = render(
<TreeSelect
classNames={customClassNames}
styles={customStyles}
showSearch
prefix="Prefix"
open
suffixIcon={() => <div>icon</div>}
placeholder="Please select"
treeDefaultExpandAll
treeData={treeData}
/>,
);
const prefix = container.querySelector('.rc-tree-select-prefix');
const input = container.querySelector('.rc-tree-select-selection-search-input');
const suffix = container.querySelector('.rc-tree-select-arrow');
const itemTitle = container.querySelector('.rc-tree-select-tree-title');
const item = container.querySelector(`.${customClassNames.item}`);
expect(prefix).toHaveClass(customClassNames.prefix);
expect(input).toHaveClass(customClassNames.input);
expect(suffix).toHaveClass(customClassNames.suffix);
expect(itemTitle).toHaveClass(customClassNames.itemTitle);

expect(prefix).toHaveStyle(customStyles.prefix);
expect(input).toHaveStyle(customStyles.input);
expect(suffix).toHaveStyle(customStyles.suffix);
expect(itemTitle).toHaveStyle(customStyles.itemTitle);
expect(item).toHaveStyle(customStyles.item);
});
});