diff --git a/.changeset/brown-spoons-think.md b/.changeset/brown-spoons-think.md index 04d1f8cfc..ce0d1b35e 100644 --- a/.changeset/brown-spoons-think.md +++ b/.changeset/brown-spoons-think.md @@ -2,6 +2,6 @@ '@primer/react-brand': patch --- -Updated the following library depedencies: `@oddbird/popover-polyfill`, `clsx`, `autoprefixer`, `css-loader`, `mini-css-extract-plugin`, `postcss`, `postcss-loader`, `postcss-preset-env`, `style-loader`, `typed-css-modules`, `typescript-plugin-css-modules`, `webpack-cli`, `fast-glob`. +Updated the following library depedencies: `@oddbird/popover-polyfill`, `autoprefixer`, `css-loader`, `mini-css-extract-plugin`, `postcss`, `postcss-loader`, `postcss-preset-env`, `style-loader`, `typed-css-modules`, `typescript-plugin-css-modules`, `webpack-cli`, `fast-glob`. These updates should not affect the library’s visuals or component APIs. **In most cases, no additional action is required**. Please note however, that the compiled output may be slightly different due to changes in the bundling process. diff --git a/.changeset/strong-emus-leave.md b/.changeset/strong-emus-leave.md index ba0a6bafd..693aa4ff3 100644 --- a/.changeset/strong-emus-leave.md +++ b/.changeset/strong-emus-leave.md @@ -2,4 +2,4 @@ '@primer/react-brand': patch --- -Fix `RiverStoryScroll` scrolling bug when `disabled={true}` +Fix `RiverStoryScroll` scrolling bug when `disabled={true}`. Now renders `children` 1:1. diff --git a/package-lock.json b/package-lock.json index ce8024429..fe93b66c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10515,14 +10515,6 @@ "node": ">=6" } }, - "node_modules/clsx": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", - "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", - "engines": { - "node": ">=6" - } - }, "node_modules/co": { "version": "4.6.0", "dev": true, @@ -25636,7 +25628,7 @@ "dependencies": { "@oddbird/popover-polyfill": "0.5.2", "@primer/behaviors": "1.8.0", - "clsx": "2.1.1" + "clsx": "1.2.1" }, "devDependencies": { "@figma/code-connect": "1.2.4", @@ -25728,6 +25720,14 @@ } } }, + "packages/react/node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "engines": { + "node": ">=6" + } + }, "packages/react/node_modules/css-loader": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz", @@ -29524,7 +29524,7 @@ "@types/webpack": "^5.28.1", "autoprefixer": "10.4.20", "axe-playwright": "^1.2.3", - "clsx": "2.1.1", + "clsx": "1.2.1", "color2k": "2.0.3", "css-loader": "7.1.2", "identity-obj-proxy": "^3.0.0", @@ -29559,6 +29559,11 @@ "@babel/runtime": "^7.12.5" } }, + "clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==" + }, "css-loader": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz", @@ -32724,11 +32729,6 @@ "shallow-clone": "^3.0.0" } }, - "clsx": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", - "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==" - }, "co": { "version": "4.6.0", "dev": true diff --git a/packages/react/package.json b/packages/react/package.json index a51335806..bbffb4f36 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -44,7 +44,7 @@ "dependencies": { "@oddbird/popover-polyfill": "0.5.2", "@primer/behaviors": "1.8.0", - "clsx": "2.1.1" + "clsx": "1.2.1" }, "devDependencies": { "@figma/code-connect": "1.2.4", diff --git a/packages/react/src/river/RiverStoryScroll/RiverStoryScroll.tsx b/packages/react/src/river/RiverStoryScroll/RiverStoryScroll.tsx index 89193a678..e07e13499 100644 --- a/packages/react/src/river/RiverStoryScroll/RiverStoryScroll.tsx +++ b/packages/react/src/river/RiverStoryScroll/RiverStoryScroll.tsx @@ -89,7 +89,7 @@ export function RiverStoryScroll({children, disabled}: RiverStoryScrollProps) { }, [disabled, prefersReducedMotion]) if (disabled || prefersReducedMotion) { - return