Skip to content

Commit e0391d6

Browse files
author
aksonov
committed
eslint formatting, remove obsolete code
1 parent 66e713f commit e0391d6

18 files changed

+555
-1269
lines changed

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ module.exports = {
77
rules: {
88
'react/forbid-prop-types': 0,
99
'no-console': 0,
10+
'new-cap': 0,
11+
'no-underscore-dangle': 0,
12+
'no-use-before-define': 0,
13+
'max-len': ["error", 180],
1014
'import/no-unresolved': [
1115
2,
1216
{

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Change Log
2+
3+
## 4.0.0-beta.7
4+
5+
- Fix: Mobx enabled useStrict (#1994)
6+
- Improvement: Support Actions.popTo(sceneName) (#1987)
7+
- Fix: Support v3 syntax `panHandlers={null}` to disable gestures for back transition. You may also pass `gesturesEnabled={false}` (#2002)
8+
- Fix: Support for renderTitle, drawerImage, navigationBarTitleImage, navigationBarTitleImageStyle props for `Scene` (#1991)
9+
- Fix: Pass drawerPosition, drawerOptions, drawerWidth and other Scene params to react-navigation DrawerNavigator
10+
- Fix: Pass all container scene props to StackNavigator config
11+
- Fix: ESLint formatting
12+

dist/LightboxNavigator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Object.defineProperty(exports,"__esModule",{value:true});var _jsxFileName='src/L
22

33
var _react=require('react');var _react2=_interopRequireDefault(_react);
44
var _reactNavigation=require('react-navigation');
5-
var _reactNative=require('react-native');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _objectWithoutProperties(obj,keys){var target={};for(var i in obj){if(keys.indexOf(i)>=0)continue;if(!Object.prototype.hasOwnProperty.call(obj,i))continue;target[i]=obj[i];}return target;}
5+
var _reactNative=require('react-native');function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}
66

77
var LightboxNavigator=function LightboxNavigator(
88
routeConfigs)
@@ -15,7 +15,7 @@ router,
1515
routeConfigs,
1616
tabsConfig,
1717
'react-navigation/STACK')(
18-
function(_ref){var navigation=_ref.navigation,props=_objectWithoutProperties(_ref,['navigation']);var
18+
function(_ref){var navigation=_ref.navigation;var
1919
state=navigation.state,dispatch=navigation.dispatch;var
2020
routes=state.routes,index=state.index;
2121

dist/NavBar.js

Lines changed: 10 additions & 480 deletions
Large diffs are not rendered by default.

dist/Reducer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Object.defineProperty(exports,"__esModule",{value:true});exports.default=
22

3-
createReducer;var _navigationStore=require('./navigationStore');var _navigationStore2=_interopRequireDefault(_navigationStore);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function createReducer(params){
3+
createReducer;var _navigationStore=require('./navigationStore');var _navigationStore2=_interopRequireDefault(_navigationStore);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function createReducer(){
44
return function(state,action){return _navigationStore2.default._router.getStateForAction(action,state);};
55
}

dist/Router.js

Lines changed: 26 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Object.defineProperty(exports,"__esModule",{value:true});var _jsxFileName='src/Router.js';var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _react=require('react');var _react2=_interopRequireDefault(_react);
2-
var _mobx=require('mobx');
32
var _native=require('mobx-react/native');
43
var _reactNative=require('react-native');
54
var _navigationStore=require('./navigationStore');var _navigationStore2=_interopRequireDefault(_navigationStore);
65
var _Scene=require('./Scene');var _Scene2=_interopRequireDefault(_Scene);
6+
var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
77
var _Util=require('./Util');
88
var _reactNavigation=require('react-navigation');
99
var _NavBar=require('./NavBar');
@@ -53,19 +53,6 @@ var dontInheritKeys=[
5353
'hideTabBar'];
5454

5555

56-
function filterParam(data){
57-
if(data.toString()!=='[object Object]'){
58-
return{data:data};
59-
}
60-
var proto=(data||{}).constructor.name;
61-
62-
if(!data||proto!=='Object'){
63-
return{};
64-
}
65-
return data;
66-
}
67-
68-
6956
function getValue(value,params){
7057
return value instanceof Function?value(params):value;
7158
}
@@ -94,15 +81,15 @@ headerStyle:getValue(navigationParams.headerStyle||headerStyle||navigationBarSty
9481
headerBackImage:navigationParams.backButtonImage||backButtonImage});
9582

9683
if(NavBar){
97-
res.header=function(data){return _react2.default.createElement(NavBar,_extends({navigation:navigation},data,params,{__source:{fileName:_jsxFileName,lineNumber:97}}));};
84+
res.header=function(data){return _react2.default.createElement(NavBar,_extends({navigation:navigation},data,params,{__source:{fileName:_jsxFileName,lineNumber:84}}));};
9885
}
9986

10087
if(panHandlers===null){
10188
res.gesturesEnabled=false;
10289
}
10390

10491
if(navigationBarTitleImage){
105-
res.headerTitle=_react2.default.createElement(_reactNative.Image,{source:navigationBarTitleImage,style:navigationBarTitleImageStyle,__source:{fileName:_jsxFileName,lineNumber:105}});
92+
res.headerTitle=_react2.default.createElement(_reactNative.Image,{source:navigationBarTitleImage,style:navigationBarTitleImageStyle,__source:{fileName:_jsxFileName,lineNumber:92}});
10693
}
10794

10895
if(tabBarLabel){
@@ -145,26 +132,21 @@ function createWrapper(Component){
145132
if(!Component){
146133
return null;
147134
}
148-
return(0,_native.observer)(function(_ref3){var navigation=_ref3.navigation,props=_objectWithoutProperties(_ref3,['navigation']);
149-
return _react2.default.createElement(Component,_extends({},props,{navigation:navigation},navigation.state.params,{name:navigation.state.routeName,__source:{fileName:_jsxFileName,lineNumber:149}}));
150-
});
135+
return(0,_native.observer)(function(_ref3){var navigation=_ref3.navigation,props=_objectWithoutProperties(_ref3,['navigation']);return _react2.default.createElement(Component,_extends({},props,{navigation:navigation},navigation.state.params,{name:navigation.state.routeName,__source:{fileName:_jsxFileName,lineNumber:135}}));});
151136
}
152137

153138

154139
var App=(0,_native.observer)(function(props){
155140
var AppNavigator=props.navigator;
156141
return(
157-
_react2.default.createElement(AppNavigator,{navigation:(0,_reactNavigation.addNavigationHelpers)({
158-
dispatch:_navigationStore2.default.dispatch,
159-
state:_navigationStore2.default.state}),__source:{fileName:_jsxFileName,lineNumber:157}}));
160-
142+
_react2.default.createElement(AppNavigator,{navigation:(0,_reactNavigation.addNavigationHelpers)({dispatch:_navigationStore2.default.dispatch,state:_navigationStore2.default.state}),__source:{fileName:_jsxFileName,lineNumber:142}}));
161143

162144
});
163145

164146
function processScene(scene){var inheritProps=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};var clones=arguments.length>2&&arguments[2]!==undefined?arguments[2]:[];
165147
(0,_Util.assert)(scene.props,'props should be defined');
166148
if(!scene.props.children){
167-
return;
149+
return null;
168150
}
169151
var res={};
170152
var order=[];var _scene$props=
@@ -188,14 +170,13 @@ var children=!Array.isArray(parentProps.children)?[parentProps.children]:[].conc
188170
if(!drawer&&!tabs){
189171
children.push.apply(children,_toConsumableArray(clones));
190172
}
191-
var initialRouteName=void 0,initialRouteParams=void 0;var _loop=function _loop(
173+
var initialRouteName=void 0;
174+
var initialRouteParams=void 0;var _loop=function _loop(
192175
child){
193176
(0,_Util.assert)(child.key,'key should be defined for '+child);
194177
var key=child.key;
195178
var init=key===children[0].key;
196-
if(reservedKeys.indexOf(key)!==-1){
197-
throw'Scene name cannot be reserved word: '+child.key;
198-
}var _child$props=
179+
(0,_Util.assert)(reservedKeys.indexOf(key)===-1,'Scene name cannot be reserved word: '+child.key);var _child$props=
199180
child.props,component=_child$props.component,_child$props$type=_child$props.type,type=_child$props$type===undefined?'push':_child$props$type,onEnter=_child$props.onEnter,onExit=_child$props.onExit,on=_child$props.on,failure=_child$props.failure,success=_child$props.success,props=_objectWithoutProperties(_child$props,['component','type','onEnter','onExit','on','failure','success']);
200181
if(child.props.clone){
201182
if(clones.indexOf(child)===-1){
@@ -212,10 +193,10 @@ _navigationStore2.default.states[key][transition]=props[transition];
212193
}
213194
delete props.children;
214195
if(success){
215-
_navigationStore2.default.states[key].success=success instanceof Function?success:function(props){console.log('Transition to state='+success);_navigationStore2.default[success](props);};
196+
_navigationStore2.default.states[key].success=success instanceof Function?success:function(args){console.log('Transition to state='+success);_navigationStore2.default[success](args);};
216197
}
217198
if(failure){
218-
_navigationStore2.default.states[key].failure=failure instanceof Function?failure:function(props){console.log('Transition to state='+failure);_navigationStore2.default[failure](props);};
199+
_navigationStore2.default.states[key].failure=failure instanceof Function?failure:function(args){console.log('Transition to state='+failure);_navigationStore2.default[failure](args);};
219200
}
220201

221202
var screen={
@@ -235,7 +216,8 @@ res[key]=screen;
235216

236217
props.init=true;
237218
if(!_navigationStore2.default[key]){
238-
_navigationStore2.default[key]=new Function('actions','props','type','return function '+key+'(params){ actions[type](\''+key+'\', props, params)}')(_navigationStore2.default,_extends({},commonProps,props),type);
219+
_navigationStore2.default[key]=new Function('actions','props','type','return function '+
220+
key+'(params){ actions[type](\''+key+'\', props, params)}')(_navigationStore2.default,_extends({},commonProps,props),type);
239221
}
240222

241223
if((onEnter||on)&&!_navigationStore2.default[key+_Util.OnEnter]){
@@ -256,23 +238,28 @@ var mode=modal?'modal':'card';
256238
if(lightbox){
257239
return(0,_LightboxNavigator2.default)(res,{mode:mode,initialRouteParams:initialRouteParams,initialRouteName:initialRouteName,navigationOptions:createNavigationOptions(parentProps)});
258240
}else if(tabs){
259-
return(0,_reactNavigation.TabNavigator)(res,_extends({lazy:lazy,initialRouteName:initialRouteName,initialRouteParams:initialRouteParams,order:order},parentProps,{tabBarOptions:createTabBarOptions(parentProps),navigationOptions:createNavigationOptions(parentProps)}));
241+
return(0,_reactNavigation.TabNavigator)(res,_extends({lazy:lazy,initialRouteName:initialRouteName,initialRouteParams:initialRouteParams,order:order},parentProps,{
242+
tabBarOptions:createTabBarOptions(parentProps),navigationOptions:createNavigationOptions(parentProps)}));
260243
}else if(drawer){
261244
return(0,_reactNavigation.DrawerNavigator)(res,_extends({initialRouteName:initialRouteName,contentComponent:contentComponent,order:order,backBehavior:'none'},parentProps));
262-
}else{
245+
}
263246
if(navigator){
264247
return navigator(res,_extends({lazy:lazy,initialRouteName:initialRouteName,initialRouteParams:initialRouteParams,order:order},parentProps,{navigationOptions:createNavigationOptions(parentProps)}));
265-
}else{
266-
return(0,_reactNavigation.StackNavigator)(res,_extends({mode:mode,initialRouteParams:initialRouteParams,initialRouteName:initialRouteName},parentProps,{navigationOptions:createNavigationOptions(parentProps)}));
267248
}
249+
return(0,_reactNavigation.StackNavigator)(res,_extends({mode:mode,initialRouteParams:initialRouteParams,initialRouteName:initialRouteName},parentProps,{navigationOptions:createNavigationOptions(parentProps)}));
268250
}
269-
}exports.default=
270251

271-
function(_ref7){var createReducer=_ref7.createReducer,props=_objectWithoutProperties(_ref7,['createReducer']);
252+
var Router=function Router(_ref7){var createReducer=_ref7.createReducer,props=_objectWithoutProperties(_ref7,['createReducer']);
272253
var scene=props.children;
273254
var AppNavigator=processScene(scene,props);
274255
_navigationStore2.default.router=AppNavigator.router;
275256
_navigationStore2.default.reducer=createReducer&&createReducer(props);
276257

277-
return _react2.default.createElement(App,{navigator:AppNavigator,__source:{fileName:_jsxFileName,lineNumber:277}});
278-
};
258+
return _react2.default.createElement(App,{navigator:AppNavigator,__source:{fileName:_jsxFileName,lineNumber:258}});
259+
};
260+
Router.propTypes={
261+
createReducer:_propTypes2.default.func,
262+
children:_propTypes2.default.element};exports.default=
263+
264+
265+
Router;

dist/Scene.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
Object.defineProperty(exports,"__esModule",{value:true});exports.default=undefined;var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();
1+
Object.defineProperty(exports,"__esModule",{value:true});exports.default=
22

33

44

55

66

77

88

9-
var _react=require('react');var _react2=_interopRequireDefault(_react);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var _default=function(_React$Component){_inherits(_default,_React$Component);function _default(){_classCallCheck(this,_default);return _possibleConstructorReturn(this,(_default.__proto__||Object.getPrototypeOf(_default)).apply(this,arguments));}_createClass(_default,[{key:'render',value:function render()
10-
11-
12-
13-
{
14-
return null;
15-
}}]);return _default;}(_react2.default.Component);exports.default=_default;
9+
function(){return null;};

dist/index.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
Object.defineProperty(exports,"__esModule",{value:true});exports.Actions=exports.Scene=exports.Router=exports.Reducer=exports.navigationStore=exports.ActionConst=undefined;
2-
3-
4-
var _ActionConst=require('./ActionConst');var ActionConst=_interopRequireWildcard(_ActionConst);
1+
Object.defineProperty(exports,"__esModule",{value:true});exports.Actions=exports.Scene=exports.Router=exports.Reducer=exports.navigationStore=exports.ActionConst=undefined;var _ActionConst=require('./ActionConst');var ActionConst=_interopRequireWildcard(_ActionConst);
52
var _navigationStore=require('./navigationStore');var _navigationStore2=_interopRequireDefault(_navigationStore);
63
var _Reducer=require('./Reducer');var _Reducer2=_interopRequireDefault(_Reducer);
74
var _Router=require('./Router');var _Router2=_interopRequireDefault(_Router);

0 commit comments

Comments
 (0)