From 88ee6beeccf461b538447fb4a6efd3d8c61e8b8d Mon Sep 17 00:00:00 2001 From: Evans Aboge Date: Tue, 19 Jul 2022 15:54:29 +0300 Subject: [PATCH 1/3] fix toolkit text padding --- src/app/views/query-response/queryResponse.styles.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/app/views/query-response/queryResponse.styles.ts b/src/app/views/query-response/queryResponse.styles.ts index 7e81c6d3d..7e3e1d519 100644 --- a/src/app/views/query-response/queryResponse.styles.ts +++ b/src/app/views/query-response/queryResponse.styles.ts @@ -30,14 +30,10 @@ export const queryResponseStyles = (theme: ITheme) => { }, toolkitText: { root: { - padding: '20px', - width: '100%', - margin: 'auto', - display: 'inline-block', - position: 'relative', - top: '160px', - lineHeight: '1.5', - textAlign: 'justify' + display: 'flex', + justifyContent: 'center', + minHeight: '36vh', + alignItems: 'center' } } }; From fd6e3ad1617f83dc5e5b2de1464b67942ecf9521 Mon Sep 17 00:00:00 2001 From: Evans Aboge Date: Wed, 20 Jul 2022 17:04:37 +0300 Subject: [PATCH 2/3] prevent scroll on toolkit and adaptive cards tabs --- src/app/views/common/monaco/Monaco.tsx | 2 +- src/app/views/query-response/QueryResponse.tsx | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/views/common/monaco/Monaco.tsx b/src/app/views/common/monaco/Monaco.tsx index 6cbe050ad..13717a8f6 100644 --- a/src/app/views/common/monaco/Monaco.tsx +++ b/src/app/views/common/monaco/Monaco.tsx @@ -47,7 +47,7 @@ export function Monaco(props: IMonaco) { foldingStrategy: 'indentation', showFoldingControls: 'always', renderLineHighlight: 'none', - scrollBeyondLastLine: false, + scrollBeyondLastLine: true, overviewRulerBorder: false }} onChange={onChange} diff --git a/src/app/views/query-response/QueryResponse.tsx b/src/app/views/query-response/QueryResponse.tsx index 7ff87a083..d4c499506 100644 --- a/src/app/views/query-response/QueryResponse.tsx +++ b/src/app/views/query-response/QueryResponse.tsx @@ -100,6 +100,13 @@ const QueryResponse = (props: IQueryResponseProps) => { ); }; + const onScroll = () => { + const queryResponseElements = document.getElementsByClassName('query-response'); + if(queryResponseElements && queryResponseElements.length > 0){ + queryResponseElements[0].scrollTop = 0; + } + } + return ( <> { >
+ height: '100%', + overflowY: 'hidden' + }} onScroll={onScroll}> Date: Thu, 21 Jul 2022 10:21:59 +0300 Subject: [PATCH 3/3] move toolkit --- src/app/views/query-response/QueryResponse.tsx | 6 +++--- src/app/views/query-response/queryResponse.styles.ts | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/app/views/query-response/QueryResponse.tsx b/src/app/views/query-response/QueryResponse.tsx index d4c499506..a55fbed10 100644 --- a/src/app/views/query-response/QueryResponse.tsx +++ b/src/app/views/query-response/QueryResponse.tsx @@ -127,9 +127,9 @@ const QueryResponse = (props: IQueryResponseProps) => { >
+ height: '100%' + }} + onScroll={onScroll}> { }, toolkitText: { root: { - display: 'flex', - justifyContent: 'center', - minHeight: '36vh', - alignItems: 'center' + display: 'inline-block', + marginTop: '13%', + marginLeft: '16%' } } };