Azure
diff --git a/‎packages/calling-component-bindings/review/beta/calling-component-bindings.api.md‎
Lines changed: 1 addition & 2 deletions b/‎packages/calling-component-bindings/review/beta/calling-component-bindings.api.md‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎packages/calling-component-bindings/src/handlers/createCommonHandlers.ts‎
Lines changed: 3 additions & 6 deletions b/‎packages/calling-component-bindings/src/handlers/createCommonHandlers.ts‎
Lines changed: 3 additions & 6 deletions
diff --git a/‎packages/communication-react/review/beta/communication-react.api.md‎
Lines changed: 49 additions & 5 deletions b/‎packages/communication-react/review/beta/communication-react.api.md‎
Lines changed: 49 additions & 5 deletions
diff --git a/‎packages/communication-react/src/index.ts‎
Lines changed: 2 additions & 0 deletions b/‎packages/communication-react/src/index.ts‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎packages/react-components/review/beta/react-components.api.md‎
Lines changed: 13 additions & 1 deletion b/‎packages/react-components/review/beta/react-components.api.md‎
Lines changed: 13 additions & 1 deletion
diff --git a/‎packages/react-components/src/components/index.ts‎
Lines changed: 0 additions & 1 deletion b/‎packages/react-components/src/components/index.ts‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎packages/react-components/src/types/SurveyIssues.ts‎
Lines changed: 1 addition & 1 deletion b/‎packages/react-components/src/types/SurveyIssues.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/react-components/src/types/SurveyIssuesHeadingStrings.ts‎
Lines changed: 1 addition & 1 deletion b/‎packages/react-components/src/types/SurveyIssuesHeadingStrings.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/react-composites/review/beta/react-composites.api.md‎
Lines changed: 37 additions & 3 deletions b/‎packages/react-composites/review/beta/react-composites.api.md‎
Lines changed: 37 additions & 3 deletions
diff --git a/‎packages/react-composites/src/composites/CallComposite/CallComposite.tsx‎
Lines changed: 40 additions & 0 deletions b/‎packages/react-composites/src/composites/CallComposite/CallComposite.tsx‎
Lines changed: 40 additions & 0 deletions
@@ -49,7 +49,6 @@ import { ScreenShareButton } from '@internal/react-components';
 import { StartCallOptions } from '@azure/communication-calling';
 import { StatefulCallClient } from '@internal/calling-stateful-client';
 import { StatefulDeviceManager } from '@internal/calling-stateful-client';
-import { SubmitSurveyOptions } from '@azure/communication-calling';
 import { TeamsCall } from '@azure/communication-calling';
 import { TeamsCallAgent } from '@azure/communication-calling';
 import { VideoDeviceInfo } from '@azure/communication-calling';
@@ -205,7 +204,7 @@ export interface CommonCallingHandlers {
     // (undocumented)
     onStopScreenShare: () => Promise<void>;
     // (undocumented)
-    onSubmitSurvey(survey: CallSurvey, options?: SubmitSurveyOptions): Promise<CallSurveyResponse | undefined>;
+    onSubmitSurvey(survey: CallSurvey): Promise<CallSurveyResponse | undefined>;
     // (undocumented)
     onToggleCamera: (options?: VideoStreamOptions) => Promise<void>;
     // (undocumented)
 
@@ -13,7 +13,7 @@ import {
   BackgroundReplacementConfig
 } from '@azure/communication-calling';
 /* @conditional-compile-remove(end-of-call-survey) */
-import { CallSurvey, SubmitSurveyOptions, CallSurveyResponse } from '@azure/communication-calling';
+import { CallSurvey, CallSurveyResponse } from '@azure/communication-calling';
 /* @conditional-compile-remove(dialpad) */ /* @conditional-compile-remove(PSTN-calls) */
 import { DtmfTone, AddPhoneNumberOptions } from '@azure/communication-calling';
 /* @conditional-compile-remove(teams-identity-support) */
@@ -99,7 +99,7 @@ export interface CommonCallingHandlers {
   /* @conditional-compile-remove(close-captions) */
   onSetCaptionLanguage: (language: string) => Promise<void>;
   /* @conditional-compile-remove(end-of-call-survey) */
-  onSubmitSurvey(survey: CallSurvey, options?: SubmitSurveyOptions): Promise<CallSurveyResponse | undefined>;
+  onSubmitSurvey(survey: CallSurvey): Promise<CallSurveyResponse | undefined>;
 }
 
 /**
@@ -561,10 +561,7 @@ export const createDefaultCommonCallingHandlers = memoizeOne(
       await captionsFeature.setCaptionLanguage(language);
     };
     /* @conditional-compile-remove(end-of-call-survey) */
-    const onSubmitSurvey = async (
-      survey: CallSurvey,
-      options?: SubmitSurveyOptions
-    ): Promise<CallSurveyResponse | undefined> =>
+    const onSubmitSurvey = async (survey: CallSurvey): Promise<CallSurveyResponse | undefined> =>
       await call?.feature(Features.CallSurvey).submitSurvey(survey, options);
 
     return {
 
@@ -83,7 +83,6 @@ import { ScalingMode } from '@azure/communication-calling';
 import { SendMessageOptions } from '@azure/communication-chat';
 import { StartCallOptions } from '@azure/communication-calling';
 import { StartCaptionsOptions } from '@azure/communication-calling';
-import { SubmitSurveyOptions } from '@azure/communication-calling';
 import { SyntheticEvent } from 'react';
 import { TeamsCall } from '@azure/communication-calling';
 import { TeamsCallAgent } from '@azure/communication-calling';
@@ -362,7 +361,7 @@ export interface CallAdapterCallOperations {
     stopScreenShare(): Promise<void>;
     stopVideoBackgroundEffects(): Promise<void>;
     // @beta
-    submitSurvey(survey: CallSurvey, options?: SubmitSurveyOptions): Promise<CallSurveyResponse | undefined>;
+    submitSurvey(survey: CallSurvey): Promise<CallSurveyResponse | undefined>;
     unmute(): Promise<void>;
     updateBackgroundPickerImages(backgroundImages: VideoBackgroundImage[]): void;
     updateSelectedVideoBackgroundEffect(selectedVideoBackground: VideoBackgroundEffect): void;
@@ -603,6 +602,15 @@ export type CallCompositeOptions = {
     galleryOptions?: {
         layout?: VideoGalleryLayout;
     };
+    surveyOptions?: {
+        hideSurvey?: boolean;
+        onSurveySubmitted?: (callId: string, surveyId: string,
+        submittedSurvey: CallSurvey,
+        improvementSuggestions: {
+            category: 'audio' | 'video' | 'screenshare';
+            suggestion: string;
+        }[]) => Promise<void>;
+    };
     branding?: {
         logo?: {
             url: string;
@@ -753,11 +761,26 @@ export interface CallCompositeStrings {
     selectedPeopleButtonLabel: string;
     soundLabel: string;
     spokenLanguageStrings?: SpokenLanguageStrings;
+    starRatingAriaLabel: string;
+    starSurveyFiveStarText: string;
+    starSurveyFourStarText: string;
+    starSurveyHelperText: string;
+    starSurveyOneStarText: string;
+    starSurveyThreeStarText: string;
+    starSurveyTwoStarText: string;
     startCallButtonLabel: string;
     startCaptionsButtonOffLabel?: string;
     startCaptionsButtonOnLabel?: string;
     startCaptionsButtonTooltipOffContent?: string;
     startCaptionsButtonTooltipOnContent?: string;
+    surveyCancelButtonAriaLabel: string;
+    surveyCategories: SurveyCategories;
+    surveyConfirmButtonLabel: string;
+    surveyIssues: SurveyIssues;
+    surveyQuestion: string;
+    surveyTextboxDefaultText: string;
+    tagsSurveyHelperText: string;
+    tagsSurveyQuestion: string;
     threeParticipantJoinedNoticeString: string;
     threeParticipantLeftNoticeString: string;
     transferPageNoticeString: string;
@@ -983,7 +1006,7 @@ export interface CallWithChatAdapterManagement {
     stopScreenShare(): Promise<void>;
     stopVideoBackgroundEffects(): Promise<void>;
     // @beta
-    submitSurvey(survey: CallSurvey, options?: SubmitSurveyOptions): Promise<CallSurveyResponse | undefined>;
+    submitSurvey(survey: CallSurvey): Promise<CallSurveyResponse | undefined>;
     unmute(): Promise<void>;
     updateBackgroundPickerImages(backgroundImages: VideoBackgroundImage[]): void;
     // @beta (undocumented)
@@ -1213,6 +1236,15 @@ export type CallWithChatCompositeOptions = {
     galleryOptions?: {
         layout?: VideoGalleryLayout;
     };
+    surveyOptions?: {
+        hideSurvey?: boolean;
+        onSurveySubmitted?: (callId: string, surveyId: string,
+        submittedSurvey: CallSurvey,
+        improvementSuggestions: {
+            category: 'audio' | 'video' | 'screenshare';
+            suggestion: string;
+        }[]) => Promise<void>;
+    };
     branding?: {
         logo?: {
             url: string;
@@ -1866,7 +1898,7 @@ export interface CommonCallingHandlers {
     // (undocumented)
     onStopScreenShare: () => Promise<void>;
     // (undocumented)
-    onSubmitSurvey(survey: CallSurvey, options?: SubmitSurveyOptions): Promise<CallSurveyResponse | undefined>;
+    onSubmitSurvey(survey: CallSurvey): Promise<CallSurveyResponse | undefined>;
     // (undocumented)
     onToggleCamera: (options?: VideoStreamOptions) => Promise<void>;
     // (undocumented)
@@ -3862,7 +3894,19 @@ export interface StreamMediaProps {
     videoStreamElement: HTMLElement | null;
 }
 
-// @public
+// @beta
+export interface SurveyCategories {
+    // (undocumented)
+    audioRating: string;
+    // (undocumented)
+    overallRating: string;
+    // (undocumented)
+    screenshareRating: string;
+    // (undocumented)
+    videoRating: string;
+}
+
+// @beta
 export interface SurveyIssues {
     // (undocumented)
     audioRating: {
 
@@ -378,3 +378,5 @@ export type {
 export type { SpokenLanguageStrings, CaptionLanguageStrings } from '../../react-components/src';
 /* @conditional-compile-remove(end-of-call-survey) */
 export type { SurveyIssues } from '../../react-components/src';
+/* @conditional-compile-remove(end-of-call-survey) */
+export type { SurveyCategories } from '../../react-components/src';
@@ -2185,7 +2185,19 @@ export interface StreamMediaProps {
     videoStreamElement: HTMLElement | null;
 }
 
-// @public
+// @beta
+export interface SurveyCategories {
+    // (undocumented)
+    audioRating: string;
+    // (undocumented)
+    overallRating: string;
+    // (undocumented)
+    screenshareRating: string;
+    // (undocumented)
+    videoRating: string;
+}
+
+// @beta
 export interface SurveyIssues {
     // (undocumented)
     audioRating: {
 
@@ -213,7 +213,6 @@ export * from './Survey/SurveyTypes';
 export { _TagsSurvey } from './Survey/TagsSurvey/TagsSurvey';
 /* @conditional-compile-remove(end-of-call-survey) */
 export type { _TagsSurveyProps, _TagsSurveyStrings, _IssueCategory, _SurveyTag } from './Survey/TagsSurvey/TagsSurvey';
-
 /* @conditional-compile-remove(PSTN-calls) */
 export { HoldButton } from './HoldButton';
 /* @conditional-compile-remove(PSTN-calls) */
 
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 /**
- * @public
+ * @beta
  * Corresponding texts to each call issue
  */
 export interface SurveyIssues {
 
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 /**
- * @public
+ * @beta
  * Corresponding texts to each call issue category
  */
 export interface SurveyIssuesHeadingStrings {
 
@@ -60,7 +60,8 @@ import { StartCallOptions } from '@azure/communication-calling';
 import { StartCaptionsOptions } from '@azure/communication-calling';
 import { StatefulCallClient } from '@internal/calling-stateful-client';
 import { StatefulChatClient } from '@internal/chat-stateful-client';
-import { SubmitSurveyOptions } from '@azure/communication-calling';
+import { SurveyCategories } from '@internal/react-components';
+import { SurveyIssues } from '@internal/react-components';
 import { TeamsCall } from '@azure/communication-calling';
 import { TeamsCallAgent } from '@azure/communication-calling';
 import { TeamsMeetingLinkLocator } from '@azure/communication-calling';
@@ -225,7 +226,7 @@ export interface CallAdapterCallOperations {
     stopScreenShare(): Promise<void>;
     stopVideoBackgroundEffects(): Promise<void>;
     // @beta
-    submitSurvey(survey: CallSurvey, options?: SubmitSurveyOptions): Promise<CallSurveyResponse | undefined>;
+    submitSurvey(survey: CallSurvey): Promise<CallSurveyResponse | undefined>;
     unmute(): Promise<void>;
     updateBackgroundPickerImages(backgroundImages: VideoBackgroundImage[]): void;
     updateSelectedVideoBackgroundEffect(selectedVideoBackground: VideoBackgroundEffect): void;
@@ -417,6 +418,15 @@ export type CallCompositeOptions = {
     galleryOptions?: {
         layout?: VideoGalleryLayout;
     };
+    surveyOptions?: {
+        hideSurvey?: boolean;
+        onSurveySubmitted?: (callId: string, surveyId: string,
+        submittedSurvey: CallSurvey,
+        improvementSuggestions: {
+            category: 'audio' | 'video' | 'screenshare';
+            suggestion: string;
+        }[]) => Promise<void>;
+    };
     branding?: {
         logo?: {
             url: string;
@@ -567,11 +577,26 @@ export interface CallCompositeStrings {
     selectedPeopleButtonLabel: string;
     soundLabel: string;
     spokenLanguageStrings?: SpokenLanguageStrings;
+    starRatingAriaLabel: string;
+    starSurveyFiveStarText: string;
+    starSurveyFourStarText: string;
+    starSurveyHelperText: string;
+    starSurveyOneStarText: string;
+    starSurveyThreeStarText: string;
+    starSurveyTwoStarText: string;
     startCallButtonLabel: string;
     startCaptionsButtonOffLabel?: string;
     startCaptionsButtonOnLabel?: string;
     startCaptionsButtonTooltipOffContent?: string;
     startCaptionsButtonTooltipOnContent?: string;
+    surveyCancelButtonAriaLabel: string;
+    surveyCategories: SurveyCategories;
+    surveyConfirmButtonLabel: string;
+    surveyIssues: SurveyIssues;
+    surveyQuestion: string;
+    surveyTextboxDefaultText: string;
+    tagsSurveyHelperText: string;
+    tagsSurveyQuestion: string;
     threeParticipantJoinedNoticeString: string;
     threeParticipantLeftNoticeString: string;
     transferPageNoticeString: string;
@@ -691,7 +716,7 @@ export interface CallWithChatAdapterManagement {
     stopScreenShare(): Promise<void>;
     stopVideoBackgroundEffects(): Promise<void>;
     // @beta
-    submitSurvey(survey: CallSurvey, options?: SubmitSurveyOptions): Promise<CallSurveyResponse | undefined>;
+    submitSurvey(survey: CallSurvey): Promise<CallSurveyResponse | undefined>;
     unmute(): Promise<void>;
     updateBackgroundPickerImages(backgroundImages: VideoBackgroundImage[]): void;
     // @beta (undocumented)
@@ -921,6 +946,15 @@ export type CallWithChatCompositeOptions = {
     galleryOptions?: {
         layout?: VideoGalleryLayout;
     };
+    surveyOptions?: {
+        hideSurvey?: boolean;
+        onSurveySubmitted?: (callId: string, surveyId: string,
+        submittedSurvey: CallSurvey,
+        improvementSuggestions: {
+            category: 'audio' | 'video' | 'screenshare';
+            suggestion: string;
+        }[]) => Promise<void>;
+    };
     branding?: {
         logo?: {
             url: string;
 
@@ -32,6 +32,8 @@ import { useId } from '@fluentui/react-hooks';
 import { HoldPage } from './pages/HoldPage';
 /* @conditional-compile-remove(unsupported-browser) */
 import { UnsupportedBrowserPage } from './pages/UnsupportedBrowser';
+/* @conditional-compile-remove(end-of-call-survey) */
+import { CallSurvey } from '@azure/communication-calling';
 import { PermissionConstraints } from '@azure/communication-calling';
 /* @conditional-compile-remove(rooms) */
 import { ParticipantRole } from '@azure/communication-calling';
@@ -232,6 +234,42 @@ export type CallCompositeOptions = {
      */
     layout?: VideoGalleryLayout;
   };
+  /* @conditional-compile-remove(end-of-call-survey) */
+  /**
+   * Options for end of call survey
+   */
+  surveyOptions?: {
+    /**
+     * Hide call survey at the end of a call.
+     * @defaultValue false
+     */
+    hideSurvey?: boolean;
+    /**
+     * Optional callback to handle survey data including free form text response
+     * Note that free form text response survey option is only going to be enabled when this callback is provided
+     * User will need to handle all free form text response on their own
+     */
+    onSurveySubmitted?: (
+      callId: string,
+      surveyId: string,
+      /**
+       * This is the survey results containing star survey data and API tag survey data.
+       * This part of the result will always be send to calling sdk
+       * This callback provides user with the ability to gain access to survey data
+       */
+      submittedSurvey: CallSurvey,
+      /**
+       * This is the survey results containing free form text
+       * This part of the result will not be handled by composites
+       * User will need to collect and handle this information 100% on their own
+       * Free form text survey is not going to show in the UI if onSurveySubmitted is not populated
+       */
+      improvementSuggestions: {
+        category: 'audio' | 'video' | 'screenshare';
+        suggestion: string;
+      }[]
+    ) => Promise<void>;
+  };
   /* @conditional-compile-remove(custom-branding) */
   /**
    * Options for setting additional customizations related to personalized branding.
@@ -452,6 +490,8 @@ const MainScreen = (props: MainScreenProps): JSX.Element => {
           moreDetails={moreDetails}
           dataUiId={'left-call-page'}
           disableStartCallButton={disableStartCallButton}
+          /* @conditional-compile-remove(end-of-call-survey) */
+          surveyOptions={props.options?.surveyOptions}
         />
       );
       break;