Skip to content

Nav bar save props #2211

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 2 commits into from
Nov 23, 2017
Merged

Nav bar save props #2211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ea5a24
Save navBar component props
guyca Nov 23, 2017
10975fa
Update docs
guyca Nov 23, 2017
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
2 changes: 1 addition & 1 deletion docs/styling-the-navigator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ this.props.navigator.setStyle({
navBarBackgroundColor: '#f7f7f7', // change the background color of the nav bar (remembered across pushes)
navBarCustomView: 'example.CustomTopBar', // registered component name
navBarComponentAlignment: 'center', // center/fill
navBarCustomViewInitialProps: {}, // Serializable JSON passed as props
navBarCustomViewInitialProps: {}, // navBar custom component props
navBarButtonColor: '#007aff', // Change color of nav bar buttons (eg. the back button) (remembered across pushes)

navBarHidden: false, // make the nav bar hidden
Expand Down
28 changes: 21 additions & 7 deletions src/deprecated/platformSpecificDeprecated.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ function startTabBasedApp(params) {
navigatorButtons,
navigatorEventID
} = _mergeScreenSpecificSettings(tab.screen, screenInstanceID, tab);
_processNavigatorButtons(navigatorButtons);
_saveNavigatorButtonsProps(navigatorButtons);
_saveNavBarComponentProps(navigatorStyle);
tab.navigationParams = {
screenInstanceID,
navigatorStyle,
Expand Down Expand Up @@ -139,7 +140,8 @@ function startSingleScreenApp(params) {
navigatorButtons,
navigatorEventID
} = _mergeScreenSpecificSettings(screen.screen, screenInstanceID, screen);
_processNavigatorButtons(navigatorButtons);
_saveNavigatorButtonsProps(navigatorButtons);
_saveNavBarComponentProps(navigatorStyle);
params.navigationParams = {
screenInstanceID,
navigatorStyle,
Expand Down Expand Up @@ -238,7 +240,8 @@ function navigatorPush(navigator, params) {
navigatorButtons,
navigatorEventID
} = _mergeScreenSpecificSettings(params.screen, screenInstanceID, params);
_processNavigatorButtons(navigatorButtons);
_saveNavigatorButtonsProps(navigatorButtons);
_saveNavBarComponentProps(navigatorStyle);
const passProps = Object.assign({}, params.passProps);
passProps.navigatorID = navigator.navigatorID;
passProps.screenInstanceID = screenInstanceID;
Expand Down Expand Up @@ -297,7 +300,8 @@ function navigatorResetTo(navigator, params) {
navigatorButtons,
navigatorEventID
} = _mergeScreenSpecificSettings(params.screen, screenInstanceID, params);
_processNavigatorButtons(navigatorButtons);
_saveNavigatorButtonsProps(navigatorButtons);
_saveNavBarComponentProps(navigatorStyle);
const passProps = Object.assign({}, params.passProps);
passProps.navigatorID = navigator.navigatorID;
passProps.screenInstanceID = screenInstanceID;
Expand Down Expand Up @@ -366,6 +370,7 @@ function navigatorToggleNavBar(navigator, params) {
}

function navigatorSetStyle(navigator, params) {
_saveNavBarComponentProps(params);
Controllers.NavigationControllerIOS(navigator.navigatorID).setStyle(params)
}

Expand Down Expand Up @@ -447,7 +452,7 @@ function navigatorSwitchToTab(navigator, params) {
}

function navigatorSetButtons(navigator, navigatorEventID, params) {
_processNavigatorButtons(params);
_saveNavigatorButtonsProps(params);
if (params.leftButtons) {
const buttons = params.leftButtons.slice(); // clone
for (let i = 0; i < buttons.length; i++) {
Expand Down Expand Up @@ -477,7 +482,8 @@ function showModal(params) {
navigatorButtons,
navigatorEventID
} = _mergeScreenSpecificSettings(params.screen, screenInstanceID, params);
_processNavigatorButtons(navigatorButtons);
_saveNavigatorButtonsProps(navigatorButtons);
_saveNavBarComponentProps(navigatorStyle);
const passProps = Object.assign({}, params.passProps);
passProps.navigatorID = navigatorID;
passProps.screenInstanceID = screenInstanceID;
Expand Down Expand Up @@ -646,7 +652,15 @@ async function getCurrentlyVisibleScreenId() {
return await ScreenUtils.getCurrentlyVisibleScreenId();
}

function _processNavigatorButtons({rightButtons, leftButtons}) {
function _saveNavBarComponentProps(navigatorStyle) {
if (navigatorStyle.navBarCustomViewInitialProps) {
const passPropsKey = _.uniqueId('navBarComponent');
PropRegistry.save(passPropsKey, navigatorStyle.navBarCustomViewInitialProps);
navigatorStyle.navBarCustomViewInitialProps = {passPropsKey};
}
}

function _saveNavigatorButtonsProps({rightButtons, leftButtons}) {
_saveNavigatorButtonsPassProps(rightButtons);
_saveNavigatorButtonsPassProps(leftButtons);
}
Expand Down