Merge pull request #335 from dcos-labs/mp/feat/DCOS-54216-legacy-drop…

…down [spike] DCOS-54216: port Dropdown from reactjs-components
d2iq · Jun 21, 2019 · 5c35608 · 5c35608
2 parents 75f1a8f + dfb004d
commit 5c35608
Show file tree

Hide file tree

Showing 11 changed files with 2,407 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -63,7 +63,8 @@
   },
   "peerDependencies": {
     "react": ">=16.2.0 <16.9.0 || 16.7.0-alpha.0",
-    "react-dom": ">=16.2.0 <16.9.0 || 16.7.0-alpha.0"
+    "react-dom": ">=16.2.0 <16.9.0 || 16.7.0-alpha.0",
+    "react-gemini-scrollbar": "^2.1.5 || ^2.3.0"
   },
   "devDependencies": {
     "acorn": "^6.0.5",
@@ -103,6 +104,7 @@
     "file-loader": "2.0.0",
     "fork-ts-checker-webpack-plugin": "0.5.2",
     "fs-extra": "7.0.0",
+    "react-gemini-scrollbar": "2.3.x",
     "jest": "23.6.0",
     "jest-emotion": "9.2.11",
     "jest-runner-prettier": "0.2.6",

diff --git a/packages/legacy/index.ts b/packages/legacy/index.ts
@@ -1,3 +1,4 @@
 import { Tooltip } from "./src/Tooltip/Tooltip";
+import { Dropdown } from "./src/Dropdown/Dropdown";
 
-export { Tooltip };
+export { Dropdown, Tooltip };