Skip to content
Merged
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
4 changes: 3 additions & 1 deletion packages/ringcentral-widgets-demo/dev-server/Phone.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import UserGuide from 'ringcentral-integration/modules/UserGuide';
import { ModuleFactory } from 'ringcentral-integration/lib/di';
import RouterInteraction from 'ringcentral-widgets/modules/RouterInteraction';
import DialerUI from 'ringcentral-widgets/modules/DialerUI';
import ConferenceDialerUI from 'ringcentral-widgets/modules/ConferenceDialerUI';
import ProxyFrameOAuth from 'ringcentral-widgets/modules/ProxyFrameOAuth';

@ModuleFactory({
Expand Down Expand Up @@ -137,6 +138,7 @@ import ProxyFrameOAuth from 'ringcentral-widgets/modules/ProxyFrameOAuth';
{ provide: 'ContactSearch', useClass: ContactSearch },
{ provide: 'CallMonitor', useClass: CallMonitor },
{ provide: 'DialerUI', useClass: DialerUI },
{ provide: 'ConferenceDialerUI', useClass: ConferenceDialerUI },
{ provide: 'Feedback', useClass: Feedback },
{ provide: 'UserGuide', useClass: UserGuide },
{
Expand Down Expand Up @@ -318,7 +320,7 @@ export default class BasePhone extends RcModule {
webphone.onBeforeCallEnd((session) => {
const mergingPair = conferenceCall && conferenceCall.mergingPair;
if (session && mergingPair &&
(Object.values(mergingPair).indexOf(session.id) !== -1)
(Object.values(mergingPair).indexOf(session.id) !== -1)
) {
// close merging pair to close the merge call.
conferenceCall.closeMergingPair();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,18 @@ ConferenceCallDialerPanel.defaultProps = {
};

function mapToProps(_, {
phone: {
conferenceDialerUI,
...components
},
...props
}) {
const baseProps = mapToBaseProps(_, {
...props,
phone: {
...components,
dialerUI: conferenceDialerUI, // override
},
});
return {
...baseProps,
Expand All @@ -54,23 +62,28 @@ function mapToProps(_, {

function mapToFunctions(_, {
params,
phone,
phone: {
conferenceCall
conferenceCall,
conferenceDialerUI,
...components
},
onBack,
...props
}) {
const baseProps = mapToBaseFunctions(_, {
params,
phone,
...props,
phone: {
...components,
conferenceCall,
dialerUI: conferenceDialerUI, // override
},
});
return {
...baseProps,
onBack,
onCallButtonClick() {
phone.dialerUI.onCallButtonClick({
conferenceDialerUI.onCallButtonClick({
fromNumber: params.fromNumber,
beforeCall() {
const { fromSessionId } = params;
Expand Down

This file was deleted.

15 changes: 15 additions & 0 deletions packages/ringcentral-widgets/modules/ConferenceDialerUI/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Module } from 'ringcentral-integration/lib/di';
import DialerUI from '../DialerUI';

@Module()
export default class ConferenceDialerUI extends DialerUI {
constructor({
prefix,
...options
}) {
super({
...options,
prefix: `${prefix}-conf`,
});
}
}