@grafana/scenes 6.35.1--canary.1148.17638446145.0 → 6.35.1

package/dist/index.d.ts

@@ -601,10 +601,6 @@ interface SceneDataProvider<T extends SceneObjectState = SceneDataState> extends
     isDataReadyToDisplay?: () => boolean;
     cancelQuery?: () => void;
     getResultsStream(): Observable<SceneDataProviderResult>;
-    /**
-     * Can be used to disable query execution for scene elements that are out of view
-     */
-    isInViewChanged?(isInView: boolean): void;
 }
 interface SceneDataLayerProviderState extends SceneDataState {
     name: string;
@@ -1833,9 +1829,6 @@ declare class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> impleme
      */
     private getClosestExtraQueryProviders;
     private isQueryModeAuto;
-    private _isInView;
-    private _queryNotExecutedWhenOutOfView;
-    isInViewChanged(isInView: boolean): void;
 }
 
 interface DataProviderSharerState extends SceneDataState {

package/dist/index.js

@@ -6491,8 +6491,6 @@ class SceneQueryRunner extends SceneObjectBase {
       this.setState({ data: dataWithLayersApplied, _hasFetchedData: hasFetchedData });
       this._results.next({ origin: this, data: dataWithLayersApplied });
     };
-    this._isInView = true;
-    this._queryNotExecutedWhenOutOfView = false;
     this.addActivationHandler(() => this._onActivate());
   }
   getResultsStream() {
@@ -6714,11 +6712,6 @@ class SceneQueryRunner extends SceneObjectBase {
     if (!this.state.maxDataPoints && this.state.maxDataPointsFromWidth && !this._containerWidth) {
       return;
     }
-    if (this.isQueryModeAuto() && !this._isInView) {
-      this._queryNotExecutedWhenOutOfView = true;
-      return;
-    }
-    this._queryNotExecutedWhenOutOfView = false;
     if (!this._dataLayersSub) {
       this._handleDataLayers();
     }
@@ -6882,13 +6875,6 @@ class SceneQueryRunner extends SceneObjectBase {
     var _a;
     return ((_a = this.state.runQueriesMode) != null ? _a : "auto") === "auto";
   }
-  isInViewChanged(isInView) {
-    writeSceneLog("SceneQueryRunner", `isInViewChanged: ${isInView}`, this.state.key);
-    this._isInView = isInView;
-    if (isInView && this._queryNotExecutedWhenOutOfView) {
-      this.runQueries();
-    }
-  }
 }
 function findFirstDatasource(targets) {
   var _a, _b;
@@ -8329,71 +8315,6 @@ const getStyles$8 = (theme) => ({
   })
 });
 
-function useUniqueId() {
-  var _a;
-  const idRefLazy = React.useRef(void 0);
-  (_a = idRefLazy.current) != null ? _a : idRefLazy.current = lodash.uniqueId();
-  return idRefLazy.current;
-}
-const LazyLoader = React__default.default.forwardRef(
-  ({ children, onLoad, onChange, className, ...rest }, ref) => {
-    const id = useUniqueId();
-    const { hideEmpty } = ui.useStyles2(getStyles$7);
-    const [loaded, setLoaded] = React.useState(false);
-    const [isInView, setIsInView] = React.useState(false);
-    const innerRef = React.useRef(null);
-    React.useImperativeHandle(ref, () => innerRef.current);
-    reactUse.useEffectOnce(() => {
-      LazyLoader.addCallback(id, (entry) => {
-        if (!loaded && entry.isIntersecting) {
-          setLoaded(true);
-          onLoad == null ? void 0 : onLoad();
-        }
-        setIsInView(entry.isIntersecting);
-        onChange == null ? void 0 : onChange(entry.isIntersecting);
-      });
-      const wrapperEl = innerRef.current;
-      if (wrapperEl) {
-        LazyLoader.observer.observe(wrapperEl);
-      }
-      return () => {
-        wrapperEl && LazyLoader.observer.unobserve(wrapperEl);
-        delete LazyLoader.callbacks[id];
-        if (Object.keys(LazyLoader.callbacks).length === 0) {
-          LazyLoader.observer.disconnect();
-        }
-      };
-    });
-    return /* @__PURE__ */ React__default.default.createElement("div", { id, ref: innerRef, className: `${hideEmpty} ${className}`, ...rest }, !loaded || !isInView ? i18n.t("grafana-scenes.components.lazy-loader.placeholder", "\xA0") : /* @__PURE__ */ React__default.default.createElement(LazyLoaderInViewContext.Provider, { value: isInView }, children));
-  }
-);
-function getStyles$7() {
-  return {
-    hideEmpty: css.css({
-      "&:empty": {
-        display: "none"
-      }
-    })
-  };
-}
-LazyLoader.displayName = "LazyLoader";
-LazyLoader.callbacks = {};
-LazyLoader.addCallback = (id, c) => LazyLoader.callbacks[id] = c;
-LazyLoader.observer = new IntersectionObserver(
-  (entries) => {
-    for (const entry of entries) {
-      if (typeof LazyLoader.callbacks[entry.target.id] === "function") {
-        LazyLoader.callbacks[entry.target.id](entry);
-      }
-    }
-  },
-  { rootMargin: "100px" }
-);
-const LazyLoaderInViewContext = React__default.default.createContext(true);
-function useLazyLoaderIsInView() {
-  return React__default.default.useContext(LazyLoaderInViewContext);
-}
-
 function VizPanelRenderer({ model }) {
   var _a;
   const {
@@ -8436,12 +8357,6 @@ function VizPanelRenderer({ model }) {
   const sceneTimeRange = sceneGraph.getTimeRange(model);
   const timeZone = sceneTimeRange.getTimeZone();
   const timeRange = model.getTimeRange(dataWithFieldConfig);
-  const isInView = useLazyLoaderIsInView();
-  React.useEffect(() => {
-    if (dataObject.isInViewChanged) {
-      dataObject.isInViewChanged(isInView);
-    }
-  }, [isInView, dataObject]);
   const titleInterpolated = model.interpolate(title, void 0, "text");
   const alertStateStyles = ui.useStyles2(getAlertStateStyles);
   if (!plugin) {
@@ -9057,15 +8972,21 @@ class SceneDataTransformer extends SceneObjectBase {
     if (data$1.annotations && data$1.annotations.length > 0 && annotationsTransformations.length > 0) {
       streams.push(data.transformDataFrame(annotationsTransformations, (_a = data$1.annotations) != null ? _a : []));
     }
+    let series = [];
+    let annotations = [];
     this._transformSub = rxjs.forkJoin(streams).pipe(
-      rxjs.map((values) => {
-        const transformedSeries = values[0];
-        const transformedAnnotations = values[1];
-        return {
-          ...data$1,
-          series: transformedSeries,
-          annotations: transformedAnnotations != null ? transformedAnnotations : data$1.annotations
-        };
+      rxjs.map((results) => {
+        results.forEach((frames) => {
+          var _a2;
+          for (const frame of frames) {
+            if (((_a2 = frame.meta) == null ? void 0 : _a2.dataTopic) === data.DataTopic.Annotations) {
+              annotations.push(frame);
+            } else {
+              series.push(frame);
+            }
+          }
+        });
+        return { ...data$1, series, annotations };
       }),
       rxjs.catchError((err) => {
         var _a2;
@@ -11303,10 +11224,10 @@ class EmbeddedScene extends SceneObjectBase {
 EmbeddedScene.Component = EmbeddedSceneRenderer;
 function EmbeddedSceneRenderer({ model }) {
   const { body, controls } = model.useState();
-  const styles = ui.useStyles2(getStyles$6);
+  const styles = ui.useStyles2(getStyles$7);
   return /* @__PURE__ */ React__default.default.createElement("div", { className: styles.container }, controls && /* @__PURE__ */ React__default.default.createElement("div", { className: styles.controls }, controls.map((control) => /* @__PURE__ */ React__default.default.createElement(control.Component, { key: control.state.key, model: control }))), /* @__PURE__ */ React__default.default.createElement("div", { className: styles.body }, /* @__PURE__ */ React__default.default.createElement(body.Component, { model: body })));
 }
-const getStyles$6 = (theme) => {
+const getStyles$7 = (theme) => {
   return {
     container: css.css({
       flexGrow: 1,
@@ -11492,6 +11413,67 @@ function isSceneGridLayout(child) {
   return child instanceof SceneGridLayout;
 }
 
+function useUniqueId() {
+  var _a;
+  const idRefLazy = React.useRef(void 0);
+  (_a = idRefLazy.current) != null ? _a : idRefLazy.current = lodash.uniqueId();
+  return idRefLazy.current;
+}
+const LazyLoader = React__default.default.forwardRef(
+  ({ children, onLoad, onChange, className, ...rest }, ref) => {
+    const id = useUniqueId();
+    const { hideEmpty } = ui.useStyles2(getStyles$6);
+    const [loaded, setLoaded] = React.useState(false);
+    const [isInView, setIsInView] = React.useState(false);
+    const innerRef = React.useRef(null);
+    React.useImperativeHandle(ref, () => innerRef.current);
+    reactUse.useEffectOnce(() => {
+      LazyLoader.addCallback(id, (entry) => {
+        if (!loaded && entry.isIntersecting) {
+          setLoaded(true);
+          onLoad == null ? void 0 : onLoad();
+        }
+        setIsInView(entry.isIntersecting);
+        onChange == null ? void 0 : onChange(entry.isIntersecting);
+      });
+      const wrapperEl = innerRef.current;
+      if (wrapperEl) {
+        LazyLoader.observer.observe(wrapperEl);
+      }
+      return () => {
+        wrapperEl && LazyLoader.observer.unobserve(wrapperEl);
+        delete LazyLoader.callbacks[id];
+        if (Object.keys(LazyLoader.callbacks).length === 0) {
+          LazyLoader.observer.disconnect();
+        }
+      };
+    });
+    return /* @__PURE__ */ React__default.default.createElement("div", { id, ref: innerRef, className: `${hideEmpty} ${className}`, ...rest }, !loaded || !isInView ? i18n.t("grafana-scenes.components.lazy-loader.placeholder", "\xA0") : children);
+  }
+);
+function getStyles$6() {
+  return {
+    hideEmpty: css.css({
+      "&:empty": {
+        display: "none"
+      }
+    })
+  };
+}
+LazyLoader.displayName = "LazyLoader";
+LazyLoader.callbacks = {};
+LazyLoader.addCallback = (id, c) => LazyLoader.callbacks[id] = c;
+LazyLoader.observer = new IntersectionObserver(
+  (entries) => {
+    for (const entry of entries) {
+      if (typeof LazyLoader.callbacks[entry.target.id] === "function") {
+        LazyLoader.callbacks[entry.target.id](entry);
+      }
+    }
+  },
+  { rootMargin: "100px" }
+);
+
 function SceneGridLayoutRenderer({ model }) {
   const { children, isLazy, isDraggable, isResizable } = model.useState();
   const [outerDivRef, { width, height }] = reactUse.useMeasure();