Browse Source

Merge branch 'master' into dev-sb-models

Sebastian Bittrich 3 years ago
parent
commit
d9c54cd5cc
5 changed files with 30 additions and 7380 deletions
  1. 4 0
      CHANGELOG.md
  2. 2 7356
      package-lock.json
  3. 22 22
      package.json
  4. 1 1
      src/viewer/index.ts
  5. 1 1
      src/viewer/ui/strucmotif.tsx

+ 4 - 0
CHANGELOG.md

@@ -2,6 +2,10 @@
 
 [Semantic Versioning](https://semver.org/)
 
+## [1.8.8] - 2021-09-28
+### General
+- Mol* 2.3.1
+
 ## [1.8.7] - 2021-08-25
 ### General
 - Mol* 2.2.3

File diff suppressed because it is too large
+ 2 - 7356
package-lock.json


+ 22 - 22
package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rcsb/rcsb-molstar",
-    "version": "1.8.7",
+    "version": "1.8.8",
     "description": "RCSB PDB apps and props based on Mol*.",
     "homepage": "https://github.com/rcsb/rcsb-molstar#readme",
     "repository": {
@@ -37,33 +37,33 @@
     "author": "RCSB PDB and Mol* Contributors",
     "license": "MIT",
     "devDependencies": {
-        "@types/react": "^17.0.2",
-        "@types/react-dom": "^17.0.0",
-        "@typescript-eslint/eslint-plugin": "^4.9.1",
-        "@typescript-eslint/parser": "^4.9.1",
+        "@types/react": "^17.0.20",
+        "@types/react-dom": "^17.0.9",
+        "@typescript-eslint/eslint-plugin": "^4.31.0",
+        "@typescript-eslint/parser": "^4.31.0",
         "buffer": "^6.0.3",
-        "concurrently": "^5.3.0",
-        "cpx2": "^3.0.0",
+        "concurrently": "^6.2.1",
+        "cpx2": "^3.0.2",
         "crypto-browserify": "^3.12.0",
-        "css-loader": "^5.0.1",
-        "eslint": "^7.15.0",
+        "css-loader": "^6.2.0",
+        "eslint": "^7.32.0",
         "extra-watch-webpack-plugin": "^1.0.3",
         "file-loader": "^6.2.0",
-        "fs-extra": "^9.0.1",
-        "mini-css-extract-plugin": "^1.3.2",
-        "molstar": "^2.2.3",
-        "node-sass": "^6.0.0",
+        "fs-extra": "^10.0.0",
+        "mini-css-extract-plugin": "^2.3.0",
+        "molstar": "^2.3.1",
+        "node-sass": "^6.0.1",
         "path-browserify": "^1.0.1",
         "raw-loader": "^4.0.2",
-        "react": "^17.0.1",
-        "react-dom": "^17.0.1",
-        "rxjs": "^6.6.6",
-        "sass-loader": "^11.1.1",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
+        "rxjs": "^7.3.0",
+        "sass-loader": "^12.1.0",
         "stream-browserify": "^3.0.0",
-        "style-loader": "^2.0.0",
-        "tslib": "^2.1.0",
-        "typescript": "^4.2.4",
-        "webpack": "^5.37.1",
-        "webpack-cli": "^4.7.0"
+        "style-loader": "^3.2.1",
+        "tslib": "^2.3.1",
+        "typescript": "^4.4.3",
+        "webpack": "^5.52.1",
+        "webpack-cli": "^4.8.0"
     }
 }

+ 1 - 1
src/viewer/index.ts

@@ -280,7 +280,7 @@ export class Viewer {
     }
 
     handleResize() {
-        this.plugin.layout.events.updated.next();
+        this.plugin.layout.events.updated.next(void 0);
     }
 
     exportLoadedStructures() {

+ 1 - 1
src/viewer/ui/strucmotif.tsx

@@ -285,7 +285,7 @@ class SubmitControls extends PurePluginUIComponent<{}, { isBusy: boolean, residu
         const history = this.plugin.managers.structure.selection.additionsHistory;
         return <div key={e.entry.id}>
             <div className='msp-flex-row'>
-                <Button noOverflow title='Click to focus. Hover to highlight.' onClick={() => this.focusLoci(e.entry.loci)} style={{ width: 'auto', textAlign: 'left' }} onMouseEnter={() => this.highlight(e.entry.loci)} onMouseLeave={this.plugin.managers.interactivity.lociHighlights.clearHighlights}>
+                <Button noOverflow title='Click to focus. Hover to highlight.' onClick={() => this.focusLoci(e.entry.loci)} style={{ width: 'auto', textAlign: 'left' }} onMouseEnter={() => this.highlight(e.entry.loci)} onMouseLeave={() => this.plugin.managers.interactivity.lociHighlights.clearHighlights()}>
                     {idx}. <span dangerouslySetInnerHTML={{ __html: e.entry.label }} />
                 </Button>
                 <ToggleButton icon={TuneSvg} className='msp-form-control' title='Define exchanges' toggle={() => this.toggleExchanges(idx)} isSelected={this.state.action === idx} disabled={this.state.isBusy} style={{ flex: '0 0 40px', padding: 0 }} />

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