@grafana/scenes 5.4.1 → 5.4.2--canary.830.9989651797.0

package/dist/index.js

@@ -14,6 +14,8 @@ var ui = require('@grafana/ui');
 var e2eSelectors = require('@grafana/e2e-selectors');
 var css = require('@emotion/css');
 var uFuzzy = require('@leeoniya/ufuzzy');
+var react = require('@floating-ui/react');
+var reactDom = require('react-dom');
 var reactUse = require('react-use');
 var operators = require('rxjs/operators');
 var ReactGridLayout = require('react-grid-layout');
@@ -41,19 +43,19 @@ var uFuzzy__default = /*#__PURE__*/_interopDefaultLegacy(uFuzzy);
 var ReactGridLayout__default = /*#__PURE__*/_interopDefaultLegacy(ReactGridLayout);
 var AutoSizer__default = /*#__PURE__*/_interopDefaultLegacy(AutoSizer);
 
-var __defProp$K = Object.defineProperty;
-var __getOwnPropSymbols$K = Object.getOwnPropertySymbols;
-var __hasOwnProp$K = Object.prototype.hasOwnProperty;
-var __propIsEnum$K = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$K = (a, b) => {
+var __defProp$L = Object.defineProperty;
+var __getOwnPropSymbols$L = Object.getOwnPropertySymbols;
+var __hasOwnProp$L = Object.prototype.hasOwnProperty;
+var __propIsEnum$L = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$L = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$K.call(b, prop))
-      __defNormalProp$K(a, prop, b[prop]);
-  if (__getOwnPropSymbols$K)
-    for (var prop of __getOwnPropSymbols$K(b)) {
-      if (__propIsEnum$K.call(b, prop))
-        __defNormalProp$K(a, prop, b[prop]);
+    if (__hasOwnProp$L.call(b, prop))
+      __defNormalProp$L(a, prop, b[prop]);
+  if (__getOwnPropSymbols$L)
+    for (var prop of __getOwnPropSymbols$L(b)) {
+      if (__propIsEnum$L.call(b, prop))
+        __defNormalProp$L(a, prop, b[prop]);
     }
   return a;
 };
@@ -62,7 +64,7 @@ function useAppQueryParams() {
   return runtime.locationSearchToObject(location.search || "");
 }
 function getUrlWithAppState(path, preserveParams) {
-  const paramsCopy = __spreadValues$K({}, runtime.locationService.getSearchObject());
+  const paramsCopy = __spreadValues$L({}, runtime.locationService.getSearchObject());
   if (preserveParams) {
     for (const key of Object.keys(paramsCopy)) {
       if (!preserveParams.includes(key)) {
@@ -76,31 +78,31 @@ function renderSceneComponentWithRouteProps(sceneObject, routeProps) {
   return React__default["default"].createElement(sceneObject.Component, { model: sceneObject, routeProps });
 }
 
-var __defProp$J = Object.defineProperty;
-var __defProps$t = Object.defineProperties;
-var __getOwnPropDescs$t = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$J = Object.getOwnPropertySymbols;
-var __hasOwnProp$J = Object.prototype.hasOwnProperty;
-var __propIsEnum$J = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$J = (a, b) => {
+var __defProp$K = Object.defineProperty;
+var __defProps$u = Object.defineProperties;
+var __getOwnPropDescs$u = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$K = Object.getOwnPropertySymbols;
+var __hasOwnProp$K = Object.prototype.hasOwnProperty;
+var __propIsEnum$K = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$K = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$J.call(b, prop))
-      __defNormalProp$J(a, prop, b[prop]);
-  if (__getOwnPropSymbols$J)
-    for (var prop of __getOwnPropSymbols$J(b)) {
-      if (__propIsEnum$J.call(b, prop))
-        __defNormalProp$J(a, prop, b[prop]);
+    if (__hasOwnProp$K.call(b, prop))
+      __defNormalProp$K(a, prop, b[prop]);
+  if (__getOwnPropSymbols$K)
+    for (var prop of __getOwnPropSymbols$K(b)) {
+      if (__propIsEnum$K.call(b, prop))
+        __defNormalProp$K(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$t = (a, b) => __defProps$t(a, __getOwnPropDescs$t(b));
+var __spreadProps$u = (a, b) => __defProps$u(a, __getOwnPropDescs$u(b));
 const runtimePanelPlugins = /* @__PURE__ */ new Map();
 function registerRuntimePanelPlugin({ pluginId, plugin }) {
   if (runtimePanelPlugins.has(pluginId)) {
     throw new Error(`A runtime panel plugin with id ${pluginId} has already been registered`);
   }
-  plugin.meta = __spreadProps$t(__spreadValues$J({}, plugin.meta), {
+  plugin.meta = __spreadProps$u(__spreadValues$K({}, plugin.meta), {
     id: pluginId,
     name: pluginId,
     module: "runtime plugin",
@@ -128,39 +130,39 @@ function loadPanelPluginSync(pluginId) {
   return (_a = getPanelPluginFromCache(pluginId)) != null ? _a : runtimePanelPlugins.get(pluginId);
 }
 
-var __defProp$I = Object.defineProperty;
-var __defProps$s = Object.defineProperties;
-var __getOwnPropDescs$s = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$I = Object.getOwnPropertySymbols;
-var __hasOwnProp$I = Object.prototype.hasOwnProperty;
-var __propIsEnum$I = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$I = (a, b) => {
+var __defProp$J = Object.defineProperty;
+var __defProps$t = Object.defineProperties;
+var __getOwnPropDescs$t = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$J = Object.getOwnPropertySymbols;
+var __hasOwnProp$J = Object.prototype.hasOwnProperty;
+var __propIsEnum$J = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$J = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$I.call(b, prop))
-      __defNormalProp$I(a, prop, b[prop]);
-  if (__getOwnPropSymbols$I)
-    for (var prop of __getOwnPropSymbols$I(b)) {
-      if (__propIsEnum$I.call(b, prop))
-        __defNormalProp$I(a, prop, b[prop]);
+    if (__hasOwnProp$J.call(b, prop))
+      __defNormalProp$J(a, prop, b[prop]);
+  if (__getOwnPropSymbols$J)
+    for (var prop of __getOwnPropSymbols$J(b)) {
+      if (__propIsEnum$J.call(b, prop))
+        __defNormalProp$J(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$s = (a, b) => __defProps$s(a, __getOwnPropDescs$s(b));
-var __objRest$4 = (source, exclude) => {
+var __spreadProps$t = (a, b) => __defProps$t(a, __getOwnPropDescs$t(b));
+var __objRest$5 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$I.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$J.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$I)
-    for (var prop of __getOwnPropSymbols$I(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$I.call(source, prop))
+  if (source != null && __getOwnPropSymbols$J)
+    for (var prop of __getOwnPropSymbols$J(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$J.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
 };
 function SceneComponentWrapperWithoutMemo(_a) {
-  var _b = _a, { model } = _b, otherProps = __objRest$4(_b, ["model"]);
+  var _b = _a, { model } = _b, otherProps = __objRest$5(_b, ["model"]);
   var _a2;
   const Component = (_a2 = model.constructor["Component"]) != null ? _a2 : EmptyRenderer;
   const [_, setValue] = React.useState(0);
@@ -172,7 +174,7 @@ function SceneComponentWrapperWithoutMemo(_a) {
   if (!model.isActive) {
     return null;
   }
-  return /* @__PURE__ */ React__default["default"].createElement(Component, __spreadProps$s(__spreadValues$I({}, otherProps), {
+  return /* @__PURE__ */ React__default["default"].createElement(Component, __spreadProps$t(__spreadValues$J({}, otherProps), {
     model
   }));
 }
@@ -218,19 +220,19 @@ class SceneObjectRef {
 }
 _ref = new WeakMap();
 
-var __defProp$H = Object.defineProperty;
-var __getOwnPropSymbols$H = Object.getOwnPropertySymbols;
-var __hasOwnProp$H = Object.prototype.hasOwnProperty;
-var __propIsEnum$H = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$H = (a, b) => {
+var __defProp$I = Object.defineProperty;
+var __getOwnPropSymbols$I = Object.getOwnPropertySymbols;
+var __hasOwnProp$I = Object.prototype.hasOwnProperty;
+var __propIsEnum$I = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$I = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$H.call(b, prop))
-      __defNormalProp$H(a, prop, b[prop]);
-  if (__getOwnPropSymbols$H)
-    for (var prop of __getOwnPropSymbols$H(b)) {
-      if (__propIsEnum$H.call(b, prop))
-        __defNormalProp$H(a, prop, b[prop]);
+    if (__hasOwnProp$I.call(b, prop))
+      __defNormalProp$I(a, prop, b[prop]);
+  if (__getOwnPropSymbols$I)
+    for (var prop of __getOwnPropSymbols$I(b)) {
+      if (__propIsEnum$I.call(b, prop))
+        __defNormalProp$I(a, prop, b[prop]);
     }
   return a;
 };
@@ -290,7 +292,7 @@ class SceneObjectBase {
   }
   setState(update) {
     const prevState = this._state;
-    const newState = __spreadValues$H(__spreadValues$H({}, this._state), update);
+    const newState = __spreadValues$I(__spreadValues$I({}, this._state), update);
     this._state = Object.freeze(newState);
     this._setParent(update);
     this._handleActivationOfChangedStateProps(prevState, newState);
@@ -486,19 +488,19 @@ function forEachChild(state, callback) {
   }
 }
 
-var __defProp$G = Object.defineProperty;
-var __getOwnPropSymbols$G = Object.getOwnPropertySymbols;
-var __hasOwnProp$G = Object.prototype.hasOwnProperty;
-var __propIsEnum$G = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$G = (a, b) => {
+var __defProp$H = Object.defineProperty;
+var __getOwnPropSymbols$H = Object.getOwnPropertySymbols;
+var __hasOwnProp$H = Object.prototype.hasOwnProperty;
+var __propIsEnum$H = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$H = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$G.call(b, prop))
-      __defNormalProp$G(a, prop, b[prop]);
-  if (__getOwnPropSymbols$G)
-    for (var prop of __getOwnPropSymbols$G(b)) {
-      if (__propIsEnum$G.call(b, prop))
-        __defNormalProp$G(a, prop, b[prop]);
+    if (__hasOwnProp$H.call(b, prop))
+      __defNormalProp$H(a, prop, b[prop]);
+  if (__getOwnPropSymbols$H)
+    for (var prop of __getOwnPropSymbols$H(b)) {
+      if (__propIsEnum$H.call(b, prop))
+        __defNormalProp$H(a, prop, b[prop]);
     }
   return a;
 };
@@ -507,7 +509,7 @@ function cloneSceneObject(sceneObject, withState) {
   return new sceneObject.constructor(clonedState);
 }
 function cloneSceneObjectState(sceneState, withState) {
-  const clonedState = __spreadValues$G({}, sceneState);
+  const clonedState = __spreadValues$H({}, sceneState);
   for (const key in clonedState) {
     const propValue = clonedState[key];
     if (propValue instanceof SceneObjectBase) {
@@ -604,25 +606,25 @@ function lookupVariable(name, sceneObject) {
   return null;
 }
 
-var __defProp$F = Object.defineProperty;
-var __getOwnPropSymbols$F = Object.getOwnPropertySymbols;
-var __hasOwnProp$F = Object.prototype.hasOwnProperty;
-var __propIsEnum$F = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$F = (a, b) => {
+var __defProp$G = Object.defineProperty;
+var __getOwnPropSymbols$G = Object.getOwnPropertySymbols;
+var __hasOwnProp$G = Object.prototype.hasOwnProperty;
+var __propIsEnum$G = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$G = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$F.call(b, prop))
-      __defNormalProp$F(a, prop, b[prop]);
-  if (__getOwnPropSymbols$F)
-    for (var prop of __getOwnPropSymbols$F(b)) {
-      if (__propIsEnum$F.call(b, prop))
-        __defNormalProp$F(a, prop, b[prop]);
+    if (__hasOwnProp$G.call(b, prop))
+      __defNormalProp$G(a, prop, b[prop]);
+  if (__getOwnPropSymbols$G)
+    for (var prop of __getOwnPropSymbols$G(b)) {
+      if (__propIsEnum$G.call(b, prop))
+        __defNormalProp$G(a, prop, b[prop]);
     }
   return a;
 };
 class SceneDataNode extends SceneObjectBase {
   constructor(state) {
-    super(__spreadValues$F({
+    super(__spreadValues$G({
       data: emptyPanelData
     }, state));
   }
@@ -703,19 +705,19 @@ function evaluateTimeRange(from, to, timeZone, fiscalYearStartMonth, delay) {
   };
 }
 
-var __defProp$E = Object.defineProperty;
-var __getOwnPropSymbols$E = Object.getOwnPropertySymbols;
-var __hasOwnProp$E = Object.prototype.hasOwnProperty;
-var __propIsEnum$E = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$E = (a, b) => {
+var __defProp$F = Object.defineProperty;
+var __getOwnPropSymbols$F = Object.getOwnPropertySymbols;
+var __hasOwnProp$F = Object.prototype.hasOwnProperty;
+var __propIsEnum$F = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$F = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$E.call(b, prop))
-      __defNormalProp$E(a, prop, b[prop]);
-  if (__getOwnPropSymbols$E)
-    for (var prop of __getOwnPropSymbols$E(b)) {
-      if (__propIsEnum$E.call(b, prop))
-        __defNormalProp$E(a, prop, b[prop]);
+    if (__hasOwnProp$F.call(b, prop))
+      __defNormalProp$F(a, prop, b[prop]);
+  if (__getOwnPropSymbols$F)
+    for (var prop of __getOwnPropSymbols$F(b)) {
+      if (__propIsEnum$F.call(b, prop))
+        __defNormalProp$F(a, prop, b[prop]);
     }
   return a;
 };
@@ -732,7 +734,7 @@ class SceneTimeRange extends SceneObjectBase {
       state.fiscalYearStartMonth,
       state.UNSAFE_nowDelay
     );
-    super(__spreadValues$E({ from, to, timeZone, value }, state));
+    super(__spreadValues$F({ from, to, timeZone, value }, state));
     this._urlSync = new SceneObjectUrlSyncConfig(this, { keys: ["from", "to", "timezone"] });
     this.onTimeRangeChange = (timeRange) => {
       const update = {};
@@ -1362,25 +1364,25 @@ function collectAllVariables(sceneObject, record = {}) {
   return record;
 }
 
-var __defProp$D = Object.defineProperty;
-var __defProps$r = Object.defineProperties;
-var __getOwnPropDescs$r = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$D = Object.getOwnPropertySymbols;
-var __hasOwnProp$D = Object.prototype.hasOwnProperty;
-var __propIsEnum$D = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$D = (obj, key, value) => key in obj ? __defProp$D(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$D = (a, b) => {
+var __defProp$E = Object.defineProperty;
+var __defProps$s = Object.defineProperties;
+var __getOwnPropDescs$s = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$E = Object.getOwnPropertySymbols;
+var __hasOwnProp$E = Object.prototype.hasOwnProperty;
+var __propIsEnum$E = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$E = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$D.call(b, prop))
-      __defNormalProp$D(a, prop, b[prop]);
-  if (__getOwnPropSymbols$D)
-    for (var prop of __getOwnPropSymbols$D(b)) {
-      if (__propIsEnum$D.call(b, prop))
-        __defNormalProp$D(a, prop, b[prop]);
+    if (__hasOwnProp$E.call(b, prop))
+      __defNormalProp$E(a, prop, b[prop]);
+  if (__getOwnPropSymbols$E)
+    for (var prop of __getOwnPropSymbols$E(b)) {
+      if (__propIsEnum$E.call(b, prop))
+        __defNormalProp$E(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$r = (a, b) => __defProps$r(a, __getOwnPropDescs$r(b));
+var __spreadProps$s = (a, b) => __defProps$s(a, __getOwnPropDescs$s(b));
 function getTemplateProxyForField(field, frame, frames) {
   return new Proxy(
     {},
@@ -1396,7 +1398,7 @@ function getTemplateProxyForField(field, frame, frames) {
           if (!field.labels) {
             return "";
           }
-          return __spreadProps$r(__spreadValues$D({}, field.labels), {
+          return __spreadProps$s(__spreadValues$E({}, field.labels), {
             __values: Object.values(field.labels).sort().join(", "),
             toString: () => {
               return data.formatLabels(field.labels, "", true);
@@ -2281,25 +2283,25 @@ function isExtraQueryProvider(obj) {
   return typeof obj === "object" && "getExtraQueries" in obj;
 }
 
-var __defProp$C = Object.defineProperty;
-var __defProps$q = Object.defineProperties;
-var __getOwnPropDescs$q = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$C = Object.getOwnPropertySymbols;
-var __hasOwnProp$C = Object.prototype.hasOwnProperty;
-var __propIsEnum$C = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$C = (obj, key, value) => key in obj ? __defProp$C(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$C = (a, b) => {
+var __defProp$D = Object.defineProperty;
+var __defProps$r = Object.defineProperties;
+var __getOwnPropDescs$r = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$D = Object.getOwnPropertySymbols;
+var __hasOwnProp$D = Object.prototype.hasOwnProperty;
+var __propIsEnum$D = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$D = (obj, key, value) => key in obj ? __defProp$D(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$D = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$C.call(b, prop))
-      __defNormalProp$C(a, prop, b[prop]);
-  if (__getOwnPropSymbols$C)
-    for (var prop of __getOwnPropSymbols$C(b)) {
-      if (__propIsEnum$C.call(b, prop))
-        __defNormalProp$C(a, prop, b[prop]);
+    if (__hasOwnProp$D.call(b, prop))
+      __defNormalProp$D(a, prop, b[prop]);
+  if (__getOwnPropSymbols$D)
+    for (var prop of __getOwnPropSymbols$D(b)) {
+      if (__propIsEnum$D.call(b, prop))
+        __defNormalProp$D(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$q = (a, b) => __defProps$q(a, __getOwnPropDescs$q(b));
+var __spreadProps$r = (a, b) => __defProps$r(a, __getOwnPropDescs$r(b));
 const passthroughProcessor = (_, secondary) => rxjs.of(secondary);
 const extraQueryProcessingOperator = (processors) => (data) => {
   return data.pipe(
@@ -2312,7 +2314,7 @@ const extraQueryProcessingOperator = (processors) => (data) => {
     }),
     rxjs.map(([primary, ...processedSecondaries]) => {
       var _a;
-      return __spreadProps$q(__spreadValues$C({}, primary), {
+      return __spreadProps$r(__spreadValues$D({}, primary), {
         series: [...primary.series, ...processedSecondaries.flatMap((s) => s.series)],
         annotations: [...(_a = primary.annotations) != null ? _a : [], ...processedSecondaries.flatMap((s) => {
           var _a2;
@@ -2323,25 +2325,25 @@ const extraQueryProcessingOperator = (processors) => (data) => {
   );
 };
 
-var __defProp$B = Object.defineProperty;
-var __defProps$p = Object.defineProperties;
-var __getOwnPropDescs$p = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$B = Object.getOwnPropertySymbols;
-var __hasOwnProp$B = Object.prototype.hasOwnProperty;
-var __propIsEnum$B = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$B = (obj, key, value) => key in obj ? __defProp$B(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$B = (a, b) => {
+var __defProp$C = Object.defineProperty;
+var __defProps$q = Object.defineProperties;
+var __getOwnPropDescs$q = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$C = Object.getOwnPropertySymbols;
+var __hasOwnProp$C = Object.prototype.hasOwnProperty;
+var __propIsEnum$C = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$C = (obj, key, value) => key in obj ? __defProp$C(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$C = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$B.call(b, prop))
-      __defNormalProp$B(a, prop, b[prop]);
-  if (__getOwnPropSymbols$B)
-    for (var prop of __getOwnPropSymbols$B(b)) {
-      if (__propIsEnum$B.call(b, prop))
-        __defNormalProp$B(a, prop, b[prop]);
+    if (__hasOwnProp$C.call(b, prop))
+      __defNormalProp$C(a, prop, b[prop]);
+  if (__getOwnPropSymbols$C)
+    for (var prop of __getOwnPropSymbols$C(b)) {
+      if (__propIsEnum$C.call(b, prop))
+        __defNormalProp$C(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$p = (a, b) => __defProps$p(a, __getOwnPropDescs$p(b));
+var __spreadProps$q = (a, b) => __defProps$q(a, __getOwnPropDescs$q(b));
 function filterAnnotations(data, filters) {
   var _a;
   if (!Array.isArray(data) || data.length === 0) {
@@ -2392,11 +2394,11 @@ function filterAnnotations(data, filters) {
           continue;
         }
       }
-      fields.push(__spreadProps$p(__spreadValues$B({}, field), {
+      fields.push(__spreadProps$q(__spreadValues$C({}, field), {
         values: buffer
       }));
     }
-    processed.push(__spreadProps$p(__spreadValues$B({}, frame), {
+    processed.push(__spreadProps$q(__spreadValues$C({}, frame), {
       fields,
       length: frameLength
     }));
@@ -2822,33 +2824,33 @@ function getOptionSearcher(options, includeAll) {
   };
 }
 
-var __defProp$A = Object.defineProperty;
-var __defProps$o = Object.defineProperties;
-var __getOwnPropDescs$o = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$A = Object.getOwnPropertySymbols;
-var __hasOwnProp$A = Object.prototype.hasOwnProperty;
-var __propIsEnum$A = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$A = (obj, key, value) => key in obj ? __defProp$A(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$A = (a, b) => {
+var __defProp$B = Object.defineProperty;
+var __defProps$p = Object.defineProperties;
+var __getOwnPropDescs$p = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$B = Object.getOwnPropertySymbols;
+var __hasOwnProp$B = Object.prototype.hasOwnProperty;
+var __propIsEnum$B = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$B = (obj, key, value) => key in obj ? __defProp$B(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$B = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$A.call(b, prop))
-      __defNormalProp$A(a, prop, b[prop]);
-  if (__getOwnPropSymbols$A)
-    for (var prop of __getOwnPropSymbols$A(b)) {
-      if (__propIsEnum$A.call(b, prop))
-        __defNormalProp$A(a, prop, b[prop]);
+    if (__hasOwnProp$B.call(b, prop))
+      __defNormalProp$B(a, prop, b[prop]);
+  if (__getOwnPropSymbols$B)
+    for (var prop of __getOwnPropSymbols$B(b)) {
+      if (__propIsEnum$B.call(b, prop))
+        __defNormalProp$B(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$o = (a, b) => __defProps$o(a, __getOwnPropDescs$o(b));
-var __objRest$3 = (source, exclude) => {
+var __spreadProps$p = (a, b) => __defProps$p(a, __getOwnPropDescs$p(b));
+var __objRest$4 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$A.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$B.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$A)
-    for (var prop of __getOwnPropSymbols$A(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$A.call(source, prop))
+  if (source != null && __getOwnPropSymbols$B)
+    for (var prop of __getOwnPropSymbols$B(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$B.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -2976,11 +2978,11 @@ const OptionWithCheckbox = ({
   renderOptionLabel
 }) => {
   var _b;
-  const _a = innerProps, rest = __objRest$3(_a, ["onMouseMove", "onMouseOver"]);
+  const _a = innerProps, rest = __objRest$4(_a, ["onMouseMove", "onMouseOver"]);
   const theme = ui.useTheme2();
   const selectStyles = ui.getSelectStyles(theme);
   const optionStyles = ui.useStyles2(getOptionStyles);
-  return /* @__PURE__ */ React__default["default"].createElement("div", __spreadProps$o(__spreadValues$A({
+  return /* @__PURE__ */ React__default["default"].createElement("div", __spreadProps$p(__spreadValues$B({
     ref: innerRef,
     className: css.cx(selectStyles.option, isFocused && selectStyles.optionFocused)
   }, rest), {
@@ -3082,28 +3084,28 @@ function getEnrichedFiltersRequest(sourceRunner) {
   return null;
 }
 
-var __defProp$z = Object.defineProperty;
-var __defProps$n = Object.defineProperties;
-var __getOwnPropDescs$n = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$z = Object.getOwnPropertySymbols;
-var __hasOwnProp$z = Object.prototype.hasOwnProperty;
-var __propIsEnum$z = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$z = (obj, key, value) => key in obj ? __defProp$z(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$z = (a, b) => {
+var __defProp$A = Object.defineProperty;
+var __defProps$o = Object.defineProperties;
+var __getOwnPropDescs$o = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$A = Object.getOwnPropertySymbols;
+var __hasOwnProp$A = Object.prototype.hasOwnProperty;
+var __propIsEnum$A = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$A = (obj, key, value) => key in obj ? __defProp$A(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$A = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$z.call(b, prop))
-      __defNormalProp$z(a, prop, b[prop]);
-  if (__getOwnPropSymbols$z)
-    for (var prop of __getOwnPropSymbols$z(b)) {
-      if (__propIsEnum$z.call(b, prop))
-        __defNormalProp$z(a, prop, b[prop]);
+    if (__hasOwnProp$A.call(b, prop))
+      __defNormalProp$A(a, prop, b[prop]);
+  if (__getOwnPropSymbols$A)
+    for (var prop of __getOwnPropSymbols$A(b)) {
+      if (__propIsEnum$A.call(b, prop))
+        __defNormalProp$A(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$n = (a, b) => __defProps$n(a, __getOwnPropDescs$n(b));
+var __spreadProps$o = (a, b) => __defProps$o(a, __getOwnPropDescs$o(b));
 class GroupByVariable extends MultiValueVariable {
   constructor(initialState) {
-    super(__spreadProps$n(__spreadValues$z({
+    super(__spreadProps$o(__spreadValues$A({
       isMulti: true,
       name: "",
       value: [],
@@ -3136,7 +3138,7 @@ class GroupByVariable extends MultiValueVariable {
       const queries = getQueriesForVariables(this);
       const otherFilters = this.state.baseFilters || [];
       const timeRange = sceneGraph.getTimeRange(this).state.value;
-      const response = await ds.getTagKeys(__spreadValues$z({ filters: otherFilters, queries, timeRange }, getEnrichedFiltersRequest(this)));
+      const response = await ds.getTagKeys(__spreadValues$A({ filters: otherFilters, queries, timeRange }, getEnrichedFiltersRequest(this)));
       if (responseHasError(response)) {
         this.setState({ error: response.error.message });
       }
@@ -3481,10 +3483,7 @@ function AdHocFilterRenderer({ filter, model }) {
   const [valueHasCustomValue, setValueHasCustomValue] = React.useState(false);
   const keyValue = keyLabelToOption(filter.key, filter.keyLabel);
   const valueValue = keyLabelToOption(filter.value, filter.valueLabel);
-  const optionSearcher = React.useMemo(
-    () => getAdhocOptionSearcher(values),
-    [values]
-  );
+  const optionSearcher = React.useMemo(() => getAdhocOptionSearcher(values), [values]);
   const onValueInputChange = (value, { action }) => {
     if (action === "input-change") {
       setValueInputValue(value);
@@ -3752,6 +3751,469 @@ function isFilter(filter) {
   return filter !== null && typeof filter.key === "string" && typeof filter.value === "string";
 }
 
+var __defProp$z = Object.defineProperty;
+var __defProps$n = Object.defineProperties;
+var __getOwnPropDescs$n = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$z = Object.getOwnPropertySymbols;
+var __hasOwnProp$z = Object.prototype.hasOwnProperty;
+var __propIsEnum$z = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$z = (obj, key, value) => key in obj ? __defProp$z(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$z = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$z.call(b, prop))
+      __defNormalProp$z(a, prop, b[prop]);
+  if (__getOwnPropSymbols$z)
+    for (var prop of __getOwnPropSymbols$z(b)) {
+      if (__propIsEnum$z.call(b, prop))
+        __defNormalProp$z(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$n = (a, b) => __defProps$n(a, __getOwnPropDescs$n(b));
+var __objRest$3 = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp$z.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols$z)
+    for (var prop of __getOwnPropSymbols$z(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$z.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+const Item = React.forwardRef(
+  (_a, ref) => {
+    var _b = _a, { children, active } = _b, rest = __objRest$3(_b, ["children", "active"]);
+    const theme = ui.useTheme2();
+    const selectStyles = ui.getSelectStyles(theme);
+    const id = react.useId();
+    return /* @__PURE__ */ React__default["default"].createElement("div", __spreadValues$z({
+      ref,
+      role: "option",
+      id,
+      "aria-selected": active,
+      className: css.cx(selectStyles.option, active && selectStyles.optionFocused)
+    }, rest), /* @__PURE__ */ React__default["default"].createElement("div", {
+      className: selectStyles.optionBody,
+      "data-testid": `data-testid ad hoc filter option value ${children}`
+    }, /* @__PURE__ */ React__default["default"].createElement("span", null, children)));
+  }
+);
+const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model, wip, handleChangeViewMode }, parentRef) {
+  var _a;
+  const [open, setOpen] = React.useState(false);
+  const [options, setOptions] = React.useState([]);
+  const [inputValue, setInputValue] = React.useState("");
+  const [activeIndex, setActiveIndex] = React.useState(null);
+  const [inputType, setInputType] = React.useState(!wip ? "value" : "key");
+  const styles = ui.useStyles2(getStyles2);
+  const listRef = React.useRef([]);
+  const { _wip } = model.useState();
+  const handleResetWip = React.useCallback(() => {
+    if (wip) {
+      model._addWip();
+      setInputType("key");
+      setInputValue("");
+    }
+  }, [model, wip]);
+  const filterToUse = filter || _wip;
+  const operatorIdentifier = `${(_a = filterToUse == null ? void 0 : filterToUse.key) != null ? _a : ""}-operator`;
+  const { refs, floatingStyles, context } = react.useFloating({
+    whileElementsMounted: react.autoUpdate,
+    open,
+    onOpenChange: (nextOpen, _, reason) => {
+      setOpen(nextOpen);
+      if (["outside-press", "escape-key"].includes(reason || "")) {
+        handleResetWip();
+        handleChangeViewMode == null ? void 0 : handleChangeViewMode();
+      }
+    },
+    middleware: [
+      react.flip({ padding: 10 }),
+      react.size({
+        apply({ rects, availableHeight, elements }) {
+          Object.assign(elements.floating.style, {
+            width: `${rects.reference.width}px`,
+            maxHeight: `${availableHeight > 256 ? 256 : availableHeight}px`
+          });
+        },
+        padding: 10
+      })
+    ]
+  });
+  const role = react.useRole(context, { role: "listbox" });
+  const dismiss = react.useDismiss(context, {
+    outsidePress: (event) => {
+      return !event.currentTarget.classList.contains(
+        operatorIdentifier
+      );
+    }
+  });
+  const listNav = react.useListNavigation(context, {
+    listRef,
+    activeIndex,
+    onNavigate: setActiveIndex,
+    virtual: true,
+    loop: true
+  });
+  const { getReferenceProps, getFloatingProps, getItemProps } = react.useInteractions([role, dismiss, listNav]);
+  React.useImperativeHandle(parentRef, () => () => {
+    var _a2;
+    return (_a2 = refs.domReference.current) == null ? void 0 : _a2.focus();
+  }, [refs.domReference]);
+  function onChange(event) {
+    var _a2, _b;
+    if (inputType === "key") {
+      const lastChar = event.target.value.slice(-1);
+      if (["=", "!", "<", ">"].includes(lastChar)) {
+        const key = event.target.value.slice(0, -1);
+        const optionIndex = options.findIndex((option) => option.value === key);
+        if (optionIndex >= 0) {
+          model._updateFilter(filterToUse, inputType, options[optionIndex]);
+          setInputValue(lastChar);
+        }
+        reactDom.flushSync(() => {
+          setInputType("operator");
+        });
+        (_a2 = refs.domReference.current) == null ? void 0 : _a2.focus();
+        return;
+      }
+    }
+    if (inputType === "operator") {
+      const lastChar = event.target.value.slice(-1);
+      if (/\w/.test(lastChar)) {
+        const operator = event.target.value.slice(0, -1);
+        if (!/\w/.test(operator)) {
+          const optionIndex = options.findIndex((option) => option.value === operator);
+          if (optionIndex >= 0) {
+            model._updateFilter(filterToUse, inputType, options[optionIndex]);
+            setInputValue(lastChar);
+          }
+          reactDom.flushSync(() => {
+            setInputType("value");
+          });
+          (_b = refs.domReference.current) == null ? void 0 : _b.focus();
+          return;
+        }
+      }
+    }
+    const value = event.target.value;
+    setInputValue(value);
+    setActiveIndex(0);
+  }
+  const items = options.filter(
+    (item) => {
+      var _a2, _b;
+      return (_b = (_a2 = item.label) != null ? _a2 : item.value) == null ? void 0 : _b.toLocaleLowerCase().startsWith(inputValue.toLowerCase());
+    }
+  );
+  const flushInputType = React.useCallback((inputType2) => {
+    reactDom.flushSync(() => {
+      setInputType(inputType2);
+    });
+  }, []);
+  React.useEffect(() => {
+    if (wip && !_wip) {
+      model._addWip();
+    }
+  }, [_wip]);
+  React.useEffect(() => {
+    if (!wip && refs.domReference.current) {
+      setInputType("value");
+      setInputValue("");
+      refs.domReference.current.focus();
+    }
+  }, []);
+  const handleFetchOptions = React.useCallback(async () => {
+    let options2 = [];
+    if (inputType === "key") {
+      options2 = await model._getKeys(null);
+    } else if (inputType === "operator") {
+      options2 = model._getOperators();
+    } else if (inputType === "value") {
+      options2 = await model._getValuesFor(filterToUse);
+    }
+    setOptions(options2);
+  }, [filterToUse, inputType, model]);
+  const handleBackspaceInput = React.useCallback(
+    (event) => {
+      if (event.key === "Backspace" && !inputValue && inputType === "key") {
+        model._removeLastFilter();
+        setOpen(false);
+      }
+    },
+    [inputValue, inputType]
+  );
+  const handleTabInput = React.useCallback((event) => {
+    if (event.key === "Tab" && !event.shiftKey) {
+      handleChangeViewMode == null ? void 0 : handleChangeViewMode();
+      handleResetWip();
+    }
+  }, []);
+  const handleShiftTabInput = React.useCallback((event) => {
+    if (event.key === "Tab" && event.shiftKey) {
+      handleChangeViewMode == null ? void 0 : handleChangeViewMode();
+      handleResetWip();
+    }
+  }, []);
+  const handleEnterInput = React.useCallback(
+    (event) => {
+      var _a2;
+      if (event.key === "Enter" && activeIndex != null && items[activeIndex]) {
+        model._updateFilter(filterToUse, inputType, items[activeIndex]);
+        setInputValue("");
+        if (inputType === "key") {
+          flushInputType("operator");
+        } else if (inputType === "operator") {
+          flushInputType("value");
+        } else if (inputType === "value") {
+          flushInputType("key");
+          handleChangeViewMode == null ? void 0 : handleChangeViewMode();
+        }
+        (_a2 = refs.domReference.current) == null ? void 0 : _a2.focus();
+      }
+    },
+    [activeIndex, filterToUse, inputType, items, model]
+  );
+  React.useEffect(() => {
+    if (open) {
+      handleFetchOptions();
+    }
+  }, [open, inputType]);
+  return /* @__PURE__ */ React__default["default"].createElement("div", {
+    className: styles.comboboxWrapper
+  }, filterToUse ? /* @__PURE__ */ React__default["default"].createElement("div", {
+    className: styles.pillWrapper
+  }, (filterToUse == null ? void 0 : filterToUse.key) ? /* @__PURE__ */ React__default["default"].createElement("div", {
+    className: css.cx(styles.basePill, styles.keyPill)
+  }, filterToUse.key) : null, (filterToUse == null ? void 0 : filterToUse.key) && (filterToUse == null ? void 0 : filterToUse.operator) && inputType !== "operator" ? /* @__PURE__ */ React__default["default"].createElement("div", {
+    className: css.cx(styles.basePill, operatorIdentifier),
+    role: "button",
+    "aria-label": "Edit filter operator",
+    tabIndex: 0,
+    onClick: (event) => {
+      var _a2;
+      event.stopPropagation();
+      flushInputType("operator");
+      (_a2 = refs.domReference.current) == null ? void 0 : _a2.focus();
+    },
+    onKeyDown: (event) => {
+      var _a2;
+      handleShiftTabInput(event);
+      if (event.key === "Enter") {
+        flushInputType("operator");
+        (_a2 = refs.domReference.current) == null ? void 0 : _a2.focus();
+      }
+    }
+  }, filterToUse.operator) : null, (filterToUse == null ? void 0 : filterToUse.key) && (filterToUse == null ? void 0 : filterToUse.operator) && (filterToUse == null ? void 0 : filterToUse.value) && !["operator", "value"].includes(inputType) ? /* @__PURE__ */ React__default["default"].createElement("div", {
+    className: css.cx(styles.basePill, styles.valuePill)
+  }, filterToUse.value) : null) : null, /* @__PURE__ */ React__default["default"].createElement("input", __spreadProps$n(__spreadValues$z({}, getReferenceProps({
+    ref: refs.setReference,
+    onChange,
+    value: inputValue,
+    placeholder: !wip ? inputType === "operator" ? `${filterToUse[inputType]} ${filterToUse.value || ""}` : filterToUse[inputType] : "Filter by label values",
+    "aria-autocomplete": "list",
+    onKeyDown(event) {
+      if (inputType === "operator") {
+        handleShiftTabInput(event);
+      }
+      handleBackspaceInput(event);
+      handleTabInput(event);
+      handleEnterInput(event);
+    }
+  })), {
+    className: styles.inputStyle,
+    onClick: (event) => {
+      event.stopPropagation();
+      setOpen(true);
+    },
+    onFocus: () => {
+      setActiveIndex(0);
+      setOpen(true);
+    }
+  })), /* @__PURE__ */ React__default["default"].createElement(react.FloatingPortal, null, open && /* @__PURE__ */ React__default["default"].createElement(react.FloatingFocusManager, {
+    context,
+    initialFocus: -1,
+    visuallyHiddenDismiss: true
+  }, /* @__PURE__ */ React__default["default"].createElement("div", __spreadProps$n(__spreadValues$z({}, getFloatingProps({
+    ref: refs.setFloating,
+    style: __spreadProps$n(__spreadValues$z({}, floatingStyles), {
+      overflowY: "auto"
+    })
+  })), {
+    className: styles.dropdownWrapper
+  }), items.map((item, index) => {
+    var _a2;
+    return /* @__PURE__ */ React__default["default"].createElement(Item, __spreadProps$n(__spreadValues$z({}, getItemProps({
+      key: item.value,
+      ref(node) {
+        listRef.current[index] = node;
+      },
+      onClick() {
+        var _a3;
+        model._updateFilter(filterToUse, inputType, item);
+        setInputValue("");
+        if (inputType === "key") {
+          flushInputType("operator");
+        } else if (inputType === "operator") {
+          flushInputType("value");
+        } else if (inputType === "value") {
+          flushInputType("key");
+          handleChangeViewMode == null ? void 0 : handleChangeViewMode();
+        }
+        (_a3 = refs.domReference.current) == null ? void 0 : _a3.focus();
+      }
+    })), {
+      active: activeIndex === index
+    }), (_a2 = item.label) != null ? _a2 : item.value);
+  })))));
+});
+const getStyles2 = (theme) => ({
+  comboboxWrapper: css.css({
+    display: "flex",
+    flexWrap: "nowrap"
+  }),
+  pillWrapper: css.css({
+    display: "flex",
+    alignItems: "center",
+    whiteSpace: "nowrap"
+  }),
+  basePill: css.css(__spreadProps$n(__spreadValues$z({
+    display: "flex",
+    alignItems: "center",
+    background: theme.colors.action.disabledBackground,
+    border: `1px solid ${theme.colors.border.weak}`,
+    padding: theme.spacing(0.125, 1, 0.125, 1),
+    color: theme.colors.text.primary,
+    overflow: "hidden",
+    whiteSpace: "nowrap",
+    minHeight: "22px"
+  }, theme.typography.bodySmall), {
+    cursor: "pointer"
+  })),
+  keyPill: css.css({
+    fontWeight: theme.typography.fontWeightBold,
+    cursor: "default"
+  }),
+  valuePill: css.css({
+    background: theme.colors.action.selected
+  }),
+  dropdownWrapper: css.css({
+    backgroundColor: theme.colors.background.primary,
+    color: theme.colors.text.primary,
+    boxShadow: theme.shadows.z2
+  }),
+  inputStyle: css.css({
+    paddingBlock: 0,
+    "&:focus": {
+      outline: "none"
+    }
+  })
+});
+function AdHocFilterEditSwitch({ filter, model }) {
+  const styles = ui.useStyles2(getStyles3);
+  const [viewMode, setViewMode] = React.useState(true);
+  const pillWrapperRef = React.useRef(null);
+  const handleChangeViewMode = React.useCallback((event) => {
+    var _a;
+    event == null ? void 0 : event.stopPropagation();
+    let viewMode2 = false;
+    reactDom.flushSync(() => {
+      setViewMode((mode) => {
+        viewMode2 = mode;
+        return !mode;
+      });
+    });
+    if (!viewMode2) {
+      (_a = pillWrapperRef.current) == null ? void 0 : _a.focus();
+    }
+  }, []);
+  if (viewMode) {
+    return /* @__PURE__ */ React__default["default"].createElement("div", {
+      className: styles.combinedFilterPill,
+      onClick: handleChangeViewMode,
+      onKeyDown: (e) => {
+        if (e.key === "Enter") {
+          handleChangeViewMode();
+        }
+      },
+      role: "button",
+      "aria-label": "Edit filter",
+      tabIndex: 0,
+      ref: pillWrapperRef
+    }, /* @__PURE__ */ React__default["default"].createElement("span", null, filter.key, " ", filter.operator, " ", filter.value), /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
+      onClick: (e) => {
+        e.stopPropagation();
+        model._removeFilter(filter);
+      },
+      onKeyDownCapture: (e) => {
+        if (e.key === "Enter") {
+          e.preventDefault();
+          e.stopPropagation();
+          model._removeFilter(filter);
+        }
+      },
+      name: "times",
+      size: "md",
+      className: styles.removeButton,
+      tooltip: "Remove filter"
+    }));
+  }
+  return /* @__PURE__ */ React__default["default"].createElement(AdHocCombobox, {
+    filter,
+    model,
+    handleChangeViewMode
+  });
+}
+const getStyles3 = (theme) => ({
+  wrapper: css.css({
+    display: "flex",
+    flexWrap: "wrap",
+    alignItems: "center",
+    columnGap: theme.spacing(1),
+    rowGap: theme.spacing(1),
+    minHeight: theme.spacing(4),
+    backgroundColor: theme.components.input.background,
+    border: `1px solid ${theme.colors.border.strong}`,
+    borderRadius: theme.shape.radius.default,
+    paddingInline: theme.spacing(1),
+    "&:focus-within": {
+      outline: "2px dotted transparent",
+      outlineOffset: "2px",
+      boxShadow: `0 0 0 2px ${theme.colors.background.canvas}, 0 0 0px 4px ${theme.colors.primary.main}`,
+      transitionTimingFunction: `cubic-bezier(0.19, 1, 0.22, 1)`,
+      transitionDuration: "0.2s",
+      transitionProperty: "outline, outline-offset, box-shadow"
+    }
+  }),
+  combinedFilterPill: css.css(__spreadProps$n(__spreadValues$z({
+    display: "flex",
+    alignItems: "center",
+    background: theme.colors.action.selected,
+    borderRadius: theme.shape.radius.default,
+    border: `1px solid ${theme.colors.border.weak}`,
+    padding: theme.spacing(0.125, 0, 0.125, 1),
+    color: theme.colors.text.primary,
+    overflow: "hidden",
+    whiteSpace: "nowrap",
+    minHeight: "22px"
+  }, theme.typography.bodySmall), {
+    fontWeight: theme.typography.fontWeightBold,
+    cursor: "pointer",
+    "&:hover": {
+      background: theme.colors.emphasize(theme.colors.background.secondary)
+    }
+  })),
+  removeButton: css.css({
+    marginInline: theme.spacing(0.5),
+    cursor: "pointer",
+    "&:hover": {
+      color: theme.colors.text.primary
+    }
+  })
+});
+
 var __defProp$y = Object.defineProperty;
 var __defProps$m = Object.defineProperties;
 var __getOwnPropDescs$m = Object.getOwnPropertyDescriptors;
@@ -3837,6 +4299,12 @@ class AdHocFiltersVariable extends SceneObjectBase {
     }
     this.setState({ filters: this.state.filters.filter((f) => f !== filter) });
   }
+  _removeLastFilter() {
+    const filterToRemove = this.state.filters.at(-1);
+    if (filterToRemove) {
+      this._removeFilter(filterToRemove);
+    }
+  }
   async _getKeys(currentKey) {
     var _a, _b, _c;
     const override = await ((_b = (_a = this.state).getTagKeysProvider) == null ? void 0 : _b.call(_a, this, currentKey));
@@ -3853,7 +4321,11 @@ class AdHocFiltersVariable extends SceneObjectBase {
     const otherFilters = this.state.filters.filter((f) => f.key !== currentKey).concat((_c = this.state.baseFilters) != null ? _c : []);
     const timeRange = sceneGraph.getTimeRange(this).state.value;
     const queries = this.state.useQueriesAsFilterForOptions ? getQueriesForVariables(this) : void 0;
-    const response = await ds.getTagKeys(__spreadValues$y({ filters: otherFilters, queries, timeRange }, getEnrichedFiltersRequest(this)));
+    const response = await ds.getTagKeys(__spreadValues$y({
+      filters: otherFilters,
+      queries,
+      timeRange
+    }, getEnrichedFiltersRequest(this)));
     if (responseHasError(response)) {
       this.setState({ error: response.error.message });
     }
@@ -3914,6 +4386,28 @@ function renderExpression(builder, filters) {
 function AdHocFiltersVariableRenderer({ model }) {
   const { filters, readOnly, addFilterButtonText } = model.useState();
   const styles = ui.useStyles2(getStyles$8);
+  const focusOnInputRef = React.useRef();
+  if (model.state.layout === "combobox") {
+    return /* @__PURE__ */ React__default["default"].createElement("div", {
+      className: styles.comboboxWrapper,
+      onClick: () => {
+        var _a;
+        (_a = focusOnInputRef.current) == null ? void 0 : _a.call(focusOnInputRef);
+      }
+    }, /* @__PURE__ */ React__default["default"].createElement(ui.Icon, {
+      name: "filter",
+      className: styles.filterIcon,
+      size: "lg"
+    }), filters.map((filter, index) => /* @__PURE__ */ React__default["default"].createElement(AdHocFilterEditSwitch, {
+      key: index,
+      filter,
+      model
+    })), /* @__PURE__ */ React__default["default"].createElement(AdHocCombobox, {
+      model,
+      wip: true,
+      ref: focusOnInputRef
+    }));
+  }
   return /* @__PURE__ */ React__default["default"].createElement("div", {
     className: styles.wrapper
   }, filters.map((filter, index) => /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, {
@@ -3935,9 +4429,31 @@ const getStyles$8 = (theme) => ({
     columnGap: theme.spacing(2),
     rowGap: theme.spacing(1)
   }),
+  comboboxWrapper: css.css({
+    display: "flex",
+    flexWrap: "wrap",
+    alignItems: "center",
+    columnGap: theme.spacing(1),
+    rowGap: theme.spacing(0.5),
+    minHeight: theme.spacing(4),
+    backgroundColor: theme.components.input.background,
+    border: `1px solid ${theme.colors.border.strong}`,
+    borderRadius: theme.shape.radius.default,
+    paddingInline: theme.spacing(1),
+    paddingBlock: theme.spacing(0.5),
+    flexGrow: 1,
+    "&:focus-within": {
+      outline: "2px dotted transparent",
+      outlineOffset: "2px",
+      boxShadow: `0 0 0 2px ${theme.colors.background.canvas}, 0 0 0px 4px ${theme.colors.primary.main}`,
+      transitionTimingFunction: `cubic-bezier(0.19, 1, 0.22, 1)`,
+      transitionDuration: "0.2s",
+      transitionProperty: "outline, outline-offset, box-shadow"
+    }
+  }),
   filterIcon: css.css({
     color: theme.colors.text.secondary,
-    paddingRight: theme.spacing(0.5)
+    alignSelf: "center"
   })
 });
 function toSelectableValue(input) {