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

use anchor element for social links when in game #10277

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use anchor element for social links when in game #10277

Show file tree
Hide file tree
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
116 changes: 78 additions & 38 deletions react-common/components/controls/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from "react";
import { classList, ContainerProps, fireClickOnEnter } from "../util";

export interface ButtonViewProps extends ContainerProps {
buttonRef?: (ref: HTMLButtonElement) => void;
buttonRef?: (ref: HTMLButtonElement | HTMLAnchorElement) => void;
title: string;
label?: string | JSX.Element;
labelClassName?: string;
Expand All @@ -14,6 +14,7 @@ export interface ButtonViewProps extends ContainerProps {
target?: string;
tabIndex?: number;
style?: React.CSSProperties;
asAnchorElement?: boolean;

/** Miscellaneous aria pass-through props */
ariaControls?: string;
Expand Down Expand Up @@ -53,15 +54,11 @@ export const Button = (props: ButtonProps) => {
onBlur,
buttonRef,
title,
label,
labelClassName,
leftIcon,
rightIcon,
hardDisabled,
href,
target,
tabIndex,
children
asAnchorElement
} = props;

let {
Expand All @@ -78,44 +75,87 @@ export const Button = (props: ButtonProps) => {
);

let clickHandler = (ev: React.MouseEvent) => {
if (onClick) onClick();
if (href) window.open(href, target || "_blank", "noopener,noreferrer")
ev.stopPropagation();

if (onClick) {
onClick();
}
if (href) {
if (asAnchorElement) {
// handled using the href attribute, so don't prevent default
return;
}
window.open(href, target || "_blank", "noopener,noreferrer");
}
ev.preventDefault();
}

const elementProps = {
id: id,
className: classes,
style: style,
title: title,
ref: buttonRef,
onClick: !disabled ? clickHandler : undefined,
onKeyDown: onKeydown || fireClickOnEnter,
onBlur: onBlur,
role: role || (asAnchorElement ? undefined : "button"),
tabIndex: tabIndex || (disabled ? -1 : 0),
disabled: hardDisabled,
"aria-label": ariaLabel,
"aria-hidden": ariaHidden,
"aria-controls": ariaControls,
"aria-expanded": ariaExpanded,
"aria-haspopup": ariaHasPopup as any,
"aria-posinset": ariaPosInSet,
"aria-setsize": ariaSetSize,
"aria-describedby": ariaDescribedBy,
"aria-selected": ariaSelected,
"aria-pressed": ariaPressed,
}

if (asAnchorElement) {
return (
<a
{...elementProps}
href={href}
target={target || "_blank"}
rel="noopener,noreferrer"
>
<ButtonBody {...props} />
</a>
);
}

return (
<button
id={id}
className={classes}
style={style}
title={title}
ref={buttonRef}
onClick={!disabled ? clickHandler : undefined}
onKeyDown={onKeydown || fireClickOnEnter}
onBlur={onBlur}
role={role || "button"}
tabIndex={tabIndex || (disabled ? -1 : 0)}
disabled={hardDisabled}
aria-label={ariaLabel}
aria-hidden={ariaHidden}
aria-controls={ariaControls}
aria-expanded={ariaExpanded}
aria-haspopup={ariaHasPopup as any}
aria-posinset={ariaPosInSet}
aria-setsize={ariaSetSize}
aria-describedby={ariaDescribedBy}
aria-selected={ariaSelected}
aria-pressed={ariaPressed}>
{(leftIcon || rightIcon || label) && (
<span className="common-button-flex">
{leftIcon && <i className={leftIcon} aria-hidden={true}/>}
<span className={classList("common-button-label", labelClassName)}>
{label}
</span>
{rightIcon && <i className={"right " + rightIcon} aria-hidden={true}/>}
</span>)}
{children}
{...elementProps}
>
<ButtonBody {...props} />
</button>
);
}

const ButtonBody = (props: ButtonViewProps) => {
const {
label,
labelClassName,
leftIcon,
rightIcon,
children
} = props;
return (
<>
{(leftIcon || rightIcon || label) && (
<span className="common-button-flex">
{leftIcon && <i className={leftIcon} aria-hidden={true}/>}
<span className={classList("common-button-label", labelClassName)}>
{label}
</span>
{rightIcon && <i className={"right " + rightIcon} aria-hidden={true}/>}
</span>
)}
{children}
</>
)
}
71 changes: 41 additions & 30 deletions react-common/components/share/SocialButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,71 +14,82 @@ export const SocialButton = (props: SocialButtonProps) => {

const classes = classList(className, "social-button", "type")

const handleClick = () => {
const getSocialUrl = () => {
const socialOptions = pxt.appTarget.appTheme.socialOptions;
let socialUrl = '';

pxt.tickEvent(`share.social.${type}`);
switch (type) {
case "facebook": {
socialUrl = `https://www.facebook.com/sharer/sharer.php?u=${encodeURIComponent(url)}`;
break;
return `https://www.facebook.com/sharer/sharer.php?u=${encodeURIComponent(url)}`;
}
case "twitter": {
let twitterText = lf("Check out what I made!");
if (socialOptions.twitterHandle && socialOptions.orgTwitterHandle) {
twitterText = lf("Check out what I made with @{0} and @{1}!", socialOptions.twitterHandle, socialOptions.orgTwitterHandle);
} else if (socialOptions.twitterHandle) {
}
else if (socialOptions.twitterHandle) {
twitterText = lf("Check out what I made with @{0}!", socialOptions.twitterHandle);
} else if (socialOptions.orgTwitterHandle) {
}
else if (socialOptions.orgTwitterHandle) {
twitterText = lf("Check out what I made with @{0}!", socialOptions.orgTwitterHandle);
}
socialUrl = `https://twitter.com/intent/tweet?url=${encodeURIComponent(url)}` +
return `https://twitter.com/intent/tweet?url=${encodeURIComponent(url)}` +
`&text=${encodeURIComponent(twitterText)}` +
(socialOptions.hashtags ? `&hashtags=${encodeURIComponent(socialOptions.hashtags)}` : '') +
(socialOptions.related ? `&related=${encodeURIComponent(socialOptions.related)}` : '');
break;
}
case "discourse": {
// https://meta.discourse.org/t/compose-a-new-pre-filled-topic-via-url/28074
socialUrl = `${socialOptions.discourse || "https://forum.makecode.com/"}new-topic?title=${encodeURIComponent(url)}`;
if (socialOptions.discourseCategory)
socialUrl += `&category=${encodeURIComponent(socialOptions.discourseCategory)}`;
break;
let socialUrl = `${socialOptions.discourse || "https://forum.makecode.com/"}new-topic?title=${encodeURIComponent(url)}`;
if (socialOptions.discourseCategory) {
socialUrl += `&category=${encodeURIComponent(socialOptions.discourseCategory)}`;
}
return socialUrl;
}
case "google-classroom":
socialUrl = `https://classroom.google.com/share?url=${encodeURIComponent(url)}`;
break;
return `https://classroom.google.com/share?url=${encodeURIComponent(url)}`;
case "microsoft-teams":
socialUrl = `https://teams.microsoft.com/share?href=${encodeURIComponent(url)}`;
break;
return `https://teams.microsoft.com/share?href=${encodeURIComponent(url)}`;
case "whatsapp":
socialUrl = `https://api.whatsapp.com/send?text=${encodeURIComponent(url)}`;
break;
return `https://api.whatsapp.com/send?text=${encodeURIComponent(url)}`;
}
pxt.BrowserUtils.popupWindow(socialUrl, heading, 600, 600);
}

const handleClick = () => {
pxt.tickEvent(`share.social.${type}`);
}

const useLink = pxt.BrowserUtils.isInGame();

switch (type) {
// Icon buttons
case "facebook":
case "twitter":
case "discourse":
case "whatsapp":
return <Button className={classes}
ariaLabel={type}
title={heading}
leftIcon={`icon ${type}`}
onClick={handleClick} />
return (
<Button className={classes}
ariaLabel={type}
title={heading}
leftIcon={`icon ${type}`}
onClick={handleClick}
asAnchorElement={useLink}
href={getSocialUrl()}
/>
);

// Image buttons
case "google-classroom":
case "microsoft-teams":
return <Button className={classes}
ariaLabel={type}
title={heading}
label={<img src={`/static/logo/social-buttons/${type}.png`} alt={heading || pxt.U.rlf(type)} />}
onClick={handleClick} />
return (
<Button className={classes}
ariaLabel={type}
title={heading}
label={<img src={`/static/logo/social-buttons/${type}.png`} alt={heading || pxt.U.rlf(type)} />}
onClick={handleClick}
href={getSocialUrl()}
asAnchorElement={useLink}
/>
)
}


Expand Down
7 changes: 7 additions & 0 deletions react-common/styles/controls/Button.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,13 @@ a.common-button.menu-button {
}
}

a.common-button.square-button {
appearance: button;
display: flex;
align-items: center;
justify-content: center;
}


/****************************************************
* Circle Buttons *
Expand Down
Loading