@carto/meridian-ds 1.4.4-alpha-others.2 → 1.4.4-alpha-icons-shapes.2

package/CHANGELOG.md

@@ -2,15 +2,19 @@
 
 ## Unreleased
 
-- TimeSeriesWidgetUI: handle empty categories [#195](https://github.com/CartoDB/meridian-ds/pull/195)
+- Fix Icon shapes size [#194](https://github.com/CartoDB/meridian-ds/pull/194)
+
+## 1.0
+
+### 1.4.4
+
 - feat(widgets): Pie&Category widget acceps otherValues prop [#186](https://github.com/CartoDB/meridian-ds/pull/186)
+- TimeSeriesWidgetUI: handle empty categories [#195](https://github.com/CartoDB/meridian-ds/pull/195)
 - New CodeAreaField & CodeAreaDialog components [#175](https://github.com/CartoDB/meridian-ds/pull/175)
-- Expose OrderTypes enum in widgets [#192](https://github.com/CartoDB/meridian-ds/pull/192)
 - New CopiableComponent component [#187](https://github.com/CartoDB/meridian-ds/pull/187)
 - Expose OrderTypes enum in widgets [#192](https://github.com/CartoDB/meridian-ds/pull/192)
 - Disable minification in published builds [#190](https://github.com/CartoDB/meridian-ds/pull/190)
-
-## 1.0
+- Fix issue with Category Widget not holding all selected values [#198](https://github.com/CartoDB/meridian-ds/pull/198)
 
 ### 1.4.3
 

package/dist/theme/index.cjs

@@ -520,8 +520,13 @@ const dataDisplayOverrides = {
   // Svg Icons
   MuiSvgIcon: {
     styleOverrides: {
-      root: () => ({
-        fontSize: TablePaginationActions.ICON_SIZE_MEDIUM
+      root: ({ theme: theme2 }) => ({
+        fontSize: TablePaginationActions.ICON_SIZE_MEDIUM,
+        // Force the size of the inner shapes to match the icon size
+        "& rect, & circle, & polygon": {
+          minWidth: theme2.spacing(2),
+          minHeight: theme2.spacing(2)
+        }
       }),
       fontSizeSmall: () => ({
         fontSize: TablePaginationActions.ICON_SIZE_SMALL

package/dist/theme/index.js

@@ -520,8 +520,13 @@ const dataDisplayOverrides = {
   // Svg Icons
   MuiSvgIcon: {
     styleOverrides: {
-      root: () => ({
-        fontSize: ICON_SIZE_MEDIUM
+      root: ({ theme: theme2 }) => ({
+        fontSize: ICON_SIZE_MEDIUM,
+        // Force the size of the inner shapes to match the icon size
+        "& rect, & circle, & polygon": {
+          minWidth: theme2.spacing(2),
+          minHeight: theme2.spacing(2)
+        }
       }),
       fontSizeSmall: () => ({
         fontSize: ICON_SIZE_SMALL

package/dist/types/theme/sections/components/data-display.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-display.d.ts","sourceRoot":"","sources":["../../../../../src/theme/sections/components/data-display.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAkBxD,eAAO,MAAM,oBAAoB,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CA0iB3D,CAAA"}
+{"version":3,"file":"data-display.d.ts","sourceRoot":"","sources":["../../../../../src/theme/sections/components/data-display.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAkBxD,eAAO,MAAM,oBAAoB,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAgjB3D,CAAA"}

package/dist/types/widgets/CategoryWidgetUI/CategoryWidgetUI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CategoryWidgetUI.d.ts","sourceRoot":"","sources":["../../../../src/widgets/CategoryWidgetUI/CategoryWidgetUI.tsx"],"names":[],"mappings":"AAoBA,OAAO,EAAE,SAAS,EAAW,MAAM,YAAY,CAAA;AAkB/C,OAAO,EAAE,UAAU,EAAiB,MAAM,wBAAwB,CAAA;AAClE,OAAO,EAAwB,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAI7E,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;AAChD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,IAAI,EAAE,YAAY,EAAE,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,cAAc,CAAA;IAC7C,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,CAAA;IAC/B,0BAA0B,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,IAAI,CAAA;CAC9D,CAAA;AAOD,iBAAS,gBAAgB,CAAC,EACxB,IAAI,EACJ,SAAoB,EACpB,MAAkB,EAClB,QAAY,EACZ,WAAW,EACX,KAA0B,EAC1B,kBAA8B,EAC9B,0BAAqC,EACrC,SAAgB,EAChB,UAAiB,EACjB,UAAiB,EACjB,SAAS,GACV,EAAE,qBAAqB,2CAyjBvB;AAED,eAAe,gBAAgB,CAAA"}
+{"version":3,"file":"CategoryWidgetUI.d.ts","sourceRoot":"","sources":["../../../../src/widgets/CategoryWidgetUI/CategoryWidgetUI.tsx"],"names":[],"mappings":"AAoBA,OAAO,EAAE,SAAS,EAAW,MAAM,YAAY,CAAA;AAkB/C,OAAO,EAAE,UAAU,EAAiB,MAAM,wBAAwB,CAAA;AAClE,OAAO,EAAwB,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAI7E,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;AAChD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,IAAI,EAAE,YAAY,EAAE,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,cAAc,CAAA;IAC7C,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,UAAU,CAAA;IAClB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,CAAA;IAC/B,0BAA0B,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,IAAI,CAAA;CAC9D,CAAA;AAOD,iBAAS,gBAAgB,CAAC,EACxB,IAAI,EACJ,SAAoB,EACpB,MAAkB,EAClB,QAAY,EACZ,WAAW,EACX,KAA0B,EAC1B,kBAA8B,EAC9B,0BAAqC,EACrC,SAAgB,EAChB,UAAiB,EACjB,UAAiB,EACjB,SAAS,GACV,EAAE,qBAAqB,2CAklBvB;AAED,eAAe,gBAAgB,CAAA"}

package/dist/widgets/index.cjs

@@ -821,8 +821,15 @@ function CategoryWidgetUI({
   const intl = reactIntl.useIntl();
   const intlConfig = TablePaginationActions.useImperativeIntl(intl);
   function sortBlockedSameAsData(blockedCategories2) {
-    return sortedData.reduce((acum, elem) => {
-      if (blockedCategories2.includes(elem.name)) {
+    const blockedCategoriesSet = new Set(blockedCategories2);
+    let sortedByOrderData = data;
+    if (order === OrderTypes.Ranking) {
+      sortedByOrderData = [...data].sort(
+        (a, b) => (b.value ?? 0) - (a.value ?? 0)
+      );
+    }
+    return sortedByOrderData.reduce((acum, elem) => {
+      if (blockedCategoriesSet.has(elem.name)) {
         acum.push(elem.name);
       }
       return acum;
@@ -1080,6 +1087,18 @@ function CategoryWidgetUI({
             material.Checkbox,
             {
               checked: tempBlockedCategories.includes(data2.name),
+              onChange: (e) => {
+                if (e.target.checked) {
+                  setTempBlockedCategories([
+                    ...tempBlockedCategories,
+                    data2.name
+                  ]);
+                } else {
+                  setTempBlockedCategories(
+                    tempBlockedCategories.filter((c) => c !== data2.name)
+                  );
+                }
+              },
               tabIndex: -1
             }
           ) }),

package/dist/widgets/index.js

@@ -819,8 +819,15 @@ function CategoryWidgetUI({
   const intl = useIntl();
   const intlConfig = useImperativeIntl(intl);
   function sortBlockedSameAsData(blockedCategories2) {
-    return sortedData.reduce((acum, elem) => {
-      if (blockedCategories2.includes(elem.name)) {
+    const blockedCategoriesSet = new Set(blockedCategories2);
+    let sortedByOrderData = data;
+    if (order === OrderTypes.Ranking) {
+      sortedByOrderData = [...data].sort(
+        (a, b) => (b.value ?? 0) - (a.value ?? 0)
+      );
+    }
+    return sortedByOrderData.reduce((acum, elem) => {
+      if (blockedCategoriesSet.has(elem.name)) {
         acum.push(elem.name);
       }
       return acum;
@@ -1078,6 +1085,18 @@ function CategoryWidgetUI({
             Checkbox,
             {
               checked: tempBlockedCategories.includes(data2.name),
+              onChange: (e) => {
+                if (e.target.checked) {
+                  setTempBlockedCategories([
+                    ...tempBlockedCategories,
+                    data2.name
+                  ]);
+                } else {
+                  setTempBlockedCategories(
+                    tempBlockedCategories.filter((c) => c !== data2.name)
+                  );
+                }
+              },
               tabIndex: -1
             }
           ) }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carto/meridian-ds",
-  "version": "1.4.4-alpha-others.2",
+  "version": "1.4.4-alpha-icons-shapes.2",
   "description": "CARTO Meridian Design System",
   "type": "module",
   "scripts": {