Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migration to material-ui-pickers 2.x #17

Merged
merged 4 commits into from
Jan 21, 2019
+158 −111
Merged

migration to material-ui-pickers 2.x #17

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61aa22f
migration to material-ui-pickers 2.x
vascofg Nov 27, 2018
017896a
fix unbound function
vascofg Jan 21, 2019
657ae8f
bump dependecy versions
vascofg Jan 21, 2019
54e4857
eslint fixes
vascofg Jan 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@ var _raCore = require('ra-core');

var _materialUiPickers = require('material-ui-pickers');

var _dateFnsUtils = require('material-ui-pickers/utils/date-fns-utils');
var _dateFns = require('@date-io/date-fns');

var _dateFnsUtils2 = _interopRequireDefault(_dateFnsUtils);

var _MuiPickersUtilsProvider = require('material-ui-pickers/utils/MuiPickersUtilsProvider');

var _MuiPickersUtilsProvider2 = _interopRequireDefault(_MuiPickersUtilsProvider);
var _dateFns2 = _interopRequireDefault(_dateFns);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

Expand Down Expand Up @@ -76,7 +72,7 @@ var makePicker = function makePicker(PickerComponent) {
'div',
{ className: 'picker' },
_react2.default.createElement(
_MuiPickersUtilsProvider2.default,
_materialUiPickers.MuiPickersUtilsProvider,
providerOptions,
_react2.default.createElement(PickerComponent, _extends({}, options, {
label: _react2.default.createElement(_raCore.FieldTitle, {
Expand All @@ -93,9 +89,7 @@ var makePicker = function makePicker(PickerComponent) {
},
className: className,
value: input.value ? input.value : null,
onChange: function onChange(date) {
return _this2.onChange(date);
}
onChange: this.onChange
}))
)
);
Expand Down Expand Up @@ -132,7 +126,7 @@ var makePicker = function makePicker(PickerComponent) {
labelTime: '',
className: '',
providerOptions: {
utils: _dateFnsUtils2.default,
utils: _dateFns2.default,
locale: undefined
}
};
Expand Down
186 changes: 109 additions & 77 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-admin-date-inputs",
"version": "1.0.21",
"version": "1.1.0",
"description": "react-admin-date-inputs",
"main": "lib/index.js",
"author": "vascofg",
Expand Down Expand Up @@ -49,7 +49,8 @@
"react-admin": "^2.1.0"
},
"dependencies": {
"date-fns": "2.0.0-alpha.16",
"material-ui-pickers": "1.0.0-rc.17"
"@date-io/date-fns": "0.0.2",
"date-fns": "2.0.0-alpha.25",
"material-ui-pickers": "^2.0.2"
}
}
7 changes: 3 additions & 4 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { addField, FieldTitle } from 'ra-core';
import { DatePicker, TimePicker, DateTimePicker } from 'material-ui-pickers';
import DateFnsUtils from 'material-ui-pickers/utils/date-fns-utils';
import MuiPickersUtilsProvider from 'material-ui-pickers/utils/MuiPickersUtilsProvider';
import { DatePicker, TimePicker, DateTimePicker, MuiPickersUtilsProvider } from 'material-ui-pickers';
import DateFnsUtils from '@date-io/date-fns';

const makePicker = (PickerComponent) => {
class _makePicker extends Component {
Expand Down Expand Up @@ -44,7 +43,7 @@ const makePicker = (PickerComponent) => {
ref={(node) => { this.picker = node; }}
className={className}
value={input.value ? input.value : null}
onChange={date => this.onChange(date)}
onChange={this.onChange}
/>
</MuiPickersUtilsProvider>
</div>
Expand Down