reduced min rows in commit msg box to 2, improved placeholder msg

Author: telamonian

src/components/CommitBox.tsx

@@ -1,3 +1,5 @@
+import { ISettingRegistry } from '@jupyterlab/coreutils';
+
 import * as React from 'react';
 import TextareaAutosize from 'react-textarea-autosize';
 import { classes } from 'typestyle';
@@ -14,6 +16,7 @@ import {
 export interface ICommitBoxProps {
   hasFiles: boolean;
   commitFunc: (message: string) => Promise<void>;
+  settings: ISettingRegistry.ISettings;
 }
 
 export interface ICommitBoxState {
@@ -78,13 +81,9 @@ export class CommitBox extends React.Component<
         <TextareaAutosize
           className={classes(textInputStyle, stagedCommitMessageStyle)}
           disabled={!this.props.hasFiles}
-          minRows={3}
+          minRows={2}
           onChange={this.handleChange}
-          placeholder={
-            this.props.hasFiles
-              ? 'Input message to commit staged changes'
-              : 'Stage your changes before commit'
-          }
+          placeholder={this._placeholder()}
           value={this.state.value}
         />
         <input
@@ -100,4 +99,16 @@ export class CommitBox extends React.Component<
       </form>
     );
   }
+
+  protected _placeholder = (): string => {
+    if (this.props.settings.composite['simpleStaging']) {
+      return this.props.hasFiles
+        ? 'Input message to commit selected changes'
+        : 'Select changes to enable commit';
+    } else {
+      return this.props.hasFiles
+        ? 'Input message to commit staged changes'
+        : 'Stage your changes before commit';
+    }
+  };
 }

src/components/FileList.tsx

@@ -512,6 +512,7 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
           <CommitBox
             hasFiles={this.markedFiles.length > 0}
             commitFunc={this.commitAllMarkedFiles}
+            settings={this.props.settings}
           />
           <div>
             <GitStageSimple
@@ -531,6 +532,7 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
           <CommitBox
             hasFiles={this.props.stagedFiles.length > 0}
             commitFunc={this.commitAllStagedFiles}
+            settings={this.props.settings}
           />
           <div>
             <Staged />

src/style/BranchHeaderStyle.ts

@@ -96,7 +96,7 @@ export const stagedCommitButtonStyle = style({
   color: 'white',
   flex: '1 1 auto',
   fontSize: 'var(--jp-ui-font-size1)',
-  height: 'calc(3em + 9px)',
+  height: 'calc(2 * (1.25em - 1px))',
   padding: 'calc(var(--jp-code-padding) + 1px) 7px',
   width: '40px'
 });