From aa8319ce2ec2371dce5cdc0a0a3e9e0a53f93575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atte=20Kein=C3=A4nen?= <atte.keinanen@gmail.com> Date: Fri, 21 Apr 2017 10:23:06 -0700 Subject: [PATCH] Fix the centering bug of sharing/embedding page --- .../components/widgets/EmbedModalContent.jsx | 66 +++++++++++-------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx b/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx index e46b9fb677f..916a529a7f2 100644 --- a/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx +++ b/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx @@ -163,42 +163,50 @@ export default class EmbedModalContent extends Component<*, Props, State> { }} /> </div> - <div className="flex flex-full"> - { embedType == null ? - <div className="flex-full ml-auto mr-auto" style={{ maxWidth: 1040 }}> + { embedType == null ? + <div className="flex-full"> + {/* Center only using margins because */} + <div className="ml-auto mr-auto" style={{maxWidth: 1040}}> <SharingPane {...this.props} publicUrl={getUnsignedPreviewUrl(siteUrl, resourceType, resource.public_uuid, displayOptions)} iframeUrl={getUnsignedPreviewUrl(siteUrl, resourceType, resource.public_uuid, displayOptions)} - onChangeEmbedType={(embedType) => this.setState({ embedType })} + onChangeEmbedType={(embedType) => this.setState({embedType})} /> </div> + </div> : embedType === "application" ? - <AdvancedEmbedPane - pane={pane} - resource={resource} - resourceType={resourceType} - embedType={embedType} - token={getSignedToken(resourceType, resource.id, params, secretKey, embeddingParams)} - iframeUrl={getSignedPreviewUrl(siteUrl, resourceType, resource.id, params, displayOptions, secretKey, embeddingParams)} - siteUrl={siteUrl} - secretKey={secretKey} - params={params} - displayOptions={displayOptions} - previewParameters={previewParameters} - parameterValues={parameterValues} - resourceParameters={resourceParameters} - embeddingParams={embeddingParams} - onChangeDisplayOptions={(displayOptions) => this.setState({ displayOptions })} - onChangeEmbeddingParameters={(embeddingParams) => this.setState({ embeddingParams })} - onChangeParameterValue={(id, value) => this.setState({ parameterValues: { ...parameterValues, [id]: value }})} - onChangePane={(pane) => this.setState({ pane })} - onSave={this.handleSave} - onUnpublish={this.handleUnpublish} - onDiscard={this.handleDiscard} - /> - : null } - </div> + <div className="flex flex-full"> + <AdvancedEmbedPane + pane={pane} + resource={resource} + resourceType={resourceType} + embedType={embedType} + token={getSignedToken(resourceType, resource.id, params, secretKey, embeddingParams)} + iframeUrl={getSignedPreviewUrl(siteUrl, resourceType, resource.id, params, displayOptions, secretKey, embeddingParams)} + siteUrl={siteUrl} + secretKey={secretKey} + params={params} + displayOptions={displayOptions} + previewParameters={previewParameters} + parameterValues={parameterValues} + resourceParameters={resourceParameters} + embeddingParams={embeddingParams} + onChangeDisplayOptions={(displayOptions) => this.setState({displayOptions})} + onChangeEmbeddingParameters={(embeddingParams) => this.setState({embeddingParams})} + onChangeParameterValue={(id, value) => this.setState({ + parameterValues: { + ...parameterValues, + [id]: value + } + })} + onChangePane={(pane) => this.setState({pane})} + onSave={this.handleSave} + onUnpublish={this.handleUnpublish} + onDiscard={this.handleDiscard} + /> + </div> + : null } </div> ); } -- GitLab