🐛 Pas de conversation, d'avancement quand contrôle bloquant

pull/269/head
Mael 2018-07-03 13:11:25 +00:00
parent b1bbb53370
commit 75558ba51e
2 changed files with 19 additions and 11 deletions

View File

@ -35,12 +35,13 @@ export default class Simu extends Component {
<FoldedSteps />
<GoToAnswers />
<TargetSelection colours={colours} />
{conversationStarted && (
<>
<ProgressTip />
<Conversation textColourOnWhite={colours.textColourOnWhite} />
</>
)}
{conversationStarted &&
!blockingInputControls && (
<>
<ProgressTip />
<Conversation textColourOnWhite={colours.textColourOnWhite} />
</>
)}
{!noUserInput && !blockingInputControls && <GoToExplanations />}
</div>
{!noUserInput && !blockingInputControls && <ResultView />}

View File

@ -126,7 +126,8 @@ export default class TargetSelection extends Component {
{...{
target,
conversationStarted,
isActiveInput: activeInput === target.dottedName
isActiveInput: activeInput === target.dottedName,
blockingInputControls
}}
/>
<TargetInputOrValue
@ -159,12 +160,18 @@ export default class TargetSelection extends Component {
}
}
let Header = ({ target, conversationStarted, isActiveInput }) => {
let Header = ({
target,
conversationStarted,
isActiveInput,
blockingInputControls
}) => {
return (
<span className="header">
{conversationStarted && (
<ProgressCircle target={target} isActiveInput={isActiveInput} />
)}
{conversationStarted &&
!blockingInputControls && (
<ProgressCircle target={target} isActiveInput={isActiveInput} />
)}
<span className="texts">
<span className="optionTitle">