Apply Devon's changes

elastic · Apr 20, 2022 · 67d6f12 · 67d6f12
1 parent bb3d368
commit 67d6f12
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 25 deletions.
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_editor.tsx b/src/plugins/controls/public/control_types/options_list/options_list_editor.tsx
@@ -60,7 +60,7 @@ export const OptionsListEditor = ({
         initialInput?.dataViewId ?? getRelevantDataViewId?.() ?? (await getDefaultId());
       let dataView: DataView | undefined;
       if (initialId) {
-        onChange({ dataViewId: initialId, fieldName: initialInput?.fieldName });
+        onChange({ dataViewId: initialId });
         dataView = await get(initialId);
       }
       if (!mounted) return;

diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider.component.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import React, { FC, useCallback, useEffect, useState } from 'react';
+import React, { FC, useCallback } from 'react';
 import { BehaviorSubject } from 'rxjs';
 
 import { DataViewField } from '@kbn/data-views-plugin/public';
@@ -47,12 +47,6 @@ export const RangeSliderComponent: FC<Props> = ({ componentStateSubject }) => {
 
   const { value, id, title } = useEmbeddableSelector((state) => state);
 
-  const [selectedValue, setSelectedValue] = useState<RangeValue>(value || ['', '']);
-
-  useEffect(() => {
-    setSelectedValue(value ?? ['', '']);
-  }, [value]);
-
   const onChangeComplete = useCallback(
     (range: RangeValue) => {
       dispatch(selectRange(range));
@@ -67,7 +61,7 @@ export const RangeSliderComponent: FC<Props> = ({ componentStateSubject }) => {
       min={min}
       max={max}
       title={title}
-      value={selectedValue}
+      value={value ?? ['', '']}
       onChange={onChangeComplete}
       fieldFormatter={fieldFormatter}
     />

diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_editor.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_editor.tsx
@@ -56,7 +56,7 @@ export const RangeSliderEditor = ({
         initialInput?.dataViewId ?? getRelevantDataViewId?.() ?? (await getDefaultId());
       let dataView: DataView | undefined;
       if (initialId) {
-        onChange({ dataViewId: initialId, fieldName: initialInput?.fieldName });
+        onChange({ dataViewId: initialId });
         dataView = await get(initialId);
       }
       if (!mounted) return;

diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_embeddable_factory.tsx
@@ -37,8 +37,8 @@ export class RangeSliderEmbeddableFactory
   ) => {
     if (
       embeddable &&
-      (!deepEqual(newInput.fieldName, embeddable.getInput().fieldName) ||
-        !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId))
+      ((newInput.fieldName && !deepEqual(newInput.fieldName, embeddable.getInput().fieldName)) ||
+        (newInput.dataViewId && !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId)))
     ) {
       // if the field name or data view id has changed in this editing session, selected values are invalid, so reset them.
       newInput.value = ['', ''];

diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import React, { FC, useCallback, useState, useMemo, useEffect } from 'react';
+import React, { FC, useCallback, useMemo } from 'react';
 import { BehaviorSubject } from 'rxjs';
 import { debounce } from 'lodash';
 import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
@@ -59,10 +59,6 @@ export const TimeSlider: FC<TimeSliderProps> = ({
 
   const { value } = useEmbeddableSelector((state) => state);
 
-  const [selectedValue, setSelectedValue] = useState<[number | null, number | null]>(
-    value || [null, null]
-  );
-
   const dispatchChange = useCallback(
     (range: [number | null, number | null]) => {
       dispatch(selectRange(range));
@@ -79,14 +75,10 @@ export const TimeSlider: FC<TimeSliderProps> = ({
     [debouncedDispatchChange]
   );
 
-  useEffect(() => {
-    setSelectedValue(value ?? [null, null]);
-  }, [value]);
-
   return (
     <Component
       onChange={onChangeComplete}
-      value={selectedValue}
+      value={value ?? [null, null]}
       range={[min, max]}
       dateFormat={dateFormat}
       timezone={timezone}

diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_editor.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider_editor.tsx
@@ -55,7 +55,7 @@ export const TimeSliderEditor = ({
         initialInput?.dataViewId ?? getRelevantDataViewId?.() ?? (await getDefaultId());
       let dataView: DataView | undefined;
       if (initialId) {
-        onChange({ dataViewId: initialId, fieldName: initialInput?.fieldName });
+        onChange({ dataViewId: initialId });
         dataView = await get(initialId);
       }
       if (!mounted) return;

diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx
@@ -39,8 +39,8 @@ export class TimesliderEmbeddableFactory
   ) => {
     if (
       embeddable &&
-      (!deepEqual(newInput.fieldName, embeddable.getInput().fieldName) ||
-        !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId))
+      ((newInput.fieldName && !deepEqual(newInput.fieldName, embeddable.getInput().fieldName)) ||
+        (newInput.dataViewId && !deepEqual(newInput.dataViewId, embeddable.getInput().dataViewId)))
     ) {
       // if the field name or data view id has changed in this editing session, selected options are invalid, so reset them.
       newInput.value = undefined;