Merge branch 'main' into carocao/RTTWork

carocao-msft · web-flow · commit 0f2ab34b45b1 · 2025-01-15T11:16:18.000-08:00
diff --git a/change-beta/@azure-communication-react-ac416b4b-9be8-49b1-8e61-31a89b90e73b.json b/change-beta/@azure-communication-react-ac416b4b-9be8-49b1-8e61-31a89b90e73b.json
@@ -0,0 +1,9 @@
+{
+  "type": "prerelease",
+  "area": "feature",
+  "workstream": "Real Time Text",
+  "comment": "Real Time Text component changes and strings",
+  "packageName": "@azure/communication-react",
+  "email": "96077406+carocao-msft@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-communication-react-e4791dc2-7f02-4b0d-9147-ca8b52f51701.json b/change/@azure-communication-react-e4791dc2-7f02-4b0d-9147-ca8b52f51701.json
diff --git a/packages/communication-react/review/beta/communication-react.api.md b/packages/communication-react/review/beta/communication-react.api.md
@@ -4634,6 +4634,17 @@ export type RealTimeTextInformation = {
     finalizedTimeStamp: Date;
 };
 
+// @beta
+export type RealTimeTextInformation = {
+    id: number;
+    displayName: string;
+    userId?: string;
+    message: string;
+    isTyping: boolean;
+    isMe: boolean;
+    finalizedTimeStamp: Date;
+};
+
 // @beta
 export const RealTimeTextModal: (props: RealTimeTextModalProps) => JSX.Element;
 
diff --git a/packages/react-components/src/components/CaptionsBanner.tsx b/packages/react-components/src/components/CaptionsBanner.tsx
@@ -331,7 +331,9 @@ export const CaptionsBanner = (props: CaptionsBannerProps): JSX.Element => {
         <FocusZone shouldFocusOnMount className={captionsContainerClassName} data-ui-id="captions-banner">
           {
             /* @conditional-compile-remove(rtt) */ isRealTimeTextOn && (
-              <_RTTDisclosureBanner strings={realTimeTextDisclosureBannerStrings} />
+              <div style={{ paddingTop: '0.5rem' }}>
+                <_RTTDisclosureBanner strings={realTimeTextDisclosureBannerStrings} />
+              </div>
             )
           }
           {(isCaptionsOn || /* @conditional-compile-remove(rtt) */ isRealTimeTextOn) && (

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,9 @@ export const CaptionsBanner = (props: CaptionsBannerProps): JSX.Element => {`
`331`	`331`	`<FocusZone shouldFocusOnMount className={captionsContainerClassName} data-ui-id="captions-banner">`
`332`	`332`	`{`
`333`	`333`	`/* @conditional-compile-remove(rtt) */ isRealTimeTextOn && (`
`334`		`- <_RTTDisclosureBanner strings={realTimeTextDisclosureBannerStrings} />`
	`334`	`+ <div style={{ paddingTop: '0.5rem' }}>`
	`335`	`+ <_RTTDisclosureBanner strings={realTimeTextDisclosureBannerStrings} />`
	`336`	`+ </div>`
`335`	`337`	`)`
`336`	`338`	`}`
`337`	`339`	`{(isCaptionsOn \|\| /* @conditional-compile-remove(rtt) */ isRealTimeTextOn) && (`