Fixing collor pickers in the admin console (mattermost#4436)

Revanth47 · Dec 5, 2019 · 91447e5 · 91447e5
1 parent 490795c
commit 91447e5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/components/admin_console/color_setting.tsx b/components/admin_console/color_setting.tsx
@@ -50,8 +50,11 @@ export default class ColorSetting extends React.PureComponent<Props, State> {
  }
 
  private closePicker = (e: MouseEvent) => {
- if (e.target && (e.target as HTMLElement).closest('.' + this.getPickerClass())) {
- this.setState({showPicker: false});
+ if (e.target) {
+ const closest = (e.target as HTMLElement).closest('.' + this.getPickerClass());
+ if (!closest || !closest.contains(e.target as HTMLElement)) {
+ this.setState({showPicker: false});
+ }
  }
  }