From 2e7b7c9d86b5849dad28e1fa205a3f58883d9754 Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Sun, 17 Apr 2022 15:57:35 -0400 Subject: [PATCH 1/3] Enable touch-clicks in react-draggable Add onTouchEnd events for click functions inside react-draggable. Necessary because react-draggable prevents default click behavior. --- src/ui/React/LogBoxManager.tsx | 8 ++++---- src/ui/React/Overview.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/React/LogBoxManager.tsx b/src/ui/React/LogBoxManager.tsx index 0b892da12..ad41ea61c 100644 --- a/src/ui/React/LogBoxManager.tsx +++ b/src/ui/React/LogBoxManager.tsx @@ -265,10 +265,10 @@ function LogWindow(props: IProps): React.ReactElement { - {!workerScripts.has(script.pid) && } - {workerScripts.has(script.pid) && } - - + {!workerScripts.has(script.pid) && } + {workerScripts.has(script.pid) && } + + diff --git a/src/ui/React/Overview.tsx b/src/ui/React/Overview.tsx index d1bdf2a56..769a2cf3c 100644 --- a/src/ui/React/Overview.tsx +++ b/src/ui/React/Overview.tsx @@ -130,7 +130,7 @@ export function Overview({ children, mode }: IProps): React.ReactElement { size="small" className={classes.visibilityToggle} > - { setOpen((old) => !old)} />} + { setOpen((old) => !old)} onTouchEnd={() => setOpen((old) => !old)} />} From 9850b56711b29c254102ad8694b1610b4d5adc81 Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Sun, 17 Apr 2022 17:23:14 -0400 Subject: [PATCH 2/3] Update LogBoxManager.tsx Fix prettier failure? --- src/ui/React/LogBoxManager.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ui/React/LogBoxManager.tsx b/src/ui/React/LogBoxManager.tsx index ad41ea61c..7106ce8c5 100644 --- a/src/ui/React/LogBoxManager.tsx +++ b/src/ui/React/LogBoxManager.tsx @@ -265,10 +265,10 @@ function LogWindow(props: IProps): React.ReactElement { - {!workerScripts.has(script.pid) && } - {workerScripts.has(script.pid) && } - - + {!workerScripts.has(script.pid) && } + {workerScripts.has(script.pid) && } + + From 5c53b39edcf7b7ab4edc5e925e4ef77409849555 Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Sun, 17 Apr 2022 17:40:37 -0400 Subject: [PATCH 3/3] Try to fix formatting? --- src/ui/React/LogBoxManager.tsx | 20 ++++++++++++++++---- src/ui/React/Overview.tsx | 9 ++++++++- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/ui/React/LogBoxManager.tsx b/src/ui/React/LogBoxManager.tsx index ad41ea61c..da20bb32e 100644 --- a/src/ui/React/LogBoxManager.tsx +++ b/src/ui/React/LogBoxManager.tsx @@ -265,10 +265,22 @@ function LogWindow(props: IProps): React.ReactElement { - {!workerScripts.has(script.pid) && } - {workerScripts.has(script.pid) && } - - + {!workerScripts.has(script.pid) && ( + + )} + {workerScripts.has(script.pid) && ( + + )} + + diff --git a/src/ui/React/Overview.tsx b/src/ui/React/Overview.tsx index 769a2cf3c..8923cbd27 100644 --- a/src/ui/React/Overview.tsx +++ b/src/ui/React/Overview.tsx @@ -130,7 +130,14 @@ export function Overview({ children, mode }: IProps): React.ReactElement { size="small" className={classes.visibilityToggle} > - { setOpen((old) => !old)} onTouchEnd={() => setOpen((old) => !old)} />} + { + setOpen((old) => !old)} + onTouchEnd={() => setOpen((old) => !old)} + /> + }