Skip to content

Move custom branding out of in-progress and into beta builds #3968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamesBurnside merged 4 commits into from
Jan 5, 2024
Merged

Move custom branding out of in-progress and into beta builds #3968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22b0ae5
Include ability to set background image and logo in CallComposites in…
JamesBurnside Jan 4, 2024
85ad77b
Change files
JamesBurnside Jan 4, 2024
aec4a8f
Duplicate change files for beta release
JamesBurnside Jan 4, 2024
068d541
Merge branch 'main' into jaburnsi/move-custom-branding-out-of-in-prog…
JamesBurnside Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions change-beta/@azure-communication-react-0228f556-3eeb-4eb0-a2bf-5c662038a560.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "prerelease",
"area": "feature",
"workstream": "Custom Branding",
"comment": "Include ability to set background image and logo in CallComposites in beta packages",
"packageName": "@azure/communication-react",
"email": "2684369+JamesBurnside@users.noreply.github.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions change/@azure-communication-react-0228f556-3eeb-4eb0-a2bf-5c662038a560.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "prerelease",
"area": "feature",
"workstream": "Custom Branding",
"comment": "Include ability to set background image and logo in CallComposites in beta packages",
"packageName": "@azure/communication-react",
"email": "2684369+JamesBurnside@users.noreply.github.com",
"dependentChangeType": "patch"
}
2 changes: 0 additions & 2 deletions common/config/babel/features.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ module.exports = {
"gallery-layout-composite",
// feature for hiding attendee name in the teams meeting
"hide-attendee-name",
// custom branding for the composites
"custom-branding",
// Feature for sounds during different calling events
"calling-sounds",
// Feature for end of call survey
Expand Down
18 changes: 10 additions & 8 deletions packages/storybook/stories/CallComposite/CallCompositeDocs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@ const callParticipantsLocatorSnippet = `

const customBrandingSnippet = `
<CallComposite options={{
logo: {
url: 'https://...',
alt: 'My company logo',
shape: 'circle'
},
backgroundImage: {
url: 'https://...'
branding: {
logo: {
url: 'https://...',
alt: 'My company logo',
shape: 'circle'
},
backgroundImage: {
url: 'https://...'
}
}
}} />
`;
Expand Down Expand Up @@ -190,7 +192,7 @@ export const Docs: () => JSX.Element = () => {
</div>

<Heading>Custom Branding</Heading>
<SingleLineBetaBanner version="1.12.0-beta.1" />
<SingleLineBetaBanner version="1.13.0-beta.1" />
<Description>
Along with applying a Fluent Theme to style the composites, you can also inject your own custom branding. You
can inject a background and logo into the Composite configuration page to present to your users. This is done by
Expand Down
18 changes: 10 additions & 8 deletions packages/storybook/stories/CallWithChatComposite/CallWithChatCompositeDocs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ options={{

const customBrandingSnippet = `
<CallWithChatComposite options={{
logo: {
url: 'https://...',
alt: 'My company logo',
shape: 'circle'
},
backgroundImage: {
url: 'https://...'
branding: {
logo: {
url: 'https://...',
alt: 'My company logo',
shape: 'circle'
},
backgroundImage: {
url: 'https://...'
}
}
}} />
`;
Expand Down Expand Up @@ -146,7 +148,7 @@ export const Docs: () => JSX.Element = () => {
</Description>

<Heading>Custom Branding</Heading>
<SingleLineBetaBanner version="1.12.0-beta.1" />
<SingleLineBetaBanner version="1.13.0-beta.1" />
<Description>
Along with applying a Fluent Theme to style the composites, you can also inject your own custom branding. You
can inject a background and logo into the Composite configuration page to present to your users. This is done by
Expand Down
⚡