mirror of
https://github.com/gosticks/react-bootstrap-table2.git
synced 2026-05-13 06:44:32 +00:00
fixed wrong conflict fixs for #514
This commit is contained in:
@@ -3,8 +3,8 @@ import React from 'react';
|
||||
import { Consumer } from './context';
|
||||
import createEditingCell from './editing-cell';
|
||||
|
||||
export default (_) => {
|
||||
const EditingCell = createEditingCell(_);
|
||||
export default (_, onStartEdit) => {
|
||||
const EditingCell = createEditingCell(_, onStartEdit);
|
||||
const renderWithEditingCell = (props, cellEdit) => {
|
||||
const content = _.get(props.row, props.column.dataField);
|
||||
let editCellstyle = props.column.editCellStyle || {};
|
||||
|
||||
Reference in New Issue
Block a user