Skip to content

Commit 96091b0

Browse files
authored
Merge pull request #1865 from merico-dev/fix-tree-single-select-style
fix(filter-tree): Improve selected node styling and remove unused icon
2 parents a9c94b7 + 9a6fe80 commit 96091b0

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtable/api",
3-
"version": "14.58.9",
3+
"version": "14.58.10",
44
"description": "",
55
"main": "index.js",
66
"scripts": {

dashboard/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtable/dashboard",
3-
"version": "14.58.9",
3+
"version": "14.58.10",
44
"license": "Apache-2.0",
55
"repository": {
66
"url": "https://github.com/merico-dev/table"

dashboard/src/components/filter/filter-tree/filter-tree-single-select/render/widget.styles.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,10 @@ export default createStyles((theme, { radius = 4, width, name }: TreeSelectWidge
150150
backgroundColor: '#f1f3f5',
151151
},
152152
'&.rc-tree-select-tree-treenode-selected': {
153-
'.rc-tree-select-tree-iconEle .checkbox-icon .checkmark-checked': {
154-
stroke: 'rgb(64, 192, 87)',
155-
animation: 'check 200ms linear forwards',
153+
backgroundColor: '#e7f5ff',
154+
'.rc-tree-select-tree-node-content-wrapper': {
155+
color: '#228be6',
156+
fontWeight: 500,
156157
},
157158
},
158159
'&.rc-tree-select-tree-treenode-disabled': {

dashboard/src/components/filter/filter-tree/filter-tree-single-select/render/widget.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import TreeSelect from 'rc-tree-select';
44
import { useTranslation } from 'react-i18next';
55
import { ErrorMessageOrNotFound } from '~/components/filter/error-message-or-not-found';
66
import { SwitcherIcon } from '../../common/switcher-icon';
7-
import { TreeIcon } from '../../common/tree-icon';
87
import useStyles from './widget.styles';
98

109
// DefaultProps adds system props support (margin, padding, sx, unstyled, styles and classNames).
@@ -62,8 +61,6 @@ export const FilterTreeSingleSelectWidget = ({
6261
treeLine
6362
// @ts-expect-error rc-tree-selecct's TreeNodeProps
6463
switcherIcon={SwitcherIcon}
65-
// @ts-expect-error rc-tree-selecct's TreeNodeProps
66-
treeIcon={TreeIcon}
6764
value={value}
6865
treeData={treeData}
6966
notFoundContent={<ErrorMessageOrNotFound errorMessage={errorMessage} />}

settings-form/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtable/settings-form",
3-
"version": "14.58.9",
3+
"version": "14.58.10",
44
"license": "Apache-2.0",
55
"repository": {
66
"url": "https://github.com/merico-dev/table"

0 commit comments

Comments
 (0)