willba-component-library 0.1.74 → 0.1.76

package/lib/components/FilterBar/FilterBar.d.ts

@@ -1,18 +1,18 @@
 import React from 'react';
 import { Palette } from '../../themes/useTheme';
 import '../../themes/Default.css';
-import { AgeCategoryType, CalendarOffset, Filters } from './FilterBarTypes';
+import { AgeCategoryType, CalendarOffset, Filters, Tab } from './FilterBarTypes';
 import './FilterBar.css';
 export type FilterBarProps = {
     language?: string;
     ageCategories?: AgeCategoryType[];
     redirectUrl?: string;
     palette?: Palette;
-    currentViewApply?: string;
     onSubmit?: ((val: Filters) => void) | null;
     fullWidth?: boolean;
     calendarOffset?: CalendarOffset;
     mode?: string;
     defaultTab?: string;
+    tabs?: Tab[];
 };
-export default function FilterBar({ language, ageCategories, redirectUrl, palette, currentViewApply, onSubmit, fullWidth, calendarOffset, mode, defaultTab, }: FilterBarProps): React.JSX.Element | null;
+export default function FilterBar({ language, ageCategories, redirectUrl, palette, onSubmit, fullWidth, calendarOffset, mode, tabs, }: FilterBarProps): React.JSX.Element | null;

package/lib/components/FilterBar/FilterBarTypes.d.ts

@@ -23,9 +23,6 @@ export declare enum FilterSections {
 export type Filters = {
     [key: string]: string;
 };
-export declare enum ViewApply {
-    ROOMS = "roomFilters"
-}
 export declare enum Pages {
     ROOMS = "/rooms",
     EVENTS = "/events"
@@ -33,3 +30,15 @@ export declare enum Pages {
 export type CalendarOffset = {
     [key: string]: number;
 };
+type Translations = {
+    en: string;
+    fi: string;
+    [key: string]: string;
+};
+export type Tab = {
+    path: string;
+    default?: boolean;
+    order: number;
+    label?: Translations;
+};
+export {};

package/lib/components/FilterBar/hooks/useFilterBar.d.ts

@@ -1,19 +1,18 @@
 /// <reference types="react" />
 import { DateRange } from 'react-day-picker';
-import { AgeCategoryCount, AgeCategoryType, Filters, Pages } from '../FilterBarTypes';
+import { AgeCategoryCount, AgeCategoryType, Filters, Tab } from '../FilterBarTypes';
 type Props = {
     redirectUrl?: string;
-    currentViewApply?: string;
     ageCategories?: AgeCategoryType[];
     onSubmit?: ((val: Filters) => void) | null;
-    defaultTab?: string;
+    tabs?: Tab[];
 };
-export declare const useFilterBar: ({ redirectUrl, currentViewApply, ageCategories, onSubmit, defaultTab, }: Props) => {
+export declare const useFilterBar: ({ redirectUrl, ageCategories, onSubmit, tabs, }: Props) => {
     selectedFilter: string | boolean;
     ageCategoryCounts: AgeCategoryCount;
     categories: number;
     calendarRange: DateRange | undefined;
-    selectedPath: Pages;
+    selectedPath: string;
     setCalendarRange: import("react").Dispatch<import("react").SetStateAction<DateRange | undefined>>;
     setSelectedFilter: import("react").Dispatch<import("react").SetStateAction<string | boolean>>;
     setAgeCategoryCounts: import("react").Dispatch<import("react").SetStateAction<AgeCategoryCount>>;
@@ -22,6 +21,6 @@ export declare const useFilterBar: ({ redirectUrl, currentViewApply, ageCategori
     handleSubmit: () => string | void;
     updateGuestsCount: (id: string, newCount: number) => void;
     handleResetFilters: () => void;
-    setSelectedPath: import("react").Dispatch<import("react").SetStateAction<Pages>>;
+    setSelectedPath: import("react").Dispatch<import("react").SetStateAction<string>>;
 };
 export {};

package/lib/index.d.ts

@@ -44,19 +44,30 @@ type Filters = {
 type CalendarOffset = {
     [key: string]: number;
 };
+type Translations = {
+    en: string;
+    fi: string;
+    [key: string]: string;
+};
+type Tab = {
+    path: string;
+    default?: boolean;
+    order: number;
+    label?: Translations;
+};
 
 type FilterBarProps = {
     language?: string;
     ageCategories?: AgeCategoryType[];
     redirectUrl?: string;
     palette?: Palette;
-    currentViewApply?: string;
     onSubmit?: ((val: Filters) => void) | null;
     fullWidth?: boolean;
     calendarOffset?: CalendarOffset;
     mode?: string;
     defaultTab?: string;
+    tabs?: Tab[];
 };
-declare function FilterBar({ language, ageCategories, redirectUrl, palette, currentViewApply, onSubmit, fullWidth, calendarOffset, mode, defaultTab, }: FilterBarProps): React.JSX.Element | null;
+declare function FilterBar({ language, ageCategories, redirectUrl, palette, onSubmit, fullWidth, calendarOffset, mode, tabs, }: FilterBarProps): React.JSX.Element | null;
 
 export { Button, FilterBar };

package/lib/index.esm.js

@@ -3927,10 +3927,6 @@ var FilterSections;
     FilterSections["GUESTS"] = "guests";
     FilterSections["CATEGORIES"] = "categories";
 })(FilterSections || (FilterSections = {}));
-var ViewApply;
-(function (ViewApply) {
-    ViewApply["ROOMS"] = "roomFilters";
-})(ViewApply || (ViewApply = {}));
 var Pages;
 (function (Pages) {
     Pages["ROOMS"] = "/rooms";
@@ -3938,7 +3934,7 @@ var Pages;
 })(Pages || (Pages = {}));
 
 var useFilterBar = function (_a) {
-    var redirectUrl = _a.redirectUrl, currentViewApply = _a.currentViewApply, ageCategories = _a.ageCategories, onSubmit = _a.onSubmit, defaultTab = _a.defaultTab;
+    var redirectUrl = _a.redirectUrl, ageCategories = _a.ageCategories, onSubmit = _a.onSubmit, tabs = _a.tabs;
     var _b = __read(useState(Pages.EVENTS), 2), selectedPath = _b[0], setSelectedPath = _b[1];
     var _c = __read(useState(false), 2), selectedFilter = _c[0], setSelectedFilter = _c[1];
     var _d = __read(useState(), 2), calendarRange = _d[0], setCalendarRange = _d[1];
@@ -3973,11 +3969,11 @@ var useFilterBar = function (_a) {
         // Handle default selected tab
         if (typeof window === 'undefined')
             return;
-        console.log(defaultTab);
-        var currentPath = defaultTab === Pages.EVENTS ||
+        var defaultTab = (tabs === null || tabs === void 0 ? void 0 : tabs.length) === 1 ? tabs[0] : tabs === null || tabs === void 0 ? void 0 : tabs.find(function (tab) { return tab.default; });
+        var currentPath = (defaultTab === null || defaultTab === void 0 ? void 0 : defaultTab.path) === Pages.EVENTS ||
             window.location.pathname.includes(Pages.EVENTS)
             ? Pages.EVENTS
-            : defaultTab === Pages.ROOMS ||
+            : (defaultTab === null || defaultTab === void 0 ? void 0 : defaultTab.path) === Pages.ROOMS ||
                 window.location.pathname.includes(Pages.ROOMS)
                 ? Pages.ROOMS
                 : Pages.EVENTS;
@@ -4005,7 +4001,7 @@ var useFilterBar = function (_a) {
                 ageCategories: ageCategories,
             }),
         };
-        if (currentViewApply) {
+        if ((tabs === null || tabs === void 0 ? void 0 : tabs.length) === 1) {
             var currentSearchParams = new URLSearchParams(window.location.search);
             var updatedParams = new URLSearchParams();
             try {
@@ -11110,7 +11106,7 @@ var css_248z = ".will-root {\n  z-index: 999;\n  width: fit-content;\n  min-widt
 styleInject(css_248z);
 
 function FilterBar(_a) {
-    var language = _a.language, _b = _a.ageCategories, ageCategories = _b === void 0 ? AGE_CATEGORIES_FALLBACK : _b, _c = _a.redirectUrl, redirectUrl = _c === void 0 ? REDIRECT_URL_FALLBACK : _c, palette = _a.palette, currentViewApply = _a.currentViewApply, onSubmit = _a.onSubmit, fullWidth = _a.fullWidth, calendarOffset = _a.calendarOffset, mode = _a.mode, defaultTab = _a.defaultTab;
+    var language = _a.language, _b = _a.ageCategories, ageCategories = _b === void 0 ? AGE_CATEGORIES_FALLBACK : _b, _c = _a.redirectUrl, redirectUrl = _c === void 0 ? REDIRECT_URL_FALLBACK : _c, palette = _a.palette, onSubmit = _a.onSubmit, fullWidth = _a.fullWidth, calendarOffset = _a.calendarOffset, mode = _a.mode, tabs = _a.tabs;
     var themePalette = useTheme({ palette: palette });
     // Translations
     useUpdateTranslations({ language: language });
@@ -11118,17 +11114,10 @@ function FilterBar(_a) {
     // Filters
     var _d = useFilterBar({
         redirectUrl: redirectUrl,
-        currentViewApply: currentViewApply,
         ageCategories: ageCategories,
         onSubmit: onSubmit,
-        defaultTab: defaultTab,
+        tabs: tabs,
     }), selectedFilter = _d.selectedFilter, ageCategoryCounts = _d.ageCategoryCounts, categories = _d.categories, calendarRange = _d.calendarRange, selectedPath = _d.selectedPath, setCalendarRange = _d.setCalendarRange, setCategories = _d.setCategories, handleSelectedFilter = _d.handleSelectedFilter, handleSubmit = _d.handleSubmit, updateGuestsCount = _d.updateGuestsCount, setSelectedPath = _d.setSelectedPath, handleResetFilters = _d.handleResetFilters;
-    // Default selected tab when tabs are hidden
-    useEffect(function () {
-        if (currentViewApply === ViewApply.ROOMS) {
-            setSelectedPath(Pages.ROOMS);
-        }
-    }, []);
     // Scroll in to view
     var _e = useScrollInToView({ selectedFilter: selectedFilter }), isMobile = _e.isMobile, targetFilterBarRef = _e.targetFilterBarRef;
     // Handle close filter section
@@ -11151,14 +11140,14 @@ function FilterBar(_a) {
         guestsLabel: t('guests.guestsLabel'),
     });
     return (React__default__default.createElement("div", { className: "will-root ".concat(fullWidth ? 'is-full-width' : ''), style: themePalette },
-        !currentViewApply && (React__default__default.createElement("div", { className: "will-filter-bar-tabs", ref: !currentViewApply ? targetFilterBarRef : null },
-            React__default__default.createElement(TabButton, { label: t('tabs.events'), onClick: function () {
-                    setSelectedPath(Pages.EVENTS), handleResetFilters();
-                }, active: selectedPath === Pages.EVENTS, mode: mode }),
-            React__default__default.createElement(TabButton, { label: t('tabs.rooms'), onClick: function () {
-                    setSelectedPath(Pages.ROOMS), handleResetFilters();
-                }, active: selectedPath === Pages.ROOMS, mode: mode }))),
-        React__default__default.createElement("div", { className: "will-filter-bar-header ".concat(mode || 'dark'), ref: currentViewApply ? targetFilterBarRef : null },
+        tabs && tabs.length > 1 && (React__default__default.createElement("div", { className: "will-filter-bar-tabs", ref: targetFilterBarRef }, tabs
+            .sort(function (a, b) { return a.order - b.order; })
+            .map(function (tab, idx) { return (React__default__default.createElement(TabButton, { key: "tab-".concat(idx), label: tab.label && language
+                ? tab.label[language]
+                : t("tabs.".concat(tab.path.substring(1))), onClick: function () {
+                setSelectedPath(tab.path), handleResetFilters();
+            }, active: selectedPath === tab.path, mode: mode })); }))),
+        React__default__default.createElement("div", { className: "will-filter-bar-header ".concat(mode || 'dark'), ref: (tabs === null || tabs === void 0 ? void 0 : tabs.length) === 1 ? targetFilterBarRef : null },
             React__default__default.createElement(SelectButton, { label: t('calendar.label'), description: parsedDates
                     ? parsedDates
                     : selectedPath === Pages.ROOMS
@@ -11168,7 +11157,7 @@ function FilterBar(_a) {
                 React__default__default.createElement(Divider, null),
                 React__default__default.createElement(SelectButton, { label: t('guests.label'), description: parsedGuests.content, onClick: function () { return handleSelectedFilter(FilterSections.GUESTS); }, active: !!parsedGuests.data.total }))),
             React__default__default.createElement(SubmitButton, { onClick: handleSubmit })),
-        selectedFilter && (React__default__default.createElement("div", { className: "will-filter-bar-container ".concat(mode || 'dark'), style: currentViewApply && !isMobile ? { top: 66 } : {} },
+        selectedFilter && (React__default__default.createElement("div", { className: "will-filter-bar-container ".concat(mode || 'dark'), style: tabs && tabs.length === 1 && !isMobile ? { top: 66 } : {} },
             React__default__default.createElement(CloseButton, { handleClose: function () { return handleSelectedFilter(false); } }),
             selectedFilter === FilterSections.CALENDAR && (React__default__default.createElement(Calendar, { calendarRange: calendarRange, setCalendarRange: setCalendarRange, ref: filtersRef, calendarOffset: calendarOffset, selectedPath: selectedPath, locale: language })),
             selectedFilter === FilterSections.GUESTS && (React__default__default.createElement(Guests, { updateGuestsCount: updateGuestsCount, ageCategories: ageCategories, ageCategoryCounts: ageCategoryCounts, ref: filtersRef })),