Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the help link button in the monaco flyout #10008

Merged
merged 1 commit into from
May 8, 2024
Merged

Fix the help link button in the monaco flyout #10008

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions webapp/src/monacoFlyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import * as workspace from "./workspace";
import * as data from "./data";
import * as auth from "./auth";
import { HELP_IMAGE_URI } from "../../pxteditor";
import * as pxtblockly from "../../pxtblocks";

import ISettingsProps = pxt.editor.ISettingsProps;

Expand Down Expand Up @@ -353,7 +354,11 @@ export class MonacoFlyout extends data.Component<MonacoFlyoutProps, MonacoFlyout
const params = block.parameters;
const blockColor = pxt.toolbox.getAccessibleBackground(block.attributes.color || color);
const blockDescription = this.getBlockDescription(block, params ? params.slice() : null);
const helpUrl = block.attributes.help;
const helpUrl = pxt.blocks.getHelpUrl(block as pxtc.SymbolInfo);

const openHelp = () => {
pxtblockly.external.openHelpUrl(helpUrl);
};

const qName = this.getQName(block) || this.getSnippetName(block);
const selected = qName == this.state.selectedBlock;
Expand Down Expand Up @@ -385,9 +390,11 @@ export class MonacoFlyout extends data.Component<MonacoFlyoutProps, MonacoFlyout
<div className="description">{description}</div>
<div className="signature">
<span>{snippet ? snippet : `${qName}(${params ? params.map(p => `${p.name}`).join(", ") : ""})`}</span>
{helpUrl && <a className="blockHelp" href={`/reference/${helpUrl}`} target="_blank" rel="noopener noreferrer" role="button">
<i className="question circle outline icon" aria-label={lf("Open documentation")}></i>
</a>}
{helpUrl &&
<a className="blockHelp" role="button" onClick={openHelp}>
<i className="question circle outline icon" aria-label={lf("Open documentation")}></i>
</a>
}
</div>
{params && <div className="params">
{params.map((p, i) => {
Expand Down