From 410427a1ea144ffc3fbe9c0a7f153b4029aa6ce0 Mon Sep 17 00:00:00 2001 From: GeoffCoxMSFT Date: Sat, 4 Mar 2023 10:22:35 -0800 Subject: [PATCH 1/3] Custom style react-text --- ...ui-react-text-4ec8a8d0-658f-4318-9259-eb36057dbf99.json | 7 +++++++ packages/react-components/react-text/package.json | 1 + .../react-text/src/components/Text/Text.tsx | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 change/@fluentui-react-text-4ec8a8d0-658f-4318-9259-eb36057dbf99.json diff --git a/change/@fluentui-react-text-4ec8a8d0-658f-4318-9259-eb36057dbf99.json b/change/@fluentui-react-text-4ec8a8d0-658f-4318-9259-eb36057dbf99.json new file mode 100644 index 0000000000000..6644e7a1365d3 --- /dev/null +++ b/change/@fluentui-react-text-4ec8a8d0-658f-4318-9259-eb36057dbf99.json @@ -0,0 +1,7 @@ +{ + "type": "minor", + "comment": "feat: custom styles", + "packageName": "@fluentui/react-text", + "email": "gcox@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-components/react-text/package.json b/packages/react-components/react-text/package.json index f10c3572a465c..f4071195b09fa 100644 --- a/packages/react-components/react-text/package.json +++ b/packages/react-components/react-text/package.json @@ -33,6 +33,7 @@ }, "dependencies": { "@griffel/react": "^1.5.2", + "@fluentui/react-shared-contexts": "^9.2.0", "@fluentui/react-theme": "^9.1.5", "@fluentui/react-utilities": "^9.6.0", "tslib": "^2.1.0" diff --git a/packages/react-components/react-text/src/components/Text/Text.tsx b/packages/react-components/react-text/src/components/Text/Text.tsx index 697c6c1d57f65..f9ca2632f0f94 100644 --- a/packages/react-components/react-text/src/components/Text/Text.tsx +++ b/packages/react-components/react-text/src/components/Text/Text.tsx @@ -4,6 +4,7 @@ import { renderText_unstable } from './renderText'; import { useTextStyles_unstable } from './useTextStyles'; import type { TextProps } from './Text.types'; import type { ForwardRefComponent } from '@fluentui/react-utilities'; +import { useCustomStyleHooks_unstable } from '@fluentui/react-shared-contexts'; /** * Typography and styling abstraction component used to ensure consistency of text. @@ -13,6 +14,9 @@ export const Text: ForwardRefComponent = React.forwardRef((props, ref useTextStyles_unstable(state); + const { useTextStyles_unstable: useCustomStyles } = useCustomStyleHooks_unstable(); + useCustomStyles(state); + return renderText_unstable(state); // Work around some small mismatches in inferred types which don't matter in practice }) as ForwardRefComponent; From 0acfa70871880aef6206322980237134130bb369 Mon Sep 17 00:00:00 2001 From: "Geoff Cox (Microsoft)" Date: Tue, 7 Mar 2023 11:20:45 -0800 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: Makoto Morimoto --- ...luentui-react-text-4ec8a8d0-658f-4318-9259-eb36057dbf99.json | 2 +- packages/react-components/react-text/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/change/@fluentui-react-text-4ec8a8d0-658f-4318-9259-eb36057dbf99.json b/change/@fluentui-react-text-4ec8a8d0-658f-4318-9259-eb36057dbf99.json index 6644e7a1365d3..8fa5f8d88243a 100644 --- a/change/@fluentui-react-text-4ec8a8d0-658f-4318-9259-eb36057dbf99.json +++ b/change/@fluentui-react-text-4ec8a8d0-658f-4318-9259-eb36057dbf99.json @@ -1,6 +1,6 @@ { "type": "minor", - "comment": "feat: custom styles", + "comment": "feat: Adding calls to custom style hooks derived from context.", "packageName": "@fluentui/react-text", "email": "gcox@microsoft.com", "dependentChangeType": "patch" diff --git a/packages/react-components/react-text/package.json b/packages/react-components/react-text/package.json index f4071195b09fa..6b91319366520 100644 --- a/packages/react-components/react-text/package.json +++ b/packages/react-components/react-text/package.json @@ -32,10 +32,10 @@ "@fluentui/scripts-tasks": "*" }, "dependencies": { - "@griffel/react": "^1.5.2", "@fluentui/react-shared-contexts": "^9.2.0", "@fluentui/react-theme": "^9.1.5", "@fluentui/react-utilities": "^9.6.0", + "@griffel/react": "^1.5.2", "tslib": "^2.1.0" }, "peerDependencies": { From 36478a9bb983e8646850575985fb1442336fffe5 Mon Sep 17 00:00:00 2001 From: GeoffCoxMSFT Date: Tue, 14 Mar 2023 09:36:00 -0700 Subject: [PATCH 3/3] syncpack fix --- packages/react-components/react-text/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-components/react-text/package.json b/packages/react-components/react-text/package.json index 1473ad06c744f..20a609c4b6383 100644 --- a/packages/react-components/react-text/package.json +++ b/packages/react-components/react-text/package.json @@ -32,7 +32,7 @@ "@fluentui/scripts-tasks": "*" }, "dependencies": { - "@fluentui/react-shared-contexts": "^9.2.0", + "@fluentui/react-shared-contexts": "^9.3.0", "@fluentui/react-theme": "^9.1.5", "@griffel/react": "^1.5.2", "@fluentui/react-utilities": "^9.7.0",