diff --git a/apps/perf-test-react-components/package.json b/apps/perf-test-react-components/package.json index 55c092e105bb7d..acb76c3684cc51 100644 --- a/apps/perf-test-react-components/package.json +++ b/apps/perf-test-react-components/package.json @@ -15,7 +15,7 @@ "@fluentui/eslint-plugin": "*" }, "dependencies": { - "@griffel/core": "^1.8.0", + "@griffel/core": "^1.8.1", "@fluentui/react-avatar": "^9.2.4", "@fluentui/react-button": "^9.1.6", "@fluentui/react-provider": "^9.1.5", diff --git a/apps/public-docsite-v9/package.json b/apps/public-docsite-v9/package.json index f4d7fc2efc6f48..866840648e6aee 100644 --- a/apps/public-docsite-v9/package.json +++ b/apps/public-docsite-v9/package.json @@ -29,7 +29,7 @@ "@fluentui/react-components": "^9.6.0", "@fluentui/react-storybook-addon": "^9.0.0-rc.1", "@fluentui/react-theme": "^9.1.1", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "react": "17.0.2", "react-dom": "17.0.2", "react-window": "^1.8.6", diff --git a/apps/vr-tests-react-components/package.json b/apps/vr-tests-react-components/package.json index fbf47998f437c6..33062a368eb16c 100644 --- a/apps/vr-tests-react-components/package.json +++ b/apps/vr-tests-react-components/package.json @@ -52,7 +52,7 @@ "@fluentui/react-tooltip": "^9.0.9", "@fluentui/react-utilities": "^9.1.2", "@fluentui/scripts": "^1.0.0", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "react": "17.0.2", "react-dom": "17.0.2", "screener-storybook": "0.23.0", diff --git a/change/@fluentui-react-accordion-bf1e8bdc-870f-45dd-8867-d56ff11174a3.json b/change/@fluentui-react-accordion-bf1e8bdc-870f-45dd-8867-d56ff11174a3.json new file mode 100644 index 00000000000000..32f7ba0d4e9193 --- /dev/null +++ b/change/@fluentui-react-accordion-bf1e8bdc-870f-45dd-8867-d56ff11174a3.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-accordion", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-alert-d0f43053-1c61-4666-838a-90fae197c2e5.json b/change/@fluentui-react-alert-d0f43053-1c61-4666-838a-90fae197c2e5.json new file mode 100644 index 00000000000000..138796460c8fec --- /dev/null +++ b/change/@fluentui-react-alert-d0f43053-1c61-4666-838a-90fae197c2e5.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-alert", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-avatar-ec4bff4a-d425-4aa8-8c01-a95170f752cc.json b/change/@fluentui-react-avatar-ec4bff4a-d425-4aa8-8c01-a95170f752cc.json new file mode 100644 index 00000000000000..0ce39218fc70d9 --- /dev/null +++ b/change/@fluentui-react-avatar-ec4bff4a-d425-4aa8-8c01-a95170f752cc.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-avatar", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-badge-5cf07333-75bf-4db6-bda1-77fdafbdd11c.json b/change/@fluentui-react-badge-5cf07333-75bf-4db6-bda1-77fdafbdd11c.json new file mode 100644 index 00000000000000..0dcebbc65adf1b --- /dev/null +++ b/change/@fluentui-react-badge-5cf07333-75bf-4db6-bda1-77fdafbdd11c.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-badge", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-button-51713c1d-c7f8-4c53-b23b-2bcc386bbaa6.json b/change/@fluentui-react-button-51713c1d-c7f8-4c53-b23b-2bcc386bbaa6.json new file mode 100644 index 00000000000000..fb7f45badd9f35 --- /dev/null +++ b/change/@fluentui-react-button-51713c1d-c7f8-4c53-b23b-2bcc386bbaa6.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: refactor styles to use makeResetStyles", + "packageName": "@fluentui/react-button", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-card-1b79ff8b-9f94-4d40-ad32-6bbadf3e0fc7.json b/change/@fluentui-react-card-1b79ff8b-9f94-4d40-ad32-6bbadf3e0fc7.json new file mode 100644 index 00000000000000..8e388e14522dcc --- /dev/null +++ b/change/@fluentui-react-card-1b79ff8b-9f94-4d40-ad32-6bbadf3e0fc7.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-card", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-checkbox-c649f00d-6b51-4966-b89b-ec86ccfa693a.json b/change/@fluentui-react-checkbox-c649f00d-6b51-4966-b89b-ec86ccfa693a.json new file mode 100644 index 00000000000000..bfb62ed6763d90 --- /dev/null +++ b/change/@fluentui-react-checkbox-c649f00d-6b51-4966-b89b-ec86ccfa693a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-checkbox", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-combobox-9e01498d-0d38-4f1f-928d-a4f0189c2441.json b/change/@fluentui-react-combobox-9e01498d-0d38-4f1f-928d-a4f0189c2441.json new file mode 100644 index 00000000000000..6c1ace954af357 --- /dev/null +++ b/change/@fluentui-react-combobox-9e01498d-0d38-4f1f-928d-a4f0189c2441.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-combobox", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-components-226630d4-a7de-4e9e-b774-d3bcdc2e0ef6.json b/change/@fluentui-react-components-226630d4-a7de-4e9e-b774-d3bcdc2e0ef6.json new file mode 100644 index 00000000000000..062db5241cd334 --- /dev/null +++ b/change/@fluentui-react-components-226630d4-a7de-4e9e-b774-d3bcdc2e0ef6.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-components", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-conformance-griffel-14e7c81a-5b2b-40e2-9a4f-25c65da171ca.json b/change/@fluentui-react-conformance-griffel-14e7c81a-5b2b-40e2-9a4f-25c65da171ca.json new file mode 100644 index 00000000000000..ab7014c305cc54 --- /dev/null +++ b/change/@fluentui-react-conformance-griffel-14e7c81a-5b2b-40e2-9a4f-25c65da171ca.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-conformance-griffel", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-dialog-6d2782f2-7f20-4d71-a9e8-2f2ae2a67595.json b/change/@fluentui-react-dialog-6d2782f2-7f20-4d71-a9e8-2f2ae2a67595.json new file mode 100644 index 00000000000000..031540c2c6c2d2 --- /dev/null +++ b/change/@fluentui-react-dialog-6d2782f2-7f20-4d71-a9e8-2f2ae2a67595.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-dialog", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-divider-30e41d69-cfbf-4531-a1a8-9cd7e36f141a.json b/change/@fluentui-react-divider-30e41d69-cfbf-4531-a1a8-9cd7e36f141a.json new file mode 100644 index 00000000000000..9e86a9004812fc --- /dev/null +++ b/change/@fluentui-react-divider-30e41d69-cfbf-4531-a1a8-9cd7e36f141a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-divider", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-field-292f3c2c-797e-4848-a35a-d8c7c03c675f.json b/change/@fluentui-react-field-292f3c2c-797e-4848-a35a-d8c7c03c675f.json new file mode 100644 index 00000000000000..97eb2230f34806 --- /dev/null +++ b/change/@fluentui-react-field-292f3c2c-797e-4848-a35a-d8c7c03c675f.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-field", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-image-9493ac07-4c72-4c43-a561-81e0a5690405.json b/change/@fluentui-react-image-9493ac07-4c72-4c43-a561-81e0a5690405.json new file mode 100644 index 00000000000000..c46a0d6a6fa88d --- /dev/null +++ b/change/@fluentui-react-image-9493ac07-4c72-4c43-a561-81e0a5690405.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-image", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-input-20d8bb4b-2d4d-403b-8acb-ebc9f2a7c80d.json b/change/@fluentui-react-input-20d8bb4b-2d4d-403b-8acb-ebc9f2a7c80d.json new file mode 100644 index 00000000000000..a426953f65f135 --- /dev/null +++ b/change/@fluentui-react-input-20d8bb4b-2d4d-403b-8acb-ebc9f2a7c80d.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-input", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-label-aec64e19-8de6-486e-ad52-11383c8396e7.json b/change/@fluentui-react-label-aec64e19-8de6-486e-ad52-11383c8396e7.json new file mode 100644 index 00000000000000..87a48a676d1518 --- /dev/null +++ b/change/@fluentui-react-label-aec64e19-8de6-486e-ad52-11383c8396e7.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-label", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-link-29ee4631-07cb-4efe-aca6-6649654f8671.json b/change/@fluentui-react-link-29ee4631-07cb-4efe-aca6-6649654f8671.json new file mode 100644 index 00000000000000..174bc783f882c3 --- /dev/null +++ b/change/@fluentui-react-link-29ee4631-07cb-4efe-aca6-6649654f8671.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-link", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-menu-0795bf71-7261-4baf-aff9-b4be649e436f.json b/change/@fluentui-react-menu-0795bf71-7261-4baf-aff9-b4be649e436f.json new file mode 100644 index 00000000000000..54f401566c08a2 --- /dev/null +++ b/change/@fluentui-react-menu-0795bf71-7261-4baf-aff9-b4be649e436f.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-menu", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-migration-v8-v9-1f5cc779-dbbc-4c05-b57e-a1db1f0b912a.json b/change/@fluentui-react-migration-v8-v9-1f5cc779-dbbc-4c05-b57e-a1db1f0b912a.json new file mode 100644 index 00000000000000..79e454e74a1b5d --- /dev/null +++ b/change/@fluentui-react-migration-v8-v9-1f5cc779-dbbc-4c05-b57e-a1db1f0b912a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-migration-v8-v9", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-overflow-9924a36d-bbec-45d0-9585-54484c85f5cd.json b/change/@fluentui-react-overflow-9924a36d-bbec-45d0-9585-54484c85f5cd.json new file mode 100644 index 00000000000000..bbb15298f7e1ed --- /dev/null +++ b/change/@fluentui-react-overflow-9924a36d-bbec-45d0-9585-54484c85f5cd.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-overflow", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-persona-ccd68d5b-13b2-4501-a7ed-62ed32b53bb1.json b/change/@fluentui-react-persona-ccd68d5b-13b2-4501-a7ed-62ed32b53bb1.json new file mode 100644 index 00000000000000..865ed515598ed6 --- /dev/null +++ b/change/@fluentui-react-persona-ccd68d5b-13b2-4501-a7ed-62ed32b53bb1.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-persona", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-popover-50c1ca26-f30b-4a70-90da-ad86de997b80.json b/change/@fluentui-react-popover-50c1ca26-f30b-4a70-90da-ad86de997b80.json new file mode 100644 index 00000000000000..0a6af642a942e5 --- /dev/null +++ b/change/@fluentui-react-popover-50c1ca26-f30b-4a70-90da-ad86de997b80.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-popover", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-portal-7ce09ddf-dcc9-4b28-98c7-82118f4372b4.json b/change/@fluentui-react-portal-7ce09ddf-dcc9-4b28-98c7-82118f4372b4.json new file mode 100644 index 00000000000000..9d5bcd2b3d2977 --- /dev/null +++ b/change/@fluentui-react-portal-7ce09ddf-dcc9-4b28-98c7-82118f4372b4.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-portal", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-positioning-e121df7e-6064-46e2-b44d-ab491814169e.json b/change/@fluentui-react-positioning-e121df7e-6064-46e2-b44d-ab491814169e.json new file mode 100644 index 00000000000000..f5714c1fa9ee01 --- /dev/null +++ b/change/@fluentui-react-positioning-e121df7e-6064-46e2-b44d-ab491814169e.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-positioning", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-progress-6571b1db-1c5b-4618-ad8a-f59a3ed00afa.json b/change/@fluentui-react-progress-6571b1db-1c5b-4618-ad8a-f59a3ed00afa.json new file mode 100644 index 00000000000000..e8effb8ff575f3 --- /dev/null +++ b/change/@fluentui-react-progress-6571b1db-1c5b-4618-ad8a-f59a3ed00afa.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-progress", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-provider-622b4187-3bca-481e-8aec-e35c3a4a0357.json b/change/@fluentui-react-provider-622b4187-3bca-481e-8aec-e35c3a4a0357.json new file mode 100644 index 00000000000000..45376a1471857d --- /dev/null +++ b/change/@fluentui-react-provider-622b4187-3bca-481e-8aec-e35c3a4a0357.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-provider", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-radio-ff9171d6-5440-430b-9062-c0428d286099.json b/change/@fluentui-react-radio-ff9171d6-5440-430b-9062-c0428d286099.json new file mode 100644 index 00000000000000..978ba3754346ca --- /dev/null +++ b/change/@fluentui-react-radio-ff9171d6-5440-430b-9062-c0428d286099.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-radio", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-select-aab10139-fece-4b9b-af0e-5722a3bf4feb.json b/change/@fluentui-react-select-aab10139-fece-4b9b-af0e-5722a3bf4feb.json new file mode 100644 index 00000000000000..e601daa619ca93 --- /dev/null +++ b/change/@fluentui-react-select-aab10139-fece-4b9b-af0e-5722a3bf4feb.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-select", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-slider-f817f12d-6c4c-4302-b284-6f393bbf45cc.json b/change/@fluentui-react-slider-f817f12d-6c4c-4302-b284-6f393bbf45cc.json new file mode 100644 index 00000000000000..79120213e71732 --- /dev/null +++ b/change/@fluentui-react-slider-f817f12d-6c4c-4302-b284-6f393bbf45cc.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-slider", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-spinbutton-684b4304-c9fe-43ec-b176-1a1223f13b11.json b/change/@fluentui-react-spinbutton-684b4304-c9fe-43ec-b176-1a1223f13b11.json new file mode 100644 index 00000000000000..757f25a09fb14e --- /dev/null +++ b/change/@fluentui-react-spinbutton-684b4304-c9fe-43ec-b176-1a1223f13b11.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-spinbutton", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-spinner-2b6e81d3-3720-457d-a3df-6628cf2d6524.json b/change/@fluentui-react-spinner-2b6e81d3-3720-457d-a3df-6628cf2d6524.json new file mode 100644 index 00000000000000..9c78af49ad22c9 --- /dev/null +++ b/change/@fluentui-react-spinner-2b6e81d3-3720-457d-a3df-6628cf2d6524.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-spinner", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-switch-41eef457-242d-455b-ba76-f64f38637e2c.json b/change/@fluentui-react-switch-41eef457-242d-455b-ba76-f64f38637e2c.json new file mode 100644 index 00000000000000..ccc17551c4b9f1 --- /dev/null +++ b/change/@fluentui-react-switch-41eef457-242d-455b-ba76-f64f38637e2c.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-switch", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-table-a227e1e3-7890-434c-b263-fc044af25413.json b/change/@fluentui-react-table-a227e1e3-7890-434c-b263-fc044af25413.json new file mode 100644 index 00000000000000..3625ec7464ef24 --- /dev/null +++ b/change/@fluentui-react-table-a227e1e3-7890-434c-b263-fc044af25413.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-table", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-tabs-383af3aa-14f1-4105-8204-c8fea8abb925.json b/change/@fluentui-react-tabs-383af3aa-14f1-4105-8204-c8fea8abb925.json new file mode 100644 index 00000000000000..657dd097d9793d --- /dev/null +++ b/change/@fluentui-react-tabs-383af3aa-14f1-4105-8204-c8fea8abb925.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-tabs", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-tabster-71be85ee-ac90-4874-a5c1-62749bdb98a2.json b/change/@fluentui-react-tabster-71be85ee-ac90-4874-a5c1-62749bdb98a2.json new file mode 100644 index 00000000000000..25502cfa499748 --- /dev/null +++ b/change/@fluentui-react-tabster-71be85ee-ac90-4874-a5c1-62749bdb98a2.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-tabster", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-text-63c52842-6b75-46ab-8e29-c48b2c14a39c.json b/change/@fluentui-react-text-63c52842-6b75-46ab-8e29-c48b2c14a39c.json new file mode 100644 index 00000000000000..fe362a5a953ccd --- /dev/null +++ b/change/@fluentui-react-text-63c52842-6b75-46ab-8e29-c48b2c14a39c.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-text", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-textarea-f71b2370-d827-4407-8903-e6a86269b974.json b/change/@fluentui-react-textarea-f71b2370-d827-4407-8903-e6a86269b974.json new file mode 100644 index 00000000000000..c0d9d86a9ef832 --- /dev/null +++ b/change/@fluentui-react-textarea-f71b2370-d827-4407-8903-e6a86269b974.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-textarea", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-toolbar-674dd8e0-ab53-4a7d-b650-e220d2d1c636.json b/change/@fluentui-react-toolbar-674dd8e0-ab53-4a7d-b650-e220d2d1c636.json new file mode 100644 index 00000000000000..5a89ec422113de --- /dev/null +++ b/change/@fluentui-react-toolbar-674dd8e0-ab53-4a7d-b650-e220d2d1c636.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-toolbar", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-tooltip-500af90c-c1ae-4483-948d-18b54fcded67.json b/change/@fluentui-react-tooltip-500af90c-c1ae-4483-948d-18b54fcded67.json new file mode 100644 index 00000000000000..7c3d78e434a00d --- /dev/null +++ b/change/@fluentui-react-tooltip-500af90c-c1ae-4483-948d-18b54fcded67.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "chore: Update Griffel to latest version", + "packageName": "@fluentui/react-tooltip", + "email": "olfedias@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/package.json b/package.json index 24797c0e76f252..965e76763ada52 100644 --- a/package.json +++ b/package.json @@ -85,12 +85,12 @@ "@cypress/react": "5.12.4", "@cypress/webpack-dev-server": "1.8.3", "@fluentui/react-icons": "^2.0.175", - "@griffel/babel-preset": "1.4.0", + "@griffel/babel-preset": "1.4.3", "@griffel/eslint-plugin": "1.0.0", - "@griffel/jest-serializer": "1.0.13", - "@griffel/react": "^1.4.1", - "@griffel/webpack-extraction-plugin": "0.2.0", - "@griffel/webpack-loader": "2.1.0", + "@griffel/jest-serializer": "1.1.1", + "@griffel/react": "^1.4.2", + "@griffel/webpack-extraction-plugin": "0.2.1", + "@griffel/webpack-loader": "2.1.3", "@microsoft/api-extractor": "7.18.1", "@microsoft/eslint-plugin-sdl": "0.1.9", "@nrwl/cli": "13.10.6", diff --git a/packages/react-components/react-accordion/package.json b/packages/react-components/react-accordion/package.json index 82c39d740dafff..25aa0eaabf345d 100644 --- a/packages/react-components/react-accordion/package.json +++ b/packages/react-components/react-accordion/package.json @@ -38,7 +38,7 @@ "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-alert/package.json b/packages/react-components/react-alert/package.json index 6e105cb99642af..bd73a24f342515 100644 --- a/packages/react-components/react-alert/package.json +++ b/packages/react-components/react-alert/package.json @@ -36,7 +36,7 @@ "@fluentui/react-icons": "^2.0.175", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-avatar-context/package.json b/packages/react-components/react-avatar-context/package.json index f84ceefe1114d7..f5896ccd36dcfc 100644 --- a/packages/react-components/react-avatar-context/package.json +++ b/packages/react-components/react-avatar-context/package.json @@ -31,7 +31,7 @@ "dependencies": { "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-avatar/package.json b/packages/react-components/react-avatar/package.json index 74d2bdfe177dc1..44f3d211a29160 100644 --- a/packages/react-components/react-avatar/package.json +++ b/packages/react-components/react-avatar/package.json @@ -43,7 +43,7 @@ "@fluentui/react-theme": "^9.1.1", "@fluentui/react-tooltip": "^9.0.9", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-badge/package.json b/packages/react-components/react-badge/package.json index 20a10289f74a88..91b2297bef2907 100644 --- a/packages/react-components/react-badge/package.json +++ b/packages/react-components/react-badge/package.json @@ -33,7 +33,7 @@ }, "dependencies": { "@fluentui/react-icons": "^2.0.175", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", "tslib": "^2.1.0" diff --git a/packages/react-components/react-button/package.json b/packages/react-components/react-button/package.json index 3ea8c1b9585144..1f402fef3939e9 100644 --- a/packages/react-components/react-button/package.json +++ b/packages/react-components/react-button/package.json @@ -39,7 +39,7 @@ "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-button/src/components/Button/useButtonStyles.ts b/packages/react-components/react-button/src/components/Button/useButtonStyles.ts index 148daa26a7d2d8..78438b0a3db250 100644 --- a/packages/react-components/react-button/src/components/Button/useButtonStyles.ts +++ b/packages/react-components/react-button/src/components/Button/useButtonStyles.ts @@ -1,7 +1,7 @@ import { iconFilledClassName, iconRegularClassName } from '@fluentui/react-icons'; import { createCustomFocusIndicatorStyle } from '@fluentui/react-tabster'; import { tokens } from '@fluentui/react-theme'; -import { shorthands, makeStyles, mergeClasses } from '@griffel/react'; +import { shorthands, makeStyles, makeResetStyles, mergeClasses } from '@griffel/react'; import type { SlotClassNames } from '@fluentui/react-utilities'; import type { ButtonSlots, ButtonState } from './Button.types'; @@ -15,93 +15,111 @@ const iconSpacingVar = '--fui-Button__icon--spacing'; const buttonSpacingSmall = '3px'; const buttonSpacingMedium = '5px'; -const useRootStyles = makeStyles({ - // Base styles - base: { - alignItems: 'center', - boxSizing: 'border-box', - display: 'inline-flex', - justifyContent: 'center', - textDecorationLine: 'none', - verticalAlign: 'middle', +const useBaseClassName = makeResetStyles({ + alignItems: 'center', + boxSizing: 'border-box', + display: 'inline-flex', + justifyContent: 'center', + textDecorationLine: 'none', + verticalAlign: 'middle', - ...shorthands.margin(0), + margin: 0, + overflow: 'hidden', - ...shorthands.overflow('hidden'), + backgroundColor: tokens.colorNeutralBackground1, + color: tokens.colorNeutralForeground1, + border: `${tokens.strokeWidthThin} solid ${tokens.colorNeutralStroke1}`, - backgroundColor: tokens.colorNeutralBackground1, - color: tokens.colorNeutralForeground1, - ...shorthands.border(tokens.strokeWidthThin, 'solid', tokens.colorNeutralStroke1), + fontFamily: tokens.fontFamilyBase, + outlineStyle: 'none', - fontFamily: tokens.fontFamilyBase, + ':hover': { + backgroundColor: tokens.colorNeutralBackground1Hover, + borderColor: tokens.colorNeutralStroke1Hover, + color: tokens.colorNeutralForeground1Hover, - outlineStyle: 'none', - - ':hover': { - backgroundColor: tokens.colorNeutralBackground1Hover, - ...shorthands.borderColor(tokens.colorNeutralStroke1Hover), - color: tokens.colorNeutralForeground1Hover, + cursor: 'pointer', - cursor: 'pointer', - - [`& .${iconFilledClassName}`]: { - display: 'inline', - }, - [`& .${iconRegularClassName}`]: { - display: 'none', - }, + [`& .${iconFilledClassName}`]: { + display: 'inline', }, + [`& .${iconRegularClassName}`]: { + display: 'none', + }, + }, - ':hover:active': { - backgroundColor: tokens.colorNeutralBackground1Pressed, - ...shorthands.borderColor(tokens.colorNeutralStroke1Pressed), - color: tokens.colorNeutralForeground1Pressed, + ':hover:active': { + backgroundColor: tokens.colorNeutralBackground1Pressed, + borderColor: tokens.colorNeutralStroke1Pressed, + color: tokens.colorNeutralForeground1Pressed, - outlineStyle: 'none', + outlineStyle: 'none', - [`& .${iconFilledClassName}`]: { - display: 'inline', - }, - [`& .${iconRegularClassName}`]: { - display: 'none', - }, + [`& .${iconFilledClassName}`]: { + display: 'inline', + }, + [`& .${iconRegularClassName}`]: { + display: 'none', }, }, + padding: `${buttonSpacingMedium} ${tokens.spacingHorizontalM}`, + minWidth: '96px', + borderRadius: tokens.borderRadiusMedium, + + fontSize: tokens.fontSizeBase300, + fontWeight: tokens.fontWeightSemibold, + lineHeight: tokens.lineHeightBase300, + // Transition styles - transition: { - transitionDuration: '100ms', - transitionProperty: 'background, border, color', - transitionTimingFunction: 'cubic-bezier(0.33, 0, 0.67, 1)', - '@media screen and (prefers-reduced-motion: reduce)': { - transitionDuration: '0.01ms', - }, + transitionDuration: '100ms', + transitionProperty: 'background, border, color', + transitionTimingFunction: 'cubic-bezier(0.33, 0, 0.67, 1)', + + '@media screen and (prefers-reduced-motion: reduce)': { + transitionDuration: '0.01ms', }, // High contrast styles - highContrast: { - '@media (forced-colors: active)': { - ':focus': { - ...shorthands.borderColor('ButtonText'), - }, - ':hover': { - backgroundColor: 'HighlightText', - ...shorthands.borderColor('Highlight'), - color: 'Highlight', - forcedColorAdjust: 'none', - }, + '@media (forced-colors: active)': { + ':focus': { + borderColor: 'ButtonText', + }, - ':hover:active': { - backgroundColor: 'HighlightText', - ...shorthands.borderColor('Highlight'), - color: 'Highlight', - forcedColorAdjust: 'none', - }, + ':hover': { + backgroundColor: 'HighlightText', + borderColor: 'Highlight', + color: 'Highlight', + forcedColorAdjust: 'none', + }, + + ':hover:active': { + backgroundColor: 'HighlightText', + borderColor: 'Highlight', + color: 'Highlight', + forcedColorAdjust: 'none', }, }, + // Focus styles + + ...createCustomFocusIndicatorStyle({ + ...shorthands.borderColor(tokens.colorTransparentStroke), + ...shorthands.borderRadius(tokens.borderRadiusMedium), + outlineColor: tokens.colorTransparentStroke, + outlineWidth: tokens.strokeWidthThick, + outlineStyle: 'solid', + boxShadow: ` + ${tokens.shadow4}, + 0 0 0 2px ${tokens.colorStrokeFocus2} + `, + zIndex: 1, + }), +}); + +const useRootStyles = makeStyles({ // Appearance variations outline: { backgroundColor: tokens.colorTransparentBackground, @@ -193,15 +211,7 @@ const useRootStyles = makeStyles({ lineHeight: tokens.lineHeightBase200, }, medium: { - ...shorthands.padding(buttonSpacingMedium, tokens.spacingHorizontalM), - - minWidth: '96px', - - ...shorthands.borderRadius(tokens.borderRadiusMedium), - - fontSize: tokens.fontSizeBase300, - fontWeight: tokens.fontWeightSemibold, - lineHeight: tokens.lineHeightBase300, + /* defined in base styles */ }, large: { ...shorthands.padding(tokens.spacingVerticalS, tokens.spacingHorizontalL), @@ -335,18 +345,6 @@ const useRootDisabledStyles = makeStyles({ }); const useRootFocusStyles = makeStyles({ - base: createCustomFocusIndicatorStyle({ - ...shorthands.borderColor(tokens.colorTransparentStroke), - outlineColor: tokens.colorTransparentStroke, - outlineWidth: tokens.strokeWidthThick, - outlineStyle: 'solid', - boxShadow: ` - ${tokens.shadow4}, - 0 0 0 2px ${tokens.colorStrokeFocus2} - `, - zIndex: 1, - }), - // Shape variations circular: createCustomFocusIndicatorStyle({ ...shorthands.borderRadius(tokens.borderRadiusCircular), @@ -368,9 +366,9 @@ const useRootFocusStyles = makeStyles({ small: createCustomFocusIndicatorStyle({ ...shorthands.borderRadius(tokens.borderRadiusSmall), }), - medium: createCustomFocusIndicatorStyle({ - ...shorthands.borderRadius(tokens.borderRadiusMedium), - }), + medium: { + /* defined in base styles */ + }, large: createCustomFocusIndicatorStyle({ ...shorthands.borderRadius(tokens.borderRadiusLarge), }), @@ -450,6 +448,7 @@ const useIconStyles = makeStyles({ }); export const useButtonStyles_unstable = (state: ButtonState): ButtonState => { + const baseClassName = useBaseClassName(); const rootStyles = useRootStyles(); const rootDisabledStyles = useRootDisabledStyles(); const rootFocusStyles = useRootFocusStyles(); @@ -460,12 +459,10 @@ export const useButtonStyles_unstable = (state: ButtonState): ButtonState => { state.root.className = mergeClasses( buttonClassNames.root, + baseClassName, - // Root styles - rootStyles.base, - rootStyles.transition, - rootStyles.highContrast, appearance && rootStyles[appearance], + rootStyles[size], rootStyles[shape], @@ -475,7 +472,6 @@ export const useButtonStyles_unstable = (state: ButtonState): ButtonState => { appearance && (disabled || disabledFocusable) && rootDisabledStyles[appearance], // Focus styles - rootFocusStyles.base, appearance === 'primary' && rootFocusStyles.primary, rootFocusStyles[size], rootFocusStyles[shape], diff --git a/packages/react-components/react-card/package.json b/packages/react-components/react-card/package.json index 3983f73f4ef215..a6504534de1b85 100644 --- a/packages/react-components/react-card/package.json +++ b/packages/react-components/react-card/package.json @@ -36,7 +36,7 @@ "@fluentui/react-button": "^9.1.6" }, "dependencies": { - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "@fluentui/react-utilities": "^9.1.2", "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", diff --git a/packages/react-components/react-checkbox/package.json b/packages/react-components/react-checkbox/package.json index 4ce48d326da673..81a32a8e048097 100644 --- a/packages/react-components/react-checkbox/package.json +++ b/packages/react-components/react-checkbox/package.json @@ -36,7 +36,7 @@ "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-combobox/package.json b/packages/react-components/react-combobox/package.json index 0e203b02143d73..db822a8e453ce8 100644 --- a/packages/react-components/react-combobox/package.json +++ b/packages/react-components/react-combobox/package.json @@ -39,7 +39,7 @@ "@fluentui/react-positioning": "^9.2.2", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-components/package.json b/packages/react-components/react-components/package.json index 452a04f94487f2..d7bb5a2ec994d5 100644 --- a/packages/react-components/react-components/package.json +++ b/packages/react-components/react-components/package.json @@ -71,7 +71,7 @@ "@fluentui/react-tooltip": "^9.0.9", "@fluentui/react-utilities": "^9.1.2", "@fluentui/react-text": "^9.1.4", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-conformance-griffel/package.json b/packages/react-components/react-conformance-griffel/package.json index 18ec08ae692251..8b4228576f7614 100644 --- a/packages/react-components/react-conformance-griffel/package.json +++ b/packages/react-components/react-conformance-griffel/package.json @@ -32,7 +32,7 @@ "@fluentui/react-conformance": "^0.15.4" }, "dependencies": { - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "beachball": { diff --git a/packages/react-components/react-dialog/package.json b/packages/react-components/react-dialog/package.json index 6cf3186b4fc460..62f9d416cb6814 100644 --- a/packages/react-components/react-dialog/package.json +++ b/packages/react-components/react-dialog/package.json @@ -33,7 +33,7 @@ "@fluentui/scripts": "^1.0.0" }, "dependencies": { - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "@fluentui/react-utilities": "^9.1.2", "@fluentui/keyboard-keys": "^9.0.0", "@fluentui/react-context-selector": "^9.0.5", diff --git a/packages/react-components/react-divider/package.json b/packages/react-components/react-divider/package.json index 2867b47aaabeb5..421b5723748bea 100644 --- a/packages/react-components/react-divider/package.json +++ b/packages/react-components/react-divider/package.json @@ -32,7 +32,7 @@ "@fluentui/scripts": "^1.0.0" }, "dependencies": { - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", "tslib": "^2.1.0" diff --git a/packages/react-components/react-field/package.json b/packages/react-components/react-field/package.json index 133b2c28c6fbeb..b5237a00049a32 100644 --- a/packages/react-components/react-field/package.json +++ b/packages/react-components/react-field/package.json @@ -46,7 +46,7 @@ "@fluentui/react-textarea": "^9.1.3", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-image/package.json b/packages/react-components/react-image/package.json index f84231b5e833a1..5308040c02edf0 100644 --- a/packages/react-components/react-image/package.json +++ b/packages/react-components/react-image/package.json @@ -31,7 +31,7 @@ "@fluentui/scripts": "^1.0.0" }, "dependencies": { - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "@fluentui/react-utilities": "^9.1.2", "@fluentui/react-theme": "^9.1.1", "tslib": "^2.1.0" diff --git a/packages/react-components/react-infobutton/package.json b/packages/react-components/react-infobutton/package.json index ef46a6847f730f..bf3349e35b4a7d 100644 --- a/packages/react-components/react-infobutton/package.json +++ b/packages/react-components/react-infobutton/package.json @@ -34,7 +34,7 @@ "dependencies": { "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-input/package.json b/packages/react-components/react-input/package.json index 61235f0c2d901f..7dd1a696a82725 100644 --- a/packages/react-components/react-input/package.json +++ b/packages/react-components/react-input/package.json @@ -35,7 +35,7 @@ "dependencies": { "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-label/package.json b/packages/react-components/react-label/package.json index f2ba7237c9c49a..c401e1c4d8c08c 100644 --- a/packages/react-components/react-label/package.json +++ b/packages/react-components/react-label/package.json @@ -34,7 +34,7 @@ "dependencies": { "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-link/package.json b/packages/react-components/react-link/package.json index 26ffdf6869ffde..95e255358fb997 100644 --- a/packages/react-components/react-link/package.json +++ b/packages/react-components/react-link/package.json @@ -37,7 +37,7 @@ "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-menu/package.json b/packages/react-components/react-menu/package.json index 3071c566344122..7e1ec65e65c6ec 100644 --- a/packages/react-components/react-menu/package.json +++ b/packages/react-components/react-menu/package.json @@ -43,7 +43,7 @@ "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-overflow/package.json b/packages/react-components/react-overflow/package.json index 9ca237880bfd2f..587c7246d0e8f6 100644 --- a/packages/react-components/react-overflow/package.json +++ b/packages/react-components/react-overflow/package.json @@ -35,7 +35,7 @@ "@fluentui/react-context-selector": "^9.0.5", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-persona/package.json b/packages/react-components/react-persona/package.json index 759330b85e006e..d295911399cf53 100644 --- a/packages/react-components/react-persona/package.json +++ b/packages/react-components/react-persona/package.json @@ -36,7 +36,7 @@ "@fluentui/react-badge": "^9.0.10", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-popover/package.json b/packages/react-components/react-popover/package.json index 335e31b6d22261..c7c66130007a3d 100644 --- a/packages/react-components/react-popover/package.json +++ b/packages/react-components/react-popover/package.json @@ -42,7 +42,7 @@ "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-portal/package.json b/packages/react-components/react-portal/package.json index 7f98e5d60e738d..f2850a0312a726 100644 --- a/packages/react-components/react-portal/package.json +++ b/packages/react-components/react-portal/package.json @@ -34,7 +34,7 @@ "@fluentui/react-shared-contexts": "^9.0.2", "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-positioning/package.json b/packages/react-components/react-positioning/package.json index 2446a34aebbc49..62282368a296f7 100644 --- a/packages/react-components/react-positioning/package.json +++ b/packages/react-components/react-positioning/package.json @@ -32,7 +32,7 @@ "@fluentui/react-shared-contexts": "^9.0.2", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-progress/package.json b/packages/react-components/react-progress/package.json index 1f8d90dc7faaf4..d0fba1115b65c6 100644 --- a/packages/react-components/react-progress/package.json +++ b/packages/react-components/react-progress/package.json @@ -35,7 +35,7 @@ "@fluentui/react-shared-contexts": "^9.0.2", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-provider/package.json b/packages/react-components/react-provider/package.json index b66338b6633ec4..7e0a0f6f20dbdf 100644 --- a/packages/react-components/react-provider/package.json +++ b/packages/react-components/react-provider/package.json @@ -32,8 +32,8 @@ "@fluentui/scripts": "^1.0.0" }, "dependencies": { - "@griffel/core": "^1.8.0", - "@griffel/react": "^1.4.1", + "@griffel/core": "^1.8.1", + "@griffel/react": "^1.4.2", "@fluentui/react-shared-contexts": "^9.0.2", "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", diff --git a/packages/react-components/react-radio/package.json b/packages/react-components/react-radio/package.json index bc2db173146381..06a800b3bc4972 100644 --- a/packages/react-components/react-radio/package.json +++ b/packages/react-components/react-radio/package.json @@ -37,7 +37,7 @@ "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-select/package.json b/packages/react-components/react-select/package.json index 4251f3304e4228..1d449a9058468a 100644 --- a/packages/react-components/react-select/package.json +++ b/packages/react-components/react-select/package.json @@ -34,7 +34,7 @@ "@fluentui/react-icons": "^2.0.175", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-slider/package.json b/packages/react-components/react-slider/package.json index 5a65529fd76451..9bcb97d49dd8ec 100644 --- a/packages/react-components/react-slider/package.json +++ b/packages/react-components/react-slider/package.json @@ -32,7 +32,7 @@ "@fluentui/scripts": "^1.0.0" }, "dependencies": { - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "@fluentui/react-shared-contexts": "^9.0.2", "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", diff --git a/packages/react-components/react-spinbutton/package.json b/packages/react-components/react-spinbutton/package.json index d2a6ffaedfd20f..5385a0d299d509 100644 --- a/packages/react-components/react-spinbutton/package.json +++ b/packages/react-components/react-spinbutton/package.json @@ -33,7 +33,7 @@ "@fluentui/scripts": "^1.0.0" }, "dependencies": { - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "@fluentui/keyboard-keys": "^9.0.0", "@fluentui/react-icons": "^2.0.175", "@fluentui/react-input": "^9.2.3", diff --git a/packages/react-components/react-spinner/package.json b/packages/react-components/react-spinner/package.json index 7e817ee856d741..5e9f91a59c2d89 100644 --- a/packages/react-components/react-spinner/package.json +++ b/packages/react-components/react-spinner/package.json @@ -35,7 +35,7 @@ "@fluentui/react-theme": "^9.1.1", "@fluentui/react-label": "^9.0.8", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-switch/package.json b/packages/react-components/react-switch/package.json index f2d358c4375bcd..4130d3aab95dc4 100644 --- a/packages/react-components/react-switch/package.json +++ b/packages/react-components/react-switch/package.json @@ -37,7 +37,7 @@ "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-table/package.json b/packages/react-components/react-table/package.json index a6c25fd2c9db54..b93a930fd0aa5d 100644 --- a/packages/react-components/react-table/package.json +++ b/packages/react-components/react-table/package.json @@ -38,7 +38,7 @@ "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-tabs/package.json b/packages/react-components/react-tabs/package.json index e15dedd75e6651..f6b320e246590d 100644 --- a/packages/react-components/react-tabs/package.json +++ b/packages/react-components/react-tabs/package.json @@ -34,7 +34,7 @@ "@fluentui/react-tabster": "^9.2.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-tabster/package.json b/packages/react-components/react-tabster/package.json index 20f5258f3ac7f6..2ff01e5a4ccb8f 100644 --- a/packages/react-components/react-tabster/package.json +++ b/packages/react-components/react-tabster/package.json @@ -31,7 +31,7 @@ "@fluentui/scripts": "^1.0.0" }, "dependencies": { - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "@fluentui/react-shared-contexts": "^9.0.2", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", diff --git a/packages/react-components/react-text/package.json b/packages/react-components/react-text/package.json index aea5d628bb69ed..8206eeff054ec7 100644 --- a/packages/react-components/react-text/package.json +++ b/packages/react-components/react-text/package.json @@ -31,7 +31,7 @@ "@fluentui/scripts": "^1.0.0" }, "dependencies": { - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", "tslib": "^2.1.0" diff --git a/packages/react-components/react-textarea/package.json b/packages/react-components/react-textarea/package.json index 3ed37479cf0f38..70b6eaf116175b 100644 --- a/packages/react-components/react-textarea/package.json +++ b/packages/react-components/react-textarea/package.json @@ -34,7 +34,7 @@ "dependencies": { "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-toolbar/package.json b/packages/react-components/react-toolbar/package.json index fc7aec0d5a9467..84a2ee612119b9 100644 --- a/packages/react-components/react-toolbar/package.json +++ b/packages/react-components/react-toolbar/package.json @@ -41,7 +41,7 @@ "@fluentui/react-hooks": "^8.6.12", "@fluentui/react-radio": "^9.0.9", "@fluentui/react-tabster": "^9.2.0", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-tooltip/package.json b/packages/react-components/react-tooltip/package.json index 223e842488728d..6248f4894dae64 100644 --- a/packages/react-components/react-tooltip/package.json +++ b/packages/react-components/react-tooltip/package.json @@ -37,7 +37,7 @@ "@fluentui/react-shared-contexts": "^9.0.2", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/react-tree/package.json b/packages/react-components/react-tree/package.json index f3bdf12e15c788..6364f0a30941a9 100644 --- a/packages/react-components/react-tree/package.json +++ b/packages/react-components/react-tree/package.json @@ -31,7 +31,7 @@ "dependencies": { "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/packages/react-components/theme-designer/package.json b/packages/react-components/theme-designer/package.json index 59a0dd40c9c7e2..0a0048b44fee03 100644 --- a/packages/react-components/theme-designer/package.json +++ b/packages/react-components/theme-designer/package.json @@ -33,7 +33,7 @@ "dependencies": { "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0", "@fluentui/react-components": "^9.6.0", "@fluentui/react-icons": "^2.0.175", diff --git a/packages/react-migration-v8-v9/package.json b/packages/react-migration-v8-v9/package.json index 1344c33ccf822d..622e1bc465c11b 100644 --- a/packages/react-migration-v8-v9/package.json +++ b/packages/react-migration-v8-v9/package.json @@ -33,7 +33,7 @@ "@fluentui/react-components": "^9.6.0", "@fluentui/react-theme": "^9.1.1", "@fluentui/react-utilities": "^9.1.2", - "@griffel/react": "^1.4.1", + "@griffel/react": "^1.4.2", "tslib": "^2.1.0" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 45c58c2641ba29..df4bef8c7066c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1642,10 +1642,10 @@ resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== -"@griffel/babel-preset@1.4.0", "@griffel/babel-preset@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@griffel/babel-preset/-/babel-preset-1.4.0.tgz#efe2ae47865d034f9f006e1f100ec5d9581d9bf4" - integrity sha512-yqAlE9o57jFDVfwhb7naShgaCx4uxb9d8ObSNqsO0grD2jtNkAbukFiWMI9GraLw5UjSMDrOkoSmJHj7AKM/Pw== +"@griffel/babel-preset@1.4.3", "@griffel/babel-preset@^1.4.3": + version "1.4.3" + resolved "https://registry.yarnpkg.com/@griffel/babel-preset/-/babel-preset-1.4.3.tgz#31319170b818990c28a49e0bb710f1a27aa9cc05" + integrity sha512-UAf/Rwme2F5r+we15HJs245z26whby/IuT8kaBK8XCvdNLKUPBVF8OaQmixfLTz/V8Xb+U+xtJsEVYrwr9Q6ag== dependencies: "@babel/core" "^7.12.13" "@babel/generator" "^7.12.13" @@ -1658,10 +1658,10 @@ stylis "^4.0.13" tslib "^2.1.0" -"@griffel/core@^1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@griffel/core/-/core-1.8.0.tgz#2b798b64b59762eba504e2f2e5286fc93e5c1034" - integrity sha512-Z6gmkTc4031Uxf97caKuTwIlDR6MJ8VKVnbv7Z2koeITZjeRg2iMmo/4rXsS/sLTnbT9vqkDRiemBuseExLG/A== +"@griffel/core@^1.8.1": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@griffel/core/-/core-1.8.1.tgz#c72215cb292fed23dd21967c8886e2d9f52008f4" + integrity sha512-Zig4h+o2f8v7tV13yQCmRaEKp6Psdi+NZEPQOmM7DJNmAHYQgcHJcLqJH7SOGWr+QOh3ZXVpQ2EP3JDKz479GQ== dependencies: "@emotion/hash" "^0.8.0" csstype "^3.0.10" @@ -1677,41 +1677,41 @@ "@typescript-eslint/utils" "^5.20.0" csstype "^3.0.10" -"@griffel/jest-serializer@1.0.13": - version "1.0.13" - resolved "https://registry.yarnpkg.com/@griffel/jest-serializer/-/jest-serializer-1.0.13.tgz#2295101412d80a3b0c6d2f864070cb065b9316d5" - integrity sha512-pxLUkpeIbLn1ooaN/sm5cNm/zLp8bHu9Jvn14Hk2B7zKiiNefK0aRWUGaUSUYJMDjDZ1QxMUHBqq3qEiVxHaKw== +"@griffel/jest-serializer@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@griffel/jest-serializer/-/jest-serializer-1.1.1.tgz#38a8bb13a2591ea8006757cf58b0ec108d484ced" + integrity sha512-X3pF+vJiBsCnQLueL2dv+Ml+zyVxwB7zc5L/lKhkB1vc3Xt4tFGINXVRNPAs7P0hSbMF2+Z331prXWhSCAOY/g== dependencies: tslib "^2.1.0" -"@griffel/react@1.4.1", "@griffel/react@^1.0.0", "@griffel/react@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@griffel/react/-/react-1.4.1.tgz#f9726d9c72054a1100cedef69fb96344ca43f077" - integrity sha512-xKQLWXGE9IhuTAGClseUKn3/luMF5Gb0+0UM1cFuWoVpcfRvHMRZsNkClb0hwhjqR1Y8GLtoO52PM1Q4Z+GQ1w== +"@griffel/react@1.4.2", "@griffel/react@^1.0.0", "@griffel/react@^1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@griffel/react/-/react-1.4.2.tgz#d4d3a9b24334e11cae188d8fb5574aa946e46cc2" + integrity sha512-VM047UxJFiq/OX5YkRPVuGB9NdU/TxVX9nrBRncXuxzVRRmvf+1OmHlcXWaFuXVj0JOjiMBzm4jH34lqPRGS+Q== dependencies: - "@griffel/core" "^1.8.0" + "@griffel/core" "^1.8.1" tslib "^2.1.0" -"@griffel/webpack-extraction-plugin@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@griffel/webpack-extraction-plugin/-/webpack-extraction-plugin-0.2.0.tgz#7d0d1b883a91fc154c69be33bb83eb667c1d5e0f" - integrity sha512-xq3TP2brw8k5sObDCZael/rWnZmtSc/UAX6s/hm0sIgEXPSfIqjNfHObc0l7ikT4cgOTeTCtJGg8Smbc9QO4VA== +"@griffel/webpack-extraction-plugin@0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@griffel/webpack-extraction-plugin/-/webpack-extraction-plugin-0.2.1.tgz#23bb9a5de1bd59ee9c9e9cda47a44358f6a7e218" + integrity sha512-FVM5+tBiIJ5B+Dtth6YL/+z8I5ShgZKYXa+m9/QXsMou/6+y+6ySThOtklFEr7K0b05uNlt2srLgWI38UBT8og== dependencies: "@babel/core" "^7.12.13" "@babel/helper-plugin-utils" "^7.12.13" - "@griffel/react" "1.4.1" + "@griffel/react" "1.4.2" loader-utils "^2.0.0" schema-utils "^3.1.1" stylis "^4.0.13" tslib "^2.1.0" -"@griffel/webpack-loader@2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@griffel/webpack-loader/-/webpack-loader-2.1.0.tgz#1b5c106935e0da8086fc8d176e50dbcb44018d1f" - integrity sha512-Nv3xnW64q+wuW/G1I98YW+neXfsXvLeBJmZ5AKFY6iPERsJa+VceTnXlHnMn147ylecwU/5r36v/7s0X+SF6cw== +"@griffel/webpack-loader@2.1.3": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@griffel/webpack-loader/-/webpack-loader-2.1.3.tgz#6553f8d2b4fa77253fdc58e01c3f00d784b17ca1" + integrity sha512-bXSUbcP4iBc+oZnyWuDCHTuywzbbD0MCxgrVmmHzBnRjYi1ZnGvQqUFFZxA9f31JYnY6y+MkIZMr2xd44codjA== dependencies: "@babel/core" "^7.12.13" - "@griffel/babel-preset" "^1.4.0" + "@griffel/babel-preset" "^1.4.3" enhanced-resolve "^5.8.2" loader-utils "^2.0.0" schema-utils "^3.1.1"