Merge branch 'master' into feature/sc-333679/decathlon-add-click-even…

…t-to-google-maps
CartoDB · Jul 24, 2023 · a7f3cc5 · a7f3cc5
2 parents 180706d + 89d2d79
commit a7f3cc5
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,15 @@
 
 ## Not released
 
-- SelectField Storybook leftovers [#746](https://github.com/CartoDB/carto-react/pull/746)
 - Add onClick event handler to GoogleMap component [#747](https://github.com/CartoDB/carto-react/pull/747)
 
 ## 2.2
 
+### 2.2.1 (2023-07-21)
+
+- Fix MuiList: add more specificity to apply max-height [#748](https://github.com/CartoDB/carto-react/pull/748)
+- SelectField Storybook leftovers [#746](https://github.com/CartoDB/carto-react/pull/746)
+
 ### 2.2.0 (2023-07-19)
 
 - Developer API change:

diff --git a/lerna.json b/lerna.json
@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "2.2.0"
+  "version": "2.2.1"
 }
diff --git a/packages/react-api/package.json b/packages/react-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carto/react-api",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "CARTO for React - Api",
   "author": "CARTO Dev Team",
   "keywords": [
@@ -64,9 +64,9 @@
     "@babel/runtime": "^7.13.9"
   },
   "peerDependencies": {
-    "@carto/react-core": "^2.2.0",
-    "@carto/react-redux": "^2.2.0",
-    "@carto/react-workers": "^2.2.0",
+    "@carto/react-core": "^2.2.1",
+    "@carto/react-redux": "^2.2.1",
+    "@carto/react-workers": "^2.2.1",
     "@deck.gl/carto": "^8.9.18",
     "@deck.gl/core": "^8.9.18",
     "@deck.gl/extensions": "^8.9.18",

diff --git a/packages/react-auth/package.json b/packages/react-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carto/react-auth",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "CARTO for React - Auth",
   "author": "CARTO Dev Team",
   "keywords": [
@@ -64,7 +64,7 @@
     "@babel/runtime": "^7.13.9"
   },
   "peerDependencies": {
-    "@carto/react-core": "^2.2.0",
+    "@carto/react-core": "^2.2.1",
     "react": "17.x || 18.x",
     "react-dom": "17.x || 18.x"
   }

diff --git a/packages/react-basemaps/package.json b/packages/react-basemaps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carto/react-basemaps",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "CARTO for React - Basemaps",
   "keywords": [
     "carto",
@@ -64,7 +64,7 @@
     "@babel/runtime": "^7.13.9"
   },
   "peerDependencies": {
-    "@carto/react-core": "^2.2.0",
+    "@carto/react-core": "^2.2.1",
     "@deck.gl/google-maps": "^8.9.18",
     "react": "17.x || 18.x",
     "react-dom": "17.x || 18.x"

diff --git a/packages/react-core/package.json b/packages/react-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carto/react-core",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "CARTO for React - Core",
   "author": "CARTO Dev Team",
   "keywords": [

diff --git a/packages/react-redux/package.json b/packages/react-redux/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carto/react-redux",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "CARTO for React - Redux",
   "author": "CARTO Dev Team",
   "keywords": [
@@ -63,8 +63,8 @@
     "@babel/runtime": "^7.13.9"
   },
   "peerDependencies": {
-    "@carto/react-core": "^2.2.0",
-    "@carto/react-workers": "^2.2.0",
+    "@carto/react-core": "^2.2.1",
+    "@carto/react-workers": "^2.2.1",
     "@deck.gl/carto": "^8.9.18",
     "@deck.gl/core": "^8.9.18",
     "@reduxjs/toolkit": "^1.5.0"

diff --git a/packages/react-ui/package.json b/packages/react-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carto/react-ui",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "CARTO for React - UI",
   "author": "CARTO Dev Team",
   "keywords": [
@@ -78,7 +78,7 @@
     "@babel/runtime": "^7.13.9"
   },
   "peerDependencies": {
-    "@carto/react-core": "^2.2.0",
+    "@carto/react-core": "^2.2.1",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@mui/icons-material": "^5.11.16",

diff --git a/packages/react-ui/src/theme/sections/components/dataDisplay.js b/packages/react-ui/src/theme/sections/components/dataDisplay.js
@@ -30,8 +30,10 @@ export const dataDisplayOverrides = {
   MuiList: {
     styleOverrides: {
       root: ({ theme }) => ({
-        maxHeight: theme.spacing(39), // 312px, defined by design
-        overflowY: 'auto',
+        '.MuiPopover-root &, .MuiPopper-root &': {
+          maxHeight: theme.spacing(39), // 312px, defined by design
+          overflowY: 'auto'
+        },
 
         // Indent sublevels, ugly but needed to avoid issues with hover
         '& .MuiList-root': {

diff --git a/packages/react-widgets/package.json b/packages/react-widgets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carto/react-widgets",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "CARTO for React - Widgets",
   "author": "CARTO Dev Team",
   "keywords": [
@@ -65,11 +65,11 @@
     "@babel/runtime": "^7.13.9"
   },
   "peerDependencies": {
-    "@carto/react-api": "^2.2.0",
-    "@carto/react-core": "^2.2.0",
-    "@carto/react-redux": "^2.2.0",
-    "@carto/react-ui": "^2.2.0",
-    "@carto/react-workers": "^2.2.0",
+    "@carto/react-api": "^2.2.1",
+    "@carto/react-core": "^2.2.1",
+    "@carto/react-redux": "^2.2.1",
+    "@carto/react-ui": "^2.2.1",
+    "@carto/react-workers": "^2.2.1",
     "@deck.gl/core": "^8.9.18",
     "@deck.gl/layers": "^8.9.18",
     "@emotion/react": "^11.10.6",

diff --git a/packages/react-workers/package.json b/packages/react-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carto/react-workers",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "CARTO for React - Workers",
   "author": "CARTO Dev Team",
   "keywords": [
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.13.9",
-    "@carto/react-core": "^2.2.0",
+    "@carto/react-core": "^2.2.1",
     "@turf/bbox-polygon": "^6.3.0",
     "@turf/boolean-intersects": "^6.3.0",
     "@turf/boolean-within": "^6.3.0",