From da9a1bf3e686877e12c27ef21b186e6172ba6b7b Mon Sep 17 00:00:00 2001 From: sadakchap Date: Fri, 16 Apr 2021 19:55:05 +0530 Subject: [PATCH 1/2] Date pickups not working on filters --- src/components/BrowserFilter/BrowserFilter.react.js | 2 +- src/components/BrowserFilter/FilterRow.react.js | 8 +++++--- src/components/DateTimeEntry/DateTimeEntry.react.js | 2 +- src/components/Popover/Popover.react.js | 6 +++++- src/lib/hasAncestor.js | 4 +++- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/components/BrowserFilter/BrowserFilter.react.js b/src/components/BrowserFilter/BrowserFilter.react.js index af000adb67..945c0f05c4 100644 --- a/src/components/BrowserFilter/BrowserFilter.react.js +++ b/src/components/BrowserFilter/BrowserFilter.react.js @@ -110,7 +110,7 @@ export default class BrowserFilter extends React.Component { filters={this.state.filters} onChange={filters => this.setState({ filters: filters })} renderRow={props => ( - 0} /> + 0} parentContentId={POPOVER_CONTENT_ID} /> )} />
diff --git a/src/components/BrowserFilter/FilterRow.react.js b/src/components/BrowserFilter/FilterRow.react.js index 4c8c2c12da..f7c2eb05ef 100644 --- a/src/components/BrowserFilter/FilterRow.react.js +++ b/src/components/BrowserFilter/FilterRow.react.js @@ -27,7 +27,7 @@ let setFocus = (input) => { } } -function compareValue(info, value, onChangeCompareTo, active) { +function compareValue(info, value, onChangeCompareTo, active, parentContentId) { switch (info.type) { case null: return null; @@ -70,7 +70,8 @@ function compareValue(info, value, onChangeCompareTo, active) { className={styles.date} value={Parse._decode('date', value)} onChange={(value) => onChangeCompareTo(Parse._encode(value))} - ref={setFocus} /> + ref={setFocus} + parentContentId={parentContentId} /> ); } } @@ -87,6 +88,7 @@ let FilterRow = ({ onChangeCompareTo, onDeleteRow, active, + parentContentId, }) => (
Constraints[c].name)} onChange={(c) => onChangeConstraint(constraintLookup[c])} /> - {compareValue(compareInfo, compareTo, onChangeCompareTo, active)} + {compareValue(compareInfo, compareTo, onChangeCompareTo, active, parentContentId)}
); diff --git a/src/components/DateTimeEntry/DateTimeEntry.react.js b/src/components/DateTimeEntry/DateTimeEntry.react.js index 176155cc42..d1eb69c093 100644 --- a/src/components/DateTimeEntry/DateTimeEntry.react.js +++ b/src/components/DateTimeEntry/DateTimeEntry.react.js @@ -87,7 +87,7 @@ export default class DateTimeEntry extends React.Component { let popover = null; if (this.state.open) { popover = ( - + Date: Fri, 16 Apr 2021 19:56:10 +0530 Subject: [PATCH 2/2] catching onClick event,stop propagating to parent --- src/components/DateTimePicker/DateTimePicker.react.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DateTimePicker/DateTimePicker.react.js b/src/components/DateTimePicker/DateTimePicker.react.js index 5f9908f490..a4fdabe5b2 100644 --- a/src/components/DateTimePicker/DateTimePicker.react.js +++ b/src/components/DateTimePicker/DateTimePicker.react.js @@ -90,7 +90,7 @@ export default class DateTimePicker extends React.Component { render() { return ( -
+
e.stopPropagation()} > { let timeRef = this.props.value || hoursFrom(new Date(), 1); let newDate = this.props.local ? new Date(