@choice-ui/react 1.6.7 → 1.6.9

package/dist/components/code-block/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { default as React__default, ReactNode, HTMLProps, RefObject } from 'react';
 import * as React from 'react';
-import * as react_jsx_runtime from 'react/jsx-runtime';
 
 interface CodeBlockContextValue {
     codeExpanded: boolean;
@@ -14,7 +13,7 @@ interface CodeBlockContextValue {
     isExpanded: boolean;
     language: string;
     lineCount: number;
-    lineThreshold: number;
+    lineThreshold?: number;
     needsScroll: boolean;
     scrollRef?: RefObject<HTMLDivElement>;
     variant?: "default" | "light" | "dark";
@@ -51,35 +50,33 @@ interface CodeBlockFooterProps extends CodeBlockInjectedProps {
 }
 interface CodeBlockContentProps extends CodeBlockInjectedProps {
     className?: string;
-    code: string;
     language?: string;
     withScrollArea?: boolean;
+    children?: string;
 }
 interface CodeBlockCodeProps extends HTMLProps<HTMLDivElement> {
     className?: string;
-    code: string;
-    /** 从 CodeBlock 传递的 context */
+    children?: string;
     codeBlock?: CodeBlockContextValue;
     codeBlockId?: string;
     language?: string;
-    /** 手动指定主题，覆盖自动检测 */
     variant?: "light" | "dark";
 }
 
+declare const CodeBlock: React__default.NamedExoticComponent<CodeBlockProps> & {
+    Code: React__default.NamedExoticComponent<CodeBlockCodeProps>;
+    Content: React__default.NamedExoticComponent<CodeBlockContentProps>;
+    Footer: React__default.NamedExoticComponent<CodeBlockFooterProps>;
+    Header: React__default.NamedExoticComponent<CodeBlockHeaderProps>;
+};
+
 declare const CodeBlockCode: React.NamedExoticComponent<CodeBlockCodeProps>;
 
 declare const CodeBlockHeader: React__default.NamedExoticComponent<CodeBlockHeaderProps>;
 
 declare const CodeBlockFooter: React.NamedExoticComponent<CodeBlockFooterProps>;
 
-declare function CodeBlockContent(props: CodeBlockContentProps): react_jsx_runtime.JSX.Element | null;
-
-declare const CodeBlock: React__default.NamedExoticComponent<CodeBlockProps> & {
-    Code: React__default.NamedExoticComponent<CodeBlockCodeProps>;
-    Content: typeof CodeBlockContent;
-    Footer: React__default.NamedExoticComponent<CodeBlockFooterProps>;
-    Header: React__default.NamedExoticComponent<CodeBlockHeaderProps>;
-};
+declare const CodeBlockContent: React.NamedExoticComponent<CodeBlockContentProps>;
 
 declare function getDefaultFilenameForLanguage(language: string): string;
 

package/dist/components/code-block/dist/index.js

@@ -1,4 +1,4 @@
-import React__default, { memo, useState, useEffect } from "react";
+import React__default, { memo, useState, useEffect, useRef, useCallback } from "react";
 import { useStickToBottom } from "use-stick-to-bottom";
 import { codeToHtml } from "shiki";
 import { useEventCallback } from "usehooks-ts";
@@ -34,13 +34,34 @@ function useCodeBlock({
     if (!code || typeof code !== "string") {
       return;
     }
-    try {
-      if (typeof navigator !== "undefined" && navigator.clipboard) {
+    const onSuccess = () => {
+      setCopied(true);
+      setTimeout(() => setCopied(false), 2e3);
+    };
+    if (typeof navigator !== "undefined" && navigator.clipboard) {
+      try {
         await navigator.clipboard.writeText(code);
-        setCopied(true);
-        setTimeout(() => setCopied(false), 2e3);
+        onSuccess();
+        return;
+      } catch {
+      }
+    }
+    const textArea = document.createElement("textarea");
+    try {
+      textArea.value = code;
+      textArea.style.cssText = "position:fixed;top:0;left:0;width:2em;height:2em;padding:0;border:none;outline:none;box-shadow:none;background:transparent;";
+      document.body.appendChild(textArea);
+      textArea.focus();
+      textArea.select();
+      const successful = document.execCommand("copy");
+      if (successful) {
+        onSuccess();
+      }
+    } catch {
+    } finally {
+      if (textArea.parentNode) {
+        textArea.parentNode.removeChild(textArea);
       }
-    } catch (error) {
     }
   });
   return {
@@ -56,12 +77,15 @@ function useScrollDetection({
   scrollRef,
   contentRef,
   isExpanded,
-  codeExpanded,
-  children
+  codeExpanded
 }) {
   const [needsScroll, setNeedsScroll] = useState(false);
-  useEffect(() => {
-    const checkScrollNeeded = () => {
+  const debounceRef = useRef(null);
+  const checkScrollNeeded = useCallback(() => {
+    if (debounceRef.current) {
+      clearTimeout(debounceRef.current);
+    }
+    debounceRef.current = setTimeout(() => {
       if (!scrollRef.current || !contentRef.current) {
         setNeedsScroll(false);
         return;
@@ -71,50 +95,30 @@ function useScrollDetection({
         const content = contentRef.current;
         const hasScroll = content.scrollHeight > viewport.clientHeight;
         setNeedsScroll(hasScroll);
-      } catch (error) {
+      } catch {
         setNeedsScroll(false);
       }
-    };
+    }, 50);
+  }, [scrollRef, contentRef]);
+  useEffect(() => {
     const timeoutId = setTimeout(checkScrollNeeded, 100);
     window.addEventListener("resize", checkScrollNeeded);
     let resizeObserver = null;
-    if (typeof ResizeObserver !== "undefined") {
+    if (typeof ResizeObserver !== "undefined" && contentRef.current) {
       resizeObserver = new ResizeObserver(checkScrollNeeded);
-      if (contentRef.current) {
-        resizeObserver.observe(contentRef.current);
-      }
+      resizeObserver.observe(contentRef.current);
     }
     return () => {
       clearTimeout(timeoutId);
+      if (debounceRef.current) {
+        clearTimeout(debounceRef.current);
+      }
       window.removeEventListener("resize", checkScrollNeeded);
       resizeObserver == null ? void 0 : resizeObserver.disconnect();
     };
-  }, [scrollRef, contentRef, isExpanded, codeExpanded, children]);
+  }, [checkScrollNeeded, isExpanded, codeExpanded]);
   return needsScroll;
 }
-function useLineCount(children) {
-  const [lineCount, setLineCount] = useState(0);
-  useEffect(() => {
-    try {
-      const codeContent = React__default.Children.toArray(children).map((child) => {
-        var _a;
-        if (React__default.isValidElement(child) && ((_a = child.props) == null ? void 0 : _a.code) && typeof child.props.code === "string") {
-          return child.props.code;
-        }
-        return "";
-      }).join("");
-      if (codeContent) {
-        const lines = codeContent.split("\n").length;
-        setLineCount(lines);
-      } else {
-        setLineCount(0);
-      }
-    } catch (error) {
-      setLineCount(0);
-    }
-  }, [children]);
-  return lineCount;
-}
 function useTheme() {
   const [theme, setTheme] = useState(() => {
     if (typeof window === "undefined") return "light";
@@ -176,34 +180,46 @@ var codeBlockCodeTv = tcv({
   base: "text-message-code w-fit min-w-full bg-transparent font-mono [&>pre]:!bg-transparent [&>pre]:px-4 [&>pre]:py-4"
 });
 var CodeBlockCode = memo(function CodeBlockCode2(props) {
-  const { code, language = "tsx", className, variant: variantProp, codeBlock, ...rest } = props;
+  const { children, language = "tsx", className, variant: variantProp, codeBlock, ...rest } = props;
   const systemTheme = useTheme();
   const resolvedVariant = variantProp ?? ((codeBlock == null ? void 0 : codeBlock.variant) === "default" ? void 0 : codeBlock == null ? void 0 : codeBlock.variant);
   const theme = resolvedVariant ?? systemTheme;
   const [highlightedHtml, setHighlightedHtml] = useState(null);
   useEffect(() => {
+    let isMounted = true;
     async function highlight() {
-      if (!code) {
-        setHighlightedHtml("<pre><code></code></pre>");
+      if (!children) {
+        if (isMounted) setHighlightedHtml("<pre><code></code></pre>");
         return;
       }
       const resolvedLang = resolveLanguage(language);
+      const themeConfig = theme === "light" ? "github-light" : "github-dark";
       try {
-        const html = await codeToHtml(code, {
+        const html = await codeToHtml(children, {
           lang: resolvedLang,
-          theme: theme === "light" ? "github-light" : "github-dark"
+          theme: themeConfig
         });
-        setHighlightedHtml(html);
+        if (isMounted) setHighlightedHtml(html);
       } catch {
-        const html = await codeToHtml(code, {
-          lang: "text",
-          theme: theme === "light" ? "github-light" : "github-dark"
-        });
-        setHighlightedHtml(html);
+        try {
+          const html = await codeToHtml(children, {
+            lang: "text",
+            theme: themeConfig
+          });
+          if (isMounted) setHighlightedHtml(html);
+        } catch {
+          if (isMounted) {
+            const escaped = children.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            setHighlightedHtml(`<pre><code>${escaped}</code></pre>`);
+          }
+        }
       }
     }
     highlight();
-  }, [code, language, theme]);
+    return () => {
+      isMounted = false;
+    };
+  }, [children, language, theme]);
   const classNames = codeBlockCodeTv({ className });
   return highlightedHtml ? /* @__PURE__ */ jsx(
     "div",
@@ -217,10 +233,29 @@ var CodeBlockCode = memo(function CodeBlockCode2(props) {
     {
       className: tcx("min-w-0", classNames),
       ...rest,
-      children: /* @__PURE__ */ jsx("pre", { children: /* @__PURE__ */ jsx("code", { children: code }) })
+      children: /* @__PURE__ */ jsx("pre", { children: /* @__PURE__ */ jsx("code", { children }) })
     }
   );
 });
+function extractCodeFromChildren(children) {
+  if (!children) return "";
+  try {
+    return React__default.Children.toArray(children).map((child) => {
+      var _a, _b;
+      if (React__default.isValidElement(child)) {
+        if (((_a = child.props) == null ? void 0 : _a.code) && typeof child.props.code === "string") {
+          return child.props.code;
+        }
+        if (((_b = child.props) == null ? void 0 : _b.children) && typeof child.props.children === "string") {
+          return child.props.children;
+        }
+      }
+      return "";
+    }).filter(Boolean).join("");
+  } catch {
+    return "";
+  }
+}
 var icons = {
   js: /* @__PURE__ */ jsxs(
     "svg",
@@ -908,9 +943,8 @@ var CodeBlockHeader = memo(function CodeBlockHeader2(props) {
     handleCopy,
     variant
   } = codeBlock;
-  if (!handleExpand || !handleCopy) {
-    return null;
-  }
+  const canExpand = Boolean(handleExpand);
+  const canCopy = Boolean(handleCopy);
   const tv = codeBlockHeaderTv({ isExpanded, variant });
   let icon = null;
   try {
@@ -934,17 +968,17 @@ var CodeBlockHeader = memo(function CodeBlockHeader2(props) {
       children
     ] }),
     /* @__PURE__ */ jsxs("div", { className: tv.actions(), children: [
-      isExpanded && /* @__PURE__ */ jsx(
+      isExpanded && canCopy && /* @__PURE__ */ jsx(
         IconButton,
         {
           className: tv.button(),
           variant: variant === "dark" ? "dark" : "ghost",
-          onClick: () => handleCopy(),
+          onClick: () => handleCopy == null ? void 0 : handleCopy(),
           tooltip: { content: copyTooltipContent },
           children: copied ? /* @__PURE__ */ jsx(Check, { className: "text-success-foreground" }) : /* @__PURE__ */ jsx(ClipboardSmall, {})
         }
       ),
-      expandable && /* @__PURE__ */ jsx(
+      expandable && canExpand && /* @__PURE__ */ jsx(
         IconButton,
         {
           className: tv.button(),
@@ -972,9 +1006,10 @@ var codeBlockFooterTv = tcv({
       },
       false: {
         footer: [
-          "bg-secondary-background/90 absolute inset-x-0 bottom-0 z-3",
+          "bg-secondary-background/80 absolute inset-x-0 bottom-0 z-3",
           "opacity-0 group-hover:opacity-100",
-          "hover:bg-tertiary-background"
+          "hover:bg-tertiary-background",
+          "backdrop-blur-xs"
         ]
       }
     }
@@ -988,7 +1023,7 @@ var CodeBlockFooter = memo(function CodeBlockFooter2(props) {
   if (!codeBlock) return null;
   const { isExpanded, codeExpanded, handleCodeExpand, lineCount, lineThreshold, needsScroll } = codeBlock;
   const tv = codeBlockFooterTv({ codeExpanded });
-  if (!(lineCount > lineThreshold || needsScroll || codeExpanded) || !isExpanded) {
+  if (lineThreshold && !(lineCount > lineThreshold || needsScroll || codeExpanded) || !isExpanded) {
     return null;
   }
   return /* @__PURE__ */ jsx(
@@ -1000,24 +1035,26 @@ var CodeBlockFooter = memo(function CodeBlockFooter2(props) {
     }
   );
 });
+var LINE_HEIGHT_PX = 16;
+var HEIGHT_PADDING_PX = 32 + 40;
 var codeBlockTv = tcv({
   slots: {
-    code: "overflow-hidden",
+    code: "overflow-hidden min-h-0 flex-1",
     content: "flex w-fit flex-col overflow-clip p-[inherit]"
   }
 });
-function CodeBlockContent(props) {
-  const { code, className, codeBlock, withScrollArea = true } = props;
+var CodeBlockContent = memo(function CodeBlockContent2(props) {
+  const { className, codeBlock, withScrollArea = true, children } = props;
   if (!codeBlock) return null;
   const { language, isExpanded, codeExpanded, scrollRef, contentRef, lineCount, lineThreshold } = codeBlock;
   if (!isExpanded) {
     return null;
   }
-  if (typeof code !== "string") {
+  if (typeof children !== "string") {
     return null;
   }
   const tv = codeBlockTv();
-  const shouldLimitHeight = lineCount > lineThreshold && !codeExpanded;
+  const shouldLimitHeight = lineThreshold && lineCount > lineThreshold && !codeExpanded;
   return /* @__PURE__ */ jsx(Fragment, { children: withScrollArea ? /* @__PURE__ */ jsx(
     ScrollArea,
     {
@@ -1030,7 +1067,7 @@ function CodeBlockContent(props) {
         {
           ref: scrollRef,
           style: {
-            maxHeight: shouldLimitHeight ? `${lineThreshold * 14 + 32}px` : "none"
+            maxHeight: shouldLimitHeight ? `${lineThreshold * LINE_HEIGHT_PX + HEIGHT_PADDING_PX}px` : "none"
           },
           children: /* @__PURE__ */ jsx(
             ScrollArea.Content,
@@ -1040,9 +1077,9 @@ function CodeBlockContent(props) {
               children: /* @__PURE__ */ jsx(
                 CodeBlockCode,
                 {
-                  code,
                   language,
-                  codeBlock
+                  codeBlock,
+                  children
                 }
               )
             }
@@ -1053,19 +1090,19 @@ function CodeBlockContent(props) {
   ) : /* @__PURE__ */ jsx("div", { className: tcx(tv.content(), className), children: /* @__PURE__ */ jsx(
     CodeBlockCode,
     {
-      code,
       language,
-      codeBlock
+      codeBlock,
+      children
     }
   ) }) });
-}
+});
 var CodeBlockRoot = memo(function CodeBlock(props) {
   const {
     children,
     className,
     filename,
     language = "code",
-    lineThreshold = 20,
+    lineThreshold,
     expandable = true,
     defaultExpanded = true,
     defaultCodeExpanded = false,
@@ -1077,7 +1114,6 @@ var CodeBlockRoot = memo(function CodeBlock(props) {
     resize: "smooth",
     initial: "smooth"
   });
-  const codeContentRef = React__default.useRef("");
   const {
     isExpanded,
     codeExpanded,
@@ -1092,34 +1128,25 @@ var CodeBlockRoot = memo(function CodeBlock(props) {
     onCodeExpandChange,
     scrollToBottom
   });
+  const codeContent = React__default.useMemo(() => extractCodeFromChildren(children), [children]);
+  const lineCount = React__default.useMemo(
+    () => codeContent ? codeContent.split("\n").length : 0,
+    [codeContent]
+  );
   const handleCopy = React__default.useCallback(
     (code) => {
-      const codeToUse = code || codeContentRef.current;
+      const codeToUse = code || codeContent;
       if (codeToUse) {
         originalHandleCopy(codeToUse);
       }
     },
-    [originalHandleCopy]
+    [originalHandleCopy, codeContent]
   );
-  React__default.useEffect(() => {
-    try {
-      React__default.Children.forEach(children, (child) => {
-        if (React__default.isValidElement(child) && child.props) {
-          if (child.props.code && typeof child.props.code === "string") {
-            codeContentRef.current = child.props.code;
-          }
-        }
-      });
-    } catch {
-    }
-  }, [children]);
-  const lineCount = useLineCount(children);
   const needsScroll = useScrollDetection({
     scrollRef,
     contentRef,
     isExpanded,
-    codeExpanded,
-    children
+    codeExpanded
   });
   const contextValue = React__default.useMemo(
     () => ({
@@ -1178,7 +1205,7 @@ var CodeBlockRoot = memo(function CodeBlock(props) {
     "div",
     {
       className: tcx(
-        "group/code-block relative overflow-hidden rounded-lg",
+        "group/code-block relative flex flex-col overflow-hidden rounded-lg",
         variant === "default" && "bg-secondary-background",
         variant === "light" && "bg-gray-100",
         variant === "dark" && "bg-gray-700",

package/dist/components/code-block/src/code-block.d.ts

@@ -1,10 +1,9 @@
 import { default as React } from 'react';
-import { CodeBlockContent } from './components';
 import { CodeBlockProps } from './types';
 export declare const CodeBlockRoot: React.NamedExoticComponent<CodeBlockProps>;
 export declare const CodeBlock: React.NamedExoticComponent<CodeBlockProps> & {
     Code: React.NamedExoticComponent<import('../..').CodeBlockCodeProps>;
-    Content: typeof CodeBlockContent;
+    Content: React.NamedExoticComponent<import('../..').CodeBlockContentProps>;
     Footer: React.NamedExoticComponent<import('../..').CodeBlockFooterProps>;
     Header: React.NamedExoticComponent<import('../..').CodeBlockHeaderProps>;
 };

package/dist/components/code-block/src/code-block.js

@@ -6,7 +6,7 @@ import { CodeBlockFooter } from "./components/code-block-footer.js";
 import { CodeBlockContent } from "./components/code-block-content.js";
 import { CodeBlockCode } from "./components/code-block-code.js";
 import { useCodeBlock } from "./hooks/use-code-block.js";
-import { useLineCount } from "./hooks/use-line-count.js";
+import { extractCodeFromChildren } from "./utils/extract-code.js";
 import { useScrollDetection } from "./hooks/use-scroll-detection.js";
 import { tcx } from "../../../shared/utils/tcx/tcx.js";
 const CodeBlockRoot = memo(function CodeBlock2(props) {
@@ -15,7 +15,7 @@ const CodeBlockRoot = memo(function CodeBlock2(props) {
     className,
     filename,
     language = "code",
-    lineThreshold = 20,
+    lineThreshold,
     expandable = true,
     defaultExpanded = true,
     defaultCodeExpanded = false,
@@ -27,7 +27,6 @@ const CodeBlockRoot = memo(function CodeBlock2(props) {
     resize: "smooth",
     initial: "smooth"
   });
-  const codeContentRef = React__default.useRef("");
   const {
     isExpanded,
     codeExpanded,
@@ -42,34 +41,25 @@ const CodeBlockRoot = memo(function CodeBlock2(props) {
     onCodeExpandChange,
     scrollToBottom
   });
+  const codeContent = React__default.useMemo(() => extractCodeFromChildren(children), [children]);
+  const lineCount = React__default.useMemo(
+    () => codeContent ? codeContent.split("\n").length : 0,
+    [codeContent]
+  );
   const handleCopy = React__default.useCallback(
     (code) => {
-      const codeToUse = code || codeContentRef.current;
+      const codeToUse = code || codeContent;
       if (codeToUse) {
         originalHandleCopy(codeToUse);
       }
     },
-    [originalHandleCopy]
+    [originalHandleCopy, codeContent]
   );
-  React__default.useEffect(() => {
-    try {
-      React__default.Children.forEach(children, (child) => {
-        if (React__default.isValidElement(child) && child.props) {
-          if (child.props.code && typeof child.props.code === "string") {
-            codeContentRef.current = child.props.code;
-          }
-        }
-      });
-    } catch {
-    }
-  }, [children]);
-  const lineCount = useLineCount(children);
   const needsScroll = useScrollDetection({
     scrollRef,
     contentRef,
     isExpanded,
-    codeExpanded,
-    children
+    codeExpanded
   });
   const contextValue = React__default.useMemo(
     () => ({
@@ -128,7 +118,7 @@ const CodeBlockRoot = memo(function CodeBlock2(props) {
     "div",
     {
       className: tcx(
-        "group/code-block relative overflow-hidden rounded-lg",
+        "group/code-block relative flex flex-col overflow-hidden rounded-lg",
         variant === "default" && "bg-secondary-background",
         variant === "light" && "bg-gray-100",
         variant === "dark" && "bg-gray-700",

package/dist/components/code-block/src/components/code-block-code.js

@@ -24,34 +24,46 @@ const codeBlockCodeTv = tcv({
   base: "text-message-code w-fit min-w-full bg-transparent font-mono [&>pre]:!bg-transparent [&>pre]:px-4 [&>pre]:py-4"
 });
 const CodeBlockCode = memo(function CodeBlockCode2(props) {
-  const { code, language = "tsx", className, variant: variantProp, codeBlock, ...rest } = props;
+  const { children, language = "tsx", className, variant: variantProp, codeBlock, ...rest } = props;
   const systemTheme = useTheme();
   const resolvedVariant = variantProp ?? ((codeBlock == null ? void 0 : codeBlock.variant) === "default" ? void 0 : codeBlock == null ? void 0 : codeBlock.variant);
   const theme = resolvedVariant ?? systemTheme;
   const [highlightedHtml, setHighlightedHtml] = useState(null);
   useEffect(() => {
+    let isMounted = true;
     async function highlight() {
-      if (!code) {
-        setHighlightedHtml("<pre><code></code></pre>");
+      if (!children) {
+        if (isMounted) setHighlightedHtml("<pre><code></code></pre>");
         return;
       }
       const resolvedLang = resolveLanguage(language);
+      const themeConfig = theme === "light" ? "github-light" : "github-dark";
       try {
-        const html = await codeToHtml(code, {
+        const html = await codeToHtml(children, {
           lang: resolvedLang,
-          theme: theme === "light" ? "github-light" : "github-dark"
+          theme: themeConfig
         });
-        setHighlightedHtml(html);
+        if (isMounted) setHighlightedHtml(html);
       } catch {
-        const html = await codeToHtml(code, {
-          lang: "text",
-          theme: theme === "light" ? "github-light" : "github-dark"
-        });
-        setHighlightedHtml(html);
+        try {
+          const html = await codeToHtml(children, {
+            lang: "text",
+            theme: themeConfig
+          });
+          if (isMounted) setHighlightedHtml(html);
+        } catch {
+          if (isMounted) {
+            const escaped = children.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            setHighlightedHtml(`<pre><code>${escaped}</code></pre>`);
+          }
+        }
       }
     }
     highlight();
-  }, [code, language, theme]);
+    return () => {
+      isMounted = false;
+    };
+  }, [children, language, theme]);
   const classNames = codeBlockCodeTv({ className });
   return highlightedHtml ? /* @__PURE__ */ jsx(
     "div",
@@ -65,7 +77,7 @@ const CodeBlockCode = memo(function CodeBlockCode2(props) {
     {
       className: tcx("min-w-0", classNames),
       ...rest,
-      children: /* @__PURE__ */ jsx("pre", { children: /* @__PURE__ */ jsx("code", { children: code }) })
+      children: /* @__PURE__ */ jsx("pre", { children: /* @__PURE__ */ jsx("code", { children }) })
     }
   );
 });

package/dist/components/code-block/src/components/code-block-content.d.ts

@@ -1,2 +1,2 @@
 import { CodeBlockContentProps } from '../types';
-export declare function CodeBlockContent(props: CodeBlockContentProps): import("react/jsx-runtime").JSX.Element | null;
+export declare const CodeBlockContent: import('react').NamedExoticComponent<CodeBlockContentProps>;