From 80d31d4548afb0854ef330ca91170d0b4b622528 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Mon, 21 Sep 2020 17:31:00 +0200 Subject: [PATCH 1/3] Bump react-beautiful-dnd --- x-pack/package.json | 4 ++-- yarn.lock | 22 +--------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/x-pack/package.json b/x-pack/package.json index 0560b1bebe42b..2b32bb4633991 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -111,7 +111,7 @@ "@types/proper-lockfile": "^3.0.1", "@types/puppeteer": "^1.20.1", "@types/react": "^16.9.36", - "@types/react-beautiful-dnd": "^12.1.1", + "@types/react-beautiful-dnd": "^13.0.0", "@types/react-dom": "^16.9.8", "@types/react-redux": "^7.1.9", "@types/react-router-dom": "^5.1.5", @@ -221,7 +221,7 @@ "proxyquire": "1.8.0", "re-resizable": "^6.1.1", "react-apollo": "^2.1.4", - "react-beautiful-dnd": "^12.2.0", + "react-beautiful-dnd": "^13.0.0", "react-docgen-typescript-loader": "^3.1.1", "react-dropzone": "^4.2.9", "react-fast-compare": "^2.0.4", diff --git a/yarn.lock b/yarn.lock index cec2697f6c15c..5f1299dacac25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -982,7 +982,7 @@ pirates "^4.0.0" source-map-support "^0.5.16" -"@babel/runtime-corejs2@^7.2.0", "@babel/runtime-corejs2@^7.6.3": +"@babel/runtime-corejs2@^7.2.0": version "7.11.2" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.11.2.tgz#700a03945ebad0d31ba6690fc8a6bcc9040faa47" integrity sha512-AC/ciV28adSSpEkBglONBWq4/Lvm6GAZuxIoyVtsnUpZMl0bxLtoChEnYAkP+47KyOCayZanojtflUEUJtR/6Q== @@ -4423,13 +4423,6 @@ "@types/history" "*" "@types/react" "*" -"@types/react-beautiful-dnd@^12.1.1": - version "12.1.1" - resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-12.1.1.tgz#149e638c0f912eee6b74ea419b26bb43d0b1da60" - integrity sha512-CPKynKgGVRK+xmywLMD0qNWamdscxhgf1Um+2oEgN6Qibn1rye3M4p2bdxAMgtOTZ2L81bYl6KGKSzJVboJWeA== - dependencies: - "@types/react" "*" - "@types/react-beautiful-dnd@^13.0.0": version "13.0.0" resolved "https://registry.yarnpkg.com/@types/react-beautiful-dnd/-/react-beautiful-dnd-13.0.0.tgz#e60d3d965312fcf1516894af92dc3e9249587db4" @@ -23280,19 +23273,6 @@ react-apollo@^2.1.4: lodash "^4.17.10" prop-types "^15.6.0" -react-beautiful-dnd@^12.2.0: - version "12.2.0" - resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-12.2.0.tgz#e5f6222f9e7934c6ed4ee09024547f9e353ae423" - integrity sha512-s5UrOXNDgeEC+sx65IgbeFlqKKgK3c0UfbrJLWufP34WBheyu5kJ741DtJbsSgPKyNLkqfswpMYr0P8lRj42cA== - dependencies: - "@babel/runtime-corejs2" "^7.6.3" - css-box-model "^1.2.0" - memoize-one "^5.1.1" - raf-schd "^4.0.2" - react-redux "^7.1.1" - redux "^4.0.4" - use-memo-one "^1.1.1" - react-beautiful-dnd@^13.0.0: version "13.0.0" resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.0.0.tgz#f70cc8ff82b84bc718f8af157c9f95757a6c3b40" From 5af7fcb8e7740a5121e718e882c7b1f6a291b1d1 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Mon, 21 Sep 2020 19:48:42 +0200 Subject: [PATCH 2/3] fix types --- .../components/timeline/body/column_headers/index.tsx | 4 +--- .../public/timelines/components/timeline/styles.tsx | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx index ea938be91abd1..88bc8179887ce 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx @@ -145,9 +145,7 @@ export const ColumnHeadersComponent = ({ const renderClone: DraggableChildrenFn = useCallback( (dragProvided, _dragSnapshot, rubric) => { - // TODO: Remove after github.com/DefinitelyTyped/DefinitelyTyped/pull/43057 is merged - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const index = (rubric as any).source.index; + const index = rubric.source.index; const header = columnHeaders[index]; const onMount = () => setDraggingIndex(index); diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx index 5c992fd640a97..234814a68877d 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/styles.tsx @@ -113,10 +113,10 @@ export const EventsThGroupData = styled.div.attrs(({ className = '' }) => ({ } `; -export const EventsTh = styled.div.attrs(({ className = '' }) => ({ +export const EventsTh = styled.div.attrs<{ role: string }>(({ className = '' }) => ({ className: `siemEventsTable__th ${className}`, role: 'columnheader', -}))` +}))<{ role?: string }>` align-items: center; display: flex; flex-shrink: 0; From 60a59144e63d6e78ce9dae135367bcb4009ce873 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Mon, 21 Sep 2020 20:38:43 +0200 Subject: [PATCH 3/3] fix types --- .../timelines/components/timeline/body/column_headers/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx index 88bc8179887ce..6e802053ab29f 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx @@ -114,7 +114,7 @@ export const ColumnHeadersComponent = ({ timelineId, toggleColumn, }: Props) => { - const [draggingIndex, setDraggingIndex] = useState(null); + const [draggingIndex, setDraggingIndex] = useState(null); const { timelineFullScreen, setTimelineFullScreen,