Merge branch 'master' into feature/autocomplete-changes

Author: shockey

dist/swagger-editor-bundle.js

@@ -1,7 +1,7 @@
 {
   "name": "swagger-editor",
   "description": "Swagger Editor",
-  "version": "3.1.9",
+  "version": "3.1.10",
   "main": "dist/swagger-editor.js",
   "repository": "[email protected]:swagger-api/swagger-editor.git",
   "license": "Apache-2.0",
@@ -57,8 +57,8 @@
     "react-redux": "^4.x.x",
     "react-transition-group": "^1.1.1",
     "redux": "^3.x.x",
-    "swagger-client": "^3.1.2",
-    "swagger-ui": "^3.2.2",
+    "swagger-client": "^3.2.1",
+    "swagger-ui": "^3.3.1",
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {

dist/swagger-editor-bundle.js.map

@@ -12,6 +12,7 @@ import EditorAutosuggestSnippetsPlugin from "./plugins/editor-autosuggest-snippe
 import EditorAutosuggestKeywordsPlugin from "./plugins/editor-autosuggest-keywords"
 import EditorAutosuggestOAS3KeywordsPlugin from "./plugins/editor-autosuggest-oas3-keywords"
 import EditorAutosuggestRefsPlugin from "./plugins/editor-autosuggest-refs"
+import JumpToPathPlugin from "./plugins/jump-to-path"
 
 // eslint-disable-next-line no-undef
 const { GIT_DIRTY, GIT_COMMIT, PACKAGE_VERSION } = buildInfo
@@ -28,6 +29,7 @@ const plugins = {
   EditorAutosuggestKeywordsPlugin,
   EditorAutosuggestRefsPlugin,
   EditorAutosuggestOAS3KeywordsPlugin,
+  JumpToPathPlugin,
 }
 
 const defaults = {

dist/swagger-editor-standalone-preset.js

@@ -1,6 +1,5 @@
 import makeEditor from "./components/editor"
 import EditorContainer from "./components/editor-container"
-import JumpToPath from "./components/jump-to-path"
 import * as actions from "./actions"
 import reducers from "./reducers"
 import * as selectors from "./selectors"
@@ -11,7 +10,7 @@ let Editor = makeEditor({
 
 export default function () {
   return {
-    components: { Editor, EditorContainer, JumpToPath },
+    components: { Editor, EditorContainer },
     statePlugins: {
       editor: {
         reducers,

dist/swagger-editor-standalone-preset.js.map

@@ -1,32 +1,43 @@
 import React, { PropTypes } from "react"
 import JumpIcon from "./jump-icon.svg"
 
-export default class JumpToPath extends React.Component {
+export class JumpToPath extends React.Component {
   static propTypes = {
     editorActions: PropTypes.object.isRequired,
     specSelectors: PropTypes.object.isRequired,
     fn: PropTypes.object.isRequired,
     path: PropTypes.oneOfType([
       PropTypes.array,
       PropTypes.string
-    ]).isRequired,
+    ]),
     content: PropTypes.element,
-    showButton: PropTypes.bool
+    showButton: PropTypes.bool,
+    specPath: PropTypes.array, // The location within the spec. Used as a fallback if `path` doesn't exist
+  }
+
+  static defaultProps = {
+    path: "",
   }
 
   shouldComponentUpdate(nextProps) {
     let { shallowEqualKeys } = nextProps.fn
     return shallowEqualKeys(this.props, nextProps, [
-      "content", "showButton", "path"
+      "content", "showButton", "path", "specPath"
     ])
   }
 
   jumpToPath = (e) => {
     e.stopPropagation()
 
-    let { path, fn: { AST, transformPathToArray }, specSelectors: { specStr, specJson }, editorActions } = this.props
-    let line = AST.getLineNumberForPath(specStr(), typeof path === "string" ? transformPathToArray(path, specJson().toJS()) : path)
-    editorActions.jumpToLine(line)
+    const {
+      specPath=[],
+      path,
+      specSelectors,
+      editorActions
+    } = this.props
+
+    const jumpPath = specSelectors.bestJumpPath({path, specPath})
+    editorActions.jumpToLine(specSelectors.getSpecLineFromPath(jumpPath))
   }