@uniformdev/context-ui 20.7.1-alpha.12 → 20.7.1-alpha.120

package/dist/index.esm.js

@@ -289,23 +289,43 @@ var contextCriteriaMenuOperators = [
   {
     name: "has the weakest score",
     value: "-"
-  },
+  }
+];
+var enrichmentCriteriaMenuOperators = [
+  ...contextCriteriaMenuOperators,
   {
     name: "has strongest category score",
     value: "^"
   }
 ];
-function CriteriaOperatorMenu({ onChange, value, ...props }) {
+var quirkCriteriaMenuOperators = [
+  {
+    name: "=",
+    description: "equals",
+    value: "="
+  },
+  {
+    name: "\u2260",
+    description: "not equal",
+    value: "!="
+  }
+];
+function getValidCriteriaOperatorsFor(rhsType) {
+  return rhsType === "QUIRK" ? quirkCriteriaMenuOperators : rhsType === "ENR" ? enrichmentCriteriaMenuOperators : contextCriteriaMenuOperators;
+}
+function CriteriaOperatorMenu({ onChange, value, rhsType, ...props }) {
   var _a, _b;
+  const operators = getValidCriteriaOperatorsFor(rhsType);
   return /* @__PURE__ */ jsx6(
     InputComboBox,
     {
       ...props,
+      isDisabled: props.disabled,
       value: {
-        label: (_b = (_a = contextCriteriaMenuOperators.find((e) => e.value === value)) == null ? void 0 : _a.name) != null ? _b : value,
+        label: (_b = (_a = operators.find((e) => e.value === value)) == null ? void 0 : _a.name) != null ? _b : value,
         value
       },
-      options: contextCriteriaMenuOperators.map((option) => ({
+      options: operators.map((option) => ({
         label: option.description ? `${option.name}:${option.description}` : option.name,
         value: option.value
       })),
@@ -537,24 +557,29 @@ function useDimensionsDataContext() {
 
 // src/components/DimensionMenu/CriteriaMatchMenu.tsx
 import { InputComboBox as InputComboBox3 } from "@uniformdev/design-system";
-import { useState as useState5 } from "react";
+import { useEffect as useEffect4, useRef, useState as useState5 } from "react";
 
 // src/components/DimensionMenu/DimensionGroupHeading.tsx
 import { Icon } from "@uniformdev/design-system";
 
 // src/components/DimensionMenu/utils.ts
+import { useMemo } from "react";
 function dimensionToMenuOption(dimension) {
+  if ("dim" in dimension) {
+    return {
+      label: dimension.displayName,
+      value: dimension.dim,
+      original: dimension
+    };
+  }
+  const quirk = dimension;
   return {
-    label: dimension.displayName,
-    value: dimension.dim,
-    isDisabled: false
+    label: `Quirk:${quirk.name}`,
+    value: quirk.id,
+    original: quirk
   };
 }
-function dimensionIcon(displayName) {
-  if (!displayName) {
-    return "unavailable";
-  }
-  const [type] = displayName.split(":");
+function dimensionIcon(type) {
   switch (type.toLowerCase()) {
     case "signal":
       return "data";
@@ -566,25 +591,42 @@ function dimensionIcon(displayName) {
       return "user-list";
   }
 }
-function groupDimensions(dimensions) {
-  const result = [];
-  let lastType = "";
-  for (const dim of dimensions) {
-    const [type] = dim.displayName.split(":");
-    if (lastType !== type) {
-      result.push({ label: type, options: [] });
-      lastType = type;
+function useGroupedDimensions(dimensions, quirks) {
+  return useMemo(() => {
+    const result = [];
+    let lastType = "";
+    for (const dim of dimensions) {
+      const { type } = dimensionDisplayName(dim.displayName);
+      if (lastType !== type) {
+        result.push({ label: type != null ? type : "", options: [] });
+        lastType = type != null ? type : "";
+      }
+      result[result.length - 1].options.push(dimensionToMenuOption(dim));
     }
-    result[result.length - 1].options.push(dimensionToMenuOption(dim));
+    if (quirks == null ? void 0 : quirks.length) {
+      result.push({
+        label: "Quirks",
+        options: quirks.map(dimensionToMenuOption)
+      });
+    }
+    return result;
+  }, [dimensions, quirks]);
+}
+function dimensionDisplayName(displayName) {
+  if (!displayName) {
+    return {};
   }
-  return result;
+  const colonIndex = displayName.indexOf(":");
+  const type = colonIndex >= 0 ? displayName.substring(0, colonIndex) : void 0;
+  const name = colonIndex >= 0 ? displayName.substring(colonIndex + 1) : displayName;
+  return { type, name };
 }
 
 // src/components/DimensionMenu/DimensionGroupHeading.tsx
 import { jsx as jsx8, jsxs as jsxs3 } from "@emotion/react/jsx-runtime";
 var DimensionGroupHeading = (props) => {
-  var _a;
   const { data, getStyles, className } = props;
+  const { type } = dimensionDisplayName(data.label);
   return /* @__PURE__ */ jsx8(
     "div",
     {
@@ -599,7 +641,7 @@ var DimensionGroupHeading = (props) => {
         {
           css: { color: "var(--gray-500)", display: "flex", alignItems: "center", gap: "var(--spacing-xs)" },
           children: [
-            /* @__PURE__ */ jsx8(Icon, { icon: dimensionIcon((_a = data.label) != null ? _a : ""), iconColor: "currentColor", size: 16 }),
+            type ? /* @__PURE__ */ jsx8(Icon, { icon: dimensionIcon(type), iconColor: "currentColor", size: 16 }) : null,
             /* @__PURE__ */ jsx8("span", { children: data.label })
           ]
         }
@@ -630,9 +672,8 @@ function DimensionMenuErrorMessage({ message }) {
 // src/components/DimensionMenu/DimensionOption.tsx
 import { jsx as jsx10 } from "@emotion/react/jsx-runtime";
 var DimensionOption = (props) => {
-  var _a, _b;
   const { data, getStyles, cx, isDisabled, isFocused, isSelected, className, innerRef, innerProps } = props;
-  const [, value] = (_b = (_a = data.label) == null ? void 0 : _a.split(":")) != null ? _b : [];
+  const { name } = dimensionDisplayName(data.label);
   return /* @__PURE__ */ jsx10(
     "div",
     {
@@ -649,38 +690,44 @@ var DimensionOption = (props) => {
       ref: innerRef,
       "aria-disabled": isDisabled,
       ...innerProps,
-      children: /* @__PURE__ */ jsx10("div", { css: { color: "var(--gray-700)" }, children: value != null ? value : data.label })
+      children: /* @__PURE__ */ jsx10("div", { css: { color: "var(--gray-700)" }, children: name != null ? name : data.label })
     }
   );
 };
 
 // src/components/DimensionMenu/DimensionValue.tsx
-import { Icon as Icon2 } from "@uniformdev/design-system";
+import { css as css4 } from "@emotion/react";
+import { Icon as Icon2, Tooltip } from "@uniformdev/design-system";
 import { jsx as jsx11, jsxs as jsxs4 } from "@emotion/react/jsx-runtime";
+var styles = {
+  dimensionValueWrapper: css4`
+    white-space: normal;
+    overflow: hidden;
+  `,
+  dimensionName: css4`
+    color: var(--gray-500);
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-xs);
+  `,
+  dimensionValue: css4`
+    color: var(--gray-700);
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  `
+};
 function DimensionValue({ displayName }) {
-  const [type, name] = displayName.split(":");
-  return /* @__PURE__ */ jsxs4(
-    "div",
-    {
-      css: {
-        whiteSpace: "normal",
-        overflow: "hidden"
-      },
-      children: [
-        name ? /* @__PURE__ */ jsxs4(
-          "small",
-          {
-            css: { color: "var(--gray-500)", display: "flex", alignItems: "center", gap: "var(--spacing-xs)" },
-            children: [
-              type ? /* @__PURE__ */ jsx11(Icon2, { icon: dimensionIcon(type), iconColor: "currentColor", size: 16 }) : null,
-              /* @__PURE__ */ jsx11("span", { "data-testid": "dimension-name", children: type })
-            ]
-          }
-        ) : null,
-        /* @__PURE__ */ jsx11("div", { css: { color: "var(--gray-700)" }, "data-testid": "dimension-value", children: name != null ? name : type })
-      ]
-    }
-  );
+  var _a;
+  const { type, name } = dimensionDisplayName(displayName);
+  const tooltip = (_a = name != null ? name : type) != null ? _a : "";
+  return /* @__PURE__ */ jsxs4("div", { css: styles.dimensionValueWrapper, children: [
+    type ? /* @__PURE__ */ jsxs4("small", { css: styles.dimensionName, children: [
+      type ? /* @__PURE__ */ jsx11(Icon2, { icon: dimensionIcon(type), iconColor: "currentColor", size: 16 }) : null,
+      /* @__PURE__ */ jsx11("span", { "data-testid": "dimension-name", children: type })
+    ] }) : null,
+    /* @__PURE__ */ jsx11(Tooltip, { title: tooltip, children: /* @__PURE__ */ jsx11("div", { css: styles.dimensionValue, "data-testid": "dimension-value", children: name != null ? name : type }) })
+  ] });
 }
 
 // src/components/DimensionMenu/DimensionSingleValue.tsx
@@ -703,13 +750,24 @@ function CriteriaMatchMenu({
   const [inputValue, setInputValue] = useState5(
     typeof criteriaMatch.r !== "undefined" && isInt(criteriaMatch.r) !== null ? criteriaMatch.r.toString(10) : ""
   );
+  const currentInputValue = useRef(inputValue);
+  currentInputValue.current = inputValue;
+  useEffect4(() => {
+    if (currentInputValue.current !== criteriaMatch.r && !criteriaMatch.rDim) {
+      setInputValue(
+        typeof criteriaMatch.r !== "undefined" && isInt(criteriaMatch.r) !== null ? criteriaMatch.r.toString(10) : ""
+      );
+    }
+  }, [criteriaMatch.r, criteriaMatch.rDim]);
   const rDim = criteriaMatch.rDim;
   const targetDim = criteriaMatch.rDim ? dimensions.dimIndex[criteriaMatch.rDim] : void 0;
+  const groupedDimensions = useGroupedDimensions(dimensions.dimensions, void 0);
   return /* @__PURE__ */ jsxs5(Fragment3, { children: [
     /* @__PURE__ */ jsx13(
       InputComboBox3,
       {
         ...props,
+        isDisabled: props.disabled,
         inputValue,
         menuShouldScrollIntoView: true,
         value: {
@@ -723,7 +781,7 @@ function CriteriaMatchMenu({
             value: "",
             isDisabled: true
           },
-          ...groupDimensions(dimensions.dimensions)
+          ...groupedDimensions
         ],
         styles: {
           ...props.styles,
@@ -802,14 +860,25 @@ function isInt(value) {
 // src/components/DimensionMenu/DimensionMenu.tsx
 import { InputComboBox as InputComboBox4 } from "@uniformdev/design-system";
 import { Fragment as Fragment4, jsx as jsx14, jsxs as jsxs6 } from "@emotion/react/jsx-runtime";
-function DimensionMenu({ onChange, value, dimensions, errorMessage, ...props }) {
+function DimensionMenu({
+  onChange,
+  value,
+  dimensions,
+  errorMessage,
+  quirks,
+  ...props
+}) {
+  const groupedDimensions = useGroupedDimensions(dimensions, quirks);
+  const valueAsMenuOption = value ? dimensionToMenuOption(value) : void 0;
   return /* @__PURE__ */ jsxs6(Fragment4, { children: [
     /* @__PURE__ */ jsx14(
       InputComboBox4,
       {
         ...props,
-        value: value ? dimensionToMenuOption(value) : void 0,
-        options: groupDimensions(dimensions),
+        isDisabled: props.disabled,
+        value: valueAsMenuOption,
+        options: groupedDimensions,
+        getOptionValue: (option) => option.label,
         styles: {
           ...props.styles,
           valueContainer: (provided, state) => {
@@ -822,8 +891,10 @@ function DimensionMenu({ onChange, value, dimensions, errorMessage, ...props })
           }
         },
         onChange: (e) => {
-          if (e) {
-            onChange(dimensions.find((d) => d.dim === e.value));
+          if (e == null ? void 0 : e.original) {
+            onChange(e.original);
+          } else {
+            onChange(void 0);
           }
         },
         components: {
@@ -843,8 +914,8 @@ import { CgChevronRight } from "@react-icons/all-files/cg/CgChevronRight";
 import { Icon as Icon3 } from "@uniformdev/design-system";
 
 // src/components/EditLink/EditLink.styles.ts
-import { css as css4 } from "@emotion/react";
-var editLink = css4`
+import { css as css5 } from "@emotion/react";
+var editLink = css5`
   display: flex;
   align-items: center;
   font-weight: var(--fw-bold);
@@ -877,7 +948,7 @@ var EditLink = ({ linkTo, name, linkText = `Edit ${name} Component` }) => {
 };
 
 // src/components/EnrichmentTag/EnrichmentTag.tsx
-import { css as css5 } from "@emotion/react";
+import { css as css6 } from "@emotion/react";
 import { CgCloseO } from "@react-icons/all-files/cg/CgCloseO";
 import { CgMathMinus } from "@react-icons/all-files/cg/CgMathMinus";
 import { CgMathPlus } from "@react-icons/all-files/cg/CgMathPlus";
@@ -892,9 +963,9 @@ import {
   LoadingIndicator as LoadingIndicator3
 } from "@uniformdev/design-system";
 import { produce } from "immer";
-import { useMemo, useState as useState6 } from "react";
+import { useMemo as useMemo2, useState as useState6 } from "react";
 import { Fragment as Fragment5, jsx as jsx16, jsxs as jsxs8 } from "@emotion/react/jsx-runtime";
-var addEnrichmentLink = css5`
+var addEnrichmentLink = css6`
   flex: 2;
   display: flex;
   width: 50%;
@@ -913,10 +984,10 @@ var EnrichmentTag = ({
   displayTitle = true
 }) => {
   const { loading, result: dimensions, error } = useDimensions(contextConfig);
-  const allEnrichments = useMemo(() => {
+  const allEnrichments = useMemo2(() => {
     if (dimensions) return dimensions.dimensions.filter((dimension) => dimension.category === "ENR");
   }, [dimensions]);
-  const remainingEnrichments = useMemo(() => {
+  const remainingEnrichments = useMemo2(() => {
     if (!value) return allEnrichments;
     if (allEnrichments)
       return allEnrichments.filter(
@@ -1083,7 +1154,7 @@ var NoEnrichmentsView = ({ contextConfig }) => /* @__PURE__ */ jsx16(Callout2, {
 var getCappedValue = (value, maxCap = 100, minCap = 0) => {
   return Math.max(Math.min(value, maxCap), minCap);
 };
-var scoreCounterMinusButtonStyles = css5`
+var scoreCounterMinusButtonStyles = css6`
   position: absolute;
   bottom: 0.875rem;
   left: var(--spacing-sm);
@@ -1096,7 +1167,7 @@ var scoreCounterMinusButtonStyles = css5`
   border: 1px solid var(--gray-300);
   border-radius: var(--rounded-full);
 `;
-var scoreCounterPlusButtonStyles = css5`
+var scoreCounterPlusButtonStyles = css6`
   ${scoreCounterMinusButtonStyles}
   left: auto;
   right: var(--spacing-sm);
@@ -1260,20 +1331,30 @@ function opHasRhs(op) {
 }
 
 // src/components/PersonalizationCriteria/PersonalizationCriteriaStatic.tsx
-import { css as css7 } from "@emotion/react";
+import { css as css8 } from "@emotion/react";
 import { CgCloseO as CgCloseO2 } from "@react-icons/all-files/cg/CgCloseO";
-import { AddListButton as AddListButton3, Callout as Callout3, Icon as Icon5, InputInlineSelect, Paragraph } from "@uniformdev/design-system";
+import {
+  AddListButton as AddListButton3,
+  Callout as Callout3,
+  Heading as Heading2,
+  Icon as Icon5,
+  Input as Input2,
+  InputInlineSelect,
+  InputSelect as InputSelect2,
+  Paragraph,
+  VerticalRhythm
+} from "@uniformdev/design-system";
 import { produce as produce2 } from "immer";
 
 // src/components/PersonalizationCriteria/PersonalizationCriteriaStatic.styles.ts
-import { css as css6 } from "@emotion/react";
+import { css as css7 } from "@emotion/react";
 var spaceBetweenCriteriaItems = "6rem";
-var criteriaItem = css6`
+var criteriaItem = css7`
   position: relative;
   padding: var(--spacing-md) var(--spacing-base);
   border: 1px solid var(--gray-300);
-  box-shadow: var(--shadow-base);
-  background-color: white;
+  box-shadow: var(--elevation-200);
+  background-color: var(--white);
   border-radius: var(--rounded-base);
   margin-top: ${spaceBetweenCriteriaItems};
   display: flex;
@@ -1290,35 +1371,37 @@ var criteriaItem = css6`
   }
 
   &:first-of-type {
-    margin-top: var(--spacing-md);
+    margin-top: 0;
     &:before {
       display: none;
     }
   }
 `;
-var criteriaItemInner = css6`
+var criteriaItemInner = css7`
   display: flex;
-  gap: var(--spacing-base);
+  row-gap: var(--spacing-base);
+  column-gap: var(--spacing-xs);
   flex-grow: 1;
   flex-wrap: wrap;
   margin-right: var(--spacing-base);
 `;
-var criteriaWrapper = css6`
+var criteriaWrapper = css7`
   width: 100%;
   display: flex;
   align-items: stretch;
   position: relative;
 `;
-var criteriaOperandWrapper = css6`
+var criteriaOperandWrapper = css7`
   flex: 2;
   height: 52px;
   min-width: 200px;
 `;
-var criteriaOperatorWrapper = css6`
+var criteriaOperatorWrapper = css7`
   flex: 1;
+  flex-wrap: nowrap;
   min-width: 80px;
 `;
-var expand = css6`
+var expand = css7`
   height: 100%;
   width: 100%;
 `;
@@ -1329,13 +1412,15 @@ var PersonalizationCriteriaStatic = ({
   value,
   setValue,
   dimensions,
+  quirks,
   onMenuOpen,
   onMenuClose,
   onAddCriteria,
   onRemoveCriteria,
   displayTitle = true,
   components,
-  errors = {}
+  errors = {},
+  readOnly
 }) => {
   var _a;
   const currentValue = { crit: [], ...value };
@@ -1378,148 +1463,207 @@ var PersonalizationCriteriaStatic = ({
           fontSize: "var(--fs-md)",
           fontWeight: "var(--fw-bold)"
         },
-        children: "Personalize This"
+        children: /* @__PURE__ */ jsx17(Heading2, { level: 5, withMarginBottom: false, children: "Personalization Variation" })
       }
     ) : null,
-    (components == null ? void 0 : components.CustomVariantName) ? /* @__PURE__ */ jsx17(components.CustomVariantName, {}) : null,
-    (components == null ? void 0 : components.ControlPercentage) ? /* @__PURE__ */ jsx17(components.ControlPercentage, {}) : null,
-    !currentValue.crit.length ? /* @__PURE__ */ jsx17(Callout3, { title: "Default variant", type: "info", css: { marginBlock: "var(--spacing-base)" }, children: /* @__PURE__ */ jsx17(Paragraph, { children: 'This personalized variant has no match criteria and will be shown to any visitor that does not match any preceding variants. Ensure that default variants come last in the variant list. Personalize this variant by clicking "Add Criteria" to get started.' }) }) : /* @__PURE__ */ jsx17("div", { children: currentValue.crit.map((currentCriteria, index) => {
-      var _a2, _b, _c, _d;
-      const critHasLhs = ((_a2 = currentCriteria.l) == null ? void 0 : _a2.length) > 0;
-      const critHasRhs = opHasRhs(currentCriteria.op);
-      return /* @__PURE__ */ jsxs9("div", { css: criteriaItem, "data-testid": "criteria-container", children: [
-        /* @__PURE__ */ jsxs9(
-          "div",
-          {
-            css: css7`
-                    ${criteriaItemInner}/* grid-template-columns: minmax(0, 1fr) ${critHasRhs ? "minmax(0, 79px) minmax(0, 1fr)" : "minmax(0, 1fr)"} */
-                  `,
-            className: "criteriaItemInner",
-            children: [
-              /* @__PURE__ */ jsx17(
-                "div",
-                {
-                  css: [criteriaWrapper, criteriaOperandWrapper],
-                  className: "criteria-wrapper",
-                  "data-testid": "select-criteria",
-                  children: /* @__PURE__ */ jsx17(
-                    DimensionMenu,
-                    {
-                      errorMessage: (_b = errors.lhs) == null ? void 0 : _b[index],
-                      css: expand,
-                      styles: { control: (base) => ({ ...base, height: "100%" }) },
-                      dimensions: dimensions.dimensions,
-                      onChange: (dim) => {
-                        update({ ...currentCriteria, l: dim.dim }, index);
-                      },
-                      value: dimensions.dimIndex[currentCriteria.l],
-                      onMenuOpen,
-                      onMenuClose
-                    }
-                  )
-                }
-              ),
-              /* @__PURE__ */ jsx17(
-                "div",
-                {
-                  css: [criteriaWrapper, criteriaOperatorWrapper],
-                  className: "criteria-wrapper",
-                  "data-testid": "select-operator",
-                  children: /* @__PURE__ */ jsx17(
-                    CriteriaOperatorMenu,
-                    {
-                      name: `op-${index}`,
-                      css: expand,
-                      styles: { control: (base) => ({ ...base, height: "100%" }) },
-                      value: currentCriteria.op,
-                      onChange: (op) => {
-                        if (op === "+" || op === "-") {
-                          update({ ...currentCriteria, op, r: void 0, rDim: void 0 }, index);
-                        } else {
-                          update({ ...currentCriteria, op }, index);
-                        }
-                      },
-                      onMenuOpen,
-                      onMenuClose
-                    }
-                  )
-                }
-              ),
-              critHasRhs ? /* @__PURE__ */ jsx17(
-                "div",
-                {
-                  css: [criteriaWrapper, criteriaOperandWrapper],
-                  className: "criteria-wrapper",
-                  "data-testid": "select-match-criteria",
-                  children: /* @__PURE__ */ jsx17(
-                    CriteriaMatchMenu,
-                    {
-                      errorMessage: (_c = errors.rhs) == null ? void 0 : _c[index],
-                      css: expand,
-                      styles: { control: (base) => ({ ...base, height: "100%" }) },
-                      criteriaMatch: currentCriteria,
-                      onChange: (match) => {
-                        update(match, index);
-                      },
-                      isDisabled: !critHasLhs,
-                      dimensions,
-                      onMenuOpen,
-                      onMenuClose
-                    }
-                  )
-                }
-              ) : null
-            ]
-          }
-        ),
-        /* @__PURE__ */ jsx17(
-          "button",
-          {
-            type: "button",
-            onClick: () => removeFromList(index),
-            title: `Delete Personalization`,
-            css: { backgroundColor: "transparent", backgroundImage: "none", borderWidth: 0 },
-            "data-testid": "button-delete",
-            children: /* @__PURE__ */ jsx17(Icon5, { icon: CgCloseO2, iconColor: "red", size: "1.5rem" })
-          }
-        ),
-        index > 0 ? /* @__PURE__ */ jsx17(
-          "div",
-          {
-            className: "criteria-group-operation",
-            css: {
-              position: "absolute",
-              top: "-4rem",
-              transform: "translateX(calc(1.5rem - 50%))"
-            },
-            children: /* @__PURE__ */ jsx17(
-              InputInlineSelect,
+    /* @__PURE__ */ jsxs9(VerticalRhythm, { children: [
+      (components == null ? void 0 : components.CustomVariantName) ? /* @__PURE__ */ jsx17(components.CustomVariantName, {}) : null,
+      (components == null ? void 0 : components.ControlPercentage) ? /* @__PURE__ */ jsx17(components.ControlPercentage, {}) : null,
+      !currentValue.crit.length ? /* @__PURE__ */ jsx17(Callout3, { title: "Default variant", type: "info", css: { marginBlock: "var(--spacing-base)" }, children: /* @__PURE__ */ jsx17(Paragraph, { children: 'This personalized variant has no match criteria and will be shown to any visitor that does not match any preceding variants. Ensure that default variants come last in the variant list. Personalize this variant by clicking "Add Criteria" to get started.' }) }) : /* @__PURE__ */ jsx17("div", { children: currentValue.crit.map((currentCriteria, index) => {
+        var _a2, _b, _c, _d, _e, _f, _g, _h;
+        const critHasLhs = ((_a2 = currentCriteria.l) == null ? void 0 : _a2.length) > 0;
+        const critHasRhs = opHasRhs(currentCriteria.op);
+        const selectedValueIsQuirk = "t" in currentCriteria && currentCriteria.t === "q";
+        const currentDimension = selectedValueIsQuirk ? void 0 : dimensions.dimIndex[currentCriteria.l];
+        const currentQuirk = selectedValueIsQuirk ? quirks == null ? void 0 : quirks.find((q) => q.id === currentCriteria.l) : void 0;
+        return /* @__PURE__ */ jsxs9("div", { css: criteriaItem, "data-testid": "criteria-container", children: [
+          /* @__PURE__ */ jsxs9("div", { css: criteriaItemInner, className: "criteriaItemInner", children: [
+            /* @__PURE__ */ jsx17(
+              "div",
               {
-                "data-testid": "dropdown-button-combine",
-                disabled: index > 1,
-                value: (_d = currentValue.op) != null ? _d : "&",
-                options: [
-                  { label: "AND", value: "&" },
-                  { label: "OR", value: "|" }
-                ],
-                onChange: (v) => {
-                  setOp(v.value);
-                }
+                css: [criteriaWrapper, criteriaOperandWrapper],
+                className: "criteria-wrapper",
+                "data-testid": "select-criteria",
+                children: /* @__PURE__ */ jsx17(
+                  DimensionMenu,
+                  {
+                    errorMessage: (_b = errors.lhs) == null ? void 0 : _b[index],
+                    css: expand,
+                    styles: { control: (base) => ({ ...base, height: "100%" }) },
+                    dimensions: dimensions.dimensions,
+                    quirks,
+                    onChange: (selection) => {
+                      if (!selection) {
+                        return;
+                      }
+                      if ("dim" in selection) {
+                        const validOperators = getValidCriteriaOperatorsFor(selection.category);
+                        const existingOpRemainsValid = !("t" in currentCriteria && currentCriteria.t === "q") && validOperators.some((op) => op.value === currentCriteria.op);
+                        const newCriteria = {
+                          ...currentCriteria,
+                          l: selection.dim,
+                          t: void 0,
+                          op: existingOpRemainsValid ? currentCriteria.op : ">",
+                          r: existingOpRemainsValid ? currentCriteria.r : 0,
+                          rDim: existingOpRemainsValid ? currentCriteria.rDim : void 0
+                        };
+                        update(newCriteria, index);
+                      } else {
+                        update({ ...currentCriteria, l: selection.id, t: "q", op: "=", r: "" }, index);
+                      }
+                    },
+                    value: currentDimension != null ? currentDimension : currentQuirk,
+                    onMenuOpen,
+                    onMenuClose,
+                    disabled: readOnly
+                  }
+                )
               }
-            )
-          }
-        ) : null
-      ] }, index);
-    }) }),
-    dimensions.dimensions.length === 0 ? (components == null ? void 0 : components.NoDimensionsDefined) ? /* @__PURE__ */ jsx17(components.NoDimensionsDefined, {}) : /* @__PURE__ */ jsx17(Callout3, { title: "Dimensions", type: "info", css: { marginBlock: "var(--spacing-base)" }, children: /* @__PURE__ */ jsx17("p", { children: "You do not have any dimensions configured." }) }) : /* @__PURE__ */ jsx17(
-      AddListButton3,
-      {
-        "data-testid": "button-add-criteria",
-        className: "add-more",
-        buttonText: "Add Criteria",
-        onButtonClick: addToList
-      }
-    )
+            ),
+            /* @__PURE__ */ jsx17(
+              "div",
+              {
+                css: [criteriaWrapper, criteriaOperatorWrapper],
+                className: "criteria-wrapper",
+                "data-testid": "select-operator",
+                children: /* @__PURE__ */ jsx17(
+                  CriteriaOperatorMenu,
+                  {
+                    name: `op-${index}`,
+                    css: expand,
+                    styles: { control: (base) => ({ ...base, height: "100%" }) },
+                    value: currentCriteria.op,
+                    rhsType: currentQuirk ? "QUIRK" : currentDimension == null ? void 0 : currentDimension.category,
+                    onChange: (op) => {
+                      if (op === "+" || op === "-") {
+                        update({ ...currentCriteria, op, r: void 0, rDim: void 0 }, index);
+                      } else {
+                        update({ ...currentCriteria, op }, index);
+                      }
+                    },
+                    onMenuOpen,
+                    onMenuClose,
+                    disabled: readOnly
+                  }
+                )
+              }
+            ),
+            critHasRhs ? /* @__PURE__ */ jsx17(
+              "div",
+              {
+                css: [criteriaWrapper, criteriaOperandWrapper],
+                className: "criteria-wrapper",
+                "data-testid": "select-match-criteria",
+                children: currentQuirk ? /* @__PURE__ */ jsx17(
+                  "div",
+                  {
+                    css: css8`
+                              width: 100%;
+                              // InputSelect wrapper is unstylable so need a descendant selector
+                              // to full-width it
+                              & > * {
+                                width: 100%;
+                              }
+                            `,
+                    children: currentQuirk.options ? /* @__PURE__ */ jsx17(
+                      InputSelect2,
+                      {
+                        label: "quirk match value",
+                        showLabel: false,
+                        value: (_c = currentCriteria.r) != null ? _c : "",
+                        errorMessage: (_d = errors.rhs) == null ? void 0 : _d[index],
+                        onChange: (e) => update({ ...currentCriteria, r: e.currentTarget.value }, index),
+                        options: [
+                          { label: "Select\u2026", value: "" },
+                          ...currentQuirk.options.map((o) => ({ label: o.name, value: o.value }))
+                        ],
+                        disabled: readOnly
+                      }
+                    ) : /* @__PURE__ */ jsx17(
+                      Input2,
+                      {
+                        type: "text",
+                        label: "quirk match value",
+                        showLabel: false,
+                        value: (_e = currentCriteria.r) != null ? _e : "",
+                        errorMessage: (_f = errors.rhs) == null ? void 0 : _f[index],
+                        onChange: (e) => update({ ...currentCriteria, r: e.currentTarget.value }, index),
+                        placeholder: "Enter a value",
+                        disabled: readOnly
+                      }
+                    )
+                  }
+                ) : /* @__PURE__ */ jsx17(
+                  CriteriaMatchMenu,
+                  {
+                    errorMessage: (_g = errors.rhs) == null ? void 0 : _g[index],
+                    css: expand,
+                    styles: { control: (base) => ({ ...base, height: "100%" }) },
+                    criteriaMatch: currentCriteria,
+                    onChange: (match) => {
+                      update(match, index);
+                    },
+                    isDisabled: !critHasLhs,
+                    dimensions,
+                    onMenuOpen,
+                    onMenuClose,
+                    disabled: readOnly
+                  }
+                )
+              }
+            ) : null
+          ] }),
+          /* @__PURE__ */ jsx17(
+            "button",
+            {
+              type: "button",
+              onClick: () => removeFromList(index),
+              title: `Delete Personalization`,
+              css: { backgroundColor: "transparent", backgroundImage: "none", borderWidth: 0 },
+              "data-testid": "button-delete",
+              disabled: readOnly,
+              children: /* @__PURE__ */ jsx17(Icon5, { icon: CgCloseO2, iconColor: "red", size: "1.5rem" })
+            }
+          ),
+          index > 0 ? /* @__PURE__ */ jsx17(
+            "div",
+            {
+              className: "criteria-group-operation",
+              css: {
+                position: "absolute",
+                top: "-4rem",
+                transform: "translateX(calc(1.5rem - 50%))"
+              },
+              children: /* @__PURE__ */ jsx17(
+                InputInlineSelect,
+                {
+                  "data-testid": "dropdown-button-combine",
+                  disabled: index > 1 || readOnly,
+                  value: (_h = currentValue.op) != null ? _h : "&",
+                  options: [
+                    { label: "AND", value: "&" },
+                    { label: "OR", value: "|" }
+                  ],
+                  onChange: (v) => {
+                    setOp(v.value);
+                  }
+                }
+              )
+            }
+          ) : null
+        ] }, index);
+      }) }),
+      dimensions.dimensions.length === 0 && !(quirks == null ? void 0 : quirks.length) ? (components == null ? void 0 : components.NoDimensionsDefined) ? /* @__PURE__ */ jsx17(components.NoDimensionsDefined, {}) : /* @__PURE__ */ jsx17(Callout3, { title: "Dimensions", type: "info", css: { marginBlock: "var(--spacing-base)" }, children: /* @__PURE__ */ jsx17("p", { children: "You do not have any dimensions configured." }) }) : /* @__PURE__ */ jsx17(
+        AddListButton3,
+        {
+          "data-testid": "button-add-criteria",
+          className: "add-more",
+          buttonText: "Add Criteria",
+          onButtonClick: addToList,
+          disabled: readOnly
+        }
+      )
+    ] })
   ] });
 };
 
@@ -1648,7 +1792,7 @@ function ProjectUIVersion({ children, versionMap, contextConfig }) {
 }
 
 // src/hooks/useValidateContextConfig.ts
-import { useEffect as useEffect4, useState as useState8 } from "react";
+import { useEffect as useEffect5, useState as useState8 } from "react";
 
 // src/utils/validateContextConfig.ts
 import { UncachedManifestClient } from "@uniformdev/context/api";
@@ -1689,7 +1833,7 @@ var useValidateContextConfig = (contextConfig) => {
     error: void 0
   });
   const { apiKey, apiHost, projectId } = contextConfig || {};
-  useEffect4(() => {
+  useEffect5(() => {
     if (!apiKey || !apiHost) {
       return;
     }
@@ -1729,6 +1873,8 @@ export {
   addEnrichmentLink,
   contextCriteriaMenuOperators,
   convertErrorsToObj,
+  enrichmentCriteriaMenuOperators,
+  getValidCriteriaOperatorsFor,
   isEnrichmentTagData,
   isPersonalizationCriteriaData,
   opHasRhs,