react-ace
Advanced tools
Comparing version 9.2.1 to 9.3.0
@@ -1,1 +0,1 @@ | ||
{"processes":{"61195e77-4c3d-40d1-8ec5-6607b587ef0d":{"parent":null,"children":["be9a5a60-5ce5-4ecf-98e2-9db73268a264"]},"be9a5a60-5ce5-4ecf-98e2-9db73268a264":{"parent":"61195e77-4c3d-40d1-8ec5-6607b587ef0d","children":[]}},"files":{},"externalIds":{}} | ||
{"processes":{"754842a4-ab01-42a6-98b2-d14a4280789d":{"parent":"d07c8f54-4ab1-4e78-b981-9d6d64b75785","children":[]},"d07c8f54-4ab1-4e78-b981-9d6d64b75785":{"parent":null,"children":["754842a4-ab01-42a6-98b2-d14a4280789d"]}},"files":{},"externalIds":{}} |
@@ -86,4 +86,4 @@ # Ace Editor | ||
| commands | | Array | new commands to add to the editor | | ||
| annotations | | Array | annotations to show in the editor i.e. `[{ row: 0, column: 2, type: 'error', text: 'Some error.'}]`, displayed in the gutter | | ||
| annotations | | Array | annotations to show in the editor i.e. `[{ row: 0, column: 2, type: 'error', text: 'Some error.'}]`, displayed in the gutter.(type:'error','info','warning') | | ||
| markers | | Array | [markers](https://ace.c9.io/#nav=api&api=edit_session) to show in the editor, i.e. `[{ startRow: 0, startCol: 2, endRow: 1, endCol: 20, className: 'error-marker', type: 'background' }]`. Make sure to define the class (eg. ".error-marker") and set `position: absolute` for it. | | ||
| style | | Object | camelCased properties | |
@@ -71,3 +71,5 @@ "use strict"; | ||
} | ||
this.editor.getSession().setMode("ace/mode/" + mode); | ||
this.editor | ||
.getSession() | ||
.setMode(typeof mode === "string" ? "ace/mode/" + mode : mode); | ||
this.editor.setTheme("ace/theme/" + theme); | ||
@@ -182,3 +184,7 @@ this.editor.setFontSize(typeof fontSize === "number" ? fontSize + "px" : fontSize); | ||
if (nextProps.mode !== oldProps.mode) { | ||
this.editor.getSession().setMode("ace/mode/" + nextProps.mode); | ||
this.editor | ||
.getSession() | ||
.setMode(typeof nextProps.mode === "string" | ||
? "ace/mode/" + nextProps.mode | ||
: nextProps.mode); | ||
} | ||
@@ -357,3 +363,3 @@ if (nextProps.theme !== oldProps.theme) { | ||
ReactAce.propTypes = { | ||
mode: PropTypes.string, | ||
mode: PropTypes.oneOfType([PropTypes.string, PropTypes.object]), | ||
focus: PropTypes.bool, | ||
@@ -360,0 +366,0 @@ theme: PropTypes.string, |
@@ -122,3 +122,3 @@ import { Ace } from "ace-builds"; | ||
text: string; | ||
type: string; | ||
type: "error" | "info" | "warning"; | ||
} | ||
@@ -125,0 +125,0 @@ interface IRenderer extends Ace.VirtualRenderer { |
{ | ||
"name": "react-ace", | ||
"version": "9.2.1", | ||
"version": "9.3.0", | ||
"description": "A react component for Ace Editor", | ||
@@ -42,3 +42,3 @@ "main": "lib/index.js", | ||
"@types/react": "^16.8.18", | ||
"@types/react-dom": "^16.8.4", | ||
"@types/react-dom": "^17.0.0", | ||
"@types/sinon": "^9.0.0", | ||
@@ -67,5 +67,5 @@ "babel-eslint": "^10.0.1", | ||
"rimraf": "3.0.2", | ||
"sinon": "9.0.2", | ||
"sinon": "9.2.4", | ||
"ts-loader": "^8.0.2", | ||
"ts-node": "^8.2.0", | ||
"ts-node": "^9.1.1", | ||
"tslint": "^6.1.2", | ||
@@ -72,0 +72,0 @@ "tslint-react": "^5.0.0", |
@@ -128,3 +128,3 @@ import { Ace } from "ace-builds"; | ||
text: string; | ||
type: string; | ||
type: "error" | "info" | "warning"; | ||
} | ||
@@ -131,0 +131,0 @@ |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
1766866
8401