@simplybusiness/mobius 10.3.4 → 10.4.1

package/dist/cjs/components/TextOrHTML/index.js

@@ -68,7 +68,8 @@ Text.displayName = "Text";
 
 // src/components/TextOrHTML/TextOrHTML.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");
-var isBlockHTML = (text) => /^\s*<[a-z]/i.test(text);
+var BLOCK_TAG = /<(div|p|ul|ol|li|h[1-6]|table|tr|td|th|blockquote|pre|hr|dl|dt|dd)[\s>/]/i;
+var containsBlockHTML = (text) => BLOCK_TAG.test(text);
 var containsHTML = (text) => /<[a-z/]/i.test(text) || /&(?:#\d+|#x[\da-f]+|[a-z]\w*);/i.test(text);
 var buildTextClasses = (textProps, htmlClassName) => {
   const { variant, elementType, spacing, className } = textProps;
@@ -91,9 +92,9 @@ var TextOrHTML = ({
   autoDetect = false,
   ...textProps
 }) => {
-  const textIsBlockHTML = autoDetect && isBlockHTML(text);
+  const hasBlockContent = autoDetect && containsBlockHTML(text);
   const dangerousHTML = (0, import_react.useMemo)(() => ({ __html: text }), [text]);
-  if (autoDetect && !textIsBlockHTML) {
+  if (autoDetect && !hasBlockContent) {
     const { variant, spacing, elementType, className, ...domProps } = textProps;
     const Element = getElementType(variant, elementType);
     const classes = buildTextClasses(textProps, htmlClassName);
@@ -107,7 +108,7 @@ var TextOrHTML = ({
       }
     ) : /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Element, { ref, ...domProps, className: classes, children: text });
   }
-  const DangerousComponent = htmlElementType ?? (textIsBlockHTML ? "div" : "span");
+  const DangerousComponent = htmlElementType ?? (hasBlockContent ? "div" : "span");
   const dangerousElement = /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
     DangerousComponent,
     {

package/dist/cjs/components/TextOrHTML/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/components/TextOrHTML/index.tsx", "../../../../src/components/TextOrHTML/TextOrHTML.tsx", "../../../../src/components/Text/Text.tsx"],
-  "sourcesContent": ["export * from \"./TextOrHTML\";\n", "import classNames from \"classnames/dedupe\";\nimport type { RefAttributes } from \"react\";\nimport { useMemo } from \"react\";\nimport type { TextElementType, TextProps } from \"../Text/Text\";\nimport { Text, getElementType } from \"../Text/Text\";\n\nexport type HTMLElementType = \"span\" | \"div\";\n\nconst isBlockHTML = (text: string) => /^\\s*<[a-z]/i.test(text);\nconst containsHTML = (text: string) =>\n  /<[a-z/]/i.test(text) || /&(?:#\\d+|#x[\\da-f]+|[a-z]\\w*);/i.test(text); // tag or entity\n\nconst buildTextClasses = (\n  textProps: Omit<TextProps, \"children\">,\n  htmlClassName?: string,\n) => {\n  const { variant, elementType, spacing, className } = textProps;\n  const variantType = variant || getElementType(variant, elementType);\n  return classNames(\n    \"mobius\",\n    \"mobius-text\",\n    { [`--is-${variantType}`]: variantType },\n    { [`--has-line-height-${spacing}`]: spacing },\n    className,\n    htmlClassName,\n  );\n};\n\nexport interface TextOrHTMLProps\n  extends Omit<TextProps, \"children\">, RefAttributes<TextElementType> {\n  /** HTML string to be rendered with dangerouslySetInnerHTML */\n  text: string;\n  /** Custom class name for the dangerous HTML element */\n  htmlClassName?: string;\n  /** HTML element type for the dangerous HTML element */\n  htmlElementType?: HTMLElementType;\n  /** If true, wraps the dangerous HTML element inside a Text component */\n  textWrapper?: boolean;\n  /** If true, auto-detects whether text is HTML or plain text to determine wrapping and element type */\n  autoDetect?: boolean;\n}\n\nconst TextOrHTML = ({\n  ref,\n  text,\n  htmlClassName,\n  htmlElementType,\n  textWrapper = false,\n  autoDetect = false,\n  ...textProps\n}: TextOrHTMLProps) => {\n  const textIsBlockHTML = autoDetect && isBlockHTML(text);\n\n  // Memoize the dangerouslySetInnerHTML object to prevent unnecessary re-renders\n  // See: https://github.com/facebook/react/issues/31660\n  const dangerousHTML = useMemo(() => ({ __html: text }), [text]);\n\n  // Non-block text with autoDetect: render directly on a Text-equivalent element,\n  // avoiding unnecessary <span> nesting inside <p>.\n  if (autoDetect && !textIsBlockHTML) {\n    const { variant, spacing, elementType, className, ...domProps } = textProps;\n    const Element = getElementType(variant, elementType);\n    const classes = buildTextClasses(textProps, htmlClassName);\n\n    return containsHTML(text) ? (\n      <Element\n        ref={ref}\n        {...domProps}\n        className={classes}\n        dangerouslySetInnerHTML={dangerousHTML}\n      />\n    ) : (\n      <Element ref={ref} {...domProps} className={classes}>\n        {text}\n      </Element>\n    );\n  }\n\n  const DangerousComponent =\n    htmlElementType ?? (textIsBlockHTML ? \"div\" : \"span\");\n  const dangerousElement = (\n    <DangerousComponent\n      className={htmlClassName}\n      dangerouslySetInnerHTML={dangerousHTML}\n    />\n  );\n\n  if (textWrapper) {\n    return (\n      <Text ref={ref} {...textProps}>\n        {dangerousElement}\n      </Text>\n    );\n  }\n\n  return dangerousElement;\n};\n\nTextOrHTML.displayName = \"TextOrHTML\";\nexport { TextOrHTML };\n", "import type { ReactNode, RefAttributes } from \"react\";\nimport classNames from \"classnames/dedupe\";\nimport type { DOMProps } from \"../../types/dom\";\nimport \"./Text.css\";\n\nexport type TextElementType = HTMLHeadingElement | HTMLParagraphElement;\nexport type TextVariantType =\n  | \"h1\"\n  | \"h2\"\n  | \"h3\"\n  | \"h4\"\n  | \"body\"\n  | \"small\"\n  | \"legal\"\n  | \"title\";\nexport type ElementType = \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"p\" | \"span\";\nexport interface TextProps extends DOMProps, RefAttributes<TextElementType> {\n  /** HTML element for the text */\n  elementType?: ElementType;\n  /** Specify font size override */\n  variant?: TextVariantType;\n  /** Specify compact line height override */\n  spacing?: \"loose\" | \"tight\";\n  /** Custom class name for setting specific CSS */\n  className?: string;\n  children: ReactNode;\n  style?: React.CSSProperties;\n}\n\nexport const getElementType = (\n  variant: TextVariantType | undefined,\n  elementType: ElementType | undefined,\n): ElementType => {\n  // Explicit elementType always wins\n  if (elementType) {\n    return elementType;\n  }\n  // Infer element from variant\n  if (variant && [\"h1\", \"h2\", \"h3\", \"h4\"].includes(variant)) {\n    return variant as ElementType;\n  }\n  return \"p\";\n};\n\nconst Text = ({ ref, elementType, ...props }: TextProps) => {\n  // Remove non-DOM props from element\n  const { variant, className, spacing, ...otherProps } = props;\n\n  // If a variant is supplied, set the class name and element type\n  const Element: ElementType = getElementType(variant, elementType);\n  const variantType = variant || Element;\n  const classes = classNames(\n    \"mobius\",\n    \"mobius-text\",\n    { [`--is-${variantType}`]: variantType },\n    { [`--has-line-height-${spacing}`]: spacing },\n    className,\n  );\n\n  return <Element ref={ref} {...otherProps} className={classes} />;\n};\n\nText.displayName = \"Text\";\nexport { Text };\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,IAAAA,iBAAuB;AAEvB,mBAAwB;;;ACDxB,oBAAuB;AAEvB,kBAAO;AAwDE;AA9BF,IAAM,iBAAiB,CAC5B,SACA,gBACgB;AAEhB,MAAI,aAAa;AACf,WAAO;AAAA,EACT;AAEA,MAAI,WAAW,CAAC,MAAM,MAAM,MAAM,IAAI,EAAE,SAAS,OAAO,GAAG;AACzD,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAEA,IAAM,OAAO,CAAC,EAAE,KAAK,aAAa,GAAG,MAAM,MAAiB;AAE1D,QAAM,EAAE,SAAS,WAAW,SAAS,GAAG,WAAW,IAAI;AAGvD,QAAM,UAAuB,eAAe,SAAS,WAAW;AAChE,QAAM,cAAc,WAAW;AAC/B,QAAM,cAAU,cAAAC;AAAA,IACd;AAAA,IACA;AAAA,IACA,EAAE,CAAC,QAAQ,WAAW,EAAE,GAAG,YAAY;AAAA,IACvC,EAAE,CAAC,qBAAqB,OAAO,EAAE,GAAG,QAAQ;AAAA,IAC5C;AAAA,EACF;AAEA,SAAO,4CAAC,WAAQ,KAAW,GAAG,YAAY,WAAW,SAAS;AAChE;AAEA,KAAK,cAAc;;;ADGb,IAAAC,sBAAA;AAzDN,IAAM,cAAc,CAAC,SAAiB,cAAc,KAAK,IAAI;AAC7D,IAAM,eAAe,CAAC,SACpB,WAAW,KAAK,IAAI,KAAK,kCAAkC,KAAK,IAAI;AAEtE,IAAM,mBAAmB,CACvB,WACA,kBACG;AACH,QAAM,EAAE,SAAS,aAAa,SAAS,UAAU,IAAI;AACrD,QAAM,cAAc,WAAW,eAAe,SAAS,WAAW;AAClE,aAAO,eAAAC;AAAA,IACL;AAAA,IACA;AAAA,IACA,EAAE,CAAC,QAAQ,WAAW,EAAE,GAAG,YAAY;AAAA,IACvC,EAAE,CAAC,qBAAqB,OAAO,EAAE,GAAG,QAAQ;AAAA,IAC5C;AAAA,IACA;AAAA,EACF;AACF;AAgBA,IAAM,aAAa,CAAC;AAAA,EAClB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,cAAc;AAAA,EACd,aAAa;AAAA,EACb,GAAG;AACL,MAAuB;AACrB,QAAM,kBAAkB,cAAc,YAAY,IAAI;AAItD,QAAM,oBAAgB,sBAAQ,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC;AAI9D,MAAI,cAAc,CAAC,iBAAiB;AAClC,UAAM,EAAE,SAAS,SAAS,aAAa,WAAW,GAAG,SAAS,IAAI;AAClE,UAAM,UAAU,eAAe,SAAS,WAAW;AACnD,UAAM,UAAU,iBAAiB,WAAW,aAAa;AAEzD,WAAO,aAAa,IAAI,IACtB;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACC,GAAG;AAAA,QACJ,WAAW;AAAA,QACX,yBAAyB;AAAA;AAAA,IAC3B,IAEA,6CAAC,WAAQ,KAAW,GAAG,UAAU,WAAW,SACzC,gBACH;AAAA,EAEJ;AAEA,QAAM,qBACJ,oBAAoB,kBAAkB,QAAQ;AAChD,QAAM,mBACJ;AAAA,IAAC;AAAA;AAAA,MACC,WAAW;AAAA,MACX,yBAAyB;AAAA;AAAA,EAC3B;AAGF,MAAI,aAAa;AACf,WACE,6CAAC,QAAK,KAAW,GAAG,WACjB,4BACH;AAAA,EAEJ;AAEA,SAAO;AACT;AAEA,WAAW,cAAc;",
+  "sourcesContent": ["export * from \"./TextOrHTML\";\n", "import classNames from \"classnames/dedupe\";\nimport type { RefAttributes } from \"react\";\nimport { useMemo } from \"react\";\nimport type { TextElementType, TextProps } from \"../Text/Text\";\nimport { Text, getElementType } from \"../Text/Text\";\n\nexport type HTMLElementType = \"span\" | \"div\";\n\n// Block-level tags that cannot be nested inside <p>.\nconst BLOCK_TAG =\n  /<(div|p|ul|ol|li|h[1-6]|table|tr|td|th|blockquote|pre|hr|dl|dt|dd)[\\s>/]/i;\nconst containsBlockHTML = (text: string) => BLOCK_TAG.test(text);\nconst containsHTML = (text: string) =>\n  /<[a-z/]/i.test(text) || /&(?:#\\d+|#x[\\da-f]+|[a-z]\\w*);/i.test(text); // tag or entity\n\nconst buildTextClasses = (\n  textProps: Omit<TextProps, \"children\">,\n  htmlClassName?: string,\n) => {\n  const { variant, elementType, spacing, className } = textProps;\n  const variantType = variant || getElementType(variant, elementType);\n  return classNames(\n    \"mobius\",\n    \"mobius-text\",\n    { [`--is-${variantType}`]: variantType },\n    { [`--has-line-height-${spacing}`]: spacing },\n    className,\n    htmlClassName,\n  );\n};\n\nexport interface TextOrHTMLProps\n  extends Omit<TextProps, \"children\">, RefAttributes<TextElementType> {\n  /** HTML string to be rendered with dangerouslySetInnerHTML */\n  text: string;\n  /** Custom class name for the dangerous HTML element */\n  htmlClassName?: string;\n  /** HTML element type for the dangerous HTML element */\n  htmlElementType?: HTMLElementType;\n  /** If true, wraps the dangerous HTML element inside a Text component */\n  textWrapper?: boolean;\n  /** If true, auto-detects whether text is HTML or plain text to determine wrapping and element type */\n  autoDetect?: boolean;\n}\n\nconst TextOrHTML = ({\n  ref,\n  text,\n  htmlClassName,\n  htmlElementType,\n  textWrapper = false,\n  autoDetect = false,\n  ...textProps\n}: TextOrHTMLProps) => {\n  const hasBlockContent = autoDetect && containsBlockHTML(text);\n\n  // Memoize the dangerouslySetInnerHTML object to prevent unnecessary re-renders\n  // See: https://github.com/facebook/react/issues/31660\n  const dangerousHTML = useMemo(() => ({ __html: text }), [text]);\n\n  // Non-block text with autoDetect: render directly on a Text-equivalent element,\n  // avoiding unnecessary <span> nesting inside <p>.\n  if (autoDetect && !hasBlockContent) {\n    const { variant, spacing, elementType, className, ...domProps } = textProps;\n    const Element = getElementType(variant, elementType);\n    const classes = buildTextClasses(textProps, htmlClassName);\n\n    return containsHTML(text) ? (\n      <Element\n        ref={ref}\n        {...domProps}\n        className={classes}\n        dangerouslySetInnerHTML={dangerousHTML}\n      />\n    ) : (\n      <Element ref={ref} {...domProps} className={classes}>\n        {text}\n      </Element>\n    );\n  }\n\n  const DangerousComponent =\n    htmlElementType ?? (hasBlockContent ? \"div\" : \"span\");\n  const dangerousElement = (\n    <DangerousComponent\n      className={htmlClassName}\n      dangerouslySetInnerHTML={dangerousHTML}\n    />\n  );\n\n  if (textWrapper) {\n    return (\n      <Text ref={ref} {...textProps}>\n        {dangerousElement}\n      </Text>\n    );\n  }\n\n  return dangerousElement;\n};\n\nTextOrHTML.displayName = \"TextOrHTML\";\nexport { TextOrHTML };\n", "import type { ReactNode, RefAttributes } from \"react\";\nimport classNames from \"classnames/dedupe\";\nimport type { DOMProps } from \"../../types/dom\";\nimport \"./Text.css\";\n\nexport type TextElementType = HTMLHeadingElement | HTMLParagraphElement;\nexport type TextVariantType =\n  | \"h1\"\n  | \"h2\"\n  | \"h3\"\n  | \"h4\"\n  | \"body\"\n  | \"small\"\n  | \"legal\"\n  | \"title\";\nexport type ElementType = \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"p\" | \"span\";\nexport interface TextProps extends DOMProps, RefAttributes<TextElementType> {\n  /** HTML element for the text */\n  elementType?: ElementType;\n  /** Specify font size override */\n  variant?: TextVariantType;\n  /** Specify compact line height override */\n  spacing?: \"loose\" | \"tight\";\n  /** Custom class name for setting specific CSS */\n  className?: string;\n  children: ReactNode;\n  style?: React.CSSProperties;\n}\n\nexport const getElementType = (\n  variant: TextVariantType | undefined,\n  elementType: ElementType | undefined,\n): ElementType => {\n  // Explicit elementType always wins\n  if (elementType) {\n    return elementType;\n  }\n  // Infer element from variant\n  if (variant && [\"h1\", \"h2\", \"h3\", \"h4\"].includes(variant)) {\n    return variant as ElementType;\n  }\n  return \"p\";\n};\n\nconst Text = ({ ref, elementType, ...props }: TextProps) => {\n  // Remove non-DOM props from element\n  const { variant, className, spacing, ...otherProps } = props;\n\n  // If a variant is supplied, set the class name and element type\n  const Element: ElementType = getElementType(variant, elementType);\n  const variantType = variant || Element;\n  const classes = classNames(\n    \"mobius\",\n    \"mobius-text\",\n    { [`--is-${variantType}`]: variantType },\n    { [`--has-line-height-${spacing}`]: spacing },\n    className,\n  );\n\n  return <Element ref={ref} {...otherProps} className={classes} />;\n};\n\nText.displayName = \"Text\";\nexport { Text };\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,IAAAA,iBAAuB;AAEvB,mBAAwB;;;ACDxB,oBAAuB;AAEvB,kBAAO;AAwDE;AA9BF,IAAM,iBAAiB,CAC5B,SACA,gBACgB;AAEhB,MAAI,aAAa;AACf,WAAO;AAAA,EACT;AAEA,MAAI,WAAW,CAAC,MAAM,MAAM,MAAM,IAAI,EAAE,SAAS,OAAO,GAAG;AACzD,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAEA,IAAM,OAAO,CAAC,EAAE,KAAK,aAAa,GAAG,MAAM,MAAiB;AAE1D,QAAM,EAAE,SAAS,WAAW,SAAS,GAAG,WAAW,IAAI;AAGvD,QAAM,UAAuB,eAAe,SAAS,WAAW;AAChE,QAAM,cAAc,WAAW;AAC/B,QAAM,cAAU,cAAAC;AAAA,IACd;AAAA,IACA;AAAA,IACA,EAAE,CAAC,QAAQ,WAAW,EAAE,GAAG,YAAY;AAAA,IACvC,EAAE,CAAC,qBAAqB,OAAO,EAAE,GAAG,QAAQ;AAAA,IAC5C;AAAA,EACF;AAEA,SAAO,4CAAC,WAAQ,KAAW,GAAG,YAAY,WAAW,SAAS;AAChE;AAEA,KAAK,cAAc;;;ADMb,IAAAC,sBAAA;AA3DN,IAAM,YACJ;AACF,IAAM,oBAAoB,CAAC,SAAiB,UAAU,KAAK,IAAI;AAC/D,IAAM,eAAe,CAAC,SACpB,WAAW,KAAK,IAAI,KAAK,kCAAkC,KAAK,IAAI;AAEtE,IAAM,mBAAmB,CACvB,WACA,kBACG;AACH,QAAM,EAAE,SAAS,aAAa,SAAS,UAAU,IAAI;AACrD,QAAM,cAAc,WAAW,eAAe,SAAS,WAAW;AAClE,aAAO,eAAAC;AAAA,IACL;AAAA,IACA;AAAA,IACA,EAAE,CAAC,QAAQ,WAAW,EAAE,GAAG,YAAY;AAAA,IACvC,EAAE,CAAC,qBAAqB,OAAO,EAAE,GAAG,QAAQ;AAAA,IAC5C;AAAA,IACA;AAAA,EACF;AACF;AAgBA,IAAM,aAAa,CAAC;AAAA,EAClB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,cAAc;AAAA,EACd,aAAa;AAAA,EACb,GAAG;AACL,MAAuB;AACrB,QAAM,kBAAkB,cAAc,kBAAkB,IAAI;AAI5D,QAAM,oBAAgB,sBAAQ,OAAO,EAAE,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC;AAI9D,MAAI,cAAc,CAAC,iBAAiB;AAClC,UAAM,EAAE,SAAS,SAAS,aAAa,WAAW,GAAG,SAAS,IAAI;AAClE,UAAM,UAAU,eAAe,SAAS,WAAW;AACnD,UAAM,UAAU,iBAAiB,WAAW,aAAa;AAEzD,WAAO,aAAa,IAAI,IACtB;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACC,GAAG;AAAA,QACJ,WAAW;AAAA,QACX,yBAAyB;AAAA;AAAA,IAC3B,IAEA,6CAAC,WAAQ,KAAW,GAAG,UAAU,WAAW,SACzC,gBACH;AAAA,EAEJ;AAEA,QAAM,qBACJ,oBAAoB,kBAAkB,QAAQ;AAChD,QAAM,mBACJ;AAAA,IAAC;AAAA;AAAA,MACC,WAAW;AAAA,MACX,yBAAyB;AAAA;AAAA,EAC3B;AAGF,MAAI,aAAa;AACf,WACE,6CAAC,QAAK,KAAW,GAAG,WACjB,4BACH;AAAA,EAEJ;AAEA,SAAO;AACT;AAEA,WAAW,cAAc;",
   "names": ["import_dedupe", "classNames", "import_jsx_runtime", "classNames"]
 }

package/dist/cjs/components/index.js

@@ -756,7 +756,7 @@ var init_Text = __esm({
 });
 
 // src/components/TextOrHTML/TextOrHTML.tsx
-var import_dedupe8, import_react9, import_jsx_runtime8, isBlockHTML, containsHTML, buildTextClasses, TextOrHTML;
+var import_dedupe8, import_react9, import_jsx_runtime8, BLOCK_TAG, containsBlockHTML, containsHTML, buildTextClasses, TextOrHTML;
 var init_TextOrHTML = __esm({
   "src/components/TextOrHTML/TextOrHTML.tsx"() {
     "use strict";
@@ -764,7 +764,8 @@ var init_TextOrHTML = __esm({
     import_react9 = require("react");
     init_Text();
     import_jsx_runtime8 = require("react/jsx-runtime");
-    isBlockHTML = (text) => /^\s*<[a-z]/i.test(text);
+    BLOCK_TAG = /<(div|p|ul|ol|li|h[1-6]|table|tr|td|th|blockquote|pre|hr|dl|dt|dd)[\s>/]/i;
+    containsBlockHTML = (text) => BLOCK_TAG.test(text);
     containsHTML = (text) => /<[a-z/]/i.test(text) || /&(?:#\d+|#x[\da-f]+|[a-z]\w*);/i.test(text);
     buildTextClasses = (textProps, htmlClassName) => {
       const { variant, elementType, spacing, className } = textProps;
@@ -787,9 +788,9 @@ var init_TextOrHTML = __esm({
       autoDetect = false,
       ...textProps
     }) => {
-      const textIsBlockHTML = autoDetect && isBlockHTML(text);
+      const hasBlockContent = autoDetect && containsBlockHTML(text);
       const dangerousHTML = (0, import_react9.useMemo)(() => ({ __html: text }), [text]);
-      if (autoDetect && !textIsBlockHTML) {
+      if (autoDetect && !hasBlockContent) {
         const { variant, spacing, elementType, className, ...domProps } = textProps;
         const Element = getElementType(variant, elementType);
         const classes = buildTextClasses(textProps, htmlClassName);
@@ -803,7 +804,7 @@ var init_TextOrHTML = __esm({
           }
         ) : /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Element, { ref, ...domProps, className: classes, children: text });
       }
-      const DangerousComponent = htmlElementType ?? (textIsBlockHTML ? "div" : "span");
+      const DangerousComponent = htmlElementType ?? (hasBlockContent ? "div" : "span");
       const dangerousElement = /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
         DangerousComponent,
         {
@@ -3807,6 +3808,7 @@ var Modal = ({ ref, ...props }) => {
   const {
     isOpen,
     onClose,
+    preventEscapeKey = false,
     onOpen,
     children,
     className,
@@ -3861,6 +3863,11 @@ var Modal = ({ ref, ...props }) => {
     {
       ref: mergeRefs([dialogRef, ref]),
       onCancel: close,
+      onKeyDown: (event) => {
+        if (preventEscapeKey && event.key === "Escape") {
+          event.preventDefault();
+        }
+      },
       className: modalClasses,
       "aria-labelledby": titleId,
       ...rest,