@salla.sa/twilight-components 2.14.486 → 2.14.488

package/dist/components/salla-filters.js

@@ -8,7 +8,7 @@ import { d as defineCustomElement$5 } from './salla-button2.js';
 import { d as defineCustomElement$3 } from './salla-price-range2.js';
 import { d as defineCustomElement$2 } from './salla-rating-stars2.js';
 
-const sallaFiltersCss = ":host{display:block}.s-rating-stars-small{line-height:12px}.s-filters-radio{background-image:none !important}";
+const sallaFiltersCss = ":host{display:block}.s-rating-stars-small{line-height:12px}.s-filters-radio{background-image:none !important}.s-filters-applied-remove{pointer-events:auto !important;cursor:pointer}";
 
 const SallaFilters$1 = /*@__PURE__*/ proxyCustomElement(class SallaFilters extends HTMLElement {
     constructor() {
@@ -16,11 +16,14 @@ const SallaFilters$1 = /*@__PURE__*/ proxyCustomElement(class SallaFilters exten
         this.__registerHost();
         this.changed = createEvent(this, "changed", 7);
         this.isReady = false; //to avoid triggering the changed event
+        this.isInitialFetch = true; //the base-category auto-append may only run on the first filters::fetched
         this.filtersData = {};
+        this.appliedOpen = true;
         salla.event.on('filters::hidden', () => this.host.style.display = 'none');
         salla.lang.onLoaded(() => {
             this.apply = salla.lang.get('pages.checkout.apply');
             this.reset = salla.lang.get('pages.categories.filters_reset');
+            this.selectedTitle = salla.lang.getWithDefault('pages.categories.selected_filters', 'لقد اخترت');
         });
         salla.event.on('filters::fetched', ({ filters }) => {
             this.host.style.display = '';
@@ -55,7 +58,9 @@ const SallaFilters$1 = /*@__PURE__*/ proxyCustomElement(class SallaFilters exten
                         break; // No need to continue checking once a match is found
                     }
                 }
-                if (salla.config.get('page.slug') == "product.index" && Object.keys(freshFilterData).length == 0 && !hasFilters) {
+                // only on the first fetch after page load — re-appending on later fetches
+                // would silently undo an explicit "remove all filters" (COD-10662)
+                if (this.isInitialFetch && salla.config.get('page.slug') == "product.index" && Object.keys(freshFilterData).length == 0 && !hasFilters) {
                     // Append the current category to the url if there are no pre-selected filters
                     let currentUrl = window.location.href;
                     let filterValue = salla.config.get('page.id');
@@ -66,6 +71,7 @@ const SallaFilters$1 = /*@__PURE__*/ proxyCustomElement(class SallaFilters exten
                 }
                 return filter;
             });
+            this.isInitialFetch = false;
             this.filtersData = freshFilterData;
             this.host.childNodes.forEach(async (widget) => widget.setWidgetHeight && await widget.setWidgetHeight());
         });
@@ -127,9 +133,7 @@ const SallaFilters$1 = /*@__PURE__*/ proxyCustomElement(class SallaFilters exten
                 const value = filters[key];
                 const fullKey = parentKey ? `${parentKey}[${key}]` : key;
                 if (Array.isArray(value)) {
-                    for (let i = 0; i < value.length; i++) {
-                        encodedFilters.push(`${fullKey}[${i}]=${value[i]}`);
-                    }
+                    value.forEach(item => encodedFilters.push(`${fullKey}[]=${item}`));
                 }
                 else if (typeof value === 'object' && value !== null) {
                     encodedFilters.push(this.encodeFilters(value, fullKey));
@@ -184,21 +188,105 @@ const SallaFilters$1 = /*@__PURE__*/ proxyCustomElement(class SallaFilters exten
             isChecked && (this.filtersData[option.key] = value);
             isChecked || (delete this.filtersData[option.key]);
         }
-        //it's checkbox
-        // add if condition to avoid error when the filter is not existed in the filtersData
+        //it's checkbox (multi-select / OR within the same group)
         else if (event.target.type == "checkbox") {
-            this.filtersData[option.key] = this.filtersData[option.key] || [];
+            const current = this.filtersData[option.key];
+            // coerce legacy scalar values (e.g. ?filters[brand_id]=1) into an array
+            this.filtersData[option.key] = Array.isArray(current) ? current : (current != null ? [current] : []);
             if (isChecked) {
                 this.filtersData[option.key].push(value);
             }
-            this.filtersData[option.key] = this.filtersData[option.key].filter(val => val != value);
+            else {
+                this.filtersData[option.key] = this.filtersData[option.key].filter(val => val != value);
+            }
+            if (!this.filtersData[option.key].length) {
+                delete this.filtersData[option.key];
+            }
+        }
+        this.filtersData = { ...this.filtersData }; // reassign so @State re-renders the applied chips
+        this.applyFilters();
+    }
+    /**
+     * Flatten the selected filtersData into displayable chips, resolving the
+     * human label for each group + option from `this.filters`. Selections that
+     * can't be resolved to a known option (e.g. the auto-added base category)
+     * are skipped.
+     */
+    getAppliedFilters() {
+        const chips = [];
+        const data = this.filtersData || {};
+        for (const key of Object.keys(data)) {
+            if (key === 'variants') {
+                const variantFilter = this.filters?.find(f => f.type === FilterOptionTypes.VARIANTS);
+                for (const variantKey of Object.keys(data.variants || {})) {
+                    const value = data.variants[variantKey];
+                    const opt = variantFilter?.values?.find(o => (o.key || o.value) == value);
+                    if (!opt)
+                        continue;
+                    chips.push({ key, variantKey, value, type: FilterOptionTypes.VARIANTS, groupLabel: variantFilter?.label, optionLabel: opt.value });
+                }
+                continue;
+            }
+            const group = this.filters?.find(f => f.key === key);
+            if (!group)
+                continue;
+            const raw = data[key];
+            // RANGE (e.g. price) is stored as a { min, max } object
+            if (group.type === FilterOptionTypes.RANGE || (raw && typeof raw === 'object' && !Array.isArray(raw))) {
+                chips.push({ key, value: raw, type: FilterOptionTypes.RANGE, groupLabel: group.label, optionLabel: `${raw.min} - ${raw.max}` });
+                continue;
+            }
+            // the auto-appended base category (see filters::fetched) is page scoping, not a user
+            // selection — skip it. It's stored as a scalar; user selections are always arrays.
+            if (key === 'category_id' && !Array.isArray(raw) && salla.config.get('page.slug') == 'product.index' && raw == salla.config.get('page.id')) {
+                continue;
+            }
+            const values = Array.isArray(raw) ? raw : [raw];
+            for (const value of values) {
+                // rating values are bare numbers; everything else maps key -> value label
+                const opt = group.values?.find(o => (typeof o === 'number' ? o : (o.key || o.value)) == value);
+                const optionLabel = group.key === 'rating' ? `${value}` : (opt && typeof opt !== 'number' ? opt.value : undefined);
+                if (optionLabel == null)
+                    continue;
+                chips.push({ key, value, type: group.type, groupLabel: group.label, optionLabel });
+            }
+        }
+        return chips;
+    }
+    /**
+     * Remove a single applied filter — the direct inverse of handleOptionChange.
+     */
+    removeFilter(chip) {
+        if (chip.type === FilterOptionTypes.VARIANTS) {
+            if (this.filtersData.variants) {
+                delete this.filtersData.variants[chip.variantKey];
+                if (!Object.keys(this.filtersData.variants).length)
+                    delete this.filtersData.variants;
+            }
+        }
+        else if (chip.type === FilterOptionTypes.RANGE) {
+            delete this.filtersData[chip.key];
+        }
+        else {
+            const raw = this.filtersData[chip.key];
+            if (Array.isArray(raw)) {
+                this.filtersData[chip.key] = raw.filter(val => val != chip.value);
+                if (!this.filtersData[chip.key].length)
+                    delete this.filtersData[chip.key];
+            }
+            else {
+                delete this.filtersData[chip.key];
+            }
         }
+        this.filtersData = { ...this.filtersData }; // reassign so the panel + widgets re-render immediately
         this.applyFilters();
     }
     render() {
-        return h(Host, { key: 'f94496fa176d99cf04b98fea8732b7c7c5912159' }, this.filters?.map(option => h("salla-filters-widget", { option: option, filtersData: this.filtersData, onChanged: ({ detail: { event, option, value } }) => {
+        const appliedFilters = this.getAppliedFilters();
+        const removeText = salla.lang.getWithDefault('common.elements.delete', 'Remove');
+        return h(Host, { key: 'd6dacbf458eadefda7ec2b2c6845c54f553abea8' }, appliedFilters.length ? h("div", { class: "s-filters-applied s-filters-widget-container" }, h("h3", { class: "s-filters-widget-title", onClick: () => this.appliedOpen = !this.appliedOpen }, h("span", null, this.selectedTitle), h("span", { class: `s-filters-widget-plusminus ${this.appliedOpen ? 's-filters-widget-plusminus-active' : ''}` })), h("div", { class: `s-filters-widget-content ${this.appliedOpen ? 's-filters-widget-opened' : 's-filters-widget-closed'}` }, h("div", { class: "s-filters-widget-values" }, appliedFilters.map(chip => h("div", { class: "s-filters-label s-filters-applied-item" }, h("span", { class: "s-filters-option-name" }, chip.groupLabel, ": ", chip.optionLabel), h("button", { type: "button", class: "s-filters-applied-remove", "aria-label": `${removeText} ${chip.groupLabel}: ${chip.optionLabel}`, onClick: () => this.removeFilter(chip) }, h("i", { class: "sicon-cancel", "aria-hidden": "true" }))))), h("div", { class: "s-filters-footer" }, h("salla-button", { color: 'gray', fill: 'outline', onClick: () => this.resetFilters() }, this.reset)))) : '', this.filters?.map(option => h("salla-filters-widget", { option: option, filtersData: this.filtersData, onChanged: ({ detail: { event, option, value } }) => {
                 this.handleOptionChange(event, option, value);
-            } })), this.filters?.length ? h("div", { class: "s-filters-footer" }, h("salla-button", { color: 'gray', fill: 'outline', onClick: () => this.resetFilters() }, this.reset)) : '');
+            } })));
     }
     componentDidLoad() {
         this.isReady = true;
@@ -211,6 +299,8 @@ const SallaFilters$1 = /*@__PURE__*/ proxyCustomElement(class SallaFilters exten
         "filtersData": [32],
         "apply": [32],
         "reset": [32],
+        "selectedTitle": [32],
+        "appliedOpen": [32],
         "getFilters": [64],
         "applyFilters": [64],
         "resetFilters": [64]

package/dist/components/salla-order-cancel.d.ts

@@ -0,0 +1,11 @@
+import type { Components, JSX } from "../types/components";
+
+interface SallaOrderCancel extends Components.SallaOrderCancel, HTMLElement {}
+export const SallaOrderCancel: {
+    prototype: SallaOrderCancel;
+    new (): SallaOrderCancel;
+};
+/**
+ * Used to define this component and all nested components recursively.
+ */
+export const defineCustomElement: () => void;

package/dist/components/salla-order-cancel.js

@@ -0,0 +1,347 @@
+/*!
+ * Crafted with ❤ by Salla
+ */
+import { proxyCustomElement, HTMLElement, h, Host } from '@stencil/core/internal/client';
+import { d as defineCustomElement$4 } from './salla-button2.js';
+import { d as defineCustomElement$3 } from './salla-loading2.js';
+import { d as defineCustomElement$2 } from './salla-modal2.js';
+
+const sallaOrderCancelCss = ".s-order-cancel-reason .s-order-cancel-radio::before,.s-order-cancel-reason .s-radio::before{content:\"\";width:10px;height:10px;border-radius:50%;transform:scale(0);transition:120ms transform ease-in-out;background-color:#fff;box-shadow:inset 1em 1em #fff}.s-order-cancel-reason .s-order-cancel-radio:checked::before,.s-order-cancel-reason .s-radio:checked::before{transform:scale(1);background-color:var(--color-primary);box-shadow:inset 1em 1em var(--color-primary)}";
+
+const MAX_NOTE = 250;
+const ORDER_WAIT_MS = 2500;
+const DATE_HEADER = 'td.single-order-header-item:not(.flex)';
+const CANCELLED_MARKER = '[data-salla-order-cancelled-reason]';
+const CANCELLED_BY_LABELS = {
+    customer: 'أُلغي الطلب من قِبل العميل',
+    merchant: 'أُلغي الطلب من قِبل المتجر',
+};
+const LANG_PAIRS = [
+    ['pages.orders.cancel_modal_title', 'إلغاء الطلب', 'Cancel order'],
+    ['pages.orders.cancel_reason_title', 'لماذا ترغب في إلغاء الطلب؟', 'Why do you want to cancel this order?'],
+    ['pages.orders.cancel_reason_subtitle', 'ساعدنا نعرف السبب لتحسين تجربتك.', 'Help us understand why to improve your experience.'],
+    ['pages.orders.cancel_reason_confirm', 'تأكيد إلغاء الطلب', 'Confirm order cancellation'],
+    ['pages.orders.cancel_reason_back', 'تراجع', 'Go back'],
+    ['pages.orders.cancel_reason_note_placeholder', 'اذكر السبب', 'Mention the reason'],
+    ['pages.orders.cancelled_by_customer', CANCELLED_BY_LABELS.customer, 'Order cancelled by the customer'],
+    ['pages.orders.cancelled_by_merchant', CANCELLED_BY_LABELS.merchant, 'Order cancelled by the merchant'],
+    ['pages.orders.cancel_reason_char_limit', 'يتجاوز النص حد الأحرف المسموح', 'Text exceeds the allowed character limit'],
+];
+const parseJson = (value) => {
+    if (!value)
+        return null;
+    try {
+        const data = typeof value === 'string' ? JSON.parse(value) : value;
+        return data && typeof data === 'object' ? data : null;
+    }
+    catch {
+        return null;
+    }
+};
+const parseCancelledReason = (raw) => {
+    const data = parseJson(raw);
+    const reasons = Array.isArray(data?.reasons)
+        ? data.reasons.filter((r) => typeof r === 'string' && r.length > 0)
+        : [];
+    if (!reasons.length)
+        return null;
+    return { cancelled_by: data?.cancelled_by === 'merchant' ? 'merchant' : 'customer', reasons };
+};
+const normalizeReasons = (reasons) => reasons.filter(r => r.is_active !== false).sort((a, b) => (a.sort ?? 0) - (b.sort ?? 0));
+const parseReasonsProp = (value) => {
+    if (value == null || value === '')
+        return null;
+    const parsed = typeof value === 'string' ? parseJson(value) : value;
+    return Array.isArray(parsed) && parsed.length ? parsed : null;
+};
+const SallaOrderCancel$1 = /*@__PURE__*/ proxyCustomElement(class SallaOrderCancel extends HTMLElement {
+    constructor() {
+        super();
+        this.__registerHost();
+        this.reasons = [];
+        this.selectedReasonId = null;
+        this.reasonNote = '';
+        this.confirmLoading = false;
+        this.loading = true;
+        this.modalTitleLabel = '';
+        this.questionLabel = '';
+        this.subtitleLabel = '';
+        this.confirmLabel = '';
+        this.backLabel = '';
+        this.notePlaceholder = '';
+        this.charLimitLabel = '';
+        salla.lang.onLoaded(() => {
+            const ar = salla.lang.messages?.['ar.trans'];
+            const en = salla.lang.messages?.['en.trans'];
+            if (ar && en && salla.helpers?.setNested) {
+                for (const [key, arText, enText] of LANG_PAIRS) {
+                    salla.helpers.setNested(ar, key, arText);
+                    salla.helpers.setNested(en, key, enText);
+                }
+            }
+            this.refreshLabels();
+        });
+    }
+    onCancellationReasonsChange() {
+        void this.load();
+    }
+    async componentWillLoad() {
+        await salla.onReady();
+        this.refreshLabels();
+        await this.load();
+    }
+    refreshLabels() {
+        const t = (key, fb) => salla.lang.getWithDefault(key, fb);
+        this.modalTitleLabel = t('pages.orders.cancel_modal_title', 'إلغاء الطلب');
+        this.questionLabel = t('pages.orders.cancel_reason_title', 'لماذا ترغب في إلغاء الطلب؟');
+        this.subtitleLabel = t('pages.orders.cancel_reason_subtitle', 'ساعدنا نعرف السبب لتحسين تجربتك.');
+        this.confirmLabel = t('pages.orders.cancel_reason_confirm', 'تأكيد إلغاء الطلب');
+        this.backLabel = t('pages.orders.cancel_reason_back', 'تراجع');
+        this.notePlaceholder = t('pages.orders.cancel_reason_note_placeholder', 'اذكر السبب');
+        this.charLimitLabel = t('pages.orders.cancel_reason_char_limit', 'يتجاوز النص حد الأحرف المسموح');
+    }
+    get resolvedOrderId() {
+        const id = this.orderId ?? this.pageOrder?.id ?? salla.config.get('page.id');
+        const n = Number(id);
+        return Number.isFinite(n) ? n : id;
+    }
+    readPageOrder() {
+        const el = document.querySelector('salla-order-totals-card');
+        return el ? parseJson(el.order ?? el.getAttribute('order')) : null;
+    }
+    waitForPageOrder() {
+        const order = this.readPageOrder();
+        if (order)
+            return Promise.resolve(order);
+        if (typeof MutationObserver === 'undefined') {
+            // ponytail: jsdom has no MutationObserver; one microtask retry for spec DOM
+            return Promise.resolve().then(() => this.readPageOrder());
+        }
+        return new Promise(resolve => {
+            let settled = false;
+            const finish = () => {
+                if (settled)
+                    return;
+                settled = true;
+                observer.disconnect();
+                clearTimeout(timer);
+                resolve(this.readPageOrder());
+            };
+            const card = document.querySelector('salla-order-totals-card');
+            const observer = new MutationObserver(finish);
+            observer.observe(card ?? document.documentElement, card
+                ? { attributes: true, attributeFilter: ['order'] }
+                : { childList: true, subtree: true, attributes: true, attributeFilter: ['order'] });
+            const timer = setTimeout(finish, ORDER_WAIT_MS);
+        });
+    }
+    cancelledByLabel(by) {
+        return salla.lang.getWithDefault(`pages.orders.cancelled_by_${by}`, CANCELLED_BY_LABELS[by]);
+    }
+    mountCancelledHeader(attempt = 0) {
+        const cancelled = this.orderCancelledReason;
+        const reason = cancelled?.reasons[0];
+        if (!reason || document.querySelector(CANCELLED_MARKER))
+            return;
+        const anchor = document.querySelector(DATE_HEADER);
+        if (!anchor) {
+            // ponytail: hook mounts before header table in single.twig; retry until anchor exists
+            if (attempt < 20)
+                requestAnimationFrame(() => this.mountCancelledHeader(attempt + 1));
+            return;
+        }
+        const cell = document.createElement('td');
+        cell.className = 's-order-cancel-cancelled-header-item';
+        cell.setAttribute('data-salla-order-cancelled-reason', '');
+        const label = document.createElement('div');
+        label.className = 's-order-cancel-cancelled-header-label';
+        label.textContent = this.cancelledByLabel(cancelled.cancelled_by);
+        const value = document.createElement('b');
+        value.className = 's-order-cancel-cancelled-header-reason';
+        value.textContent = reason;
+        value.title = reason;
+        cell.append(label, value);
+        anchor.insertAdjacentElement('afterend', cell);
+    }
+    purgeLegacyModal() {
+        if (!this.reasons.length)
+            return;
+        for (const el of document.querySelectorAll('salla-modal#modal-order-cancel:not([data-salla-order-cancel])')) {
+            el.remove();
+        }
+    }
+    applyPageOrder(order) {
+        this.pageOrder = order;
+        this.orderCancelledReason = parseCancelledReason(order.order_cancelled_reason) ?? undefined;
+    }
+    async load() {
+        this.loading = true;
+        try {
+            const fromProp = parseReasonsProp(this.cancellationReasons);
+            if (!this.pageOrder) {
+                const order = this.readPageOrder();
+                if (order)
+                    this.applyPageOrder(order);
+            }
+            if (!this.pageOrder && !fromProp) {
+                const order = await this.waitForPageOrder();
+                if (order)
+                    this.applyPageOrder(order);
+            }
+            else if (!this.pageOrder) {
+                void this.waitForPageOrder().then(order => {
+                    if (order) {
+                        this.applyPageOrder(order);
+                        this.mountCancelledHeader();
+                    }
+                });
+            }
+            const order = this.pageOrder;
+            this.reasons = fromProp
+                ? normalizeReasons(fromProp)
+                : order
+                    ? normalizeReasons(Array.isArray(order.cancellation_reasons) ? order.cancellation_reasons : [])
+                    : [];
+        }
+        finally {
+            this.loading = false;
+            this.purgeLegacyModal();
+            this.mountCancelledHeader();
+        }
+    }
+    reasonLabel(reason) {
+        const locale = salla.lang.getLocale?.() || 'ar';
+        return reason.translations?.[locale]?.name || reason.name;
+    }
+    get hasOtherSelected() {
+        return this.selectedReasonId !== null && this.reasons.some(r => r.id === this.selectedReasonId && r.slug === 'other');
+    }
+    get canConfirm() {
+        if (this.selectedReasonId === null)
+            return false;
+        if (!this.hasOtherSelected)
+            return true;
+        const len = this.reasonNote.trim().length;
+        return len > 0 && len <= MAX_NOTE;
+    }
+    selectReason(id) {
+        if (this.selectedReasonId === id) {
+            if (this.reasons.find(r => r.id === id)?.slug === 'other')
+                this.reasonNote = '';
+            this.selectedReasonId = null;
+            return;
+        }
+        if (this.reasons.find(r => r.id === this.selectedReasonId)?.slug === 'other') {
+            this.reasonNote = '';
+        }
+        this.selectedReasonId = id;
+        if (this.reasons.length && this.reasons[this.reasons.length - 1].id === id) {
+            const timer = setTimeout(() => {
+                requestAnimationFrame(() => {
+                    document.getElementById(`s-order-cancel-reason-${id}`)?.scrollIntoView({ block: 'start', behavior: 'smooth' });
+                    const textarea = document.querySelector('.s-order-cancel-textarea');
+                    textarea?.focus();
+                    clearTimeout(timer);
+                });
+            }, 200);
+        }
+    }
+    resetForm() {
+        this.selectedReasonId = null;
+        this.reasonNote = '';
+        this.confirmLoading = false;
+    }
+    setReasonNote(event) {
+        this.reasonNote = event.target.value;
+    }
+    onKeyActivate(event, action) {
+        if (event.key === 'Enter' || event.key === ' ')
+            action();
+    }
+    async confirmCancel() {
+        if (!this.canConfirm || this.confirmLoading)
+            return;
+        this.confirmLoading = true;
+        try {
+            const note = this.hasOtherSelected ? this.reasonNote.trim() : '';
+            const payload = {
+                reasons: [String(this.selectedReasonId)],
+                ...(note && { reason_note: note }),
+            };
+            await salla.order.api.cancel(this.resolvedOrderId, payload);
+            window.location.reload();
+        }
+        catch {
+            this.confirmLoading = false;
+        }
+    }
+    render() {
+        if (this.loading || !this.reasons.length)
+            return h(Host, { class: "s-order-cancel-wrapper" });
+        return (h(Host, { class: "s-order-cancel-wrapper" }, h("salla-modal", { id: "modal-order-cancel", class: "s-order-cancel-modal", "data-salla-order-cancel": "", ref: el => {
+                this.modal = el;
+                void el?.setTitle?.(this.modalTitleLabel);
+            }, width: "sm", onModalVisibilityChanged: e => !e.detail && this.resetForm() }, h("div", { class: "s-order-cancel-content" }, h("div", { class: "s-order-cancel-intro" }, h("p", { class: "s-order-cancel-heading" }, this.questionLabel), h("p", { class: "s-order-cancel-subtitle" }, this.subtitleLabel)), h("div", { class: "s-order-cancel-reasons s-scrollbar" }, this.reasons.map(reason => {
+            const id = `s-order-cancel-reason-${reason.id}`;
+            return (h("label", { key: reason.id, class: "s-order-cancel-reason", htmlFor: id }, h("input", { type: "radio", name: "cancellation_reason", id: id, class: "s-order-cancel-radio s-radio", checked: this.selectedReasonId === reason.id, onChange: () => this.selectReason(reason.id) }), h("span", { class: "s-order-cancel-reason-label" }, this.reasonLabel(reason))));
+        })), this.hasOtherSelected && (h("div", { class: "s-order-cancel-other-field" }, h("textarea", { class: "s-order-cancel-textarea", placeholder: this.notePlaceholder, value: this.reasonNote, onInput: e => this.setReasonNote(e) }), h("p", { class: {
+                's-order-cancel-counter': true,
+                's-order-cancel-counter--limit': this.reasonNote.length >= MAX_NOTE,
+            } }, this.reasonNote.length >= MAX_NOTE && `${this.charLimitLabel} `, MAX_NOTE, "/", this.reasonNote.length))), h("div", { class: "s-order-cancel-actions" }, h("salla-button", { color: "primary", class: "w-full", width: "wide", disabled: !this.canConfirm, loading: this.confirmLoading, onClick: () => this.confirmCancel(), onKeyDown: e => this.onKeyActivate(e, () => this.confirmCancel()) }, this.confirmLabel), h("salla-button", { class: "w-full", width: "wide", fill: "outline", color: "gray", onClick: () => this.modal?.close(), onKeyDown: e => this.onKeyActivate(e, () => this.modal?.close()) }, this.backLabel))))));
+    }
+    static get watchers() { return {
+        "cancellationReasons": ["onCancellationReasonsChange"]
+    }; }
+    static get style() { return sallaOrderCancelCss; }
+}, [0, "salla-order-cancel", {
+        "orderId": [8, "order-id"],
+        "cancellationReasons": [1, "cancellation-reasons"],
+        "reasons": [32],
+        "selectedReasonId": [32],
+        "reasonNote": [32],
+        "confirmLoading": [32],
+        "loading": [32],
+        "modalTitleLabel": [32],
+        "questionLabel": [32],
+        "subtitleLabel": [32],
+        "confirmLabel": [32],
+        "backLabel": [32],
+        "notePlaceholder": [32],
+        "charLimitLabel": [32]
+    }, undefined, {
+        "cancellationReasons": ["onCancellationReasonsChange"]
+    }]);
+function defineCustomElement$1() {
+    if (typeof customElements === "undefined") {
+        return;
+    }
+    const components = ["salla-order-cancel", "salla-button", "salla-loading", "salla-modal"];
+    components.forEach(tagName => { switch (tagName) {
+        case "salla-order-cancel":
+            if (!customElements.get(tagName)) {
+                customElements.define(tagName, SallaOrderCancel$1);
+            }
+            break;
+        case "salla-button":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$4();
+            }
+            break;
+        case "salla-loading":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$3();
+            }
+            break;
+        case "salla-modal":
+            if (!customElements.get(tagName)) {
+                defineCustomElement$2();
+            }
+            break;
+    } });
+}
+defineCustomElement$1();
+
+const SallaOrderCancel = SallaOrderCancel$1;
+const defineCustomElement = defineCustomElement$1;
+
+export { SallaOrderCancel, defineCustomElement };

package/dist/components/salla-products-list2.js

@@ -141,10 +141,11 @@ const SallaProductsList = /*@__PURE__*/ proxyCustomElement(class SallaProductsLi
         window.scrollTo({ top: 0, behavior: 'smooth' });
         // Create a deep copy of the filters object to avoid mutating the original object
         this.parsedFilters = JSON.parse(JSON.stringify(filters));
-        if (this.currentPage?.slug == 'product.index' &&
-            this.parsedFilters &&
-            this.parsedFilters.category_id) {
-            this.currentCategoryIdFilter = [this.parsedFilters.category_id];
+        if (this.currentPage?.slug == 'product.index') {
+            // clear when category_id disappears, otherwise getSourceValue() keeps filtering by the removed category
+            this.currentCategoryIdFilter = this.parsedFilters?.category_id
+                ? this.toCategoryIdFilter(this.parsedFilters.category_id)
+                : null;
         }
         return this.reload();
     }
@@ -607,6 +608,14 @@ const SallaProductsList = /*@__PURE__*/ proxyCustomElement(class SallaProductsLi
     isAuxiliaryProductsListSource() {
         return ['json', 'selected', 'related', 'landing-page', 'recently'].includes(this.getSource());
     }
+    // Normalize a category_id filter (array, legacy {0:,1:} object, or scalar) into a flat list of ids
+    toCategoryIdFilter(catId) {
+        if (Array.isArray(catId))
+            return catId;
+        if (catId && typeof catId === 'object')
+            return Object.values(catId);
+        return [catId];
+    }
     getSourceValue() {
         if (this.getSource() === 'wishlist') {
             const searchParams = new URLSearchParams(window.location.search);
@@ -911,7 +920,7 @@ const SallaProductsList = /*@__PURE__*/ proxyCustomElement(class SallaProductsLi
                 this.sortBy = this.sortBy || searchParams.get('sort') || searchParams.get('by');
                 this.parsedFilters = Helper.extractFiltersFromUrl(searchParams);
                 if (this.parsedFilters && this.parsedFilters.category_id) {
-                    this.currentCategoryIdFilter = [this.parsedFilters.category_id];
+                    this.currentCategoryIdFilter = this.toCategoryIdFilter(this.parsedFilters.category_id);
                 }
             }
             catch (e) {
@@ -1032,12 +1041,15 @@ const SallaProductsList = /*@__PURE__*/ proxyCustomElement(class SallaProductsLi
                         title = salla.lang.get('common.elements.search_about', { word: this.getSourceValue() });
                     }
                     else if (!title) {
-                        let catId = this.parsedFilters.category_id || this.getSourceValue()[0];
+                        // with user-applied filters a category name in the title is misleading — show count only;
+                        // the unfiltered base state keeps the page category's name
+                        let catId = Object.keys(this.parsedFilters || {}).length ? null : this.getSourceValue()[0];
                         // get the first filter that its key is category_id, then get the value when filter.value.*.key==catId
                         title =
                             response.filters
                                 ?.find(filter => filter.key === 'category_id')
-                                ?.values?.find(cat => cat.key === catId)?.value ?? '';
+                                // loose == : catId may be a number (auto-appended page.id) while API keys are strings
+                                ?.values?.find(cat => cat.key == catId)?.value ?? '';
                     }
                     title +=
                         (title ? ' - ' : '') +

package/dist/components/salla-user-menu.js

@@ -101,6 +101,8 @@ const SallaUserMenu$1 = /*@__PURE__*/ proxyCustomElement(class SallaUserMenu ext
             this.opened = false;
         };
         this.OrderUpdate = 0;
+        // STD-13103: these pages moved under /account; link directly to avoid 301 redirects.
+        this.accountPrefixedKeys = ['orders', 'pending_orders', 'wallet', 'notifications', 'rating', 'profile', 'wishlist', 'settings'];
         this.items = {
             notifications: BellRing,
             orders: OrderIcon,
@@ -243,7 +245,8 @@ const SallaUserMenu$1 = /*@__PURE__*/ proxyCustomElement(class SallaUserMenu ext
             return { href: this.profileUrl, target: '_blank', rel: 'noopener noreferrer' };
         }
         const urlKey = itemKey === 'loyalty_points' ? 'loyalty' : itemKey;
-        return { href: Salla.url.get(urlKey) };
+        const path = this.accountPrefixedKeys.includes(urlKey) ? `account/${urlKey}` : urlKey;
+        return { href: Salla.url.get(path) };
     }
     getMenuItem([itemKey, itemValue], i) {
         //todo:: enhancement support slot here

package/dist/esm/{Helper-CD8d-Brd.js → Helper-BQ9mvrt9.js}

@@ -114,8 +114,13 @@ class Helper {
             if (matchesNested) {
                 const filterName = matchesNested[1];
                 const nestedKey = matchesNested[3];
-                if (nestedKey) {
-                    // Handle nested object
+                if (nestedKey === '' || /^\d+$/.test(nestedKey)) {
+                    // Handle array (OR within a group), e.g. filters[brand_id][] or filters[brand_id][0]
+                    filters[filterName] = Array.isArray(filters[filterName]) ? filters[filterName] : [];
+                    filters[filterName].push(value);
+                }
+                else if (nestedKey) {
+                    // Handle nested object, e.g. filters[price][min]
                     filters[filterName] = filters[filterName] || {};
                     filters[filterName][nestedKey] = value;
                 }

package/dist/esm/{filepond-ZiatSU0Y.js → filepond-2lHD_yVt.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { d as getDefaultExportFromCjs } from './index-BF901xIc.js';
+import { d as getDefaultExportFromCjs } from './index-K0OclOPO.js';
 
 function _mergeNamespaces(n, m) {
     m.forEach(function (e) {

package/dist/esm/{filepond-plugin-file-poster-2WAWdRm2.js → filepond-plugin-file-poster-DIjVVIwh.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { d as getDefaultExportFromCjs } from './index-BF901xIc.js';
+import { d as getDefaultExportFromCjs } from './index-K0OclOPO.js';
 
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {

package/dist/esm/{filepond-plugin-file-validate-size-DhLjP7aF.js → filepond-plugin-file-validate-size-CfcICNJA.js}

@@ -1,7 +1,7 @@
 /*!
  * Crafted with ❤ by Salla
  */
-import { d as getDefaultExportFromCjs } from './index-BF901xIc.js';
+import { d as getDefaultExportFromCjs } from './index-K0OclOPO.js';
 
 function _mergeNamespaces(n, m) {
     m.forEach(function (e) {