Merge pull request #4740 from withspectrum/2.7.5

2.7.5

Author: brianlovin

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.7.4",
+  "version": "2.7.5",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "@babel/preset-flow": "^7.0.0",

src/components/composer/index.js

@@ -97,6 +97,7 @@ type Props = {
   isInbox: boolean,
   websocketConnection: string,
   networkOnline: boolean,
+  isEditing: boolean,
 };
 
 const LS_BODY_KEY = 'last-plaintext-thread-composer-body';
@@ -600,6 +601,7 @@ class ComposerWithData extends Component<Props, State> {
       networkOnline,
       websocketConnection,
       isSlider,
+      isEditing,
     } = this.props;
     const dataExists = user && availableCommunities && availableChannels;
 
@@ -666,6 +668,7 @@ class ComposerWithData extends Component<Props, State> {
             autoFocus={!threadSliderIsOpen}
             bodyRef={ref => (this.bodyEditor = ref)}
             onKeyDown={this.handleKeyPress}
+            isEditing={isEditing}
           />
 
           {networkDisabled && (

src/components/composer/inputs.js

@@ -26,6 +26,7 @@ type Props = {
   autoFocus?: boolean,
   bodyRef?: Function,
   onKeyDown?: Function,
+  isEditing: boolean,
 };
 
 export default (props: Props) => {
@@ -41,10 +42,11 @@ export default (props: Props) => {
     changeTitle,
     bodyRef,
     onKeyDown,
+    isEditing,
   } = props;
 
   return (
-    <InputsGrid>
+    <InputsGrid isEditing={isEditing}>
       <SegmentedControl
         css={{
           margin: '0',

src/components/composer/style.js

@@ -299,4 +299,10 @@ export const InputsGrid = styled.div`
   grid-area: body;
   overflow: hidden;
   overflow-y: scroll;
+
+  ${props =>
+    props.isEditing &&
+    css`
+      height: 100%;
+    `}
 `;

src/views/communityLogin/index.js

@@ -35,8 +35,12 @@ type Props = {
   redirectPath: ?string,
 };
 
-export class Login extends React.Component<Props> {
-  redirectPath = null;
+type State = {
+  redirectPath: ?string,
+};
+
+export class Login extends React.Component<Props, State> {
+  state = { redirectPath: null };
 
   escape = () => {
     this.props.history.push(`/${this.props.match.params.communitySlug}`);
@@ -46,15 +50,15 @@ export class Login extends React.Component<Props> {
     const { location, redirectPath } = this.props;
 
     if (redirectPath) {
-      this.redirectPath = redirectPath;
+      this.setState({ redirectPath });
     }
 
     if (location && !redirectPath) {
       const searchObj = queryString.parse(this.props.location.search);
-      this.redirectPath = searchObj.r;
+      this.setState({ redirectPath: searchObj.r });
     }
 
-    track(events.LOGIN_PAGE_VIEWED, { redirectPath: this.redirectPath });
+    track(events.LOGIN_PAGE_VIEWED, { redirectPath: this.state.redirectPath });
   }
 
   render() {
@@ -63,6 +67,7 @@ export class Login extends React.Component<Props> {
       isLoading,
       match,
     } = this.props;
+    const { redirectPath } = this.state;
 
     if (community && community.id) {
       const { brandedLogin } = community;
@@ -89,8 +94,7 @@ export class Login extends React.Component<Props> {
 
             <LoginButtonSet
               redirectPath={
-                this.redirectPath ||
-                `${CLIENT_URL}/${match.params.communitySlug}`
+                redirectPath || `${CLIENT_URL}/${match.params.communitySlug}`
               }
               signinType={'signin'}
             />

src/views/thread/components/threadDetail.js

@@ -356,6 +356,7 @@ class ThreadDetailPure extends React.Component<Props, State> {
               changeBody={this.changeBody}
               changeTitle={this.changeTitle}
               onKeyDown={this.handleKeyPress}
+              isEditing={isEditing}
             />
           ) : (
             <React.Fragment>

src/views/thread/container.js

@@ -550,7 +550,7 @@ class ThreadContainer extends React.Component<Props, State> {
               />
 
               <Content innerRef={this.setMessagesContainer}>
-                <Detail type={slider ? '' : 'only'}>
+                <Detail isEditing={isEditing} is type={slider ? '' : 'only'}>
                   {this.renderPost()}
 
                   {!isEditing && (

src/views/thread/style.js

@@ -98,13 +98,15 @@ export const Input = styled(FlexRow)`
 `;
 
 export const Detail = styled(Column)`
-  flex: 1 0 auto;
+  min-width: 100%;
   margin: 0;
-  height: 100%;
-  max-width: 100%;
-  max-height: 100%;
-  position: relative;
-  overflow-y: scroll;
+
+  ${props =>
+    props.isEditing &&
+    css`
+      height: 100%;
+      overflow-y: scroll;
+    `}
 `;
 
 export const ChatInputWrapper = styled(FlexCol)`