@parallelworks/ui 0.81.0 → 0.82.0

package/dist/list/ListFilterBar.js

@@ -9,7 +9,7 @@ import { Input } from "../components/Input.js";
 import { Combobox } from "../components/Combobox.js";
 import { Calendar } from "../components/DatePicker.js";
 import { Drawer } from "../components/Drawer.js";
-import { DATE_PRESETS, fieldOperators, isDatePreset, isMultiple, parseDay, toDay } from "./filterModel.js";
+import { DATE_PRESETS, fieldOperators, isDatePreset, isMultiple, operatorCount, parseDay, toDay } from "./filterModel.js";
 import { Menu } from "@base-ui/react/menu";
 import { useEffect, useLayoutEffect, useRef, useState } from "react";
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
@@ -81,7 +81,7 @@ function FilterChip({ filters, filter, field, stretch = false, answers, onRemove
 	const shown = all.slice(0, 2);
 	const hidden = all.length - shown.length;
 	const valueText = unset ? showsAny ? t.any : t.pending : t.list(shown);
-	const operatorText = t.operator(filter.op, filter.values.length);
+	const operatorText = t.operator(filter.op, operatorCount(field, filter));
 	const noValuePart = filter.op === "isSet" || filter.op === "isNotSet" || field.kind === "boolean" && filter.values[0] !== "false";
 	const noOperatorPart = showsAny || field.kind === "boolean" && filter.values[0] !== "false";
 	const readAll = unset ? valueText : t.list(all);
@@ -121,6 +121,7 @@ function FilterChip({ filters, filter, field, stretch = false, answers, onRemove
 			}),
 			!noOperatorPart && /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(Divider, {}), operators.length > 1 ? /* @__PURE__ */ jsx(OperatorMenu, {
 				filters,
+				field,
 				filter,
 				operators,
 				open: open === "operator",
@@ -218,9 +219,9 @@ function FieldMenu({ filters, field, open, onOpenChange }) {
 		})]
 	});
 }
-function OperatorMenu({ filters, filter, operators, open, onOpenChange }) {
+function OperatorMenu({ filters, field, filter, operators, open, onOpenChange }) {
 	const t = useStrings().filters;
-	const count = filter.values.length;
+	const count = operatorCount(field, filter);
 	const text = t.operator(filter.op, count);
 	return /* @__PURE__ */ jsxs(Menu.Root, {
 		open,
@@ -246,7 +247,7 @@ function OperatorMenu({ filters, filter, operators, open, onOpenChange }) {
 			},
 			children: operators.map((op) => /* @__PURE__ */ jsx(MenuRadioItem, {
 				value: op,
-				children: t.operator(op, Math.max(count, 1))
+				children: t.operator(op, count)
 			}, op))
 		}) })]
 	});

package/dist/list/filterModel.d.ts

@@ -79,6 +79,10 @@ export type DatePreset = (typeof DATE_PRESETS)[number];
 type AnyField = FilterField<any>;
 export declare function fieldOperators(field: AnyField): readonly FilterOperator[];
 export declare function isMultiple(field: AnyField): boolean;
+/** How many values a condition's words are for: the values chosen, and one while none is, so a
+ *  chip just added reads "is" rather than "is any of"; never more than one where only one can be
+ *  chosen. Hosts that word the condition by count, as a plural rule does, get the right form. */
+export declare function operatorCount(field: AnyField, filter: ActiveFilter): number;
 /** Whether a filter narrows anything yet: a value chosen, or a condition that needs none. */
 export declare function isComplete(filter: ActiveFilter): boolean;
 /** Whether two sets of filters say the same, ignoring order, as Save or Update buttons ask. */

package/dist/list/filterModel.js

@@ -25,6 +25,12 @@ function fieldOperators(field) {
 function isMultiple(field) {
 	return (field.kind === "enum" || field.kind === "people") && field.multiple !== false;
 }
+/** How many values a condition's words are for: the values chosen, and one while none is, so a
+*  chip just added reads "is" rather than "is any of"; never more than one where only one can be
+*  chosen. Hosts that word the condition by count, as a plural rule does, get the right form. */
+function operatorCount(field, filter) {
+	return isMultiple(field) ? Math.max(filter.values.length, 1) : 1;
+}
 /** Whether a filter narrows anything yet: a value chosen, or a condition that needs none. */
 function isComplete(filter) {
 	if (filter.op === "isSet" || filter.op === "isNotSet") return true;
@@ -305,4 +311,4 @@ function applyFilterList(rows, filters, fields, now = /* @__PURE__ */ new Date()
 	return rows.filter((row) => checks.every(({ field, filter }) => matchFilter(field, filter, row, now)));
 }
 //#endregion
-export { DATE_PRESETS, applyFilterList, dateFilterRange, decodeFilters, encodeFilters, fieldOperators, filterParamKeys, fromStored, isComplete, isDatePreset, isMultiple, matchFilter, parseDay, sameFilters, toDay, toStored, withFilterParams };
+export { DATE_PRESETS, applyFilterList, dateFilterRange, decodeFilters, encodeFilters, fieldOperators, filterParamKeys, fromStored, isComplete, isDatePreset, isMultiple, matchFilter, operatorCount, parseDay, sameFilters, toDay, toStored, withFilterParams };