@juo/blocks 2.0.0-alpha.4 → 2.0.0-alpha.6

package/dist/{ExtensionRoot-DRpD5EcC.js → ExtensionRoot-CG9dH98z.js}

@@ -4,7 +4,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 import { signal, effect, createBlockInstance, layoutSystemEnabled, untracked } from "@juo/blocks";
 import { reportBlockWarning, reportBlockError } from "./observability.js";
 import { b as isStubDefinition, w as withWrapper, s as subscribeContext, c as backfillInstanceDefaults, d as __clearDevtoolsBlockState, o as onRegisterBlock } from "./block-BjJztStr.js";
-import { L as LAYOUT_SCOPE_ATTR, b as buildGridLayout, a as ThemeStateContext } from "./css-runtime-B7tZrBIp.js";
+import { L as LAYOUT_SCOPE_ATTR, b as buildGridLayout, a as ThemeStateContext } from "./css-runtime-CjZl0K48.js";
 import { getHook } from "./devtools.js";
 class Block extends HTMLElement {
   constructor() {

package/dist/core.js

@@ -3,12 +3,33 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { e as createContext, f as d, m as w, n as defineBlock, h as createBlockInstance, j as getDefinedBlocks, p as registerBlock, E, u, s as subscribeContext } from "./block-BjJztStr.js";
 import { B, q, t, S, v, _, x, c, y, g, z, A, D, F, G, i, H, b, I, o, J, k, K, l, L, w as w2 } from "./block-BjJztStr.js";
-import { G as GRID_V1_ENGINE_ID, d as clampRect, e as applyFillExpansion, f as compactItems, g as findFreeRect, D as DEFAULT_GRID } from "./css-runtime-B7tZrBIp.js";
-import { h, i as i2, L as L2, P, a, T, b as b2, j, k as k2, l as l2, m, n, o as o2, p, q as q2, s, t as t2, u as u2, v as v2, c as c2, w as w3, r } from "./css-runtime-B7tZrBIp.js";
+import { G as GRID_V1_ENGINE_ID, d as clampRect, e as applyFillExpansion, f as compactItems, g as findFreeRect, D as DEFAULT_GRID } from "./css-runtime-CjZl0K48.js";
+import { h, i as i2, L as L2, P, a, T, b as b2, j, k as k2, l as l2, m, n, o as o2, p, q as q2, s, t as t2, u as u2, v as v2, c as c2, w as w3, r } from "./css-runtime-CjZl0K48.js";
 import { reportBlockWarning, reportBlockError } from "./observability.js";
 import { a as createEditorBridge, E as createSelectBlockMessage } from "./bridge-Mz0CqG6E.js";
-import { p as p2 } from "./project-gridstack-PxN_DIfP.js";
+import { p as p2 } from "./project-gridstack-CRZ_7HoT.js";
 import { clearLayoutModeAdapter, getLayoutModeAdapter, registerLayoutModeAdapter } from "./layout-mode-adapter-BBd4JRQd.js";
+const SUPPORTED_UI_LANGUAGES = [
+  { code: "cs", label: "Czech" },
+  { code: "da", label: "Danish" },
+  { code: "nl", label: "Dutch" },
+  { code: "en", label: "English" },
+  { code: "fr", label: "French" },
+  { code: "de", label: "German" },
+  { code: "el", label: "Greek" },
+  { code: "hu", label: "Hungarian" },
+  { code: "pl", label: "Polish" },
+  { code: "pt", label: "Portuguese" },
+  { code: "sk", label: "Slovak" },
+  { code: "sl", label: "Slovenian" },
+  { code: "es", label: "Spanish" }
+];
+function toLanguageSelectOptions(languages) {
+  return languages.map(({ code, label }) => ({ label, value: code }));
+}
+const SUPPORTED_UI_LANGUAGE_OPTIONS = toLanguageSelectOptions(
+  SUPPORTED_UI_LANGUAGES
+);
 function createState() {
   const discountCode = d(null);
   const products = d([]);
@@ -276,6 +297,13 @@ function createCustomerService(options) {
     },
     createPaymentMethod(params) {
       return options.adapter.createPaymentMethod(params);
+    },
+    async updateAttributes(attributes) {
+      var _a;
+      const merged = { ...(_a = current.value) == null ? void 0 : _a.attributes, ...attributes };
+      const result = await options.adapter.updateAttributes(merged);
+      if (result._tag === "Success") current.value = result.data;
+      return result;
     }
   };
 }
@@ -287,7 +315,8 @@ const PAYMENT_INSTRUMENT_TYPES = [
   "sepa_direct_debit",
   "blik",
   "mbway",
-  "bacs"
+  "bacs",
+  "manual"
 ];
 const INSTRUMENT_TYPE_TO_NAME = {
   credit_card: null,
@@ -296,7 +325,8 @@ const INSTRUMENT_TYPE_TO_NAME = {
   sepa_direct_debit: "SEPA",
   mbway: "MB WAY",
   shop_pay: "Shop Pay",
-  bacs: "Bacs"
+  bacs: "Bacs",
+  manual: "Shopify Checkout"
 };
 function getPaymentInstrumentName(instrument) {
   const name = INSTRUMENT_TYPE_TO_NAME[instrument.type] ?? null;
@@ -378,16 +408,23 @@ function serializeV1PaymentInstrument(raw) {
       return { type: "mbway", ...r2.phone != null ? { phone: r2.phone } : {} };
     case "bacs":
       return { type: "bacs", maskedNumber: r2.maskedNumber ?? "" };
+    case "manual":
+      return { type: "manual" };
     default:
       return null;
   }
 }
 function createMockCustomerAdapter() {
-  const customer = { id: "customer-1", name: "Customer 1" };
+  let customer = { id: "customer-1", name: "Customer 1", attributes: {} };
   return {
     async getCurrent() {
       return { _tag: "Success", data: customer };
     },
+    async updateAttributes(attributes) {
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      customer = { ...customer, attributes: { ...attributes } };
+      return { _tag: "Success", data: customer };
+    },
     async createPaymentMethod(params) {
       await new Promise((resolve) => setTimeout(resolve, 300));
       if (params.provider === "shopify") {
@@ -410,17 +447,41 @@ function createMockCustomerAdapter() {
     }
   };
 }
+function fromV1Customer(body) {
+  return {
+    id: body.id,
+    name: body.displayName,
+    email: body.email ?? void 0,
+    attributes: Object.fromEntries(
+      body.customAttributes.map(({ key, value }) => [key, value])
+    )
+  };
+}
 function createApiCustomerAdapter(fetcher) {
   return {
     async getCurrent() {
       try {
-        const res = await fetcher("/customer/info");
+        const res = await fetcher("/customer/v1/customer");
         if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
-        const data = await res.json();
-        const name = [data.firstName, data.lastName].filter(Boolean).join(" ") || data.email || "";
         return {
           _tag: "Success",
-          data: { id: data.id, name, email: data.email }
+          data: fromV1Customer(await res.json())
+        };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
+      }
+    },
+    async updateAttributes(attributes) {
+      try {
+        const res = await fetcher("/customer/v1/customer", {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ customAttributes: attributes })
+        });
+        if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+        return {
+          _tag: "Success",
+          data: fromV1Customer(await res.json())
         };
       } catch (e) {
         return { _tag: "Failure", error: e };
@@ -578,6 +639,12 @@ function createApiLoginAdapter(fetcher, opts) {
             });
           }
         }
+        if (res.status === 401) {
+          const data = await res.json().catch(() => null);
+          if (data != null && typeof data === "object" && "message" in data && data.message === "Customer not found") {
+            throw new AuthenticationError(AuthenticationErrorReason.Missing);
+          }
+        }
         if (!res.ok) {
           throw new Error(`Unexpected response: ${res.statusText}`);
         }
@@ -1481,6 +1548,39 @@ const DISCOUNT_REJECTION_REASONS = [
 function toAttributeArray(next) {
   return Object.entries(next).map(([key, value]) => ({ key, value }));
 }
+const MOCK_SHIPPING_METHODS = [
+  {
+    handle: "standard-shipping",
+    title: "Standard shipping",
+    price: { amount: "0.00", currencyCode: "EUR" }
+  },
+  {
+    handle: "dhl-express",
+    title: "DHL Express",
+    price: { amount: "9.99", currencyCode: "EUR" }
+  },
+  {
+    handle: "next-day",
+    title: "Next day delivery",
+    price: { amount: "14.99", currencyCode: "EUR" }
+  }
+];
+function toShippingAddressBody(address) {
+  return {
+    firstName: address.firstName,
+    lastName: address.lastName,
+    address1: address.address1,
+    zip: address.zip,
+    city: address.city,
+    ...address.address2 ? { address2: address.address2 } : {},
+    ...address.province ? { province: address.province } : {},
+    ...address.phone ? { phone: address.phone } : {},
+    ...address.company ? { company: address.company } : {}
+  };
+}
+function isStaleSubscriptionMessage(message) {
+  return message ? message.toLowerCase().includes("changed since last fetch") : false;
+}
 function toNonEmptyAttributeArray(next) {
   if (next == null) return [];
   return toAttributeArray(next).filter(
@@ -1962,6 +2062,92 @@ function createMockSubscriptionAdapter(options = {}) {
       subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       return { _tag: "Success", data: { ...subscription } };
     },
+    async updateDeliveryAddress({
+      subscriptionId,
+      address
+    }) {
+      var _a;
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      const subscription = mockSubscriptions.find(
+        (sub) => sub.id === subscriptionId
+      );
+      if (!subscription) {
+        return { _tag: "Failure", error: { kind: "SUBSCRIPTION_NOT_FOUND" } };
+      }
+      const previous = (_a = subscription.deliveryMethod) == null ? void 0 : _a.address;
+      subscription.deliveryMethod = {
+        ...subscription.deliveryMethod,
+        address: {
+          firstName: address.firstName,
+          lastName: address.lastName,
+          address1: address.address1,
+          zip: address.zip,
+          city: address.city,
+          ...address.address2 ? { address2: address.address2 } : {},
+          ...address.province ? { province: address.province } : {},
+          ...address.phone ? { phone: address.phone } : {},
+          ...address.company ? { company: address.company } : {},
+          ...(previous == null ? void 0 : previous.country) != null ? { country: previous.country } : {},
+          ...(previous == null ? void 0 : previous.countryCode) != null ? { countryCode: previous.countryCode } : {}
+        }
+      };
+      subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      return { _tag: "Success", data: void 0 };
+    },
+    async getAvailableShippingMethods({
+      subscriptionId
+    }) {
+      var _a, _b, _c;
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      const subscription = mockSubscriptions.find(
+        (sub) => sub.id === subscriptionId
+      );
+      if (!subscription) {
+        return { _tag: "Failure", error: "Subscription not found" };
+      }
+      const currentTitle = (_b = (_a = subscription.deliveryMethod) == null ? void 0 : _a.shippingOption) == null ? void 0 : _b.title;
+      const currencyCode = ((_c = subscription.items[0]) == null ? void 0 : _c.price.currencyCode) ?? "EUR";
+      return {
+        _tag: "Success",
+        data: MOCK_SHIPPING_METHODS.map((method) => ({
+          ...method,
+          price: { ...method.price, currencyCode },
+          isActive: method.title === currentTitle
+        }))
+      };
+    },
+    async updateDeliveryMethod({
+      subscriptionId,
+      shippingMethodHandle
+    }) {
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      const subscription = mockSubscriptions.find(
+        (sub) => sub.id === subscriptionId
+      );
+      if (!subscription) {
+        return { _tag: "Failure", error: { kind: "SUBSCRIPTION_NOT_FOUND" } };
+      }
+      const method = MOCK_SHIPPING_METHODS.find(
+        (m2) => m2.handle === shippingMethodHandle
+      );
+      if (!method) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "UNKNOWN",
+            message: `Provided shipping method handle "${shippingMethodHandle}" is not available`
+          }
+        };
+      }
+      subscription.deliveryMethod = {
+        ...subscription.deliveryMethod,
+        shippingOption: { title: method.title },
+        pickupOption: null,
+        localDeliveryOption: null
+      };
+      subscription.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      return { _tag: "Success", data: void 0 };
+    },
     async resume(params) {
       await new Promise((resolve) => setTimeout(resolve, 300));
       const subscription = mockSubscriptions.find(
@@ -2516,6 +2702,121 @@ function createApiSubscriptionAdapter(fetcher) {
         return { _tag: "Failure", error: e };
       }
     },
+    // Legacy endpoint on purpose — see SubscriptionAdapter.updateDeliveryAddress
+    // for why the documented v1 `deliveryAddress` patch is not used here.
+    async updateDeliveryAddress({ subscriptionId, address }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/shipping-address`,
+          {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify(toShippingAddressBody(address))
+          }
+        );
+        if (!res.ok) {
+          if (res.status === 403) {
+            return { _tag: "Failure", error: { kind: "NOT_ALLOWED" } };
+          }
+          if (res.status === 404) {
+            return {
+              _tag: "Failure",
+              error: { kind: "SUBSCRIPTION_NOT_FOUND" }
+            };
+          }
+          if (res.status === 400) {
+            const body = await readErrorBody(res);
+            const message = typeof body.message === "string" ? body.message : void 0;
+            if (isStaleSubscriptionMessage(message)) {
+              return { _tag: "Failure", error: { kind: "STALE" } };
+            }
+            return {
+              _tag: "Failure",
+              error: {
+                kind: "INVALID_ADDRESS",
+                ...message ? { message } : {}
+              }
+            };
+          }
+          return {
+            _tag: "Failure",
+            error: { kind: "UNKNOWN", message: `HTTP ${res.status}` }
+          };
+        }
+        return { _tag: "Success", data: void 0 };
+      } catch (e) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "NETWORK",
+            message: e instanceof Error ? e.message : void 0
+          }
+        };
+      }
+    },
+    // Legacy endpoint — no /customer/v1 equivalent exists yet.
+    async getAvailableShippingMethods({ subscriptionId }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/available-shipping-methods`
+        );
+        if (!res.ok) return { _tag: "Failure", error: `HTTP ${res.status}` };
+        const data = await res.json();
+        return { _tag: "Success", data };
+      } catch (e) {
+        return { _tag: "Failure", error: e };
+      }
+    },
+    // Legacy endpoint — no /customer/v1 equivalent exists yet. No `extra` is
+    // sent: pickup points are out of scope, and omitting it is what tells the
+    // endpoint to leave any existing parcel-locker attributes alone.
+    async updateDeliveryMethod({ subscriptionId, shippingMethodHandle }) {
+      try {
+        const res = await fetcher(
+          `/customer/subscriptions/${subscriptionId}/shipping-method`,
+          {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ shippingMethodHandle })
+          }
+        );
+        if (!res.ok) {
+          if (res.status === 403) {
+            return { _tag: "Failure", error: { kind: "NOT_ALLOWED" } };
+          }
+          if (res.status === 404) {
+            return {
+              _tag: "Failure",
+              error: { kind: "SUBSCRIPTION_NOT_FOUND" }
+            };
+          }
+          if (res.status === 400) {
+            const body = await readErrorBody(res);
+            const message = typeof body.message === "string" ? body.message : void 0;
+            if (isStaleSubscriptionMessage(message)) {
+              return { _tag: "Failure", error: { kind: "STALE" } };
+            }
+            return {
+              _tag: "Failure",
+              error: { kind: "UNKNOWN", ...message ? { message } : {} }
+            };
+          }
+          return {
+            _tag: "Failure",
+            error: { kind: "UNKNOWN", message: `HTTP ${res.status}` }
+          };
+        }
+        return { _tag: "Success", data: void 0 };
+      } catch (e) {
+        return {
+          _tag: "Failure",
+          error: {
+            kind: "NETWORK",
+            message: e instanceof Error ? e.message : void 0
+          }
+        };
+      }
+    },
     async resume({ subscriptionId }) {
       try {
         const res = await fetcher(
@@ -3551,6 +3852,27 @@ function createSubscriptionService(adapter) {
     },
     reschedule: (subscriptionId, newDate) => adapter.reschedule({ subscriptionId, newDate }),
     updateCustomAttributes: (subscriptionId, customAttributes) => adapter.updateCustomAttributes({ subscriptionId, customAttributes }),
+    updateDeliveryAddress: async (subscriptionId, address) => {
+      const result = await adapter.updateDeliveryAddress({
+        subscriptionId,
+        address
+      });
+      if (result._tag === "Success") {
+        await reload();
+      }
+      return result;
+    },
+    getAvailableShippingMethods: (subscriptionId) => adapter.getAvailableShippingMethods({ subscriptionId }),
+    updateDeliveryMethod: async (subscriptionId, shippingMethodHandle) => {
+      const result = await adapter.updateDeliveryMethod({
+        subscriptionId,
+        shippingMethodHandle
+      });
+      if (result._tag === "Success") {
+        await reload();
+      }
+      return result;
+    },
     resume: (subscriptionId) => adapter.resume({ subscriptionId }),
     pause: (subscriptionId) => adapter.pause({ subscriptionId }),
     reactivate: (subscriptionId) => adapter.reactivate({ subscriptionId }),
@@ -3561,10 +3883,98 @@ function createSubscriptionService(adapter) {
     getAvailablePlans: (subscriptionId) => adapter.getAvailablePlans({ subscriptionId }),
     getDefaultSubscriptionId: () => adapter.getDefaultSubscriptionId(),
     getUpsellProducts: (params) => adapter.getUpsellProducts ? adapter.getUpsellProducts(params) : Promise.resolve({ _tag: "Success", data: [] }),
-    addUpsellProduct: (params) => adapter.addUpsellProduct ? adapter.addUpsellProduct(params) : Promise.resolve({ _tag: "Success", data: void 0 })
+    addUpsellProduct: (params) => adapter.addUpsellProduct ? adapter.addUpsellProduct(params) : Promise.resolve({ _tag: "Success", data: void 0 }),
+    getInstantOrderProducts: (subscriptionId, params) => adapter.getInstantOrderProducts ? adapter.getInstantOrderProducts({ subscriptionId, ...params }) : Promise.resolve({
+      _tag: "Success",
+      data: {
+        available: false,
+        requiresCheckout: false,
+        products: [],
+        hasNextPage: false,
+        endCursor: null
+      }
+    }),
+    placeInstantOrder: (subscriptionId, requestKey, items) => adapter.placeInstantOrder ? adapter.placeInstantOrder({ subscriptionId, requestKey, items }) : (
+      // Distinguishable from every server-side refusal, so a consumer can
+      // treat "this host cannot do instant orders" as a missing capability
+      // rather than telling the customer their order was declined.
+      Promise.resolve({
+        _tag: "Failure",
+        error: { kind: "UNSUPPORTED" }
+      })
+    )
   };
   return service;
 }
+function isOneTimeLine(line) {
+  return line.isOneTime === true || line.recurringCycleLimit === 1;
+}
+function hasValue(value) {
+  return typeof value === "string" && value.length > 0;
+}
+function hasIdentity(line) {
+  return hasValue(line.subscriptionId) && hasValue(line.subscriptionLineId);
+}
+function isSameLine(a2, b3) {
+  return hasValue(a2.subscriptionLineId) && a2.subscriptionLineId === b3.subscriptionLineId;
+}
+function belongsToSameSubscription(a2, b3) {
+  return hasValue(a2.subscriptionId) && a2.subscriptionId === b3.subscriptionId;
+}
+function parentLineFor(child, lines) {
+  if (!hasValue(child.parentLineId)) {
+    return void 0;
+  }
+  return lines.find(
+    (candidate) => belongsToSameSubscription(candidate, child) && (candidate.subscriptionLineId === child.parentLineId || candidate.id === child.parentLineId)
+  );
+}
+function productKey(line, lines) {
+  if (hasValue(line.parentProductId)) {
+    return `product:${line.parentProductId}`;
+  }
+  if (hasValue(line.parentLineId)) {
+    const parent = parentLineFor(line, lines);
+    if (hasValue(parent == null ? void 0 : parent.productId)) {
+      return `product:${parent.productId}`;
+    }
+    return `line:${line.parentLineId}`;
+  }
+  const lineIdentity = hasValue(line.subscriptionLineId) ? line.subscriptionLineId : line.id;
+  if (!hasValue(lineIdentity)) {
+    return null;
+  }
+  const isReferencedAsParent = lines.some(
+    (candidate) => belongsToSameSubscription(candidate, line) && (hasValue(line.productId) && candidate.parentProductId === line.productId || hasValue(candidate.parentLineId) && (candidate.parentLineId === line.subscriptionLineId || candidate.parentLineId === line.id))
+  );
+  if (isReferencedAsParent && hasValue(line.productId)) {
+    return `product:${line.productId}`;
+  }
+  return `line:${lineIdentity}`;
+}
+function remainingRecurringProductKeys(line, lines) {
+  const removedProductKey = productKey(line, lines);
+  return new Set(
+    lines.filter(
+      (item) => belongsToSameSubscription(item, line) && !isOneTimeLine(item)
+    ).map((item) => productKey(item, lines)).filter((key) => key != null && key !== removedProductKey)
+  );
+}
+function canRemoveLine(line, lines) {
+  if (!hasIdentity(line)) {
+    return false;
+  }
+  const targetExists = lines.some(
+    (item) => belongsToSameSubscription(item, line) && isSameLine(item, line)
+  );
+  if (!targetExists) {
+    return false;
+  }
+  if (isOneTimeLine(line)) {
+    return true;
+  }
+  return remainingRecurringProductKeys(line, lines).size > 0;
+}
 function getDefaultBlockForAction(actionType, actionConfig, blockId) {
   const blockName = `action:${actionType}`;
   const definedBlocks = getDefinedBlocks();
@@ -4543,6 +4953,8 @@ export {
   PAYMENT_INSTRUMENT_TYPES,
   ProductServiceContext,
   RouterServiceContext,
+  SUPPORTED_UI_LANGUAGES,
+  SUPPORTED_UI_LANGUAGE_OPTIONS,
   SchedulesServiceContext,
   S as SelectedBlockContext,
   SettingsServiceContext,
@@ -4559,6 +4971,7 @@ export {
   c as backfillInstanceDefaults,
   b2 as buildGridLayout,
   j as buildLayoutCss,
+  canRemoveLine,
   canvasMode,
   clampRect,
   k2 as classifyRowDividers,
@@ -4612,6 +5025,7 @@ export {
   emitLayoutSetRects,
   q2 as expandFillLayoutDocument,
   findFreeRect,
+  fromV1Customer,
   getActiveSurfaceContext,
   getDefaultBlockForAction,
   getDefinedBlocks,
@@ -4629,6 +5043,8 @@ export {
   insertRectRelative,
   H as isEditorPreview,
   isFilterQuery,
+  isOneTimeLine,
+  isStaleSubscriptionMessage,
   b as isStubDefinition,
   t2 as layoutScopeSelector,
   I as layoutSystemEnabled,
@@ -4654,6 +5070,7 @@ export {
   l as setLayoutSystemEnabled,
   d as signal,
   subscribeContext,
+  toLanguageSelectOptions,
   L as untracked,
   waitForDevBlocksUrl,
   w2 as withWrapper

package/dist/{css-runtime-B7tZrBIp.js → css-runtime-CjZl0K48.js}

@@ -51,12 +51,16 @@ function parseBlockLocaleFile(file) {
     }
   };
 }
-function indexOverrides(overrides) {
+function indexOverrides(overrides, locale) {
   const indexed = {
     theme: {},
     blocks: {}
   };
+  const wanted = locale == null ? null : normalizeLocale(locale);
   for (const item of overrides) {
+    if (wanted != null && normalizeLocale(item.locale) !== wanted) {
+      continue;
+    }
     if (item.scope.kind === "theme") {
       indexed.theme[item.key] = item.value;
       continue;
@@ -122,29 +126,31 @@ function createThemeState(deps) {
     }
     return { defaults: nextDefaults, modes: nextModes };
   }
+  let localeVersion = 0;
   async function setLocale(nextLocaleRaw) {
     var _a2;
     const nextLocale = normalizeLocale(nextLocaleRaw);
+    const version = ++localeVersion;
     const [blockData, loadedOverrides] = await Promise.all([
       collectBlockDefaults(nextLocale),
       ((_a2 = deps.translations) == null ? void 0 : _a2.resolveTranslations(nextLocale).catch(() => [])) ?? Promise.resolve([])
     ]);
-    const overrides = loadedOverrides.filter(
-      (item) => normalizeLocale(item.locale) === nextLocale
-    );
-    const indexed = indexOverrides(overrides);
-    catalogs.value = {
-      theme: {
-        defaults: {},
-        overrides: indexed.theme
-      },
-      blocks: {
-        defaults: blockData.defaults,
-        modes: blockData.modes,
-        overrides: indexed.blocks
-      }
-    };
-    locale.value = nextLocale;
+    if (version !== localeVersion) return;
+    const indexed = indexOverrides(loadedOverrides, nextLocale);
+    r(() => {
+      catalogs.value = {
+        theme: {
+          defaults: {},
+          overrides: indexed.theme
+        },
+        blocks: {
+          defaults: blockData.defaults,
+          modes: blockData.modes,
+          overrides: indexed.blocks
+        }
+      };
+      locale.value = nextLocale;
+    });
   }
   async function resolve(surface, path, params) {
     var _a2, _b, _c, _d, _e, _f, _g, _h;

package/dist/editor/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/editor/handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAKL,KAAK,UAAU,EAEhB,MAAM,aAAa,CAAC;AAGrB,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CACrD;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB;6BAsE/B,aAAa;EAgU9C"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/editor/handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAKL,KAAK,UAAU,EAEhB,MAAM,aAAa,CAAC;AAGrB,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CACrD;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB;6BAsE/B,aAAa;EA0U9C"}

package/dist/editor.js

@@ -82,7 +82,10 @@ function createEditorHandler(options) {
       const catalogs = themeState.locales.catalogs;
       const current = catalogs.value;
       if (current == null) return;
-      const indexed = indexOverrides(message.payload.overrides);
+      const indexed = indexOverrides(
+        message.payload.overrides,
+        themeState.locales.locale.value
+      );
       catalogs.value = {
         ...current,
         theme: {

package/dist/{gridstack-adapter-BGKGC-eO.js → gridstack-adapter-C1Q8gbsH.js}

@@ -1,5 +1,5 @@
-import { c as reconcileLayout, L as LAYOUT_SCOPE_ATTR, M as MAX_BLOCKS_PER_ROW } from "./css-runtime-B7tZrBIp.js";
-import { r as resolveActiveBreakpoint, p as projectToGridStack, M as MIN_BLOCK_ROWS, a as MIN_BLOCK_PX } from "./project-gridstack-PxN_DIfP.js";
+import { c as reconcileLayout, L as LAYOUT_SCOPE_ATTR, M as MAX_BLOCKS_PER_ROW } from "./css-runtime-CjZl0K48.js";
+import { r as resolveActiveBreakpoint, p as projectToGridStack, M as MIN_BLOCK_ROWS, a as MIN_BLOCK_PX } from "./project-gridstack-CRZ_7HoT.js";
 import { LAYOUT_POP_CLASS, LAYOUT_INTERACTION_START, LAYOUT_INTERACTION_END } from "./layout-mode-adapter-BBd4JRQd.js";
 function obsolete(self, f, oldName, newName, rev) {
   const wrapper = (...args) => {