@grafana/scenes 4.5.5--canary.674.8612605644.0 → 4.5.5

package/dist/index.js

@@ -421,11 +421,17 @@ function useSceneObjectState(model) {
   const [_, setState] = React.useState(model.state);
   const stateAtFirstRender = model.state;
   React.useEffect(() => {
-    const s = model.subscribeToState(setState);
+    const unactivate = model.activate();
+    const s = model.subscribeToState((state) => {
+      setState(state);
+    });
     if (model.state !== stateAtFirstRender) {
       setState(model.state);
     }
-    return () => s.unsubscribe();
+    return () => {
+      s.unsubscribe();
+      unactivate();
+    };
   }, [model]);
   return model.state;
 }
@@ -2274,7 +2280,6 @@ function VizPanelRenderer({ model }) {
     _pluginLoadError,
     displayMode,
     hoverHeader,
-    hoverHeaderOffset,
     menu,
     headerActions,
     titleItems,
@@ -2387,7 +2392,6 @@ function VizPanelRenderer({ model }) {
     height,
     displayMode,
     hoverHeader,
-    hoverHeaderOffset,
     titleItems: titleItemsElement,
     dragClass,
     actions: actionsElement,
@@ -5161,7 +5165,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
       filters: [],
       datasource: null,
       applyMode: "auto",
-      filterExpression: (_b = state.filterExpression) != null ? _b : renderExpression(state)
+      filterExpression: (_b = state.filterExpression) != null ? _b : renderExpression(state.expressionBuilder, state.filters)
     }, state));
     this._scopedVars = { __sceneObject: { value: this } };
     this._dataSourceSrv = runtime.getDataSourceSrv();
@@ -5169,30 +5173,21 @@ class AdHocFiltersVariable extends SceneObjectBase {
     if (this.state.applyMode === "auto") {
       patchGetAdhocFilters(this);
     }
-    this.addActivationHandler(() => {
-      this._subs.add(
-        this.subscribeToState((newState, prevState) => {
-          if (newState.filters !== prevState.filters) {
-            this._updateFilterExpression(newState, true);
-          }
-        })
-      );
-      this._updateFilterExpression(this.state, false);
-    });
   }
-  getValue() {
-    return this.state.filterExpression;
-  }
-  _updateFilterExpression(state, publishEvent) {
-    let expr = renderExpression(state);
-    if (expr === this.state.filterExpression) {
-      return;
+  setState(update) {
+    let filterExpressionChanged = false;
+    if (update.filters && update.filters !== this.state.filters && !update.filterExpression) {
+      update.filterExpression = renderExpression(this.state.expressionBuilder, update.filters);
+      filterExpressionChanged = update.filterExpression !== this.state.filterExpression;
     }
-    this.setState({ filterExpression: expr });
-    if (publishEvent) {
+    super.setState(update);
+    if (filterExpressionChanged) {
       this.publishEvent(new SceneVariableValueChangedEvent(this), true);
     }
   }
+  getValue() {
+    return this.state.filterExpression;
+  }
   _updateFilter(filter, prop, value) {
     if (value == null) {
       return;
@@ -5295,9 +5290,8 @@ class AdHocFiltersVariable extends SceneObjectBase {
   }
 }
 AdHocFiltersVariable.Component = AdHocFiltersVariableRenderer;
-function renderExpression(state) {
-  var _a, _b;
-  return ((_a = state.expressionBuilder) != null ? _a : renderPrometheusLabelFilters)((_b = state.filters) != null ? _b : []);
+function renderExpression(builder, filters) {
+  return (builder != null ? builder : renderPrometheusLabelFilters)(filters != null ? filters : []);
 }
 function AdHocFiltersVariableRenderer({ model }) {
   const { filters, readOnly, addFilterButtonText } = model.useState();