docgen-utils 1.0.29 → 1.0.31

package/dist/bundle.js

@@ -65537,6 +65537,22 @@ ${generateStylesCss(styleMap, themeFonts)}
       return void 0;
     return parsed;
   }
+  function getEffectiveZIndex(element, win) {
+    let current = element;
+    while (current && current !== win.document.body && current !== win.document.documentElement) {
+      const computed = win.getComputedStyle(current);
+      const position = computed.position;
+      const isPositioned = position === "absolute" || position === "relative" || position === "fixed" || position === "sticky";
+      if (isPositioned) {
+        const zIndex = extractZIndex(computed);
+        if (zIndex !== void 0) {
+          return zIndex;
+        }
+      }
+      current = current.parentElement;
+    }
+    return void 0;
+  }
   function getEffectiveOpacity(element, win) {
     let effectiveOpacity = 1;
     let current = element;
@@ -67433,7 +67449,7 @@ ${generateStylesCss(styleMap, themeFonts)}
                 cssTriangle: null,
                 customGeometry: null
               },
-              zIndex: extractZIndex(computed2)
+              zIndex: getEffectiveZIndex(el, win)
             };
             elements.push(shapeElement);
             if (hasBorder && !hasUniformBorder) {
@@ -67515,7 +67531,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                       rotate: null,
                       cssTriangle: null,
                       customGeometry: points
-                    }
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
                   };
                   elements.push(borderLeftShape);
                 } else {
@@ -67543,7 +67560,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                       rotate: null,
                       cssTriangle: null,
                       customGeometry: null
-                    }
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
                   };
                   elements.push(borderLeftShape);
                 }
@@ -67614,7 +67632,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                       rotate: null,
                       cssTriangle: null,
                       customGeometry: points
-                    }
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
                   };
                   elements.push(borderRightShape);
                 } else {
@@ -67642,7 +67661,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                       rotate: null,
                       cssTriangle: null,
                       customGeometry: null
-                    }
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
                   };
                   elements.push(borderRightShape);
                 }
@@ -67717,7 +67737,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                     rotate: null,
                     cssTriangle: null,
                     customGeometry: points
-                  }
+                  },
+                  zIndex: getEffectiveZIndex(el, win)
                 };
                 elements.push(borderTopShape);
               } else {
@@ -67745,7 +67766,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                     rotate: null,
                     cssTriangle: null,
                     customGeometry: null
-                  }
+                  },
+                  zIndex: getEffectiveZIndex(el, win)
                 };
                 elements.push(borderTopShape);
               }
@@ -67815,7 +67837,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                     rotate: null,
                     cssTriangle: null,
                     customGeometry: points
-                  }
+                  },
+                  zIndex: getEffectiveZIndex(el, win)
                 };
                 elements.push(borderBottomShape);
               } else {
@@ -67843,7 +67866,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                     rotate: null,
                     cssTriangle: null,
                     customGeometry: null
-                  }
+                  },
+                  zIndex: getEffectiveZIndex(el, win)
                 };
                 elements.push(borderBottomShape);
               }
@@ -67940,7 +67964,7 @@ ${generateStylesCss(styleMap, themeFonts)}
                 cssTriangle: null,
                 customGeometry: null
               },
-              zIndex: extractZIndex(computed2)
+              zIndex: getEffectiveZIndex(el, win)
             };
             elements.push(shapeElement);
             if (hasBorder && !hasUniformBorder) {
@@ -68022,7 +68046,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                       rotate: null,
                       cssTriangle: null,
                       customGeometry: points
-                    }
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
                   };
                   elements.push(borderLeftShape);
                 } else {
@@ -68050,7 +68075,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                       rotate: null,
                       cssTriangle: null,
                       customGeometry: null
-                    }
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
                   };
                   elements.push(borderLeftShape);
                 }
@@ -68121,7 +68147,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                       rotate: null,
                       cssTriangle: null,
                       customGeometry: points
-                    }
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
                   };
                   elements.push(borderRightShape);
                 } else {
@@ -68149,7 +68176,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                       rotate: null,
                       cssTriangle: null,
                       customGeometry: null
-                    }
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
                   };
                   elements.push(borderRightShape);
                 }
@@ -68224,7 +68252,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                     rotate: null,
                     cssTriangle: null,
                     customGeometry: points
-                  }
+                  },
+                  zIndex: getEffectiveZIndex(el, win)
                 };
                 elements.push(borderTopShape);
               } else {
@@ -68252,7 +68281,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                     rotate: null,
                     cssTriangle: null,
                     customGeometry: null
-                  }
+                  },
+                  zIndex: getEffectiveZIndex(el, win)
                 };
                 elements.push(borderTopShape);
               }
@@ -68402,7 +68432,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                 lineSpacing: lineHeightMultiplier2 * pxToPoints(computed22.fontSize),
                 fontFill: spanFontFill,
                 ...extractAlpha(computed22.color) !== null ? { transparency: extractAlpha(computed22.color) } : {}
-              }
+              },
+              zIndex: getEffectiveZIndex(el, win)
             };
             elements.push(textElement);
             processed.add(el);
@@ -68560,6 +68591,10 @@ ${generateStylesCss(styleMap, themeFonts)}
           if (hasOpacity && !maskApplied) {
             imageElement.transparency = Math.round((1 - imgOpacity) * 100);
           }
+          const imgZIndex = getEffectiveZIndex(el, win);
+          if (imgZIndex !== void 0) {
+            imageElement.zIndex = imgZIndex;
+          }
           elements.push(imageElement);
           processed.add(el);
           return;
@@ -68706,7 +68741,8 @@ ${generateStylesCss(styleMap, themeFonts)}
               h: displayH
             },
             sizing: null,
-            transparency: svgEffectiveOpacity < 1 ? Math.round((1 - svgEffectiveOpacity) * 100) : void 0
+            transparency: svgEffectiveOpacity < 1 ? Math.round((1 - svgEffectiveOpacity) * 100) : void 0,
+            zIndex: getEffectiveZIndex(el, win)
           };
           elements.push(imageElement);
           processed.add(el);
@@ -68770,7 +68806,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                     w: pxToInch(rect2.width),
                     h: pxToInch(rect2.height)
                   },
-                  sizing: null
+                  sizing: null,
+                  zIndex: getEffectiveZIndex(el, win)
                 };
                 elements.push(imageElement);
               }
@@ -68803,7 +68840,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                     h: pxToInch(blurResult.h)
                   },
                   sizing: null,
-                  rectRadius: 0
+                  rectRadius: 0,
+                  zIndex: getEffectiveZIndex(el, win)
                 };
                 elements.push(imgElement);
                 processed.add(el);
@@ -68833,7 +68871,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   h: pxToInch(rect2.height)
                 },
                 sizing: null,
-                rectRadius: 0
+                rectRadius: 0,
+                zIndex: getEffectiveZIndex(el, win)
               };
               elements.push(imgElement);
               hasConicGradientImage = true;
@@ -68907,7 +68946,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                 rotate: triRotation,
                 cssTriangle: { direction: triangleDirection },
                 customGeometry: null
-              }
+              },
+              zIndex: getEffectiveZIndex(el, win)
             };
             elements.push(triangleShape);
             processed.add(el);
@@ -68944,7 +68984,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   },
                   sizing: null,
                   rectRadius: 0,
-                  transparency: effOp < 1 ? Math.round((1 - effOp) * 100) : void 0
+                  transparency: effOp < 1 ? Math.round((1 - effOp) * 100) : void 0,
+                  zIndex: getEffectiveZIndex(el, win)
                 };
                 elements.push(imgElement);
               }
@@ -69055,7 +69096,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   rotate: null,
                   cssTriangle: null,
                   customGeometry: points
-                }
+                },
+                zIndex: getEffectiveZIndex(el, win)
               });
             } else {
               borderShapes.push({
@@ -69082,7 +69124,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   rotate: null,
                   cssTriangle: null,
                   customGeometry: null
-                }
+                },
+                zIndex: getEffectiveZIndex(el, win)
               });
             }
           }
@@ -69154,7 +69197,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   rotate: null,
                   cssTriangle: null,
                   customGeometry: points
-                }
+                },
+                zIndex: getEffectiveZIndex(el, win)
               });
             } else {
               borderShapes.push({
@@ -69181,7 +69225,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   rotate: null,
                   cssTriangle: null,
                   customGeometry: null
-                }
+                },
+                zIndex: getEffectiveZIndex(el, win)
               });
             }
           }
@@ -69254,7 +69299,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   rotate: null,
                   cssTriangle: null,
                   customGeometry: points
-                }
+                },
+                zIndex: getEffectiveZIndex(el, win)
               });
             } else {
               borderShapes.push({
@@ -69281,7 +69327,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   rotate: null,
                   cssTriangle: null,
                   customGeometry: null
-                }
+                },
+                zIndex: getEffectiveZIndex(el, win)
               });
             }
           }
@@ -69350,7 +69397,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   rotate: null,
                   cssTriangle: null,
                   customGeometry: points
-                }
+                },
+                zIndex: getEffectiveZIndex(el, win)
               });
             } else {
               borderShapes.push({
@@ -69377,7 +69425,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   rotate: null,
                   cssTriangle: null,
                   customGeometry: null
-                }
+                },
+                zIndex: getEffectiveZIndex(el, win)
               });
             }
           }
@@ -69399,7 +69448,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                 sizing: {
                   type: bgImageSize === "cover" ? "cover" : bgImageSize === "contain" ? "contain" : "cover",
                   position: bgImagePosition
-                }
+                },
+                zIndex: getEffectiveZIndex(el, win)
               };
               elements.push(bgImgElement);
             }
@@ -70299,7 +70349,7 @@ ${generateStylesCss(styleMap, themeFonts)}
                     return points;
                   })() : null
                 },
-                zIndex: extractZIndex(computed2)
+                zIndex: getEffectiveZIndex(el, win)
               };
               if (hasPadding && shapeElement.style && (shapeText || shapeTextRuns && shapeTextRuns.length > 0)) {
                 let effectiveLeftPadding = paddingLeft;
@@ -70336,6 +70386,58 @@ ${generateStylesCss(styleMap, themeFonts)}
                   tc.querySelectorAll("*").forEach((desc) => processed.delete(desc));
                 });
               }
+              if (!shouldMergeText && hasDirectText && directTextContent) {
+                const range2 = win.document.createRange();
+                let foundTextNode = false;
+                for (const node of Array.from(el.childNodes)) {
+                  if (node.nodeType === Node.TEXT_NODE) {
+                    const text2 = (node.textContent || "").trim();
+                    if (text2) {
+                      if (!foundTextNode) {
+                        range2.setStart(node, 0);
+                        foundTextNode = true;
+                      }
+                      range2.setEnd(node, node.textContent?.length || 0);
+                    }
+                  }
+                }
+                if (foundTextNode) {
+                  const textRect = range2.getBoundingClientRect();
+                  if (textRect.width > 0 && textRect.height > 0) {
+                    const isBold = parseInt(computed2.fontWeight) >= 600;
+                    const isItalic = computed2.fontStyle === "italic";
+                    const isUnderline = computed2.textDecoration && computed2.textDecoration.includes("underline");
+                    let displayText = directTextContent;
+                    if (computed2.textTransform && computed2.textTransform !== "none") {
+                      displayText = applyTextTransform2(displayText, computed2.textTransform);
+                    }
+                    const directTextElement = {
+                      type: "p",
+                      text: displayText,
+                      position: {
+                        x: pxToInch(textRect.left),
+                        y: pxToInch(textRect.top),
+                        w: pxToInch(textRect.width),
+                        h: pxToInch(textRect.height)
+                      },
+                      style: {
+                        fontSize: pxToPoints(computed2.fontSize),
+                        fontFace: extractFontFace(computed2.fontFamily),
+                        color: rgbToHex(computed2.color),
+                        bold: isBold,
+                        italic: isItalic,
+                        underline: isUnderline ? true : void 0,
+                        valign: "middle",
+                        align: "left",
+                        ...extractLetterSpacing(computed2) !== null ? { charSpacing: extractLetterSpacing(computed2) } : {},
+                        ...extractAlpha(computed2.color) !== null ? { transparency: extractAlpha(computed2.color) } : {}
+                      },
+                      zIndex: getEffectiveZIndex(el, win)
+                    };
+                    elements.push(directTextElement);
+                  }
+                }
+              }
               if (shouldSplitTextFromClippedShape && overflowClipGeometry) {
                 const originalArea = originalShapeW * originalShapeH;
                 const clippedArea = clippedShapeW * clippedShapeH;
@@ -70378,7 +70480,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                       cssTriangle: null,
                       customGeometry: null
                       // NO custom geometry - PPTX doesn't clip text to paths
-                    }
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
                   };
                   if (hasPadding && clippedTextShape.style) {
                     clippedTextShape.style.margin = [
@@ -70421,7 +70524,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                       rotate: null,
                       cssTriangle: null,
                       customGeometry: null
-                    }
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
                   };
                   elements.push(extraShape);
                 }
@@ -70548,6 +70652,59 @@ ${generateStylesCss(styleMap, themeFonts)}
             } else if (directText) {
               extractedText = directText;
             }
+            if (isPlainDivFlexRow && directText && hasStructuralChildren) {
+              const range2 = win.document.createRange();
+              let foundTextNode = false;
+              for (const node of Array.from(el.childNodes)) {
+                if (node.nodeType === Node.TEXT_NODE) {
+                  const text2 = (node.textContent || "").trim();
+                  if (text2) {
+                    if (!foundTextNode) {
+                      range2.setStart(node, 0);
+                      foundTextNode = true;
+                    }
+                    range2.setEnd(node, node.textContent?.length || 0);
+                  }
+                }
+              }
+              if (foundTextNode) {
+                const textRect = range2.getBoundingClientRect();
+                if (textRect.width > 0 && textRect.height > 0) {
+                  const computed22 = win.getComputedStyle(el);
+                  const isBold = parseInt(computed22.fontWeight) >= 600;
+                  const isItalic = computed22.fontStyle === "italic";
+                  const isUnderline = computed22.textDecoration && computed22.textDecoration.includes("underline");
+                  let displayText = directText;
+                  if (computed22.textTransform && computed22.textTransform !== "none") {
+                    displayText = applyTextTransform2(displayText, computed22.textTransform);
+                  }
+                  const flexDirectTextElement = {
+                    type: "p",
+                    text: displayText,
+                    position: {
+                      x: pxToInch(textRect.left),
+                      y: pxToInch(textRect.top),
+                      w: pxToInch(textRect.width),
+                      h: pxToInch(textRect.height)
+                    },
+                    style: {
+                      fontSize: pxToPoints(computed22.fontSize),
+                      fontFace: extractFontFace(computed22.fontFamily),
+                      color: rgbToHex(computed22.color),
+                      bold: isBold,
+                      italic: isItalic,
+                      underline: isUnderline ? true : void 0,
+                      valign: "middle",
+                      align: "left",
+                      ...extractLetterSpacing(computed22) !== null ? { charSpacing: extractLetterSpacing(computed22) } : {},
+                      ...extractAlpha(computed22.color) !== null ? { transparency: extractAlpha(computed22.color) } : {}
+                    },
+                    zIndex: getEffectiveZIndex(el, win)
+                  };
+                  elements.push(flexDirectTextElement);
+                }
+              }
+            }
             if (extractedText && !hasStructuralChildren) {
               const computed22 = win.getComputedStyle(el);
               const fontSizePx2 = parseFloat(computed22.fontSize);
@@ -70675,7 +70832,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                   valign: hasPadding ? "top" : "middle",
                   lineSpacing: lineHeightMultiplier2 * pxToPoints(computed22.fontSize),
                   margin: hasPadding ? [paddingLeft * PT_PER_PX, paddingRight * PT_PER_PX, paddingBottom * PT_PER_PX, paddingTop * PT_PER_PX] : void 0
-                }
+                },
+                zIndex: getEffectiveZIndex(el, win)
               };
               if (baseRunOptions.transparency !== void 0 && baseRunOptions.transparency > 0) {
                 textElement.style.transparency = baseRunOptions.transparency;
@@ -70751,7 +70909,8 @@ ${generateStylesCss(styleMap, themeFonts)}
                 align: liComputed2.textAlign === "start" ? "left" : liComputed2.textAlign,
                 valign: "top",
                 lineSpacing: pxToPoints(liComputed2.lineHeight)
-              }
+              },
+              zIndex: getEffectiveZIndex(liEl, win)
             };
             elements.push(textElement);
             processed.add(liEl);
@@ -70799,7 +70958,8 @@ ${generateStylesCss(styleMap, themeFonts)}
             paraSpaceBefore: 0,
             paraSpaceAfter: pxToPoints(liComputed.marginBottom),
             margin: [marginLeft, 0, 0, 0]
-          }
+          },
+          zIndex: getEffectiveZIndex(el, win)
         };
         elements.push(listElement);
         liElements.forEach((li) => processed.add(li));
@@ -71025,7 +71185,8 @@ ${generateStylesCss(styleMap, themeFonts)}
           type: el.tagName.toLowerCase(),
           text: runs,
           position: { x: pxToInch(x), y: pxToInch(y), w: pxToInch(w), h: pxToInch(h) },
-          style: baseStyle
+          style: baseStyle,
+          zIndex: getEffectiveZIndex(el, win)
         };
         elements.push(textElement);
       } else {
@@ -71041,7 +71202,8 @@ ${generateStylesCss(styleMap, themeFonts)}
             bold: isBold && !shouldSkipBold(computed.fontFamily),
             italic: computed.fontStyle === "italic",
             underline: computed.textDecoration.includes("underline")
-          }
+          },
+          zIndex: getEffectiveZIndex(el, win)
         };
         elements.push(textElement);
       }
@@ -71070,12 +71232,17 @@ ${generateStylesCss(styleMap, themeFonts)}
       const pseudoElements = extractPseudoElements(htmlDiv, win);
       elements.push(...pseudoElements);
     });
-    elements.sort((a, b) => {
-      const zIndexA = "zIndex" in a && a.zIndex !== void 0 ? a.zIndex : 0;
-      const zIndexB = "zIndex" in b && b.zIndex !== void 0 ? b.zIndex : 0;
-      return zIndexA - zIndexB;
+    const indexedElements = elements.map((el, i) => ({ el, originalIndex: i }));
+    indexedElements.sort((a, b) => {
+      const zIndexA = "zIndex" in a.el && a.el.zIndex !== void 0 ? a.el.zIndex : 0;
+      const zIndexB = "zIndex" in b.el && b.el.zIndex !== void 0 ? b.el.zIndex : 0;
+      if (zIndexA !== zIndexB) {
+        return zIndexA - zIndexB;
+      }
+      return a.originalIndex - b.originalIndex;
     });
-    return { background, elements, placeholders, errors };
+    const sortedElements = indexedElements.map((item) => item.el);
+    return { background, elements: sortedElements, placeholders, errors };
   }
 
   // packages/slides/convert.js