@grafana/scenes 8.1.3 → 8.1.4

package/dist/index.js

@@ -6678,10 +6678,7 @@ function useFreeFormExpression({
   isGroupBy,
   populateInputOnEdit
 }) {
-  const operatorValues = React.useMemo(
-    () => controller.getOperators().map((o) => o.value).filter((v) => Boolean(v)),
-    [controller]
-  );
+  const operatorValues = controller.getOperators().map((o) => o.value).filter((v) => Boolean(v));
   const expressionInputEnabled = allowCustomValue && !isGroupBy && filterInputType !== "value" && !populateInputOnEdit;
   const parseExpression = React.useCallback(
     (input) => {
@@ -6701,6 +6698,7 @@ function useFreeFormExpression({
   );
   const parsedExpression = React.useMemo(() => parseExpression(inputValue), [parseExpression, inputValue]);
   const canCommitExpressionUpdate = parsedExpression !== null;
+  const canCommitFullExpression = Boolean(parsedExpression == null ? void 0 : parsedExpression.value);
   const commitExpressionUpdate = React.useCallback(() => {
     var _a;
     if (!parsedExpression || !filter) {
@@ -6732,6 +6730,7 @@ function useFreeFormExpression({
   return {
     parseExpression,
     canCommitExpressionUpdate,
+    canCommitFullExpression,
     commitExpressionUpdate
   };
 }
@@ -6874,7 +6873,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({
   const disabledIndicesRef = React.useRef([]);
   const filterInputTypeRef = React.useRef(initialInputType);
   const optionsSearcher = React.useMemo(() => getAdhocOptionSearcher(options), [options]);
-  const { canCommitExpressionUpdate, parseExpression, commitExpressionUpdate } = useFreeFormExpression({
+  const { canCommitExpressionUpdate, canCommitFullExpression, parseExpression, commitExpressionUpdate } = useFreeFormExpression({
     controller,
     filter,
     inputValue,
@@ -7154,6 +7153,25 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({
       handleResetWip
     ]
   );
+  const commitFullParsedExpression = React.useCallback(
+    (parsed) => {
+      var _a2;
+      if (!filter || !parsed.value) {
+        return false;
+      }
+      (_a2 = controller.startProfile) == null ? void 0 : _a2.call(controller, FILTER_CHANGED_INTERACTION);
+      const isMultiValueCommit = Boolean(parsed.operator && isMultiValueOperator(parsed.operator));
+      if (!isMultiValueCommit && onAddCustomValue) {
+        const custom = onAddCustomValue({ label: parsed.value, value: parsed.value, isCustom: true }, filter);
+        parsed.value = custom.value;
+        parsed.valueLabels = custom.valueLabels;
+      }
+      controller.updateFilter(filter, parsed);
+      setActiveIndex(null);
+      return isMultiValueCommit;
+    },
+    [controller, filter, onAddCustomValue]
+  );
   const handleTabInput = React.useCallback(
     (event, multiValueEdit) => {
       var _a2;
@@ -7162,6 +7180,11 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({
           event.preventDefault();
           handleMultiValueFilterCommit(controller, filter, filterMultiValues);
           (_a2 = refs.domReference.current) == null ? void 0 : _a2.focus();
+        } else if (canCommitFullExpression && filter) {
+          const parsed = commitExpressionUpdate();
+          if (parsed == null ? void 0 : parsed.value) {
+            commitFullParsedExpression(parsed);
+          }
         }
         handleChangeViewMode == null ? void 0 : handleChangeViewMode();
         handleResetWip();
@@ -7173,6 +7196,9 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({
       handleChangeViewMode,
       handleMultiValueFilterCommit,
       handleResetWip,
+      canCommitFullExpression,
+      commitExpressionUpdate,
+      commitFullParsedExpression,
       controller,
       refs.domReference
     ]
@@ -7192,7 +7218,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({
   );
   const handleEnterInput = React.useCallback(
     (event, multiValueEdit) => {
-      var _a2, _b2, _c2;
+      var _a2, _b2;
       if (event.key === "Enter" && canCommitExpressionUpdate && filter) {
         const parsed = commitExpressionUpdate();
         if (parsed) {
@@ -7204,14 +7230,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({
             setActiveIndex(null);
             return;
           }
-          (_a2 = controller.startProfile) == null ? void 0 : _a2.call(controller, FILTER_CHANGED_INTERACTION);
-          const isMultiValueCommit = Boolean(parsed.operator && isMultiValueOperator(parsed.operator));
-          if (!isMultiValueCommit && onAddCustomValue) {
-            const custom = onAddCustomValue({ label: parsed.value, value: parsed.value, isCustom: true }, filter);
-            parsed.value = custom.value;
-            parsed.valueLabels = custom.valueLabels;
-          }
-          controller.updateFilter(filter, parsed);
+          const isMultiValueCommit = commitFullParsedExpression(parsed);
           if (isAlwaysWip) {
             handleResetWip();
             setTimeout(() => {
@@ -7225,7 +7244,6 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({
           if (isMultiValueCommit) {
             setOpen(false);
           }
-          setActiveIndex(null);
           return;
         }
       }
@@ -7236,7 +7254,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({
         const selectedItem = filteredDropDownItems[activeIndex];
         if (isGroupBy) {
           if (isAlwaysWip) {
-            (_b2 = controller.addGroupByFilter) == null ? void 0 : _b2.call(controller, selectedItem);
+            (_a2 = controller.addGroupByFilter) == null ? void 0 : _a2.call(controller, selectedItem);
             handleResetWip();
           } else {
             controller.updateFilter(filter, {
@@ -7260,7 +7278,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({
             onAddCustomValue
           });
           if (filterInputType === "value" && payload.value !== (filter == null ? void 0 : filter.value)) {
-            (_c2 = controller.startProfile) == null ? void 0 : _c2.call(controller, FILTER_CHANGED_INTERACTION);
+            (_b2 = controller.startProfile) == null ? void 0 : _b2.call(controller, FILTER_CHANGED_INTERACTION);
           }
           controller.updateFilter(filter, payload);
           populateInputValueOnInputTypeSwitch({
@@ -7294,6 +7312,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({
       filterInputType,
       canCommitExpressionUpdate,
       commitExpressionUpdate,
+      commitFullParsedExpression,
       populateInputOnEdit,
       handleChangeViewMode,
       refs.domReference,