The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
fix(SDK): fixed bugged scrolling in embedded metabot (second version) (#69265)
Sébastien084e3ea6dfec
diff --git a/e2e/test/scenarios/embedding/sdk-iframe-embedding/custom-elements-api.cy.spec.ts b/e2e/test/scenarios/embedding/sdk-iframe-embedding/custom-elements-api.cy.spec.tsindex 1e8fc9ad4da..cf5bee1804c 100644--- a/e2e/test/scenarios/embedding/sdk-iframe-embedding/custom-elements-api.cy.spec.ts+++ b/e2e/test/scenarios/embedding/sdk-iframe-embedding/custom-elements-api.cy.spec.ts@@ -390,6 +390,36 @@ describe("scenarios > embedding > sdk iframe embedding > custom elements api", (});describe("<metabase-metabot>", () => {+ it("should handle scrolling gracefully (metabase#67399)", () => {+ const question = `+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.+ `;++ H.visitCustomHtmlPage(`+ ${H.getNewEmbedScriptTag()}+ ${H.getNewEmbedConfigurationScript()}+ <metabase-metabot />+ `);++ H.getSimpleEmbedIframeContent().within(() => {+ cy.log("metabot chat should be interactive");+ cy.findByText("Ask questions to AI.").should("be.visible");++ cy.findByPlaceholderText("Ask AI a question...")+ .paste(question)+ .type("{enter}");++ // Making sure the ChatInput is still within the viewport+ cy.findByPlaceholderText("Ask AI a question...").should("be.visible");+ });+ });+it("should load the embedded Metabot component", () => {H.visitCustomHtmlPage(`${H.getNewEmbedScriptTag()}diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsxindex c1fd3c154fe..1fceece5924 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotChatInput.tsx@@ -50,7 +50,7 @@ export function MetabotChatInput() {ref={metabot.promptInputRef as LegacyRef<HTMLTextAreaElement>}autoFocusvalue={metabot.prompt}- disabled={metabot.isDoingScience}+ readOnly={metabot.isDoingScience}placeholder={placeholder}onChange={(e) => metabot.setPrompt(e.target.value)}classNames={{ input: S.chatInput }}diff --git a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsx b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsxindex a834627f01f..fed87506f3e 100644--- a/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsx+++ b/enterprise/frontend/src/embedding-sdk-ee/metabot/MetabotQuestion.tsx@@ -2,8 +2,8 @@ import { useElementSize } from "@mantine/hooks";import { useId, useMemo } from "react";import { P, match } from "ts-pattern";-import { FlexibleSizeComponent } from "embedding-sdk-bundle/components/private/FlexibleSizeComponent";import { withPublicComponentWrapper } from "embedding-sdk-bundle/components/private/PublicComponentWrapper";+import { ResizeWrapper } from "embedding-sdk-bundle/components/private/ResizeWrapper";import { SdkAdHocQuestion } from "embedding-sdk-bundle/components/private/SdkAdHocQuestion";import { SdkQuestionDefaultView } from "embedding-sdk-bundle/components/private/SdkQuestionDefaultView";import { METABOT_SDK_EE_PLUGIN } from "embedding-sdk-bundle/components/public/MetabotQuestion/MetabotQuestion";@@ -87,13 +87,13 @@ const MetabotQuestionInner = ({);}+ // avoids initial flickering+ if (!derivedLayout || containerWidth == null) {+ return null;+ }+return (- <FlexibleSizeComponent- height={height}- width={width}- className={className}- style={style}- >+ <ResizeWrapper h={height} w={width} className={className} style={style}><divref={containerRef}className={S.container}@@ -114,7 +114,7 @@ const MetabotQuestionInner = ({</Stack></div></div>- </FlexibleSizeComponent>+ </ResizeWrapper>);};diff --git a/frontend/src/embedding-sdk-bundle/components/private/ResizeWrapper.tsx b/frontend/src/embedding-sdk-bundle/components/private/ResizeWrapper.tsxnew file mode 100644index 00000000000..e440d9d87d4--- /dev/null+++ b/frontend/src/embedding-sdk-bundle/components/private/ResizeWrapper.tsx@@ -0,0 +1,63 @@+import { useResizeObserver } from "@mantine/hooks";+import type { ReactNode, RefObject } from "react";++import { Box, type BoxProps } from "metabase/ui";++import {+ FLEXIBLE_SIZE_DEFAULT_HEIGHT,+ FLEXIBLE_SIZE_DEFAULT_WIDTH,+} from "./FlexibleSizeComponent";++/**+ * Props for the ResizeWrapper component.+ * @extends BoxProps+ */+interface ResizeWrapperProps extends BoxProps {+ /** Content to be wrapped and resized */+ children: ReactNode;+ /** Optional ref to attach to the inner div that receives the measured dimensions */+ ref?: RefObject<HTMLDivElement>;+}++/**+ * A wrapper component that measures available space and applies those dimensions to its children.+ *+ * Uses a resize observer on the outer container to track size changes, then applies+ * the measured dimensions to an inner div wrapping the children. This ensures children+ * render with explicit dimensions matching their available space.+ *+ * @param props - Component props+ * @param props.children - Content to render inside the measured container+ * @param props.ref - Optional ref for the inner div (renamed to divRef internally to avoid conflict)+ * @param props...props - Additional BoxProps passed to the outer Box container+ *+ * @example+ * ```tsx+ * <ResizeWrapper>+ * <MyChart />+ * </ResizeWrapper>+ * ```+ */+export function ResizeWrapper({+ children,+ ref: divRef,+ h = FLEXIBLE_SIZE_DEFAULT_HEIGHT,+ w = FLEXIBLE_SIZE_DEFAULT_WIDTH,+ ...props+}: ResizeWrapperProps) {+ const [ref, rect] = useResizeObserver();++ return (+ <Box ref={ref} w={w} h={h} {...props}>+ <div+ ref={divRef}+ style={{+ width: rect.width,+ height: rect.height,+ }}+ >+ {children}+ </div>+ </Box>+ );+}