From bef5fedc0a8b1ac61cb89976f6f51d1910b5da23 Mon Sep 17 00:00:00 2001 From: Josh Black Date: Tue, 20 Jun 2023 09:58:23 -0500 Subject: [PATCH 1/2] Update release-schedule.yml (#3424) --- .github/workflows/release-schedule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-schedule.yml b/.github/workflows/release-schedule.yml index 06b88db3041..c2849c8426e 100644 --- a/.github/workflows/release-schedule.yml +++ b/.github/workflows/release-schedule.yml @@ -2,7 +2,7 @@ name: Release Schedule on: workflow_dispatch: schedule: - - cron: '0 16 * * MON' + - cron: '0 0 * * TUE' concurrency: group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }} From 295c4bcd4b2db37a92979afedb2b25aee80db632 Mon Sep 17 00:00:00 2001 From: Dustin Savery <2447456+dusave@users.noreply.github.com> Date: Tue, 20 Jun 2023 07:59:41 -0700 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20[Bug=20Fix]=20Setti?= =?UTF-8?q?ng=20`DialogV2`=20backdrop=20to=20the=20proper=20variable=20(#3?= =?UTF-8?q?411)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * setting the DialogV2 backdrop to the proper variable * Create serious-bats-reply.md --------- Co-authored-by: Cole Bemis --- .changeset/serious-bats-reply.md | 5 ++++ examples/nextjs/package-lock.json | 50 ++++++++++++++++--------------- src/Dialog/Dialog.tsx | 2 +- 3 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 .changeset/serious-bats-reply.md diff --git a/.changeset/serious-bats-reply.md b/.changeset/serious-bats-reply.md new file mode 100644 index 00000000000..a2901c9d926 --- /dev/null +++ b/.changeset/serious-bats-reply.md @@ -0,0 +1,5 @@ +--- +"@primer/react": patch +--- + +Fix `Dialog2` backdrop color variable diff --git a/examples/nextjs/package-lock.json b/examples/nextjs/package-lock.json index 556a8b78abe..f3aa4537586 100644 --- a/examples/nextjs/package-lock.json +++ b/examples/nextjs/package-lock.json @@ -28,7 +28,7 @@ "@lit-labs/react": "1.1.1", "@primer/behaviors": "1.3.4", "@primer/octicons-react": "^19.1.0", - "@primer/primitives": "7.11.10", + "@primer/primitives": "^7.11.11", "@react-aria/ssr": "^3.1.0", "@styled-system/css": "^5.1.5", "@styled-system/props": "^5.1.5", @@ -43,6 +43,8 @@ "focus-visible": "^5.2.0", "fzy.js": "0.4.1", "history": "^5.0.0", + "lodash.isempty": "4.4.0", + "lodash.isobject": "3.0.2", "react-intersection-observer": "9.4.3", "styled-system": "^5.1.5" }, @@ -55,7 +57,7 @@ "@babel/plugin-proposal-optional-chaining": "7.21.0", "@babel/plugin-transform-modules-commonjs": "7.21.2", "@babel/preset-react": "7.18.6", - "@babel/preset-typescript": "7.21.0", + "@babel/preset-typescript": "7.21.5", "@changesets/changelog-github": "0.4.8", "@changesets/cli": "2.26.0", "@github/markdownlint-github": "^0.3.0", @@ -64,7 +66,7 @@ "@primer/css": "^21.0.1", "@rollup/plugin-babel": "6.0.3", "@rollup/plugin-commonjs": "25.0.0", - "@rollup/plugin-node-resolve": "15.0.2", + "@rollup/plugin-node-resolve": "15.1.0", "@rollup/plugin-replace": "5.0.2", "@rollup/plugin-terser": "0.4.0", "@rollup/plugin-typescript": "11.1.0", @@ -72,7 +74,7 @@ "@size-limit/preset-big-lib": "8.2.4", "@storybook/addon-a11y": "7.0.12", "@storybook/addon-actions": "7.0.12", - "@storybook/addon-essentials": "7.0.12", + "@storybook/addon-essentials": "7.0.18", "@storybook/addon-interactions": "7.0.12", "@storybook/addon-links": "7.0.12", "@storybook/addon-storysource": "7.0.12", @@ -97,8 +99,8 @@ "@types/node": "16.11.11", "@types/react": "18.0.28", "@types/react-dom": "18.0.9", - "@typescript-eslint/eslint-plugin": "5.54.1", - "@typescript-eslint/parser": "5.54.1", + "@typescript-eslint/eslint-plugin": "5.59.6", + "@typescript-eslint/parser": "5.59.6", "ajv": "8.12.0", "axe-core": "4.7.0", "babel-core": "7.0.0-bridge.0", @@ -145,8 +147,6 @@ "jscodeshift": "0.14.0", "lint-staged": "13.2.2", "lodash.groupby": "4.6.0", - "lodash.isempty": "4.4.0", - "lodash.isobject": "3.0.2", "lodash.keyby": "4.6.0", "markdownlint-cli2": "^0.7.1", "markdownlint-cli2-formatter-pretty": "0.0.3", @@ -155,8 +155,9 @@ "mdast-util-mdx": "2.0.1", "mdast-util-to-string": "3.1.1", "micromark-extension-frontmatter": "1.0.0", - "micromark-extension-mdxjs": "1.0.0", - "prettier": "2.8.1", + "micromark-extension-mdxjs": "1.0.1", + "postcss-custom-properties-fallback": "^1.0.2", + "prettier": "2.8.8", "react": "18.2.0", "react-dnd": "14.0.4", "react-dnd-html5-backend": "14.0.2", @@ -173,10 +174,11 @@ "storybook-addon-turbo-build": "2.0.1", "storybook-css-modules": "1.0.8", "styled-components": "4.4.1", - "terser": "5.16.1", + "terser": "5.17.6", "ts-node": "10.9.1", "ts-toolbelt": "9.6.0", "typescript": "4.9.5", + "typescript-plugin-css-modules": "5.0.1", "unist-util-find": "1.0.2", "unist-util-find-before": "3.0.1", "unist-util-flat-filter": "2.0.0", @@ -1368,8 +1370,7 @@ "@primer/octicons-react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/@primer/octicons-react/-/octicons-react-18.2.0.tgz", - "integrity": "sha512-taT0l99qztqU9NnNo0HCutm3mEjBmXcaqWlmCLvU2MrKVrMZF3HuwaguPhNl/rNk8+mpgtDSTTDPBlpI0MtPPA==", - "requires": {} + "integrity": "sha512-taT0l99qztqU9NnNo0HCutm3mEjBmXcaqWlmCLvU2MrKVrMZF3HuwaguPhNl/rNk8+mpgtDSTTDPBlpI0MtPPA==" }, "@primer/react": { "version": "file:../..", @@ -1382,7 +1383,7 @@ "@babel/plugin-proposal-optional-chaining": "7.21.0", "@babel/plugin-transform-modules-commonjs": "7.21.2", "@babel/preset-react": "7.18.6", - "@babel/preset-typescript": "7.21.0", + "@babel/preset-typescript": "7.21.5", "@changesets/changelog-github": "0.4.8", "@changesets/cli": "2.26.0", "@github/combobox-nav": "^2.1.5", @@ -1396,11 +1397,11 @@ "@primer/behaviors": "1.3.4", "@primer/css": "^21.0.1", "@primer/octicons-react": "^19.1.0", - "@primer/primitives": "7.11.10", + "@primer/primitives": "^7.11.11", "@react-aria/ssr": "^3.1.0", "@rollup/plugin-babel": "6.0.3", "@rollup/plugin-commonjs": "25.0.0", - "@rollup/plugin-node-resolve": "15.0.2", + "@rollup/plugin-node-resolve": "15.1.0", "@rollup/plugin-replace": "5.0.2", "@rollup/plugin-terser": "0.4.0", "@rollup/plugin-typescript": "11.1.0", @@ -1408,7 +1409,7 @@ "@size-limit/preset-big-lib": "8.2.4", "@storybook/addon-a11y": "7.0.12", "@storybook/addon-actions": "7.0.12", - "@storybook/addon-essentials": "7.0.12", + "@storybook/addon-essentials": "7.0.18", "@storybook/addon-interactions": "7.0.12", "@storybook/addon-links": "7.0.12", "@storybook/addon-storysource": "7.0.12", @@ -1440,8 +1441,8 @@ "@types/styled-system": "^5.1.12", "@types/styled-system__css": "^5.0.16", "@types/styled-system__theme-get": "^5.0.1", - "@typescript-eslint/eslint-plugin": "5.54.1", - "@typescript-eslint/parser": "5.54.1", + "@typescript-eslint/eslint-plugin": "5.59.6", + "@typescript-eslint/parser": "5.59.6", "ajv": "8.12.0", "axe-core": "4.7.0", "babel-core": "7.0.0-bridge.0", @@ -1504,8 +1505,9 @@ "mdast-util-mdx": "2.0.1", "mdast-util-to-string": "3.1.1", "micromark-extension-frontmatter": "1.0.0", - "micromark-extension-mdxjs": "1.0.0", - "prettier": "2.8.1", + "micromark-extension-mdxjs": "1.0.1", + "postcss-custom-properties-fallback": "^1.0.2", + "prettier": "2.8.8", "react": "18.2.0", "react-dnd": "14.0.4", "react-dnd-html5-backend": "14.0.2", @@ -1524,10 +1526,11 @@ "storybook-css-modules": "1.0.8", "styled-components": "4.4.1", "styled-system": "^5.1.5", - "terser": "5.16.1", + "terser": "5.17.6", "ts-node": "10.9.1", "ts-toolbelt": "9.6.0", "typescript": "4.9.5", + "typescript-plugin-css-modules": "5.0.1", "unist-util-find": "1.0.2", "unist-util-find-before": "3.0.1", "unist-util-flat-filter": "2.0.0", @@ -1831,8 +1834,7 @@ "stylis-rule-sheet": { "version": "0.0.10", "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz", - "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==", - "requires": {} + "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==" }, "supports-color": { "version": "5.5.0", diff --git a/src/Dialog/Dialog.tsx b/src/Dialog/Dialog.tsx index 76bd4095738..1db909aac6e 100644 --- a/src/Dialog/Dialog.tsx +++ b/src/Dialog/Dialog.tsx @@ -151,7 +151,7 @@ const Backdrop = styled('div')` display: flex; align-items: center; justify-content: center; - background-color: rgba(0, 0, 0, 0.4); + background-color: ${get('colors.primer.canvas.backdrop')}; animation: dialog-backdrop-appear ${ANIMATION_DURATION} ${get('animation.easeOutCubic')}; @keyframes dialog-backdrop-appear {