Skip to content

Accessible nested actions within select-action #131

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

Draft
frags51 wants to merge 1 commit into
base: fork-main
Choose a base branch
from
Draft

Accessible nested actions within select-action #131

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
30 changes: 24 additions & 6 deletions source/community/reactnative/src/adaptive-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ export default class AdaptiveCard extends React.Component {

//If contentHeight is passed by the user from adaptive card via props, we will set this as height
this.props.contentHeight && containerStyles.push({ height: this.props.contentHeight })

const hasSelectAction = !Utils.isNullOrEmpty(this.payload.selectAction);
const disableActionsNestingInSelectAction = this.props.disableActionableControlsNestingOnRoot;
var adaptiveCardContent = (
<ContainerWrapper
configManager={this.configManager}
Expand All @@ -237,7 +238,7 @@ export default class AdaptiveCard extends React.Component {
alwaysBounceHorizontal={false}
scrollEnabled={this.props.cardScrollEnabled}>
{this.parsePayload()}
{!Utils.isNullOrEmpty(this.state.cardModel.actions) && (
{(!disableActionsNestingInSelectAction || (disableActionsNestingInSelectAction && !hasSelectAction)) && !Utils.isNullOrEmpty(this.state.cardModel.actions) && (
<ActionWrapper
configManager={this.configManager}
style={{marginHorizontal: padding}}
Expand All @@ -260,11 +261,25 @@ export default class AdaptiveCard extends React.Component {
}

// checks if selectAction option is available for adaptive card
if (!Utils.isNullOrEmpty(this.payload.selectAction)) {
if (hasSelectAction) {
adaptiveCardContent = (
<SelectAction configManager={this.configManager} selectActionData={this.payload.selectAction}>
{adaptiveCardContent}
</SelectAction>
<>
<SelectAction configManager={this.configManager} selectActionData={this.payload.selectAction}>
{adaptiveCardContent}
</SelectAction>
{disableActionsNestingInSelectAction && !Utils.isNullOrEmpty(this.state.cardModel.actions) && (
<View style={this.props.rootActionContainerStyle || {position: 'absolute', bottom: 0, width: '100%'}}>
<ActionWrapper
configManager={this.configManager}
style={{marginHorizontal: padding}}
actions={this.state.cardModel.actions}
deviceFontScale={this.props.deviceFontScale}

/>
</View>
)}
</>

);
}
return adaptiveCardContent;
Expand Down Expand Up @@ -362,11 +377,14 @@ AdaptiveCard.propTypes = {
contentContainerStyle: PropTypes.object,
cardScrollEnabled: PropTypes.bool,
keyboardAvoidingViewEnabled: PropTypes.bool,
disableActionableControlsNestingOnRoot: PropTypes.bool,
rootActionContainerStyle: PropTypes.object,
deviceFontScale: PropTypes.number
};

AdaptiveCard.defaultProps = {
cardScrollEnabled: true,
keyboardAvoidingViewEnabled: true,
disableActionableControlsNestingOnRoot: false,
deviceFontScale: 1
};