Merge pull request #135 from qoqa/revert-material-core-update

Revert material core update
qoqa · Feb 12, 2021 · 9c751d9 · 9c751d9
2 parents b13169d + 2251b04
commit 9c751d9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@qoqa/carousel",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "main": "index.js",
   "module": "es/index.js",
   "types": "index.d.ts",
@@ -22,9 +22,9 @@
     "@material-ui/icons": "4.11.2",
     "@testing-library/jest-dom": "5.11.9",
     "@testing-library/react": "11.2.5",
-    "@testing-library/user-event": "12.6.3",
+    "@testing-library/user-event": "12.7.0",
     "@types/jest": "26.0.20",
-    "@types/node": "14.14.25",
+    "@types/node": "14.14.26",
     "@types/react": "17.0.1",
     "@types/react-dom": "17.0.0",
     "eslint": "7.19.0",
@@ -42,7 +42,7 @@
     "rollup": "2.38.5",
     "rollup-plugin-typescript2": "0.29.0",
     "rollup-plugin-virtual": "1.0.1",
-    "typescript": "4.1.3"
+    "typescript": "4.1.5"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/src/Gallery.tsx b/src/Gallery.tsx
@@ -6,8 +6,8 @@ import {
   useCarouselContext,
 } from './carousel';
 import {
-  ImageList,
-  ImageListItem,
+  GridList,
+  GridListTile,
   makeStyles,
   useMediaQuery,
   useTheme,
@@ -69,13 +69,13 @@ export function Gallery({ slides, title }: GalleryProps) {
       translationsFactory={getDefaultTranslations}
     >
       <h2>{title}</h2>
-      <ImageList cols={isMobile ? 1 : 3}>
+      <GridList cols={isMobile ? 1 : 3}>
         {slides.map((slide, index) => (
-          <ImageListItem key={index}>
+          <GridListTile key={index}>
             <ClickableImage index={index} {...slide} />
-          </ImageListItem>
+          </GridListTile>
         ))}
-      </ImageList>
+      </GridList>
       <CarouselWithModal title={title} />
     </CarouselContextProvider>
   );

diff --git a/src/carousel/CarouselControls.tsx b/src/carousel/CarouselControls.tsx
@@ -1,6 +1,6 @@
 import React, { MouseEvent, MouseEventHandler } from 'react';
 import {
-  alpha,
+  fade,
   Fade,
   IconButton,
   makeStyles,
@@ -30,9 +30,9 @@ const useStyles = /*#__PURE__*/ makeStyles((theme) => ({
     marginLeft: theme.spacing(2),
     marginRight: theme.spacing(2),
     color: 'white',
-    backgroundColor: alpha('#000000', 0.6),
+    backgroundColor: fade('#000000', 0.6),
     '&:hover': {
-      backgroundColor: alpha('#000000', 0.8),
+      backgroundColor: fade('#000000', 0.8),
     },
   },
 }));

diff --git a/yarn.lock b/yarn.lock
@@ -2394,10 +2394,10 @@
     "@babel/runtime" "^7.12.5"
     "@testing-library/dom" "^7.28.1"
 
-"@testing-library/user-event@12.6.3":
-  version "12.6.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-12.6.3.tgz#4a77c56a48823cf8adebd0f57670e4a89c24d058"
-  integrity sha512-PCmbUKofE4SXA7l8jphZAbvv5H3c4ix34xPZ/GNe99fASX//msJRgiMbHIBP+GwRfgVG9c7zmkODSPu2X2vNRw==
+"@testing-library/user-event@12.7.0":
+  version "12.7.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-12.7.0.tgz#39084ab8c777f6113980b80b8a25f2b7e349f8aa"
+  integrity sha512-KzRM1KNDoW8pJ2HTenrUhTjV6wJMHvWAagDs8DDrYSWz6y4PN+K2jSvlm2bMHWNRk5LTJPo9jqIjNjJ3FlqXNw==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
@@ -2524,11 +2524,16 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/node@*", "@types/node@14.14.25":
+"@types/node@*":
   version "14.14.25"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.25.tgz#15967a7b577ff81383f9b888aa6705d43fbbae93"
   integrity sha512-EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ==
 
+"@types/node@14.14.26":
+  version "14.14.26"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.26.tgz#e40df24c957568f350cca04e63bfb1e1556d1cbf"
+  integrity sha512-skWxepWOs+VArEBWd2S/VR3wUavioIIx9/HzW+UJiIjtwa6+kNXdsOeq7FfxDXf56hIcL0ieo2brwMgBJ1+lhw==
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -11980,10 +11985,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
-  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
+typescript@4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
+  integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"