From b2b7d5eb5d8c3a0ee1132beb7c1219bf559bc0d6 Mon Sep 17 00:00:00 2001 From: zombiej Date: Mon, 12 Aug 2019 20:14:17 +0800 Subject: [PATCH 1/8] fix: TreeNode expanded blocked by checkable status fix ant-design/ant-design#18223 --- package.json | 1 + src/util.tsx | 2 +- tests/Tree.spec.js | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8f551520..70ebe063 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "assets/*.css", "assets/*.png", "assets/*.gif", + "assets/*.less", "dist", "es", "lib" diff --git a/src/util.tsx b/src/util.tsx index 47a3e325..ee33895e 100644 --- a/src/util.tsx +++ b/src/util.tsx @@ -429,7 +429,7 @@ export function conductExpandParent(keyList: Key[], keyEntities: Record { it('update to expand parent node with autoExpandParent', () => { const wrapper = mount( - + @@ -129,6 +129,20 @@ describe('Tree Basic', () => { expect(childSwitcher.is(OPEN_CLASSNAME)).toBe(true); }); + it('skip only if disabled with autoExpandParent', () => { + const wrapper = mount( + + + + + + + , + ); + + expect(wrapper.state().expandedKeys.sort()).toEqual(['0-0-0', '0-0-0-0']); + }); + it('fires expand event', () => { const handleExpand = jest.fn(); const wrapper = mount( From 76fe762f2adce4445577e9fcb6e10f5a297b1203 Mon Sep 17 00:00:00 2001 From: zombiej Date: Mon, 12 Aug 2019 20:30:25 +0800 Subject: [PATCH 2/8] chore: update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 70ebe063..a508fb5c 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "start": "cross-env NODE_ENV=development father doc dev --storybook", "build": "father doc build --storybook", "compile": "father build", - "prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish", + "prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish --any-branch", "lint": "eslint src/ examples/ --ext .tsx,.ts,.jsx,.js", "test": "father test", "now-build": "npm run build" From df62a034f2c71d6b58dfc5aae4cda2bcc326bbc0 Mon Sep 17 00:00:00 2001 From: zombiej Date: Mon, 12 Aug 2019 20:30:48 +0800 Subject: [PATCH 3/8] v2.1.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a508fb5c..2fd65040 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-tree", - "version": "2.1.1", + "version": "2.1.2", "description": "tree ui component for react", "keywords": [ "react", From 01607cb87c3837d9ad2a2c22ba1cb62f98675b4e Mon Sep 17 00:00:00 2001 From: zombiej Date: Sat, 12 Oct 2019 14:50:07 +0800 Subject: [PATCH 4/8] chore: Update compile script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2fd65040..1999b173 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "scripts": { "start": "cross-env NODE_ENV=development father doc dev --storybook", "build": "father doc build --storybook", - "compile": "father build", + "compile": "father build && lessc assets/index.less assets/index.css", "prepublishOnly": "npm run compile && np --no-cleanup --yolo --no-publish --any-branch", "lint": "eslint src/ examples/ --ext .tsx,.ts,.jsx,.js", "test": "father test", @@ -52,6 +52,7 @@ "enzyme-adapter-react-16": "^1.1.1", "enzyme-to-json": "^3.0.0", "father": "^2.13.2", + "less": "^3.10.3", "np": "^5.0.3", "rc-dialog": "^7.3.1", "rc-tools": "^9.x", From 4b3d17c7681c6bc8380860200379c17ae9b2993b Mon Sep 17 00:00:00 2001 From: zombiej Date: Sat, 12 Oct 2019 14:51:24 +0800 Subject: [PATCH 5/8] v2.1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1999b173..924ddc8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-tree", - "version": "2.1.2", + "version": "2.1.3", "description": "tree ui component for react", "keywords": [ "react", From bf5e9268a000219cbbeddbbdddaad8e20ba28c22 Mon Sep 17 00:00:00 2001 From: zombiej Date: Sun, 26 Apr 2020 22:41:39 +0800 Subject: [PATCH 6/8] chore: Drag should not work on nest children --- .eslintrc.js | 1 + src/Tree.tsx | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index ed6a5e14..30c5f197 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -8,5 +8,6 @@ module.exports = { 'react/require-default-props': 0, 'jsx-a11y/label-has-for': 0, 'jsx-a11y/label-has-associated-control': 0, + 'react/sort-comp': 0, }, }; \ No newline at end of file diff --git a/src/Tree.tsx b/src/Tree.tsx index e919b7f1..d1ff05b5 100644 --- a/src/Tree.tsx +++ b/src/Tree.tsx @@ -342,11 +342,11 @@ class Tree extends React.Component { * But let's just keep it to avoid event trigger logic change. */ onNodeDragEnter = (event, node) => { - const { expandedKeys } = this.state; + const { expandedKeys, dragNodesKeys } = this.state; const { onDragEnter } = this.props; const { pos, eventKey } = node.props; - if (!this.dragNode) return; + if (!this.dragNode || dragNodesKeys.indexOf(eventKey) !== -1) return; const dropPosition = calcDropPosition(event, node); @@ -394,9 +394,14 @@ class Tree extends React.Component { }; onNodeDragOver = (event, node) => { + const { dragNodesKeys } = this.state; const { onDragOver } = this.props; const { eventKey } = node.props; + if (dragNodesKeys.indexOf(eventKey) !== -1) { + return; + } + // Update drag position if (this.dragNode && eventKey === this.state.dragOverNodeKey) { const dropPosition = calcDropPosition(event, node); From 442e0f44abf15fc4acfa1339e18b110de755ef6f Mon Sep 17 00:00:00 2001 From: zombiej Date: Sun, 26 Apr 2020 22:45:46 +0800 Subject: [PATCH 7/8] chore: Fix TS --- src/util.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util.tsx b/src/util.tsx index ee33895e..5ef6b962 100644 --- a/src/util.tsx +++ b/src/util.tsx @@ -91,7 +91,7 @@ export function traverseTreeNodes( // Process children node Children.forEach(childList, (subNode, subIndex) => { - processNode(subNode, subIndex, { node, pos }); + processNode(subNode as NodeElement, subIndex, { node, pos }); }); } From af09db5f4cf765a96b229c1f51c12d16836d6ad3 Mon Sep 17 00:00:00 2001 From: zombiej Date: Sun, 26 Apr 2020 22:48:30 +0800 Subject: [PATCH 8/8] 2.1.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 924ddc8e..f605c54e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-tree", - "version": "2.1.3", + "version": "2.1.4", "description": "tree ui component for react", "keywords": [ "react",