Browse Source

tweaks and packages update

Alexander Rose 5 years ago
parent
commit
f7bca8682e
3 changed files with 589 additions and 64 deletions
  1. 576 53
      package-lock.json
  2. 9 9
      package.json
  3. 4 2
      src/structure-viewer/ui/controls.tsx

File diff suppressed because it is too large
+ 576 - 53
package-lock.json


+ 9 - 9
package.json

@@ -29,16 +29,16 @@
     "license": "MIT",
     "devDependencies": {
         "@types/argparse": "^1.0.36",
-        "@types/node": "^12.7.1",
+        "@types/node": "^12.7.2",
         "@types/node-fetch": "^2.5.0",
-        "@types/react": "^16.9.1",
-        "@types/react-dom": "^16.8.5",
-        "concurrently": "^4.1.1",
+        "@types/react": "^16.9.2",
+        "@types/react-dom": "^16.9.0",
+        "concurrently": "^4.1.2",
         "cpx": "^1.5.0",
         "css-loader": "^3.2.0",
         "extra-watch-webpack-plugin": "^1.0.3",
         "file-loader": "^4.2.0",
-        "molstar": "../molstar",
+        "molstar": "^0.2.6",
         "mini-css-extract-plugin": "^0.8.0",
         "node-fetch": "^2.6.0",
         "node-sass": "^4.12.0",
@@ -46,12 +46,12 @@
         "react": "^16.9.0",
         "react-dom": "^16.9.0",
         "resolve-url-loader": "^3.1.0",
-        "sass-loader": "^7.2.0",
+        "sass-loader": "^7.3.1",
         "style-loader": "^1.0.0",
-        "tslint": "^5.18.0",
+        "tslint": "^5.19.0",
         "typescript": "3.5.3",
-        "webpack": "^4.39.1",
-        "webpack-cli": "^3.3.6"
+        "webpack": "^4.39.2",
+        "webpack-cli": "^3.3.7"
     },
     "dependencies": {}
 }

+ 4 - 2
src/structure-viewer/ui/controls.tsx

@@ -8,7 +8,8 @@ import * as React from 'react';
 import { PluginUIComponent } from 'molstar/lib/mol-plugin/ui/base';
 import { PluginContextContainer } from 'molstar/lib/mol-plugin/ui/plugin';
 import { TransformUpdaterControl } from 'molstar/lib/mol-plugin/ui/state/update-transform';
-import { StructureToolsWrapper } from 'molstar/lib/mol-plugin/ui/controls';
+import { StructureSelectionControls } from 'molstar/lib/mol-plugin/ui/structure/selection';
+import { StructureRepresentationControls } from 'molstar/lib/mol-plugin/ui/structure/representation';
 import { StateElements } from '../helpers';
 import { Viewport, ViewportControls } from 'molstar/lib/mol-plugin/ui/viewport';
 import { BackgroundTaskProgress } from 'molstar/lib/mol-plugin/ui/task';
@@ -28,7 +29,8 @@ export class ControlsWrapper extends PluginUIComponent {
                 <GeneralSettings />
                 <StructureControls />
                 <TransformUpdaterControl nodeRef={StateElements.VolumeStreaming} header={{ name: 'Volume Controls', description: '' }} />
-                <StructureToolsWrapper />
+                <StructureSelectionControls />
+                <StructureRepresentationControls />
             </PluginContextContainer>
         </div>;
     }

Some files were not shown because too many files changed in this diff