From 5082e0785dae6c332273d860198de8ae81c59853 Mon Sep 17 00:00:00 2001 From: Vitalii Date: Thu, 4 Apr 2024 17:40:09 +0900 Subject: [PATCH] Cleanup --- package-lock.json | 25 ++----------------------- package.json | 3 +-- src/react-sortable-tree.css | 21 --------------------- src/react-sortable-tree.tsx | 27 ++++----------------------- 4 files changed, 7 insertions(+), 69 deletions(-) delete mode 100644 src/react-sortable-tree.css diff --git a/package-lock.json b/package-lock.json index 4591bcf4..b03482b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "5.0.0-alpha.7", "license": "MIT", "dependencies": { - "@nosferatu500/react-dnd-scrollzone": "2.0.10", "lodash.isequal": "^4.5.0", "react-dnd": "14.0.4", "react-dnd-html5-backend": "^14.1.0", @@ -2755,23 +2754,6 @@ "node": ">= 8" } }, - "node_modules/@nosferatu500/react-dnd-scrollzone": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@nosferatu500/react-dnd-scrollzone/-/react-dnd-scrollzone-2.0.10.tgz", - "integrity": "sha512-PBJtyBQrm47ifesOfIOsJd2SaxSpjkfKSoQOHewkI4UeYLyEc4hX0BY3vlVxW0zzak2+IneJghmGnp5lznVo6A==", - "dependencies": { - "hoist-non-react-statics": "^3.3.2", - "lodash.throttle": "^4.1.1" - }, - "engines": { - "node": ">=16" - }, - "peerDependencies": { - "react": ">=17.0.2", - "react-dnd": "14.0.4", - "react-dom": ">=17.0.2" - } - }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -11568,11 +11550,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lodash.throttle": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", - "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==" - }, "node_modules/lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -13856,6 +13833,7 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "devOptional": true, "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -14615,6 +14593,7 @@ "version": "0.23.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", + "devOptional": true, "dependencies": { "loose-envify": "^1.1.0" } diff --git a/package.json b/package.json index 65c8011c..84ad8fba 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "lib" ], "engines": { - "node": ">=18" + "node": ">=20.9" }, "prettier": { "semi": false, @@ -97,7 +97,6 @@ "react-dom": "^18.2.0" }, "dependencies": { - "@nosferatu500/react-dnd-scrollzone": "2.0.10", "lodash.isequal": "^4.5.0", "react-dnd": "14.0.4", "react-dnd-html5-backend": "^14.1.0", diff --git a/src/react-sortable-tree.css b/src/react-sortable-tree.css deleted file mode 100644 index fd0975c7..00000000 --- a/src/react-sortable-tree.css +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Extra class applied to VirtualScroll through className prop - */ -.rst__virtualScrollOverride { - overflow: auto !important; -} -.rst__virtualScrollOverride * { - box-sizing: border-box; -} - -.ReactVirtualized__Grid__innerScrollContainer { - overflow: visible !important; -} - -.rst__rtl .ReactVirtualized__Grid__innerScrollContainer { - direction: rtl; -} - -.ReactVirtualized__Grid { - outline: none; -} diff --git a/src/react-sortable-tree.tsx b/src/react-sortable-tree.tsx index e92d6180..feaa90a8 100644 --- a/src/react-sortable-tree.tsx +++ b/src/react-sortable-tree.tsx @@ -1,18 +1,12 @@ // @ts-nocheck import React, { Component } from 'react' -import withScrolling, { - createHorizontalStrength, - createScrollingComponent, - createVerticalStrength, -} from '@nosferatu500/react-dnd-scrollzone' import isEqual from 'lodash.isequal' import { DndContext, DndProvider } from 'react-dnd' import { HTML5Backend } from 'react-dnd-html5-backend' import { VList, VListHandle } from 'virtua' import NodeRendererDefault from './node-renderer-default' import PlaceholderRendererDefault from './placeholder-renderer-default' -import './react-sortable-tree.css' import TreeNode from './tree-node' import TreePlaceholder from './tree-placeholder' import { classnames } from './utils/classnames' @@ -207,16 +201,6 @@ class ReactSortableTree extends Component { this.dndType ) - // Prepare scroll-on-drag options for this list - this.scrollZoneVirtualList = (createScrollingComponent || withScrolling)( - React.forwardRef((props, ref) => { - const { dragDropManager, rowHeight, ...otherProps } = props - return - }) - ) - this.vStrength = createVerticalStrength(slideRegionSize) - this.hStrength = createHorizontalStrength(slideRegionSize) - this.state = { draggingTreeData: undefined, draggedNode: undefined, @@ -694,14 +678,11 @@ class ReactSortableTree extends Component { } else { containerStyle = { height: '100%', ...containerStyle } - const ScrollZoneVirtualList = this.scrollZoneVirtualList list = ( - {rows.map((item, index) => { return this.renderRow(item, { @@ -713,7 +694,7 @@ class ReactSortableTree extends Component { swapLength, }) })} - + ) }