Regression: Fix embedded layout (#13574)

closes #13526

client/routes/router.js

@@ -6,7 +6,6 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { Session } from 'meteor/session';
 import { KonchatNotification } from 'meteor/rocketchat:ui';
-import { Layout } from 'meteor/rocketchat:ui-utils';
 import s from 'underscore.string';
 
 Blaze.registerHelper('pathFor', function(path, kw) {
@@ -28,7 +27,7 @@ FlowRouter.subscriptions = function() {
 FlowRouter.route('/', {
 	name: 'index',
 	action() {
-		BlazeLayout.render('main', { modal: Layout.isEmbedded(), center: 'loading' });
+		BlazeLayout.render('main', { center: 'loading' });
 		if (!Meteor.userId()) {
 			return FlowRouter.go('home');
 		}

packages/rocketchat-ui-utils/client/lib/openRoom.js

@@ -5,7 +5,7 @@ import { Template } from 'meteor/templating';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { Session } from 'meteor/session';
-import { RoomManager, fireGlobalEvent, readMessage, RoomHistoryManager } from '..';
+import { Layout, RoomManager, fireGlobalEvent, readMessage, RoomHistoryManager } from '..';
 import { ChatSubscription, Rooms } from 'meteor/rocketchat:models';
 import { settings } from 'meteor/rocketchat:settings';
 import { callbacks } from 'meteor/rocketchat:callbacks';
@@ -41,6 +41,9 @@ function replaceCenterDomBy(dom) {
 	return mainNode;
 }
 
+const { render } = BlazeLayout;
+BlazeLayout.render = (layout, regions = {}) => render(layout, Object.assign(regions, { modal: Layout.isEmbedded() }));
+
 export const openRoom = function(type, name) {
 	Session.set('openedRoom', null);