schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2025-01-30 23:25:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #602 from orangemug/fix/issue-565

Browse source 
Update react-collapse
This commit is contained in:
pathmapper 2020-01-19 08:54:28 +01:00 committed by GitHub
commit fb49a3abe5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
package-lock.json generated
View file

@ -9070,12 +9070,9 @@
} }
}, },
"react-collapse": { "react-collapse": {
"version": "4.0.3", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/react-collapse/-/react-collapse-4.0.3.tgz", "resolved": "https://registry.npmjs.org/react-collapse/-/react-collapse-5.0.1.tgz",
"integrity": "sha512-OO4NhtEqFtz+1ma31J1B7+ezdRnzHCZiTGSSd/Pxoks9hxrZYhzFEddeYt05A/1477xTtdrwo7xEa2FLJyWGCQ==", "integrity": "sha512-cN2tkxBWizhPQ2JHfe0aUSJtmMthKA17NZkTElpiQ2snQAAi1hssXZ2fv88rAPNNvG5ss4t0PbOZT0TIl9Lk3Q=="
"requires": {
"prop-types": "^15.5.8"
}
}, },
"react-color": { "react-color": {
"version": "2.17.3", "version": "2.17.3",

2
package.json
View file

@ -48,7 +48,7 @@
"react-aria-modal": "^4.0.0", "react-aria-modal": "^4.0.0",
"react-autobind": "^1.0.6", "react-autobind": "^1.0.6",
"react-autocomplete": "^1.8.1", "react-autocomplete": "^1.8.1",
"react-collapse": "^4.0.3", "react-collapse": "^5.0.1",
"react-color": "^2.17.3", "react-color": "^2.17.3",
"react-dom": "^16.10.2", "react-dom": "^16.10.2",
"react-file-reader-input": "^2.0.0", "react-file-reader-input": "^2.0.0",

11
src/components/layers/JSONEditor.jsx
View file

@ -105,17 +105,6 @@ class JSONEditor extends React.Component {
} }
render() { render() {
const codeMirrorOptions = {
mode: {name: "javascript", json: true},
tabSize: 2,
theme: 'maputnik',
viewportMargin: Infinity,
lineNumbers: true,
lint: true,
gutters: ["CodeMirror-lint-markers"],
scrollbarStyle: "null",
}
const style = {}; const style = {};
if (this.props.maxHeight) { if (this.props.maxHeight) {
style.maxHeight = this.props.maxHeight; style.maxHeight = this.props.maxHeight;

4
src/styles/_react-collapse.scss
View file

@ -7,3 +7,7 @@
flex: 1; flex: 1;
} }
} }
.ReactCollapse--collapse {
transition: height 180ms;
}