From 75558ba51e884e5a18e4be75e22e2556df87f7cb Mon Sep 17 00:00:00 2001 From: Mael Date: Tue, 3 Jul 2018 13:11:25 +0000 Subject: [PATCH] =?UTF-8?q?:bug:=20Pas=20de=20conversation,=20d'avancement?= =?UTF-8?q?=20quand=20contr=C3=B4le=20bloquant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/components/Simu.js | 13 +++++++------ source/components/TargetSelection.js | 17 ++++++++++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/source/components/Simu.js b/source/components/Simu.js index 091336a5e..37f85eee1 100644 --- a/source/components/Simu.js +++ b/source/components/Simu.js @@ -35,12 +35,13 @@ export default class Simu extends Component { - {conversationStarted && ( - <> - - - - )} + {conversationStarted && + !blockingInputControls && ( + <> + + + + )} {!noUserInput && !blockingInputControls && } {!noUserInput && !blockingInputControls && } diff --git a/source/components/TargetSelection.js b/source/components/TargetSelection.js index 1f8a9b2c6..2a275ff88 100644 --- a/source/components/TargetSelection.js +++ b/source/components/TargetSelection.js @@ -126,7 +126,8 @@ export default class TargetSelection extends Component { {...{ target, conversationStarted, - isActiveInput: activeInput === target.dottedName + isActiveInput: activeInput === target.dottedName, + blockingInputControls }} /> { +let Header = ({ + target, + conversationStarted, + isActiveInput, + blockingInputControls +}) => { return ( - {conversationStarted && ( - - )} + {conversationStarted && + !blockingInputControls && ( + + )}