@trackunit/filters-filter-bar 1.3.236 → 1.3.237

package/index.cjs.js

@@ -1333,7 +1333,7 @@ const mockFilterBar = {
         getFilterBarName: doNothing,
         initialState: { customerType: [] },
         name: "test",
-        hasDefaultValue: doNothing,
+        isDefaultValue: doNothing,
         objectArrayIncludesValue: doNothing,
         resetFiltersToInitialState: doNothing,
         resetIndividualFilterToInitialState: doNothing,
@@ -1582,16 +1582,11 @@ const useFilterBarActions = ({ name, filterBarConfig, filterBarDefinition, setFi
                 const filter = filterBarConfig.values[key];
                 return filter?.includes(value) || false;
             },
-            hasDefaultValue(key) {
-                // eslint-disable-next-line local-rules/no-typescript-assertion
-                const filterValue = filterBarConfig.values[key];
+            isDefaultValue(key, filterValue) {
                 const filterDefinition = filterBarDefinition[key];
-                if (dequal.dequal(filterValue, filterBarDefinition[key]?.defaultValue) || dequal.dequal(filterValue, initialState?.[key])) {
+                if (dequal.dequal(filterValue, initialState?.[key]) || dequal.dequal(filterValue, filterDefinition?.defaultValue)) {
                     return true;
                 }
-                if (filterDefinition && filterDefinition.defaultValue === undefined) {
-                    return false;
-                }
                 if (!filterValue) {
                     return true;
                 }

package/index.esm.js

@@ -1331,7 +1331,7 @@ const mockFilterBar = {
         getFilterBarName: doNothing,
         initialState: { customerType: [] },
         name: "test",
-        hasDefaultValue: doNothing,
+        isDefaultValue: doNothing,
         objectArrayIncludesValue: doNothing,
         resetFiltersToInitialState: doNothing,
         resetIndividualFilterToInitialState: doNothing,
@@ -1580,16 +1580,11 @@ const useFilterBarActions = ({ name, filterBarConfig, filterBarDefinition, setFi
                 const filter = filterBarConfig.values[key];
                 return filter?.includes(value) || false;
             },
-            hasDefaultValue(key) {
-                // eslint-disable-next-line local-rules/no-typescript-assertion
-                const filterValue = filterBarConfig.values[key];
+            isDefaultValue(key, filterValue) {
                 const filterDefinition = filterBarDefinition[key];
-                if (dequal(filterValue, filterBarDefinition[key]?.defaultValue) || dequal(filterValue, initialState?.[key])) {
+                if (dequal(filterValue, initialState?.[key]) || dequal(filterValue, filterDefinition?.defaultValue)) {
                     return true;
                 }
-                if (filterDefinition && filterDefinition.defaultValue === undefined) {
-                    return false;
-                }
                 if (!filterValue) {
                     return true;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/filters-filter-bar",
-  "version": "1.3.236",
+  "version": "1.3.237",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -15,14 +15,14 @@
     "string-ts": "^2.0.0",
     "zod": "3.23.4",
     "@trackunit/iris-app-api": "1.3.148",
-    "@trackunit/react-core-hooks": "1.3.153",
+    "@trackunit/react-core-hooks": "1.3.154",
     "@trackunit/react-filter-components": "1.3.194",
-    "@trackunit/react-date-and-time-components": "1.3.197",
+    "@trackunit/react-date-and-time-components": "1.3.198",
     "@trackunit/shared-utils": "1.5.141",
-    "@trackunit/react-form-components": "1.3.196",
+    "@trackunit/react-form-components": "1.3.197",
     "@trackunit/react-core-contexts-api": "1.4.148",
     "@trackunit/geo-json-utils": "1.3.139",
-    "@trackunit/i18n-library-translation": "1.3.160",
+    "@trackunit/i18n-library-translation": "1.3.161",
     "@trackunit/css-class-variance-utilities": "1.3.141",
     "@trackunit/react-components": "1.4.172",
     "@trackunit/react-test-setup": "1.0.31"

package/src/lib/index.d.ts

@@ -1,4 +1,22 @@
-export * from "./components";
+export * from "./components/AppliedFiltersRenderer";
+export * from "./components/DefaultCheckboxFilter";
+export * from "./components/DefaultDateRangeFilter";
+export * from "./components/DefaultFilterTypes";
+export * from "./components/DefaultMinMaxFilter";
+export * from "./components/DefaultRadioFilter";
+export * from "./components/DynamicFilterList";
+export * from "./components/FilterButtonTooltipLabel";
+export * from "./components/FilterComponent";
+export * from "./components/FilterHeader";
+export * from "./components/FilterResults";
+export * from "./components/FiltersMenu";
+export * from "./components/FiltersMenuContent";
+export * from "./components/FiltersRenderer";
+export * from "./components/FilterTableComponent";
+export * from "./components/FilterTooltips/MultipleFilterTooltipLabel";
+export * from "./components/GroupedFiltersList";
+export * from "./components/HierarchicalCheckboxFilter/HierarchicalCheckboxFilter";
+export * from "./components/ResetFiltersButton";
 export * from "./FilterBar";
 export * from "./hooks/mockFilterBar";
 export * from "./hooks/useFilterBar";
@@ -6,6 +24,7 @@ export * from "./hooks/useFilterBarAsync";
 export * from "./hooks/useFiltersMenu";
 export * from "./hooks/useSearchParamAsFilter";
 export * from "./types/FilterTypes";
+export * from "./types/FilterZodTypes";
 export * from "./utils/FilterEvents";
 export * from "./utils/mergeFilters";
 export * from "./utils/toggleFilterValue";

package/src/lib/types/FilterTypes.d.ts

@@ -1,6 +1,5 @@
-import { geoJsonMultiPolygonSchema, geoJsonPolygonSchema } from "@trackunit/geo-json-utils";
 import { ReactNode } from "react";
-import { z } from "zod";
+import { AreaFilterGeoJsonGeometry } from "./FilterZodTypes";
 export type ValueName = {
     value: string;
     name: string;
@@ -15,26 +14,6 @@ export type MinMaxFilterValue = {
     min?: number;
     max?: number;
 };
-export declare const areaFilterGeoJsonGeometrySchema: z.ZodUnion<[z.ZodObject<{
-    type: z.ZodLiteral<"Polygon">;
-    coordinates: z.ZodArray<z.ZodEffects<z.ZodArray<z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>, "many">, [number, number][], [number, number][]>, "many">;
-}, "strict", z.ZodTypeAny, {
-    type: "Polygon";
-    coordinates: [number, number][][];
-}, {
-    type: "Polygon";
-    coordinates: [number, number][][];
-}>, z.ZodObject<{
-    type: z.ZodLiteral<"MultiPolygon">;
-    coordinates: z.ZodArray<z.ZodArray<z.ZodEffects<z.ZodArray<z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>, "many">, [number, number][], [number, number][]>, "many">, "many">;
-}, "strict", z.ZodTypeAny, {
-    type: "MultiPolygon";
-    coordinates: [number, number][][][];
-}, {
-    type: "MultiPolygon";
-    coordinates: [number, number][][][];
-}>]>;
-export type AreaFilterGeoJsonGeometry = z.infer<typeof geoJsonPolygonSchema> | z.infer<typeof geoJsonMultiPolygonSchema>;
 export type FilterValueType = Array<string> | Array<ValueName> | ValueName | MinMaxFilterValue | AreaFilterGeoJsonGeometry | string | number | BooleanValue | undefined;
 export declare type FilterTypes = "boolean" | "string" | "number" | "dateRange" | "area" | "valueNameArray" | "valueName" | "stringArray" | "minMax";
 export type FilterMapActions = {
@@ -60,7 +39,7 @@ export type FilterMapGetter = {
     objectArrayIncludesValue: (key: string, value: string) => boolean;
     objectIncludesValue: (key: string, value: string) => boolean;
     getValuesByKey: (key: string) => FilterValueType;
-    hasDefaultValue: (key: string) => boolean;
+    isDefaultValue: (key: string, value: FilterValueType) => boolean;
     arrayIncludesValue: (key: string, value: string | boolean) => boolean;
     appliedFilterKeys: () => Array<keyof FilterBarDefinition>;
     isFilterIncludedByKey(key: string): boolean;
@@ -78,39 +57,13 @@ export interface AbstractFilterDefinition {
      * The type of the filter, indicating its behavior and data format.
      */
     type: FilterTypes;
-    /**
-     * The title and translation for the filter.
-     */
     title: FilterTranslation;
-    /**
-     * If the filter should be on the provided filter bar as default
-     */
     default?: boolean;
-    /**
-     * If the filter should be persisted this key to localstorage, if not it will not override if it is in the localstorage and not load if it is.
-     */
     persistValue?: boolean;
-    /**
-     * The Group the filter will be shown under in the ui.
-     *
-     * @default "OTHER"
-     */
     group: FilterGroup;
-    /**
-     * A function that determines if the filter should be displayed in the starred filter menu.
-     */
     showInStarredMenu?: () => boolean;
-    /**
-     * A function that determines if the filter should be displayed in the filter bar.
-     */
     showInFilterBar?: () => boolean;
-    /**
-     * A boolean that determines if the filter should be displayed in the filter bar without a menu, like a search field.
-     */
     showDirectly?: boolean;
-    /**
-     * A boolean that determines if the filter should be generated.
-     */
     isHidden?: boolean;
 }
 export interface BooleanFilterDefinition extends AbstractFilterDefinition {

package/src/lib/types/FilterZodTypes.d.ts

@@ -0,0 +1,21 @@
+import { z } from "zod";
+export declare const areaFilterGeoJsonGeometrySchema: z.ZodUnion<[z.ZodObject<{
+    type: z.ZodLiteral<"Polygon">;
+    coordinates: z.ZodArray<z.ZodEffects<z.ZodArray<z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>, "many">, [number, number][], [number, number][]>, "many">;
+}, "strict", z.ZodTypeAny, {
+    type: "Polygon";
+    coordinates: [number, number][][];
+}, {
+    type: "Polygon";
+    coordinates: [number, number][][];
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"MultiPolygon">;
+    coordinates: z.ZodArray<z.ZodArray<z.ZodEffects<z.ZodArray<z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>, "many">, [number, number][], [number, number][]>, "many">, "many">;
+}, "strict", z.ZodTypeAny, {
+    type: "MultiPolygon";
+    coordinates: [number, number][][][];
+}, {
+    type: "MultiPolygon";
+    coordinates: [number, number][][][];
+}>]>;
+export type AreaFilterGeoJsonGeometry = z.infer<typeof areaFilterGeoJsonGeometrySchema>;

package/src/lib/utils/validateFilter.d.ts

@@ -1,4 +1,5 @@
-import { AreaFilterGeoJsonGeometry, BooleanValue, DateRangeValue, FilterBarConfig, FilterBarDefinition, FilterDefinition, FilterDefinitionValue, MinMaxFilterValue, ValueName } from "../types/FilterTypes";
+import { BooleanValue, DateRangeValue, FilterBarConfig, FilterBarDefinition, FilterDefinition, FilterDefinitionValue, MinMaxFilterValue, ValueName } from "../types/FilterTypes";
+import { AreaFilterGeoJsonGeometry } from "../types/FilterZodTypes";
 /**
  *
  */

package/src/lib/components/index.d.ts

@@ -1,19 +0,0 @@
-export * from "./AppliedFiltersRenderer";
-export * from "./DefaultCheckboxFilter";
-export * from "./DefaultDateRangeFilter";
-export * from "./DefaultFilterTypes";
-export * from "./DefaultMinMaxFilter";
-export * from "./DefaultRadioFilter";
-export * from "./DynamicFilterList";
-export * from "./FilterButtonTooltipLabel";
-export * from "./FilterComponent";
-export * from "./FilterHeader";
-export * from "./FilterResults";
-export * from "./FiltersMenu";
-export * from "./FiltersMenuContent";
-export * from "./FiltersRenderer";
-export * from "./FilterTableComponent";
-export * from "./FilterTooltips/MultipleFilterTooltipLabel";
-export * from "./GroupedFiltersList";
-export * from "./HierarchicalCheckboxFilter/HierarchicalCheckboxFilter";
-export * from "./ResetFiltersButton";