@malloydata/malloy-explorer 0.0.269-dev250430234249 → 0.0.275-dev250509203914

package/dist/cjs/index.cjs

@@ -19,7 +19,6 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const QB = require("@malloydata/malloy-query-builder");
 const malloyTag = require("@malloydata/malloy-tag");
-const render = require("@malloydata/render");
 require("@malloydata/render/webcomponent");
 const ReactDOM = require("react-dom");
 function _interopNamespaceDefault(e) {
@@ -40,7 +39,6 @@ function _interopNamespaceDefault(e) {
 }
 const React__namespace = /* @__PURE__ */ _interopNamespaceDefault(React);
 const QB__namespace = /* @__PURE__ */ _interopNamespaceDefault(QB);
-const render__namespace = /* @__PURE__ */ _interopNamespaceDefault(render);
 const ReactDOM__namespace = /* @__PURE__ */ _interopNamespaceDefault(ReactDOM);
 function composeEventHandlers(originalEventHandler, ourEventHandler, { checkForDefaultPrevented = true } = {}) {
   return function handleEvent(event) {
@@ -3351,13 +3349,19 @@ function MalloyExplorerProvider({
   topValues
 }) {
   const rootQuery = useQueryBuilder(source, query);
+  const [currentNestView, setCurrentNestView] = React__namespace.useState(null);
+  const [currentNestQueryPanel, setCurrentNestQueryPanel] = React__namespace.useState(null);
   return /* @__PURE__ */ jsxRuntime.jsx(TooltipProvider, {
     children: /* @__PURE__ */ jsxRuntime.jsx(QueryEditorContext.Provider, {
       value: {
         source,
         rootQuery,
         setQuery,
-        topValues
+        topValues,
+        currentNestQueryPanel,
+        onCurrentNestQueryPanelChange: setCurrentNestQueryPanel,
+        currentNestView,
+        onCurrentNestViewChange: setCurrentNestView
       },
       children
     })
@@ -3836,10 +3840,10 @@ function Icon({
     return null;
   }
   return /* @__PURE__ */ jsxRuntime.jsx(IconComponent, {
-    ..._stylex.props(styles$M.main, colorVariants$3[color], SMALL_ICONS.includes(name) && styles$M.scaleUp, customStyle)
+    ..._stylex.props(styles$N.main, colorVariants$3[color], SMALL_ICONS.includes(name) && styles$N.scaleUp, customStyle)
   });
 }
-const styles$M = {
+const styles$N = {
   main: {
     display: "mly1rg5ohu",
     width: "mly1kky2od",
@@ -3912,17 +3916,17 @@ function Badge({
   customStyle
 }) {
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
-    ..._stylex.props(styles$L.main, colorVariants$2[color], customStyle),
+    ..._stylex.props(styles$M.main, colorVariants$2[color], customStyle),
     children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
       color,
       name: icon
     }), /* @__PURE__ */ jsxRuntime.jsx("div", {
-      ..._stylex.props(fontStyles.badge, styles$L.label),
+      ..._stylex.props(fontStyles.badge, styles$M.label),
       children: label
     })]
   });
 }
-const styles$L = {
+const styles$M = {
   main: {
     display: "mly3nfvp2",
     height: "mly1qx5ct2",
@@ -4004,10 +4008,10 @@ function Divider({
   customStyle
 }) {
   return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    ..._stylex.props(styles$K.main, orientationVariants[orientation], customStyle)
+    ..._stylex.props(styles$L.main, orientationVariants[orientation], customStyle)
   });
 }
-const styles$K = {
+const styles$L = {
   main: {
     background: "mly1xnbgy5",
     backgroundAttachment: null,
@@ -4808,19 +4812,12 @@ function Button({
   icon,
   label,
   tooltip,
-  onClick,
   isDisabled = false,
   customStyle,
   ...props2
 }) {
   const button = /* @__PURE__ */ jsxRuntime.jsxs("button", {
-    ..._stylex.props(styles$J.main, colorVariants$1[variant], sizeVariants$1[size2], customStyle),
-    ...onClick && {
-      onClick: (e) => {
-        e.preventDefault();
-        onClick(e);
-      }
-    },
+    ..._stylex.props(styles$K.main, colorVariants$1[variant], sizeVariants$1[size2], customStyle),
     type: "button",
     disabled: isDisabled,
     ...props2,
@@ -4830,9 +4827,9 @@ function Button({
       },
       children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
         name: icon,
-        customStyle: styles$J.icon
+        customStyle: styles$K.icon
       }), label && /* @__PURE__ */ jsxRuntime.jsx("div", {
-        ..._stylex.props(variant === "primary" ? fontStyles.emphasized : fontStyles.body, styles$J.label),
+        ..._stylex.props(variant === "primary" ? fontStyles.emphasized : fontStyles.body, styles$K.label),
         children: label
       })]
     }), isDisabled && /* @__PURE__ */ jsxRuntime.jsx("div", {
@@ -4859,7 +4856,7 @@ function Button({
     return button;
   }
 }
-const styles$J = {
+const styles$K = {
   main: {
     display: "mly3nfvp2",
     flexDirection: "mlydt5ytf",
@@ -5110,7 +5107,7 @@ function Token({
 }) {
   const isInteractive = onClick !== void 0 || asButtonTrigger;
   const token2 = /* @__PURE__ */ jsxRuntime.jsxs("div", {
-    ..._stylex.props(tokenStyles.main, tokenColorVariants[color], tokenSizeVariants[size2], !isInteractive && styles$I.nonInteractive, customStyle),
+    ..._stylex.props(tokenStyles.main, tokenColorVariants[color], tokenSizeVariants[size2], !isInteractive && styles$J.nonInteractive, customStyle),
     ...dragProps == null ? void 0 : dragProps.attributes,
     ...dragProps == null ? void 0 : dragProps.listeners,
     children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
@@ -5147,7 +5144,7 @@ function Token({
     })]
   }) : token2;
 }
-const styles$I = {
+const styles$J = {
   nonInteractive: {
     cursor: "mlyt0e3qv",
     background: "mly1np9qvj",
@@ -5171,7 +5168,7 @@ function TokenGroup({
 }) {
   const count2 = React__namespace.Children.count(children);
   return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    ..._stylex.props(styles$H.main, customStyle),
+    ..._stylex.props(styles$I.main, customStyle),
     children: React__namespace.Children.map(children, (child, index2) => /* @__PURE__ */ React__namespace.cloneElement(child, {
       customStyle: {
         ...child.props.customStyle,
@@ -5182,16 +5179,16 @@ function TokenGroup({
   });
 }
 const getChildStyle = (index2, count2) => {
-  if (count2 === 1) return styles$H.onlyChild;
-  if (index2 === 0) return styles$H.firstChild;
-  if (index2 === count2 - 1) return styles$H.lastChild;
-  return styles$H.innerChild;
+  if (count2 === 1) return styles$I.onlyChild;
+  if (index2 === 0) return styles$I.firstChild;
+  if (index2 === count2 - 1) return styles$I.lastChild;
+  return styles$I.innerChild;
 };
 const getTokenColor = (child, groupColor) => {
   const childColor = child.props.color;
   return childColor === void 0 ? groupColor : childColor;
 };
-const styles$H = {
+const styles$I = {
   main: {
     display: "mlyrvj5dj",
     gridAutoFlow: "mly1mt1orb",
@@ -5263,7 +5260,7 @@ function ErrorIcon({
         },
         children: /* @__PURE__ */ jsxRuntime.jsx(Icon, {
           name: "warning",
-          customStyle: styles$G.errorIcon
+          customStyle: styles$H.errorIcon
         })
       })
     }), /* @__PURE__ */ jsxRuntime.jsx(TooltipPortal, {
@@ -5276,7 +5273,7 @@ function ErrorIcon({
     })]
   });
 }
-const styles$G = {
+const styles$H = {
   errorIcon: {
     color: "mly1e2nbdu",
     $$css: true
@@ -5321,22 +5318,22 @@ function EditableToken({
       className: "mly78zum5 mly6s0dn4"
     },
     children: [/* @__PURE__ */ jsxRuntime.jsxs("div", {
-      ..._stylex.props(tokenStyles.main, tokenColorVariants[color], tokenSizeVariants[size2], isFocused && styles$F.focused, !!errorMessage && styles$F.hasError, customStyle),
+      ..._stylex.props(tokenStyles.main, tokenColorVariants[color], tokenSizeVariants[size2], isFocused && styles$G.focused, !!errorMessage && styles$G.hasError, customStyle),
       children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
         name: icon,
-        customStyle: styles$F.icon
+        customStyle: styles$G.icon
       }), /* @__PURE__ */ jsxRuntime.jsxs("span", {
         ...{
           className: "mlywz0xwf"
         },
         children: [/* @__PURE__ */ jsxRuntime.jsx("span", {
-          ..._stylex.props(fontStyles.body, styles$F.placeholder),
+          ..._stylex.props(fontStyles.body, styles$G.placeholder),
           style: {
             whiteSpaceCollapse: "preserve"
           },
           children: value
         }), /* @__PURE__ */ jsxRuntime.jsx("input", {
-          ..._stylex.props(styles$F.input, fontStyles.body),
+          ..._stylex.props(styles$G.input, fontStyles.body),
           ref: inputRef,
           pattern: type === "number" ? "^-?[0-9.]*$" : void 0,
           value,
@@ -5361,7 +5358,7 @@ function EditableToken({
     })]
   });
 }
-const styles$F = {
+const styles$G = {
   focused: {
     background: "mlyotlr4g",
     backgroundAttachment: null,
@@ -7703,12 +7700,12 @@ function TextInput({
     }
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
-    ..._stylex.props(styles$E.main, isFocused && styles$E.focused, sizeVariants[size2], customStyle),
+    ..._stylex.props(styles$F.main, isFocused && styles$F.focused, sizeVariants[size2], customStyle),
     children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
       name: icon,
       color: "secondary"
     }), /* @__PURE__ */ jsxRuntime.jsx("input", {
-      ..._stylex.props(fontStyles.body, styles$E.input),
+      ..._stylex.props(fontStyles.body, styles$F.input),
       value,
       placeholder,
       onChange: handleChange,
@@ -7716,7 +7713,7 @@ function TextInput({
       onBlur: handleBlur,
       onKeyDown
     }), hasClear && /* @__PURE__ */ jsxRuntime.jsx("button", {
-      ..._stylex.props(fontStyles.supporting, styles$E.actionButton, value === "" && styles$E.hidden),
+      ..._stylex.props(fontStyles.supporting, styles$F.actionButton, value === "" && styles$F.hidden),
       ref: buttonRef,
       onClick: () => onChange(""),
       tabIndex: 0,
@@ -7724,7 +7721,7 @@ function TextInput({
     })]
   });
 }
-const styles$E = {
+const styles$F = {
   main: {
     display: "mly78zum5",
     alignItems: "mly6s0dn4",
@@ -7933,7 +7930,7 @@ function SelectorToken({
     onValueChange: handleValueChange,
     required: true,
     children: [/* @__PURE__ */ jsxRuntime.jsxs(Trigger$3, {
-      ..._stylex.props(tokenStyles.main, styles$D.selectTrigger, tokenColorVariants[color], tokenSizeVariants[size2], fontStyles.body, tokenStyles.label, customStyle),
+      ..._stylex.props(tokenStyles.main, styles$E.selectTrigger, tokenColorVariants[color], tokenSizeVariants[size2], fontStyles.body, tokenStyles.label, customStyle),
       children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
         name: icon,
         customStyle: tokenStyles.icon
@@ -7962,7 +7959,7 @@ function SelectorToken({
             size: "compact",
             icon: "search",
             hasClear: true,
-            customStyle: styles$D.searchInput,
+            customStyle: styles$E.searchInput,
             onKeyDown: (event) => {
               const excludedKeys = ["ArrowUp", "ArrowDown"];
               if (!excludedKeys.includes(event.key)) {
@@ -7995,21 +7992,21 @@ function SelectItem({
   ...props2
 }) {
   return /* @__PURE__ */ jsxRuntime.jsxs(Item$1, {
-    ..._stylex.props(fontStyles.body, styles$D.selectItem),
+    ..._stylex.props(fontStyles.body, styles$E.selectItem),
     value,
     ...props2,
     children: [value === selectedValue ? /* @__PURE__ */ jsxRuntime.jsx(Icon, {
       name: "radioChecked",
-      customStyle: styles$D.radioChecked
+      customStyle: styles$E.radioChecked
     }) : /* @__PURE__ */ jsxRuntime.jsx(Icon, {
       name: "radioUnchecked",
-      customStyle: styles$D.radioUnchecked
+      customStyle: styles$E.radioUnchecked
     }), /* @__PURE__ */ jsxRuntime.jsx(ItemText, {
       children
     })]
   });
 }
-const styles$D = {
+const styles$E = {
   selectTrigger: {
     whiteSpace: "mlyuxw1ft",
     overflow: "mlyb3r6kr",
@@ -8099,7 +8096,7 @@ function Card({
   customStyle
 }) {
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
-    ..._stylex.props(styles$C.container, customStyle),
+    ..._stylex.props(styles$D.container, customStyle),
     children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
       ...{
         className: "mly1717udv"
@@ -8113,7 +8110,7 @@ function Card({
     })]
   });
 }
-const styles$C = {
+const styles$D = {
   container: {
     display: "mly78zum5",
     flexDirection: "mlydt5ytf",
@@ -8177,6 +8174,82 @@ const styles$C = {
     $$css: true
   }
 };
+function CollapsiblePanel({
+  title,
+  children,
+  icon,
+  defaultOpen = true,
+  controls,
+  collapsedControls,
+  isFocused = false
+}) {
+  const [isExpanded, setIsExpanded] = React.useState(defaultOpen);
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", {
+    ...{
+      0: {
+        className: "mlygbc89k mly1sxf85j mly1717udv"
+      },
+      1: {
+        className: "mly1sxf85j mly1717udv mlybwr872"
+      }
+    }[!!isFocused << 0],
+    children: [/* @__PURE__ */ jsxRuntime.jsxs("div", {
+      ...{
+        className: "mlyrvj5dj mly1mt1orb mly52fmzj mlylqzeqv mlyfawy5m mly167g77z mly6s0dn4"
+      },
+      children: [/* @__PURE__ */ jsxRuntime.jsxs("div", {
+        ...{
+          className: "mlyrvj5dj mly1mt1orb mlylqzeqv mly6s0dn4 mly167g77z"
+        },
+        children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
+          name: icon,
+          customStyle: styles$C.icon
+        }), /* @__PURE__ */ jsxRuntime.jsx("div", {
+          ...{
+            className: "mlyuxw1ft mlyb3r6kr mlylyipyv mlyehqz9p mly1ghz6dp mly117nqv4"
+          },
+          children: title
+        })]
+      }), /* @__PURE__ */ jsxRuntime.jsxs("div", {
+        ...{
+          className: "mly78zum5"
+        },
+        children: [isExpanded ? /* @__PURE__ */ jsxRuntime.jsx("div", {
+          ...{
+            className: "mly78zum5 mly6s0dn4 mly1jnr06f"
+          },
+          children: controls
+        }) : /* @__PURE__ */ jsxRuntime.jsx("div", {
+          ...{
+            className: "mly78zum5 mly6s0dn4 mly1jnr06f"
+          },
+          children: collapsedControls
+        }), /* @__PURE__ */ jsxRuntime.jsx(Button, {
+          variant: "flat",
+          size: "compact",
+          onClick: () => setIsExpanded(!isExpanded),
+          icon: isExpanded ? "chevronDown" : "chevronRight",
+          tooltip: isExpanded ? "Collapse" : "Expand"
+        })]
+      })]
+    }), /* @__PURE__ */ jsxRuntime.jsx("div", {
+      ...{
+        0: {
+          className: "mly1l4tkcb"
+        },
+        1: {
+          className: "mly1l4tkcb mly1s85apg"
+        }
+      }[!!!isExpanded << 0],
+      children
+    })]
+  });
+}
+const styles$C = {
+  icon: {
+    $$css: true
+  }
+};
 function CollapsibleListItem({
   label,
   sublabel,
@@ -19516,7 +19589,7 @@ function invalidDate() {
   return this._invalidDate;
 }
 var defaultOrdinal = "%d", defaultDayOfMonthOrdinalParse = /\d{1,2}/;
-function ordinal(number2) {
+function ordinal$1(number2) {
   return this._ordinal.replace("%d", number2);
 }
 var defaultRelativeTime = {
@@ -22645,7 +22718,7 @@ var proto$1 = Locale.prototype;
 proto$1.calendar = calendar;
 proto$1.longDateFormat = longDateFormat;
 proto$1.invalidDate = invalidDate;
-proto$1.ordinal = ordinal;
+proto$1.ordinal = ordinal$1;
 proto$1.preparse = preParsePostFormat;
 proto$1.postformat = preParsePostFormat;
 proto$1.relativeTime = relativeTime;
@@ -23618,25 +23691,113 @@ function SelectList({
     })
   });
 }
+const formats = {
+  second: "YYYY-MM-DD HH:mm:ss",
+  minute: "YYYY-MM-DD HH:mm",
+  hour: "YYYY-MM-DD HH:00",
+  day: "YYYY-MM-DD",
+  week: "YYYY-MM-DD-[WK]",
+  month: "YYYY-MM",
+  quarter: "YYYY-[Q]Q",
+  year: "YYYY"
+};
+const regexps = {
+  second: /\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d/,
+  minute: /\d\d\d\d-\d\d-\d\d \d\d:\d\d/,
+  hour: /\d\d\d\d-\d\d-\d\d \d\d:00/,
+  day: /\d\d\d\d-\d\d-\d\d/,
+  week: /\d\d\d\d-\d\d-\d\d-WK/,
+  month: /\d\d\d\d-\d\d/,
+  quarter: /\d\d\d\d-Q\d/,
+  year: /\d\d\d\d/
+};
+const DateInput = ({
+  value,
+  setValue,
+  placeholder,
+  autoFocus,
+  units,
+  onFocus,
+  onBlur,
+  isActive,
+  customStyle,
+  forwardRef
+}) => {
+  const format2 = formats[units];
+  const [tempValue, setTempValue] = React.useState(hooks.utc(value).format(format2));
+  React.useEffect(() => {
+    setTempValue(hooks.utc(value).format(format2));
+  }, [value, format2]);
+  return /* @__PURE__ */ jsxRuntime.jsx("input", {
+    ..._stylex.props(customStyle, isActive ? styles$y.active : null),
+    type: "text",
+    placeholder: placeholder || format2,
+    value: tempValue,
+    onFocus,
+    onBlur,
+    onChange: (event) => {
+      const raw2 = event.target.value;
+      setTempValue(raw2);
+      const regex = regexps[units];
+      if (raw2.match(regex)) {
+        const m = hooks.utc(raw2, format2);
+        if (m.isValid()) {
+          setValue(m.toDate());
+        }
+      }
+    },
+    autoFocus,
+    ref: forwardRef
+  });
+};
+function guessUnits(moment2, isDateTime) {
+  if (moment2.moment === "literal") {
+    const {
+      literal
+    } = moment2;
+    for (const unit in regexps) {
+      const temporalUnit = unit;
+      if (literal.match(regexps[temporalUnit])) {
+        return temporalUnit;
+      }
+    }
+  }
+  return isDateTime ? "second" : "day";
+}
+const styles$y = {
+  active: {
+    backgroundColor: "mly1vzefiq",
+    $$css: true
+  }
+};
 function monthName(month) {
   return ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][month];
 }
+const ordinal = Object.keys(formats);
 function DatePicker({
   value,
   setValue,
   units,
   maxLevel,
-  customStyle
+  customStyle,
+  forwardRef
 }) {
   const [date, setDate] = React.useState(value);
   const calendar2 = getCalendar(date);
   const [pickLevel, setPickLevel] = React.useState(units);
-  const yearBucket = Math.floor(hooks(date).year() / 10) * 10;
+  const yearBucket = Math.floor(hooks.utc(date).year() / 10) * 10;
+  React.useEffect(() => {
+    const unitOrd = ordinal.findIndex((unit) => unit === units);
+    const pickOrd = ordinal.findIndex((unit) => unit === pickLevel);
+    if (pickOrd < unitOrd) {
+      setPickLevel(units);
+    }
+  }, [units, pickLevel]);
   React.useEffect(() => {
     setDate(value);
   }, [value]);
   const setYear = (year) => {
-    const newDate = hooks(date).year(year).toDate();
+    const newDate = hooks.utc(date).year(year).toDate();
     setDate(newDate);
     setValue(newDate);
   };
@@ -23660,12 +23821,12 @@ function DatePicker({
         1: {
           className: "mly1247r65 mlyfvyar9 mlymcgfsh mly36usyh mly78zum5 mly6s0dn4 mlyl56j7k mly8fuzfi mly1v5ugh9 mly1fcty0u mly1ypdohk mly6mezaz mly1sxf85j mlyt89l8w mly1fxp9ov mly6wxqrg mly10bk7bj"
         }
-      }[!!(hooks(date).year() === yearBucket + offset2) << 0],
+      }[!!(hooks.utc(date).year() === yearBucket + offset2) << 0],
       children: yearBucket + offset2
     });
   };
   const setMonth2 = (month) => {
-    const newDate = hooks(date).month(month).toDate();
+    const newDate = hooks.utc(date).month(month).toDate();
     setDate(newDate);
     setValue(newDate);
   };
@@ -23678,13 +23839,13 @@ function DatePicker({
     setValue(dateOfFirstDayOfWeek);
   };
   const setQuarter = (quarter) => {
-    const newDate = hooks(date).quarter(quarter + 1).toDate();
+    const newDate = hooks.utc(date).quarter(quarter + 1).toDate();
     setDate(newDate);
     setValue(newDate);
   };
   const monthButton = (month) => {
     const click = () => setMonth2(month);
-    const isSelected = hooks(date).month() === month && hooks(date).year() === hooks(value).year();
+    const isSelected = hooks.utc(date).month() === month && hooks.utc(date).year() === hooks.utc(value).year();
     return /* @__PURE__ */ jsxRuntime.jsx("div", {
       onClick: click,
       ...{
@@ -23700,7 +23861,7 @@ function DatePicker({
   };
   const quarterButton = (quarter) => {
     const click = () => setQuarter(quarter);
-    const isSelected = hooks(date).quarter() - 1 === quarter && hooks(date).year() === hooks(value).year();
+    const isSelected = hooks.utc(date).quarter() - 1 === quarter && hooks.utc(date).year() === hooks.utc(value).year();
     return /* @__PURE__ */ jsxRuntime.jsxs("div", {
       onClick: click,
       ...{
@@ -23715,7 +23876,8 @@ function DatePicker({
     });
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
-    ..._stylex.props(styles$y.outer, customStyle),
+    ..._stylex.props(styles$x.outer, customStyle),
+    ref: forwardRef,
     children: [/* @__PURE__ */ jsxRuntime.jsxs("div", {
       ...{
         className: "mly78zum5 mly1q0g3np mly1qughib mly1nejdyq mlyu06os2"
@@ -23730,13 +23892,13 @@ function DatePicker({
           icon: "chevronLeft",
           onClick: () => {
             if (pickLevel === "day" || pickLevel === "week") {
-              setDate(hooks(date).subtract(1, "month").toDate());
+              setDate(hooks.utc(date).subtract(1, "month").toDate());
             } else if (pickLevel === "month" || pickLevel === "quarter") {
-              setDate(hooks(date).subtract(1, "year").toDate());
+              setDate(hooks.utc(date).subtract(1, "year").toDate());
             } else if (pickLevel === "year") {
-              setDate(hooks(date).subtract(10, "years").toDate());
+              setDate(hooks.utc(date).subtract(10, "years").toDate());
             } else {
-              setDay(hooks(date).subtract(1, "days").toDate());
+              setDay(hooks.utc(date).subtract(1, "days").toDate());
             }
           }
         })
@@ -23755,10 +23917,10 @@ function DatePicker({
             setPickLevel(maxLevel);
           }
         },
-        children: [(pickLevel === "day" || pickLevel === "week") && hooks(date).format("MMMM YYYY"), (pickLevel === "month" || pickLevel === "quarter") && hooks(date).format("YYYY"), pickLevel === "year" && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [(pickLevel === "day" || pickLevel === "week") && hooks.utc(date).format("MMMM YYYY"), (pickLevel === "month" || pickLevel === "quarter") && hooks.utc(date).format("YYYY"), pickLevel === "year" && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
           children: [yearBucket, "-", yearBucket + 9]
         }), (pickLevel === "hour" || pickLevel === "minute" || pickLevel === "second") && /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {
-          children: hooks(date).format("MMMM D, YYYY")
+          children: hooks.utc(date).format("MMMM D, YYYY")
         })]
       }), /* @__PURE__ */ jsxRuntime.jsx("div", {
         ...{
@@ -23770,13 +23932,13 @@ function DatePicker({
           icon: "chevronRight",
           onClick: () => {
             if (pickLevel === "day" || pickLevel === "week") {
-              setDate(hooks(date).add(1, "month").toDate());
+              setDate(hooks.utc(date).add(1, "month").toDate());
             } else if (pickLevel === "month" || pickLevel === "quarter") {
-              setDate(hooks(date).add(1, "year").toDate());
+              setDate(hooks.utc(date).add(1, "year").toDate());
             } else if (pickLevel === "year") {
-              setDate(hooks(date).add(10, "years").toDate());
+              setDate(hooks.utc(date).add(10, "years").toDate());
             } else {
-              setDay(hooks(date).add(1, "days").toDate());
+              setDay(hooks.utc(date).add(1, "days").toDate());
             }
           }
         })
@@ -23983,25 +24145,25 @@ function DatePicker({
         },
         children: [/* @__PURE__ */ jsxRuntime.jsx(NumberInput, {
           label: "Hours",
-          value: parseInt(hooks(date).format("hh")),
+          value: parseInt(hooks.utc(date).format("hh")),
           setValue: (hour12) => {
-            const amPm = hooks(date).hour() >= 12 ? "PM" : "AM";
-            const newHour24 = parseInt(hooks(`${hour12} ${amPm}`, ["hh A"]).format("H"));
-            setValue(hooks(date).hour(newHour24).toDate());
+            const amPm = hooks.utc(date).hour() >= 12 ? "PM" : "AM";
+            const newHour24 = parseInt(hooks.utc(`${hour12} ${amPm}`, ["hh A"]).format("H"));
+            setValue(hooks.utc(date).hour(newHour24).toDate());
           },
           width: "40px"
         }), (units === "minute" || units === "second") && /* @__PURE__ */ jsxRuntime.jsx(NumberInput, {
           label: "Minutes",
-          value: hooks(date).minutes(),
+          value: hooks.utc(date).minutes(),
           setValue: (minute) => {
-            setValue(hooks(date).minute(minute).toDate());
+            setValue(hooks.utc(date).minute(minute).toDate());
           },
           width: "40px"
         }), units === "second" && /* @__PURE__ */ jsxRuntime.jsx(NumberInput, {
           label: "Seconds",
-          value: hooks(date).seconds(),
+          value: hooks.utc(date).seconds(),
           setValue: (second) => {
-            setValue(hooks(date).second(second).toDate());
+            setValue(hooks.utc(date).second(second).toDate());
           },
           width: "40px"
         }), /* @__PURE__ */ jsxRuntime.jsx("div", {
@@ -24011,11 +24173,11 @@ function DatePicker({
             flexDirection: "column"
           },
           children: /* @__PURE__ */ jsxRuntime.jsx(SelectDropdown, {
-            value: hooks(date).hour() >= 12 ? "PM" : "AM",
+            value: hooks.utc(date).hour() >= 12 ? "PM" : "AM",
             onChange: (amPm) => {
-              const hour12 = parseInt(hooks(date).format("h"));
-              const newHour24 = parseInt(hooks(`${hour12} ${amPm}`, ["hh A"]).format("H"));
-              setValue(hooks(date).hour(newHour24).toDate());
+              const hour12 = parseInt(hooks.utc(date).format("h"));
+              const newHour24 = parseInt(hooks.utc(`${hour12} ${amPm}`, ["hh A"]).format("H"));
+              setValue(hooks.utc(date).hour(newHour24).toDate());
             },
             options: [{
               value: "AM",
@@ -24030,7 +24192,7 @@ function DatePicker({
     })]
   });
 }
-const styles$y = {
+const styles$x = {
   outer: {
     userSelect: "mly87ps6o",
     fontSize: "mlymhiqyu",
@@ -24039,7 +24201,7 @@ const styles$y = {
   }
 };
 function getCalendar(date) {
-  const firstDayOfMonth = hooks(date).date(1);
+  const firstDayOfMonth = hooks.utc(date).date(1);
   const dow = firstDayOfMonth.day();
   const daysInMonth2 = firstDayOfMonth.daysInMonth();
   const daysInPreviousMonth = firstDayOfMonth.clone().subtract(1, "day").daysInMonth();
@@ -24116,7 +24278,7 @@ function Banner({
       className: "mly1q4ynmn mlyh8yej3 mly5yr21d mly78zum5 mlydt5ytf mly1kmqopl mly16zck5j"
     },
     children: [/* @__PURE__ */ jsxRuntime.jsxs("div", {
-      ..._stylex.props(styles$x.header, variantColors[variant], children ? styles$x.headerWithContent : null),
+      ..._stylex.props(styles$w.header, variantColors[variant], children ? styles$w.headerWithContent : null),
       children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
         ...{
           className: "mly1qx5ct2 mly78zum5 mlyl56j7k mly6s0dn4"
@@ -24129,22 +24291,22 @@ function Banner({
           className: "mly78zum5 mlydt5ytf mlyb3r6kr"
         },
         children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
-          ..._stylex.props(styles$x.title, fontStyles.emphasized),
+          ..._stylex.props(styles$w.title, fontStyles.emphasized),
           children: title
         }), /* @__PURE__ */ jsxRuntime.jsx("div", {
-          ..._stylex.props(styles$x.description, fontStyles.supporting),
+          ..._stylex.props(styles$w.description, fontStyles.supporting),
           children: description
         })]
       })]
     }), children && /* @__PURE__ */ jsxRuntime.jsx("div", {
-      ..._stylex.props(styles$x.content, fontStyles.body),
+      ..._stylex.props(styles$w.content, fontStyles.body),
       children: /* @__PURE__ */ jsxRuntime.jsx(ScrollableArea, {
         children
       })
     })]
   });
 }
-const styles$x = {
+const styles$w = {
   header: {
     borderRadius: "mly1q4ynmn",
     borderStartStartRadius: null,
@@ -24286,14 +24448,14 @@ function AccordionList({
       onExpandedItemChange: handleExpandedItemChange
     },
     children: /* @__PURE__ */ jsxRuntime.jsx("div", {
-      ..._stylex.props(styles$w.main, customStyle),
+      ..._stylex.props(styles$v.main, customStyle),
       children: React__namespace.Children.map(children, (child) => /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [child, /* @__PURE__ */ jsxRuntime.jsx(Divider, {})]
       }))
     })
   });
 }
-const styles$w = {
+const styles$v = {
   main: {
     display: "mly78zum5",
     flexDirection: "mlydt5ytf",
@@ -24330,10 +24492,10 @@ function AccordionListItem({
           className: "mly78zum5 mlydt5ytf mlyb3r6kr mly1iyjqo2"
         },
         children: [/* @__PURE__ */ jsxRuntime.jsx("span", {
-          ..._stylex.props(fontStyles.body, styles$v.label),
+          ..._stylex.props(fontStyles.body, styles$u.label),
           children: label
         }), sublabel && /* @__PURE__ */ jsxRuntime.jsx("span", {
-          ..._stylex.props(fontStyles.supporting, styles$v.sublabel),
+          ..._stylex.props(fontStyles.supporting, styles$u.sublabel),
           children: sublabel
         })]
       }), badge && badge, endIcon && endIcon]
@@ -24345,7 +24507,7 @@ function AccordionListItem({
     })]
   });
 }
-const styles$v = {
+const styles$u = {
   label: {
     flexGrow: "mly1iyjqo2",
     fontWeight: "mly1xlr1w8",
@@ -25136,40 +25298,6 @@ var MenuArrow = React__namespace.forwardRef(
 MenuArrow.displayName = ARROW_NAME$1;
 var SUB_NAME = "MenuSub";
 var [MenuSubProvider, useMenuSubContext] = createMenuContext(SUB_NAME);
-var MenuSub = (props2) => {
-  const { __scopeMenu, children, open = false, onOpenChange } = props2;
-  const parentMenuContext = useMenuContext(SUB_NAME, __scopeMenu);
-  const popperScope = usePopperScope(__scopeMenu);
-  const [trigger, setTrigger] = React__namespace.useState(null);
-  const [content, setContent] = React__namespace.useState(null);
-  const handleOpenChange = useCallbackRef$1(onOpenChange);
-  React__namespace.useEffect(() => {
-    if (parentMenuContext.open === false) handleOpenChange(false);
-    return () => handleOpenChange(false);
-  }, [parentMenuContext.open, handleOpenChange]);
-  return /* @__PURE__ */ jsxRuntime.jsx(Root2$4, { ...popperScope, children: /* @__PURE__ */ jsxRuntime.jsx(
-    MenuProvider,
-    {
-      scope: __scopeMenu,
-      open,
-      onOpenChange: handleOpenChange,
-      content,
-      onContentChange: setContent,
-      children: /* @__PURE__ */ jsxRuntime.jsx(
-        MenuSubProvider,
-        {
-          scope: __scopeMenu,
-          contentId: useId(),
-          triggerId: useId(),
-          trigger,
-          onTriggerChange: setTrigger,
-          children
-        }
-      )
-    }
-  ) });
-};
-MenuSub.displayName = SUB_NAME;
 var SUB_TRIGGER_NAME$1 = "MenuSubTrigger";
 var MenuSubTrigger = React__namespace.forwardRef(
   (props2, forwardedRef) => {
@@ -25390,7 +25518,6 @@ var RadioItem = MenuRadioItem;
 var ItemIndicator = MenuItemIndicator;
 var Separator = MenuSeparator;
 var Arrow2 = MenuArrow;
-var Sub = MenuSub;
 var SubTrigger = MenuSubTrigger;
 var SubContent = MenuSubContent;
 var DROPDOWN_MENU_NAME = "DropdownMenu";
@@ -25529,14 +25656,14 @@ var DropdownMenuGroup = React__namespace.forwardRef(
 );
 DropdownMenuGroup.displayName = GROUP_NAME;
 var LABEL_NAME = "DropdownMenuLabel";
-var DropdownMenuLabel$1 = React__namespace.forwardRef(
+var DropdownMenuLabel = React__namespace.forwardRef(
   (props2, forwardedRef) => {
     const { __scopeDropdownMenu, ...labelProps } = props2;
     const menuScope = useMenuScope(__scopeDropdownMenu);
     return /* @__PURE__ */ jsxRuntime.jsx(Label, { ...menuScope, ...labelProps, ref: forwardedRef });
   }
 );
-DropdownMenuLabel$1.displayName = LABEL_NAME;
+DropdownMenuLabel.displayName = LABEL_NAME;
 var ITEM_NAME = "DropdownMenuItem";
 var DropdownMenuItem$1 = React__namespace.forwardRef(
   (props2, forwardedRef) => {
@@ -25590,16 +25717,6 @@ var DropdownMenuArrow = React__namespace.forwardRef(
   }
 );
 DropdownMenuArrow.displayName = ARROW_NAME;
-var DropdownMenuSub = (props2) => {
-  const { __scopeDropdownMenu, children, open: openProp, onOpenChange, defaultOpen } = props2;
-  const menuScope = useMenuScope(__scopeDropdownMenu);
-  const [open = false, setOpen] = useControllableState({
-    prop: openProp,
-    defaultProp: defaultOpen,
-    onChange: onOpenChange
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(Sub, { ...menuScope, open, onOpenChange: setOpen, children });
-};
 var SUB_TRIGGER_NAME = "DropdownMenuSubTrigger";
 var DropdownMenuSubTrigger = React__namespace.forwardRef((props2, forwardedRef) => {
   const { __scopeDropdownMenu, ...subTriggerProps } = props2;
@@ -25636,11 +25753,7 @@ var Root2$1 = DropdownMenu$1;
 var Trigger$1 = DropdownMenuTrigger;
 var Portal2 = DropdownMenuPortal;
 var Content2 = DropdownMenuContent;
-var Label2 = DropdownMenuLabel$1;
 var Item2 = DropdownMenuItem$1;
-var Sub2 = DropdownMenuSub;
-var SubTrigger2 = DropdownMenuSubTrigger;
-var SubContent2 = DropdownMenuSubContent;
 function DropdownMenu({
   trigger,
   tooltip,
@@ -25679,7 +25792,7 @@ function DropdownMenu({
       children: trigger
     }), /* @__PURE__ */ jsxRuntime.jsx(Portal2, {
       children: /* @__PURE__ */ jsxRuntime.jsx(Content2, {
-        ..._stylex.props(fontStyles.body, styles$u.content),
+        ..._stylex.props(fontStyles.body, styles$t.content),
         side: "bottom",
         align: "start",
         sideOffset: 4,
@@ -25706,79 +25819,22 @@ function DropdownMenuItem({
     disabled,
     children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
       name: icon,
-      customStyle: styles$u.icon
+      customStyle: styles$t.icon
     }), /* @__PURE__ */ jsxRuntime.jsxs("div", {
       ...{
         className: "mly78zum5 mlydt5ytf mly1iyjqo2"
       },
       children: [/* @__PURE__ */ jsxRuntime.jsx("span", {
-        ..._stylex.props(fontStyles.body, styles$u.label),
+        ..._stylex.props(fontStyles.body, styles$t.label),
         children: label
       }), sublabel && /* @__PURE__ */ jsxRuntime.jsx("span", {
-        ..._stylex.props(fontStyles.supporting, styles$u.sublabel),
+        ..._stylex.props(fontStyles.supporting, styles$t.sublabel),
         children: sublabel
       })]
     })]
   });
 }
-function DropdownSubMenuItem({
-  icon,
-  label,
-  sublabel,
-  disabled,
-  children,
-  open,
-  onOpenChange
-}) {
-  const isControlled = open !== void 0 && onOpenChange !== void 0;
-  return /* @__PURE__ */ jsxRuntime.jsxs(Sub2, {
-    ...isControlled && {
-      open
-    },
-    children: [/* @__PURE__ */ jsxRuntime.jsxs(SubTrigger2, {
-      ...{
-        className: "mly78zum5 mly6s0dn4 mlye8ttls mly167g77z mly1kogg8i mly1ypdohk mly1a2a7pz mly1bw6wve mly5ezrf1 mly15rdse5 mly1z060rf mly5deeek mly1jacekv mly7ouyw2 mly7h4d18"
-      },
-      disabled,
-      ...isControlled && {
-        onClick: () => onOpenChange(!open)
-      },
-      children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
-        name: icon,
-        customStyle: styles$u.icon
-      }), /* @__PURE__ */ jsxRuntime.jsxs("div", {
-        ...{
-          className: "mly78zum5 mlydt5ytf mly1iyjqo2"
-        },
-        children: [/* @__PURE__ */ jsxRuntime.jsx("span", {
-          ..._stylex.props(fontStyles.body, styles$u.label),
-          children: label
-        }), sublabel && /* @__PURE__ */ jsxRuntime.jsx("span", {
-          ..._stylex.props(fontStyles.supporting, styles$u.sublabel),
-          children: sublabel
-        })]
-      }), !isControlled && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
-        name: "chevronRight",
-        customStyle: styles$u.icon
-      })]
-    }), /* @__PURE__ */ jsxRuntime.jsx(SubContent2, {
-      ...{
-        className: "mly78zum5 mlydt5ytf mly1q4ynmn mlyotlr4g mly17fq3gk mlyfawy5m"
-      },
-      sideOffset: 5,
-      children: React__namespace.Children.map(children, (child) => child)
-    })]
-  });
-}
-function DropdownMenuLabel({
-  label
-}) {
-  return /* @__PURE__ */ jsxRuntime.jsx(Label2, {
-    ..._stylex.props(fontStyles.supporting, styles$u.menuLabel),
-    children: label
-  });
-}
-const styles$u = {
+const styles$t = {
   content: {
     display: "mly78zum5",
     flexDirection: "mlydt5ytf",
@@ -25814,19 +25870,6 @@ const styles$u = {
     paddingBottom: null,
     $$css: true
   },
-  menuLabel: {
-    padding: "mlydqdrvq",
-    paddingInline: null,
-    paddingStart: null,
-    paddingLeft: null,
-    paddingEnd: null,
-    paddingRight: null,
-    paddingBlock: null,
-    paddingTop: null,
-    paddingBottom: null,
-    color: "mly9dwj6z",
-    $$css: true
-  },
   icon: {
     color: "mly1mguc6l",
     $$css: true
@@ -25849,7 +25892,9 @@ function QueryActionBar({
   const {
     rootQuery,
     setQuery,
-    source
+    source,
+    onCurrentNestQueryPanelChange,
+    onCurrentNestViewChange
   } = React.useContext(QueryEditorContext);
   const {
     onCollapse
@@ -25861,6 +25906,10 @@ function QueryActionBar({
       runQuery(source, rootQuery.build());
     }
   };
+  const focusMainQueryPanel = () => {
+    onCurrentNestViewChange == null ? void 0 : onCurrentNestViewChange(null);
+    onCurrentNestQueryPanelChange == null ? void 0 : onCurrentNestQueryPanelChange(null);
+  };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     ...{
       className: "mly78zum5 mly1qughib mly6s0dn4 mlye8ttls"
@@ -25872,7 +25921,7 @@ function QueryActionBar({
       children: [/* @__PURE__ */ jsxRuntime.jsx(Icon, {
         name: "filterSliders"
       }), /* @__PURE__ */ jsxRuntime.jsx("div", {
-        ..._stylex.props(fontStyles.largeBody, styles$t.title),
+        ..._stylex.props(fontStyles.largeBody, styles$s.title),
         children: "Query"
       })]
     }), /* @__PURE__ */ jsxRuntime.jsxs("div", {
@@ -25880,7 +25929,10 @@ function QueryActionBar({
         className: "mly78zum5 mly167g77z"
       },
       children: [/* @__PURE__ */ jsxRuntime.jsx(Button, {
-        onClick: () => setQuery == null ? void 0 : setQuery(void 0),
+        onClick: () => {
+          focusMainQueryPanel();
+          setQuery == null ? void 0 : setQuery(void 0);
+        },
         isDisabled: !rootQuery || (rootQuery == null ? void 0 : rootQuery.isEmpty()),
         label: "Clear",
         variant: "flat",
@@ -25914,13 +25966,13 @@ function QueryActionBar({
     })]
   });
 }
-const styles$t = {
+const styles$s = {
   title: {
     fontWeight: "mly1xlr1w8",
     $$css: true
   }
 };
-const styles$s = {
+const styles$r = {
   labelWithIcon: {
     display: "mly78zum5",
     alignItems: "mly6s0dn4",
@@ -30009,6 +30061,12 @@ function FieldToken({
   hoverActionsVisible,
   ...props2
 }) {
+  let label = field.name;
+  if (field.kind === "dimension" && (field.type.kind === "timestamp_type" || field.type.kind === "date_type")) {
+    if (field.type.timeframe) {
+      label += `.${field.type.timeframe}`;
+    }
+  }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     ...{
       0: {
@@ -30019,7 +30077,7 @@ function FieldToken({
       }
     }[!!hoverActionsVisible << 0],
     children: [/* @__PURE__ */ jsxRuntime.jsx(Token, {
-      label: field.name,
+      label,
       color: fieldKindToColor(field.kind),
       icon: fieldToIcon(field),
       ...props2
@@ -30039,32 +30097,32 @@ function BadgeForField({
       label: "view",
       icon: "view_filled",
       color: "purple",
-      customStyle: styles$r.noBackground
+      customStyle: styles$q.noBackground
     });
   } else if (field.kind === "dimension") {
     return /* @__PURE__ */ jsxRuntime.jsx(Badge, {
       label: "dimension",
       icon: fieldToIcon(field),
       color: "cyan",
-      customStyle: styles$r.noBackground
+      customStyle: styles$q.noBackground
     });
   } else if (field.kind === "measure") {
     return /* @__PURE__ */ jsxRuntime.jsx(Badge, {
       label: "measure",
       icon: fieldToIcon(field),
       color: "green",
-      customStyle: styles$r.noBackground
+      customStyle: styles$q.noBackground
     });
   } else if (field.kind === "join") {
     return /* @__PURE__ */ jsxRuntime.jsx(Badge, {
       label: "join",
       icon: fieldToIcon(field),
       color: "gray",
-      customStyle: styles$r.noBackground
+      customStyle: styles$q.noBackground
     });
   }
 }
-const styles$r = {
+const styles$q = {
   noBackground: {
     backgroundColor: "mlyjbqb8w",
     $$css: true
@@ -30093,7 +30151,7 @@ function Visualization$1({
     onClick: () => setRenderer(viz)
   }));
   const tokens2 = [/* @__PURE__ */ jsxRuntime.jsx(SelectorToken, {
-    customStyle: styles$q.first,
+    customStyle: styles$p.first,
     icon: `viz_${currentRenderer}`,
     value: currentRenderer,
     items: vizes,
@@ -30103,7 +30161,7 @@ function Visualization$1({
     children: tokens2
   });
 }
-const styles$q = {
+const styles$p = {
   first: {
     flexGrow: "mly1iyjqo2",
     justifyContent: "mlylqzeqv",
@@ -30132,33 +30190,31 @@ function ViewAttributeTable({
 }) {
   const dimensions = viewInfo.schema.fields.filter((f2) => f2.kind === "dimension");
   return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    ..._stylex.props(styles$p.attributeTableContainer, style),
-    children: /* @__PURE__ */ jsxRuntime.jsx(ScrollableArea, {
-      children: /* @__PURE__ */ jsxRuntime.jsx("table", {
-        ...{
-          className: "mly1mwwwfo mly9f619 mlyh8yej3 mly5yr21d"
-        },
-        children: /* @__PURE__ */ jsxRuntime.jsxs("tbody", {
-          children: [/* @__PURE__ */ jsxRuntime.jsx(ViewAttributeTableRow, {
-            attribute: "chart type",
-            children: /* @__PURE__ */ jsxRuntime.jsx("div", {
-              ...{
-                className: "mly1rg5ohu"
-              },
-              children: /* @__PURE__ */ jsxRuntime.jsx(Visualization, {
-                annotations: viewInfo.annotations || []
-              })
+    ..._stylex.props(styles$o.attributeTableContainer, style),
+    children: /* @__PURE__ */ jsxRuntime.jsx("table", {
+      ...{
+        className: "mly1mwwwfo mly9f619 mlyh8yej3 mly5yr21d"
+      },
+      children: /* @__PURE__ */ jsxRuntime.jsxs("tbody", {
+        children: [/* @__PURE__ */ jsxRuntime.jsx(ViewAttributeTableRow, {
+          attribute: "chart type",
+          children: /* @__PURE__ */ jsxRuntime.jsx("div", {
+            ...{
+              className: "mly1rg5ohu"
+            },
+            children: /* @__PURE__ */ jsxRuntime.jsx(Visualization, {
+              annotations: viewInfo.annotations || []
             })
-          }), /* @__PURE__ */ jsxRuntime.jsx(ViewAttributeTableRow, {
-            attribute: "output",
-            children: dimensions.map((f2) => /* @__PURE__ */ jsxRuntime.jsx("span", {
-              children: /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
-                field: f2,
-                size: isCompact ? "compact" : "default"
-              })
-            }, `${f2.kind}::${f2.name}`))
-          })]
-        })
+          })
+        }), /* @__PURE__ */ jsxRuntime.jsx(ViewAttributeTableRow, {
+          attribute: "output",
+          children: dimensions.map((f2) => /* @__PURE__ */ jsxRuntime.jsx("span", {
+            children: /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
+              field: f2,
+              size: isCompact ? "compact" : "default"
+            })
+          }, `${f2.kind}::${f2.name}`))
+        })]
       })
     })
   });
@@ -30172,9 +30228,9 @@ function ViewAttributeTableRow({
       className: "mlydpxx8g"
     },
     children: [/* @__PURE__ */ jsxRuntime.jsx("td", {
-      ..._stylex.props(styles$p.attributeTableKeyCell, fontStyles.supporting),
+      ..._stylex.props(styles$o.attributeTableKeyCell, fontStyles.supporting),
       children: /* @__PURE__ */ jsxRuntime.jsx("div", {
-        ..._stylex.props(styles$p.attributeTableKeyCellContent, fontStyles.supporting),
+        ..._stylex.props(styles$o.attributeTableKeyCellContent, fontStyles.supporting),
         children: attribute
       })
     }), /* @__PURE__ */ jsxRuntime.jsx("td", {
@@ -30185,7 +30241,7 @@ function ViewAttributeTableRow({
     })]
   });
 }
-const styles$p = {
+const styles$o = {
   attributeTableContainer: {
     padding: "mlye8ttls",
     paddingInline: null,
@@ -30212,6 +30268,9 @@ const styles$p = {
     boxSizing: "mly9f619",
     width: "mlyh8yej3",
     height: "mly1m3v4wt",
+    overflow: "mlyysyzu8",
+    overflowX: null,
+    overflowY: null,
     $$css: true
   },
   attributeTableKeyCell: {
@@ -30333,7 +30392,7 @@ function HoverText({
           asChild: true,
           children: /* @__PURE__ */ jsxRuntime.jsx("div", {
             ref: textRef,
-            ..._stylex.props(styles$o.text, fontStyles.supporting),
+            ..._stylex.props(styles$n.text, fontStyles.supporting),
             children: text2
           })
         }), /* @__PURE__ */ jsxRuntime.jsx(Portal$4, {
@@ -30341,7 +30400,7 @@ function HoverText({
             side,
             align,
             children: /* @__PURE__ */ jsxRuntime.jsx("pre", {
-              ..._stylex.props(styles$o.hoverText, fontStyles.tooltipText),
+              ..._stylex.props(styles$n.hoverText, fontStyles.tooltipText),
               children: text2
             })
           })
@@ -30350,7 +30409,7 @@ function HoverText({
     })
   });
 }
-const styles$o = {
+const styles$n = {
   text: {
     overflow: "mlyb3r6kr",
     overflowX: null,
@@ -30403,11 +30462,11 @@ function HoverCard({
   customStyle
 }) {
   return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    ..._stylex.props(styles$n.container, fontStyles.body, customStyle),
+    ..._stylex.props(styles$m.container, fontStyles.body, customStyle),
     children
   });
 }
-const styles$n = {
+const styles$m = {
   container: {
     boxShadow: "mly5n1uv4",
     backgroundColor: "mly12peec7",
@@ -30452,7 +30511,7 @@ function FieldHoverCard({
     details = /* @__PURE__ */ jsxRuntime.jsx(ViewAttributeTable, {
       viewInfo: field,
       isCompact: true,
-      style: styles$m.viewAttributeTable
+      style: styles$l.viewAttributeTable
     });
   } else if (field.kind === "dimension") {
     details = /* @__PURE__ */ jsxRuntime.jsx(TopValuesTable, {
@@ -30461,7 +30520,7 @@ function FieldHoverCard({
     });
   }
   return /* @__PURE__ */ jsxRuntime.jsxs(HoverCard, {
-    customStyle: styles$m.container,
+    customStyle: styles$l.container,
     children: [/* @__PURE__ */ jsxRuntime.jsxs("div", {
       children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
         ...{
@@ -30471,10 +30530,10 @@ function FieldHoverCard({
           field
         })
       }), /* @__PURE__ */ jsxRuntime.jsx("div", {
-        ..._stylex.props(fontStyles.supporting, styles$m.path),
+        ..._stylex.props(fontStyles.supporting, styles$l.path),
         children: pathString
       }), /* @__PURE__ */ jsxRuntime.jsx("div", {
-        ..._stylex.props(fontStyles.emphasized, styles$m.title),
+        ..._stylex.props(fontStyles.emphasized, styles$l.title),
         children: field.name
       }), description && /* @__PURE__ */ jsxRuntime.jsx(HoverText, {
         text: description
@@ -30484,7 +30543,7 @@ function FieldHoverCard({
     })]
   });
 }
-const styles$m = {
+const styles$l = {
   container: {
     width: "mlybl57os",
     maxHeight: "mlyq3t0pi",
@@ -30776,10 +30835,10 @@ const PillInput = ({
     commitValue();
   });
   return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    ..._stylex.props(fontStyles.body, styles$l.main),
+    ..._stylex.props(fontStyles.body, styles$k.main),
     children: /* @__PURE__ */ jsxRuntime.jsx(ScrollableArea, {
       children: /* @__PURE__ */ jsxRuntime.jsxs("div", {
-        ..._stylex.props(styles$l.content, customStyle),
+        ..._stylex.props(styles$k.content, customStyle),
         onKeyUp,
         onClick: () => {
           var _a2;
@@ -30846,7 +30905,7 @@ const Pill = ({
     onClick,
     tabIndex: 0,
     ref: forwardRef,
-    ..._stylex.props(styles$l.pill, colorVariants[color]),
+    ..._stylex.props(styles$k.pill, colorVariants[color]),
     children: [children, /* @__PURE__ */ jsxRuntime.jsx("div", {
       title: "Remove",
       ...{
@@ -30861,7 +30920,7 @@ const Pill = ({
     })]
   });
 };
-const styles$l = {
+const styles$k = {
   main: {
     borderRadius: "mly12oqio5",
     borderStartStartRadius: null,
@@ -31045,7 +31104,7 @@ function ValueList({
     children: (stringSearchResults == null ? void 0 : stringSearchResults.length) ? stringSearchResults.map((value) => /* @__PURE__ */ jsxRuntime.jsxs("div", {
       role: "menuitem",
       tabIndex: -1,
-      ..._stylex.props(addMenuStyles.item, styles$k.valueItem),
+      ..._stylex.props(addMenuStyles.item, styles$j.valueItem),
       onClick: () => onClick(value),
       children: [/* @__PURE__ */ jsxRuntime.jsx(Value, {
         value
@@ -31069,10 +31128,10 @@ function Value({
     label: value.fieldValue ?? "∅",
     icon: "filter",
     color: "purple",
-    customStyle: styles$k.token
+    customStyle: styles$j.token
   });
 }
-const styles$k = {
+const styles$j = {
   valueItem: {
     height: "mly1qx5ct2",
     paddingTop: "mly1y1aw1k",
@@ -31248,7 +31307,7 @@ const StringFilterCore = ({
               setSearchValue("");
             }
           },
-          customStyle: styles$j.valueList
+          customStyle: styles$i.valueList
         })
       })]
     }) : currentFilter.operator === "~" ? /* @__PURE__ */ jsxRuntime.jsx(StringEditor, {
@@ -31316,7 +31375,7 @@ function stringFilterChangeType(filter, type) {
       };
   }
 }
-const styles$j = {
+const styles$i = {
   valueList: {
     maxHeight: "mly3d5gib",
     width: "mly1hfn5x7",
@@ -31571,83 +31630,6 @@ function makeFilterWithNewType(filter, type) {
       };
   }
 }
-const formats = {
-  second: "YYYY-MM-DD HH:mm:ss",
-  minute: "YYYY-MM-DD HH:mm",
-  hour: "YYYY-MM-DD HH:00",
-  day: "YYYY-MM-DD",
-  week: "[WK]YYYY-WW",
-  month: "YYYY-MM",
-  quarter: "YYYY-[Q]Q",
-  year: "YYYY"
-};
-const regexps = {
-  second: /\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d/,
-  minute: /\d\d\d\d-\d\d-\d\d \d\d:\d\d/,
-  hour: /\d\d\d\d-\d\d-\d\d \d\d:00/,
-  day: /\d\d\d\d-\d\d-\d\d/,
-  week: /WK\d\d\d\d-\d\d-\d\d/,
-  month: /\d\d\d\d-\d\d/,
-  quarter: /\d\d\d\d-Q\d/,
-  year: /\d\d\d\d/
-};
-const DateInput = ({
-  value,
-  setValue,
-  placeholder,
-  autoFocus,
-  units,
-  onFocus,
-  onBlur,
-  isActive,
-  customStyle
-}) => {
-  const format2 = formats[units];
-  const [tempValue, setTempValue] = React.useState(hooks(value).format(format2));
-  React.useEffect(() => {
-    setTempValue(hooks(value).format(format2));
-  }, [value, format2]);
-  return /* @__PURE__ */ jsxRuntime.jsx("input", {
-    ..._stylex.props(customStyle, isActive ? styles$i.active : null),
-    type: "text",
-    placeholder: placeholder || format2,
-    value: tempValue,
-    onFocus,
-    onBlur,
-    onChange: (event) => {
-      const raw2 = event.target.value;
-      setTempValue(raw2);
-      const regex = regexps[units];
-      if (raw2.match(regex)) {
-        const m = hooks(raw2, format2);
-        if (m.isValid()) {
-          setValue(m.toDate());
-        }
-      }
-    },
-    autoFocus
-  });
-};
-function guessUnits(moment2, isDateTime) {
-  if (moment2.moment === "literal") {
-    const {
-      literal
-    } = moment2;
-    for (const unit in regexps) {
-      const temporalUnit = unit;
-      if (literal.match(regexps[temporalUnit])) {
-        return temporalUnit;
-      }
-    }
-  }
-  return isDateTime ? "second" : "day";
-}
-const styles$i = {
-  active: {
-    backgroundColor: "mly1vzefiq",
-    $$css: true
-  }
-};
 function typeFromFilter(filter) {
   if (filter.operator === "null" && filter.not) {
     return "-null";
@@ -31655,7 +31637,7 @@ function typeFromFilter(filter) {
   return filter.operator;
 }
 function unitsFromFilter(filter, isDateTime) {
-  if (filter.operator === "last" || filter.operator === "next") {
+  if (filter.operator === "last" || filter.operator === "next" || filter.operator === "in_last") {
     return filter.units;
   } else if (filter.operator === "to") {
     return guessUnits(filter.fromMoment, isDateTime);
@@ -31697,11 +31679,14 @@ const DateTimeFilterCore = ({
         value: type,
         onChange: changeType,
         options: [{
-          value: "last",
+          value: "in_last",
           label: "last"
+        }, {
+          value: "last",
+          label: "last complete"
         }, {
           value: "next",
-          label: "next"
+          label: "next complete"
         }, {
           value: "after",
           label: "after"
@@ -31728,6 +31713,7 @@ const DateTimeFilterCore = ({
 };
 function getTopEditorRow(currentFilter, updateFilter, units, setUnits, maxLevel) {
   switch (currentFilter.operator) {
+    case "in_last":
     case "last":
     case "next":
       return /* @__PURE__ */ jsxRuntime.jsx(NUnitFilter, {
@@ -31840,15 +31826,48 @@ function NUnitFilter({
   });
 }
 function UnitFilter({
+  currentFilter,
+  updateFilter,
   units,
   setUnits,
   maxLevel
 }) {
   const options = maxLevel === "day" ? DateUnits : [...DateUnits, ...TimeUnits];
+  const updateUnits = (units2) => {
+    setUnits(units2);
+    switch (currentFilter.operator) {
+      case "after":
+        updateFilter({
+          ...currentFilter,
+          after: updateMoment(currentFilter.after, units2)
+        });
+        return;
+      case "before":
+        updateFilter({
+          ...currentFilter,
+          before: updateMoment(currentFilter.before, units2)
+        });
+        return;
+      case "to":
+        updateFilter({
+          ...currentFilter,
+          fromMoment: updateMoment(currentFilter.fromMoment, units2),
+          toMoment: updateMoment(currentFilter.toMoment, units2)
+        });
+        return;
+      case "in": {
+        updateFilter({
+          ...currentFilter,
+          in: updateMoment(currentFilter.in, units2)
+        });
+        return;
+      }
+    }
+  };
   return /* @__PURE__ */ jsxRuntime.jsx(SelectDropdown, {
     options,
     value: units,
-    onChange: setUnits,
+    onChange: updateUnits,
     customStyle: filterStyles.editorCell
   });
 }
@@ -31973,20 +31992,25 @@ function DoubleDateFilter({
 function createTemporalLiteral(date, units) {
   return {
     moment: "literal",
-    literal: hooks(date).format(formats[units])
+    literal: hooks.utc(date).format(formats[units]),
+    units
   };
 }
 function extractDateFromMoment(momentObj) {
   if (momentObj && momentObj.moment === "literal") {
-    return hooks(momentObj.literal).toDate();
+    return hooks.utc(momentObj.literal, formats[momentObj.units ?? "second"]).toDate();
   }
   return /* @__PURE__ */ new Date();
 }
+function updateMoment(moment2, units) {
+  return createTemporalLiteral(extractDateFromMoment(moment2), units);
+}
 function dateTimeFilterChangeType(filter, type, units) {
   let n = "7";
   let fromMoment = createTemporalLiteral(/* @__PURE__ */ new Date(), units);
   let toMoment = createTemporalLiteral(/* @__PURE__ */ new Date(), units);
   switch (filter.operator) {
+    case "in_last":
     case "last":
     case "next":
       n = filter.n;
@@ -32006,6 +32030,7 @@ function dateTimeFilterChangeType(filter, type, units) {
       break;
   }
   switch (type) {
+    case "in_last":
     case "last":
     case "next":
       return {
@@ -32023,6 +32048,11 @@ function dateTimeFilterChangeType(filter, type, units) {
         operator: type,
         before: fromMoment
       };
+    case "in":
+      return {
+        operator: type,
+        in: fromMoment
+      };
     case "to":
       return {
         operator: type,
@@ -32088,6 +32118,13 @@ function FilterDialog({
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     ..._stylex.props(fontStyles.body, filterStyles.filterDialog),
+    onKeyDown: (event) => {
+      if (event.key === "Enter") {
+        onApply();
+      } else if (event.key === "Esc") {
+        onCancel();
+      }
+    },
     children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
       ..._stylex.props(filterStyles.filterDialogHeader),
       children: fieldInfo.name
@@ -32191,12 +32228,17 @@ function FilterPopover({
   setFilter,
   trigger,
   anchor,
-  layoutProps
+  layoutProps,
+  onOpenChange
 }) {
   const [open, setOpen] = React.useState(false);
+  const handleOpenChange = (open2) => {
+    setOpen(open2);
+    onOpenChange == null ? void 0 : onOpenChange(open2);
+  };
   return /* @__PURE__ */ jsxRuntime.jsxs(Root2$2, {
     open,
-    onOpenChange: setOpen,
+    onOpenChange: handleOpenChange,
     modal: true,
     children: [anchor ? /* @__PURE__ */ jsxRuntime.jsx(Anchor2$1, {
       asChild: true,
@@ -32215,7 +32257,7 @@ function FilterPopover({
           filter,
           path,
           onFilterApply: setFilter,
-          onOpenChange: setOpen
+          onOpenChange: handleOpenChange
         })
       })
     })]
@@ -32236,7 +32278,7 @@ function FieldList({
     const groups2 = [];
     const lcSearch = search.toLocaleLowerCase();
     const buildGroups = (types22, path, name, fields2) => {
-      const filteredFields = sortFieldInfos(fields2).filter((field) => field.kind !== "join").filter((field) => !isArrayOrRecord(field)).filter((field) => field.name.toLocaleLowerCase().includes(lcSearch) && types22.includes(field.kind)).filter((field) => filter ? filter(view, field, path) : true);
+      const filteredFields = sortFieldInfos(fields2).filter((field) => field.kind !== "join").filter((field) => field.name.toLocaleLowerCase().includes(lcSearch) && types22.includes(field.kind)).filter((field) => filter ? filter(view, field, path) : true);
       const joins = fields2.filter((field) => field.kind === "join");
       const arraysAndRecords = fields2.filter(isArrayOrRecord);
       if (filteredFields.length) {
@@ -32395,20 +32437,19 @@ function segmentHasOrderBy(segment, name) {
 function segmentNestNo(segment, name) {
   return segment.operations.items.reduce((acc, operation) => {
     if (operation instanceof QB.ASTNestViewOperation) {
-      if (name) {
+      {
         if (operation.name === name) {
           do {
             acc += 1;
           } while (segment.hasFieldNamed(`${name} ${acc}`));
         }
-      } else {
-        return acc + 1;
       }
     }
     return acc;
   }, 1);
 }
 function addGroupBy(view, field, path) {
+  const type = field.kind === "dimension" ? field.type.kind : "string";
   const segment = view.getOrAddDefaultSegment();
   const {
     fields
@@ -32417,7 +32458,13 @@ function addGroupBy(view, field, path) {
   if (fields.find((f2) => f2.name === field.name)) {
     rename = findUniqueFieldName(fields, field.name, path);
   }
-  segment.addGroupBy(field.name, path, rename);
+  if (type === "date_type") {
+    segment.addDateGroupBy(field.name, path, "day");
+  } else if (type === "timestamp_type") {
+    segment.addTimestampGroupBy(field.name, path, "second");
+  } else {
+    segment.addGroupBy(field.name, path, rename);
+  }
 }
 function addAggregate(view, field, path) {
   const segment = view.getOrAddDefaultSegment();
@@ -32441,6 +32488,18 @@ function addNest(view, field) {
   }
   segment.addNest(field.name, rename);
 }
+function addOrderBy(view, field, direction = "desc") {
+  const segment = view.getOrAddDefaultSegment();
+  segment.addOrderBy(field.name, direction);
+}
+function addFilter(view, field, path, filter) {
+  const segment = view.getOrAddDefaultSegment();
+  if (field.kind === "dimension") {
+    segment.addWhere(field.name, path, filter);
+  } else {
+    segment.addHaving(field.name, path, filter);
+  }
+}
 function getSegmentIfPresent(parent) {
   const definition = getViewDefinition(parent);
   if (definition instanceof QB.ASTSegmentViewDefinition) {
@@ -32466,7 +32525,7 @@ function OperationActionTitle({
     return !(segment == null ? void 0 : segment.hasField(field.name, path)) && isNotAnnotatedFilteredField(field);
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
-    ..._stylex.props(styles$s.title, hoverStyles.main),
+    ..._stylex.props(styles$r.title, hoverStyles.main),
     children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
       children: title
     }), /* @__PURE__ */ jsxRuntime.jsx("div", {
@@ -32863,7 +32922,14 @@ function RenameDialog({
                 ..._stylex.props({
                   ...dialogStyles.editorCell,
                   ...dialogStyles.input
-                })
+                }),
+                onKeyDown: (event) => {
+                  if (event.key === "Enter") {
+                    onRename();
+                  } else if (event.key === "Esc") {
+                    setOpen(false);
+                  }
+                }
               }), badName && /* @__PURE__ */ jsxRuntime.jsx(ErrorIcon, {
                 errorMessage: "Name already in use"
               })]
@@ -33036,7 +33102,7 @@ function SortableOperations({
       fields,
       ...props2
     }), /* @__PURE__ */ jsxRuntime.jsx("div", {
-      ..._stylex.props(styles$s.tokenContainer),
+      ..._stylex.props(styles$r.tokenContainer),
       children: /* @__PURE__ */ jsxRuntime.jsx(DndContext, {
         sensors,
         collisionDetection: closestCenter,
@@ -33044,6 +33110,7 @@ function SortableOperations({
         children: /* @__PURE__ */ jsxRuntime.jsx(SortableContext, {
           items,
           children: items.map((item) => /* @__PURE__ */ jsxRuntime.jsx(SortableOperation, {
+            rootQuery,
             id: item.id,
             color: kind === "group_by" ? "cyan" : "green",
             view,
@@ -33054,18 +33121,19 @@ function SortableOperations({
     })]
   });
 }
+const NULL_PATH = [];
 function SortableOperation({
+  rootQuery,
   id,
   view,
   operation,
   color
 }) {
   const {
-    rootQuery,
     setQuery
   } = React.useContext(QueryEditorContext);
   const fieldInfo = operation.getFieldInfo();
-  const path = operation.field.getReference().path ?? [];
+  const path = operation.field.getReference().path ?? NULL_PATH;
   const {
     attributes,
     listeners,
@@ -33085,37 +33153,64 @@ function SortableOperation({
     transform: CSS$1.Transform.toString(transform2),
     transition
   };
+  const hoverActions = React.useMemo(() => {
+    return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenu, {
+        trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, {
+          variant: "flat",
+          icon: "meatballs",
+          size: "compact",
+          tooltip: "More Actions"
+        }),
+        onOpenChange: setHoverActionsVisible,
+        children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
+          label: "Rename",
+          onClick: () => {
+            setRenameTarget(operation);
+            setRenameOpen(true);
+          }
+        }, "rename")]
+      }, [...path, fieldInfo.name].join(".")), /* @__PURE__ */ jsxRuntime.jsx(ClearButton, {
+        onClick: () => {
+          operation.delete();
+          setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
+        }
+      })]
+    });
+  }, [fieldInfo, operation, path, rootQuery, setQuery]);
+  const granular = granularityMenuItems(fieldInfo, operation.field);
+  let icon = "orderBy";
+  if (fieldInfo.kind === "dimension" || fieldInfo.kind === "measure") {
+    icon = atomicTypeToIcon(fieldInfo.type.kind);
+  }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     id,
     ref: setNodeRef,
     style,
-    children: [/* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
+    children: [granular ? /* @__PURE__ */ jsxRuntime.jsxs(TokenGroup, {
+      customStyle: customStyles.tokenGroup,
+      children: [/* @__PURE__ */ jsxRuntime.jsx(Token, {
+        color,
+        icon,
+        label: fieldInfo.name,
+        dragProps: {
+          attributes,
+          listeners
+        }
+      }), /* @__PURE__ */ jsxRuntime.jsx(SelectorToken, {
+        color,
+        value: granular.value,
+        onChange: (granulation) => {
+          if (operation.field.expression instanceof QB.ASTTimeTruncationExpression) operation.field.expression.truncation = granulation;
+          setQuery == null ? void 0 : setQuery(rootQuery.build());
+        },
+        items: granular.options
+      })]
+    }) : /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
       field: fieldInfo,
       color,
       hoverActionsVisible,
-      hoverActions: /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-        children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenu, {
-          trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, {
-            variant: "flat",
-            icon: "meatballs",
-            size: "compact",
-            tooltip: "More Actions"
-          }),
-          onOpenChange: setHoverActionsVisible,
-          children: /* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
-            label: "Rename",
-            onClick: () => {
-              setRenameTarget(operation);
-              setRenameOpen(true);
-            }
-          })
-        }, [...path, fieldInfo.name].join(".")), /* @__PURE__ */ jsxRuntime.jsx(ClearButton, {
-          onClick: () => {
-            operation.delete();
-            setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
-          }
-        })]
-      }),
+      hoverActions,
       tooltip: /* @__PURE__ */ jsxRuntime.jsx(FieldHoverCard, {
         field: fieldInfo,
         path
@@ -33138,6 +33233,38 @@ function SortableOperation({
     })]
   });
 }
+const DateGranulation = ["day", "week", "month", "quarter", "year"];
+const TimestampGranulation = ["second", "minute", "hour", "day", "week", "month", "quarter", "year"];
+function granularityMenuItems(fieldInfo, field) {
+  if (fieldInfo.kind !== "dimension" || !(field.expression instanceof QB.ASTTimeTruncationExpression)) {
+    return null;
+  }
+  if (fieldInfo.type.kind === "timestamp_type") {
+    return {
+      value: fieldInfo.type.timeframe ?? "second",
+      options: TimestampGranulation.map((value) => ({
+        label: value,
+        value
+      }))
+    };
+  }
+  if (fieldInfo.type.kind === "date_type") {
+    return {
+      value: fieldInfo.type.timeframe ?? "day",
+      options: DateGranulation.map((value) => ({
+        label: value,
+        value
+      }))
+    };
+  }
+  return null;
+}
+const customStyles = {
+  tokenGroup: {
+    display: "mly78zum5",
+    $$css: true
+  }
+};
 function GroupByOperations({
   rootQuery,
   segment,
@@ -33186,10 +33313,10 @@ function FilterOperations({
   }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
-      ..._stylex.props(styles$s.title),
+      ..._stylex.props(styles$r.title),
       children: "filter by"
     }), /* @__PURE__ */ jsxRuntime.jsx("div", {
-      ..._stylex.props(styles$s.tokenContainer),
+      ..._stylex.props(styles$r.tokenContainer),
       children: filters.map((filterOperation, key2) => {
         return /* @__PURE__ */ jsxRuntime.jsx(ErrorElement, {
           fallback: /* @__PURE__ */ jsxRuntime.jsxs("div", {
@@ -33396,7 +33523,7 @@ const parsedToLabels = (parsed, filterString) => {
             const {
               not
             } = temporalClause;
-            op = `is${not ? " not" : ""} last`;
+            op = `is${not ? " not" : ""} last complete`;
             value = temporalClause.n + " " + temporalClause.units;
           }
           break;
@@ -33405,7 +33532,7 @@ const parsedToLabels = (parsed, filterString) => {
             const {
               not
             } = temporalClause;
-            op = `is${not ? " not" : ""} nest`;
+            op = `is${not ? " not" : ""} next complete`;
             value = temporalClause.n + " " + temporalClause.units;
           }
           break;
@@ -33453,7 +33580,7 @@ function LimitOperation({
   }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
-      ..._stylex.props(styles$s.title),
+      ..._stylex.props(styles$r.title),
       children: "limit"
     }), /* @__PURE__ */ jsxRuntime.jsxs("div", {
       ..._stylex.props(hoverStyles.main),
@@ -33503,10 +33630,10 @@ function OrderByOperations({
   }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
-      ..._stylex.props(styles$s.title),
+      ..._stylex.props(styles$r.title),
       children: "order by"
     }), /* @__PURE__ */ jsxRuntime.jsx("div", {
-      ..._stylex.props(styles$s.tokenContainer),
+      ..._stylex.props(styles$r.tokenContainer),
       children: orderBys.map((orderBy) => {
         const {
           fieldReference
@@ -33574,71 +33701,6 @@ function View({
     })]
   });
 }
-function CollapsiblePanel({
-  title,
-  children,
-  icon,
-  defaultOpen = true,
-  controls,
-  collapsedControls
-}) {
-  const [isExpanded, setIsExpanded] = React.useState(defaultOpen);
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", {
-    ...{
-      className: "mlyzkdzjc mly1sxf85j mly1717udv"
-    },
-    children: [/* @__PURE__ */ jsxRuntime.jsxs("div", {
-      ...{
-        className: "mlyrvj5dj mly1mt1orb mly52fmzj mlylqzeqv mlyfawy5m mly167g77z mly6s0dn4"
-      },
-      children: [/* @__PURE__ */ jsxRuntime.jsxs("div", {
-        ...{
-          className: "mlyrvj5dj mly1mt1orb mlylqzeqv mly6s0dn4 mly167g77z"
-        },
-        children: [icon && /* @__PURE__ */ jsxRuntime.jsx(Icon, {
-          name: icon,
-          customStyle: styles$f.icon
-        }), /* @__PURE__ */ jsxRuntime.jsx("div", {
-          ...{
-            className: "mlyuxw1ft mlyb3r6kr mlylyipyv mlyehqz9p mly1ghz6dp"
-          },
-          children: title
-        })]
-      }), /* @__PURE__ */ jsxRuntime.jsxs("div", {
-        ...{
-          className: "mly78zum5"
-        },
-        children: [isExpanded ? /* @__PURE__ */ jsxRuntime.jsx("div", {
-          ...{
-            className: "mly78zum5 mly6s0dn4 mly1jnr06f"
-          },
-          children: controls
-        }) : /* @__PURE__ */ jsxRuntime.jsx("div", {
-          ...{
-            className: "mly78zum5 mly6s0dn4 mly1jnr06f"
-          },
-          children: collapsedControls
-        }), /* @__PURE__ */ jsxRuntime.jsx(Button, {
-          variant: "flat",
-          size: "compact",
-          onClick: () => setIsExpanded(!isExpanded),
-          icon: isExpanded ? "chevronDown" : "chevronRight",
-          tooltip: isExpanded ? "Collapse" : "Expand"
-        })]
-      })]
-    }), isExpanded && /* @__PURE__ */ jsxRuntime.jsx("div", {
-      ...{
-        className: "mly1l4tkcb"
-      },
-      children
-    })]
-  });
-}
-const styles$f = {
-  icon: {
-    $$css: true
-  }
-};
 function AddItem({
   icon,
   label,
@@ -33657,7 +33719,7 @@ function AddItem({
       children: /* @__PURE__ */ jsxRuntime.jsxs("div", {
         role: "menuitem",
         tabIndex: -1,
-        ..._stylex.props(addMenuStyles.item, addMenuStyles.clickable, open ? styles$e.open : null),
+        ..._stylex.props(addMenuStyles.item, addMenuStyles.clickable, open ? styles$f.open : null),
         onClick: doOnClick,
         "data-disabled": disabled ? "true" : void 0,
         children: [/* @__PURE__ */ jsxRuntime.jsxs("div", {
@@ -33681,7 +33743,7 @@ function AddItem({
     }) : null]
   });
 }
-const styles$e = {
+const styles$f = {
   open: {
     background: "mly16o7sp0",
     backgroundAttachment: null,
@@ -33756,12 +33818,13 @@ function AddFieldItem({
     onAddOperation,
     isFilterOperation,
     search,
-    customStyle: styles$d.list
+    customStyle: styles$e.list
   });
 }
-const styles$d = {
+const styles$e = {
   list: {
-    width: "mlyqyf9gi",
+    minWidth: "mly2ixbly",
+    maxWidth: "mly1j9u4d2",
     $$css: true
   }
 };
@@ -33783,8 +33846,7 @@ function AddOrderBy({
     fields,
     types: ["dimension"],
     onAddOperation: (field) => {
-      const segment2 = view.getOrAddDefaultSegment();
-      segment2.addOrderBy(field.name, "asc");
+      addOrderBy(view, field);
       setQuery == null ? void 0 : setQuery(rootQuery.build());
     },
     disabledMessage: "There must be at least one field in the output to order by.",
@@ -33861,28 +33923,21 @@ function AddWhere({
   const {
     fields
   } = getInputSchemaFromViewParent(view);
-  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {
-    children: /* @__PURE__ */ jsxRuntime.jsx(AddFieldItem, {
-      label: "Add filter",
-      icon: "filter",
-      view,
-      fields,
-      types: ["measure", "dimension"],
-      filter: (_segment, field) => (field.kind === "dimension" || field.kind === "measure") && FILTERABLE_TYPES$1.has(field.type.kind) && isNotAnnotatedFilteredField(field),
-      onAddOperation: (field, path, filter) => {
-        if (filter && (field.kind === "dimension" || field.kind === "measure")) {
-          const segment = view.getOrAddDefaultSegment();
-          if (field.kind === "dimension") {
-            segment.addWhere(field.name, path, filter);
-          } else {
-            segment.addHaving(field.name, path, filter);
-          }
-          setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
-        }
-      },
-      isFilterOperation: true,
-      search
-    })
+  return /* @__PURE__ */ jsxRuntime.jsx(AddFieldItem, {
+    label: "Add filter",
+    icon: "filter",
+    view,
+    fields,
+    types: ["measure", "dimension"],
+    filter: (_segment, field) => (field.kind === "dimension" || field.kind === "measure") && FILTERABLE_TYPES$1.has(field.type.kind) && isNotAnnotatedFilteredField(field),
+    onAddOperation: (field, path, filter) => {
+      if (filter && (field.kind === "dimension" || field.kind === "measure")) {
+        addFilter(view, field, path, filter);
+        setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
+      }
+    },
+    isFilterOperation: true,
+    search
   });
 }
 const FILTERABLE_TYPES$1 = /* @__PURE__ */ new Set(["string_type", "boolean_type", "number_type", "date_type", "timestamp_type"]);
@@ -33963,7 +34018,7 @@ function AddMenu({
             value: search,
             onChange: setSearch,
             placeholder: "Search...",
-            customStyle: styles$c.search
+            customStyle: styles$d.search
           })
         }), /* @__PURE__ */ jsxRuntime.jsx(Divider, {}), /* @__PURE__ */ jsxRuntime.jsxs("div", {
           ...{
@@ -34084,7 +34139,7 @@ function AddMenu({
     })]
   });
 }
-const styles$c = {
+const styles$d = {
   search: {
     width: "mlyh8yej3",
     $$css: true
@@ -34099,7 +34154,7 @@ function NestOperations({
     return null;
   }
   return /* @__PURE__ */ jsxRuntime.jsx("div", {
-    ..._stylex.props(styles$s.tokenContainer),
+    ..._stylex.props(styles$r.tokenContainer),
     children: nests.map((nest) => /* @__PURE__ */ jsxRuntime.jsx(NestOperation, {
       rootQuery,
       view,
@@ -34113,10 +34168,31 @@ function NestOperation({
   nest
 }) {
   const {
-    setQuery
+    setQuery,
+    currentNestQueryPanel,
+    onCurrentNestQueryPanelChange,
+    onCurrentNestViewChange
   } = React.useContext(QueryEditorContext);
   const [renameOpen, setRenameOpen] = React.useState(false);
-  const defaultOpen = nest.view.definition.node.kind === "segment" && nest.view.definition.node.operations.length === 0;
+  const panelRef = React__namespace.useRef(null);
+  const isCurrentNestQueryPanelFocused = currentNestQueryPanel !== null && panelRef.current == currentNestQueryPanel;
+  React__namespace.useEffect(() => {
+    if (isCurrentNestQueryPanelFocused) {
+      onCurrentNestViewChange == null ? void 0 : onCurrentNestViewChange(nest.view);
+    }
+  }, [nest, isCurrentNestQueryPanelFocused, onCurrentNestViewChange]);
+  const focusCurrentNestQueryPanel = () => {
+    onCurrentNestQueryPanelChange == null ? void 0 : onCurrentNestQueryPanelChange(panelRef.current);
+    onCurrentNestViewChange == null ? void 0 : onCurrentNestViewChange(nest.view);
+  };
+  const focusParentQueryPanel = () => {
+    const currentPanel = panelRef.current;
+    const parent = findParentNestQueryPanel(currentPanel);
+    onCurrentNestQueryPanelChange == null ? void 0 : onCurrentNestQueryPanelChange(parent);
+    if (parent === null) {
+      onCurrentNestViewChange == null ? void 0 : onCurrentNestViewChange(null);
+    }
+  };
   const getControls = (nest2) => /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/* @__PURE__ */ jsxRuntime.jsxs(DropdownMenu, {
       trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, {
@@ -34129,6 +34205,7 @@ function NestOperation({
         icon: "clear",
         label: "Delete Query",
         onClick: () => {
+          focusParentQueryPanel();
           nest2.delete();
           setQuery == null ? void 0 : setQuery(rootQuery.build());
         }
@@ -34143,29 +34220,41 @@ function NestOperation({
       view: nest2.view
     })]
   });
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", {
+  return /* @__PURE__ */ jsxRuntime.jsx("div", {
     ...{
       className: "mlyj3b58b mly1yf7rl7 mly1xmf6yo mlyh8yej3"
     },
-    children: [/* @__PURE__ */ jsxRuntime.jsx(CollapsiblePanel, {
-      title: nest.name,
-      icon: viewToVisualizationIcon(nest.view),
-      defaultOpen,
-      controls: getControls(nest),
-      collapsedControls: getControls(nest),
-      children: /* @__PURE__ */ jsxRuntime.jsx(View, {
+    children: /* @__PURE__ */ jsxRuntime.jsxs("div", {
+      ref: panelRef,
+      onPointerDownCapture: focusCurrentNestQueryPanel,
+      "data-nest-panel": true,
+      children: [/* @__PURE__ */ jsxRuntime.jsx(CollapsiblePanel, {
+        title: nest.name,
+        icon: viewToVisualizationIcon(nest.view),
+        defaultOpen: true,
+        controls: getControls(nest),
+        collapsedControls: getControls(nest),
+        isFocused: isCurrentNestQueryPanelFocused,
+        children: /* @__PURE__ */ jsxRuntime.jsx(View, {
+          rootQuery,
+          view: nest.view
+        })
+      }), /* @__PURE__ */ jsxRuntime.jsx(RenameDialog, {
         rootQuery,
-        view: nest.view
-      })
-    }), /* @__PURE__ */ jsxRuntime.jsx(RenameDialog, {
-      rootQuery,
-      view,
-      target: nest,
-      open: renameOpen,
-      setOpen: setRenameOpen
-    })]
+        view,
+        target: nest,
+        open: renameOpen,
+        setOpen: setRenameOpen
+      })]
+    })
   }, nest.name);
 }
+function findParentNestQueryPanel(element2) {
+  if (!element2 || !element2.parentElement) return null;
+  const parentElement = element2.parentElement;
+  if (parentElement.dataset.nestPanel !== void 0) return parentElement;
+  return findParentNestQueryPanel(parentElement);
+}
 function Operations({
   rootQuery,
   view,
@@ -34267,7 +34356,7 @@ function ViewDefinition({
 function CollapsingView({
   viewDef
 }) {
-  const [collapsed, setCollapsed] = React.useState(true);
+  const [collapsed, setCollapsed] = React.useState(false);
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     ...{
       0: {
@@ -34296,11 +34385,11 @@ function CollapsingView({
       })]
     }), !collapsed && /* @__PURE__ */ jsxRuntime.jsx(ViewAttributeTable, {
       viewInfo: viewDef.getViewInfo(),
-      style: styles$b.preview
+      style: styles$c.preview
     })]
   });
 }
-const styles$b = {
+const styles$c = {
   preview: {
     height: "mlyt7dq6l",
     maxHeight: "mly1hkcv85",
@@ -34332,75 +34421,91 @@ function Query({
   query,
   setQuery
 }) {
-  return /* @__PURE__ */ jsxRuntime.jsxs(CollapsiblePanel, {
-    title: "Main query",
-    controls: /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenu, {
-        trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, {
-          variant: "flat",
-          icon: "meatballs",
-          size: "compact",
-          tooltip: "More Actions"
-        }),
-        children: setQuery ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-          children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
-            icon: "clear",
-            label: "Clear query",
-            onClick: () => {
-              setQuery == null ? void 0 : setQuery(void 0);
-            },
-            disabled: rootQuery.isEmpty()
-          }), /* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
-            icon: "nest",
-            label: "Nest query",
-            onClick: () => {
-              if (rootQuery.definition instanceof QB.ASTArrowQueryDefinition) {
-                rootQuery.definition.view.convertToNest("Nest");
-              }
-              setQuery == null ? void 0 : setQuery(rootQuery.build());
-            },
-            disabled: rootQuery.isEmpty() || !(rootQuery.definition instanceof QB.ASTArrowQueryDefinition)
-          })]
-        }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {})
-      }), query.definition instanceof QB.ASTArrowQueryDefinition ? /* @__PURE__ */ jsxRuntime.jsx(AddMenu, {
-        rootQuery,
-        view: query.definition
-      }) : null]
-    }),
-    collapsedControls: /* @__PURE__ */ jsxRuntime.jsx(Icon, {
-      name: viewToVisualizationIcon(query)
-    }),
-    children: [query.definition instanceof QB.ASTArrowQueryDefinition ? /* @__PURE__ */ jsxRuntime.jsxs("div", {
-      style: {
-        display: "flex",
-        flexDirection: "column",
-        gap: 8
-      },
-      children: [!query.isEmpty() && /* @__PURE__ */ jsxRuntime.jsx(Visualization$1, {
-        rootQuery,
-        view: query
-      }), /* @__PURE__ */ jsxRuntime.jsx(ViewDefinition, {
-        rootQuery,
-        view: query.definition,
-        viewDef: query.definition.view
-      })]
-    }) : null, query.isEmpty() ? /* @__PURE__ */ jsxRuntime.jsx("div", {
-      ...{
-        className: "mly78zum5 mlyl56j7k mly6s0dn4 mlyng8ra"
-      },
-      children: /* @__PURE__ */ jsxRuntime.jsxs("div", {
-        ...{
-          className: "mly78zum5 mly6s0dn4"
+  const {
+    currentNestQueryPanel,
+    onCurrentNestQueryPanelChange,
+    onCurrentNestViewChange
+  } = React__namespace.useContext(QueryEditorContext);
+  const focusMainQueryPanel = () => {
+    onCurrentNestQueryPanelChange == null ? void 0 : onCurrentNestQueryPanelChange(null);
+    onCurrentNestViewChange == null ? void 0 : onCurrentNestViewChange(null);
+  };
+  const canEditViz = query.definition instanceof QB.ASTSegmentViewDefinition;
+  return /* @__PURE__ */ jsxRuntime.jsx("div", {
+    onPointerDownCapture: focusMainQueryPanel,
+    children: /* @__PURE__ */ jsxRuntime.jsxs(CollapsiblePanel, {
+      title: "Main query",
+      isFocused: !currentNestQueryPanel,
+      controls: /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+        children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenu, {
+          trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, {
+            variant: "flat",
+            icon: "meatballs",
+            size: "compact",
+            tooltip: "More Actions"
+          }),
+          children: setQuery ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+            children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
+              icon: "clear",
+              label: "Clear query",
+              onClick: () => {
+                focusMainQueryPanel();
+                setQuery == null ? void 0 : setQuery(void 0);
+              },
+              disabled: rootQuery.isEmpty()
+            }), /* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
+              icon: "nest",
+              label: "Nest query",
+              onClick: () => {
+                if (rootQuery.definition instanceof QB.ASTArrowQueryDefinition) {
+                  rootQuery.definition.view.convertToNest("Nest");
+                }
+                setQuery == null ? void 0 : setQuery(rootQuery.build());
+              },
+              disabled: rootQuery.isEmpty() || !(rootQuery.definition instanceof QB.ASTArrowQueryDefinition)
+            })]
+          }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {})
+        }), query.definition instanceof QB.ASTArrowQueryDefinition ? /* @__PURE__ */ jsxRuntime.jsx(AddMenu, {
+          rootQuery,
+          view: query.definition
+        }) : null]
+      }),
+      collapsedControls: /* @__PURE__ */ jsxRuntime.jsx(Icon, {
+        name: viewToVisualizationIcon(query)
+      }),
+      children: [query.definition instanceof QB.ASTArrowQueryDefinition ? /* @__PURE__ */ jsxRuntime.jsxs("div", {
+        style: {
+          display: "flex",
+          flexDirection: "column",
+          gap: 8
         },
-        children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
-          children: "Click"
-        }), /* @__PURE__ */ jsxRuntime.jsx(Icon, {
-          name: "insert"
-        }), /* @__PURE__ */ jsxRuntime.jsx("div", {
-          children: "to get started"
+        children: [!query.isEmpty() && canEditViz && /* @__PURE__ */ jsxRuntime.jsx(Visualization$1, {
+          rootQuery,
+          view: query
+        }), /* @__PURE__ */ jsxRuntime.jsx(ViewDefinition, {
+          rootQuery,
+          view: query.definition,
+          viewDef: query.definition.view
         })]
-      })
-    }) : null]
+      }) : null, query.isEmpty() ? /* @__PURE__ */ jsxRuntime.jsx("div", {
+        ...{
+          className: "mly78zum5 mlyl56j7k mly6s0dn4 mlyng8ra"
+        },
+        children: /* @__PURE__ */ jsxRuntime.jsxs("div", {
+          ...{
+            className: "mly78zum5 mly6s0dn4 mlywzxoxx"
+          },
+          children: [/* @__PURE__ */ jsxRuntime.jsx("div", {
+            children: "Click"
+          }), /* @__PURE__ */ jsxRuntime.jsx(Icon, {
+            name: "insert",
+            color: "disabled"
+          }), /* @__PURE__ */ jsxRuntime.jsx("div", {
+            children: "to get started"
+          })]
+        })
+      }) : null]
+    })
   });
 }
 function Source({
@@ -34408,14 +34513,14 @@ function Source({
 }) {
   if (rootQuery.definition instanceof QB.ASTArrowQueryDefinition) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", {
-      ..._stylex.props(styles$s.queryCard, styles$a.content),
+      ..._stylex.props(styles$r.queryCard, styles$b.content),
       children: /* @__PURE__ */ jsxRuntime.jsxs("div", {
-        ..._stylex.props(styles$s.labelWithIcon),
+        ..._stylex.props(styles$r.labelWithIcon),
         children: [/* @__PURE__ */ jsxRuntime.jsx(Icon, {
           name: "database"
         }), /* @__PURE__ */ jsxRuntime.jsx("div", {
           ...{
-            className: "mlyb3r6kr mlylyipyv"
+            className: "mlyb3r6kr mlylyipyv mly117nqv4"
           },
           children: rootQuery.definition.as.ArrowQueryDefinition().source.as.ReferenceQueryArrowSource().name
         })]
@@ -34424,7 +34529,7 @@ function Source({
   }
   return null;
 }
-const styles$a = {
+const styles$b = {
   content: {
     display: "mlyrvj5dj",
     gridAutoFlow: "mly1mt1orb",
@@ -34435,12 +34540,145 @@ const styles$a = {
     $$css: true
   }
 };
+function DateLiteralEditor({
+  value,
+  setValue,
+  customStyle
+}) {
+  const [errorMessage, setErrorMessage] = React.useState("");
+  const [open, setOpen] = React.useState(false);
+  const input = React.useRef(null);
+  const picker = React.useRef(null);
+  const isDate2 = value.kind === "date_literal";
+  const date = isDate2 ? value.date_value : value.timestamp_value;
+  const units = isDate2 ? "day" : "second";
+  const onSetValue = (date2) => {
+    if (date2) {
+      setErrorMessage("");
+      if (isDate2) {
+        setValue({
+          kind: "date_literal",
+          date_value: hooks.utc(date2).format(formats["day"])
+        });
+      } else {
+        setValue({
+          kind: "timestamp_literal",
+          timestamp_value: hooks.utc(date2).format(formats["second"])
+        });
+      }
+    } else {
+      setErrorMessage("Invalid date");
+    }
+  };
+  useClickOutside([input, picker], () => {
+    setOpen(false);
+  });
+  return /* @__PURE__ */ jsxRuntime.jsxs(Root2$2, {
+    open,
+    onOpenChange: () => {
+    },
+    children: [/* @__PURE__ */ jsxRuntime.jsx(Trigger$2, {
+      asChild: true,
+      children: /* @__PURE__ */ jsxRuntime.jsx("div", {
+        ..._stylex.props(tokenStyles.main, styles$a.wrapper, customStyle),
+        children: /* @__PURE__ */ jsxRuntime.jsx(DateInput, {
+          value: hooks.utc(date).toDate(),
+          setValue: onSetValue,
+          units,
+          onFocus: () => setOpen(true),
+          customStyle: {
+            ...styles$a.input,
+            ...isDate2 ? styles$a.dateInput : styles$a.timestampInput
+          },
+          forwardRef: input
+        })
+      })
+    }), errorMessage && /* @__PURE__ */ jsxRuntime.jsx(ErrorIcon, {
+      errorMessage
+    }), /* @__PURE__ */ jsxRuntime.jsx(Portal$2, {
+      children: /* @__PURE__ */ jsxRuntime.jsx(Content2$2, {
+        align: "center",
+        asChild: true,
+        children: /* @__PURE__ */ jsxRuntime.jsx(DatePicker, {
+          value: hooks.utc(date).toDate(),
+          setValue: onSetValue,
+          units,
+          maxLevel: units,
+          customStyle: styles$a.datePicker,
+          forwardRef: picker
+        })
+      })
+    })]
+  });
+}
+const styles$a = {
+  input: {
+    border: "mly1gs6z28",
+    borderWidth: null,
+    borderInlineWidth: null,
+    borderInlineStartWidth: null,
+    borderLeftWidth: null,
+    borderInlineEndWidth: null,
+    borderRightWidth: null,
+    borderBlockWidth: null,
+    borderTopWidth: null,
+    borderBottomWidth: null,
+    borderStyle: null,
+    borderInlineStyle: null,
+    borderInlineStartStyle: null,
+    borderLeftStyle: null,
+    borderInlineEndStyle: null,
+    borderRightStyle: null,
+    borderBlockStyle: null,
+    borderTopStyle: null,
+    borderBottomStyle: null,
+    borderColor: null,
+    borderInlineColor: null,
+    borderInlineStartColor: null,
+    borderLeftColor: null,
+    borderInlineEndColor: null,
+    borderRightColor: null,
+    borderBlockColor: null,
+    borderTopColor: null,
+    borderBottomColor: null,
+    height: "mlyd7y6wv",
+    backgroundColor: "mlyjbqb8w mlytw1abo",
+    $$css: true
+  },
+  dateInput: {
+    width: "mly869kya",
+    $$css: true
+  },
+  timestampInput: {
+    width: "mlynrytzq",
+    $$css: true
+  },
+  wrapper: {
+    $$css: true
+  },
+  datePicker: {
+    display: "mly78zum5",
+    flexDirection: "mlydt5ytf",
+    boxShadow: "mly5n1uv4",
+    backgroundColor: "mly12peec7",
+    borderRadius: "mlyur7f20",
+    borderStartStartRadius: null,
+    borderStartEndRadius: null,
+    borderEndStartRadius: null,
+    borderEndEndRadius: null,
+    borderTopLeftRadius: null,
+    borderTopRightRadius: null,
+    borderBottomLeftRadius: null,
+    borderBottomRightRadius: null,
+    width: "mly1hfn5x7",
+    $$css: true
+  }
+};
 function LiteralValueEditor({
   value,
   setValue,
   customStyle
 }) {
-  const [errorMessage, setErrorMessage] = React__namespace.useState("");
   if (!value) {
     return null;
   }
@@ -34455,31 +34693,18 @@ function LiteralValueEditor({
           label: "false",
           value: "false"
         }],
-        onChange: (value2) => setValue(value2 === "true"),
+        onChange: (value2) => setValue({
+          kind: "boolean_literal",
+          boolean_value: value2 === "true"
+        }),
         customStyle
       });
     case "date_literal":
-      return /* @__PURE__ */ jsxRuntime.jsxs("div", {
-        ...{
-          className: "mly78zum5"
-        },
-        children: [/* @__PURE__ */ jsxRuntime.jsx("input", {
-          value: value.date_value.split(" ")[0],
-          type: "date",
-          onChange: (event) => {
-            if (event.target.valueAsDate) {
-              setErrorMessage("");
-              setValue({
-                date: event.target.valueAsDate,
-                granularity: "day"
-              });
-            } else {
-              setErrorMessage("Invalid date");
-            }
-          }
-        }), errorMessage && /* @__PURE__ */ jsxRuntime.jsx(ErrorIcon, {
-          errorMessage
-        })]
+    case "timestamp_literal":
+      return /* @__PURE__ */ jsxRuntime.jsx(DateLiteralEditor, {
+        value,
+        setValue,
+        customStyle
       });
     case "null_literal":
       return /* @__PURE__ */ jsxRuntime.jsx(Token, {
@@ -34489,42 +34714,28 @@ function LiteralValueEditor({
       return /* @__PURE__ */ jsxRuntime.jsx(EditableToken, {
         value: value.number_value,
         type: "number",
-        onChange: (value2) => setValue(value2),
+        onChange: (value2) => setValue({
+          kind: "number_literal",
+          number_value: value2
+        }),
         customStyle
       });
     case "string_literal":
       return /* @__PURE__ */ jsxRuntime.jsx(EditableToken, {
         value: value.string_value,
-        onChange: (value2) => setValue(value2),
+        onChange: (value2) => setValue({
+          kind: "string_literal",
+          string_value: value2
+        }),
         customStyle
       });
-    case "timestamp_literal":
-      return /* @__PURE__ */ jsxRuntime.jsxs("div", {
-        ...{
-          className: "mly78zum5"
-        },
-        children: [/* @__PURE__ */ jsxRuntime.jsx("input", {
-          value: value.timestamp_value,
-          type: "date",
-          onChange: (event) => {
-            if (event.target.valueAsDate) {
-              setErrorMessage("");
-              setValue({
-                date: event.target.valueAsDate,
-                granularity: "second"
-              });
-            } else {
-              setErrorMessage("Invalid date");
-            }
-          }
-        }), errorMessage && /* @__PURE__ */ jsxRuntime.jsx(ErrorIcon, {
-          errorMessage
-        })]
-      });
     case "filter_expression_literal":
       return /* @__PURE__ */ jsxRuntime.jsx(EditableToken, {
         value: value.filter_expression_value,
-        onChange: (value2) => setValue(value2),
+        onChange: (value2) => setValue({
+          kind: "filter_expression_literal",
+          filter_expression_value: value2
+        }),
         customStyle
       });
   }
@@ -35110,34 +35321,22 @@ function Banners({
 function RenderedResult({
   result
 }) {
-  const [html2, setHTML] = React__namespace.useState();
-  const [rendering, setRendering] = React__namespace.useState(true);
-  React__namespace.useEffect(() => {
-    let canceled = false;
-    setRendering(true);
-    const updateResults = async () => {
-      const renderer = new render__namespace.HTMLView(document);
-      const html22 = await renderer.render(result, {
-        dataStyles: {},
-        isDrillingEnabled: true
-      });
-      if (canceled) {
-        return;
-      }
-      setRendering(false);
-      setHTML(html22);
-    };
-    updateResults();
-    return () => {
-      canceled = true;
-    };
+  const [renderer, setRenderer] = React.useState();
+  React.useEffect(() => {
+    const renderer2 = document.createElement("malloy-render");
+    renderer2.malloyResult = result;
+    setRenderer(renderer2);
   }, [result]);
-  if (!rendering) return html2 && /* @__PURE__ */ jsxRuntime.jsx(DOMElement, {
-    className: "malloy-render_result-wrapper",
-    element: html2
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(ScrollableArea, {
-    children: /* @__PURE__ */ jsxRuntime.jsx("div", {
+  if (renderer) {
+    return /* @__PURE__ */ jsxRuntime.jsx(DOMElement, {
+      element: renderer,
+      style: {
+        overflow: "hidden",
+        height: "100%"
+      }
+    });
+  } else {
+    return /* @__PURE__ */ jsxRuntime.jsx("div", {
       ...{
         className: "mly78zum5 mlyl56j7k mly6s0dn4"
       },
@@ -35152,8 +35351,8 @@ function RenderedResult({
           children: "Rendering..."
         })]
       })
-    })
-  });
+    });
+  }
 }
 function LoadingDisplay({
   onCancel,
@@ -35350,7 +35549,7 @@ function ResultPanel({
       children: [/* @__PURE__ */ jsxRuntime.jsx(Content, {
         value: "Results",
         ...{
-          className: "mlyc7ga6q mlyh8yej3 mly5yr21d mly9f619 mlyysyzu8"
+          className: "mlyc7ga6q mlyh8yej3 mly5yr21d mly9f619"
         },
         children: submittedQuery && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
           children: [draftQuery && submittedQuery && !queriesAreEqual(draftQuery, submittedQuery.query) && /* @__PURE__ */ jsxRuntime.jsxs("div", {
@@ -35569,15 +35768,21 @@ function flattenFieldsTree(fields, path = []) {
       case "measure":
       case "dimension":
         if (field.type.kind === "array_type" && field.type.element_type.kind === "record_type") {
-          return flattenFieldsTree(field.type.element_type.fields.map((dimension) => ({
+          return [{
+            path,
+            field
+          }, ...flattenFieldsTree(field.type.element_type.fields.map((dimension) => ({
             kind: field.kind,
             ...dimension
-          })), [...path, field.name]);
+          })), [...path, field.name])];
         } else if (field.type.kind === "record_type") {
-          return flattenFieldsTree(field.type.fields.map((dimension) => ({
+          return [{
+            path,
+            field
+          }, ...flattenFieldsTree(field.type.fields.map((dimension) => ({
             kind: field.kind,
             ...dimension
-          })), [...path, field.name]);
+          })), [...path, field.name])];
         }
         return [{
           path,
@@ -35619,64 +35824,46 @@ function groupFieldItemsByKind(items) {
     return acc;
   }, {}));
 }
-const getNestName = (segment, rename = "Nest") => {
-  const nestNo = segmentNestNo(segment);
-  return nestNo > 1 ? `${rename} ${nestNo}` : rename;
-};
 const FIELD_KIND_TO_TITLE = {
   view: "Views",
   measure: "Measures",
   dimension: "Dimensions"
 };
-function useNestOperations(rootQuery) {
-  const nestOperations = React.useMemo(() => {
-    if (rootQuery) {
-      const queryDef = rootQuery.definition;
-      if (queryDef instanceof QB.ASTArrowQueryDefinition) {
-        return extractNestOperations(queryDef.view);
-      }
-    }
-    return [];
-  }, [rootQuery]);
-  return nestOperations;
-}
-const extractNestOperations = (view, nestOperations = []) => {
-  if (view instanceof QB.ASTArrowViewDefinition) {
-    return extractNestOperations(view.view, nestOperations);
-  } else if (view instanceof QB.ASTSegmentViewDefinition) {
-    view.operations.items.filter((operation) => operation instanceof QB.ASTNestViewOperation).forEach((operation) => {
-      const nestView = operation.view.definition;
-      nestOperations.push({
-        name: operation.name,
-        view: nestView
-      });
-      extractNestOperations(nestView, nestOperations);
-    });
-    return nestOperations;
-  } else if (view instanceof QB.ASTRefinementViewDefinition) {
-    return extractNestOperations(view.refinement, nestOperations);
-  }
-  return nestOperations;
-};
 function useOperations(view, field, path) {
+  const dimensionFields = React.useMemo(() => {
+    const {
+      fields
+    } = getInputSchemaFromViewParent(view);
+    return new Set(flattenFieldsTree(fields).filter(({
+      field: field2
+    }) => field2.kind === "dimension").map(({
+      field: field2
+    }) => field2.name));
+  }, [view]);
+  const measureFields = React.useMemo(() => {
+    const {
+      fields
+    } = getInputSchemaFromViewParent(view);
+    return new Set(flattenFieldsTree(fields).filter(({
+      field: field2
+    }) => field2.kind === "measure").map(({
+      field: field2
+    }) => field2.name));
+  }, [view]);
   const isGroupByAllowed = React.useMemo(() => {
     if (!view) {
       return false;
     }
-    const fieldName = field.name;
-    const inputSchemaFields = getInputSchemaFromViewParent(view).fields;
-    const filteredFieldItems = flattenFieldsTree(inputSchemaFields).filter((item) => item.field.kind === "dimension");
-    return filteredFieldItems.some((item) => item.field.name === fieldName && item.path.join(".") === path.join("."));
-  }, [view, field, path]);
+    const segment = getSegmentIfPresent(view);
+    return dimensionFields.has(field.name) && !(segment == null ? void 0 : segment.hasField(field.name, path)) && isNotAnnotatedFilteredField(field);
+  }, [view, field, path, dimensionFields]);
   const isAggregateAllowed = React.useMemo(() => {
     if (!view) {
       return false;
     }
-    const fieldName = field.name;
-    const inputSchemaFields = getInputSchemaFromViewParent(view).fields;
-    const filteredFieldItems = flattenFieldsTree(inputSchemaFields).filter((item) => item.field.kind === "measure");
-    return filteredFieldItems.some((item) => item.field.name === fieldName && item.path.join(".") === path.join("."));
-  }, [view, field, path]);
+    const segment = getSegmentIfPresent(view);
+    return measureFields.has(field.name) && !(segment == null ? void 0 : segment.hasField(field.name, path)) && isNotAnnotatedFilteredField(field);
+  }, [view, field, path, measureFields]);
   const isFilterAllowed = React.useMemo(() => {
     if (!view) {
       return false;
@@ -35703,280 +35890,119 @@ function useOperations(view, field, path) {
 }
 const FILTERABLE_TYPES = ["string_type", "boolean_type", "number_type", "date_type", "timestamp_type"];
 const ORDERABLE_TYPES = ["string_type", "number_type", "boolean_type", "date_type", "timestamp_type"];
-function OperationDropdownMenuItems({
-  view,
+function FieldTokenWithActions({
   field,
   path,
-  withEmptyNest = false
+  viewDef
 }) {
   const {
     rootQuery,
-    setQuery
+    setQuery,
+    currentNestView
   } = React.useContext(QueryEditorContext);
+  const view = currentNestView ?? viewDef;
   const {
     isGroupByAllowed,
     isAggregateAllowed,
     isFilterAllowed,
     isOrderByAllowed
   } = useOperations(view, field, path);
-  const handleMenuItemClick = (event, operation) => {
+  const [isFilterPopoverOpen, setIsFilterPopoverOpen] = React.useState();
+  const [isTooltipOpen, setIsTooltipOpen] = React.useState(false);
+  const handleAddOperationAction = (operation, filter) => {
     if (field.kind === "dimension" || field.kind === "measure") {
-      const segment = view.getOrAddDefaultSegment();
-      const currentView = withEmptyNest ? segment.addEmptyNest(getNestName(segment)).view : view;
-      const currentSegment = currentView.getOrAddDefaultSegment();
       if (operation === "groupBy" && isGroupByAllowed) {
-        addGroupBy(currentView, field, path);
+        addGroupBy(view, field, path);
       } else if (operation === "aggregate" && isAggregateAllowed) {
-        addAggregate(currentView, field, path);
+        addAggregate(view, field, path);
       } else if (operation === "orderBy" && isOrderByAllowed) {
-        currentSegment.addOrderBy(field.name, "asc");
+        addOrderBy(view, field);
+      } else if (operation === "filter" && isFilterAllowed && filter) {
+        addFilter(view, field, path, filter);
       }
       setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
     }
   };
-  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {
-    children: field.kind === "measure" ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
-        icon: "aggregate",
-        label: "Aggregate",
-        disabled: !isAggregateAllowed,
-        onClick: (event) => handleMenuItemClick(event, "aggregate")
-      }), /* @__PURE__ */ jsxRuntime.jsx(FilterDropdownSubmenuItem, {
-        view,
-        isFilterAllowed,
-        field,
-        path
-      }), /* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
-        icon: "orderBy",
-        label: "Order by",
-        disabled: !isOrderByAllowed,
-        onClick: (event) => handleMenuItemClick(event, "orderBy")
-      })]
-    }) : field.kind === "dimension" ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
-        icon: "groupBy",
-        label: "Group by",
-        disabled: !isGroupByAllowed,
-        onClick: (event) => handleMenuItemClick(event, "groupBy")
-      }), /* @__PURE__ */ jsxRuntime.jsx(FilterDropdownSubmenuItem, {
-        view,
-        isFilterAllowed,
-        field,
-        path
-      }), /* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
-        icon: "orderBy",
-        label: "Order by",
-        disabled: !isOrderByAllowed,
-        onClick: (event) => handleMenuItemClick(event, "orderBy")
-      })]
-    }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {})
-  });
-}
-function FilterDropdownSubmenuItem({
-  view,
-  isFilterAllowed,
-  field,
-  path
-}) {
-  const {
-    rootQuery,
-    setQuery
-  } = React.useContext(QueryEditorContext);
-  const [isOpen, setIsOpen] = React.useState(false);
-  const handleFilterSet = (filter) => {
-    const segment = view.getOrAddDefaultSegment();
-    if (field.kind === "dimension") {
-      segment.addWhere(field.name, path, filter);
-    } else {
-      segment.addHaving(field.name, path, filter);
-    }
-    setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
-  };
-  return /* @__PURE__ */ jsxRuntime.jsx(DropdownSubMenuItem, {
-    icon: "filter",
-    label: "Filter",
-    disabled: !isFilterAllowed,
-    open: isOpen,
-    onOpenChange: setIsOpen,
-    children: /* @__PURE__ */ jsxRuntime.jsx(FilterDialog, {
-      fieldInfo: field,
-      path,
-      onFilterApply: handleFilterSet,
-      onOpenChange: setIsOpen
-    })
-  });
-}
-function NestFieldDropdownMenu({
-  view,
-  field,
-  path,
-  trigger,
-  onOpenChange
-}) {
-  const {
-    rootQuery,
-    setQuery
-  } = React.useContext(QueryEditorContext);
-  const nestOperations = useNestOperations(rootQuery);
-  const nestViewWithinNestQuery = (operation) => {
-    const segment = operation.view.getOrAddDefaultSegment();
-    const {
-      fields
-    } = operation.view.getOutputSchema();
-    let rename;
-    if (fields.find((f2) => f2.name === field.name)) {
-      rename = findUniqueFieldName(fields, field.name);
-    }
-    segment.addNest(field.name, rename);
-    setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
-  };
-  return /* @__PURE__ */ jsxRuntime.jsx(DropdownMenu, {
-    trigger,
-    onOpenChange,
-    children: nestOperations.length === 0 ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenuLabel, {
-        label: "Add to new nested query as..."
-      }), /* @__PURE__ */ jsxRuntime.jsx(OperationDropdownMenuItems, {
-        view,
-        field,
-        path,
-        withEmptyNest: true
-      })]
-    }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenuLabel, {
-        label: "Add to nested query..."
-      }), nestOperations.map((operation, index2) => {
-        return field.kind === "view" ? /* @__PURE__ */ jsxRuntime.jsx(DropdownMenuItem, {
-          label: operation.name,
-          onClick: () => nestViewWithinNestQuery(operation)
-        }, index2) : /* @__PURE__ */ jsxRuntime.jsxs(DropdownSubMenuItem, {
-          label: operation.name,
-          children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenuLabel, {
-            label: `Add to ${operation.name} query as...`
-          }), /* @__PURE__ */ jsxRuntime.jsx(OperationDropdownMenuItems, {
-            view: operation.view.parent.as.View(),
-            field,
-            path
-          })]
-        }, index2);
-      })]
-    })
-  });
-}
-function AddFieldDropdownMenu({
-  view,
-  field,
-  path,
-  ...props2
-}) {
-  return /* @__PURE__ */ jsxRuntime.jsxs(DropdownMenu, {
-    ...props2,
-    children: [/* @__PURE__ */ jsxRuntime.jsx(DropdownMenuLabel, {
-      label: "Add to main query as..."
-    }), /* @__PURE__ */ jsxRuntime.jsx(OperationDropdownMenuItems, {
-      view,
-      field,
-      path
-    })]
-  });
-}
-function FieldTokenWithActions({
-  field,
-  path
-}) {
-  const {
-    rootQuery,
-    setQuery
-  } = React.useContext(QueryEditorContext);
-  const [isAddFieldMenuOpen, setIsAddFieldMenuOpen] = React.useState();
-  const [isNestFieldMenuOpen, setIsNestFieldMenuOpen] = React.useState();
-  const nestViews = useNestOperations(rootQuery);
-  const viewDef = rootQuery == null ? void 0 : rootQuery.definition;
-  if (!(viewDef instanceof QB.ASTArrowQueryDefinition)) {
-    return null;
-  }
-  const hasAddFieldMenu = field.kind === "measure" || field.kind === "dimension";
-  const hasNestFieldMenu = field.kind === "measure" || field.kind === "dimension" || field.kind === "view" && nestViews.length > 0;
-  const addViewToMainQuery = () => {
-    if (field.kind === "view") {
-      if (rootQuery == null ? void 0 : rootQuery.isEmpty()) {
-        rootQuery == null ? void 0 : rootQuery.setView(field.name);
-      } else {
-        addNest(viewDef, field);
-      }
+  const handleSetView = () => {
+    if (field.kind === "view" && (rootQuery == null ? void 0 : rootQuery.isEmpty())) {
+      rootQuery == null ? void 0 : rootQuery.setView(field.name);
       setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
     }
   };
-  const nestViewWithinMainQuery = () => {
+  const handleAddView = () => {
     if (field.kind === "view") {
-      addNest(viewDef, field);
+      addNest(view, field);
       setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
     }
   };
-  const hoverActions = () => {
-    return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-      children: [hasAddFieldMenu ? /* @__PURE__ */ jsxRuntime.jsx(AddFieldDropdownMenu, {
-        view: viewDef,
-        field,
+  return /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
+    field,
+    hoverActions: field.kind === "view" ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [/* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
+        icon: "insert",
+        disabled: !(rootQuery == null ? void 0 : rootQuery.isEmpty()),
+        onClick: handleSetView,
+        tooltip: "Add view",
+        onTooltipOpenChange: setIsTooltipOpen
+      }), /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
+        icon: "nest",
+        onClick: handleAddView,
+        tooltip: "Add as new nested query",
+        onTooltipOpenChange: setIsTooltipOpen
+      })]
+    }) : field.kind === "measure" ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [/* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
+        icon: "aggregate",
+        tooltip: "Add as aggregate",
+        disabled: !isAggregateAllowed,
+        onClick: () => handleAddOperationAction("aggregate"),
+        onTooltipOpenChange: setIsTooltipOpen
+      }), /* @__PURE__ */ jsxRuntime.jsx(FilterPopover, {
+        fieldInfo: field,
         path,
-        trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, {
-          variant: "flat",
-          size: "compact",
-          icon: "insert",
-          tooltip: "Add to main query"
+        setFilter: (filter) => handleAddOperationAction("filter", filter),
+        trigger: /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
+          icon: "filter",
+          tooltip: "Add as filter",
+          disabled: !isFilterAllowed,
+          onTooltipOpenChange: setIsTooltipOpen
         }),
-        onOpenChange: (open) => setIsAddFieldMenuOpen(open)
-      }) : /* @__PURE__ */ jsxRuntime.jsx(Button, {
-        variant: "flat",
-        size: "compact",
-        icon: "insert",
-        onClick: addViewToMainQuery,
-        tooltip: "Add to main query"
-      }), hasNestFieldMenu ? /* @__PURE__ */ jsxRuntime.jsx(NestFieldDropdownMenu, {
-        view: viewDef,
-        field,
+        onOpenChange: setIsFilterPopoverOpen
+      }), /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
+        icon: "orderBy",
+        tooltip: "Add as order by",
+        disabled: !isOrderByAllowed,
+        onClick: () => handleAddOperationAction("orderBy"),
+        onTooltipOpenChange: setIsTooltipOpen
+      })]
+    }) : field.kind === "dimension" ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [/* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
+        icon: "groupBy",
+        tooltip: "Add as group by",
+        disabled: !isGroupByAllowed,
+        onClick: () => handleAddOperationAction("groupBy"),
+        onTooltipOpenChange: setIsTooltipOpen
+      }), /* @__PURE__ */ jsxRuntime.jsx(FilterPopover, {
+        fieldInfo: field,
         path,
-        trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, {
-          variant: "flat",
-          size: "compact",
-          icon: "nest",
-          tooltip: "Add to nested query"
+        setFilter: (filter) => handleAddOperationAction("filter", filter),
+        trigger: /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
+          icon: "filter",
+          tooltip: "Add as filter",
+          disabled: !isFilterAllowed,
+          onTooltipOpenChange: setIsTooltipOpen
         }),
-        onOpenChange: (open) => setIsNestFieldMenuOpen(open)
-      }) : /* @__PURE__ */ jsxRuntime.jsx(Button, {
-        variant: "flat",
-        size: "compact",
-        icon: "nest",
-        onClick: nestViewWithinMainQuery,
-        tooltip: "Add to nested query"
+        onOpenChange: setIsFilterPopoverOpen
+      }), /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
+        icon: "orderBy",
+        tooltip: "Add as order by",
+        disabled: !isOrderByAllowed,
+        onClick: () => handleAddOperationAction("orderBy"),
+        onTooltipOpenChange: setIsTooltipOpen
       })]
-    });
-  };
-  return hasAddFieldMenu ? /* @__PURE__ */ jsxRuntime.jsx(AddFieldDropdownMenu, {
-    view: viewDef,
-    field,
-    path,
-    trigger: /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
-      field,
-      hoverActionsVisible: isAddFieldMenuOpen || isNestFieldMenuOpen,
-      hoverActions: hoverActions(),
-      asButtonTrigger: true
-    }),
-    onOpenChange: (open) => setIsAddFieldMenuOpen(open),
-    tooltip: /* @__PURE__ */ jsxRuntime.jsx(FieldHoverCard, {
-      field,
-      path
-    }),
-    tooltipProps: {
-      side: "right",
-      align: "start",
-      alignOffset: 28
-    }
-  }) : /* @__PURE__ */ jsxRuntime.jsx(FieldToken, {
-    field,
-    onClick: addViewToMainQuery,
-    hoverActions: hoverActions(),
-    hoverActionsVisible: isAddFieldMenuOpen || isNestFieldMenuOpen,
+    }) : null,
+    onClick: field.kind === "dimension" && isGroupByAllowed ? () => handleAddOperationAction("groupBy") : field.kind === "measure" && isAggregateAllowed ? () => handleAddOperationAction("aggregate") : field.kind === "view" ? () => handleAddView() : void 0,
+    hoverActionsVisible: isFilterPopoverOpen || isTooltipOpen,
     tooltip: /* @__PURE__ */ jsxRuntime.jsx(FieldHoverCard, {
       field,
       path
@@ -35988,6 +36014,30 @@ function FieldTokenWithActions({
     }
   });
 }
+function ActionButton({
+  tooltip,
+  onTooltipOpenChange,
+  ...props2
+}) {
+  return /* @__PURE__ */ jsxRuntime.jsxs(Tooltip, {
+    delayDuration: 300,
+    onOpenChange: onTooltipOpenChange,
+    children: [/* @__PURE__ */ jsxRuntime.jsx(TooltipTrigger, {
+      asChild: true,
+      children: /* @__PURE__ */ jsxRuntime.jsx(Button, {
+        variant: "flat",
+        size: "compact",
+        ...props2
+      })
+    }), /* @__PURE__ */ jsxRuntime.jsx(TooltipPortal, {
+      children: /* @__PURE__ */ jsxRuntime.jsx(TooltipContent, {
+        sideOffset: 8,
+        ..._stylex.props(fontStyles.body, tooltipStyles.default),
+        children: tooltip
+      })
+    })]
+  });
+}
 const FIELD_KIND_ORDER = ["dimension", "measure", "view"];
 function SearchResultList({
   source,
@@ -35999,6 +36049,13 @@ function SearchResultList({
       items: groupFieldItemsByPath(source, group.items)
     }));
   }, [source, items]);
+  const {
+    rootQuery
+  } = React__namespace.useContext(QueryEditorContext);
+  const viewDef = rootQuery == null ? void 0 : rootQuery.definition;
+  if (!(viewDef instanceof QB.ASTArrowQueryDefinition)) {
+    return null;
+  }
   return /* @__PURE__ */ jsxRuntime.jsxs("div", {
     ...{
       className: "mly78zum5 mlydt5ytf mly1cy8zhl mlyou54vl mlye8ttls mly10cdfl8"
@@ -36033,7 +36090,8 @@ function SearchResultList({
           path
         }) => /* @__PURE__ */ jsxRuntime.jsx(FieldTokenWithActions, {
           field,
-          path
+          path,
+          viewDef
         }, [...path, field.name].join(".")))))
       })]
     }, group))]
@@ -36076,6 +36134,13 @@ function FieldGroupList({
       group
     }) => group === fieldGroupType)) == null ? void 0 : _a2.items) ?? [];
   }, [fieldGroupsByKindByPath, fieldGroupType]);
+  const {
+    rootQuery
+  } = React__namespace.useContext(QueryEditorContext);
+  const viewDef = rootQuery == null ? void 0 : rootQuery.definition;
+  if (!(viewDef instanceof QB.ASTArrowQueryDefinition)) {
+    return null;
+  }
   return /* @__PURE__ */ jsxRuntime.jsx("div", {
     ...{
       className: "mly78zum5 mlydt5ytf mly167g77z"
@@ -36090,7 +36155,8 @@ function FieldGroupList({
           path
         }) => /* @__PURE__ */ jsxRuntime.jsx(FieldTokenWithActions, {
           field,
-          path
+          path,
+          viewDef
         }, [...path, field.name].join(".")))
       }, item.groupPath.join(".")))
     })