[Logs UI] stop accordion chart preview from auto expanding/collapsing (#109581)

* stop propagation to the criterion popovers

* fix toggling issue with criteria popovers

* Fixes for more popovers staying open

* another toggling fix "for the last" popover
This commit is contained in:
mgiota 2021-08-23 20:08:24 +02:00 committed by GitHub
parent 953e21b20e
commit 098a797636
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions

View file

@ -60,7 +60,7 @@ export const GroupByExpression: React.FC<Props> = ({
uppercase={true}
value={expressionValue}
isActive={isPopoverOpen}
onClick={() => setIsPopoverOpen(true)}
onClick={() => setIsPopoverOpen(!isPopoverOpen)}
/>
}
isOpen={isPopoverOpen}

View file

@ -168,12 +168,13 @@ export const Criterion: React.FC<Props> = ({
color={errors.field.length === 0 ? 'secondary' : 'danger'}
onClick={(e) => {
e.stopPropagation();
setIsFieldPopoverOpen(true);
setIsFieldPopoverOpen(!isFieldPopoverOpen);
}}
/>
}
isOpen={isFieldPopoverOpen}
closePopover={() => setIsFieldPopoverOpen(false)}
onClick={(e) => e.stopPropagation()}
ownFocus
panelPaddingSize="s"
anchorPosition="downLeft"
@ -214,12 +215,13 @@ export const Criterion: React.FC<Props> = ({
}
onClick={(e) => {
e.stopPropagation();
setIsComparatorPopoverOpen(true);
setIsComparatorPopoverOpen(!isComparatorPopoverOpen);
}}
/>
}
isOpen={isComparatorPopoverOpen}
closePopover={() => setIsComparatorPopoverOpen(false)}
onClick={(e) => e.stopPropagation()}
ownFocus
panelPaddingSize="s"
anchorPosition="downLeft"

View file

@ -67,7 +67,7 @@ export const Threshold: React.FC<Props> = ({ comparator, value, updateThreshold,
uppercase={true}
value={`${comparator ? ComparatorToi18nMap[comparator] : ''} ${value ? value : ''}`}
isActive={isThresholdPopoverOpen}
onClick={() => setThresholdPopoverOpenState(true)}
onClick={() => setThresholdPopoverOpenState(!isThresholdPopoverOpen)}
/>
}
isOpen={isThresholdPopoverOpen}

View file

@ -70,7 +70,7 @@ export const TypeSwitcher: React.FC<Props> = ({ criteria, updateType }) => {
uppercase={true}
value={thresholdType === 'ratio' ? ratioI18n : countI18n}
isActive={isThresholdTypePopoverOpen}
onClick={() => setThresholdTypePopoverOpenState(true)}
onClick={() => setThresholdTypePopoverOpenState(!isThresholdTypePopoverOpen)}
/>
<ExpressionLike
text={

View file

@ -73,7 +73,7 @@ export const ForLastExpression = ({
)}`}
isActive={alertDurationPopoverOpen}
onClick={() => {
setAlertDurationPopoverOpen(true);
setAlertDurationPopoverOpen(!alertDurationPopoverOpen);
}}
display={display === 'inline' ? 'inline' : 'columns'}
isInvalid={!timeWindowSize}