Skip to content

Revert "Fixes freeze of passProps on iOS" #3222

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

Merged
guyca merged 1 commit into from
May 17, 2018
Merged

Revert "Fixes freeze of passProps on iOS" #3222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions src/deprecated/platformSpecificDeprecated.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ async function startTabBasedApp(params) {

components.forEach(component => {
const screenInstanceID = _.uniqueId('screenInstanceID');

const {
navigatorStyle,
navigatorButtons,
navigatorEventID
} = _mergeScreenSpecificSettings(component.screen, screenInstanceID, params);
_saveNavigatorButtonsProps(navigatorButtons);
_saveNavBarComponentProps(navigatorStyle);
const passProps = _.cloneDeep(component.passProps);
const passProps = Object.assign({}, component.passProps);
passProps.navigatorID = navigatorID;
passProps.screenInstanceID = screenInstanceID;
passProps.navigatorEventID = navigatorEventID;


component.navigationParams = {
screenInstanceID,
navigatorStyle,
Expand All @@ -60,15 +60,15 @@ async function startTabBasedApp(params) {
navigatorID: navigatorID,
passProps
};

component.subtitle = params.subtitle;
component.passProps = passProps;
component.navigatorStyle = navigatorStyle;

savePassProps(component);

});

}

const {
Expand Down Expand Up @@ -191,7 +191,7 @@ async function startSingleScreenApp(params) {
} = _mergeScreenSpecificSettings(component.screen, screenInstanceID, params);
_saveNavigatorButtonsProps(navigatorButtons);
_saveNavBarComponentProps(navigatorStyle);
const passProps = _.cloneDeep(params.passProps);
const passProps = Object.assign({}, params.passProps);
passProps.navigatorID = navigatorID;
passProps.screenInstanceID = screenInstanceID;
passProps.navigatorEventID = navigatorEventID;
Expand Down Expand Up @@ -340,7 +340,7 @@ function navigatorPush(navigator, params) {
} = _mergeScreenSpecificSettings(params.screen, screenInstanceID, params);
_saveNavigatorButtonsProps(navigatorButtons);
_saveNavBarComponentProps(navigatorStyle);
const passProps = _.cloneDeep(params);
const passProps = Object.assign({}, params.passProps);
passProps.navigatorID = navigator.navigatorID;
passProps.screenInstanceID = screenInstanceID;
passProps.navigatorEventID = navigatorEventID;
Expand Down Expand Up @@ -406,7 +406,7 @@ function navigatorResetTo(navigator, params) {
} = _mergeScreenSpecificSettings(params.screen, screenInstanceID, params);
_saveNavigatorButtonsProps(navigatorButtons);
_saveNavBarComponentProps(navigatorStyle);
const passProps = _.cloneDeep(params.passProps);
const passProps = Object.assign({}, params.passProps);
passProps.navigatorID = navigator.navigatorID;
passProps.screenInstanceID = screenInstanceID;
passProps.navigatorEventID = navigatorEventID;
Expand Down Expand Up @@ -590,7 +590,7 @@ function showModal(params) {
} = _mergeScreenSpecificSettings(params.screen, screenInstanceID, params);
_saveNavigatorButtonsProps(navigatorButtons);
_saveNavBarComponentProps(navigatorStyle);
const passProps = _.cloneDeep(params.passProps);
const passProps = Object.assign({}, params.passProps);
passProps.navigatorID = navigatorID;
passProps.screenInstanceID = screenInstanceID;
passProps.navigatorEventID = navigatorEventID;
Expand Down Expand Up @@ -648,7 +648,7 @@ function showLightBox(params) {
navigatorButtons,
navigatorEventID
} = _mergeScreenSpecificSettings(params.screen, screenInstanceID, params);
const passProps = _.cloneDeep(params.passProps);
const passProps = Object.assign({}, params.passProps);
passProps.navigatorID = navigatorID;
passProps.screenInstanceID = screenInstanceID;
passProps.navigatorEventID = navigatorEventID;
Expand Down Expand Up @@ -688,7 +688,7 @@ function showInAppNotification(params) {
navigatorButtons,
navigatorEventID
} = _mergeScreenSpecificSettings(params.screen, screenInstanceID, params);
const passProps = _.cloneDeep(params.passProps);
const passProps = Object.assign({}, params.passProps);
passProps.navigatorID = navigatorID;
passProps.screenInstanceID = screenInstanceID;
passProps.navigatorEventID = navigatorEventID;
Expand Down