fix(setImmediate): replaced by setTimeout(fn, 0)

Kitware · Aug 18, 2021 · fa82b15 · fa82b15
1 parent fe6d8da
commit fa82b15
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 40 deletions.
diff --git a/src/Common/Core/CompositeClosureHelper/index.js b/src/Common/Core/CompositeClosureHelper/index.js
@@ -1,5 +1,3 @@
-import { setImmediate } from 'paraviewweb/src/Common/Core';
-
 // ----------------------------------------------------------------------------
 // capitalize provided string
 // ----------------------------------------------------------------------------
@@ -113,7 +111,7 @@ function event(publicAPI, model, eventName, asynchrounous = true) {
     }
 
     if (asynchrounous) {
-      setImmediate(processCallbacks);
+      setTimeout(processCallbacks, 0);
     } else {
       processCallbacks();
     }

diff --git a/src/Common/Core/LookupTableManager/index.js b/src/Common/Core/LookupTableManager/index.js
@@ -1,6 +1,5 @@
 import Monologue from 'monologue.js';
 
-import { setImmediate } from 'paraviewweb/src/Common/Core';
 import LookupTable from 'paraviewweb/src/Common/Core/LookupTable';
 
 const TOPIC = {
@@ -57,9 +56,9 @@ export default class LookupTableManager {
   }
 
   updateActiveLookupTable(name) {
-    setImmediate(() => {
+    setTimeout(() => {
       this.emit(TOPIC.ACTIVE_CHANGE, name);
-    });
+    }, 0);
     this.activeField = name;
   }
 

diff --git a/src/Common/Core/index.js b/src/Common/Core/index.js
@@ -2,10 +2,6 @@ import CompositeClosureHelper from './CompositeClosureHelper';
 import LookupTable from './LookupTable';
 import LookupTableManager from './LookupTableManager';
 
-export function setImmediate(fn) {
-  return setTimeout(fn, 0);
-}
-
 export default {
   CompositeClosureHelper,
   LookupTable,

diff --git a/src/Component/Native/ToggleControl/index.js b/src/Component/Native/ToggleControl/index.js
@@ -1,5 +1,4 @@
 /* global document */
-import { setImmediate } from 'paraviewweb/src/Common/Core';
 import style from 'PVWStyle/ComponentNative/ToggleControl.mcss';
 
 const SELECTOR_BUTTON_CLASS = style.jsControlButton;
@@ -18,7 +17,7 @@ export default class CompositeControlContainer {
         this.container.querySelector(
           `.${style.jsControlContent}`
         ).style.display = this.controlVisible ? 'flex' : 'none';
-        setImmediate(() => this.resize());
+        setTimeout(() => this.resize(), 0);
       }
     };
   }

diff --git a/src/IO/Core/QueryDataModel/index.js b/src/IO/Core/QueryDataModel/index.js
@@ -6,7 +6,6 @@ import now from 'mout/src/time/now';
 import omit from 'mout/object/omit';
 import size from 'mout/object/size';
 
-import { setImmediate } from 'paraviewweb/src/Common/Core';
 import DataManager from 'paraviewweb/src/IO/Core/DataManager';
 
 // ============================================================================
@@ -136,9 +135,9 @@ export default class QueryDataModel {
 
       if (hasPending) {
         // put the request back in the queue
-        setImmediate(() => {
+        setTimeout(() => {
           this.requests.push(request);
-        });
+        }, 0);
       } else if (!hasError) {
         // We are good to go
         // Broadcast data to the category
@@ -192,11 +191,11 @@ export default class QueryDataModel {
 
       if (minValue === maxValue && (dataSize === 1 ? minValue === 0 : true)) {
         // Handling requests after any re-queue
-        setImmediate(() => {
+        setTimeout(() => {
           while (this.requests.length) {
             processRequest(this.requests.pop());
           }
-        });
+        }, 0);
       }
     };
 
@@ -260,7 +259,7 @@ export default class QueryDataModel {
 
     this.explorationSubscription = this.onDataChange(() => {
       if (this.exploreState.animate && this.exploreState.onDataReady) {
-        setImmediate((_) => this.nextExploration());
+        setTimeout((_) => this.nextExploration(), 0);
       }
     });
   }

diff --git a/src/InfoViz/Native/HistogramSelector/index.js b/src/InfoViz/Native/HistogramSelector/index.js
@@ -1,7 +1,6 @@
 import d3 from 'd3';
 import style from 'PVWStyle/InfoVizNative/HistogramSelector.mcss';
 
-import { setImmediate } from 'paraviewweb/src/Common/Core';
 import CompositeClosureHelper from 'paraviewweb/src/Common/Core/CompositeClosureHelper';
 import multiClicker from 'paraviewweb/src/InfoViz/Core/D3MultiClick';
 import score from 'paraviewweb/src/InfoViz/Native/HistogramSelector/score';
@@ -837,7 +836,7 @@ function histogramSelector(publicAPI, model) {
         .classed(style.parameterScrollFix, true);
       publicAPI.resize();
 
-      setImmediate(scoreHelper.updateFieldAnnotations);
+      setTimeout(scoreHelper.updateFieldAnnotations, 0);
     }
   };
 

diff --git a/src/InfoViz/Native/ParallelCoordinates/AxesManager.js b/src/InfoViz/Native/ParallelCoordinates/AxesManager.js
@@ -1,4 +1,3 @@
-import { setImmediate } from 'paraviewweb/src/Common/Core';
 import { dataToScreen } from 'paraviewweb/src/InfoViz/Native/ParallelCoordinates';
 import Axis from 'paraviewweb/src/InfoViz/Native/ParallelCoordinates/Axis';
 import SelectionBuilder from 'paraviewweb/src/Common/Misc/SelectionBuilder';
@@ -258,7 +257,7 @@ export default class AxesManager {
   }
 
   triggerSelectionChange(reset = true) {
-    setImmediate(() => {
+    setTimeout(() => {
       if (reset) {
         this.selection = null;
       }
@@ -269,7 +268,7 @@ export default class AxesManager {
           listener(selection);
         }
       });
-    });
+    }, 0);
   }
 
   onAxisListChange(callback) {
@@ -282,14 +281,14 @@ export default class AxesManager {
   }
 
   triggerAxisListChange() {
-    setImmediate(() => {
+    setTimeout(() => {
       // Notify listeners
       this.axisListChangeListeners.forEach((listener) => {
         if (listener) {
           listener(this.getAxesPairs());
         }
       });
-    });
+    }, 0);
   }
 
   getSelection() {

diff --git a/src/React/CollapsibleControls/LightControl/index.js b/src/React/CollapsibleControls/LightControl/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { setImmediate } from 'paraviewweb/src/Common/Core';
 import style from 'PVWStyle/ReactCollapsibleControls/LightControl.mcss';
 
 import CollapsibleWidget from '../../Widgets/CollapsibleWidget';
@@ -24,11 +23,11 @@ export default class LightControl extends React.Component {
     const newState = {};
     newState[name] = newVal;
     this.setState(newState);
-    setImmediate(() => {
+    setTimeout(() => {
       this.props.light.setLightProperties({
         lightTerms: newState,
       });
-    });
+    }, 0);
   }
 
   onLightPositionChange(event) {

diff --git a/src/React/CollapsibleControls/ProbeControl/index.js b/src/React/CollapsibleControls/ProbeControl/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { setImmediate } from 'paraviewweb/src/Common/Core';
 import NumberSliderWidget from '../../Widgets/NumberSliderWidget';
 import CollapsibleWidget from '../../Widgets/CollapsibleWidget';
 
@@ -76,7 +75,7 @@ export default class ProbeControl extends React.Component {
       showFieldValue: isProbeOpen,
     });
 
-    setImmediate(() => {
+    setTimeout(() => {
       if (this.props.imageBuilders) {
         Object.keys(this.props.imageBuilders).forEach((key) => {
           const builder = this.props.imageBuilders[key].builder;
@@ -88,7 +87,7 @@ export default class ProbeControl extends React.Component {
         this.props.imageBuilder.setCrossHairEnable(isProbeOpen);
         this.props.imageBuilder.render();
       }
-    });
+    }, 0);
   }
 
   attachImageBuilderListeners(imageBuilder) {

diff --git a/src/React/Containers/OverlayWindow/index.js b/src/React/Containers/OverlayWindow/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { setImmediate } from 'paraviewweb/src/Common/Core';
 import style from 'PVWStyle/ReactContainers/OverlayWindow.mcss';
 
 /* eslint-disable react/no-unused-prop-types */
@@ -364,7 +363,7 @@ export default class OverlayWindow extends React.Component {
     const actionStruct = this.computeActionRegion(evt);
     this.dragHandler = this.mouseMove;
     this.setState({ cursor: actionStruct.cursor, dragging: false });
-    setImmediate(() => this.props.onActive(false, this));
+    setTimeout(() => this.props.onActive(false, this), 0);
   }
 
   render() {

diff --git a/src/React/Viewers/Probe3DViewer/example/index.js b/src/React/Viewers/Probe3DViewer/example/index.js
@@ -3,8 +3,6 @@ import 'normalize.css';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { setImmediate } from 'paraviewweb/src/Common/Core';
-
 import jsonData from 'tonic-arctic-sample-data/data/probe/index.json';
 
 import ImageBuilder from 'paraviewweb/src/Rendering/Image/DataProberImageBuilder';
@@ -27,6 +25,6 @@ ReactDOM.render(
   bodyElement
 );
 
-setImmediate(() => {
+setTimeout(() => {
   dataModel.fetchData();
-});
+}, 0);
diff --git a/src/React/Widgets/TextInputWidget/index.js b/src/React/Widgets/TextInputWidget/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { setImmediate } from 'paraviewweb/src/Common/Core';
 import style from 'PVWStyle/ReactWidgets/TextInputWidget.mcss';
 
 export default class TextInputWidget extends React.Component {
@@ -55,10 +54,10 @@ export default class TextInputWidget extends React.Component {
       this.setState({ valueRep: this.props.value });
       if (this.props.escEndsEdit) {
         // needs to happen at next idle so it happens after setState.
-        setImmediate(() => {
+        setTimeout(() => {
           this.textInput.blur();
           if (!this.props.blurEndsEdit) this.endEditing();
-        });
+        }, 0);
       }
     }
   }