Merge pull request #537 from MetaCell/release/2.0.0

Release 2.0.0
MetaCell · May 20, 2024 · 89141e5 · 89141e5
2 parents 2ff28c7 + 0d0d64f
commit 89141e5
Show file tree

Hide file tree

Showing 24 changed files with 14,456 additions and 105,759 deletions.
diff --git a/geppetto-showcase/src/App.js b/geppetto-showcase/src/App.js
@@ -22,8 +22,6 @@ export default class App extends Component {
         type: 'dark',
         primary: { main: orange[500] },
         secondary: { main: blue[500] },
-        button: { main: '#fc6320' },
-        toolbarBackground: { main: 'rgb(0,0,0,0.5)' },
       },
       overrides: {
         MuiListItemIcon: {

diff --git a/geppetto-showcase/src/components/showcase/Code.jsx b/geppetto-showcase/src/components/showcase/Code.jsx
@@ -15,7 +15,7 @@ const styles = theme => ({
   button: {
     padding: theme.spacing(1),
     top: theme.spacing(0),
-    color: theme.palette.button.main,
+    color: theme.palette.primary,
   },
   code: {
     paddingTop: theme.spacing(0),

diff --git a/geppetto-showcase/src/examples/3d-canvas/SimpleInstancesExample.js b/geppetto-showcase/src/examples/3d-canvas/SimpleInstancesExample.js
@@ -69,7 +69,7 @@ class SimpleInstancesExample extends Component {
         baseZoom: 1,
         cameraControls: {
           instance: CameraControls,
-          props: { wireframeButtonEnabled: false },
+          props: { wireframeButtonEnabled: false, buttonStyles: { color: '#ff0000', } },
         },
         initialFlip: ['y', 'z'],
         reset: false,
@@ -128,7 +128,7 @@ class SimpleInstancesExample extends Component {
     const captureOptions = {
       captureControls: {
         instance: CaptureControls,
-        props: {}
+        props: { buttonStyles: { color: '#0000ff', } }
       },
       recorderOptions: {
         mediaRecorderOptions: { mimeType: 'video/webm', },

diff --git a/geppetto-showcase/src/examples/connectivity-viewer/ConnectivityShowcaseForce.js b/geppetto-showcase/src/examples/connectivity-viewer/ConnectivityShowcaseForce.js
@@ -30,37 +30,48 @@ class ConnectivityShowcaseForce extends Component {
     )[0].getId();
   }
 
-  matrixHandler = () => {
-    console.warn('Mock call to SceneController')
-    console.trace()
-  }
+    matrixHandler = () => {
+      console.warn('Mock call to SceneController')
+      console.trace()
+    }
 
-  render () {
-    const data = Instances[0];
-    const layout = new Force();
-    const colors = ['#cb0000', '#003398'];
-    const names = ['pyramidals_48', 'baskets_12'];
-    const { classes } = this.props;
+    render () {
+      const data = Instances[0];
+      const layout = new Force();
+      const colors = ['#cb0000', '#003398'];
+      const themeColor = '#145365'
+      const names = ['pyramidals_48', 'baskets_12'];
+      const { classes } = this.props;
 
-    return (
-      <div className={classes.connectivity}>
-        <ConnectivityComponent
-          id="ConnectivityContainerForce"
-          data={data}
-          colors={colors}
-          names={names}
-          layout={layout}
-          modelFactory={ModelFactory}
-          resources={Resources}
-          matrixOnClickHandler={this.matrixHandler}
-          nodeType={null}
-          linkWeight={null}
-          linkType={this.linkType}
-          library={null}
-        />
-      </div>
-    );
-  }
+      return (
+        <div className={classes.connectivity}>
+          <ConnectivityComponent
+            id="ConnectivityContainerForce"
+            data={data}
+            colors={colors}
+            names={names}
+            layout={layout}
+            modelFactory={ModelFactory}
+            resources={Resources}
+            matrixOnClickHandler={this.matrixHandler}
+            nodeType={null}
+            linkWeight={null}
+            linkType={this.linkType}
+            library={null}
+            toolbarOptions={{
+              menuButtonStyles: { color: themeColor, },
+              deckStyles: { color: themeColor },
+              innerDivStyles: { backgroundColor: 'rgb(0,0,0,0);' },
+              buttonStyles: {
+                padding: 8,
+                top: 0,
+                color: themeColor
+              }
+            }}
+          />
+        </div>
+      );
+    }
 }
 
 export default withStyles(styles)(ConnectivityShowcaseForce);