Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions Project/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,18 @@ ul {
font-size: 12px;
}

.ms-Toggle>label {
color: #c5c5c5;
font-weight: 400;
font-size: 12px;
}

div.push-notification-options[disabled],
div.ms-Checkbox.is-disabled>input[type="checkbox"]+label.ms-Checkbox-label>span.ms-Checkbox-text,
.ms-TextField-field:disabled,
.ms-TextField-field::placeholder,
.ms-TextField.is-disabled>.ms-TextField-wrapper>label,
.ms-Toggle.is-disabled>label,
div.ms-Checkbox.is-disabled>input[type="checkbox"]+label.ms-Checkbox-label>div.ms-Checkbox-checkbox>i.ms-Checkbox-checkmark {
color: #484644 !important;
}
Expand Down Expand Up @@ -457,6 +464,16 @@ div.ms-Checkbox>input[type="checkbox"]+label.ms-Checkbox-label>span.ms-Checkbox-
height: 100%;
}

.phonenumber-id-element {
display: table-cell;
margin: auto;
}

.phonenumber-id-container {
display: table;
margin: 0;
}

.remote-video-container video {
object-fit: cover !important;
object-position: center center;
Expand Down
28 changes: 22 additions & 6 deletions Project/src/MakeCall/MakeCall.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import {
PrimaryButton,
TextField,
MessageBar,
MessageBarType
MessageBarType,
Toggle
} from 'office-ui-fabric-react'
import { Icon } from '@fluentui/react/lib/Icon';
import IncomingCallCard from './IncomingCallCard';
Expand Down Expand Up @@ -274,6 +275,10 @@ export default class MakeCall extends React.Component {
callOptions.alternateCallerId = { phoneNumber: this.alternateCallerId.value.trim() };
}

if (this.callAgent.kind === CallAgentKind.CallAgent && this.hideCallerId.state?.checked === true) {
callOptions.privacyOptions = { hideCallerId: true };
}

if (identitiesToCall.length > 1) {
if (this.callAgent.kind === CallAgentKind.TeamsCallAgent && this.threadId?.value !== '') {
callOptions.threadId = this.threadId.value;
Expand Down Expand Up @@ -989,11 +994,22 @@ this.callAgent.on('incomingCall', async (args) => {
label="Destination Phone Identity or Phone Identities"
placeholder="4:+18881231234"
componentRef={(val) => this.destinationPhoneIds = val} />
<TextField
disabled={this.state.call || !this.state.loggedIn}
label="If calling a Phone Identity, your Alternate Caller Id must be specified."
placeholder="4:+18881231234"
componentRef={(val) => this.alternateCallerId = val} />
<div className="ms-Grid-row phonenumber-id-container">
<div className="ms-sm9 ms-md9 ms-lg8 phonenumber-id-element">
<TextField
disabled={this.state.call || !this.state.loggedIn}
label="If calling a Phone Identity, your Alternate Caller Id must be specified."
placeholder="4:+18881231234"
componentRef={(val) => this.alternateCallerId = val} />
</div>
<div className="ms-sm1 ms-md1 ms-lg1 phonenumber-id-element"/>
<div className="ms-sm2 ms-md2 ms-lg3 phonenumber-id-element">
<Toggle
disabled={this.state.call || !this.state.loggedIn}
label="Hide caller id"
componentRef={(val) => this.hideCallerId = val} />
</div>
</div>
</div>
</div>
<PrimaryButton
Expand Down