From 2da221e81849ee047ec5dac3023976acfc5d32cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= <patryk.kopycinski@elastic.co>
Date: Wed, 23 Sep 2020 10:23:39 +0200
Subject: [PATCH] Bump react-beautiful-dnd (#78028) (#78249)

* Bump react-beautiful-dnd

* fix types

* fix types
---
 x-pack/package.json                           |  4 ++--
 .../timeline/body/column_headers/index.tsx    |  6 ++---
 .../timelines/components/timeline/styles.tsx  |  4 ++--
 yarn.lock                                     | 22 +------------------
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/x-pack/package.json b/x-pack/package.json
index 4c161526c50b..970e333f1c6f 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",
@@ -222,7 +222,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/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 ea938be91abd..6e802053ab29 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<number | null>(null);
   const {
     timelineFullScreen,
     setTimelineFullScreen,
@@ -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 5c992fd640a9..234814a68877 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;
diff --git a/yarn.lock b/yarn.lock
index 6f65a51f93d5..f88ab6959e3b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1003,7 +1003,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==
@@ -4450,13 +4450,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"
@@ -23342,19 +23335,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"