@payloadcms/ui 3.0.0-alpha.48 → 3.0.0-alpha.49

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

@@ -1,22 +1,22 @@
 import React, { useEffect, useState } from 'react';
 import { RenderCustomComponent } from '../../../elements/RenderCustomComponent/index.js';
-import useDebounce from '../../../hooks/useDebounce.js';
+import { useDebounce } from '../../../hooks/useDebounce.js';
 import { Button } from '../../Button/index.js';
-import ReactSelect from '../../ReactSelect/index.js';
+import { ReactSelect } from '../../ReactSelect/index.js';
 import { DateField } from './Date/index.js';
-import Number from './Number/index.js';
-import Relationship from './Relationship/index.js';
+import { NumberField } from './Number/index.js';
+import { RelationshipField } from './Relationship/index.js';
 import { Select } from './Select/index.js';
 import Text from './Text/index.js';
 const valueFields = {
-    DateField,
-    Number,
-    Relationship,
+    Date: DateField,
+    Number: NumberField,
+    Relationship: RelationshipField,
     Select,
     Text
 };
 const baseClass = 'condition';
-const Condition = (props)=>{
+export const Condition = (props)=>{
     const { andIndex, dispatch, fields, orIndex, value } = props;
     const fieldName = Object.keys(value)[0];
     const [activeField, setActiveField] = useState(()=>fields.find((field)=>fieldName === field.value));
@@ -53,7 +53,7 @@ const Condition = (props)=>{
     ]);
     const booleanSelect = [
         'exists'
-    ].includes(operatorValue) || activeField.props.type === 'checkbox';
+    ].includes(operatorValue) || activeField?.props?.type === 'checkbox';
     const ValueComponent = booleanSelect ? Select : valueFields[activeField?.component] || valueFields.Text;
     let valueOptions;
     if (booleanSelect) {
@@ -98,8 +98,8 @@ const Condition = (props)=>{
             });
             setInternalOperatorField(operator.value);
         },
-        options: activeField.operators,
-        value: activeField.operators.find((operator)=>internalOperatorField === operator.value) || null
+        options: activeField?.operators,
+        value: activeField?.operators.find((operator)=>internalOperatorField === operator.value) || null
     })), /*#__PURE__*/ React.createElement("div", {
         className: `${baseClass}__value`
     }, /*#__PURE__*/ React.createElement(RenderCustomComponent, {
@@ -141,6 +141,5 @@ const Condition = (props)=>{
         round: true
     }))));
 };
-export default Condition;
 
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/elements/WhereBuilder/Condition/index.tsx"],"sourcesContent":["import React, { useEffect, useState } from 'react'\n\nimport type { FieldCondition } from '../types.js'\nimport type { Props } from './types.js'\n\nimport { RenderCustomComponent } from '../../../elements/RenderCustomComponent/index.js'\nimport useDebounce from '../../../hooks/useDebounce.js'\nimport { Button } from '../../Button/index.js'\nimport ReactSelect from '../../ReactSelect/index.js'\nimport { DateField } from './Date/index.js'\nimport Number from './Number/index.js'\nimport Relationship from './Relationship/index.js'\nimport { Select } from './Select/index.js'\nimport Text from './Text/index.js'\nimport './index.scss'\n\nconst valueFields = {\n  DateField,\n  Number,\n  Relationship,\n  Select,\n  Text,\n}\n\nconst baseClass = 'condition'\n\nconst Condition: React.FC<Props> = (props) => {\n  const { andIndex, dispatch, fields, orIndex, value } = props\n  const fieldName = Object.keys(value)[0]\n  const [activeField, setActiveField] = useState<FieldCondition>(() =>\n    fields.find((field) => fieldName === field.value),\n  )\n\n  const operatorAndValue = value?.[fieldName] ? Object.entries(value[fieldName])[0] : undefined\n  const queryValue = operatorAndValue?.[1]\n  const operatorValue = operatorAndValue?.[0]\n\n  const [internalValue, setInternalValue] = useState(queryValue)\n  const [internalOperatorField, setInternalOperatorField] = useState(operatorValue)\n\n  const debouncedValue = useDebounce(internalValue, 300)\n\n  useEffect(() => {\n    const newActiveField = fields.find(({ value: name }) => name === fieldName)\n\n    if (newActiveField && newActiveField !== activeField) {\n      setActiveField(newActiveField)\n      setInternalOperatorField(null)\n      setInternalValue('')\n    }\n  }, [fieldName, fields, activeField])\n\n  useEffect(() => {\n    dispatch({\n      type: 'update',\n      andIndex,\n      orIndex,\n      value: debouncedValue || '',\n    })\n  }, [debouncedValue, dispatch, orIndex, andIndex])\n\n  const booleanSelect = ['exists'].includes(operatorValue) || activeField.props.type === 'checkbox'\n  const ValueComponent = booleanSelect\n    ? Select\n    : valueFields[activeField?.component] || valueFields.Text\n\n  let valueOptions\n  if (booleanSelect) {\n    valueOptions = ['true', 'false']\n  } else if (activeField?.props && 'options' in activeField.props) {\n    valueOptions = activeField.props.options\n  }\n\n  return (\n    <div className={baseClass}>\n      <div className={`${baseClass}__wrap`}>\n        <div className={`${baseClass}__inputs`}>\n          <div className={`${baseClass}__field`}>\n            <ReactSelect\n              isClearable={false}\n              onChange={(field) => {\n                dispatch({\n                  type: 'update',\n                  andIndex,\n                  field: field?.value,\n                  orIndex,\n                })\n              }}\n              options={fields}\n              value={fields.find((field) => fieldName === field.value)}\n            />\n          </div>\n          <div className={`${baseClass}__operator`}>\n            <ReactSelect\n              disabled={!fieldName}\n              isClearable={false}\n              onChange={(operator) => {\n                dispatch({\n                  type: 'update',\n                  andIndex,\n                  operator: operator.value,\n                  orIndex,\n                })\n                setInternalOperatorField(operator.value)\n              }}\n              options={activeField.operators}\n              value={\n                activeField.operators.find(\n                  (operator) => internalOperatorField === operator.value,\n                ) || null\n              }\n            />\n          </div>\n          <div className={`${baseClass}__value`}>\n            <RenderCustomComponent\n              CustomComponent={activeField?.props?.admin?.components?.Filter}\n              DefaultComponent={ValueComponent}\n              componentProps={{\n                ...activeField?.props,\n                disabled: !operatorValue,\n                onChange: setInternalValue,\n                operator: operatorValue,\n                options: valueOptions,\n                value: internalValue,\n              }}\n            />\n          </div>\n        </div>\n        <div className={`${baseClass}__actions`}>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__actions-remove`}\n            icon=\"x\"\n            iconStyle=\"with-border\"\n            onClick={() =>\n              dispatch({\n                type: 'remove',\n                andIndex,\n                orIndex,\n              })\n            }\n            round\n          />\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__actions-add`}\n            icon=\"plus\"\n            iconStyle=\"with-border\"\n            onClick={() =>\n              dispatch({\n                type: 'add',\n                andIndex: andIndex + 1,\n                field: fields[0].value,\n                orIndex,\n                relation: 'and',\n              })\n            }\n            round\n          />\n        </div>\n      </div>\n    </div>\n  )\n}\n\nexport default Condition\n"],"names":["React","useEffect","useState","RenderCustomComponent","useDebounce","Button","ReactSelect","DateField","Number","Relationship","Select","Text","valueFields","baseClass","Condition","props","andIndex","dispatch","fields","orIndex","value","fieldName","Object","keys","activeField","setActiveField","find","field","operatorAndValue","entries","undefined","queryValue","operatorValue","internalValue","setInternalValue","internalOperatorField","setInternalOperatorField","debouncedValue","newActiveField","name","type","booleanSelect","includes","ValueComponent","component","valueOptions","options","div","className","isClearable","onChange","disabled","operator","operators","CustomComponent","admin","components","Filter","DefaultComponent","componentProps","buttonStyle","icon","iconStyle","onClick","round","relation"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/elements/WhereBuilder/Condition/index.tsx"],"sourcesContent":["import type { Where } from 'payload/types'\n\nimport React, { useEffect, useState } from 'react'\n\nimport type { Action, FieldCondition } from '../types.js'\n\nexport type Props = {\n  andIndex: number\n  dispatch: (action: Action) => void\n  fields: FieldCondition[]\n  orIndex: number\n  value: Where\n}\n\nimport { RenderCustomComponent } from '../../../elements/RenderCustomComponent/index.js'\nimport { useDebounce } from '../../../hooks/useDebounce.js'\nimport { Button } from '../../Button/index.js'\nimport { ReactSelect } from '../../ReactSelect/index.js'\nimport { DateField } from './Date/index.js'\nimport { NumberField } from './Number/index.js'\nimport { RelationshipField } from './Relationship/index.js'\nimport { Select } from './Select/index.js'\nimport Text from './Text/index.js'\nimport './index.scss'\n\ntype ComponentType = 'Date' | 'Number' | 'Relationship' | 'Select' | 'Text'\nconst valueFields: Record<ComponentType, React.FC> = {\n  Date: DateField,\n  Number: NumberField,\n  Relationship: RelationshipField,\n  Select,\n  Text,\n}\n\nconst baseClass = 'condition'\n\nexport const Condition: React.FC<Props> = (props) => {\n  const { andIndex, dispatch, fields, orIndex, value } = props\n  const fieldName = Object.keys(value)[0]\n  const [activeField, setActiveField] = useState<FieldCondition>(() =>\n    fields.find((field) => fieldName === field.value),\n  )\n\n  const operatorAndValue = value?.[fieldName] ? Object.entries(value[fieldName])[0] : undefined\n  const queryValue = operatorAndValue?.[1]\n  const operatorValue = operatorAndValue?.[0]\n\n  const [internalValue, setInternalValue] = useState(queryValue)\n  const [internalOperatorField, setInternalOperatorField] = useState(operatorValue)\n\n  const debouncedValue = useDebounce(internalValue, 300)\n\n  useEffect(() => {\n    const newActiveField = fields.find(({ value: name }) => name === fieldName)\n\n    if (newActiveField && newActiveField !== activeField) {\n      setActiveField(newActiveField)\n      setInternalOperatorField(null)\n      setInternalValue('')\n    }\n  }, [fieldName, fields, activeField])\n\n  useEffect(() => {\n    dispatch({\n      type: 'update',\n      andIndex,\n      orIndex,\n      value: debouncedValue || '',\n    })\n  }, [debouncedValue, dispatch, orIndex, andIndex])\n\n  const booleanSelect =\n    ['exists'].includes(operatorValue) || activeField?.props?.type === 'checkbox'\n  const ValueComponent = booleanSelect\n    ? Select\n    : valueFields[activeField?.component] || valueFields.Text\n\n  let valueOptions\n  if (booleanSelect) {\n    valueOptions = ['true', 'false']\n  } else if (activeField?.props && 'options' in activeField.props) {\n    valueOptions = activeField.props.options\n  }\n\n  return (\n    <div className={baseClass}>\n      <div className={`${baseClass}__wrap`}>\n        <div className={`${baseClass}__inputs`}>\n          <div className={`${baseClass}__field`}>\n            <ReactSelect\n              isClearable={false}\n              onChange={(field) => {\n                dispatch({\n                  type: 'update',\n                  andIndex,\n                  field: field?.value,\n                  orIndex,\n                })\n              }}\n              options={fields}\n              value={fields.find((field) => fieldName === field.value)}\n            />\n          </div>\n          <div className={`${baseClass}__operator`}>\n            <ReactSelect\n              disabled={!fieldName}\n              isClearable={false}\n              onChange={(operator) => {\n                dispatch({\n                  type: 'update',\n                  andIndex,\n                  operator: operator.value,\n                  orIndex,\n                })\n                setInternalOperatorField(operator.value)\n              }}\n              options={activeField?.operators}\n              value={\n                activeField?.operators.find(\n                  (operator) => internalOperatorField === operator.value,\n                ) || null\n              }\n            />\n          </div>\n          <div className={`${baseClass}__value`}>\n            <RenderCustomComponent\n              CustomComponent={activeField?.props?.admin?.components?.Filter}\n              DefaultComponent={ValueComponent}\n              componentProps={{\n                ...activeField?.props,\n                disabled: !operatorValue,\n                onChange: setInternalValue,\n                operator: operatorValue,\n                options: valueOptions,\n                value: internalValue,\n              }}\n            />\n          </div>\n        </div>\n        <div className={`${baseClass}__actions`}>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__actions-remove`}\n            icon=\"x\"\n            iconStyle=\"with-border\"\n            onClick={() =>\n              dispatch({\n                type: 'remove',\n                andIndex,\n                orIndex,\n              })\n            }\n            round\n          />\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__actions-add`}\n            icon=\"plus\"\n            iconStyle=\"with-border\"\n            onClick={() =>\n              dispatch({\n                type: 'add',\n                andIndex: andIndex + 1,\n                field: fields[0].value,\n                orIndex,\n                relation: 'and',\n              })\n            }\n            round\n          />\n        </div>\n      </div>\n    </div>\n  )\n}\n"],"names":["React","useEffect","useState","RenderCustomComponent","useDebounce","Button","ReactSelect","DateField","NumberField","RelationshipField","Select","Text","valueFields","Date","Number","Relationship","baseClass","Condition","props","andIndex","dispatch","fields","orIndex","value","fieldName","Object","keys","activeField","setActiveField","find","field","operatorAndValue","entries","undefined","queryValue","operatorValue","internalValue","setInternalValue","internalOperatorField","setInternalOperatorField","debouncedValue","newActiveField","name","type","booleanSelect","includes","ValueComponent","component","valueOptions","options","div","className","isClearable","onChange","disabled","operator","operators","CustomComponent","admin","components","Filter","DefaultComponent","componentProps","buttonStyle","icon","iconStyle","onClick","round","relation"],"mappings":"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"}

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

@@ -1,10 +1,10 @@
 import React from 'react';
-import type { Props } from './types.js';
+import type { WhereBuilderProps } from './types.js';
 import './index.scss';
+export { WhereBuilderProps };
 /**
  * The WhereBuilder component is used to render the filter controls for a collection's list view.
  * It is part of the {@link ListControls} component which is used to render the controls (search, filter, where).
  */
-declare const WhereBuilder: React.FC<Props>;
-export default WhereBuilder;
+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":"AAGA,OAAO,KAA+B,MAAM,OAAO,CAAA;AAGnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AASvC,OAAO,cAAc,CAAA;AAyCrB;;;GAGG;AACH,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA4JjC,CAAA;AAED,eAAe,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA+B,MAAM,OAAO,CAAA;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AASnD,OAAO,cAAc,CAAA;AAyCrB,OAAO,EAAE,iBAAiB,EAAE,CAAA;AAE5B;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAuGpD,CAAA"}

package/dist/elements/WhereBuilder/index.js

@@ -1,13 +1,12 @@
-// import queryString from 'qs'
 import { getTranslation } from '@payloadcms/translations';
 import { flattenTopLevelFields } from 'payload/utilities';
 import React, { useReducer, useState } from 'react';
 import { useConfig } from '../../providers/Config/index.js';
-// import useThrottledEffect from '../../hooks/useThrottledEffect'
+import { useListQuery } from '../../providers/ListQuery/index.js';
 import { useSearchParams } from '../../providers/SearchParams/index.js';
 import { useTranslation } from '../../providers/Translation/index.js';
 import { Button } from '../Button/index.js';
-import Condition from './Condition/index.js';
+import { Condition } from './Condition/index.js';
 import fieldTypes from './field-types.js';
 import reducer from './reducer.js';
 import { transformWhereQuery } from './transformWhereQuery.js';
@@ -48,18 +47,21 @@ const reduceFields = (fields, i18n)=>flattenTopLevelFields(fields).reduce((reduc
 /**
  * The WhereBuilder component is used to render the filter controls for a collection's list view.
  * It is part of the {@link ListControls} component which is used to render the controls (search, filter, where).
- */ const WhereBuilder = (props)=>{
-    const { collectionPluralLabel, collectionSlug, handleChange, modifySearchQuery = true } = props;
+ */ export const WhereBuilder = (props)=>{
+    const { collectionPluralLabel, collectionSlug } = props;
     const { i18n, t } = useTranslation();
     const config = useConfig();
     const collection = config.collections.find((c)=>c.slug === collectionSlug);
     const [reducedFields] = useState(()=>reduceFields(collection.fields, i18n));
     const { searchParams } = useSearchParams();
+    const { handleWhereChange } = useListQuery();
     // This handles initializing the where conditions from the search query (URL). That way, if you pass in
     // query params to the URL, the where conditions will be initialized from those and displayed in the UI.
     // Example: /admin/collections/posts?where[or][0][and][0][text][equals]=example%20post
-    const [conditions, dispatchConditions] = useReducer(reducer, searchParams.where, (whereFromSearch)=>{
-        if (modifySearchQuery && whereFromSearch) {
+    const [conditions, dispatchConditions] = useReducer(reducer((state)=>handleWhereChange({
+            or: state
+        })), searchParams.where, (whereFromSearch)=>{
+        if (whereFromSearch) {
             if (validateWhereQuery(whereFromSearch)) {
                 return whereFromSearch.or;
             }
@@ -68,57 +70,10 @@ const reduceFields = (fields, i18n)=>flattenTopLevelFields(fields).reduce((reduc
             if (validateWhereQuery(transformedWhere)) {
                 return transformedWhere.or;
             }
-            console.warn('Invalid where query in URL. Ignoring.');
+            console.warn(`Invalid where query in URL: ${JSON.stringify(whereFromSearch)}`);
         }
         return [];
     });
-    // This handles updating the search query (URL) when the where conditions change
-    // useThrottledEffect(
-    //   () => {
-    //     const currentParams = queryString.parse(history.location.search, {
-    //       depth: 10,
-    //       ignoreQueryPrefix: true,
-    //     }) as { where: Where }
-    //     const paramsToKeep =
-    //       typeof currentParams?.where === 'object' && 'or' in currentParams.where
-    //         ? currentParams.where.or.reduce((keptParams, param) => {
-    //             const newParam = { ...param }
-    //             if (param.and) {
-    //               delete newParam.and
-    //             }
-    //             return [...keptParams, newParam]
-    //           }, [])
-    //         : []
-    //     const hasNewWhereConditions = conditions.length > 0
-    //     const newWhereQuery = {
-    //       ...(typeof currentParams?.where === 'object' &&
-    //       (validateWhereQuery(currentParams?.where) || !hasNewWhereConditions)
-    //         ? currentParams.where
-    //         : {}),
-    //       or: [...conditions, ...paramsToKeep],
-    //     }
-    //     if (handleChange) handleChange(newWhereQuery as Where)
-    //     const hasExistingConditions =
-    //       typeof currentParams?.where === 'object' && 'or' in currentParams.where
-    //     if (
-    //       modifySearchQuery &&
-    //       ((hasExistingConditions && !hasNewWhereConditions) || hasNewWhereConditions)
-    //     ) {
-    //       history.replace({
-    //         search: queryString.stringify(
-    //           {
-    //             ...currentParams,
-    //             page: 1,
-    //             where: newWhereQuery,
-    //           },
-    //           { addQueryPrefix: true },
-    //         ),
-    //       })
-    //     }
-    //   },
-    //   500,
-    //   [conditions, modifySearchQuery, handleChange],
-    // )
     return /*#__PURE__*/ React.createElement("div", {
         className: baseClass
     }, conditions.length > 0 && /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement("div", {
@@ -174,6 +129,5 @@ const reduceFields = (fields, i18n)=>flattenTopLevelFields(fields).reduce((reduc
         }
     }, t('general:addFilter'))));
 };
-export default WhereBuilder;
 
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WhereBuilder/index.tsx"],"sourcesContent":["// import queryString from 'qs'\nimport { getTranslation } from '@payloadcms/translations'\nimport { flattenTopLevelFields } from 'payload/utilities'\nimport React, { useReducer, useState } from 'react'\n\n// import type { Where } from 'payload/types'\nimport type { Props } from './types.js'\n\nimport { useConfig } from '../../providers/Config/index.js'\n// import useThrottledEffect from '../../hooks/useThrottledEffect'\nimport { useSearchParams } from '../../providers/SearchParams/index.js'\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { Button } from '../Button/index.js'\nimport Condition from './Condition/index.js'\nimport fieldTypes from './field-types.js'\nimport './index.scss'\nimport reducer from './reducer.js'\nimport { transformWhereQuery } from './transformWhereQuery.js'\nimport validateWhereQuery from './validateWhereQuery.js'\n\nconst baseClass = 'where-builder'\n\nconst reduceFields = (fields, i18n) =>\n  flattenTopLevelFields(fields).reduce((reduced, field) => {\n    if (typeof fieldTypes[field.type] === 'object') {\n      const operatorKeys = new Set()\n      const operators = fieldTypes[field.type].operators.reduce((acc, operator) => {\n        if (!operatorKeys.has(operator.value)) {\n          operatorKeys.add(operator.value)\n          return [\n            ...acc,\n            {\n              ...operator,\n              label: i18n.t(`operators:${operator.label}`),\n            },\n          ]\n        }\n        return acc\n      }, [])\n\n      const formattedField = {\n        label: getTranslation(field.label || field.name, i18n),\n        value: field.name,\n        ...fieldTypes[field.type],\n        operators,\n        props: {\n          ...field,\n        },\n      }\n\n      return [...reduced, formattedField]\n    }\n\n    return reduced\n  }, [])\n\n/**\n * The WhereBuilder component is used to render the filter controls for a collection's list view.\n * It is part of the {@link ListControls} component which is used to render the controls (search, filter, where).\n */\nconst WhereBuilder: React.FC<Props> = (props) => {\n  const { collectionPluralLabel, collectionSlug, handleChange, modifySearchQuery = true } = props\n  const { i18n, t } = useTranslation()\n\n  const config = useConfig()\n  const collection = config.collections.find((c) => c.slug === collectionSlug)\n  const [reducedFields] = useState(() => reduceFields(collection.fields, i18n))\n\n  const { searchParams } = useSearchParams()\n\n  // This handles initializing the where conditions from the search query (URL). That way, if you pass in\n  // query params to the URL, the where conditions will be initialized from those and displayed in the UI.\n  // Example: /admin/collections/posts?where[or][0][and][0][text][equals]=example%20post\n  const [conditions, dispatchConditions] = useReducer(\n    reducer,\n    searchParams.where,\n    (whereFromSearch) => {\n      if (modifySearchQuery && whereFromSearch) {\n        if (validateWhereQuery(whereFromSearch)) {\n          return whereFromSearch.or\n        }\n\n        // Transform the where query to be in the right format. This will transform something simple like [text][equals]=example%20post to the right format\n        const transformedWhere = transformWhereQuery(whereFromSearch)\n\n        if (validateWhereQuery(transformedWhere)) {\n          return transformedWhere.or\n        }\n\n        console.warn('Invalid where query in URL. Ignoring.')\n      }\n      return []\n    },\n  )\n\n  // This handles updating the search query (URL) when the where conditions change\n  // useThrottledEffect(\n  //   () => {\n  //     const currentParams = queryString.parse(history.location.search, {\n  //       depth: 10,\n  //       ignoreQueryPrefix: true,\n  //     }) as { where: Where }\n\n  //     const paramsToKeep =\n  //       typeof currentParams?.where === 'object' && 'or' in currentParams.where\n  //         ? currentParams.where.or.reduce((keptParams, param) => {\n  //             const newParam = { ...param }\n  //             if (param.and) {\n  //               delete newParam.and\n  //             }\n  //             return [...keptParams, newParam]\n  //           }, [])\n  //         : []\n\n  //     const hasNewWhereConditions = conditions.length > 0\n\n  //     const newWhereQuery = {\n  //       ...(typeof currentParams?.where === 'object' &&\n  //       (validateWhereQuery(currentParams?.where) || !hasNewWhereConditions)\n  //         ? currentParams.where\n  //         : {}),\n  //       or: [...conditions, ...paramsToKeep],\n  //     }\n\n  //     if (handleChange) handleChange(newWhereQuery as Where)\n\n  //     const hasExistingConditions =\n  //       typeof currentParams?.where === 'object' && 'or' in currentParams.where\n\n  //     if (\n  //       modifySearchQuery &&\n  //       ((hasExistingConditions && !hasNewWhereConditions) || hasNewWhereConditions)\n  //     ) {\n  //       history.replace({\n  //         search: queryString.stringify(\n  //           {\n  //             ...currentParams,\n  //             page: 1,\n  //             where: newWhereQuery,\n  //           },\n  //           { addQueryPrefix: true },\n  //         ),\n  //       })\n  //     }\n  //   },\n  //   500,\n  //   [conditions, modifySearchQuery, handleChange],\n  // )\n\n  return (\n    <div className={baseClass}>\n      {conditions.length > 0 && (\n        <React.Fragment>\n          <div className={`${baseClass}__label`}>\n            {t('general:filterWhere', { label: getTranslation(collectionPluralLabel, i18n) })}\n          </div>\n          <ul className={`${baseClass}__or-filters`}>\n            {conditions.map((or, orIndex) => (\n              <li key={orIndex}>\n                {orIndex !== 0 && <div className={`${baseClass}__label`}>{t('general:or')}</div>}\n                <ul className={`${baseClass}__and-filters`}>\n                  {Array.isArray(or?.and) &&\n                    or.and.map((_, andIndex) => (\n                      <li key={andIndex}>\n                        {andIndex !== 0 && (\n                          <div className={`${baseClass}__label`}>{t('general:and')}</div>\n                        )}\n                        <Condition\n                          andIndex={andIndex}\n                          dispatch={dispatchConditions}\n                          fields={reducedFields}\n                          key={andIndex}\n                          orIndex={orIndex}\n                          value={conditions[orIndex].and[andIndex]}\n                        />\n                      </li>\n                    ))}\n                </ul>\n              </li>\n            ))}\n          </ul>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__add-or`}\n            icon=\"plus\"\n            iconPosition=\"left\"\n            iconStyle=\"with-border\"\n            onClick={() => {\n              if (reducedFields.length > 0)\n                dispatchConditions({ type: 'add', field: reducedFields[0].value })\n            }}\n          >\n            {t('general:or')}\n          </Button>\n        </React.Fragment>\n      )}\n      {conditions.length === 0 && (\n        <div className={`${baseClass}__no-filters`}>\n          <div className={`${baseClass}__label`}>{t('general:noFiltersSet')}</div>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__add-first-filter`}\n            icon=\"plus\"\n            iconPosition=\"left\"\n            iconStyle=\"with-border\"\n            onClick={() => {\n              if (reducedFields.length > 0)\n                dispatchConditions({ type: 'add', field: reducedFields[0].value })\n            }}\n          >\n            {t('general:addFilter')}\n          </Button>\n        </div>\n      )}\n    </div>\n  )\n}\n\nexport default WhereBuilder\n"],"names":["getTranslation","flattenTopLevelFields","React","useReducer","useState","useConfig","useSearchParams","useTranslation","Button","Condition","fieldTypes","reducer","transformWhereQuery","validateWhereQuery","baseClass","reduceFields","fields","i18n","reduce","reduced","field","type","operatorKeys","Set","operators","acc","operator","has","value","add","label","t","formattedField","name","props","WhereBuilder","collectionPluralLabel","collectionSlug","handleChange","modifySearchQuery","config","collection","collections","find","c","slug","reducedFields","searchParams","conditions","dispatchConditions","where","whereFromSearch","or","transformedWhere","console","warn","div","className","length","Fragment","ul","map","orIndex","li","key","Array","isArray","and","_","andIndex","dispatch","buttonStyle","icon","iconPosition","iconStyle","onClick"],"mappings":"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"}
+{"version":3,"sources":["../../../src/elements/WhereBuilder/index.tsx"],"sourcesContent":["import type { Where } from 'payload/types'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport { flattenTopLevelFields } from 'payload/utilities'\nimport React, { useReducer, useState } from 'react'\n\nimport type { WhereBuilderProps } from './types.js'\n\nimport { useConfig } from '../../providers/Config/index.js'\nimport { useListQuery } from '../../providers/ListQuery/index.js'\nimport { useSearchParams } from '../../providers/SearchParams/index.js'\nimport { useTranslation } from '../../providers/Translation/index.js'\nimport { Button } from '../Button/index.js'\nimport { Condition } from './Condition/index.js'\nimport fieldTypes from './field-types.js'\nimport './index.scss'\nimport reducer from './reducer.js'\nimport { transformWhereQuery } from './transformWhereQuery.js'\nimport validateWhereQuery from './validateWhereQuery.js'\n\nconst baseClass = 'where-builder'\n\nconst reduceFields = (fields, i18n) =>\n  flattenTopLevelFields(fields).reduce((reduced, field) => {\n    if (typeof fieldTypes[field.type] === 'object') {\n      const operatorKeys = new Set()\n      const operators = fieldTypes[field.type].operators.reduce((acc, operator) => {\n        if (!operatorKeys.has(operator.value)) {\n          operatorKeys.add(operator.value)\n          return [\n            ...acc,\n            {\n              ...operator,\n              label: i18n.t(`operators:${operator.label}`),\n            },\n          ]\n        }\n        return acc\n      }, [])\n\n      const formattedField = {\n        label: getTranslation(field.label || field.name, i18n),\n        value: field.name,\n        ...fieldTypes[field.type],\n        operators,\n        props: {\n          ...field,\n        },\n      }\n\n      return [...reduced, formattedField]\n    }\n\n    return reduced\n  }, [])\n\nexport { WhereBuilderProps }\n\n/**\n * The WhereBuilder component is used to render the filter controls for a collection's list view.\n * It is part of the {@link ListControls} component which is used to render the controls (search, filter, where).\n */\nexport const WhereBuilder: React.FC<WhereBuilderProps> = (props) => {\n  const { collectionPluralLabel, collectionSlug } = props\n  const { i18n, t } = useTranslation()\n\n  const config = useConfig()\n  const collection = config.collections.find((c) => c.slug === collectionSlug)\n  const [reducedFields] = useState(() => reduceFields(collection.fields, i18n))\n\n  const { searchParams } = useSearchParams()\n  const { handleWhereChange } = useListQuery()\n\n  // This handles initializing the where conditions from the search query (URL). That way, if you pass in\n  // query params to the URL, the where conditions will be initialized from those and displayed in the UI.\n  // Example: /admin/collections/posts?where[or][0][and][0][text][equals]=example%20post\n  const [conditions, dispatchConditions] = useReducer(\n    reducer((state) => handleWhereChange({ or: state })),\n    searchParams.where as Where,\n    (whereFromSearch: Where) => {\n      if (whereFromSearch) {\n        if (validateWhereQuery(whereFromSearch)) {\n          return whereFromSearch.or\n        }\n\n        // Transform the where query to be in the right format. This will transform something simple like [text][equals]=example%20post to the right format\n        const transformedWhere = transformWhereQuery(whereFromSearch)\n\n        if (validateWhereQuery(transformedWhere)) {\n          return transformedWhere.or\n        }\n\n        console.warn(`Invalid where query in URL: ${JSON.stringify(whereFromSearch)}`)\n      }\n      return []\n    },\n  )\n\n  return (\n    <div className={baseClass}>\n      {conditions.length > 0 && (\n        <React.Fragment>\n          <div className={`${baseClass}__label`}>\n            {t('general:filterWhere', { label: getTranslation(collectionPluralLabel, i18n) })}\n          </div>\n          <ul className={`${baseClass}__or-filters`}>\n            {conditions.map((or, orIndex) => (\n              <li key={orIndex}>\n                {orIndex !== 0 && <div className={`${baseClass}__label`}>{t('general:or')}</div>}\n                <ul className={`${baseClass}__and-filters`}>\n                  {Array.isArray(or?.and) &&\n                    or.and.map((_, andIndex) => (\n                      <li key={andIndex}>\n                        {andIndex !== 0 && (\n                          <div className={`${baseClass}__label`}>{t('general:and')}</div>\n                        )}\n                        <Condition\n                          andIndex={andIndex}\n                          dispatch={dispatchConditions}\n                          fields={reducedFields}\n                          key={andIndex}\n                          orIndex={orIndex}\n                          value={conditions[orIndex].and[andIndex]}\n                        />\n                      </li>\n                    ))}\n                </ul>\n              </li>\n            ))}\n          </ul>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__add-or`}\n            icon=\"plus\"\n            iconPosition=\"left\"\n            iconStyle=\"with-border\"\n            onClick={() => {\n              if (reducedFields.length > 0)\n                dispatchConditions({ type: 'add', field: reducedFields[0].value })\n            }}\n          >\n            {t('general:or')}\n          </Button>\n        </React.Fragment>\n      )}\n      {conditions.length === 0 && (\n        <div className={`${baseClass}__no-filters`}>\n          <div className={`${baseClass}__label`}>{t('general:noFiltersSet')}</div>\n          <Button\n            buttonStyle=\"icon-label\"\n            className={`${baseClass}__add-first-filter`}\n            icon=\"plus\"\n            iconPosition=\"left\"\n            iconStyle=\"with-border\"\n            onClick={() => {\n              if (reducedFields.length > 0)\n                dispatchConditions({ type: 'add', field: reducedFields[0].value })\n            }}\n          >\n            {t('general:addFilter')}\n          </Button>\n        </div>\n      )}\n    </div>\n  )\n}\n"],"names":["getTranslation","flattenTopLevelFields","React","useReducer","useState","useConfig","useListQuery","useSearchParams","useTranslation","Button","Condition","fieldTypes","reducer","transformWhereQuery","validateWhereQuery","baseClass","reduceFields","fields","i18n","reduce","reduced","field","type","operatorKeys","Set","operators","acc","operator","has","value","add","label","t","formattedField","name","props","WhereBuilder","collectionPluralLabel","collectionSlug","config","collection","collections","find","c","slug","reducedFields","searchParams","handleWhereChange","conditions","dispatchConditions","state","or","where","whereFromSearch","transformedWhere","console","warn","JSON","stringify","div","className","length","Fragment","ul","map","orIndex","li","key","Array","isArray","and","_","andIndex","dispatch","buttonStyle","icon","iconPosition","iconStyle","onClick"],"mappings":"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"}

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

@@ -1,5 +1,5 @@
 import type { Where } from 'payload/types';
 import type { Action } from './types.js';
-declare const reducer: (state: Where[], action: Action) => Where[];
+declare const reducer: (callback?: (state: Where[]) => void) => (state: Where[], action: Action) => Where[];
 export default reducer;
 //# sourceMappingURL=reducer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/reducer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAExC,QAAA,MAAM,OAAO,UAAW,KAAK,EAAE,UAAU,MAAM,KAAG,KAAK,EAgFtD,CAAA;AAED,eAAe,OAAO,CAAA"}
+{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/reducer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAE1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAExC,QAAA,MAAM,OAAO,sBACS,KAAK,EAAE,KAAK,IAAI,aAC5B,KAAK,EAAE,UAAU,MAAM,KAAG,KAAK,EA+EtC,CAAA;AAEH,eAAe,OAAO,CAAA"}

package/dist/elements/WhereBuilder/reducer.js

@@ -1,78 +1,78 @@
-const reducer = (state, action)=>{
-    const newState = [
-        ...state
-    ];
-    const { andIndex, orIndex } = action;
-    switch(action.type){
-        case 'add':
-            {
-                const { field, relation } = action;
-                if (relation === 'and') {
-                    newState[orIndex].and.splice(andIndex, 0, {
-                        [field]: {}
-                    });
-                    return newState;
-                }
-                return [
-                    ...newState,
-                    {
-                        and: [
-                            {
-                                [field]: {}
-                            }
-                        ]
+const reducer = (callback)=>(state, action)=>{
+        const newState = [
+            ...state
+        ];
+        const { andIndex, orIndex } = action;
+        switch(action.type){
+            case 'add':
+                {
+                    const { field, relation } = action;
+                    if (relation === 'and') {
+                        newState[orIndex].and.splice(andIndex, 0, {
+                            [field]: {}
+                        });
+                    } else {
+                        newState.push({
+                            and: [
+                                {
+                                    [field]: {}
+                                }
+                            ]
+                        });
                     }
-                ];
-            }
-        case 'remove':
-            {
-                newState[orIndex].and.splice(andIndex, 1);
-                if (newState[orIndex].and.length === 0) {
-                    newState.splice(orIndex, 1);
+                    break;
                 }
-                return newState;
-            }
-        case 'update':
-            {
-                const { field, operator, value } = action;
-                if (typeof newState[orIndex].and[andIndex] === 'object') {
-                    newState[orIndex].and[andIndex] = {
-                        ...newState[orIndex].and[andIndex]
-                    };
-                    const [existingFieldName, existingCondition] = Object.entries(newState[orIndex].and[andIndex])[0] || [
-                        undefined,
-                        undefined
-                    ];
-                    if (operator) {
-                        newState[orIndex].and[andIndex] = {
-                            [existingFieldName]: {
-                                [operator]: Object.values(existingCondition)[0]
-                            }
-                        };
-                    }
-                    if (field) {
-                        newState[orIndex].and[andIndex] = {
-                            [field]: operator ? {
-                                [operator]: value
-                            } : {}
-                        };
+            case 'remove':
+                {
+                    newState[orIndex].and.splice(andIndex, 1);
+                    if (newState[orIndex].and.length === 0) {
+                        newState.splice(orIndex, 1);
                     }
-                    if (value !== undefined) {
+                    break;
+                }
+            case 'update':
+                {
+                    const { field, operator, value } = action;
+                    if (typeof newState[orIndex].and[andIndex] === 'object') {
                         newState[orIndex].and[andIndex] = {
-                            [existingFieldName]: Object.keys(existingCondition)[0] ? {
-                                [Object.keys(existingCondition)[0]]: value
-                            } : {}
+                            ...newState[orIndex].and[andIndex]
                         };
+                        const [existingFieldName, existingCondition] = Object.entries(newState[orIndex].and[andIndex])[0] || [
+                            undefined,
+                            undefined
+                        ];
+                        if (operator) {
+                            newState[orIndex].and[andIndex] = {
+                                [existingFieldName]: {
+                                    [operator]: Object.values(existingCondition)[0]
+                                }
+                            };
+                        }
+                        if (field) {
+                            newState[orIndex].and[andIndex] = {
+                                [field]: operator ? {
+                                    [operator]: value
+                                } : {}
+                            };
+                        }
+                        if (value !== undefined) {
+                            newState[orIndex].and[andIndex] = {
+                                [existingFieldName]: Object.keys(existingCondition)[0] ? {
+                                    [Object.keys(existingCondition)[0]]: value
+                                } : {}
+                            };
+                        }
                     }
+                    break;
+                }
+            default:
+                {
+                    return newState;
                 }
-                return newState;
-            }
-        default:
-            {
-                return newState;
-            }
-    }
-};
+        }
+        if (callback) callback(newState);
+        return newState;
+    };
 export default reducer;
 
 //# sourceMappingURL=reducer.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WhereBuilder/reducer.ts"],"sourcesContent":["import type { Where } from 'payload/types'\n\nimport type { Action } from './types.js'\n\nconst reducer = (state: Where[], action: Action): Where[] => {\n  const newState = [...state]\n\n  const { andIndex, orIndex } = action\n\n  switch (action.type) {\n    case 'add': {\n      const { field, relation } = action\n\n      if (relation === 'and') {\n        newState[orIndex].and.splice(andIndex, 0, { [field]: {} })\n        return newState\n      }\n\n      return [\n        ...newState,\n        {\n          and: [\n            {\n              [field]: {},\n            },\n          ],\n        },\n      ]\n    }\n\n    case 'remove': {\n      newState[orIndex].and.splice(andIndex, 1)\n\n      if (newState[orIndex].and.length === 0) {\n        newState.splice(orIndex, 1)\n      }\n\n      return newState\n    }\n\n    case 'update': {\n      const { field, operator, value } = action\n\n      if (typeof newState[orIndex].and[andIndex] === 'object') {\n        newState[orIndex].and[andIndex] = {\n          ...newState[orIndex].and[andIndex],\n        }\n\n        const [existingFieldName, existingCondition] = Object.entries(\n          newState[orIndex].and[andIndex],\n        )[0] || [undefined, undefined]\n\n        if (operator) {\n          newState[orIndex].and[andIndex] = {\n            [existingFieldName]: {\n              [operator]: Object.values(existingCondition)[0],\n            },\n          }\n        }\n\n        if (field) {\n          newState[orIndex].and[andIndex] = {\n            [field]: operator ? { [operator]: value } : {},\n          }\n        }\n\n        if (value !== undefined) {\n          newState[orIndex].and[andIndex] = {\n            [existingFieldName]: Object.keys(existingCondition)[0]\n              ? {\n                  [Object.keys(existingCondition)[0]]: value,\n                }\n              : {},\n          }\n        }\n      }\n\n      return newState\n    }\n\n    default: {\n      return newState\n    }\n  }\n}\n\nexport default reducer\n"],"names":["reducer","state","action","newState","andIndex","orIndex","type","field","relation","and","splice","length","operator","value","existingFieldName","existingCondition","Object","entries","undefined","values","keys"],"mappings":"AAIA,MAAMA,UAAU,CAACC,OAAgBC;IAC/B,MAAMC,WAAW;WAAIF;KAAM;IAE3B,MAAM,EAAEG,QAAQ,EAAEC,OAAO,EAAE,GAAGH;IAE9B,OAAQA,OAAOI,IAAI;QACjB,KAAK;YAAO;gBACV,MAAM,EAAEC,KAAK,EAAEC,QAAQ,EAAE,GAAGN;gBAE5B,IAAIM,aAAa,OAAO;oBACtBL,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACC,MAAM,CAACN,UAAU,GAAG;wBAAE,CAACG,MAAM,EAAE,CAAC;oBAAE;oBACxD,OAAOJ;gBACT;gBAEA,OAAO;uBACFA;oBACH;wBACEM,KAAK;4BACH;gCACE,CAACF,MAAM,EAAE,CAAC;4BACZ;yBACD;oBACH;iBACD;YACH;QAEA,KAAK;YAAU;gBACbJ,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACC,MAAM,CAACN,UAAU;gBAEvC,IAAID,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACE,MAAM,KAAK,GAAG;oBACtCR,SAASO,MAAM,CAACL,SAAS;gBAC3B;gBAEA,OAAOF;YACT;QAEA,KAAK;YAAU;gBACb,MAAM,EAAEI,KAAK,EAAEK,QAAQ,EAAEC,KAAK,EAAE,GAAGX;gBAEnC,IAAI,OAAOC,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,KAAK,UAAU;oBACvDD,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,GAAG;wBAChC,GAAGD,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS;oBACpC;oBAEA,MAAM,CAACU,mBAAmBC,kBAAkB,GAAGC,OAAOC,OAAO,CAC3Dd,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,CAChC,CAAC,EAAE,IAAI;wBAACc;wBAAWA;qBAAU;oBAE9B,IAAIN,UAAU;wBACZT,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,GAAG;4BAChC,CAACU,kBAAkB,EAAE;gCACnB,CAACF,SAAS,EAAEI,OAAOG,MAAM,CAACJ,kBAAkB,CAAC,EAAE;4BACjD;wBACF;oBACF;oBAEA,IAAIR,OAAO;wBACTJ,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,GAAG;4BAChC,CAACG,MAAM,EAAEK,WAAW;gCAAE,CAACA,SAAS,EAAEC;4BAAM,IAAI,CAAC;wBAC/C;oBACF;oBAEA,IAAIA,UAAUK,WAAW;wBACvBf,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,GAAG;4BAChC,CAACU,kBAAkB,EAAEE,OAAOI,IAAI,CAACL,kBAAkB,CAAC,EAAE,GAClD;gCACE,CAACC,OAAOI,IAAI,CAACL,kBAAkB,CAAC,EAAE,CAAC,EAAEF;4BACvC,IACA,CAAC;wBACP;oBACF;gBACF;gBAEA,OAAOV;YACT;QAEA;YAAS;gBACP,OAAOA;YACT;IACF;AACF;AAEA,eAAeH,QAAO"}
+{"version":3,"sources":["../../../src/elements/WhereBuilder/reducer.ts"],"sourcesContent":["import type { Where } from 'payload/types'\n\nimport type { Action } from './types.js'\n\nconst reducer =\n  (callback?: (state: Where[]) => void) =>\n  (state: Where[], action: Action): Where[] => {\n    const newState = [...state]\n\n    const { andIndex, orIndex } = action\n\n    switch (action.type) {\n      case 'add': {\n        const { field, relation } = action\n\n        if (relation === 'and') {\n          newState[orIndex].and.splice(andIndex, 0, { [field]: {} })\n        } else {\n          newState.push({\n            and: [\n              {\n                [field]: {},\n              },\n            ],\n          })\n        }\n        break\n      }\n\n      case 'remove': {\n        newState[orIndex].and.splice(andIndex, 1)\n\n        if (newState[orIndex].and.length === 0) {\n          newState.splice(orIndex, 1)\n        }\n        break\n      }\n\n      case 'update': {\n        const { field, operator, value } = action\n\n        if (typeof newState[orIndex].and[andIndex] === 'object') {\n          newState[orIndex].and[andIndex] = {\n            ...newState[orIndex].and[andIndex],\n          }\n\n          const [existingFieldName, existingCondition] = Object.entries(\n            newState[orIndex].and[andIndex],\n          )[0] || [undefined, undefined]\n\n          if (operator) {\n            newState[orIndex].and[andIndex] = {\n              [existingFieldName]: {\n                [operator]: Object.values(existingCondition)[0],\n              },\n            }\n          }\n\n          if (field) {\n            newState[orIndex].and[andIndex] = {\n              [field]: operator ? { [operator]: value } : {},\n            }\n          }\n\n          if (value !== undefined) {\n            newState[orIndex].and[andIndex] = {\n              [existingFieldName]: Object.keys(existingCondition)[0]\n                ? {\n                    [Object.keys(existingCondition)[0]]: value,\n                  }\n                : {},\n            }\n          }\n        }\n\n        break\n      }\n\n      default: {\n        return newState\n      }\n    }\n\n    if (callback) callback(newState)\n    return newState\n  }\n\nexport default reducer\n"],"names":["reducer","callback","state","action","newState","andIndex","orIndex","type","field","relation","and","splice","push","length","operator","value","existingFieldName","existingCondition","Object","entries","undefined","values","keys"],"mappings":"AAIA,MAAMA,UACJ,CAACC,WACD,CAACC,OAAgBC;QACf,MAAMC,WAAW;eAAIF;SAAM;QAE3B,MAAM,EAAEG,QAAQ,EAAEC,OAAO,EAAE,GAAGH;QAE9B,OAAQA,OAAOI,IAAI;YACjB,KAAK;gBAAO;oBACV,MAAM,EAAEC,KAAK,EAAEC,QAAQ,EAAE,GAAGN;oBAE5B,IAAIM,aAAa,OAAO;wBACtBL,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACC,MAAM,CAACN,UAAU,GAAG;4BAAE,CAACG,MAAM,EAAE,CAAC;wBAAE;oBAC1D,OAAO;wBACLJ,SAASQ,IAAI,CAAC;4BACZF,KAAK;gCACH;oCACE,CAACF,MAAM,EAAE,CAAC;gCACZ;6BACD;wBACH;oBACF;oBACA;gBACF;YAEA,KAAK;gBAAU;oBACbJ,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACC,MAAM,CAACN,UAAU;oBAEvC,IAAID,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACG,MAAM,KAAK,GAAG;wBACtCT,SAASO,MAAM,CAACL,SAAS;oBAC3B;oBACA;gBACF;YAEA,KAAK;gBAAU;oBACb,MAAM,EAAEE,KAAK,EAAEM,QAAQ,EAAEC,KAAK,EAAE,GAAGZ;oBAEnC,IAAI,OAAOC,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,KAAK,UAAU;wBACvDD,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,GAAG;4BAChC,GAAGD,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS;wBACpC;wBAEA,MAAM,CAACW,mBAAmBC,kBAAkB,GAAGC,OAAOC,OAAO,CAC3Df,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,CAChC,CAAC,EAAE,IAAI;4BAACe;4BAAWA;yBAAU;wBAE9B,IAAIN,UAAU;4BACZV,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,GAAG;gCAChC,CAACW,kBAAkB,EAAE;oCACnB,CAACF,SAAS,EAAEI,OAAOG,MAAM,CAACJ,kBAAkB,CAAC,EAAE;gCACjD;4BACF;wBACF;wBAEA,IAAIT,OAAO;4BACTJ,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,GAAG;gCAChC,CAACG,MAAM,EAAEM,WAAW;oCAAE,CAACA,SAAS,EAAEC;gCAAM,IAAI,CAAC;4BAC/C;wBACF;wBAEA,IAAIA,UAAUK,WAAW;4BACvBhB,QAAQ,CAACE,QAAQ,CAACI,GAAG,CAACL,SAAS,GAAG;gCAChC,CAACW,kBAAkB,EAAEE,OAAOI,IAAI,CAACL,kBAAkB,CAAC,EAAE,GAClD;oCACE,CAACC,OAAOI,IAAI,CAACL,kBAAkB,CAAC,EAAE,CAAC,EAAEF;gCACvC,IACA,CAAC;4BACP;wBACF;oBACF;oBAEA;gBACF;YAEA;gBAAS;oBACP,OAAOX;gBACT;QACF;QAEA,IAAIH,UAAUA,SAASG;QACvB,OAAOA;IACT;AAEF,eAAeJ,QAAO"}

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

@@ -1,9 +1,7 @@
 import type { Field, Operator, SanitizedCollectionConfig, Where } from 'payload/types';
-export type Props = {
+export type WhereBuilderProps = {
     collectionPluralLabel: SanitizedCollectionConfig['labels']['plural'];
     collectionSlug: SanitizedCollectionConfig['slug'];
-    handleChange?: (where: Where) => void;
-    modifySearchQuery?: boolean;
 };
 export type FieldCondition = {
     component?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,yBAAyB,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAEtF,MAAM,MAAM,KAAK,GAAG;IAClB,qBAAqB,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAA;IACpE,cAAc,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAA;IACjD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IACrC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE;QACT,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,QAAQ,CAAA;KAChB,EAAE,CAAA;IACH,KAAK,EAAE,KAAK,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAA;AAEnC,MAAM,MAAM,GAAG,GAAG;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,IAAI,EAAE,KAAK,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,MAAM,CAAA;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE,KAAK,EAAE,CAAA;CACZ,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,yBAAyB,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAEtF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,qBAAqB,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAA;IACpE,cAAc,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAA;CAClD,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE;QACT,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,QAAQ,CAAA;KAChB,EAAE,CAAA;IACH,KAAK,EAAE,KAAK,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAA;AAEnC,MAAM,MAAM,GAAG,GAAG;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,IAAI,EAAE,KAAK,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,MAAM,CAAA;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE,KAAK,EAAE,CAAA;CACZ,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WhereBuilder/types.ts"],"sourcesContent":["import type { Field, Operator, SanitizedCollectionConfig, Where } from 'payload/types'\n\nexport type Props = {\n  collectionPluralLabel: SanitizedCollectionConfig['labels']['plural']\n  collectionSlug: SanitizedCollectionConfig['slug']\n  handleChange?: (where: Where) => void\n  modifySearchQuery?: boolean\n}\n\nexport type FieldCondition = {\n  component?: string\n  label: string\n  operators: {\n    label: string\n    value: Operator\n  }[]\n  props: Field\n  value: string\n}\n\nexport type Relation = 'and' | 'or'\n\nexport type ADD = {\n  andIndex?: number\n  field: string\n  orIndex?: number\n  relation?: Relation\n  type: 'add'\n}\n\nexport type REMOVE = {\n  andIndex: number\n  orIndex: number\n  type: 'remove'\n}\n\nexport type UPDATE = {\n  andIndex: number\n  field?: string\n  operator?: string\n  orIndex: number\n  type: 'update'\n  value?: unknown\n}\n\nexport type Action = ADD | REMOVE | UPDATE\n\nexport type State = {\n  or: Where[]\n}\n"],"names":[],"mappings":"AA+CA,WAEC"}
+{"version":3,"sources":["../../../src/elements/WhereBuilder/types.ts"],"sourcesContent":["import type { Field, Operator, SanitizedCollectionConfig, Where } from 'payload/types'\n\nexport type WhereBuilderProps = {\n  collectionPluralLabel: SanitizedCollectionConfig['labels']['plural']\n  collectionSlug: SanitizedCollectionConfig['slug']\n}\n\nexport type FieldCondition = {\n  component?: string\n  label: string\n  operators: {\n    label: string\n    value: Operator\n  }[]\n  props: Field\n  value: string\n}\n\nexport type Relation = 'and' | 'or'\n\nexport type ADD = {\n  andIndex?: number\n  field: string\n  orIndex?: number\n  relation?: Relation\n  type: 'add'\n}\n\nexport type REMOVE = {\n  andIndex: number\n  orIndex: number\n  type: 'remove'\n}\n\nexport type UPDATE = {\n  andIndex: number\n  field?: string\n  operator?: string\n  orIndex: number\n  type: 'update'\n  value?: unknown\n}\n\nexport type Action = ADD | REMOVE | UPDATE\n\nexport type State = {\n  or: Where[]\n}\n"],"names":[],"mappings":"AA6CA,WAEC"}

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

@@ -0,0 +1,5 @@
+/// <reference types="react" resolution-mode="require"/>
+declare const WindowInfoProvider: import("react").FC<import("@faceless-ui/window-info/dist/WindowInfoProvider/index.js").WindowInfoProviderProps>;
+declare const useWindowInfo: () => import("@faceless-ui/window-info/dist/WindowInfoProvider/context.js").IWindowInfoContext;
+export { WindowInfoProvider, useWindowInfo };
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/WindowInfo/index.tsx"],"names":[],"mappings":";AACA,QAAA,MAAQ,kBAAkB,iHAGa,CAAA;AACvC,QAAA,MAAQ,aAAa,gGAGa,CAAA;AAClC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,CAAA"}

package/dist/elements/WindowInfo/index.js

@@ -0,0 +1,10 @@
+import * as facelessUIImport from '@faceless-ui/window-info';
+const { WindowInfoProvider } = facelessUIImport && 'WindowInfoProvider' in facelessUIImport ? facelessUIImport : {
+    WindowInfoProvider: undefined
+};
+const { useWindowInfo } = facelessUIImport && 'useWindowInfo' in facelessUIImport ? facelessUIImport : {
+    useWindowInfo: undefined
+};
+export { WindowInfoProvider, useWindowInfo };
+
+//# sourceMappingURL=index.js.map

package/dist/elements/WindowInfo/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/elements/WindowInfo/index.tsx"],"sourcesContent":["import * as facelessUIImport from '@faceless-ui/window-info'\nconst { WindowInfoProvider } =\n  facelessUIImport && 'WindowInfoProvider' in facelessUIImport\n    ? facelessUIImport\n    : { WindowInfoProvider: undefined }\nconst { useWindowInfo } =\n  facelessUIImport && 'useWindowInfo' in facelessUIImport\n    ? facelessUIImport\n    : { useWindowInfo: undefined }\nexport { WindowInfoProvider, useWindowInfo }\n"],"names":["facelessUIImport","WindowInfoProvider","undefined","useWindowInfo"],"mappings":"AAAA,YAAYA,sBAAsB,2BAA0B;AAC5D,MAAM,EAAEC,kBAAkB,EAAE,GAC1BD,oBAAoB,wBAAwBA,mBACxCA,mBACA;IAAEC,oBAAoBC;AAAU;AACtC,MAAM,EAAEC,aAAa,EAAE,GACrBH,oBAAoB,mBAAmBA,mBACnCA,mBACA;IAAEG,eAAeD;AAAU;AACjC,SAASD,kBAAkB,EAAEE,aAAa,GAAE"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/withMergedProps/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,mBAAmB,EAAE,EACrE,SAAS,EACT,gBAAgB,GACjB,EAAE;IACD,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAA;IACxC,gBAAgB,EAAE,gBAAgB,CAAA;CACnC,GAAG,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAQhC"}

package/dist/elements/withMergedProps/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/elements/withMergedProps/index.tsx"],"sourcesContent":["import { deepMerge } from 'payload/utilities'\nimport React from 'react'\n\n/**\n * Creates a higher-order component (HOC) that merges predefined properties (`toMergeIntoProps`)\n * with any properties passed to the resulting component.\n *\n * Use this when you want to pre-specify some props for a component, while also allowing users to\n * pass in their own props. The HOC ensures the passed props and predefined props are combined before\n * rendering the original component.\n *\n * @example\n * const PredefinedComponent = getMergedPropsComponent({\n *   Component: OriginalComponent,\n *   toMergeIntoProps: { someExtraValue: 5 }\n * });\n * // Using <PredefinedComponent customProp=\"value\" /> will result in\n * // <OriginalComponent customProp=\"value\" someExtraValue={5} />\n *\n * @returns A higher-order component with combined properties.\n */\nexport function withMergedProps<ToMergeIntoProps, CompleteReturnProps>({\n  Component,\n  toMergeIntoProps,\n}: {\n  Component: React.FC<CompleteReturnProps>\n  toMergeIntoProps: ToMergeIntoProps\n}): React.FC<CompleteReturnProps> {\n  // A wrapper around the args.Component to inject the args.toMergeArgs as props, which are merged with the passed props\n  const MergedPropsComponent: React.FC<CompleteReturnProps> = (passedProps) => {\n    const mergedProps = deepMerge(toMergeIntoProps, passedProps)\n    return <Component {...mergedProps} />\n  }\n\n  return MergedPropsComponent\n}\n"],"names":["deepMerge","React","withMergedProps","Component","toMergeIntoProps","MergedPropsComponent","passedProps","mergedProps"],"mappings":"AAAA,SAASA,SAAS,QAAQ,oBAAmB;AAC7C,OAAOC,WAAW,QAAO;AAEzB;;;;;;;;;;;;;;;;;CAiBC,GACD,OAAO,SAASC,gBAAuD,EACrEC,SAAS,EACTC,gBAAgB,EAIjB;IACC,sHAAsH;IACtH,MAAMC,uBAAsD,CAACC;QAC3D,MAAMC,cAAcP,UAAUI,kBAAkBE;QAChD,qBAAO,oBAACH,WAAcI;IACxB;IAEA,OAAOF;AACT"}