From 1c8f55f82bfd8e2bdfa236d47ec69e2707ddc7b9 Mon Sep 17 00:00:00 2001 From: jduthon Date: Wed, 4 Oct 2017 15:12:58 +0200 Subject: [PATCH 1/4] Fix: Octicons dependency should take care of the indirection in Octicons.js --- src/components/FormIconField.js | 5 +++-- src/components/Glyph.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/FormIconField.js b/src/components/FormIconField.js index 46809c5..15bc9b3 100644 --- a/src/components/FormIconField.js +++ b/src/components/FormIconField.js @@ -5,8 +5,9 @@ const classNames = require('classnames'); const FormField = require('./FormField'); const Spinner = require('./Spinner'); -const ICON_MAP = require('../Octicons').map; -const ICON_KEYS = require('../Octicons').keys; +const Octicons = require('../Octicons').Octicon; +const ICON_MAP = Octicons.map; +const ICON_KEYS = Octicons.keys; const COLOR_VARIANTS = ['danger', 'default', 'primary', 'success', 'warning']; export default React.createClass({ diff --git a/src/components/Glyph.js b/src/components/Glyph.js index 42cfbce..bca8bec 100644 --- a/src/components/Glyph.js +++ b/src/components/Glyph.js @@ -1,8 +1,9 @@ var React = require('react'); var classNames = require('classnames'); -var icons = require('../Octicons').map; -var validNames = require('../Octicons').keys; +const Octicons = require('../Octicons').Octicon; +const icons = Octicons.map; +const validNames = Octicons.keys; var Glyph = React.createClass({ displayName: 'Glyph', From b6525e11d20da58e19fe1e39d123a6399870901b Mon Sep 17 00:00:00 2001 From: jduthon Date: Wed, 4 Oct 2017 15:17:44 +0200 Subject: [PATCH 2/4] Fix: FormInput uses right attribute for its input --- src/components/FormInput.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/FormInput.js b/src/components/FormInput.js index 125713a..51d4989 100644 --- a/src/components/FormInput.js +++ b/src/components/FormInput.js @@ -42,7 +42,7 @@ export default React.createClass({ this.input.select(); }, getRef (ref) { - this.target = ref; + this.input = ref; if (this.props.innerRef) { this.props.innerRef(ref); From 6f2c4b96bd164f43bdbaf1982d2e2f73a66f0521 Mon Sep 17 00:00:00 2001 From: jduthon Date: Mon, 16 Oct 2017 15:23:58 +0200 Subject: [PATCH 3/4] Add build on postinstall so it works out from a git check out repo --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 5dcc64b..4e7a668 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "build:lib": "gulp build:lib", "bump": "gulp bump", "lint": "eslint .", + "install": "npm run build", "prepublish": "npm run build:lib", "publish:npm": "gulp publish:npm", "publish:site": "gulp publish:examples", From 33d2db2b20a5f100281909407eb9f8fb79840087 Mon Sep 17 00:00:00 2001 From: jduthon Date: Mon, 16 Oct 2017 15:44:35 +0200 Subject: [PATCH 4/4] Revert "Add build on postinstall so it works out from a git check out repo" This reverts commit 6f2c4b96bd164f43bdbaf1982d2e2f73a66f0521. --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 4e7a668..5dcc64b 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "build:lib": "gulp build:lib", "bump": "gulp bump", "lint": "eslint .", - "install": "npm run build", "prepublish": "npm run build:lib", "publish:npm": "gulp publish:npm", "publish:site": "gulp publish:examples",