@grafana/scenes 5.13.1--canary.889.10720020573.0 → 5.14.1--canary.889.10722729172.0

package/dist/index.js

@@ -241,6 +241,7 @@ class SceneObjectBase {
     this._deactivationHandlers = /* @__PURE__ */ new Map();
     this._subs = new rxjs.Subscription();
     this._refCount = 0;
+    this._UNSAFE_PARENT_ACTIVATION = false;
     if (!state.key) {
       state.key = uuid.v4();
     }
@@ -397,12 +398,19 @@ class SceneObjectBase {
     }
   }
   activate() {
+    let parentDeactivate;
+    if (this.parent && !this.parent.isActive && this._UNSAFE_PARENT_ACTIVATION) {
+      parentDeactivate = this.parent.activate();
+    }
     if (!this.isActive) {
       this._internalActivate();
     }
     this._refCount++;
     let called = false;
     return () => {
+      if (parentDeactivate) {
+        parentDeactivate();
+      }
       this._refCount--;
       if (called) {
         const msg = `SceneObject cancelation handler returned by activate() called a second time`;
@@ -3954,8 +3962,8 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
       setInputValue("");
     }
   }, [model, isAlwaysWip]);
-  const handleMultiValueUpdate = React.useCallback(
-    (model2, filter2, filterMultiValues2) => {
+  const handleMultiValueFilterCommit = React.useCallback(
+    (model2, filter2, filterMultiValues2, preventFocus) => {
       if (filterMultiValues2.length) {
         const valueLabels = [];
         const values = [];
@@ -3967,14 +3975,16 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
         model2._updateFilter(filter2, { valueLabels, values, value: values[0] });
         setFilterMultiValues([]);
       }
-      setTimeout(() => {
-        var _a2;
-        return (_a2 = refs.domReference.current) == null ? void 0 : _a2.focus();
-      });
+      if (!preventFocus) {
+        setTimeout(() => {
+          var _a2;
+          return (_a2 = refs.domReference.current) == null ? void 0 : _a2.focus();
+        });
+      }
     },
     []
   );
-  const handleAddMultiValue = React.useCallback((selectedItem) => {
+  const handleLocalMultiValueChange = React.useCallback((selectedItem) => {
     setFilterMultiValues((items) => {
       if (items.some((item) => item.value === selectedItem.value)) {
         return items.filter((item) => item.value !== selectedItem.value);
@@ -3991,13 +4001,21 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
       setOpen(nextOpen);
       if (reason && ["outside-press", "escape-key"].includes(reason)) {
         if (isMultiValueEdit) {
-          handleMultiValueUpdate(model, filter, filterMultiValues);
+          handleMultiValueFilterCommit(model, filter, filterMultiValues);
         }
         handleResetWip();
         handleChangeViewMode == null ? void 0 : handleChangeViewMode();
       }
     },
-    [filter, filterMultiValues, handleChangeViewMode, handleMultiValueUpdate, handleResetWip, isMultiValueEdit, model]
+    [
+      filter,
+      filterMultiValues,
+      handleChangeViewMode,
+      handleMultiValueFilterCommit,
+      handleResetWip,
+      isMultiValueEdit,
+      model
+    ]
   );
   const outsidePressIdsToIgnore = React.useMemo(() => {
     return [operatorIdentifier, ...filterMultiValues.map((item, i) => `${item.value}-${i}`)];
@@ -4084,21 +4102,36 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
       if (event.key === "Tab" && !event.shiftKey) {
         if (multiValueEdit) {
           event.preventDefault();
-          handleMultiValueUpdate(model, filter, filterMultiValues);
+          handleMultiValueFilterCommit(model, filter, filterMultiValues);
           (_a2 = refs.domReference.current) == null ? void 0 : _a2.focus();
         }
         handleChangeViewMode == null ? void 0 : handleChangeViewMode();
         handleResetWip();
       }
     },
-    [filter, filterMultiValues, handleChangeViewMode, handleMultiValueUpdate, handleResetWip, model, refs.domReference]
+    [
+      filter,
+      filterMultiValues,
+      handleChangeViewMode,
+      handleMultiValueFilterCommit,
+      handleResetWip,
+      model,
+      refs.domReference
+    ]
+  );
+  const handleShiftTabInput = React.useCallback(
+    (event, multiValueEdit) => {
+      if (event.key === "Tab" && event.shiftKey) {
+        if (multiValueEdit) {
+          event.preventDefault();
+          handleMultiValueFilterCommit(model, filter, filterMultiValues, true);
+        }
+        handleChangeViewMode == null ? void 0 : handleChangeViewMode();
+        handleResetWip();
+      }
+    },
+    [filter, filterMultiValues, handleChangeViewMode, handleMultiValueFilterCommit, handleResetWip, model]
   );
-  const handleShiftTabInput = React.useCallback((event) => {
-    if (event.key === "Tab" && event.shiftKey) {
-      handleChangeViewMode == null ? void 0 : handleChangeViewMode();
-      handleResetWip();
-    }
-  }, []);
   const handleEnterInput = React.useCallback(
     (event, multiValueEdit) => {
       if (event.key === "Enter" && activeIndex != null) {
@@ -4107,7 +4140,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
         }
         const selectedItem = filteredDropDownItems[activeIndex];
         if (multiValueEdit) {
-          handleAddMultiValue(selectedItem);
+          handleLocalMultiValueChange(selectedItem);
         } else {
           model._updateFilter(filter, generateFilterUpdatePayload(filterInputType, selectedItem));
           switchToNextInputType(filterInputType, setInputType, handleChangeViewMode, refs.domReference.current);
@@ -4121,7 +4154,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
       filter,
       filterInputType,
       filteredDropDownItems,
-      handleAddMultiValue,
+      handleLocalMultiValueChange,
       handleChangeViewMode,
       model,
       refs.domReference
@@ -4186,7 +4219,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
       switchInputType("operator", setInputType, void 0, refs.domReference.current);
     },
     onKeyDown: (event) => {
-      handleShiftTabInput(event);
+      handleShiftTabInput(event, hasMultiValueOperator);
       if (event.key === "Enter") {
         switchInputType("operator", setInputType, void 0, refs.domReference.current);
       }
@@ -4279,7 +4312,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
         }
         if (isMultiValueEdit) {
           event.stopPropagation();
-          handleAddMultiValue(item);
+          handleLocalMultiValueChange(item);
           (_a3 = refs.domReference.current) == null ? void 0 : _a3.focus();
         } else {
           model._updateFilter(filter, generateFilterUpdatePayload(filterInputType, item));
@@ -4307,7 +4340,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
       className: styles.descriptionText
     }, item.description) : null);
   }))), isMultiValueEdit && !optionsLoading && !optionsError && filteredDropDownItems.length ? /* @__PURE__ */ React__default["default"].createElement(MultiValueApplyButton, {
-    onClick: () => handleMultiValueUpdate(model, filter, filterMultiValues),
+    onClick: () => handleMultiValueFilterCommit(model, filter, filterMultiValues),
     floatingElement: refs.floating.current,
     maxOptionWidth
   }) : null))));