@grafana/scenes 4.5.0 → 4.5.2

package/dist/index.d.ts

@@ -901,8 +901,8 @@ declare class GroupByVariable extends MultiValueVariable<GroupByVariableState> {
      * Allows clearing the value of the variable to an empty value. Overrides default behavior of a MultiValueVariable
      */
     getDefaultMultiState(options: VariableValueOption[]): {
-        value: never[];
-        text: never[];
+        value: VariableValueSingle[];
+        text: string[];
     };
     /**
      * Get all queries in the scene that have the same datasource as this AggregationsSet
@@ -1090,7 +1090,7 @@ declare class LiveNowTimer extends SceneObjectBase<LiveNowTimerState> {
     private timerId;
     private static REFRESH_RATE;
     constructor({ enabled }: {
-        enabled?: boolean | undefined;
+        enabled?: boolean;
     });
     private _activationHandler;
     enable(): void;
@@ -1185,18 +1185,18 @@ declare class AnnotationsDataLayer extends SceneDataLayerBase<AnnotationsDataLay
     protected processEvents(query: AnnotationQuery, events: AnnotationQueryResults): {
         state: LoadingState;
         series: _grafana_data.DataFrame[];
-        structureRev?: number | undefined;
-        annotations?: _grafana_data.DataFrame[] | undefined;
-        alertState?: _grafana_data.AlertStateInfo | undefined;
-        request?: _grafana_data.DataQueryRequest<_grafana_data.DataQuery> | undefined;
-        timings?: _grafana_data.DataQueryTimings | undefined;
-        errors?: _grafana_data.DataQueryError[] | undefined;
-        error?: _grafana_data.DataQueryError | undefined;
+        structureRev?: number;
+        annotations?: _grafana_data.DataFrame[];
+        alertState?: _grafana_data.AlertStateInfo;
+        request?: _grafana_data.DataQueryRequest<_grafana_data.DataQuery>;
+        timings?: _grafana_data.DataQueryTimings;
+        errors?: _grafana_data.DataQueryError[];
+        error?: _grafana_data.DataQueryError;
         timeRange: _grafana_data.TimeRange;
-        traceIds?: string[] | undefined;
+        traceIds?: string[];
     };
 }
-declare function AnnotationsDataLayerRenderer({ model }: SceneComponentProps<AnnotationsDataLayer>): JSX.Element | null;
+declare function AnnotationsDataLayerRenderer({ model }: SceneComponentProps<AnnotationsDataLayer>): JSX.Element;
 
 type index_AnnotationsDataLayer = AnnotationsDataLayer;
 declare const index_AnnotationsDataLayer: typeof AnnotationsDataLayer;
@@ -1303,7 +1303,7 @@ declare class SceneDataLayerControls extends SceneObjectBase<SceneDataLayerContr
     static Component: typeof SceneDataLayerControlsRenderer;
     constructor();
 }
-declare function SceneDataLayerControlsRenderer({ model }: SceneComponentProps<SceneDataLayerControls>): JSX.Element | null;
+declare function SceneDataLayerControlsRenderer({ model }: SceneComponentProps<SceneDataLayerControls>): JSX.Element;
 
 interface SceneDataTransformerState extends SceneDataState {
     /**
@@ -1358,7 +1358,7 @@ interface VariableValueControlState extends SceneObjectState {
 declare class VariableValueControl extends SceneObjectBase<VariableValueControlState> {
     static Component: typeof VariableValueControlRenderer;
 }
-declare function VariableValueControlRenderer({ model }: SceneComponentProps<VariableValueControl>): JSX.Element | null;
+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 */
@@ -1689,7 +1689,7 @@ declare class SceneTimePicker extends SceneObjectBase<SceneTimePickerState> {
     onMoveBackward: () => void;
     onMoveForward: () => void;
 }
-declare function SceneTimePickerRenderer({ model }: SceneComponentProps<SceneTimePicker>): JSX.Element | null;
+declare function SceneTimePickerRenderer({ model }: SceneComponentProps<SceneTimePicker>): JSX.Element;
 
 interface SceneRefreshPickerState extends SceneObjectState {
     refresh: string;
@@ -1785,7 +1785,7 @@ declare class SceneFlexLayout extends SceneObjectBase<SceneFlexLayoutState> impl
     toggleDirection(): void;
     isDraggable(): boolean;
 }
-declare function SceneFlexLayoutRenderer({ model, parentState }: SceneFlexItemRenderProps$1<SceneFlexLayout>): JSX.Element | null;
+declare function SceneFlexLayoutRenderer({ model, parentState }: SceneFlexItemRenderProps$1<SceneFlexLayout>): JSX.Element;
 interface SceneFlexItemPlacement {
     wrap?: CSSProperties['flexWrap'];
     direction?: CSSProperties['flexDirection'];
@@ -1817,7 +1817,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>): JSX.Element | null;
+declare function SceneFlexItemRenderer({ model, parentState }: SceneFlexItemRenderProps$1<SceneFlexItem>): JSX.Element;
 
 interface SceneCSSGridLayoutState extends SceneObjectState, SceneCSSGridLayoutOptions {
     children: Array<SceneCSSGridItem | SceneObject>;
@@ -1861,7 +1861,7 @@ declare class SceneCSSGridLayout extends SceneObjectBase<SceneCSSGridLayoutState
     constructor(state: Partial<SceneCSSGridLayoutState>);
     isDraggable(): boolean;
 }
-declare function SceneCSSGridLayoutRenderer({ model }: SceneCSSGridItemRenderProps<SceneCSSGridLayout>): JSX.Element | null;
+declare function SceneCSSGridLayoutRenderer({ model }: SceneCSSGridItemRenderProps<SceneCSSGridLayout>): JSX.Element;
 interface SceneCSSGridItemPlacement {
     /**
      * True when the item should rendered but not visible.
@@ -1883,7 +1883,7 @@ interface SceneCSSGridItemRenderProps<T> extends SceneComponentProps<T> {
 declare class SceneCSSGridItem extends SceneObjectBase<SceneCSSGridItemState> {
     static Component: typeof SceneCSSGridItemRenderer;
 }
-declare function SceneCSSGridItemRenderer({ model, parentState }: SceneCSSGridItemRenderProps<SceneCSSGridItem>): JSX.Element | null;
+declare function SceneCSSGridItemRenderer({ model, parentState }: SceneCSSGridItemRenderProps<SceneCSSGridItem>): JSX.Element;
 
 declare function SceneGridLayoutRenderer({ model }: SceneComponentProps<SceneGridLayout>): JSX.Element;
 
@@ -1925,7 +1925,7 @@ declare function SceneGridRowRenderer({ model }: SceneComponentProps<SceneGridRo
 
 interface SceneGridLayoutState extends SceneObjectState {
     /**
-     * Turn on or off dragging for all items. Indiviadual items can still disabled via isDraggable property
+     * Turn on or off dragging for all items. Individual items can still disabled via isDraggable property
      **/
     isDraggable?: boolean;
     /** Enable or disable item resizing */
@@ -1942,6 +1942,8 @@ interface SceneGridLayoutState extends SceneObjectState {
 declare class SceneGridLayout extends SceneObjectBase<SceneGridLayoutState> implements SceneLayout {
     static Component: typeof SceneGridLayoutRenderer;
     private _skipOnLayoutChange;
+    private _oldLayout;
+    private _loadOldLayout;
     constructor(state: SceneGridLayoutState);
     /**
      * SceneLayout interface. Used for example by VizPanelRenderer
@@ -1958,14 +1960,15 @@ declare class SceneGridLayout extends SceneObjectBase<SceneGridLayoutState> impl
     onResizeStop: ReactGridLayout.ItemCallback;
     private pushChildDown;
     /**
-     *  We assume the layout array is storted according to y pos, and walk upwards until we find a row.
+     *  We assume the layout array is sorted according to y pos, and walk upwards until we find a row.
      *  If it is collapsed there is no row to add it to. The default is then to return the SceneGridLayout itself
      */
     private findGridItemSceneParent;
     /**
-     * This likely needs a slighltly different approach. Where we clone or deactivate or and re-activate the moved child
+     * This likely needs a slightly different approach. Where we clone or deactivate or and re-activate the moved child
      */
     moveChildTo(child: SceneGridItemLike, target: SceneGridLayout | SceneGridRow): SceneGridItemLike[];
+    onDragStart: ReactGridLayout.ItemCallback;
     onDragStop: ReactGridLayout.ItemCallback;
     private toGridCell;
     buildGridLayout(width: number, height: number): ReactGridLayout.Layout[];
@@ -1977,9 +1980,9 @@ interface SceneGridItemState extends SceneGridItemStateLike {
 declare class SceneGridItem extends SceneObjectBase<SceneGridItemState> implements SceneGridItemLike {
     static Component: typeof SceneGridItemRenderer;
 }
-declare function SceneGridItemRenderer({ model }: SceneComponentProps<SceneGridItem>): JSX.Element | null;
+declare function SceneGridItemRenderer({ model }: SceneComponentProps<SceneGridItem>): JSX.Element;
 
-declare function SplitLayoutRenderer({ model }: SceneFlexItemRenderProps<SplitLayout>): JSX.Element | null;
+declare function SplitLayoutRenderer({ model }: SceneFlexItemRenderProps<SplitLayout>): JSX.Element;
 interface SceneFlexItemRenderProps<T> extends SceneComponentProps<T> {
     parentState?: SceneFlexItemPlacement;
 }
@@ -2097,7 +2100,7 @@ declare class SceneAppPage extends SceneObjectBase<SceneAppPageState> implements
     initializeScene(scene: EmbeddedScene): void;
     getScene(routeMatch: SceneRouteMatch): EmbeddedScene;
     getDrilldownPage(drilldown: SceneAppDrilldownView, routeMatch: SceneRouteMatch<{}>): SceneAppPageLike;
-    enrichDataRequest(source: SceneObject): Partial<_grafana_data.DataQueryRequest<_grafana_data.DataQuery>> | null;
+    enrichDataRequest(source: SceneObject): Partial<_grafana_data.DataQueryRequest<_grafana_data.DataQuery>>;
 }
 interface SceneAppPageRendererProps extends SceneComponentProps<SceneAppPage> {
     routeProps: RouteComponentProps;
@@ -2122,7 +2125,7 @@ interface SceneReactObjectState<TProps = {}> extends SceneObjectState {
  * 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>) => {} | null;
+    static Component: ({ model }: SceneComponentProps<SceneReactObject>) => {};
 }
 
 type StandardFieldConfigInterface<T, C, Prefix extends string> = {
@@ -2275,7 +2278,7 @@ declare class VizPanelBuilder<TOptions extends {}, TFieldConfig extends {}> impl
 declare class PanelOptionsBuilder<TOptions extends {} = {}> {
     private defaultOptions?;
     private _options;
-    constructor(defaultOptions?: (() => Partial<TOptions>) | undefined);
+    constructor(defaultOptions?: () => Partial<TOptions>);
     private setDefaults;
     /**
      * Set an individual panel option. This will merge the value with the existing options.
@@ -2312,7 +2315,7 @@ declare class FieldConfigBuilder<TFieldConfig extends {}> implements StandardFie
     private defaultFieldConfig?;
     private _fieldConfig;
     private _overridesBuilder;
-    constructor(defaultFieldConfig?: (() => TFieldConfig) | undefined);
+    constructor(defaultFieldConfig?: () => TFieldConfig);
     private setDefaults;
     /**
      * Set color.

package/dist/index.js

@@ -1546,7 +1546,7 @@ function getQueryController(sceneObject) {
     }
     parent = parent.parent;
   }
-  return parent;
+  return void 0;
 }
 
 class SkipFormattingValue {
@@ -6590,8 +6590,9 @@ function createQueryVariableRunnerFactory(datasource) {
 }
 let createQueryVariableRunner = createQueryVariableRunnerFactory;
 function ensureVariableQueryModelIsADataQuery(variable) {
-  const query = variable.state.query;
-  if (!query || typeof query !== "object") {
+  var _a;
+  const query = (_a = variable.state.query) != null ? _a : "";
+  if (typeof query === "string") {
     return { query, refId: `variable-${variable.state.name}` };
   }
   if (query.refId == null) {
@@ -7681,6 +7682,7 @@ function SceneGridLayoutRenderer({ model }) {
       draggableHandle: `.grid-drag-handle-${model.state.key}`,
       draggableCancel: ".grid-drag-cancel",
       layout,
+      onDragStart: model.onDragStart,
       onDragStop: model.onDragStop,
       onResizeStop: model.onResizeStop,
       onLayoutChange: model.onLayoutChange,
@@ -7830,11 +7832,17 @@ const _SceneGridLayout = class extends SceneObjectBase {
       children: sortChildrenByPosition(state.children)
     }));
     this._skipOnLayoutChange = false;
+    this._oldLayout = [];
+    this._loadOldLayout = false;
     this.onLayoutChange = (layout) => {
       if (this._skipOnLayoutChange) {
         this._skipOnLayoutChange = false;
         return;
       }
+      if (this._loadOldLayout) {
+        layout = [...this._oldLayout];
+        this._loadOldLayout = false;
+      }
       for (const item of layout) {
         const child = this.getSceneLayoutChild(item.i);
         const nextSize = {
@@ -7856,6 +7864,9 @@ const _SceneGridLayout = class extends SceneObjectBase {
         height: n.h
       });
     };
+    this.onDragStart = (gridLayout) => {
+      this._oldLayout = [...gridLayout];
+    };
     this.onDragStop = (gridLayout, o, updatedItem) => {
       const sceneChild = this.getSceneLayoutChild(updatedItem.i);
       gridLayout = sortGridLayout(gridLayout);
@@ -7871,8 +7882,12 @@ const _SceneGridLayout = class extends SceneObjectBase {
         }
       }
       const indexOfUpdatedItem = gridLayout.findIndex((item) => item.i === updatedItem.i);
-      const newParent = this.findGridItemSceneParent(gridLayout, indexOfUpdatedItem - 1);
+      let newParent = this.findGridItemSceneParent(gridLayout, indexOfUpdatedItem - 1);
       let newChildren = this.state.children;
+      if (sceneChild instanceof SceneGridRow && newParent instanceof SceneGridRow) {
+        this._loadOldLayout = true;
+        newParent = this;
+      }
       if (newParent !== sceneChild.parent) {
         newChildren = this.moveChildTo(sceneChild, newParent);
       }