diff --git a/packages/react-bootstrap-table2-editor/README.md b/packages/react-bootstrap-table2-editor/README.md index 55d6c1d..f5d98aa 100644 --- a/packages/react-bootstrap-table2-editor/README.md +++ b/packages/react-bootstrap-table2-editor/README.md @@ -132,7 +132,7 @@ const columns = [ if (typeof cell !== 'object') { dateObj = new Date(cell); } - return `${('0' + dateObj.getDate()).slice(-2)}/${('0' + (dateObj.getMonth() + 1)).slice(-2)}/${dateObj.getFullYear()}`; + return `${('0' + dateObj.getUTCDate()).slice(-2)}/${('0' + (dateObj.getUTCMonth() + 1)).slice(-2)}/${dateObj.getUTCFullYear()}`; }, editor: { type: Type.DATE @@ -173,16 +173,16 @@ If you feel above predefined editors are not satisfied to your requirement, you * `editorProps`: Some useful attributes you can use on DOM editor, like class, style etc. * `value`: Current cell value -* `row`: Current row data -* `column`: Current column definition -* `rowIndex`: Current row index +* `row`: Current row data +* `column`: Current column definition +* `rowIndex`: Current row index * `columnIndex`: Current column index > Note when implement a custom React editor component, this component should have a **getValue** function which return current value on editor > Note when you want to save value, you can call **editorProps.onUpdate** function -Following is a short example: +Following is a short example: ```js class QualityRanger extends React.Component { diff --git a/packages/react-bootstrap-table2-example/examples/cell-edit/date-editor-table.js b/packages/react-bootstrap-table2-example/examples/cell-edit/date-editor-table.js index d166c94..465970d 100644 --- a/packages/react-bootstrap-table2-example/examples/cell-edit/date-editor-table.js +++ b/packages/react-bootstrap-table2-example/examples/cell-edit/date-editor-table.js @@ -23,7 +23,7 @@ const columns = [{ if (typeof cell !== 'object') { dateObj = new Date(cell); } - return `${('0' + dateObj.getDate()).slice(-2)}/${('0' + (dateObj.getMonth() + 1)).slice(-2)}/${dateObj.getFullYear()}`; + return `${('0' + dateObj.getUTCDate()).slice(-2)}/${('0' + (dateObj.getUTCMonth() + 1)).slice(-2)}/${dateObj.getUTCFullYear()}`; }, editor: { type: Type.DATE @@ -48,7 +48,7 @@ const columns = [{ if (typeof cell !== 'object') { dateObj = new Date(cell); } - return \`$\{('0' + dateObj.getDate()).slice(-2)}/$\{('0' + (dateObj.getMonth() + 1)).slice(-2)}/$\{dateObj.getFullYear()}\`; + return \`$\{('0' + dateObj.getUTCDate()).slice(-2)}/$\{('0' + (dateObj.getUTCMonth() + 1)).slice(-2)}/$\{dateObj.getUTCFullYear()}\`; }, editor: { type: Type.DATE diff --git a/packages/react-bootstrap-table2-filter/src/components/date.js b/packages/react-bootstrap-table2-filter/src/components/date.js index 5a6b1aa..45717ae 100644 --- a/packages/react-bootstrap-table2-filter/src/components/date.js +++ b/packages/react-bootstrap-table2-filter/src/components/date.js @@ -18,7 +18,7 @@ const legalComparators = [ ]; function dateParser(d) { - return `${d.getFullYear()}-${('0' + (d.getMonth() + 1)).slice(-2)}-${('0' + d.getDate()).slice(-2)}`; + return `${d.getUTCFullYear()}-${('0' + (d.getUTCMonth() + 1)).slice(-2)}-${('0' + d.getUTCDate()).slice(-2)}`; } class DateFilter extends Component { diff --git a/packages/react-bootstrap-table2-filter/src/filter.js b/packages/react-bootstrap-table2-filter/src/filter.js index 07454c4..de61577 100644 --- a/packages/react-bootstrap-table2-filter/src/filter.js +++ b/packages/react-bootstrap-table2-filter/src/filter.js @@ -98,9 +98,9 @@ export const filterByDate = _ => ( customFilterValue ) => { if (!date || !comparator) return data; - const filterDate = date.getDate(); - const filterMonth = date.getMonth(); - const filterYear = date.getFullYear(); + const filterDate = date.getUTCDate(); + const filterMonth = date.getUTCMonth(); + const filterYear = date.getUTCFullYear(); return data.filter((row) => { let valid = true; @@ -114,9 +114,9 @@ export const filterByDate = _ => ( cell = new Date(cell); } - const targetDate = cell.getDate(); - const targetMonth = cell.getMonth(); - const targetYear = cell.getFullYear(); + const targetDate = cell.getUTCDate(); + const targetMonth = cell.getUTCMonth(); + const targetYear = cell.getUTCFullYear(); switch (comparator) {