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

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import * as _grafana_data from '@grafana/data';
 import { BusEventWithPayload, PanelData, BusEvent, BusEventType, BusEventHandler, TimeRange, DataQueryRequest, DataTransformContext, DataFrame, PanelPlugin, EventBus, DataQuery, DataSourceApi, Registry, RegistryItem, ScopedVars, AdHocVariableFilter, SelectableValue, MetricFindValue, VariableRefresh as VariableRefresh$1, VariableSort, EventFilterOptions, AnnotationEvent, AnnotationQuery, DataTransformerConfig, PanelMenuItem, FieldConfigSource, PanelModel, AbsoluteTimeRange, InterpolateFunction, IconName as IconName$1, FieldConfig, FieldType, FieldValueMatcherConfig } from '@grafana/data';
-import * as React$1 from 'react';
-import React__default, { CSSProperties, ComponentType } from 'react';
+import React$1, { CSSProperties, ComponentType } from 'react';
 import * as rxjs from 'rxjs';
 import { Observable, Unsubscribable, MonoTypeOperatorFunction, Subscription, ReplaySubject } from 'rxjs';
 import * as _grafana_schema from '@grafana/schema';
@@ -153,7 +152,7 @@ interface SceneLayoutChildOptions {
 interface SceneComponentProps<T> {
     model: T;
 }
-type SceneComponent<TModel> = (props: SceneComponentProps<TModel>) => React__default.ReactElement | null;
+type SceneComponent<TModel> = (props: SceneComponentProps<TModel>) => React$1.ReactElement | null;
 interface SceneDataState extends SceneObjectState {
     data?: PanelData;
 }
@@ -188,7 +187,7 @@ interface SceneObject<TState extends SceneObjectState = SceneObjectState> {
     /** Returns a deep clone this object and all its children */
     clone(state?: Partial<TState>): this;
     /** A React component to use for rendering the object */
-    Component(props: SceneComponentProps<SceneObject<TState>>): React__default.ReactElement | null;
+    Component(props: SceneComponentProps<SceneObject<TState>>): React$1.ReactElement | null;
     /** Force a re-render, should only be needed when variable values change */
     forceRender(): void;
     /** Returns a SceneObjectRef that will resolve to this object */
@@ -514,12 +513,13 @@ interface AdHocFiltersVariableState extends SceneVariableState {
      * The default builder creates a Prometheus/Loki compatible filter expression,
      * this can be overridden to create a different expression based on the current filters.
      */
-    expressionBuilder?: (filters: AdHocVariableFilter[]) => string;
+    expressionBuilder?: AdHocVariableExpressionBuilderFn;
     /**
      * @internal state of the new filter being added
      */
     _wip?: AdHocVariableFilter;
 }
+type AdHocVariableExpressionBuilderFn = (filters: AdHocVariableFilter[]) => string;
 type getTagKeysProvider$1 = (variable: AdHocFiltersVariable, currentKey: string | null) => Promise<{
     replace?: boolean;
     values: MetricFindValue[];
@@ -534,8 +534,8 @@ declare class AdHocFiltersVariable extends SceneObjectBase<AdHocFiltersVariableS
     private _dataSourceSrv;
     protected _urlSync: AdHocFiltersVariableUrlSyncHandler;
     constructor(state: Partial<AdHocFiltersVariableState>);
+    setState(update: Partial<AdHocFiltersVariableState>): void;
     getValue(): VariableValue | undefined;
-    private _updateFilterExpression;
     _updateFilter(filter: AdHocVariableFilter, prop: keyof AdHocVariableFilter, value: string | undefined | null): void;
     _removeFilter(filter: AdHocVariableFilter): void;
     /**
@@ -553,7 +553,7 @@ declare class AdHocFiltersVariable extends SceneObjectBase<AdHocFiltersVariableS
      */
     private _getSceneQueries;
 }
-declare function AdHocFiltersVariableRenderer({ model }: SceneComponentProps<AdHocFiltersVariable>): React__default.JSX.Element;
+declare function AdHocFiltersVariableRenderer({ model }: SceneComponentProps<AdHocFiltersVariable>): JSX.Element;
 
 interface ConstantVariableState extends SceneVariableState {
     value: VariableValue;
@@ -690,7 +690,7 @@ declare class CustomVariable extends MultiValueVariable<CustomVariableState> {
     protected _variableDependency: VariableDependencyConfig<CustomVariableState>;
     constructor(initialState: Partial<CustomVariableState>);
     getValueOptions(args: VariableGetOptionsArgs): Observable<VariableValueOption[]>;
-    static Component: ({ model }: SceneComponentProps<MultiValueVariable>) => React$1.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<MultiValueVariable>) => JSX.Element;
 }
 
 interface DataSourceVariableState extends MultiValueVariableState {
@@ -711,7 +711,7 @@ declare class DataSourceVariable extends MultiValueVariable<DataSourceVariableSt
     protected _variableDependency: VariableDependencyConfig<DataSourceVariableState>;
     constructor(initialState: Partial<DataSourceVariableState>);
     getValueOptions(args: VariableGetOptionsArgs): Observable<VariableValueOption[]>;
-    static Component: ({ model }: SceneComponentProps<MultiValueVariable>) => React$1.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<MultiValueVariable>) => JSX.Element;
 }
 
 interface IntervalVariableState extends SceneVariableState {
@@ -734,7 +734,7 @@ declare class IntervalVariable extends SceneObjectBase<IntervalVariableState> im
     private getAutoRefreshInteval;
     _onChange: (value: SelectableValue<string>) => void;
     validateAndUpdate(): Observable<ValidateAndUpdateResult>;
-    static Component: ({ model }: SceneComponentProps<IntervalVariable>) => React__default.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<IntervalVariable>) => JSX.Element;
 }
 
 interface TextBoxVariableState extends SceneVariableState {
@@ -749,7 +749,7 @@ declare class TextBoxVariable extends SceneObjectBase<TextBoxVariableState> impl
         [x: string]: string;
     };
     updateFromUrl(values: SceneObjectUrlValues): void;
-    static Component: ({ model }: SceneComponentProps<TextBoxVariable>) => React__default.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<TextBoxVariable>) => JSX.Element;
 }
 
 interface QueryRunnerState extends SceneObjectState {
@@ -848,7 +848,7 @@ declare class QueryVariable extends MultiValueVariable<QueryVariableState> {
     private getRequest;
     onSearchChange: (searchFilter: string) => void;
     private _updateOptionsBasedOnSearchFilter;
-    static Component: ({ model }: SceneComponentProps<MultiValueVariable>) => React$1.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<MultiValueVariable>) => JSX.Element;
 }
 
 interface GroupByVariableState extends MultiValueVariableState {
@@ -910,7 +910,7 @@ declare class GroupByVariable extends MultiValueVariable<GroupByVariableState> {
      */
     private _getSceneQueries;
 }
-declare function GroupByVariableRenderer({ model }: SceneComponentProps<MultiValueVariable>): React$1.JSX.Element;
+declare function GroupByVariableRenderer({ model }: SceneComponentProps<MultiValueVariable>): JSX.Element;
 
 declare function isAdHocVariable(variable: SceneVariable): variable is AdHocFiltersVariable;
 declare function isConstantVariable(variable: SceneVariable): variable is ConstantVariable;
@@ -1197,7 +1197,7 @@ declare class AnnotationsDataLayer extends SceneDataLayerBase<AnnotationsDataLay
         traceIds?: string[];
     };
 }
-declare function AnnotationsDataLayerRenderer({ model }: SceneComponentProps<AnnotationsDataLayer>): React__default.JSX.Element;
+declare function AnnotationsDataLayerRenderer({ model }: SceneComponentProps<AnnotationsDataLayer>): JSX.Element;
 
 type index_AnnotationsDataLayer = AnnotationsDataLayer;
 declare const index_AnnotationsDataLayer: typeof AnnotationsDataLayer;
@@ -1295,7 +1295,7 @@ interface SceneDataLayersSetState extends SceneDataLayerProviderState {
 declare class SceneDataLayerSet extends SceneDataLayerSetBase<SceneDataLayersSetState> implements SceneDataLayerProvider {
     constructor(state: Partial<SceneDataLayersSetState>);
     private _onActivate;
-    static Component: ({ model }: SceneComponentProps<SceneDataLayerSet>) => React__default.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<SceneDataLayerSet>) => JSX.Element;
 }
 
 interface SceneDataLayerControlsState extends SceneObjectState {
@@ -1304,7 +1304,7 @@ declare class SceneDataLayerControls extends SceneObjectBase<SceneDataLayerContr
     static Component: typeof SceneDataLayerControlsRenderer;
     constructor();
 }
-declare function SceneDataLayerControlsRenderer({ model }: SceneComponentProps<SceneDataLayerControls>): React__default.JSX.Element;
+declare function SceneDataLayerControlsRenderer({ model }: SceneComponentProps<SceneDataLayerControls>): JSX.Element;
 
 interface SceneDataTransformerState extends SceneDataState {
     /**
@@ -1349,7 +1349,7 @@ interface VariableValueSelectorsState extends SceneObjectState {
 declare class VariableValueSelectors extends SceneObjectBase<VariableValueSelectorsState> {
     static Component: typeof VariableValueSelectorsRenderer;
 }
-declare function VariableValueSelectorsRenderer({ model }: SceneComponentProps<VariableValueSelectors>): React__default.JSX.Element;
+declare function VariableValueSelectorsRenderer({ model }: SceneComponentProps<VariableValueSelectors>): JSX.Element;
 
 interface VariableValueControlState extends SceneObjectState {
     layout?: ControlsLayout;
@@ -1359,7 +1359,7 @@ interface VariableValueControlState extends SceneObjectState {
 declare class VariableValueControl extends SceneObjectBase<VariableValueControlState> {
     static Component: typeof VariableValueControlRenderer;
 }
-declare function VariableValueControlRenderer({ model }: SceneComponentProps<VariableValueControl>): React__default.JSX.Element;
+declare function VariableValueControlRenderer({ model }: SceneComponentProps<VariableValueControl>): JSX.Element;
 
 declare class SceneVariableSet extends SceneObjectBase<SceneVariableSetState> implements SceneVariables {
     /** Variables that have changed in since the activation or since the first manual value change */
@@ -1461,7 +1461,7 @@ declare class TestVariable extends MultiValueVariable<TestVariableState> {
     private getOptions;
     /** Useful from tests */
     signalUpdateCompleted(): void;
-    static Component: ({ model }: SceneComponentProps<MultiValueVariable>) => React$1.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<MultiValueVariable>) => JSX.Element;
 }
 
 interface LocalValueVariableState extends SceneVariableState {
@@ -1530,9 +1530,9 @@ declare class EmbeddedScene extends SceneObjectBase<EmbeddedSceneState> {
      */
     initUrlSync(): void;
 }
-declare function EmbeddedSceneRenderer({ model }: SceneComponentProps<EmbeddedScene>): React__default.JSX.Element;
+declare function EmbeddedSceneRenderer({ model }: SceneComponentProps<EmbeddedScene>): JSX.Element;
 
-declare function VizPanelRenderer({ model }: SceneComponentProps<VizPanel>): React__default.JSX.Element;
+declare function VizPanelRenderer({ model }: SceneComponentProps<VizPanel>): JSX.Element;
 
 interface VizPanelMenuState extends SceneObjectState {
     items?: PanelMenuItem[];
@@ -1542,7 +1542,7 @@ declare class VizPanelMenu extends SceneObjectBase<VizPanelMenuState> {
     addItem(item: PanelMenuItem): void;
     setItems(items: PanelMenuItem[]): void;
 }
-declare function VizPanelMenuRenderer({ model }: SceneComponentProps<VizPanelMenu>): React__default.JSX.Element;
+declare function VizPanelMenuRenderer({ model }: SceneComponentProps<VizPanelMenu>): JSX.Element;
 
 interface VizPanelState<TOptions = {}, TFieldConfig = {}> extends SceneObjectState {
     /**
@@ -1646,7 +1646,7 @@ declare class NestedScene extends SceneObjectBase<NestedSceneState> {
     /** Removes itself from its parent's children array */
     onRemove: () => void;
 }
-declare function NestedSceneRenderer({ model }: SceneComponentProps<NestedScene>): React__default.JSX.Element;
+declare function NestedSceneRenderer({ model }: SceneComponentProps<NestedScene>): JSX.Element;
 
 interface SceneCanvasTextState extends SceneObjectState {
     text: string;
@@ -1660,7 +1660,7 @@ interface SceneCanvasTextState extends SceneObjectState {
  */
 declare class SceneCanvasText extends SceneObjectBase<SceneCanvasTextState> {
     protected _variableDependency: VariableDependencyConfig<SceneCanvasTextState>;
-    static Component: ({ model }: SceneComponentProps<SceneCanvasText>) => React__default.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<SceneCanvasText>) => JSX.Element;
 }
 
 interface ToolbarButtonState extends SceneObjectState {
@@ -1668,7 +1668,7 @@ interface ToolbarButtonState extends SceneObjectState {
     onClick: () => void;
 }
 declare class SceneToolbarButton extends SceneObjectBase<ToolbarButtonState> {
-    static Component: ({ model }: SceneComponentProps<SceneToolbarButton>) => React__default.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<SceneToolbarButton>) => JSX.Element;
 }
 interface SceneToolbarInputState extends SceneObjectState {
     value?: string;
@@ -1676,7 +1676,7 @@ interface SceneToolbarInputState extends SceneObjectState {
     onChange: (value: number) => void;
 }
 declare class SceneToolbarInput extends SceneObjectBase<SceneToolbarInputState> {
-    static Component: ({ model }: SceneComponentProps<SceneToolbarInput>) => React__default.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<SceneToolbarInput>) => JSX.Element;
 }
 
 interface SceneTimePickerState extends SceneObjectState {
@@ -1690,7 +1690,7 @@ declare class SceneTimePicker extends SceneObjectBase<SceneTimePickerState> {
     onMoveBackward: () => void;
     onMoveForward: () => void;
 }
-declare function SceneTimePickerRenderer({ model }: SceneComponentProps<SceneTimePicker>): React__default.JSX.Element;
+declare function SceneTimePickerRenderer({ model }: SceneComponentProps<SceneTimePicker>): JSX.Element;
 
 interface SceneRefreshPickerState extends SceneObjectState {
     refresh: string;
@@ -1718,7 +1718,7 @@ declare class SceneRefreshPicker extends SceneObjectBase<SceneRefreshPickerState
     private calculateAutoRefreshInterval;
     private setupIntervalTimer;
 }
-declare function SceneRefreshPickerRenderer({ model }: SceneComponentProps<SceneRefreshPicker>): React__default.JSX.Element;
+declare function SceneRefreshPickerRenderer({ model }: SceneComponentProps<SceneRefreshPicker>): JSX.Element;
 
 interface TimeRangeCompareProvider {
     getCompareTimeRange(timeRange: TimeRange): TimeRange | undefined;
@@ -1745,7 +1745,7 @@ declare class SceneTimeRangeCompare extends SceneObjectBase<SceneTimeRangeCompar
     getUrlState(): SceneObjectUrlValues;
     updateFromUrl(values: SceneObjectUrlValues): void;
 }
-declare function SceneTimeRangeCompareRenderer({ model }: SceneComponentProps<SceneTimeRangeCompare>): React__default.JSX.Element;
+declare function SceneTimeRangeCompareRenderer({ model }: SceneComponentProps<SceneTimeRangeCompare>): JSX.Element;
 
 interface SceneByFrameRepeaterState extends SceneObjectState {
     body: SceneLayout;
@@ -1754,7 +1754,7 @@ interface SceneByFrameRepeaterState extends SceneObjectState {
 declare class SceneByFrameRepeater extends SceneObjectBase<SceneByFrameRepeaterState> {
     constructor(state: SceneByFrameRepeaterState);
     private performRepeat;
-    static Component: ({ model }: SceneComponentProps<SceneByFrameRepeater>) => React__default.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<SceneByFrameRepeater>) => JSX.Element;
 }
 
 interface SceneByVariableRepeaterState extends SceneObjectState {
@@ -1766,13 +1766,13 @@ declare class SceneByVariableRepeater extends SceneObjectBase<SceneByVariableRep
     protected _variableDependency: VariableDependencyConfig<SceneByVariableRepeaterState>;
     constructor(state: SceneByVariableRepeaterState);
     private performRepeat;
-    static Component: ({ model }: SceneComponentProps<SceneByVariableRepeater>) => React__default.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<SceneByVariableRepeater>) => JSX.Element;
 }
 
 declare class SceneControlsSpacer extends SceneObjectBase {
     constructor();
-    get Component(): (_props: SceneComponentProps<SceneControlsSpacer>) => React__default.JSX.Element;
-    static Component: (_props: SceneComponentProps<SceneControlsSpacer>) => React__default.JSX.Element;
+    get Component(): (_props: SceneComponentProps<SceneControlsSpacer>) => JSX.Element;
+    static Component: (_props: SceneComponentProps<SceneControlsSpacer>) => JSX.Element;
 }
 
 interface SceneFlexItemStateLike extends SceneFlexItemPlacement, SceneObjectState {
@@ -1787,7 +1787,7 @@ declare class SceneFlexLayout extends SceneObjectBase<SceneFlexLayoutState> impl
     toggleDirection(): void;
     isDraggable(): boolean;
 }
-declare function SceneFlexLayoutRenderer({ model, parentState }: SceneFlexItemRenderProps$1<SceneFlexLayout>): React__default.JSX.Element;
+declare function SceneFlexLayoutRenderer({ model, parentState }: SceneFlexItemRenderProps$1<SceneFlexLayout>): JSX.Element;
 interface SceneFlexItemPlacement {
     wrap?: CSSProperties['flexWrap'];
     direction?: CSSProperties['flexDirection'];
@@ -1819,7 +1819,7 @@ interface SceneFlexItemRenderProps$1<T> extends SceneComponentProps<T> {
 declare class SceneFlexItem extends SceneObjectBase<SceneFlexItemState> {
     static Component: typeof SceneFlexItemRenderer;
 }
-declare function SceneFlexItemRenderer({ model, parentState }: SceneFlexItemRenderProps$1<SceneFlexItem>): React__default.JSX.Element;
+declare function SceneFlexItemRenderer({ model, parentState }: SceneFlexItemRenderProps$1<SceneFlexItem>): JSX.Element;
 
 interface SceneCSSGridLayoutState extends SceneObjectState, SceneCSSGridLayoutOptions {
     children: Array<SceneCSSGridItem | SceneObject>;
@@ -1863,7 +1863,7 @@ declare class SceneCSSGridLayout extends SceneObjectBase<SceneCSSGridLayoutState
     constructor(state: Partial<SceneCSSGridLayoutState>);
     isDraggable(): boolean;
 }
-declare function SceneCSSGridLayoutRenderer({ model }: SceneCSSGridItemRenderProps<SceneCSSGridLayout>): React__default.JSX.Element;
+declare function SceneCSSGridLayoutRenderer({ model }: SceneCSSGridItemRenderProps<SceneCSSGridLayout>): JSX.Element;
 interface SceneCSSGridItemPlacement {
     /**
      * True when the item should rendered but not visible.
@@ -1885,9 +1885,9 @@ interface SceneCSSGridItemRenderProps<T> extends SceneComponentProps<T> {
 declare class SceneCSSGridItem extends SceneObjectBase<SceneCSSGridItemState> {
     static Component: typeof SceneCSSGridItemRenderer;
 }
-declare function SceneCSSGridItemRenderer({ model, parentState }: SceneCSSGridItemRenderProps<SceneCSSGridItem>): React__default.JSX.Element;
+declare function SceneCSSGridItemRenderer({ model, parentState }: SceneCSSGridItemRenderProps<SceneCSSGridItem>): JSX.Element;
 
-declare function SceneGridLayoutRenderer({ model }: SceneComponentProps<SceneGridLayout>): React__default.JSX.Element;
+declare function SceneGridLayoutRenderer({ model }: SceneComponentProps<SceneGridLayout>): JSX.Element;
 
 interface SceneGridItemPlacement {
     x?: number;
@@ -1923,7 +1923,7 @@ declare class SceneGridRow extends SceneObjectBase<SceneGridRowState> {
     };
     updateFromUrl(values: SceneObjectUrlValues): void;
 }
-declare function SceneGridRowRenderer({ model }: SceneComponentProps<SceneGridRow>): React__default.JSX.Element;
+declare function SceneGridRowRenderer({ model }: SceneComponentProps<SceneGridRow>): JSX.Element;
 
 interface SceneGridLayoutState extends SceneObjectState {
     /**
@@ -1982,9 +1982,9 @@ interface SceneGridItemState extends SceneGridItemStateLike {
 declare class SceneGridItem extends SceneObjectBase<SceneGridItemState> implements SceneGridItemLike {
     static Component: typeof SceneGridItemRenderer;
 }
-declare function SceneGridItemRenderer({ model }: SceneComponentProps<SceneGridItem>): React__default.JSX.Element;
+declare function SceneGridItemRenderer({ model }: SceneComponentProps<SceneGridItem>): JSX.Element;
 
-declare function SplitLayoutRenderer({ model }: SceneFlexItemRenderProps<SplitLayout>): React__default.JSX.Element;
+declare function SplitLayoutRenderer({ model }: SceneFlexItemRenderProps<SplitLayout>): JSX.Element;
 interface SceneFlexItemRenderProps<T> extends SceneComponentProps<T> {
     parentState?: SceneFlexItemPlacement;
 }
@@ -2084,7 +2084,7 @@ declare class SceneApp extends SceneObjectBase<SceneAppState> implements DataReq
     enrichDataRequest(): {
         app: string;
     };
-    static Component: ({ model }: SceneComponentProps<SceneApp>) => React__default.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<SceneApp>) => JSX.Element;
 }
 /**
  * Caches the the resulting SceneApp returned by the factory function so that it's only called once during the lifetime of the browser tab
@@ -2107,13 +2107,13 @@ declare class SceneAppPage extends SceneObjectBase<SceneAppPageState> implements
 interface SceneAppPageRendererProps extends SceneComponentProps<SceneAppPage> {
     routeProps: RouteComponentProps;
 }
-declare function SceneAppPageRenderer({ model, routeProps }: SceneAppPageRendererProps): React__default.JSX.Element;
+declare function SceneAppPageRenderer({ model, routeProps }: SceneAppPageRendererProps): JSX.Element;
 
 interface SceneReactObjectState<TProps = {}> extends SceneObjectState {
     /**
      * React component to render
      */
-    component?: React__default.ComponentType<TProps>;
+    component?: React$1.ComponentType<TProps>;
     /**
      * Props to pass to the component
      */
@@ -2121,13 +2121,13 @@ interface SceneReactObjectState<TProps = {}> extends SceneObjectState {
     /**
      * Alternative to component and props is just to pass a React node
      */
-    reactNode?: React__default.ReactNode;
+    reactNode?: React$1.ReactNode;
 }
 /**
  * A utility object that can be used to render any React component or ReactNode
  */
 declare class SceneReactObject<TProps = {}> extends SceneObjectBase<SceneReactObjectState<TProps>> {
-    static Component: ({ model }: SceneComponentProps<SceneReactObject>) => string | number | true | Iterable<React__default.ReactNode> | React__default.JSX.Element;
+    static Component: ({ model }: SceneComponentProps<SceneReactObject>) => {};
 }
 
 type StandardFieldConfigInterface<T, C, Prefix extends string> = {
@@ -2442,7 +2442,7 @@ interface Props {
  *
  * This is only exported so that core dashboards can use it.
  */
-declare function SceneDebugger({ scene }: Props): React__default.JSX.Element;
+declare function SceneDebugger({ scene }: Props): JSX.Element;
 
 declare const sceneUtils: {
     getUrlWithAppState: typeof getUrlWithAppState;

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;
 }
@@ -5159,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();
@@ -5167,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;
@@ -5293,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();