Merge pull request #333 from openworm/feature/486

Feature/486
openworm · Sep 22, 2020 · 6dd04a0 · 6dd04a0
2 parents ea81a68 + 26e226c
commit 6dd04a0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/geppetto-ui/src/list-viewer/ListViewer.js b/geppetto-ui/src/list-viewer/ListViewer.js
@@ -348,7 +348,7 @@ export default class ListViewer extends React.Component {
       <div className="listviewer-container">
         <Filter />
         <Table />
-        <Pagination />
+        { this.props.showPagination === false ? null : <Pagination /> }
       </div>
     );
   }
@@ -379,7 +379,7 @@ export default class ListViewer extends React.Component {
       : {};
     const { events, ...others } = this.props;
     return (
-      <section className="listviewer">
+      <section className={ this.props.className ? this.props.className : "listviewer" }>
         <Griddle
           data={this.getData()}
           plugins={this.getPlugins()}
@@ -417,4 +417,8 @@ ListViewer.propTypes = {
    * Components passed in with a matching name will override the default in Griddle
    */
   customComponents: PropTypes.object,
+  /**
+   * Show Pagination button, used for changing pages
+   */
+  showPagination:  PropTypes.bool
 };
diff --git a/geppetto-ui/src/menu/MenuSection.js b/geppetto-ui/src/menu/MenuSection.js
@@ -142,11 +142,21 @@ class MenuSection extends React.Component {
           onMouseOver={this.handleOver}
           onMouseOut={this.handleOut}
         >
-          {this.props.button.icon !== '' ? (
-            <span style={{ display: 'inline-block', width: '25px' }}>
-              <i className={this.props.button.icon}></i>
-            </span>
-          ) : undefined}
+          { this.props.button.icon !== ""
+            ? this.props.button.caret
+              ? this.props.button.caret.show
+                ? <span style={ { color : this.props.button.activeColor } }>
+                  {this.props.button.icon ? this.props.button.icon : null}
+                  {this.props.menuOpen ? this.props.button.caret.closedIcon : this.props.button.caret.expandedIcon }
+                </span>
+                : <span style={{ display: "inline-block", color : this.props.button.activeColor }}>
+                  {this.props.button.icon ? this.props.button.icon : null}
+                </span>
+              : <span style={{ display: "inline-block", color : this.props.button.activeColor }}>
+                {this.props.button.icon ? this.props.button.icon : null}
+              </span>
+            : undefined
+          }
           {this.props.button.label}
         </Button>
         <MenuPopper