From: David Yip <yipdw@member.fsf.org>
Date: Fri, 17 Nov 2017 06:11:01 +0000 (-0600)
Subject: Throw layout, isWide, navbarUnder back into mapStateToProps.
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=392945f9a35d86b4d8d61157d7fa17c073d47156;p=mastodon.git

Throw layout, isWide, navbarUnder back into mapStateToProps.

This gets wide view, auto layout, and navbar-under-mobile working again.
---

diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index fc51df163..345492577 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -54,6 +54,9 @@ const messages = defineMessages({
 const mapStateToProps = state => ({
   isComposing: state.getIn(['compose', 'is_composing']),
   hasComposingText: state.getIn(['compose', 'text']) !== '',
+  layout: state.getIn(['local_settings', 'layout']),
+  isWide: state.getIn(['local_settings', 'stretch']),
+  navbarUnder: state.getIn(['local_settings', 'navbar_under'])
 });
 
 const keyMap = {