@pixldocs/canvas-renderer 0.5.82 → 0.5.84

package/dist/index.cjs

@@ -494,29 +494,39 @@ function resolveStackGroupEffectivePositions(group, pageChildren, options) {
   const mode = group.layoutMode ?? "absolute";
   if (!isStackLayoutMode(mode)) return /* @__PURE__ */ new Map();
   const gap = group.stackSpacing ?? 8;
+  const padTop = group.paddingTop ?? 0;
+  const padLeft = group.paddingLeft ?? 0;
   const kids = group.children ?? [];
   const out = /* @__PURE__ */ new Map();
   if (isVerticalStackLayoutMode(mode)) {
-    let prevBottom = 0;
+    let prevBottom = padTop;
+    let firstSeen = false;
     for (let i = 0; i < kids.length; i++) {
       const child = kids[i];
       const storedTop = getNodeTop(child);
       const storedLeft = getNodeLeft(child);
-      const effectiveTop = i === 0 ? storedTop : prevBottom + gap + storedTop;
-      out.set(child.id, { top: effectiveTop, left: storedLeft });
+      const mTop = child.marginTop ?? 0;
+      const mLeft = child.marginLeft ?? 0;
+      const effectiveTop = !firstSeen ? padTop + storedTop + mTop : prevBottom + gap + storedTop + mTop;
+      firstSeen = true;
+      out.set(child.id, { top: effectiveTop, left: padLeft + storedLeft + mLeft });
       const h = getNodeBounds(child, pageChildren).height;
-      prevBottom = effectiveTop + h;
+      prevBottom = effectiveTop + h + (child.marginBottom ?? 0);
     }
   } else {
-    let prevRight = 0;
+    let prevRight = padLeft;
+    let firstSeen = false;
     for (let i = 0; i < kids.length; i++) {
       const child = kids[i];
       const storedLeft = getNodeLeft(child);
       const storedTop = getNodeTop(child);
-      const effectiveLeft = i === 0 ? storedLeft : prevRight + gap + storedLeft;
-      out.set(child.id, { top: storedTop, left: effectiveLeft });
+      const mTop = child.marginTop ?? 0;
+      const mLeft = child.marginLeft ?? 0;
+      const effectiveLeft = !firstSeen ? padLeft + storedLeft + mLeft : prevRight + gap + storedLeft + mLeft;
+      firstSeen = true;
+      out.set(child.id, { top: padTop + storedTop + mTop, left: effectiveLeft });
       const w = getNodeBounds(child, pageChildren).width;
-      prevRight = effectiveLeft + w;
+      prevRight = effectiveLeft + w + (child.marginRight ?? 0);
     }
   }
   return out;
@@ -541,6 +551,14 @@ function groupBoundsFromChildren(group, pageChildren, options) {
     maxX = Math.max(maxX, cl + b.width);
     maxY = Math.max(maxY, ct + b.height);
   }
+  if (isStack) {
+    const padRight = group.paddingRight ?? 0;
+    const padBottom = group.paddingBottom ?? 0;
+    return {
+      width: Math.max(1, maxX + padRight),
+      height: Math.max(1, maxY + padBottom)
+    };
+  }
   return {
     width: Math.max(1, maxX - minX),
     height: Math.max(1, maxY - minY)
@@ -603,7 +621,7 @@ function absoluteToStorePosition(absoluteLeft, absoluteTop, nodeId, pageChildren
   const prev = kids[idx - 1];
   const prevResolved = resolved.get(prev.id);
   const prevHeight = getNodeBounds(prev, pageChildren).height;
-  const prevBottom = prevResolved ? prevResolved.top + prevHeight : 0;
+  const prevBottom = prevResolved ? prevResolved.top + prevHeight + (prev.marginBottom ?? 0) : 0;
   const storeTop = inParentTop - prevBottom - gap;
   return { left: storeLeft, top: Math.max(0, storeTop) };
 }
@@ -625,7 +643,7 @@ function reflowStackGroup(group, pageChildren, spacing) {
       const b = getNodeBounds(child, pageChildren);
       const currentTop = getNodeTop(child);
       const effectiveTop = i === 0 ? currentTop : prevBottom + gap;
-      prevBottom = effectiveTop + b.height;
+      prevBottom = effectiveTop + b.height + (child.marginBottom ?? 0);
       if (i > 0) updates.set(child.id, { top: 0, left: firstLeft });
     }
   } else {
@@ -636,7 +654,7 @@ function reflowStackGroup(group, pageChildren, spacing) {
       const b = getNodeBounds(child, pageChildren);
       const currentLeft = getNodeLeft(child);
       const effectiveLeft = i === 0 ? currentLeft : prevRight + gap;
-      prevRight = effectiveLeft + b.width;
+      prevRight = effectiveLeft + b.width + (child.marginRight ?? 0);
       if (i > 0) updates.set(child.id, { left: 0, top: firstTop });
     }
   }
@@ -788,7 +806,8 @@ const cloneCanvas = (canvas) => ({
   themeConfig: canvas.themeConfig ? {
     properties: canvas.themeConfig.properties.map((p) => ({ ...p })),
     variants: canvas.themeConfig.variants.map((v) => ({ ...v, values: { ...v.values } }))
-  } : void 0
+  } : void 0,
+  pdfTextMode: canvas.pdfTextMode
 });
 const sameIdSet = (a, b) => {
   if (a.length !== b.length) return false;
@@ -1268,6 +1287,12 @@ const useEditorStore = zustand.create((set, get) => ({
     const committed = commitFromState(state, nextCanvas);
     return { canvas: nextCanvas, ...committed };
   }),
+  setPdfTextMode: (mode) => set((state) => {
+    if (state.canvas.pdfTextMode === mode) return {};
+    const nextCanvas = { ...state.canvas, pdfTextMode: mode };
+    const committed = commitFromState(state, nextCanvas);
+    return { canvas: nextCanvas, ...committed };
+  }),
   setZoom: (zoom) => set((state) => ({
     canvas: { ...state.canvas, zoom: Math.max(0.1, Math.min(10, zoom)) }
   })),
@@ -1671,7 +1696,7 @@ const useEditorStore = zustand.create((set, get) => ({
     const themeConfig = state.canvas.themeConfig ?? createEmptyThemeConfig();
     if (themeConfig.properties.some((p) => p.id === property.id)) return {};
     const updatedProperties = [...themeConfig.properties, property];
-    const updatedVariants = themeConfig.variants.map(
+    const updatedVariants = property.linkedTo ? themeConfig.variants : themeConfig.variants.map(
       (v) => v.isDefault ? { ...v, values: { ...v.values, [property.id]: currentValue } } : v
     );
     const nextCanvas = {
@@ -1697,9 +1722,17 @@ const useEditorStore = zustand.create((set, get) => ({
   removeThemeProperty: (propertyId) => set((state) => {
     const themeConfig = state.canvas.themeConfig;
     if (!themeConfig) return {};
-    const updatedProperties = themeConfig.properties.filter((p) => p.id !== propertyId);
+    const linkedChildren = themeConfig.properties.filter((p) => p.linkedTo === propertyId);
+    const updatedProperties = themeConfig.properties.filter((p) => p.id !== propertyId).map((p) => p.linkedTo === propertyId ? { ...p, linkedTo: void 0 } : p);
     const updatedVariants = themeConfig.variants.map((v) => {
-      const { [propertyId]: _, ...rest } = v.values;
+      const { [propertyId]: removedValue, ...rest } = v.values;
+      if (linkedChildren.length && removedValue !== void 0) {
+        const seeded = { ...rest };
+        for (const child of linkedChildren) {
+          if (seeded[child.id] === void 0) seeded[child.id] = removedValue;
+        }
+        return { ...v, values: seeded };
+      }
       return { ...v, values: rest };
     });
     const nextCanvas = {
@@ -1773,7 +1806,7 @@ const useEditorStore = zustand.create((set, get) => ({
     const PAGE_BG_ID = "__pageBackground__";
     let updatedPages = [...state.canvas.pages];
     for (const prop of themeConfig.properties) {
-      const value = variant.values[prop.id];
+      const value = variant.values[prop.linkedTo ?? prop.id];
       if (value === void 0) continue;
       if (prop.elementId === PAGE_BG_ID) {
         if (prop.targetProperty === "backgroundColor") {
@@ -1996,19 +2029,7 @@ const useEditorStore = zustand.create((set, get) => ({
     } else {
       newCollapsedSet.add(groupId);
     }
-    const currentPage = getCurrentPageFromCanvas(state.canvas);
-    let nextCanvas = state.canvas;
-    const group = findNodeById(currentPage.children, groupId);
-    if (group && isGroup(group)) {
-      nextCanvas = updateCurrentPageChildren(
-        nextCanvas,
-        (children) => updateNodeInTree(children, groupId, { collapsed: !isCollapsed })
-      );
-    }
-    return {
-      collapsedGroups: newCollapsedSet,
-      canvas: nextCanvas
-    };
+    return { collapsedGroups: newCollapsedSet };
   }),
   // Convenience aliases
   groupElements: (ids, name) => get().groupNodes(ids, name),
@@ -2455,7 +2476,8 @@ const useEditorStore = zustand.create((set, get) => ({
       formBindingMode: config.formBindingMode,
       boundFormDefId: config.boundFormDefId,
       boundFormDefName: config.boundFormDefName,
-      themeConfig: config.themeConfig ?? void 0
+      themeConfig: config.themeConfig ?? void 0,
+      pdfTextMode: config.pdfTextMode ?? "selectable"
     };
     const committed = commitFromState(state, nextCanvas);
     const out = {
@@ -4922,7 +4944,9 @@ function extractTextBgConfig(element) {
       if (!Number.isFinite(n)) return void 0;
       return Math.max(0, Math.min(1, n));
     })(),
-    shadowAffectsBg: element.textShadowAffectsBg !== false
+    shadowAffectsBg: element.textShadowAffectsBg !== false,
+    shadowAffectsText: element.textShadowAffectsText !== false,
+    fitToText: element.textBgFitToText === true
   };
 }
 function hasTextBackground(cfg) {
@@ -4978,10 +5002,6 @@ function applyTextBackground(obj, cfg) {
       const pR = Math.max(0, Number(bg.padRight ?? 0));
       const pB = Math.max(0, Number(bg.padBottom ?? 0));
       const pL = Math.max(0, Number(bg.padLeft ?? 0));
-      const x = -w / 2 - pL;
-      const y = -h / 2 - pT;
-      const bgW = w + pL + pR;
-      const bgH = h + pT + pB;
       ctx.save();
       const suppressShadowOnBg = bg.shadowAffectsBg === false;
       if (suppressShadowOnBg) {
@@ -4990,24 +5010,38 @@ function applyTextBackground(obj, cfg) {
         ctx.shadowOffsetX = 0;
         ctx.shadowOffsetY = 0;
       }
-      buildRoundedRectPath2D(
-        ctx,
-        x,
-        y,
-        bgW,
-        bgH,
-        bg.rxTL ?? 0,
-        bg.rxTR ?? 0,
-        bg.rxBR ?? 0,
-        bg.rxBL ?? 0
-      );
       const op = typeof bg.opacity === "number" ? Math.max(0, Math.min(1, bg.opacity)) : 1;
       if (op < 1) ctx.globalAlpha = (ctx.globalAlpha ?? 1) * op;
       ctx.fillStyle = bg.color;
-      ctx.fill();
+      const rects = computeBgRects(this, w, h, pT, pR, pB, pL, !!bg.fitToText);
+      for (const r of rects) {
+        buildRoundedRectPath2D(
+          ctx,
+          r.x,
+          r.y,
+          r.w,
+          r.h,
+          bg.rxTL ?? 0,
+          bg.rxTR ?? 0,
+          bg.rxBR ?? 0,
+          bg.rxBL ?? 0
+        );
+        ctx.fill();
+      }
+      ctx.restore();
+    }
+    const suppressShadowOnText = bg && bg.shadowAffectsText === false;
+    if (suppressShadowOnText) {
+      ctx.save();
+      ctx.shadowColor = "transparent";
+      ctx.shadowBlur = 0;
+      ctx.shadowOffsetX = 0;
+      ctx.shadowOffsetY = 0;
+      originalRender(ctx);
       ctx.restore();
+    } else {
+      originalRender(ctx);
     }
-    originalRender(ctx);
   };
   const originalToObject = obj.toObject.bind(obj);
   obj.toObject = function(propertiesToInclude) {
@@ -5033,20 +5067,18 @@ function applyTextBackground(obj, cfg) {
       const pR = Math.max(0, Number((bg == null ? void 0 : bg.padRight) ?? 0));
       const pB = Math.max(0, Number((bg == null ? void 0 : bg.padBottom) ?? 0));
       const pL = Math.max(0, Number((bg == null ? void 0 : bg.padLeft) ?? 0));
-      const x = -w / 2 - pL;
-      const y = -h / 2 - pT;
-      const bgW = w + pL + pR;
-      const bgH = h + pT + pB;
-      const bgD = buildRoundedRectPathD(
-        x,
-        y,
-        bgW,
-        bgH,
+      const fit = !!(bg == null ? void 0 : bg.fitToText);
+      const rects = computeBgRects(this, w, h, pT, pR, pB, pL, fit);
+      const bgD = rects.map((r) => buildRoundedRectPathD(
+        r.x,
+        r.y,
+        r.w,
+        r.h,
         (bg == null ? void 0 : bg.rxTL) ?? 0,
         (bg == null ? void 0 : bg.rxTR) ?? 0,
         (bg == null ? void 0 : bg.rxBR) ?? 0,
         (bg == null ? void 0 : bg.rxBL) ?? 0
-      );
+      )).join(" ");
       const bgFill = (bg == null ? void 0 : bg.color) || "";
       const bgOpacity = typeof (bg == null ? void 0 : bg.opacity) === "number" ? Math.max(0, Math.min(1, bg.opacity)) : 1;
       const bgOpacityAttr = bgOpacity < 1 ? ` fill-opacity="${bgOpacity}"` : "";
@@ -5071,9 +5103,11 @@ function applyTextBackground(obj, cfg) {
           const shadowBgPath = `<path d="${bgD}" fill="${escapeXmlAttr(shadowColor)}" />`;
           bgShadowMarker = wrapShadow(shadowBgPath);
         }
-        const inner = extractGInnerMarkup(svg);
-        const recoloredText = recolorSvgFills(inner, shadowColor);
-        if (recoloredText) textShadowMarker = wrapShadow(recoloredText);
+        if ((bg == null ? void 0 : bg.shadowAffectsText) !== false) {
+          const inner = extractGInnerMarkup(svg);
+          const recoloredText = recolorSvgFills(inner, shadowColor);
+          if (recoloredText) textShadowMarker = wrapShadow(recoloredText);
+        }
       }
       const openTagMatch = svg.match(/^\s*<g\b[^>]*>/);
       const inserted = bgShadowMarker + bgPath + textShadowMarker;
@@ -5124,6 +5158,74 @@ function buildRoundedRectPathD(x, y, w, h, rTL, rTR, rBR, rBL) {
   parts.push("Z");
   return parts.join(" ");
 }
+function computeBgRects(obj, w, h, pT, pR, pB, pL, fit) {
+  var _a;
+  if (!fit) {
+    return [{
+      x: -w / 2 - pL,
+      y: -h / 2 - pT,
+      w: w + pL + pR,
+      h: h + pT + pB
+    }];
+  }
+  const lines = (obj == null ? void 0 : obj._textLines) ?? [];
+  if (!lines || lines.length === 0) {
+    return [{
+      x: -w / 2 - pL,
+      y: -h / 2 - pT,
+      w: w + pL + pR,
+      h: h + pT + pB
+    }];
+  }
+  const rects = [];
+  const halfW = w / 2;
+  const halfH = h / 2;
+  const lineHeightRatio = Math.max(0.01, Number((obj == null ? void 0 : obj.lineHeight) ?? 1) || 1);
+  let cursorY = -halfH;
+  for (let i = 0; i < lines.length; i++) {
+    let lineW = 0;
+    let lineLeft = 0;
+    let lineH = 0;
+    try {
+      lineW = obj.getLineWidth(i) || 0;
+    } catch {
+      lineW = 0;
+    }
+    try {
+      lineLeft = ((_a = obj._getLineLeftOffset) == null ? void 0 : _a.call(obj, i)) ?? 0;
+    } catch {
+      lineLeft = 0;
+    }
+    try {
+      lineH = obj.getHeightOfLine(i) || 0;
+    } catch {
+      lineH = 0;
+    }
+    const rawSlotH = i === lines.length - 1 ? lineH / lineHeightRatio : lineH;
+    const usedH = cursorY + halfH;
+    const slotH = Math.max(0, Math.min(rawSlotH, h - usedH));
+    if (lineW <= 0 || slotH <= 0) {
+      cursorY += slotH;
+      continue;
+    }
+    rects.push({
+      x: -halfW + lineLeft - pL,
+      y: cursorY - pT,
+      w: lineW + pL + pR,
+      h: slotH + pT + pB
+    });
+    cursorY += slotH;
+  }
+  if (rects.length === 0) {
+    return [{
+      x: -w / 2 - pL,
+      y: -h / 2 - pT,
+      w: w + pL + pR,
+      h: h + pT + pB
+    }];
+  }
+  return rects;
+}
 function escapeXmlAttr(s) {
   return String(s).replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
@@ -8143,10 +8245,14 @@ const PageCanvas = react.forwardRef(
                   tr: element.textBgRxTR ?? 0,
                   br: element.textBgRxBR ?? 0,
                   bl: element.textBgRxBL ?? 0,
+                  ft: element.textBgFitToText === true,
+                  bo: element.textBgOpacity ?? 1,
                   sc: element.textShadowColor ?? null,
                   sb: element.textShadowBlur ?? 0,
                   sx: element.textShadowOffsetX ?? 0,
-                  sy: element.textShadowOffsetY ?? 0
+                  sy: element.textShadowOffsetY ?? 0,
+                  st: element.textShadowAffectsText !== false,
+                  sa: element.textShadowAffectsBg !== false
                 }) !== (existingObj.__lastTextBgShadowJson ?? "") || // CRITICAL: Detect gradient fill/stroke changes — serialise to JSON for deep comparison
                 JSON.stringify(element.fillGradient || null) !== (existingObj.__lastFillGradientJson ?? "null") || JSON.stringify(element.strokeGradient || null) !== (existingObj.__lastStrokeGradientJson ?? "null");
                 const forceApplyFromPanel = syncTriggeredByPanelRef.current;
@@ -9060,10 +9166,14 @@ const PageCanvas = react.forwardRef(
             tr: element.textBgRxTR ?? 0,
             br: element.textBgRxBR ?? 0,
             bl: element.textBgRxBL ?? 0,
+            ft: element.textBgFitToText === true,
+            bo: element.textBgOpacity ?? 1,
             sc: element.textShadowColor ?? null,
             sb: element.textShadowBlur ?? 0,
             sx: element.textShadowOffsetX ?? 0,
-            sy: element.textShadowOffsetY ?? 0
+            sy: element.textShadowOffsetY ?? 0,
+            st: element.textShadowAffectsText !== false,
+            sa: element.textShadowAffectsBg !== false
           });
           obj.dirty = true;
         } catch (err) {
@@ -10186,7 +10296,8 @@ function formDefSectionsToInferred(schemaSections, repeatableNodeMap) {
           })),
           // Honor minEntries: 0 — start with no entries, user adds via "+ Add" button.
           initialEntryCount: minEntries,
-          parentId
+          parentId,
+          entryNameFieldKey: def.entryNameFieldKey
         };
         if (treeNodeId) section.treeNodeId = treeNodeId;
         sections.push(section);
@@ -10631,6 +10742,26 @@ function baseId(id) {
 const REPEATABLE_KEY_REGEX = /^field_(.+)_(\d+)_(.+)$/;
 const NESTED_REPEATABLE_KEY_REGEX = /^field_(.+)_(\d+)_field_(.+)_(\d+)_(.+)$/;
 const FORMDEF_CANONICAL_KEY_REGEX = /^field_.+_N_.+$/;
+function parseEntryRange(range, max) {
+  if (!range || !range.trim()) return null;
+  const out = /* @__PURE__ */ new Set();
+  for (const partRaw of range.split(",")) {
+    const part = partRaw.trim();
+    if (!part) continue;
+    if (/^\d+$/.test(part)) {
+      const n = parseInt(part, 10);
+      if (n >= 1 && n <= max) out.add(n);
+      continue;
+    }
+    const m = /^(\d*)\s*-\s*(\d*)$/.exec(part);
+    if (!m) continue;
+    const start = m[1] === "" ? 1 : Math.max(1, parseInt(m[1], 10));
+    const end = m[2] === "" ? max : Math.min(max, parseInt(m[2], 10));
+    for (let i = start; i <= end; i++) out.add(i);
+  }
+  if (out.size === 0) return null;
+  return Array.from(out).sort((a, b) => a - b);
+}
 function applyTextCase(text, textCase) {
   if (!textCase || textCase === "none") return text;
   switch (textCase) {
@@ -10709,13 +10840,19 @@ function findElementBySourceIdInSubtree(nodes, sourceId) {
   }
   return void 0;
 }
-function findRepeatableElementBySourceId(pages, baseNodeId, oneBasedIndex, sourceElementId) {
+function findAllRepeatableElementsBySourceId(pages, baseNodeId, oneBasedIndex, sourceElementId, expectedEntriesPerOccurrence) {
   var _a;
   const groups = collectGroupsByBaseId(pages, baseNodeId);
-  const group = groups[oneBasedIndex - 1];
-  if (!group) return void 0;
-  if (!isGroup(group) || !((_a = group.children) == null ? void 0 : _a.length)) return void 0;
-  return findElementBySourceIdInSubtree(group.children, sourceElementId) ?? (group.__sourceId === sourceElementId ? group.id : void 0);
+  if (!groups.length) return [];
+  const N = Math.max(1, expectedEntriesPerOccurrence ?? groups.length);
+  const out = [];
+  for (let occStart = 0; occStart < groups.length; occStart += N) {
+    const group = groups[occStart + (oneBasedIndex - 1)];
+    if (!group || !isGroup(group) || !((_a = group.children) == null ? void 0 : _a.length)) continue;
+    const found = findElementBySourceIdInSubtree(group.children, sourceElementId) ?? (group.__sourceId === sourceElementId ? group.id : void 0);
+    if (found) out.push(found);
+  }
+  return out;
 }
 function findNestedRepeatableElementBySourceId(pages, parentBaseNodeId, parentPi, childBaseNodeId, childCi, sourceElementId) {
   var _a, _b;
@@ -10736,6 +10873,24 @@ function findNestedRepeatableElementBySourceId(pages, parentBaseNodeId, parentPi
   if (!childGroup || !isGroup(childGroup) || !((_b = childGroup.children) == null ? void 0 : _b.length)) return void 0;
   return findElementBySourceIdInSubtree(childGroup.children, sourceElementId) ?? (childGroup.__sourceId === sourceElementId ? childGroup.id : void 0);
 }
+function repeatableLabelKey(label) {
+  return String(label ?? "").trim().toLowerCase();
+}
+function repeatableLabelSlug(label) {
+  return repeatableLabelKey(label).replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+}
+function addToSetMap(map, key, value) {
+  if (!key || !value) return;
+  const set = map.get(key);
+  if (set) set.add(value);
+  else map.set(key, /* @__PURE__ */ new Set([value]));
+}
+function getFieldKeyAliases(fieldId) {
+  const aliases = /* @__PURE__ */ new Set([fieldId]);
+  const canonicalParts = fieldId.split("_N_");
+  if (canonicalParts.length > 1) aliases.add(canonicalParts[canonicalParts.length - 1]);
+  return Array.from(aliases).filter(Boolean);
+}
 function idPrefix(node) {
   if (isGroup(node)) return "group";
   const t = node.type;
@@ -10789,7 +10944,7 @@ function findRepeatableByNodeIds(pages, nodeIds) {
     var _a2;
     return !!((_a2 = n.repeatableSection) == null ? void 0 : _a2.label);
   };
-  function walk(children, parentRepeatableBaseId, parentInfo) {
+  function walk(children, parentRepeatableBaseId, parentInfo, parentRepeatableEntryIndex) {
     var _a2, _b;
     if (!Array.isArray(children)) return;
     for (let i = 0; i < children.length; i++) {
@@ -10803,7 +10958,7 @@ function findRepeatableByNodeIds(pages, nodeIds) {
           const childBaseFromMeta = child.__baseNodeId;
           const isMatch = schemaBaseIds.has(child.id) || schemaBaseIds.has(childBase) || childBaseFromMeta != null && schemaBaseIds.has(childBaseFromMeta);
           if (!isMatch) {
-            if (isGroup(child) && Array.isArray(child.children)) walk(child.children, parentRepeatableBaseId);
+            if (isGroup(child) && Array.isArray(child.children)) walk(child.children, parentRepeatableBaseId, void 0, parentRepeatableEntryIndex);
             j++;
             continue;
           }
@@ -10826,17 +10981,22 @@ function findRepeatableByNodeIds(pages, nodeIds) {
             count,
             node: child,
             baseNodeId: childBaseFromMeta ?? childBase,
-            parentBaseNodeId: parentRepeatableBaseId
+            parentBaseNodeId: parentRepeatableBaseId,
+            parentEntryIndex: parentRepeatableEntryIndex
           });
-          if (isGroup(child) && Array.isArray(child.children)) walk(child.children, childBase);
+          const childEntryIndex = child.__repeatableEntryIndex;
+          if (isGroup(child) && Array.isArray(child.children)) walk(child.children, effectiveChildBase, void 0, childEntryIndex);
           j += count;
         }
       } else if (isGroup(node) && ((_b = node.children) == null ? void 0 : _b.length)) {
         const nodeBase = baseId(node.id);
         const selfMatch = schemaBaseIds.has(node.id) || schemaBaseIds.has(nodeBase) || node.__baseNodeId != null && schemaBaseIds.has(node.__baseNodeId);
-        if (selfMatch && hasRepeatableSection(node)) {
+        const isSelfRepeatable = selfMatch && hasRepeatableSection(node);
+        let matchedSelfBase;
+        if (selfMatch) matchedSelfBase = node.__baseNodeId ?? nodeBase;
+        if (isSelfRepeatable) {
           let count = 1;
-          const effectiveBase = node.__baseNodeId ?? nodeBase;
+          const effectiveBase = matchedSelfBase ?? nodeBase;
           if (node.id !== nodeBase && node.id !== effectiveBase) {
             while (i + count < children.length) {
               const next = children[i + count];
@@ -10853,10 +11013,12 @@ function findRepeatableByNodeIds(pages, nodeIds) {
             count,
             node,
             baseNodeId: effectiveBase,
-            parentBaseNodeId: parentRepeatableBaseId
+            parentBaseNodeId: parentRepeatableBaseId,
+            parentEntryIndex: parentRepeatableEntryIndex
           });
         }
-        walk(node.children, parentRepeatableBaseId);
+        const nodeEntryIndex = node.__repeatableEntryIndex;
+        walk(node.children, matchedSelfBase ?? parentRepeatableBaseId, void 0, nodeEntryIndex ?? parentRepeatableEntryIndex);
       }
     }
   }
@@ -10915,7 +11077,7 @@ function getNestedRepeatableEntryCount(parentId, parentIndex, childId, formValue
   return Math.max(1, maxIndex);
 }
 function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsFromSchema, repeatableEntryCounts, repeatableNestedEntryCounts, displayFormatMap, repeatablePagesFromSchema) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c;
   const cloned = JSON.parse(JSON.stringify(config));
   if (!cloned.pages) return cloned;
   const dynamicFields = cloned.dynamicFields;
@@ -10965,17 +11127,56 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
   }
   const repeatableList = (repeatableSectionsFromSchema == null ? void 0 : repeatableSectionsFromSchema.length) ? repeatableSectionsFromSchema : getRepeatableFromConfig(pages);
   const nodeIds = repeatableList.map((r) => r.nodeId);
+  const repeatableBasesByLabel = /* @__PURE__ */ new Map();
+  for (const r of repeatableList) {
+    const base = baseId(r.nodeId);
+    addToSetMap(repeatableBasesByLabel, repeatableLabelKey(r.label), base);
+    addToSetMap(repeatableBasesByLabel, repeatableLabelSlug(r.label), base);
+  }
+  const repeatableTokenToBaseIds = /* @__PURE__ */ new Map();
+  for (const r of repeatableList) {
+    const base = baseId(r.nodeId);
+    const labelBases = /* @__PURE__ */ new Set([
+      base,
+      ...repeatableBasesByLabel.get(repeatableLabelKey(r.label)) ?? [],
+      ...repeatableBasesByLabel.get(repeatableLabelSlug(r.label)) ?? []
+    ]);
+    for (const targetBase of labelBases) {
+      addToSetMap(repeatableTokenToBaseIds, base, targetBase);
+      addToSetMap(repeatableTokenToBaseIds, r.nodeId, targetBase);
+      addToSetMap(repeatableTokenToBaseIds, repeatableLabelKey(r.label), targetBase);
+      addToSetMap(repeatableTokenToBaseIds, repeatableLabelSlug(r.label), targetBase);
+    }
+  }
+  const getRepeatableBaseIdsForToken = (token) => {
+    const direct = repeatableTokenToBaseIds.get(token) ?? repeatableTokenToBaseIds.get(baseId(token));
+    return direct ? Array.from(direct) : [baseId(token)];
+  };
   const entryCountFromList = (baseNodeId) => {
     const item = repeatableList.find((r) => baseId(r.nodeId) === baseNodeId || r.nodeId === baseNodeId);
     return item == null ? void 0 : item.entryCount;
   };
+  const entryFilterFromList = (baseNodeId) => {
+    var _a2;
+    const item = repeatableList.find((r) => baseId(r.nodeId) === baseNodeId || r.nodeId === baseNodeId);
+    const filter = item == null ? void 0 : item.entryFilter;
+    return (filter == null ? void 0 : filter.mode) === "range" && ((_a2 = filter.range) == null ? void 0 : _a2.trim()) ? filter : void 0;
+  };
   const resolvedIdMap = /* @__PURE__ */ new Map();
+  const addResolved = (key, id) => {
+    const arr = resolvedIdMap.get(key);
+    if (arr) {
+      if (!arr.includes(id)) arr.push(id);
+    } else resolvedIdMap.set(key, [id]);
+  };
   const mappedNewIds = /* @__PURE__ */ new Set();
   const elementIdToFieldId = /* @__PURE__ */ new Map();
   if (dynamicFields == null ? void 0 : dynamicFields.length) {
     for (const f of dynamicFields) {
-      const elId = (_c = (_b = f.mappings) == null ? void 0 : _b[0]) == null ? void 0 : _c.elementId;
-      if (elId) elementIdToFieldId.set(elId, f.id);
+      for (const m of f.mappings ?? []) {
+        const elId = m == null ? void 0 : m.elementId;
+        if (elId) elementIdToFieldId.set(elId, f.id);
+      }
     }
   }
   const repeatableInfosFirst = findRepeatableByNodeIds(pages, nodeIds);
@@ -10988,37 +11189,90 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
   for (const r of nestedFirst) {
     if (r.parentBaseNodeId) nestedChildToParent.set(r.baseNodeId, r.parentBaseNodeId);
   }
+  const getNestedBasePairs = (parentToken, childToken) => {
+    const pairs = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const parentBaseId of getRepeatableBaseIdsForToken(parentToken)) {
+      for (const childBaseId of getRepeatableBaseIdsForToken(childToken)) {
+        const key = `${parentBaseId}::${childBaseId}`;
+        if (seen.has(key)) continue;
+        seen.add(key);
+        pairs.push({ parentBaseId, childBaseId });
+      }
+    }
+    return pairs.length ? pairs : [{ parentBaseId: baseId(parentToken), childBaseId: baseId(childToken) }];
+  };
+  const getNestedCountForBasePair = (parentBaseNodeId, parentIndex1Based, childBaseNodeId) => {
+    let maxCount = 0;
+    for (const { parentBaseId, childBaseId } of getNestedBasePairs(parentBaseNodeId, childBaseNodeId)) {
+      const aliasKey = `${parentBaseId}_${parentIndex1Based}_${childBaseId}`;
+      maxCount = Math.max(
+        maxCount,
+        (repeatableNestedEntryCounts == null ? void 0 : repeatableNestedEntryCounts[aliasKey]) ?? 0,
+        getNestedRepeatableEntryCount(parentBaseId, parentIndex1Based, childBaseId, formValues)
+      );
+    }
+    return Math.max(1, maxCount);
+  };
   const phase1NewToOriginal = /* @__PURE__ */ new Map();
-  const topLevelByBase = /* @__PURE__ */ new Map();
+  const entryCountByBase = /* @__PURE__ */ new Map();
+  [...topLevel].sort((a, b) => {
+    if (a.parentChildren !== b.parentChildren) return 0;
+    return b.startIndex - a.startIndex;
+  });
+  const occByParent = /* @__PURE__ */ new Map();
   for (const r of topLevel) {
-    if (!topLevelByBase.has(r.baseNodeId)) topLevelByBase.set(r.baseNodeId, []);
-    topLevelByBase.get(r.baseNodeId).push(r);
-  }
-  for (const [, blocks] of topLevelByBase) {
-    const first = blocks[0];
-    const startIndex = Math.min(...blocks.map((b) => b.startIndex));
-    const endIndex = Math.max(...blocks.map((b) => b.startIndex + b.count));
-    const count = endIndex - startIndex;
-    const { parentChildren, node, baseNodeId } = first;
+    if (!occByParent.has(r.parentChildren)) occByParent.set(r.parentChildren, []);
+    occByParent.get(r.parentChildren).push(r);
+  }
+  const computeN = (baseNodeId, sampleNodeId) => {
+    if (entryCountByBase.has(baseNodeId)) return entryCountByBase.get(baseNodeId);
     const countFromList = entryCountFromList(baseNodeId);
-    const countFromState = countFromList ?? (repeatableEntryCounts == null ? void 0 : repeatableEntryCounts[baseNodeId]) ?? (repeatableEntryCounts == null ? void 0 : repeatableEntryCounts[node.id]) ?? repeatableEntryCounts;
+    const countFromState = countFromList ?? (repeatableEntryCounts == null ? void 0 : repeatableEntryCounts[baseNodeId]) ?? (repeatableEntryCounts == null ? void 0 : repeatableEntryCounts[sampleNodeId]) ?? repeatableEntryCounts;
     const N = Math.max(1, countFromState ?? getRepeatableEntryCount(baseNodeId, formValues));
-    const clones = [];
-    for (let i = 1; i <= N; i++) {
-      const [clone, oldToNew] = cloneNodeWithNewIds$1(node, `${baseNodeId}_e${i}`);
-      delete clone.repeatableSection;
-      clones.push(clone);
-      const newToOriginal = /* @__PURE__ */ new Map();
-      for (const [oldId, newId] of oldToNew) {
-        resolvedIdMap.set(`${baseNodeId}_${i}_${oldId}`, newId);
-        newToOriginal.set(newId, oldId);
-        const fieldId = elementIdToFieldId.get(oldId);
-        if (fieldId) resolvedIdMap.set(`${baseNodeId}_${i}_${fieldId}`, newId);
-        mappedNewIds.add(newId);
-      }
-      phase1NewToOriginal.set(`${baseNodeId}_${i}`, newToOriginal);
-    }
-    parentChildren.splice(startIndex, count, ...clones);
+    entryCountByBase.set(baseNodeId, N);
+    return N;
+  };
+  const occurrenceIndexByBase = /* @__PURE__ */ new Map();
+  for (const r of topLevel) {
+    const idx = (occurrenceIndexByBase.get(r.baseNodeId) ?? 0) + 1;
+    occurrenceIndexByBase.set(r.baseNodeId, idx);
+    r.__occurrenceIndex = idx;
+  }
+  for (const [parentChildren, blocks] of occByParent) {
+    const sorted = [...blocks].sort((a, b) => b.startIndex - a.startIndex);
+    for (const block of sorted) {
+      const { node, baseNodeId, startIndex, count } = block;
+      const occIdx = block.__occurrenceIndex ?? 1;
+      const N = computeN(baseNodeId, node.id);
+      const entryFilter = ((_b = node.repeatableSection) == null ? void 0 : _b.entryFilter) ?? entryFilterFromList(baseNodeId);
+      let entryIndices;
+      if (entryFilter && entryFilter.mode === "range" && entryFilter.range) {
+        const parsed = parseEntryRange(entryFilter.range, N);
+        entryIndices = parsed && parsed.length ? parsed : Array.from({ length: N }, (_, k) => k + 1);
+      } else {
+        entryIndices = Array.from({ length: N }, (_, k) => k + 1);
+      }
+      const clones = [];
+      for (const i of entryIndices) {
+        const [clone, oldToNew] = cloneNodeWithNewIds$1(node, `${baseNodeId}_o${occIdx}_e${i}`);
+        clone.__repeatableEntryIndex = i;
+        delete clone.repeatableSection;
+        clones.push(clone);
+        const newToOriginal = /* @__PURE__ */ new Map();
+        for (const [oldId, newId] of oldToNew) {
+          addResolved(`${baseNodeId}_${i}_${oldId}`, newId);
+          newToOriginal.set(newId, oldId);
+          const fieldId = elementIdToFieldId.get(oldId);
+          if (fieldId) {
+            for (const alias of getFieldKeyAliases(fieldId)) addResolved(`${baseNodeId}_${i}_${alias}`, newId);
+          }
+          mappedNewIds.add(newId);
+        }
+        phase1NewToOriginal.set(`${baseNodeId}_${i}`, newToOriginal);
+      }
+      parentChildren.splice(startIndex, count, ...clones);
+    }
   }
   if (nestedChildToParent.size > 0) {
     const repeatableInfosSecond = findRepeatableByNodeIds(pages, nodeIds);
@@ -11031,25 +11285,41 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
     for (const [childBaseNodeId, blocks] of byChildBase) {
       const parentBaseNodeId = nestedChildToParent.get(childBaseNodeId);
       blocks.forEach((block, parentIndex0) => {
-        const parentIndex1Based = parentIndex0 + 1;
+        var _a2;
+        const parentIndex1Based = block.parentEntryIndex ?? parentIndex0 + 1;
         const { parentChildren, startIndex, count, node, baseNodeId } = block;
-        const nestedKey = `${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}`;
-        const N = Math.max(
-          1,
-          (repeatableNestedEntryCounts == null ? void 0 : repeatableNestedEntryCounts[nestedKey]) ?? getNestedRepeatableEntryCount(parentBaseNodeId, parentIndex1Based, baseNodeId, formValues)
-        );
+        const N = getNestedCountForBasePair(parentBaseNodeId, parentIndex1Based, baseNodeId);
         const phase1Map = phase1NewToOriginal.get(`${parentBaseNodeId}_${parentIndex1Based}`);
+        const nestedEntryFilter = ((_a2 = node.repeatableSection) == null ? void 0 : _a2.entryFilter) ?? entryFilterFromList(baseNodeId);
+        let nestedEntryIndices;
+        if (nestedEntryFilter && nestedEntryFilter.mode === "range" && nestedEntryFilter.range) {
+          const parsed = parseEntryRange(nestedEntryFilter.range, N);
+          nestedEntryIndices = parsed && parsed.length ? parsed : Array.from({ length: N }, (_, k) => k + 1);
+        } else {
+          nestedEntryIndices = Array.from({ length: N }, (_, k) => k + 1);
+        }
         const clones = [];
-        for (let i = 1; i <= N; i++) {
+        for (const i of nestedEntryIndices) {
           const [clone, oldToNew] = cloneNodeWithNewIds$1(node, `${parentBaseNodeId}_p${parentIndex1Based}_${baseNodeId}_e${i}`);
           delete clone.repeatableSection;
           clones.push(clone);
           for (const [oldId, newId] of oldToNew) {
             const originalId = (phase1Map == null ? void 0 : phase1Map.get(oldId)) ?? oldId;
-            resolvedIdMap.set(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${originalId}`, newId);
-            resolvedIdMap.set(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${oldId}`, newId);
+            addResolved(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${originalId}`, newId);
+            addResolved(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${oldId}`, newId);
+            for (const { parentBaseId, childBaseId } of getNestedBasePairs(parentBaseNodeId, baseNodeId)) {
+              addResolved(`${parentBaseId}_${parentIndex1Based}_${childBaseId}_${i}_${originalId}`, newId);
+              addResolved(`${parentBaseId}_${parentIndex1Based}_${childBaseId}_${i}_${oldId}`, newId);
+            }
             const fieldId = elementIdToFieldId.get(originalId) ?? elementIdToFieldId.get(oldId);
-            if (fieldId) resolvedIdMap.set(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${fieldId}`, newId);
+            if (fieldId) {
+              for (const alias of getFieldKeyAliases(fieldId)) {
+                addResolved(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${alias}`, newId);
+                for (const { parentBaseId, childBaseId } of getNestedBasePairs(parentBaseNodeId, baseNodeId)) {
+                  addResolved(`${parentBaseId}_${parentIndex1Based}_${childBaseId}_${i}_${alias}`, newId);
+                }
+              }
+            }
             mappedNewIds.add(newId);
           }
         }
@@ -11057,7 +11327,9 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
       });
     }
   }
-  cloned.__cloneIdMap = Object.fromEntries(resolvedIdMap);
+  cloned.__cloneIdMap = Object.fromEntries(
+    Array.from(resolvedIdMap.entries()).map(([k, v]) => [k, v.length === 1 ? v[0] : v])
+  );
   cloned.__mappedElementIds = Array.from(mappedNewIds);
   const fieldLabelByKey = /* @__PURE__ */ new Map();
   const fieldTypeByKey = /* @__PURE__ */ new Map();
@@ -11200,10 +11472,7 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
     }
     const byId = dynamicFields.find((f) => f.id === fieldId);
     if (byId) return byId;
-    const byElementId = dynamicFields.find((f) => {
-      var _a2, _b2;
-      return ((_b2 = (_a2 = f.mappings) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.elementId) === fieldId;
-    });
+    const byElementId = dynamicFields.find((f) => (f.mappings ?? []).some((m) => (m == null ? void 0 : m.elementId) === fieldId));
     if (byElementId) return byElementId;
     const suffixMatch = dynamicFields.find((f) => {
       if (f.id.endsWith(`_N_${fieldId}`)) return true;
@@ -11219,39 +11488,36 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
         const [, parentId, parentIndexStr, childId, childIndexStr, fieldId] = nestedMatch;
         const value = formValues[key];
         const field = getFieldForRepeatableKey(fieldId, key);
-        const mapping = (_d = field == null ? void 0 : field.mappings) == null ? void 0 : _d[0];
-        if (!mapping) continue;
-        const oldElementId = mapping.elementId;
-        const mapKeyByElement = `${baseId(parentId)}_${parentIndexStr}_${baseId(childId)}_${childIndexStr}_${oldElementId}`;
-        const mapKeyByField = `${baseId(parentId)}_${parentIndexStr}_${baseId(childId)}_${childIndexStr}_${fieldId}`;
-        let elementId = resolvedIdMap.get(mapKeyByElement) ?? resolvedIdMap.get(mapKeyByField);
-        if (!elementId) {
-          const mapKeyByElementBase = `${baseId(parentId)}_${parentIndexStr}_${baseId(childId)}_${childIndexStr}_${baseId(oldElementId)}`;
-          elementId = resolvedIdMap.get(mapKeyByElementBase);
-        }
-        if (!elementId) {
-          elementId = findNestedRepeatableElementBySourceId(
-            pages,
-            baseId(parentId),
-            parseInt(parentIndexStr, 10),
-            baseId(childId),
-            parseInt(childIndexStr, 10),
-            oldElementId
-          );
-        }
-        if (!elementId) {
-          elementId = findNestedRepeatableElementBySourceId(
-            pages,
-            baseId(parentId),
-            parseInt(parentIndexStr, 10),
-            baseId(childId),
-            parseInt(childIndexStr, 10),
-            baseId(oldElementId)
-          );
+        for (const mapping of (field == null ? void 0 : field.mappings) ?? []) {
+          const oldElementId = mapping.elementId;
+          const mapKeyByElement = `${baseId(parentId)}_${parentIndexStr}_${baseId(childId)}_${childIndexStr}_${oldElementId}`;
+          let elementIds = resolvedIdMap.get(mapKeyByElement);
+          if (!elementIds || elementIds.length === 0) {
+            const mapKeyByElementBase = `${baseId(parentId)}_${parentIndexStr}_${baseId(childId)}_${childIndexStr}_${baseId(oldElementId)}`;
+            elementIds = resolvedIdMap.get(mapKeyByElementBase);
+          }
+          if (!elementIds || elementIds.length === 0) {
+            const fallback = findNestedRepeatableElementBySourceId(
+              pages,
+              baseId(parentId),
+              parseInt(parentIndexStr, 10),
+              baseId(childId),
+              parseInt(childIndexStr, 10),
+              oldElementId
+            ) ?? findNestedRepeatableElementBySourceId(
+              pages,
+              baseId(parentId),
+              parseInt(parentIndexStr, 10),
+              baseId(childId),
+              parseInt(childIndexStr, 10),
+              baseId(oldElementId)
+            );
+            if (fallback) elementIds = [fallback];
+          }
+          if (!elementIds || elementIds.length === 0) continue;
+          const targetProperty = mapping.targetProperty || "text";
+          for (const elementId of elementIds) applyValue(elementId, targetProperty, value, key);
         }
-        if (!elementId) continue;
-        const targetProperty = mapping.targetProperty || "text";
-        applyValue(elementId, targetProperty, value, key);
       }
     }
   }
@@ -11274,18 +11540,29 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
       const [, nodeId, indexStr, fieldId] = match;
       const value = formValues[key];
       const field = getFieldForRepeatableKey(fieldId);
-      const mapping = (_e = field == null ? void 0 : field.mappings) == null ? void 0 : _e[0];
-      if (!mapping) continue;
-      const oldElementId = mapping.elementId;
-      const mapKeyByElement = `${baseId(nodeId)}_${indexStr}_${oldElementId}`;
-      const mapKeyByField = `${baseId(nodeId)}_${indexStr}_${fieldId}`;
-      let elementId = resolvedIdMap.get(mapKeyByElement) ?? resolvedIdMap.get(mapKeyByField);
-      if (!elementId) {
-        elementId = findRepeatableElementBySourceId(pages, baseId(nodeId), parseInt(indexStr, 10), oldElementId);
+      for (const mapping of (field == null ? void 0 : field.mappings) ?? []) {
+        const oldElementId = mapping.elementId;
+        const elementIds = /* @__PURE__ */ new Set();
+        for (const candidateBaseId of getRepeatableBaseIdsForToken(nodeId)) {
+          const mapKeyByElement = `${candidateBaseId}_${indexStr}_${oldElementId}`;
+          const foundByMap = resolvedIdMap.get(mapKeyByElement);
+          for (const id of foundByMap ?? []) elementIds.add(id);
+          if (!(foundByMap == null ? void 0 : foundByMap.length)) {
+            const N = entryCountByBase.get(candidateBaseId);
+            const found = findAllRepeatableElementsBySourceId(
+              pages,
+              candidateBaseId,
+              parseInt(indexStr, 10),
+              oldElementId,
+              N
+            );
+            for (const id of found) elementIds.add(id);
+          }
+        }
+        if (elementIds.size === 0) continue;
+        const targetProperty = mapping.targetProperty || "text";
+        for (const elementId of elementIds) applyValue(elementId, targetProperty, value, key);
       }
-      if (!elementId) continue;
-      const targetProperty = mapping.targetProperty || "text";
-      applyValue(elementId, targetProperty, value, key);
     }
   }
   const repeatableKeySet = new Set(
@@ -11338,7 +11615,7 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
     }
   }
   for (const page of pages) {
-    if ((_f = page.children) == null ? void 0 : _f.length) {
+    if ((_c = page.children) == null ? void 0 : _c.length) {
       page.children = applyStackReflowToPageTree(page.children);
     }
   }
@@ -12296,7 +12573,8 @@ function applyThemeVariantToConfig(config, themeConfig, themeId) {
   const cloneIdMap = config.__cloneIdMap || {};
   const pageElements = result.pages.map((page) => flattenAll(page.children || []));
   for (const prop of themeConfig.properties) {
-    const value = variant ? (_d = variant.values) == null ? void 0 : _d[prop.id] : prop.defaultValue;
+    const lookupId = prop.linkedTo || prop.id;
+    const value = variant ? (_d = variant.values) == null ? void 0 : _d[lookupId] : prop.defaultValue;
     if (value === void 0) continue;
     if (prop.targetProperty === "backgroundColor" && prop.elementId === "__pageBackground__") {
       result.pages.forEach((p) => {
@@ -14115,6 +14393,7 @@ async function fetchTTFAsBase64(url) {
     if (!res.ok) return null;
     const buf = await res.arrayBuffer();
     const bytes = new Uint8Array(buf);
+    if (!isJsPdfEmbeddableTrueType(bytes)) return null;
     let binary = "";
     for (let i = 0; i < bytes.length; i++) {
       binary += String.fromCharCode(bytes[i]);
@@ -14126,6 +14405,33 @@ async function fetchTTFAsBase64(url) {
     return null;
   }
 }
+function isJsPdfEmbeddableTrueType(bytes) {
+  if (bytes.length < 12) return false;
+  const signature = String.fromCharCode(bytes[0], bytes[1], bytes[2], bytes[3]);
+  if (signature !== "\0
\0\0" && signature !== "true") return false;
+  const u16 = (offset) => bytes[offset] << 8 | bytes[offset + 1];
+  const u32 = (offset) => (bytes[offset] << 24 | bytes[offset + 1] << 16 | bytes[offset + 2] << 8 | bytes[offset + 3]) >>> 0;
+  const tableCount = u16(4);
+  for (let i = 0; i < tableCount; i++) {
+    const recordOffset = 12 + i * 16;
+    if (recordOffset + 16 > bytes.length) return false;
+    const tag = String.fromCharCode(bytes[recordOffset], bytes[recordOffset + 1], bytes[recordOffset + 2], bytes[recordOffset + 3]);
+    if (tag !== "cmap") continue;
+    const cmapOffset = u32(recordOffset + 8);
+    const cmapLength = u32(recordOffset + 12);
+    if (cmapOffset + Math.min(cmapLength, 4) > bytes.length) return false;
+    const subtables = u16(cmapOffset + 2);
+    for (let j = 0; j < subtables; j++) {
+      const encOffset = cmapOffset + 4 + j * 8;
+      if (encOffset + 8 > bytes.length) return false;
+      const platform = u16(encOffset);
+      const encoding = u16(encOffset + 2);
+      if (platform === 0 || platform === 3 && (encoding === 1 || encoding === 10)) return true;
+    }
+    return false;
+  }
+  return false;
+}
 async function embedFont(pdf, fontName, weight, fontBaseUrl, isItalic = false) {
   const fontFiles = FONT_FILES[fontName];
   if (!fontFiles) return false;
@@ -15833,7 +16139,7 @@ async function assemblePdfFromSvgs(svgResults, options = {}) {
     }
     if (shouldOutlineText) {
       try {
-        const { convertAllTextToPath } = await Promise.resolve().then(() => require("./svgTextToPath-DHAXuVMF.cjs"));
+        const { convertAllTextToPath } = await Promise.resolve().then(() => require("./svgTextToPath-CBcIgtk1.cjs"));
         pageSvg = await convertAllTextToPath(pageSvg, fontBaseUrl, { mode: outlineSubMode });
         try {
           dumpSvgTextDiagnostics(pageSvg, i, PARITY_TAG, "STAGE-1b-after-text-to-path-raw");