fix(build): Fix lint issues and specs

This commit is contained in:
Juan Tejada 2016-05-11 15:33:52 -07:00
parent 72e86dde36
commit eacf54b4eb
8 changed files with 74 additions and 76 deletions

View file

@ -34,7 +34,7 @@
"quote-props": ["error", "consistent-as-needed", { "keywords": true }],
"no-param-reassign": ["error", { "props": false }],
"semi": "off",
"import/no-unresolved": ["error", {"ignore": ["nylas-exports", "nylas-component-kit", "electron", "nylas-store", "react-dom/server", "nylas-observables", "windows-shortcuts", "moment-round", "chrono-node", "event-kit"]}],
"import/no-unresolved": ["error", {"ignore": ["nylas-exports", "nylas-component-kit", "electron", "nylas-store", "react-dom/server", "nylas-observables", "windows-shortcuts", "moment-round", "chrono-node", "event-kit", "enzyme"]}],
"react/no-multi-comp": "off",
"react/prop-types": ["error", {"ignore": ["children"]}],
"react/sort-comp": "error"

View file

@ -148,21 +148,7 @@ export class EditableTableCell extends Component {
}
}
export default class EditableTable extends Component {
static displayName = 'EditableTable'
static propTypes = {
tableDataSource: SelectableTable.propTypes.tableDataSource,
inputProps: PropTypes.object,
InputRenderer: PropTypes.any,
onCellEdited: PropTypes.func.isRequired,
onAddColumn: PropTypes.func,
onRemoveColumn: PropTypes.func,
onAddRow: PropTypes.func,
onRemoveRow: PropTypes.func,
}
render() {
function EditableTable(props) {
const {
inputProps,
InputRenderer,
@ -172,7 +158,7 @@ export default class EditableTable extends Component {
onAddColumn,
onRemoveColumn,
...otherProps,
} = this.props
} = props
const tableProps = {
...otherProps,
@ -210,4 +196,18 @@ export default class EditableTable extends Component {
</div>
)
}
EditableTable.displayName = 'EditableTable'
EditableTable.propTypes = {
tableDataSource: SelectableTable.propTypes.tableDataSource,
inputProps: PropTypes.object,
InputRenderer: PropTypes.any,
onCellEdited: PropTypes.func.isRequired,
onAddColumn: PropTypes.func,
onRemoveColumn: PropTypes.func,
onAddRow: PropTypes.func,
onRemoveRow: PropTypes.func,
}
export default EditableTable

View file

@ -60,11 +60,10 @@ const TablePropTypes = {
}
export function TableCell(props) {
const {className, isHeader, children} = props;
const continuedProps = _.omit(props, "className", "isHeader", "children")
const {className, isHeader, children, ...extraProps} = props;
const CellTag = isHeader ? 'th' : 'td'
return (
<CellTag {...continuedProps} className={`table-cell ${className}`} >
<CellTag {...extraProps} className={`table-cell ${className}`} >
{children}
</CellTag>
)
@ -73,7 +72,6 @@ export function TableCell(props) {
TableCell.propTypes = {
isHeader: PropTypes.bool,
className: PropTypes.string,
children: PropTypes.children,
};
export class TableRow extends Component {

View file

@ -11,7 +11,7 @@ class NylasComponentKit
@loadFrom = (prop, path) ->
Object.defineProperty @prototype, prop,
get: ->
exported = NylasComponentKit.default(require "../components/#{path}")
exported = require "../components/#{path}"
return exported[prop]
@loadDeprecated = (prop, path, {instead} = {}) ->
@ -60,13 +60,13 @@ class NylasComponentKit
@load "DateInput", "date-input"
@load "DatePicker", "date-picker"
@load "TimePicker", "time-picker"
@loadFrom "Table", "table/table"
@load "Table", "table/table"
@loadFrom "TableRow", "table/table"
@loadFrom "TableCell", "table/table"
@loadFrom "SelectableTable", "selectable-table"
@load "SelectableTable", "selectable-table"
@loadFrom "SelectableTableRow", "selectable-table"
@loadFrom "SelectableTableCell", "selectable-table"
@loadFrom "EditableTable", "editable-table"
@load "EditableTable", "editable-table"
@loadFrom "EditableTableCell", "editable-table"
@load "LazyRenderedList", "lazy-rendered-list"

@ -1 +1 @@
Subproject commit 5ea51b035478ea2912257f3a57d876d3e0c335b9
Subproject commit 6e7135d50ed005e4b0e9a5ac54b8323ef031e0bd