mc-react-structure-visualizer 0.2.0 → 0.4.0

package/README.md

@@ -1,74 +1,74 @@
-# React Materials Cloud Structure Visualizer
-
-A React component to visualize structures on the Materials Cloud platform.
-
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
-
-The page will reload when you make changes.\
-You may also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can't go back!**
-
-If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
-
-You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
-
-### Analyzing the Bundle Size
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
-
-### Making a Progressive Web App
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
-
-### Advanced Configuration
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
-
-### Deployment
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
-
-### `npm run build` fails to minify
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
+# React Materials Cloud Structure Visualizer
+
+A React component to visualize structures on the Materials Cloud platform.
+
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
+
+The page will reload when you make changes.\
+You may also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can't go back!**
+
+If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
+
+You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).
+
+### Code Splitting
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
+
+### Analyzing the Bundle Size
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
+
+### Making a Progressive Web App
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
+
+### Advanced Configuration
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
+
+### Deployment
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
+
+### `npm run build` fails to minify
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)

package/dist/ControlBox/index.css

@@ -1,25 +1,60 @@
 .control-box {
   position: relative;
   z-index: 1;
-  height: 95px;
-  width: 448px;
-  background: rgb(223, 226, 255);
+  height: 100px;
+  width: 450px;
+  background: rgb(250, 250, 250);
   text-align: center;
   border: 1px solid #999;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: start;
-  margin: 3px;
-  margin-top: -15px;
-  padding-top: 10px;
-  border-radius: 10px;
+  margin-top: -20px;
+  padding: 30px 10px 10px 10px;
+  border-radius: 5px;
+}
+
+.supercell-input {
+  width: 45px;
+  height: 25px;
+}
+
+/* Always show the small arrows (needed for Chrome) */
+.supercell-input::-webkit-inner-spin-button,
+.supercell-input::-webkit-outer-spin-button {
+  opacity: 1;
 }
 
 .control-box-row {
-  margin: 2px 5px;
+  margin: 5px 5px;
+  line-height: inherit;
 }
 
-.supercell-input {
-  width: 40px;
+.control-box-row label {
+  margin: 0px 5px;
+}
+
+.control-box-row button {
+  border-width: 1px;
+  border-style: outset;
+  border-color: rgb(0, 0, 0);
+  border-radius: 4px;
+  display: inline-flex;
+  align-items: center;
+  /* margin-top: -10px; */
+  margin: 0px 1px;
+  height: 25px;
+}
+
+.control-box-row button:hover {
+  background-color: rgb(222, 222, 222);
+}
+.control-box-row .option-checkbox {
+  margin: 0px 2px;
+}
+
+.control-box-row .camera-controls {
+  margin: 0px 30px;
+  display: inline;
 }

package/dist/ControlBox/index.js

@@ -54,13 +54,14 @@ var ControlBox = /*#__PURE__*/function (_React$Component) {
           key: index,
           className: "supercell-input",
           type: "number",
+          min: "1",
           value: _this2.props.viewerParams.supercell[index],
           onChange: function onChange(e) {
             return _this2.handleSupercellChange(index, e.target.value);
           }
         });
-      })), /*#__PURE__*/_react.default.createElement("div", {
-        className: "control-box-row"
+      }), /*#__PURE__*/_react.default.createElement("div", {
+        className: "camera-controls"
       }, /*#__PURE__*/_react.default.createElement("label", null, "Camera: "), /*#__PURE__*/_react.default.createElement("button", {
         onClick: function onClick() {
           return _this2.handleCameraEvent("x");
@@ -73,15 +74,17 @@ var ControlBox = /*#__PURE__*/function (_React$Component) {
         onClick: function onClick() {
           return _this2.handleCameraEvent("z");
         }
-      }, "z")), /*#__PURE__*/_react.default.createElement("div", {
+      }, "z"))), /*#__PURE__*/_react.default.createElement("div", {
         className: "control-box-row"
       }, /*#__PURE__*/_react.default.createElement("label", null, /*#__PURE__*/_react.default.createElement("input", {
+        className: "option-checkbox",
         type: "checkbox",
         checked: this.props.viewerParams.bonds,
         onChange: function onChange() {
           return _this2.handleOptionChange("bonds");
         }
       }), "Bonds"), /*#__PURE__*/_react.default.createElement("label", null, /*#__PURE__*/_react.default.createElement("input", {
+        className: "option-checkbox",
         type: "checkbox",
         checked: this.props.viewerParams.atomLabels,
         onChange: function onChange() {
@@ -89,6 +92,7 @@ var ControlBox = /*#__PURE__*/function (_React$Component) {
         },
         disabled: true
       }), "Atom Labels"), /*#__PURE__*/_react.default.createElement("label", null, /*#__PURE__*/_react.default.createElement("input", {
+        className: "option-checkbox",
         type: "checkbox",
         checked: this.props.viewerParams.packedCell,
         onChange: function onChange() {
@@ -96,6 +100,7 @@ var ControlBox = /*#__PURE__*/function (_React$Component) {
         },
         disabled: true
       }), "Packed Cell"), /*#__PURE__*/_react.default.createElement("label", null, /*#__PURE__*/_react.default.createElement("input", {
+        className: "option-checkbox",
         type: "checkbox",
         checked: this.props.viewerParams.spaceFilling,
         onChange: function onChange() {

package/dist/{3dmol → StructureWindow/3dmol}/Visualizer3dmol.js

@@ -48,6 +48,13 @@ var Visualizer3dmol = /*#__PURE__*/function (_React$Component) {
       this.viewer = $3Dmol.createViewer(this.divId, config);
       this.updateView();
     }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      if (prevProps.viewerParams != this.props.viewerParams || prevProps.cifText != this.props.cifText) {
+        this.updateView();
+      }
+    }
   }, {
     key: "updateView",
     value: function updateView() {
@@ -73,10 +80,6 @@ var Visualizer3dmol = /*#__PURE__*/function (_React$Component) {
       var sc = this.props.viewerParams.supercell;
       this.viewer.replicateUnitCell(sc[0], sc[1], sc[2], this.model);
       this.model.assignBonds();
-
-      // console.log(this.viewer.getView());
-      // this.viewer.setView([0.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.5, 0.5]);
-
       this.viewer.zoomTo();
       this.viewer.render();
     }
@@ -100,9 +103,6 @@ var Visualizer3dmol = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      if (this.viewer && this.model) {
-        this.updateView();
-      }
       return /*#__PURE__*/_react.default.createElement("div", {
         id: this.divId,
         className: "gldiv"

package/dist/StructureWindow/index.css

@@ -0,0 +1,33 @@
+.structure-window-outer {
+  position: relative;
+}
+
+.structure-window {
+  position: relative;
+  z-index: 2;
+  height: 370px;
+  width: 450px;
+  background: #f5fffa;
+  text-align: center;
+  border: 1px solid #999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 5px;
+}
+
+.disable-mouse {
+  pointer-events: none;
+}
+
+.mouse-disabled-note {
+  background-color: #fafafa;
+  border: 1px solid black;
+  color: #353434;
+  padding: 5px;
+  border-radius: 5px;
+  position: absolute;
+  top: 15px;
+  left: 170px;
+  z-index: 3;
+}

package/dist/StructureWindow/index.js

@@ -0,0 +1,56 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _Visualizer3dmol = _interopRequireDefault(require("./3dmol/Visualizer3dmol"));
+require("./index.css");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+var StructureWindow = /*#__PURE__*/function (_React$Component) {
+  _inherits(StructureWindow, _React$Component);
+  var _super = _createSuper(StructureWindow);
+  function StructureWindow(props) {
+    _classCallCheck(this, StructureWindow);
+    return _super.call(this, props);
+  }
+  _createClass(StructureWindow, [{
+    key: "render",
+    value: function render() {
+      var _this = this;
+      var swClassName = "structure-window";
+      if (!this.props.mouseEnabled) swClassName += " disable-mouse";
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: "structure-window-outer",
+        onClick: function onClick() {
+          return _this.props.setMouseEnabled();
+        }
+      }, /*#__PURE__*/_react.default.createElement("div", {
+        className: swClassName
+      }, /*#__PURE__*/_react.default.createElement(_Visualizer3dmol.default, {
+        ref: this.props.visualizerRef,
+        viewerParams: this.props.viewerParams,
+        cifText: this.props.cifText
+      })), !this.props.mouseEnabled && /*#__PURE__*/_react.default.createElement("div", {
+        className: "mouse-disabled-note"
+      }, "Click to interact!"));
+    }
+  }]);
+  return StructureWindow;
+}(_react.default.Component);
+var _default = StructureWindow;
+exports.default = _default;

package/dist/index.css

@@ -1,14 +1,3 @@
-.structure-window {
-  position: relative;
-  z-index: 2;
-  height: 350px;
-  width: 448px;
-  background: #f5fffa;
-  text-align: center;
-  border: 1px solid #999;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin: 3px;
-  border-radius: 10px;
+.structure-visualizer {
+  width: 450px;
 }

package/dist/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _ControlBox = _interopRequireDefault(require("./ControlBox"));
-var _Visualizer3dmol = _interopRequireDefault(require("./3dmol/Visualizer3dmol"));
+var _StructureWindow = _interopRequireDefault(require("./StructureWindow"));
 require("./index.css");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -35,21 +35,52 @@ var StructureVisualizer = /*#__PURE__*/function (_React$Component) {
     _this.state = {
       viewerParams: {
         supercell: [2, 2, 2],
-        orientation: "x",
         bonds: true,
         atomLabels: false,
         packedCell: false,
         vdwRadius: false
-      }
+      },
+      mouseEnabled: false
     };
 
     // use Ref to send events to the visualizer backend
     _this.visualizerRef = /*#__PURE__*/_react.default.createRef();
+
+    // Ref to detect click outside
+    _this.wrapperRef = /*#__PURE__*/_react.default.createRef();
+    _this.handleClickOutside = _this.handleClickOutside.bind(_assertThisInitialized(_this));
     _this.handleViewerParamChange = _this.handleViewerParamChange.bind(_assertThisInitialized(_this));
     _this.handleViewerEvent = _this.handleViewerEvent.bind(_assertThisInitialized(_this));
+    _this.setMouseEnabled = _this.setMouseEnabled.bind(_assertThisInitialized(_this));
     return _this;
   }
   _createClass(StructureVisualizer, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      document.addEventListener("mousedown", this.handleClickOutside);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      document.removeEventListener("mousedown", this.handleClickOutside);
+    }
+  }, {
+    key: "handleClickOutside",
+    value: function handleClickOutside(event) {
+      if (this.wrapperRef && !this.wrapperRef.current.contains(event.target)) {
+        this.setState({
+          mouseEnabled: false
+        });
+      }
+    }
+  }, {
+    key: "setMouseEnabled",
+    value: function setMouseEnabled() {
+      this.setState({
+        mouseEnabled: true
+      });
+    }
+  }, {
     key: "handleViewerParamChange",
     value: function handleViewerParamChange(param, value) {
       this.setState({
@@ -64,16 +95,16 @@ var StructureVisualizer = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      // console.log("CIF", this.props.cifText);
       return /*#__PURE__*/_react.default.createElement("div", {
+        ref: this.wrapperRef,
         className: "structure-visualizer"
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: "structure-window"
-      }, /*#__PURE__*/_react.default.createElement(_Visualizer3dmol.default, {
-        ref: this.visualizerRef,
+      }, /*#__PURE__*/_react.default.createElement(_StructureWindow.default, {
+        visualizerRef: this.visualizerRef,
         viewerParams: this.state.viewerParams,
-        cifText: this.props.cifText
-      })), /*#__PURE__*/_react.default.createElement(_ControlBox.default, {
+        cifText: this.props.cifText,
+        mouseEnabled: this.state.mouseEnabled,
+        setMouseEnabled: this.setMouseEnabled
+      }), /*#__PURE__*/_react.default.createElement(_ControlBox.default, {
         viewerParams: this.state.viewerParams,
         onViewerParamChange: this.handleViewerParamChange,
         onViewerEvent: this.handleViewerEvent

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mc-react-structure-visualizer",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "author": "Kristjan Eimre <kristjan.eimre@epfl.ch>",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -15,7 +15,9 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "3dmol": "^2.0.1",
+    "bootstrap": "^5.2.3",
     "react": "^18.2.0",
+    "react-bootstrap": "^2.7.1",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1",
     "web-vitals": "^2.1.4"

package/public/index.html

@@ -1,43 +1,43 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>

package/public/manifest.json

@@ -1,25 +1,25 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

package/public/robots.txt

@@ -1,3 +1,3 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

package/src/App.css

@@ -1,38 +1,38 @@
-/* .App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-} */
+/* .App {
+  text-align: center;
+}
+
+.App-logo {
+  height: 40vmin;
+  pointer-events: none;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  .App-logo {
+    animation: App-logo-spin infinite 20s linear;
+  }
+}
+
+.App-header {
+  background-color: #282c34;
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size: calc(10px + 2vmin);
+  color: white;
+}
+
+.App-link {
+  color: #61dafb;
+}
+
+@keyframes App-logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+} */

package/src/App.js

@@ -1,5 +1,9 @@
 import React, { useState, useEffect } from "react";
 
+// Note: Bootstrap is not really used.
+// Just the default css is loaded to test how the component works with bootstrap.
+import "bootstrap/dist/css/bootstrap.min.css";
+
 import "./App.css";
 import StructureVisualizer from "./StructureVisualizer";
 
@@ -13,8 +17,6 @@ async function fetchCif() {
   );
   const jsonAiiDACif = await responseAiiDACif.json();
 
-  console.log(jsonAiiDACif);
-
   return jsonAiiDACif.data.download.data;
 }
 

package/src/StructureVisualizer/ControlBox/index.css

@@ -1,25 +1,60 @@
 .control-box {
   position: relative;
   z-index: 1;
-  height: 95px;
-  width: 448px;
-  background: rgb(223, 226, 255);
+  height: 100px;
+  width: 450px;
+  background: rgb(250, 250, 250);
   text-align: center;
   border: 1px solid #999;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: start;
-  margin: 3px;
-  margin-top: -15px;
-  padding-top: 10px;
-  border-radius: 10px;
+  margin-top: -20px;
+  padding: 30px 10px 10px 10px;
+  border-radius: 5px;
+}
+
+.supercell-input {
+  width: 45px;
+  height: 25px;
+}
+
+/* Always show the small arrows (needed for Chrome) */
+.supercell-input::-webkit-inner-spin-button,
+.supercell-input::-webkit-outer-spin-button {
+  opacity: 1;
 }
 
 .control-box-row {
-  margin: 2px 5px;
+  margin: 5px 5px;
+  line-height: inherit;
 }
 
-.supercell-input {
-  width: 40px;
+.control-box-row label {
+  margin: 0px 5px;
+}
+
+.control-box-row button {
+  border-width: 1px;
+  border-style: outset;
+  border-color: rgb(0, 0, 0);
+  border-radius: 4px;
+  display: inline-flex;
+  align-items: center;
+  /* margin-top: -10px; */
+  margin: 0px 1px;
+  height: 25px;
+}
+
+.control-box-row button:hover {
+  background-color: rgb(222, 222, 222);
+}
+.control-box-row .option-checkbox {
+  margin: 0px 2px;
+}
+
+.control-box-row .camera-controls {
+  margin: 0px 30px;
+  display: inline;
 }

package/src/StructureVisualizer/ControlBox/index.js

@@ -31,22 +31,24 @@ class ControlBox extends React.Component {
               key={index}
               className="supercell-input"
               type="number"
+              min="1"
               value={this.props.viewerParams.supercell[index]}
               onChange={(e) =>
                 this.handleSupercellChange(index, e.target.value)
               }
             />
           ))}
-        </div>
-        <div className="control-box-row">
-          <label>Camera: </label>
-          <button onClick={() => this.handleCameraEvent("x")}>x</button>
-          <button onClick={() => this.handleCameraEvent("y")}>y</button>
-          <button onClick={() => this.handleCameraEvent("z")}>z</button>
+          <div className="camera-controls">
+            <label>Camera: </label>
+            <button onClick={() => this.handleCameraEvent("x")}>x</button>
+            <button onClick={() => this.handleCameraEvent("y")}>y</button>
+            <button onClick={() => this.handleCameraEvent("z")}>z</button>
+          </div>
         </div>
         <div className="control-box-row">
           <label>
             <input
+              className="option-checkbox"
               type="checkbox"
               checked={this.props.viewerParams.bonds}
               onChange={() => this.handleOptionChange("bonds")}
@@ -55,6 +57,7 @@ class ControlBox extends React.Component {
           </label>
           <label>
             <input
+              className="option-checkbox"
               type="checkbox"
               checked={this.props.viewerParams.atomLabels}
               onChange={() => this.handleOptionChange("atomLabels")}
@@ -64,6 +67,7 @@ class ControlBox extends React.Component {
           </label>
           <label>
             <input
+              className="option-checkbox"
               type="checkbox"
               checked={this.props.viewerParams.packedCell}
               onChange={() => this.handleOptionChange("packedCell")}
@@ -73,6 +77,7 @@ class ControlBox extends React.Component {
           </label>
           <label>
             <input
+              className="option-checkbox"
               type="checkbox"
               checked={this.props.viewerParams.spaceFilling}
               onChange={() => this.handleOptionChange("vdwRadius")}

package/src/StructureVisualizer/{3dmol → StructureWindow/3dmol}/Visualizer3dmol.js

@@ -23,6 +23,15 @@ class Visualizer3dmol extends React.Component {
     this.updateView();
   }
 
+  componentDidUpdate(prevProps) {
+    if (
+      prevProps.viewerParams != this.props.viewerParams ||
+      prevProps.cifText != this.props.cifText
+    ) {
+      this.updateView();
+    }
+  }
+
   updateView() {
     this.viewer.removeAllModels();
     this.model = this.viewer.addModel(this.props.cifText, "cif");
@@ -44,9 +53,6 @@ class Visualizer3dmol extends React.Component {
     this.viewer.replicateUnitCell(sc[0], sc[1], sc[2], this.model);
     this.model.assignBonds();
 
-    // console.log(this.viewer.getView());
-    // this.viewer.setView([0.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.5, 0.5]);
-
     this.viewer.zoomTo();
     this.viewer.render();
   }
@@ -68,9 +74,6 @@ class Visualizer3dmol extends React.Component {
   }
 
   render() {
-    if (this.viewer && this.model) {
-      this.updateView();
-    }
     return (
       <div id={this.divId} className="gldiv">
         No data!

package/src/StructureVisualizer/StructureWindow/index.css

@@ -0,0 +1,33 @@
+.structure-window-outer {
+  position: relative;
+}
+
+.structure-window {
+  position: relative;
+  z-index: 2;
+  height: 370px;
+  width: 450px;
+  background: #f5fffa;
+  text-align: center;
+  border: 1px solid #999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 5px;
+}
+
+.disable-mouse {
+  pointer-events: none;
+}
+
+.mouse-disabled-note {
+  background-color: #fafafa;
+  border: 1px solid black;
+  color: #353434;
+  padding: 5px;
+  border-radius: 5px;
+  position: absolute;
+  top: 15px;
+  left: 170px;
+  z-index: 3;
+}

package/src/StructureVisualizer/StructureWindow/index.js

@@ -0,0 +1,35 @@
+import React from "react";
+
+import Visualizer3dmol from "./3dmol/Visualizer3dmol";
+
+import "./index.css";
+
+class StructureWindow extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+
+  render() {
+    let swClassName = "structure-window";
+    if (!this.props.mouseEnabled) swClassName += " disable-mouse";
+    return (
+      <div
+        className="structure-window-outer"
+        onClick={() => this.props.setMouseEnabled()}
+      >
+        <div className={swClassName}>
+          <Visualizer3dmol
+            ref={this.props.visualizerRef}
+            viewerParams={this.props.viewerParams}
+            cifText={this.props.cifText}
+          />
+        </div>
+        {!this.props.mouseEnabled && (
+          <div className="mouse-disabled-note">Click to interact!</div>
+        )}
+      </div>
+    );
+  }
+}
+
+export default StructureWindow;

package/src/StructureVisualizer/index.css

@@ -1,14 +1,3 @@
-.structure-window {
-  position: relative;
-  z-index: 2;
-  height: 350px;
-  width: 448px;
-  background: #f5fffa;
-  text-align: center;
-  border: 1px solid #999;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin: 3px;
-  border-radius: 10px;
+.structure-visualizer {
+  width: 450px;
 }

package/src/StructureVisualizer/index.js

@@ -2,7 +2,7 @@ import React from "react";
 
 import ControlBox from "./ControlBox";
 
-import Visualizer3dmol from "./3dmol/Visualizer3dmol";
+import StructureWindow from "./StructureWindow";
 
 import "./index.css";
 
@@ -13,19 +13,42 @@ class StructureVisualizer extends React.Component {
     this.state = {
       viewerParams: {
         supercell: [2, 2, 2],
-        orientation: "x",
         bonds: true,
         atomLabels: false,
         packedCell: false,
         vdwRadius: false,
       },
+      mouseEnabled: false,
     };
 
     // use Ref to send events to the visualizer backend
     this.visualizerRef = React.createRef();
 
+    // Ref to detect click outside
+    this.wrapperRef = React.createRef();
+    this.handleClickOutside = this.handleClickOutside.bind(this);
+
     this.handleViewerParamChange = this.handleViewerParamChange.bind(this);
     this.handleViewerEvent = this.handleViewerEvent.bind(this);
+    this.setMouseEnabled = this.setMouseEnabled.bind(this);
+  }
+
+  componentDidMount() {
+    document.addEventListener("mousedown", this.handleClickOutside);
+  }
+
+  componentWillUnmount() {
+    document.removeEventListener("mousedown", this.handleClickOutside);
+  }
+
+  handleClickOutside(event) {
+    if (this.wrapperRef && !this.wrapperRef.current.contains(event.target)) {
+      this.setState({ mouseEnabled: false });
+    }
+  }
+
+  setMouseEnabled() {
+    this.setState({ mouseEnabled: true });
   }
 
   handleViewerParamChange(param, value) {
@@ -42,16 +65,15 @@ class StructureVisualizer extends React.Component {
   }
 
   render() {
-    // console.log("CIF", this.props.cifText);
     return (
-      <div className="structure-visualizer">
-        <div className="structure-window">
-          <Visualizer3dmol
-            ref={this.visualizerRef}
-            viewerParams={this.state.viewerParams}
-            cifText={this.props.cifText}
-          />
-        </div>
+      <div ref={this.wrapperRef} className="structure-visualizer">
+        <StructureWindow
+          visualizerRef={this.visualizerRef}
+          viewerParams={this.state.viewerParams}
+          cifText={this.props.cifText}
+          mouseEnabled={this.state.mouseEnabled}
+          setMouseEnabled={this.setMouseEnabled}
+        />
         <ControlBox
           viewerParams={this.state.viewerParams}
           onViewerParamChange={this.handleViewerParamChange}

package/src/index.css

@@ -1,13 +1,13 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
+}

package/src/index.js

@@ -1,17 +1,17 @@
-import React from 'react';
-import ReactDOM from 'react-dom/client';
-import './index.css';
-import App from './App';
-import reportWebVitals from './reportWebVitals';
-
-const root = ReactDOM.createRoot(document.getElementById('root'));
-root.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>
-);
-
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import './index.css';
+import App from './App';
+import reportWebVitals from './reportWebVitals';
+
+const root = ReactDOM.createRoot(document.getElementById('root'));
+root.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>
+);
+
+// If you want to start measuring performance in your app, pass a function
+// to log results (for example: reportWebVitals(console.log))
+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+reportWebVitals();

package/src/reportWebVitals.js

@@ -1,13 +1,13 @@
-const reportWebVitals = onPerfEntry => {
-  if (onPerfEntry && onPerfEntry instanceof Function) {
-    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
-      getCLS(onPerfEntry);
-      getFID(onPerfEntry);
-      getFCP(onPerfEntry);
-      getLCP(onPerfEntry);
-      getTTFB(onPerfEntry);
-    });
-  }
-};
-
-export default reportWebVitals;
+const reportWebVitals = onPerfEntry => {
+  if (onPerfEntry && onPerfEntry instanceof Function) {
+    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+      getCLS(onPerfEntry);
+      getFID(onPerfEntry);
+      getFCP(onPerfEntry);
+      getLCP(onPerfEntry);
+      getTTFB(onPerfEntry);
+    });
+  }
+};
+
+export default reportWebVitals;