Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
4 changes: 2 additions & 2 deletions examples/popup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import 'rmc-picker/assets/index.css';
import 'rmc-cascader/assets/index.less';
import 'rmc-picker/assets/popup.css';
import React from 'react';
import ReactDOM from 'react-dom';
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import PopupCascader from '../src/Popup';
import Cascader from '../src/Cascader';
import globalData from './data';
Expand Down
2 changes: 1 addition & 1 deletion examples/react-native/picker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import Cascader from '../../src/Cascader';
import { View, Text } from 'react-native';
import globalData from '../data';
import React from 'react';
import * as React from 'react';

export class PickerDemo extends React.Component<any, any> {
onChange = (value) => {
Expand Down
2 changes: 1 addition & 1 deletion examples/react-native/popup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/* tslint:disable:no-console */

import React from 'react';
import * as React from 'react';
import { View, Text, StyleSheet, TouchableHighlight } from 'react-native';
import PopupCascader from '../../src/Popup';
import globalData from '../data';
Expand Down
4 changes: 2 additions & 2 deletions examples/simple.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import 'rmc-picker/assets/index.css';
import 'rmc-cascader/assets/index.less';
import Cascader from '../src/Cascader';
import React from 'react';
import ReactDOM from 'react-dom';
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import globalData from './data';

class Demo extends React.Component<any, any> {
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
},
"devDependencies": {
"@types/mocha": "~2.2.32",
"@types/react": "^15.5.0",
"@types/react-dom": "^15.5.0",
"@types/react-native": "^0.46.9",
"@types/react": "^16.0.0",
"@types/react-dom": "^16.0.0",
"@types/react-native": "^0.55.0",
"create-react-class": "^15.6.0",
"expect.js": "0.3.x",
"fastclick": "^1.0.6",
Expand Down
2 changes: 1 addition & 1 deletion src/Cascader.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';
import arrayTreeFilter from 'array-tree-filter';
import MultiPicker from 'rmc-picker/lib/MultiPicker';
import Picker from 'rmc-picker/lib/Picker';
Expand Down
2 changes: 1 addition & 1 deletion src/Popup.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import * as React from 'react';
import PopupPicker from 'rmc-picker/lib/Popup';
import { IPopupPickerProps } from 'rmc-picker/lib/PopupPickerTypes';
import { ICascaderProps, CascaderValue } from './CascaderTypes';
Expand Down
6 changes: 3 additions & 3 deletions tests/popup.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import expect from 'expect.js';
import React from 'react';
import ReactDOM from 'react-dom';
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import createReactClass from 'create-react-class';
import TestUtils from 'react-dom/test-utils';
import * as TestUtils from 'react-dom/test-utils';
const Simulate = TestUtils.Simulate;
import Cascader from '../src/Cascader';
import PopCascader from '../src/Popup';
Expand Down
4 changes: 2 additions & 2 deletions tests/simple.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import expect from 'expect.js';
// tslint:disable-next-line
import React from 'react';
import ReactDOM from 'react-dom';
import * as React from 'react';
import * as ReactDOM from 'react-dom';
// const TestUtils = require('react-addons-test-utils');
// const Simulate = TestUtils.Simulate;

Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strictNullChecks": true,
"moduleResolution": "node",
"jsx": "react",
"allowSyntheticDefaultImports":true,
"target": "es6"
"target": "es6",
"skipLibCheck": true
}
}
30 changes: 0 additions & 30 deletions typings/custom.d.ts
Original file line number Diff line number Diff line change
@@ -1,39 +1,9 @@
declare module "rc-dialog" {
var Ret: any;
export default Ret;
}

declare module "react-hammerjs" {
var Ret: any;
export default Ret;
}

declare module "object-assign" {
var Ret: any;
export default Ret;
}

declare module "expect.js" {
var Ret: any;
export default Ret;
}

declare module "react-native-picker-android" {
var Ret: any;
export default Ret;
}

declare module "react-addons-test-utils" {
var Ret: any;
export default Ret;
}

declare module "array-tree-filter" {
var Ret: any;
export default Ret;
}

declare module "classnames" {
var Ret: any;
export default Ret;
}