@payloadcms/ui 4.0.0-internal.183b315 → 4.0.0-internal.1a2a79e

package/dist/elements/WhereBuilder/Condition/index.css

@@ -28,7 +28,7 @@
     text-transform: lowercase;
   }
 
-  .condition__join .rs__menu {
+  .condition__join-menu {
     text-transform: lowercase;
   }
 
@@ -55,6 +55,7 @@
     gap: var(--spacer-2);
   }
 
+  /* stylelint-disable-next-line plugin/no-max-width-media-query -- TODO: pre-existing; migrate to a mobile-first min-width query */
   @media (max-width: 768px) {
     .condition {
       display: block;

package/dist/elements/WhereBuilder/Condition/index.d.ts

@@ -3,6 +3,7 @@ import type { AddCondition, ReducedField, RemoveCondition, UpdateCondition, Upda
 export type Props = {
     readonly addCondition: AddCondition;
     readonly andIndex: number;
+    readonly disableRemoveButton: boolean;
     readonly fieldPath: string;
     readonly filterOptions?: ResolvedFilterOptions;
     readonly isFirstCondition: boolean;

package/dist/elements/WhereBuilder/Condition/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/elements/WhereBuilder/Condition/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAA2C,MAAM,OAAO,CAAA;AAE/D,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,eAAe,EACf,UAAU,EACV,KAAK,EACN,MAAM,aAAa,CAAA;AAEpB,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,qBAAqB,CAAA;IAC9C,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAA;IAClC,QAAQ,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAA;IAC3B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,aAAa,EAAE,YAAY,EAAE,CAAA;IACtC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAA;IACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACzC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAA;IACzC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAA;IAC/B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;CACtB,CAAA;AAED,OAAO,KAAK,EAAE,QAAQ,EAA2B,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAcvF,OAAO,aAAa,CAAA;AAIpB,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAkLrC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/elements/WhereBuilder/Condition/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmD,MAAM,OAAO,CAAA;AAEvE,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,eAAe,EACf,UAAU,EACV,KAAK,EACN,MAAM,aAAa,CAAA;AAEpB,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAA;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAA;IACrC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,qBAAqB,CAAA;IAC9C,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAA;IAClC,QAAQ,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,CAAA;IAC3B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAA;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,aAAa,EAAE,YAAY,EAAE,CAAA;IACtC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAA;IACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACzC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAA;IACzC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAA;IAC/B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAA;CACtB,CAAA;AAED,OAAO,KAAK,EAAE,QAAQ,EAA2B,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAcvF,OAAO,aAAa,CAAA;AAIpB,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA6MrC,CAAA"}

package/dist/elements/WhereBuilder/Condition/index.js

@@ -1,7 +1,7 @@
 'use client';
 
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { isFieldDisabled } from 'payload/shared';
 import { useDebounce } from '../../../hooks/useDebounce.js';
 import { useEffectEvent } from '../../../hooks/useEffectEvent.js';
@@ -16,6 +16,7 @@ const baseClass = 'condition';
 export const Condition = props => {
   const {
     andIndex,
+    disableRemoveButton,
     fieldPath,
     filterOptions,
     isFirstCondition,
@@ -35,6 +36,9 @@ export const Condition = props => {
   const reducedField = reducedFields.find(field => field.fieldPath === fieldPath);
   const [internalValue, setInternalValue] = useState(value);
   const debouncedValue = useDebounce(internalValue, 300);
+  // Tracks the last value this row reported upward, so the downward sync below can tell our own
+  // committed echo apart from a genuine external change (e.g. the row being cleared/reset).
+  const lastReportedValue = useRef(value);
   const booleanSelect = ['exists'].includes(operator) || reducedField?.field?.type === 'checkbox';
   let valueOptions = [];
   if (booleanSelect) {
@@ -50,19 +54,29 @@ export const Condition = props => {
   }
   const updateValue = useEffectEvent(async debouncedValue_0 => {
     if (operator) {
+      const normalizedValue = debouncedValue_0 === null || debouncedValue_0 === '' ? undefined : debouncedValue_0;
+      lastReportedValue.current = normalizedValue;
       await updateCondition({
         type: 'value',
         andIndex,
         field: reducedField,
         operator,
         orIndex,
-        value: debouncedValue_0 === null || debouncedValue_0 === '' ? undefined : debouncedValue_0
+        value: normalizedValue
       });
     }
   });
   useEffect(() => {
     void updateValue(debouncedValue);
   }, [debouncedValue]);
+  // Sync external value changes (e.g. the row being cleared or reset to a placeholder) down into
+  // local state, but skip our own committed echo so this never clobbers in-progress typing.
+  useEffect(() => {
+    if (value !== lastReportedValue.current) {
+      lastReportedValue.current = value;
+      setInternalValue(value);
+    }
+  }, [value]);
   const disabled = !reducedField?.fieldPath || isFieldDisabled(reducedField?.field, 'filter');
   const handleFieldChange = useCallback(async field_0 => {
     setInternalValue(undefined);
@@ -103,6 +117,10 @@ export const Condition = props => {
           className: `${baseClass}__join-label`,
           children: t('general:where')
         }) : /*#__PURE__*/_jsx(ReactSelect, {
+          "aria-label": t('general:filter'),
+          classNames: {
+            menu: () => 'condition__join-menu'
+          },
           isClearable: false,
           onChange: option_0 => updateJoin({
             andIndex,
@@ -126,8 +144,12 @@ export const Condition = props => {
         children: [/*#__PURE__*/_jsx("div", {
           className: `${baseClass}__field`,
           children: /*#__PURE__*/_jsx(ReactSelect, {
+            "aria-label": t('general:field'),
             disabled: disabled,
-            filterOption: (option_1, inputValue) => (option_1?.data?.plainTextLabel || option_1.label).toLowerCase().includes(inputValue.toLowerCase()),
+            filterOption: (option_1, inputValue) => {
+              const label = typeof option_1?.data?.plainTextLabel === 'string' ? option_1.data.plainTextLabel : option_1.label;
+              return label.toLowerCase().includes(inputValue.toLowerCase());
+            },
             isClearable: false,
             onChange: handleFieldChange,
             options: reducedFields.filter(field_1 => !isFieldDisabled(field_1.field, 'filter')).map(f => ({
@@ -142,6 +164,7 @@ export const Condition = props => {
         }), /*#__PURE__*/_jsx("div", {
           className: `${baseClass}__operator`,
           children: /*#__PURE__*/_jsx(ReactSelect, {
+            "aria-label": t('general:filter'),
             disabled: disabled,
             isClearable: false,
             onChange: handleOperatorChange,
@@ -164,8 +187,10 @@ export const Condition = props => {
       }), /*#__PURE__*/_jsx("div", {
         className: `${baseClass}__actions`,
         children: /*#__PURE__*/_jsx(Button, {
+          "aria-label": t('general:removeFilter'),
           buttonStyle: "ghost",
           className: `${baseClass}__actions-remove`,
+          disabled: disableRemoveButton,
           icon: /*#__PURE__*/_jsx(LineIcon, {
             size: 24
           }),

package/dist/elements/WhereBuilder/Condition/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["React","useCallback","useEffect","useState","isFieldDisabled","useDebounce","useEffectEvent","LineIcon","useTranslation","Button","ReactSelect","DefaultFilter","getOperatorValueTypes","baseClass","Condition","props","andIndex","fieldPath","filterOptions","isFirstCondition","join","operator","orIndex","reducedFields","removeCondition","RenderedFilter","updateCondition","updateJoin","value","t","reducedField","find","field","internalValue","setInternalValue","debouncedValue","booleanSelect","includes","type","valueOptions","label","options","updateValue","undefined","disabled","handleFieldChange","option","handleOperatorChange","operatorValueTypes","validOperatorValue","isValidValue","_jsx","className","_jsxs","isClearable","onChange","filterOption","inputValue","data","plainTextLabel","toLowerCase","filter","map","f","operators","o","internalField","buttonStyle","icon","size","onClick"],"sources":["../../../../src/elements/WhereBuilder/Condition/index.tsx"],"sourcesContent":["'use client'\nimport React, { useCallback, useEffect, useState } from 'react'\n\nimport type {\n  AddCondition,\n  ReducedField,\n  RemoveCondition,\n  UpdateCondition,\n  UpdateJoin,\n  Value,\n} from '../types.js'\n\nexport type Props = {\n  readonly addCondition: AddCondition\n  readonly andIndex: number\n  readonly fieldPath: string\n  readonly filterOptions?: ResolvedFilterOptions\n  readonly isFirstCondition: boolean\n  readonly join: 'and' | 'or'\n  readonly operator: Operator\n  readonly orIndex: number\n  readonly reducedFields: ReducedField[]\n  readonly removeCondition: RemoveCondition\n  readonly RenderedFilter?: React.ReactNode\n  readonly updateCondition: UpdateCondition\n  readonly updateJoin: UpdateJoin\n  readonly value: Value\n}\n\nimport type { Operator, Option as PayloadOption, ResolvedFilterOptions } from 'payload'\n\nimport { isFieldDisabled } from 'payload/shared'\n\nimport type { Option } from '../../ReactSelect/index.js'\n\nimport { useDebounce } from '../../../hooks/useDebounce.js'\nimport { useEffectEvent } from '../../../hooks/useEffectEvent.js'\nimport { LineIcon } from '../../../icons/Line/index.js'\nimport { useTranslation } from '../../../providers/Translation/index.js'\nimport { Button } from '../../Button/index.js'\nimport { ReactSelect } from '../../ReactSelect/index.js'\nimport { DefaultFilter } from './DefaultFilter/index.js'\nimport { getOperatorValueTypes } from './validOperators.js'\nimport './index.css'\n\nconst baseClass = 'condition'\n\nexport const Condition: React.FC<Props> = (props) => {\n  const {\n    andIndex,\n    fieldPath,\n    filterOptions,\n    isFirstCondition,\n    join,\n    operator,\n    orIndex,\n    reducedFields,\n    removeCondition,\n    RenderedFilter,\n    updateCondition,\n    updateJoin,\n    value,\n  } = props\n\n  const { t } = useTranslation()\n\n  const reducedField = reducedFields.find((field) => field.fieldPath === fieldPath)\n\n  const [internalValue, setInternalValue] = useState<Value>(value)\n\n  const debouncedValue = useDebounce(internalValue, 300)\n\n  const booleanSelect = ['exists'].includes(operator) || reducedField?.field?.type === 'checkbox'\n\n  let valueOptions: PayloadOption[] = []\n\n  if (booleanSelect) {\n    valueOptions = [\n      { label: t('general:true'), value: 'true' },\n      { label: t('general:false'), value: 'false' },\n    ]\n  } else if (reducedField?.field && 'options' in reducedField.field) {\n    valueOptions = reducedField.field.options\n  }\n\n  const updateValue = useEffectEvent(async (debouncedValue: Value) => {\n    if (operator) {\n      await updateCondition({\n        type: 'value',\n        andIndex,\n        field: reducedField,\n        operator,\n        orIndex,\n        value: debouncedValue === null || debouncedValue === '' ? undefined : debouncedValue,\n      })\n    }\n  })\n\n  useEffect(() => {\n    void updateValue(debouncedValue)\n  }, [debouncedValue])\n\n  const disabled = !reducedField?.fieldPath || isFieldDisabled(reducedField?.field, 'filter')\n\n  const handleFieldChange = useCallback(\n    async (field: Option<string>) => {\n      setInternalValue(undefined)\n      await updateCondition({\n        type: 'field',\n        andIndex,\n        field: reducedFields.find((option) => option.fieldPath === field.value),\n        operator,\n        orIndex,\n        value: undefined,\n      })\n    },\n    [andIndex, operator, orIndex, reducedFields, updateCondition],\n  )\n\n  const handleOperatorChange = useCallback(\n    async (operator: Option<Operator>) => {\n      const operatorValueTypes = getOperatorValueTypes(reducedField.field.type)\n      const validOperatorValue = operatorValueTypes[operator.value] || 'any'\n      const isValidValue =\n        validOperatorValue === 'any' ||\n        typeof value === validOperatorValue ||\n        (validOperatorValue === 'boolean' && (value === 'true' || value === 'false'))\n\n      if (!isValidValue) {\n        // if the current value is not valid for the new operator\n        // reset the value before passing it to updateCondition\n        setInternalValue(undefined)\n      }\n\n      await updateCondition({\n        type: 'operator',\n        andIndex,\n        field: reducedField,\n        operator: operator.value,\n        orIndex,\n        value: isValidValue ? value : undefined,\n      })\n    },\n    [andIndex, reducedField, orIndex, updateCondition, value],\n  )\n\n  return (\n    <div className={baseClass}>\n      <div className={`${baseClass}__wrap`}>\n        <div className={`${baseClass}__join`}>\n          {isFirstCondition ? (\n            <span className={`${baseClass}__join-label`}>{t('general:where')}</span>\n          ) : (\n            <ReactSelect\n              isClearable={false}\n              onChange={(option: Option<'and' | 'or'>) =>\n                updateJoin({ andIndex, join: option.value, orIndex })\n              }\n              options={[\n                { label: t('general:and'), value: 'and' },\n                { label: t('general:or'), value: 'or' },\n              ]}\n              value={{ label: join === 'and' ? t('general:and') : t('general:or'), value: join }}\n            />\n          )}\n        </div>\n        <div className={`${baseClass}__inputs`}>\n          <div className={`${baseClass}__field`}>\n            <ReactSelect\n              disabled={disabled}\n              filterOption={(option, inputValue) =>\n                ((option?.data?.plainTextLabel as string) || option.label)\n                  .toLowerCase()\n                  .includes(inputValue.toLowerCase())\n              }\n              isClearable={false}\n              onChange={handleFieldChange}\n              options={reducedFields\n                .filter((field) => !isFieldDisabled(field.field, 'filter'))\n                .map((f) => ({ ...f, value: f.fieldPath }))}\n              value={reducedField ? { ...reducedField, value: reducedField.fieldPath } : undefined}\n            />\n          </div>\n          <div className={`${baseClass}__operator`}>\n            <ReactSelect\n              disabled={disabled}\n              isClearable={false}\n              onChange={handleOperatorChange}\n              options={reducedField?.operators}\n              value={reducedField?.operators.find((o) => operator === o.value) || null}\n            />\n          </div>\n          <div className={`${baseClass}__value`}>\n            {RenderedFilter || (\n              <DefaultFilter\n                booleanSelect={booleanSelect}\n                disabled={\n                  !operator || !reducedField || isFieldDisabled(reducedField?.field, 'filter')\n                }\n                filterOptions={filterOptions}\n                internalField={reducedField}\n                onChange={setInternalValue}\n                operator={operator}\n                options={valueOptions}\n                value={internalValue ?? ''}\n              />\n            )}\n          </div>\n        </div>\n        <div className={`${baseClass}__actions`}>\n          <Button\n            buttonStyle=\"ghost\"\n            className={`${baseClass}__actions-remove`}\n            icon={<LineIcon size={24} />}\n            onClick={() =>\n              removeCondition({\n                andIndex,\n                orIndex,\n              })\n            }\n          />\n        </div>\n      </div>\n    </div>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["React","useCallback","useEffect","useRef","useState","isFieldDisabled","useDebounce","useEffectEvent","LineIcon","useTranslation","Button","ReactSelect","DefaultFilter","getOperatorValueTypes","baseClass","Condition","props","andIndex","disableRemoveButton","fieldPath","filterOptions","isFirstCondition","join","operator","orIndex","reducedFields","removeCondition","RenderedFilter","updateCondition","updateJoin","value","t","reducedField","find","field","internalValue","setInternalValue","debouncedValue","lastReportedValue","booleanSelect","includes","type","valueOptions","label","options","updateValue","normalizedValue","undefined","current","disabled","handleFieldChange","option","handleOperatorChange","operatorValueTypes","validOperatorValue","isValidValue","_jsx","className","_jsxs","classNames","menu","isClearable","onChange","filterOption","inputValue","data","plainTextLabel","toLowerCase","filter","map","f","operators","o","internalField","buttonStyle","icon","size","onClick"],"sources":["../../../../src/elements/WhereBuilder/Condition/index.tsx"],"sourcesContent":["'use client'\nimport React, { useCallback, useEffect, useRef, useState } from 'react'\n\nimport type {\n  AddCondition,\n  ReducedField,\n  RemoveCondition,\n  UpdateCondition,\n  UpdateJoin,\n  Value,\n} from '../types.js'\n\nexport type Props = {\n  readonly addCondition: AddCondition\n  readonly andIndex: number\n  readonly disableRemoveButton: boolean\n  readonly fieldPath: string\n  readonly filterOptions?: ResolvedFilterOptions\n  readonly isFirstCondition: boolean\n  readonly join: 'and' | 'or'\n  readonly operator: Operator\n  readonly orIndex: number\n  readonly reducedFields: ReducedField[]\n  readonly removeCondition: RemoveCondition\n  readonly RenderedFilter?: React.ReactNode\n  readonly updateCondition: UpdateCondition\n  readonly updateJoin: UpdateJoin\n  readonly value: Value\n}\n\nimport type { Operator, Option as PayloadOption, ResolvedFilterOptions } from 'payload'\n\nimport { isFieldDisabled } from 'payload/shared'\n\nimport type { Option } from '../../ReactSelect/index.js'\n\nimport { useDebounce } from '../../../hooks/useDebounce.js'\nimport { useEffectEvent } from '../../../hooks/useEffectEvent.js'\nimport { LineIcon } from '../../../icons/Line/index.js'\nimport { useTranslation } from '../../../providers/Translation/index.js'\nimport { Button } from '../../Button/index.js'\nimport { ReactSelect } from '../../ReactSelect/index.js'\nimport { DefaultFilter } from './DefaultFilter/index.js'\nimport { getOperatorValueTypes } from './validOperators.js'\nimport './index.css'\n\nconst baseClass = 'condition'\n\nexport const Condition: React.FC<Props> = (props) => {\n  const {\n    andIndex,\n    disableRemoveButton,\n    fieldPath,\n    filterOptions,\n    isFirstCondition,\n    join,\n    operator,\n    orIndex,\n    reducedFields,\n    removeCondition,\n    RenderedFilter,\n    updateCondition,\n    updateJoin,\n    value,\n  } = props\n\n  const { t } = useTranslation()\n\n  const reducedField = reducedFields.find((field) => field.fieldPath === fieldPath)\n\n  const [internalValue, setInternalValue] = useState<Value>(value)\n\n  const debouncedValue = useDebounce(internalValue, 300)\n\n  // Tracks the last value this row reported upward, so the downward sync below can tell our own\n  // committed echo apart from a genuine external change (e.g. the row being cleared/reset).\n  const lastReportedValue = useRef<Value>(value)\n\n  const booleanSelect = ['exists'].includes(operator) || reducedField?.field?.type === 'checkbox'\n\n  let valueOptions: PayloadOption[] = []\n\n  if (booleanSelect) {\n    valueOptions = [\n      { label: t('general:true'), value: 'true' },\n      { label: t('general:false'), value: 'false' },\n    ]\n  } else if (reducedField?.field && 'options' in reducedField.field) {\n    valueOptions = reducedField.field.options\n  }\n\n  const updateValue = useEffectEvent(async (debouncedValue: Value) => {\n    if (operator) {\n      const normalizedValue =\n        debouncedValue === null || debouncedValue === '' ? undefined : debouncedValue\n      lastReportedValue.current = normalizedValue\n      await updateCondition({\n        type: 'value',\n        andIndex,\n        field: reducedField,\n        operator,\n        orIndex,\n        value: normalizedValue,\n      })\n    }\n  })\n\n  useEffect(() => {\n    void updateValue(debouncedValue)\n  }, [debouncedValue])\n\n  // Sync external value changes (e.g. the row being cleared or reset to a placeholder) down into\n  // local state, but skip our own committed echo so this never clobbers in-progress typing.\n  useEffect(() => {\n    if (value !== lastReportedValue.current) {\n      lastReportedValue.current = value\n      setInternalValue(value)\n    }\n  }, [value])\n\n  const disabled = !reducedField?.fieldPath || isFieldDisabled(reducedField?.field, 'filter')\n\n  const handleFieldChange = useCallback(\n    async (field: Option<string>) => {\n      setInternalValue(undefined)\n      await updateCondition({\n        type: 'field',\n        andIndex,\n        field: reducedFields.find((option) => option.fieldPath === field.value),\n        operator,\n        orIndex,\n        value: undefined,\n      })\n    },\n    [andIndex, operator, orIndex, reducedFields, updateCondition],\n  )\n\n  const handleOperatorChange = useCallback(\n    async (operator: Option<Operator>) => {\n      const operatorValueTypes = getOperatorValueTypes(reducedField.field.type)\n      const validOperatorValue = operatorValueTypes[operator.value] || 'any'\n      const isValidValue =\n        validOperatorValue === 'any' ||\n        typeof value === validOperatorValue ||\n        (validOperatorValue === 'boolean' && (value === 'true' || value === 'false'))\n\n      if (!isValidValue) {\n        // if the current value is not valid for the new operator\n        // reset the value before passing it to updateCondition\n        setInternalValue(undefined)\n      }\n\n      await updateCondition({\n        type: 'operator',\n        andIndex,\n        field: reducedField,\n        operator: operator.value,\n        orIndex,\n        value: isValidValue ? value : undefined,\n      })\n    },\n    [andIndex, reducedField, orIndex, updateCondition, value],\n  )\n\n  return (\n    <div className={baseClass}>\n      <div className={`${baseClass}__wrap`}>\n        <div className={`${baseClass}__join`}>\n          {isFirstCondition ? (\n            <span className={`${baseClass}__join-label`}>{t('general:where')}</span>\n          ) : (\n            <ReactSelect\n              aria-label={t('general:filter')}\n              classNames={{\n                menu: () => 'condition__join-menu',\n              }}\n              isClearable={false}\n              onChange={(option: Option<'and' | 'or'>) =>\n                updateJoin({ andIndex, join: option.value, orIndex })\n              }\n              options={[\n                { label: t('general:and'), value: 'and' },\n                { label: t('general:or'), value: 'or' },\n              ]}\n              value={{ label: join === 'and' ? t('general:and') : t('general:or'), value: join }}\n            />\n          )}\n        </div>\n        <div className={`${baseClass}__inputs`}>\n          <div className={`${baseClass}__field`}>\n            <ReactSelect\n              aria-label={t('general:field')}\n              disabled={disabled}\n              filterOption={(option, inputValue) => {\n                const label =\n                  typeof option?.data?.plainTextLabel === 'string'\n                    ? option.data.plainTextLabel\n                    : option.label\n                return label.toLowerCase().includes(inputValue.toLowerCase())\n              }}\n              isClearable={false}\n              onChange={handleFieldChange}\n              options={reducedFields\n                .filter((field) => !isFieldDisabled(field.field, 'filter'))\n                .map((f) => ({ ...f, value: f.fieldPath }))}\n              value={reducedField ? { ...reducedField, value: reducedField.fieldPath } : undefined}\n            />\n          </div>\n          <div className={`${baseClass}__operator`}>\n            <ReactSelect\n              aria-label={t('general:filter')}\n              disabled={disabled}\n              isClearable={false}\n              onChange={handleOperatorChange}\n              options={reducedField?.operators}\n              value={reducedField?.operators.find((o) => operator === o.value) || null}\n            />\n          </div>\n          <div className={`${baseClass}__value`}>\n            {RenderedFilter || (\n              <DefaultFilter\n                booleanSelect={booleanSelect}\n                disabled={\n                  !operator || !reducedField || isFieldDisabled(reducedField?.field, 'filter')\n                }\n                filterOptions={filterOptions}\n                internalField={reducedField}\n                onChange={setInternalValue}\n                operator={operator}\n                options={valueOptions}\n                value={internalValue ?? ''}\n              />\n            )}\n          </div>\n        </div>\n        <div className={`${baseClass}__actions`}>\n          <Button\n            aria-label={t('general:removeFilter')}\n            buttonStyle=\"ghost\"\n            className={`${baseClass}__actions-remove`}\n            disabled={disableRemoveButton}\n            icon={<LineIcon size={24} />}\n            onClick={() =>\n              removeCondition({\n                andIndex,\n                orIndex,\n              })\n            }\n          />\n        </div>\n      </div>\n    </div>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/elements/WhereBuilder/Condition/validOperators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validOperators.d.ts","sourceRoot":"","sources":["../../../../src/elements/WhereBuilder/Condition/validOperators.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,GAAI,cAAS;;;;;;;;;;;;;;;;;CAiC9C,CAAA"}
+{"version":3,"file":"validOperators.d.ts","sourceRoot":"","sources":["../../../../src/elements/WhereBuilder/Condition/validOperators.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;CAiCjC,CAAA"}

package/dist/elements/WhereBuilder/conditionValue.d.ts

@@ -0,0 +1,32 @@
+import type { UpdateCondition } from './types.js';
+type UpdateType = Parameters<UpdateCondition>[0]['type'];
+/**
+ * A row that holds no value yet. Empty arrives as `''` from the URL, `null` from a cleared
+ * select, or `undefined` from a row that was added but never filled in.
+ */
+export declare const isEmptyConditionValue: ({ value }: {
+    value: unknown;
+}) => boolean;
+/**
+ * The value a row renders with. Only a missing value becomes `undefined`. `0` and `false` are
+ * real filter values, so they must survive.
+ */
+export declare const getDisplayedConditionValue: <T>({ value }: {
+    value: T;
+}) => T | undefined;
+/**
+ * Whether an edit leaves the row unchanged, and so must not be committed.
+ *
+ * An empty row renders blank and reports `undefined` back up as soon as it mounts. Committing
+ * that stores `{ [operator]: undefined }`, which `qs.stringify` drops when the query is written
+ * to the URL — so the row is gone on the next parse.
+ *
+ * Field and operator edits change the row even while it holds no value, so they always commit.
+ */
+export declare const isNoOpConditionValueUpdate: ({ type, incomingValue, storedValue, }: {
+    incomingValue: unknown;
+    storedValue: unknown;
+    type: UpdateType;
+}) => boolean;
+export {};
+//# sourceMappingURL=conditionValue.d.ts.map

package/dist/elements/WhereBuilder/conditionValue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conditionValue.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/conditionValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD,KAAK,UAAU,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;AAExD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,cAAe;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,KAAG,OACf,CAAA;AAEvD;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GAAI,CAAC,aAAa;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,KAAG,CAAC,GAAG,SACxD,CAAA;AAEpB;;;;;;;;GAQG;AACH,eAAO,MAAM,0BAA0B,0CAIpC;IACD,aAAa,EAAE,OAAO,CAAA;IACtB,WAAW,EAAE,OAAO,CAAA;IACpB,IAAI,EAAE,UAAU,CAAA;CACjB,KAAG,OAG6C,CAAA"}

package/dist/elements/WhereBuilder/conditionValue.js

@@ -0,0 +1,32 @@
+/**
+ * A row that holds no value yet. Empty arrives as `''` from the URL, `null` from a cleared
+ * select, or `undefined` from a row that was added but never filled in.
+ */export const isEmptyConditionValue = ({
+  value
+}) => value === undefined || value === null || value === '';
+/**
+ * The value a row renders with. Only a missing value becomes `undefined`. `0` and `false` are
+ * real filter values, so they must survive.
+ */
+export const getDisplayedConditionValue = ({
+  value
+}) => value ?? undefined;
+/**
+ * Whether an edit leaves the row unchanged, and so must not be committed.
+ *
+ * An empty row renders blank and reports `undefined` back up as soon as it mounts. Committing
+ * that stores `{ [operator]: undefined }`, which `qs.stringify` drops when the query is written
+ * to the URL — so the row is gone on the next parse.
+ *
+ * Field and operator edits change the row even while it holds no value, so they always commit.
+ */
+export const isNoOpConditionValueUpdate = ({
+  type,
+  incomingValue,
+  storedValue
+}) => type === 'value' && isEmptyConditionValue({
+  value: storedValue
+}) && isEmptyConditionValue({
+  value: incomingValue
+});
+//# sourceMappingURL=conditionValue.js.map

package/dist/elements/WhereBuilder/conditionValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conditionValue.js","names":["isEmptyConditionValue","value","undefined","getDisplayedConditionValue","isNoOpConditionValueUpdate","type","incomingValue","storedValue"],"sources":["../../../src/elements/WhereBuilder/conditionValue.ts"],"sourcesContent":["import type { UpdateCondition } from './types.js'\n\ntype UpdateType = Parameters<UpdateCondition>[0]['type']\n\n/**\n * A row that holds no value yet. Empty arrives as `''` from the URL, `null` from a cleared\n * select, or `undefined` from a row that was added but never filled in.\n */\nexport const isEmptyConditionValue = ({ value }: { value: unknown }): boolean =>\n  value === undefined || value === null || value === ''\n\n/**\n * The value a row renders with. Only a missing value becomes `undefined`. `0` and `false` are\n * real filter values, so they must survive.\n */\nexport const getDisplayedConditionValue = <T>({ value }: { value: T }): T | undefined =>\n  value ?? undefined\n\n/**\n * Whether an edit leaves the row unchanged, and so must not be committed.\n *\n * An empty row renders blank and reports `undefined` back up as soon as it mounts. Committing\n * that stores `{ [operator]: undefined }`, which `qs.stringify` drops when the query is written\n * to the URL — so the row is gone on the next parse.\n *\n * Field and operator edits change the row even while it holds no value, so they always commit.\n */\nexport const isNoOpConditionValueUpdate = ({\n  type,\n  incomingValue,\n  storedValue,\n}: {\n  incomingValue: unknown\n  storedValue: unknown\n  type: UpdateType\n}): boolean =>\n  type === 'value' &&\n  isEmptyConditionValue({ value: storedValue }) &&\n  isEmptyConditionValue({ value: incomingValue })\n"],"mappings":"AAIA;;;GAIA,OAAO,MAAMA,qBAAA,GAAwBA,CAAC;EAAEC;AAAK,CAAsB,KACjEA,KAAA,KAAUC,SAAA,IAAaD,KAAA,KAAU,QAAQA,KAAA,KAAU;AAErD;;;;AAIA,OAAO,MAAME,0BAAA,GAA6BA,CAAI;EAAEF;AAAK,CAAgB,KACnEA,KAAA,IAASC,SAAA;AAEX;;;;;;;;;AASA,OAAO,MAAME,0BAAA,GAA6BA,CAAC;EACzCC,IAAI;EACJC,aAAa;EACbC;AAAW,CAKZ,KACCF,IAAA,KAAS,WACTL,qBAAA,CAAsB;EAAEC,KAAA,EAAOM;AAAY,MAC3CP,qBAAA,CAAsB;EAAEC,KAAA,EAAOK;AAAc","ignoreList":[]}

package/dist/elements/WhereBuilder/field-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field-types.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/field-types.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAa1C,eAAO,MAAM,cAAc;;;GAS1B,CAAA;AA8DD,eAAO,MAAM,mBAAmB,EAAE;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,SAAS,EAAE,MAAM,CAAA;QACjB,SAAS,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;KAC9C,CAAA;CA0DF,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,sBAGpC;IACD,KAAK,EAAE,WAAW,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,KAAG;IACF,aAAa,EAAE,MAAM,CAAA;IACrB,cAAc,EAAE;QACd,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,MAAM,CAAA;KACd,EAAE,CAAA;CAqBJ,CAAA"}
+{"version":3,"file":"field-types.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/field-types.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAa1C,eAAO,MAAM,cAAc;;;GAS1B,CAAA;AA8DD,eAAO,MAAM,mBAAmB,EAAE;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,SAAS,EAAE,MAAM,CAAA;QACjB,SAAS,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;KAC9C,CAAA;CA0DF,CAAA;AAED,eAAO,MAAM,sBAAsB,yBAGhC;IACD,KAAK,EAAE,WAAW,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,KAAG;IACF,aAAa,EAAE,MAAM,CAAA;IACrB,cAAc,EAAE;QACd,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,MAAM,CAAA;KACd,EAAE,CAAA;CAqBJ,CAAA"}

package/dist/elements/WhereBuilder/index.css

@@ -48,6 +48,7 @@
     grid-column: 2 / -1;
   }
 
+  /* stylelint-disable-next-line plugin/no-max-width-media-query -- TODO: pre-existing; migrate to a mobile-first min-width query */
   @media (max-width: 768px) {
     .where-builder__or-filters {
       display: flex;
@@ -66,6 +67,7 @@
     }
   }
 
+  /* stylelint-disable-next-line plugin/no-max-width-media-query -- TODO: pre-existing; migrate to a mobile-first min-width query */
   @media (max-width: 768px) {
     .where-builder {
       padding-top: var(--spacer-2);

package/dist/elements/WhereBuilder/index.d.ts

@@ -3,9 +3,10 @@ import type { WhereBuilderProps } from './types.js';
 import './index.css';
 export { WhereBuilderProps };
 /**
- * The WhereBuilder component is used to render the filter controls for a collection's list view
- * or in a form (e.g. Query Presets). When `value` and `onChange` are provided, it is controlled
- * by the form; otherwise it uses list query state from {@link useListQuery}.
+ * Presentational filter builder. It renders the conditions described by `value` and
+ * reports edits through `onChange`. It is unaware of where its value is stored — the
+ * list view wires it to list query state via {@link ListWhereBuilder}, and the Query
+ * Presets drawer wires it to form state.
  */
 export declare const WhereBuilder: React.FC<WhereBuilderProps>;
 //# sourceMappingURL=index.d.ts.map

package/dist/elements/WhereBuilder/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/index.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAkB,MAAM,OAAO,CAAA;AAEtC,OAAO,KAAK,EAKV,iBAAiB,EAClB,MAAM,YAAY,CAAA;AAUnB,OAAO,aAAa,CAAA;AAKpB,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAE5B;;;;GAIG;AACH,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAwRpD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/index.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAkB,MAAM,OAAO,CAAA;AAEtC,OAAO,KAAK,EAKV,iBAAiB,EAClB,MAAM,YAAY,CAAA;AAanB,OAAO,aAAa,CAAA;AAKpB,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAE5B;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA6RpD,CAAA"}

package/dist/elements/WhereBuilder/index.js

@@ -6,29 +6,29 @@ import { isFieldDisabled, transformWhereQuery, validateWhereQuery } from 'payloa
 import React, { useMemo } from 'react';
 import { CirclePlusIcon } from '../../icons/CirclePlus/index.js';
 import { useAuth } from '../../providers/Auth/index.js';
-import { useConfig } from '../../providers/Config/index.js';
-import { useListQuery } from '../../providers/ListQuery/index.js';
 import { useTranslation } from '../../providers/Translation/index.js';
 import { reduceFieldsToOptions } from '../../utilities/reduceFieldsToOptions.js';
 import { Button } from '../Button/index.js';
 import { Condition } from './Condition/index.js';
+import { getDisplayedConditionValue, isEmptyConditionValue, isNoOpConditionValueUpdate } from './conditionValue.js';
 import './index.css';
 import { fieldTypeConditions, getValidFieldOperators } from './field-types.js';
 const baseClass = 'where-builder';
 /**
- * The WhereBuilder component is used to render the filter controls for a collection's list view
- * or in a form (e.g. Query Presets). When `value` and `onChange` are provided, it is controlled
- * by the form; otherwise it uses list query state from {@link useListQuery}.
+ * Presentational filter builder. It renders the conditions described by `value` and
+ * reports edits through `onChange`. It is unaware of where its value is stored — the
+ * list view wires it to list query state via {@link ListWhereBuilder}, and the Query
+ * Presets drawer wires it to form state.
  */
 export const WhereBuilder = props => {
   const {
     collectionSlug,
-    fields: fieldsProp,
-    onChange,
-    onClose,
+    fields,
+    onChange: handleWhereChange,
+    onEmptyRemove,
     renderedFilters = undefined,
     resolvedFilterOptions = undefined,
-    value: valueProp
+    value
   } = props;
   const {
     i18n,
@@ -37,15 +37,6 @@ export const WhereBuilder = props => {
   const {
     permissions
   } = useAuth();
-  const {
-    getEntityConfig
-  } = useConfig();
-  const listQuery = useListQuery();
-  const isFormMode = typeof onChange === 'function';
-  const collectionConfig = useMemo(() => isFormMode ? getEntityConfig({
-    collectionSlug
-  }) : null, [isFormMode, collectionSlug, getEntityConfig]);
-  const fields = isFormMode ? collectionConfig?.fields : fieldsProp;
   const fieldPermissions = permissions?.collections?.[collectionSlug]?.fields;
   const reducedFields = useMemo(() => reduceFieldsToOptions({
     fieldPermissions,
@@ -54,31 +45,24 @@ export const WhereBuilder = props => {
   }), [fieldPermissions, fields, i18n]);
   const firstField = useMemo(() => reducedFields.find(f => !isFieldDisabled(f.field, 'filter')), [reducedFields]);
   const conditions = useMemo(() => {
-    const whereFromSearch = isFormMode ? valueProp : listQuery.query?.where;
-    if (whereFromSearch) {
-      if (validateWhereQuery(whereFromSearch)) {
-        return whereFromSearch.or ?? [];
+    if (value) {
+      if (validateWhereQuery(value)) {
+        return value.or ?? [];
       }
-      const transformedWhere = transformWhereQuery(whereFromSearch);
+      const transformedWhere = transformWhereQuery(value);
       if (validateWhereQuery(transformedWhere)) {
         return transformedWhere.or ?? [];
       }
-      if (!isFormMode) {
-        console.warn(`Invalid where query in URL: ${JSON.stringify(whereFromSearch)}`); // eslint-disable-line no-console
-      }
     }
     return [];
-  }, [isFormMode, valueProp, listQuery.query?.where]);
-  const handleWhereChange = useMemo(() => isFormMode ? where => {
-    onChange?.(where);
-  } : listQuery.handleWhereChange, [isFormMode, onChange, listQuery.handleWhereChange]);
-  const addCondition = React.useCallback(async ({
+  }, [value]);
+  const addCondition = React.useCallback(({
     andIndex,
     field,
     orIndex,
     relation
   }) => {
-    const newConditions = [...conditions];
+    const newConditions = structuredClone(conditions);
     const defaultOperator = fieldTypeConditions[field.field.type].operators[0].value;
     if (relation === 'and') {
       newConditions[orIndex].and.splice(andIndex, 0, {
@@ -95,30 +79,37 @@ export const WhereBuilder = props => {
         }]
       });
     }
-    await handleWhereChange({
+    void handleWhereChange({
       or: newConditions
     });
   }, [conditions, handleWhereChange]);
-  const updateCondition = React.useCallback(async ({
+  const updateCondition = React.useCallback(({
+    type,
     andIndex: andIndex_0,
     field: field_0,
     operator: incomingOperator,
     orIndex: orIndex_0,
-    value
+    value: value_0
   }) => {
     // Virtual first row: conditions not yet committed, build from scratch
     if (conditions.length === 0) {
+      // Field and operator picks carry empty values too, but must fall through to build the row.
+      if (type === 'value' && isEmptyConditionValue({
+        value: value_0
+      })) {
+        return;
+      }
       const {
         validOperator
       } = getValidFieldOperators({
         field: field_0.field,
         operator: incomingOperator
       });
-      await handleWhereChange({
+      void handleWhereChange({
         or: [{
           and: [{
             [String(field_0.fieldPath)]: {
-              [validOperator]: value
+              [validOperator]: value_0
             }
           }]
         }]
@@ -135,47 +126,54 @@ export const WhereBuilder = props => {
       });
       // Skip if nothing changed
       const existingValue = existingCondition[String(field_0.fieldPath)]?.[validOperator_0];
-      if (typeof existingValue !== 'undefined' && existingValue === value) {
+      if (typeof existingValue !== 'undefined' && existingValue === value_0) {
+        return;
+      }
+      if (isNoOpConditionValueUpdate({
+        type,
+        incomingValue: value_0,
+        storedValue: existingValue
+      })) {
         return;
       }
       const newRowCondition = {
         [String(field_0.fieldPath)]: {
-          [validOperator_0]: value
+          [validOperator_0]: value_0
         }
       };
       if (dequal(existingCondition, newRowCondition)) {
         return;
       }
-      const newConditions_0 = [...conditions];
+      const newConditions_0 = structuredClone(conditions);
       newConditions_0[orIndex_0].and[andIndex_0] = newRowCondition;
-      await handleWhereChange({
+      void handleWhereChange({
         or: newConditions_0
       });
     }
   }, [conditions, handleWhereChange]);
-  const removeCondition = React.useCallback(async ({
+  const removeCondition = React.useCallback(({
     andIndex: andIndex_1,
     orIndex: orIndex_1
   }) => {
     // Virtual first row: removing it just closes the panel
     if (conditions.length === 0) {
-      onClose?.();
+      onEmptyRemove?.();
       return;
     }
-    const newConditions_1 = [...conditions];
+    const newConditions_1 = structuredClone(conditions);
     newConditions_1[orIndex_1].and.splice(andIndex_1, 1);
     if (newConditions_1[orIndex_1].and.length === 0) {
       newConditions_1.splice(orIndex_1, 1);
     }
-    await handleWhereChange({
+    void handleWhereChange({
       or: newConditions_1
     });
     // Removing the last remaining condition closes the filters panel.
     if (newConditions_1.length === 0) {
-      onClose?.();
+      onEmptyRemove?.();
     }
-  }, [conditions, handleWhereChange, onClose]);
-  const updateJoin = React.useCallback(async ({
+  }, [conditions, handleWhereChange, onEmptyRemove]);
+  const updateJoin = React.useCallback(({
     andIndex: andIndex_2,
     join,
     orIndex: orIndex_2
@@ -207,29 +205,48 @@ export const WhereBuilder = props => {
         newConditions_2[newConditions_2.length - 1].and.push(cond_0);
       }
     });
-    await handleWhereChange({
+    void handleWhereChange({
       or: newConditions_2
     });
   }, [conditions, handleWhereChange]);
-  const addFirstFilter = React.useCallback(async () => {
-    if (firstField) {
-      await addCondition({
-        andIndex: 0,
-        field: firstField,
-        orIndex: conditions.length,
-        relation: 'or'
+  const addFirstFilter = React.useCallback(() => {
+    if (!firstField) {
+      return;
+    }
+    // With no committed conditions, only the virtual placeholder row is shown. Commit it
+    // and append a new row so a second row appears on the first click.
+    if (conditions.length === 0) {
+      const defaultOperator_0 = firstField.operators[0].value;
+      const makeRow = () => ({
+        and: [{
+          [String(firstField.fieldPath)]: {
+            [defaultOperator_0]: undefined
+          }
+        }]
+      });
+      void handleWhereChange({
+        or: [makeRow(), makeRow()]
       });
+      return;
     }
-  }, [addCondition, conditions.length, firstField]);
-  // When conditions is empty in list mode, show a virtual first row immediately
-  // (derived from the first available field) so the panel never opens blank.
-  const displayConditions = !isFormMode && conditions.length === 0 && firstField ? [{
+    void addCondition({
+      andIndex: 0,
+      field: firstField,
+      orIndex: conditions.length,
+      relation: 'or'
+    });
+  }, [addCondition, conditions.length, firstField, handleWhereChange]);
+  // When conditions is empty, show a virtual first row so the panel never opens blank.
+  const displayConditions = conditions.length === 0 && firstField ? [{
     and: [{
       [firstField.fieldPath]: {
         [firstField.operators[0].value]: undefined
       }
     }]
   }] : conditions;
+  // Disable the remove button only when there are no committed conditions and this host
+  // doesn't provide an empty-state removal handler.
+  const disableRemoveButton = conditions.length === 0 && !onEmptyRemove;
   return /*#__PURE__*/_jsx("div", {
     className: baseClass,
     children: /*#__PURE__*/_jsxs("div", {
@@ -242,12 +259,15 @@ export const WhereBuilder = props => {
             const condition = displayConditions[orIndex_3].and[andIndex_3];
             const fieldPath = Object.keys(condition)[0];
             const operator = Object.keys(condition?.[fieldPath] || {})?.[0] || undefined;
-            const value_0 = condition?.[fieldPath]?.[operator] || undefined;
+            const value_1 = getDisplayedConditionValue({
+              value: condition?.[fieldPath]?.[operator]
+            });
             const isFirstCondition = orIndex_3 === 0 && andIndex_3 === 0;
             const join_0 = andIndex_3 === 0 ? 'or' : 'and';
             return /*#__PURE__*/_jsx(Condition, {
               addCondition: addCondition,
               andIndex: andIndex_3,
+              disableRemoveButton: disableRemoveButton,
               fieldPath: fieldPath,
               filterOptions: resolvedFilterOptions?.get(fieldPath),
               isFirstCondition: isFirstCondition,
@@ -259,7 +279,7 @@ export const WhereBuilder = props => {
               RenderedFilter: renderedFilters?.get(fieldPath),
               updateCondition: updateCondition,
               updateJoin: updateJoin,
-              value: value_0
+              value: value_1
             }, andIndex_3);
           })
         }, compoundOrKey);