Merge branch 'master' into usr/agupta/controlledLegendFix

packages/azure-themes/CHANGELOG.json

@@ -1,6 +1,36 @@
 {
   "name": "@fluentui/azure-themes",
   "entries": [
+    {
+      "date": "Fri, 13 Dec 2024 07:23:12 GMT",
+      "tag": "@fluentui/azure-themes_v8.6.114",
+      "version": "8.6.114",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui/azure-themes",
+            "comment": "Bump @fluentui/react to v8.122.1",
+            "commit": "6dfe27e984d9633129c79178b40c6a0a189e29c7"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 12 Dec 2024 07:22:33 GMT",
+      "tag": "@fluentui/azure-themes_v8.6.113",
+      "version": "8.6.113",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui/azure-themes",
+            "comment": "Bump @fluentui/react to v8.122.0",
+            "commit": "53dd771e70338065810404663cd6219d1b54c1e2"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 22 Nov 2024 07:21:18 GMT",
       "tag": "@fluentui/azure-themes_v8.6.112",

packages/azure-themes/CHANGELOG.md

@@ -1,9 +1,27 @@
 # Change Log - @fluentui/azure-themes
 
-This log was last generated on Fri, 22 Nov 2024 07:21:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Dec 2024 07:23:12 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## [8.6.114](https://github.com/microsoft/fluentui/tree/@fluentui/azure-themes_v8.6.114)
+
+Fri, 13 Dec 2024 07:23:12 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/azure-themes_v8.6.113..@fluentui/azure-themes_v8.6.114)
+
+### Patches
+
+- Bump @fluentui/react to v8.122.1 ([PR #33455](https://github.com/microsoft/fluentui/pull/33455) by beachball)
+
+## [8.6.113](https://github.com/microsoft/fluentui/tree/@fluentui/azure-themes_v8.6.113)
+
+Thu, 12 Dec 2024 07:22:33 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/azure-themes_v8.6.112..@fluentui/azure-themes_v8.6.113)
+
+### Patches
+
+- Bump @fluentui/react to v8.122.0 ([PR #33243](https://github.com/microsoft/fluentui/pull/33243) by beachball)
+
 ## [8.6.112](https://github.com/microsoft/fluentui/tree/@fluentui/azure-themes_v8.6.112)
 
 Fri, 22 Nov 2024 07:21:18 GMT 

packages/azure-themes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui/azure-themes",
-  "version": "8.6.112",
+  "version": "8.6.114",
   "description": "Azure themes for Fluent UI React",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
@@ -27,7 +27,7 @@
     "@fluentui/scripts-webpack": "*"
   },
   "dependencies": {
-    "@fluentui/react": "^8.121.13",
+    "@fluentui/react": "^8.122.1",
     "@fluentui/set-version": "^8.2.23",
     "tslib": "^2.1.0"
   }

packages/charts/react-charting/CHANGELOG.json

@@ -1,6 +1,78 @@
 {
   "name": "@fluentui/react-charting",
   "entries": [
+    {
+      "date": "Fri, 13 Dec 2024 07:23:11 GMT",
+      "tag": "@fluentui/react-charting_v5.23.24",
+      "version": "5.23.24",
+      "comments": {
+        "patch": [
+          {
+            "author": "[email protected]",
+            "package": "@fluentui/react-charting",
+            "commit": "97bb4b60188bc8951730381b54d886764351ec74",
+            "comment": "Declarative chart bug fixes"
+          },
+          {
+            "author": "[email protected]",
+            "package": "@fluentui/react-charting",
+            "commit": "23320700a9104667ffab27dfc2b3e6e2243bf927",
+            "comment": "Adding theme check for dark mode for declarative charts"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-charting",
+            "comment": "Bump @fluentui/react-focus to v8.9.19",
+            "commit": "6dfe27e984d9633129c79178b40c6a0a189e29c7"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-charting",
+            "comment": "Bump @fluentui/theme-samples to v8.7.190",
+            "commit": "6dfe27e984d9633129c79178b40c6a0a189e29c7"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-charting",
+            "comment": "Bump @fluentui/react to v8.122.1",
+            "commit": "6dfe27e984d9633129c79178b40c6a0a189e29c7"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 12 Dec 2024 07:22:32 GMT",
+      "tag": "@fluentui/react-charting_v5.23.23",
+      "version": "5.23.23",
+      "comments": {
+        "patch": [
+          {
+            "author": "[email protected]",
+            "package": "@fluentui/react-charting",
+            "commit": "221a380b189a7ae191cc5c1ee96d07d107800067",
+            "comment": "Dark mode theme colors for declarative charts"
+          },
+          {
+            "author": "[email protected]",
+            "package": "@fluentui/react-charting",
+            "commit": "608336dee79ebb116cc5ed3d0775fc7385a028c8",
+            "comment": "Add support for controlled selction of legends."
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-charting",
+            "comment": "Bump @fluentui/theme-samples to v8.7.189",
+            "commit": "53dd771e70338065810404663cd6219d1b54c1e2"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui/react-charting",
+            "comment": "Bump @fluentui/react to v8.122.0",
+            "commit": "53dd771e70338065810404663cd6219d1b54c1e2"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 09 Dec 2024 07:21:03 GMT",
       "tag": "@fluentui/react-charting_v5.23.22",

packages/charts/react-charting/CHANGELOG.md

@@ -1,9 +1,34 @@
 # Change Log - @fluentui/react-charting
 
-This log was last generated on Mon, 09 Dec 2024 07:21:03 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Dec 2024 07:23:11 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## [5.23.24](https://github.com/microsoft/fluentui/tree/@fluentui/react-charting_v5.23.24)
+
+Fri, 13 Dec 2024 07:23:11 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-charting_v5.23.23..@fluentui/react-charting_v5.23.24)
+
+### Patches
+
+- Declarative chart bug fixes ([PR #33426](https://github.com/microsoft/fluentui/pull/33426) by [email protected])
+- Adding theme check for dark mode for declarative charts ([PR #33454](https://github.com/microsoft/fluentui/pull/33454) by [email protected])
+- Bump @fluentui/react-focus to v8.9.19 ([PR #33455](https://github.com/microsoft/fluentui/pull/33455) by beachball)
+- Bump @fluentui/theme-samples to v8.7.190 ([PR #33455](https://github.com/microsoft/fluentui/pull/33455) by beachball)
+- Bump @fluentui/react to v8.122.1 ([PR #33455](https://github.com/microsoft/fluentui/pull/33455) by beachball)
+
+## [5.23.23](https://github.com/microsoft/fluentui/tree/@fluentui/react-charting_v5.23.23)
+
+Thu, 12 Dec 2024 07:22:32 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-charting_v5.23.22..@fluentui/react-charting_v5.23.23)
+
+### Patches
+
+- Dark mode theme colors for declarative charts ([PR #33439](https://github.com/microsoft/fluentui/pull/33439) by [email protected])
+- Add support for controlled selction of legends. ([PR #33436](https://github.com/microsoft/fluentui/pull/33436) by [email protected])
+- Bump @fluentui/theme-samples to v8.7.189 ([PR #33243](https://github.com/microsoft/fluentui/pull/33243) by beachball)
+- Bump @fluentui/react to v8.122.0 ([PR #33243](https://github.com/microsoft/fluentui/pull/33243) by beachball)
+
 ## [5.23.22](https://github.com/microsoft/fluentui/tree/@fluentui/react-charting_v5.23.22)
 
 Mon, 09 Dec 2024 07:21:03 GMT 

packages/charts/react-charting/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui/react-charting",
-  "version": "5.23.22",
+  "version": "5.23.24",
   "description": "React web charting controls for Microsoft fluentui system.",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
@@ -39,8 +39,8 @@
     "jest-canvas-mock": "2.4.0"
   },
   "dependencies": {
-    "@fluentui/react-focus": "^8.9.18",
-    "@fluentui/theme-samples": "^8.7.188",
+    "@fluentui/react-focus": "^8.9.19",
+    "@fluentui/theme-samples": "^8.7.190",
     "@microsoft/load-themed-styles": "^1.10.26",
     "@types/d3-array": "^3.0.0",
     "@types/d3-axis": "^3.0.0",
@@ -66,7 +66,7 @@
     "tslib": "^2.1.0"
   },
   "peerDependencies": {
-    "@fluentui/react": "^8.121.13",
+    "@fluentui/react": "^8.122.1",
     "@types/react": ">=16.8.0 <19.0.0",
     "@types/react-dom": ">=16.8.0 <19.0.0",
     "react": ">=16.8.0 <19.0.0",

packages/charts/react-charting/src/components/DeclarativeChart/DeclarativeChart.tsx

@@ -29,7 +29,7 @@ import { useTheme } from '@fluentui/react';
 
 export const UseIsDarkTheme = (): boolean => {
   const theme = useTheme();
-  return theme.isInverted;
+  return theme?.isInverted ?? false;
 };
 
 export interface Schema {

packages/charts/react-charting/src/components/DeclarativeChart/PlotlySchemaAdapter.ts

@@ -331,12 +331,13 @@ export const transformPlotlyJsonToHorizontalBarWithAxisProps = (
     })
     .flat();
 
-  const chartHeight = layout.height || 350;
+  const chartHeight = layout.height || 450;
   const margin = layout.margin?.l || 0;
   const padding = layout.margin?.pad || 0;
   const availableHeight = chartHeight - margin - padding;
   const numberOfBars = data[0].y.length;
-  const gapFactor = 0.5;
+  const scalingFactor = 0.01;
+  const gapFactor = 1 / (1 + scalingFactor * numberOfBars);
   const barHeight = availableHeight / (numberOfBars * (1 + gapFactor));
 
   return {
@@ -381,8 +382,10 @@ export const transformPlotlyJsonToHeatmapProps = (jsonObj: any): IHeatMapChartPr
   };
 
   // Convert normalized values to actual values
-  const domainValuesForColorScale: number[] = firstData.colorscale?.map((arr: any) => arr[0] * (zMax - zMin) + zMin);
-  const rangeValuesForColorScale: string[] = firstData.colorscale?.map((arr: any) => arr[1]);
+  const domainValuesForColorScale: number[] = firstData.colorscale
+    ? firstData.colorscale.map((arr: any) => arr[0] * (zMax - zMin) + zMin)
+    : [];
+  const rangeValuesForColorScale: string[] = firstData.colorscale ? firstData.colorscale.map((arr: any) => arr[1]) : [];
 
   return {
     data: [heatmapData],
@@ -407,7 +410,8 @@ export const transformPlotlyJsonToSankeyProps = (
     }))
     // eslint-disable-next-line @typescript-eslint/no-shadow
     //@ts-expect-error Dynamic link object. Ignore for now.
-    .filter(x => x.source !== x.target); // Filter out self-references (circular links)
+    // Filter out negative nodes, unequal nodes and self-references (circular links)
+    .filter(x => x.source > 0 && x.target > 0 && x.source !== x.target);
 
   const sankeyChartData = {
     nodes: node.label.map((label: string, index: number) => {

packages/charts/react-charting/src/components/LineChart/LineChart.base.tsx

@@ -1192,7 +1192,7 @@ export class LineChartBase extends React.Component<ILineChartProps, ILineChartSt
           () => `translate(${this._xAxisScale(pointToHighlight.x)}, ${this._yAxisScale(pointToHighlight.y)})`,
         )
         .attr('visibility', 'visibility')
-        .attr('y2', `${lineHeight - this._yAxisScale(pointToHighlight.y)}`);
+        .attr('y2', `${lineHeight - 5 - this._yAxisScale(pointToHighlight.y)}`);
 
       this.setState({
         nearestCircleToHighlight: pointToHighlight,
@@ -1278,7 +1278,7 @@ export class LineChartBase extends React.Component<ILineChartProps, ILineChartSt
       d3Select(`#${this._verticalLine}`)
         .attr('transform', () => `translate(${_this._xAxisScale(x)}, ${_this._yAxisScale(y)})`)
         .attr('visibility', 'visibility')
-        .attr('y2', `${lineHeight - _this._yAxisScale(y)}`);
+        .attr('y2', `${lineHeight - 5 - _this._yAxisScale(y)}`);
       if (this._uniqueCallOutID !== circleId) {
         this._uniqueCallOutID = circleId;
         this.setState({

packages/common-styles/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui/common-styles",
-  "version": "1.2.63",
+  "version": "1.2.64",
   "description": "Common style definitions for Fluent UI React components",
   "repository": {
     "type": "git",

packages/cra-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui/cra-template",
-  "version": "8.4.189",
+  "version": "8.4.191",
   "description": "Create React App template for Fluent UI React (@fluentui/react)",
   "repository": {
     "type": "git",

packages/fluent2-theme/CHANGELOG.json

@@ -1,6 +1,36 @@
 {
   "name": "@fluentui/fluent2-theme",
   "entries": [
+    {
+      "date": "Fri, 13 Dec 2024 07:23:12 GMT",
+      "tag": "@fluentui/fluent2-theme_v8.107.118",
+      "version": "8.107.118",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui/fluent2-theme",
+            "comment": "Bump @fluentui/react to v8.122.1",
+            "commit": "6dfe27e984d9633129c79178b40c6a0a189e29c7"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 12 Dec 2024 07:22:33 GMT",
+      "tag": "@fluentui/fluent2-theme_v8.107.117",
+      "version": "8.107.117",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui/fluent2-theme",
+            "comment": "Bump @fluentui/react to v8.122.0",
+            "commit": "53dd771e70338065810404663cd6219d1b54c1e2"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 22 Nov 2024 07:21:18 GMT",
       "tag": "@fluentui/fluent2-theme_v8.107.116",

packages/fluent2-theme/CHANGELOG.md

@@ -1,9 +1,27 @@
 # Change Log - @fluentui/fluent2-theme
 
-This log was last generated on Fri, 22 Nov 2024 07:21:18 GMT and should not be manually modified.
+This log was last generated on Fri, 13 Dec 2024 07:23:12 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## [8.107.118](https://github.com/microsoft/fluentui/tree/@fluentui/fluent2-theme_v8.107.118)
+
+Fri, 13 Dec 2024 07:23:12 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/fluent2-theme_v8.107.117..@fluentui/fluent2-theme_v8.107.118)
+
+### Patches
+
+- Bump @fluentui/react to v8.122.1 ([PR #33455](https://github.com/microsoft/fluentui/pull/33455) by beachball)
+
+## [8.107.117](https://github.com/microsoft/fluentui/tree/@fluentui/fluent2-theme_v8.107.117)
+
+Thu, 12 Dec 2024 07:22:33 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/fluent2-theme_v8.107.116..@fluentui/fluent2-theme_v8.107.117)
+
+### Patches
+
+- Bump @fluentui/react to v8.122.0 ([PR #33243](https://github.com/microsoft/fluentui/pull/33243) by beachball)
+
 ## [8.107.116](https://github.com/microsoft/fluentui/tree/@fluentui/fluent2-theme_v8.107.116)
 
 Fri, 22 Nov 2024 07:21:18 GMT