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

Jump to bottom

Allow for smaller share dialog when we don't want previews #9655

Merged
merged 1 commit into from
Aug 25, 2023
Merged

Allow for smaller share dialog when we don't want previews #9655

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
3 changes: 2 additions & 1 deletion react-common/components/share/ShareInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ export const ShareInfo = (props: ShareInfoProps) => {
const [ isAnonymous, setIsAnonymous ] = React.useState(!isLoggedIn || anonymousShareByDefault);
const [ isShowingMultiConfirmation, setIsShowingMultiConfirmation ] = React.useState(false);

const showSimulator = !!simRecorder;
const { simScreenshot, simGif } = pxt.appTarget.appTheme;
const showSimulator = (simScreenshot || simGif) && !!simRecorder;
const showDescription = shareState !== "publish";
let qrCodeButtonRef: HTMLButtonElement;
let inputRef: HTMLInputElement;
Expand Down
6 changes: 2 additions & 4 deletions webapp/src/share.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,7 @@ export class ShareEditor extends auth.Component<ShareEditorProps, ShareEditorSta
const { visible, projectName: newProjectName, title, screenshotUri } = this.state;
const { simScreenshot, simGif } = pxt.appTarget.appTheme;
const hasIdentity = auth.hasIdentity() && this.isLoggedIn();
const light = !!pxt.options.light;
const thumbnails = pxt.appTarget.cloud && pxt.appTarget.cloud.thumbnails
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was pxt.appTarget.cloud.thumbnails superfluous in some way? I don't really know what it represents, but was curious as to why it was removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure as to what it did, honestly. But the light and thumbnails variables were never used, and for the case of share dialog, if it's specified in pxtarget.json that we do or don't want the thumbnails, I think that's enough to either supply or ignore them.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, got it. I missed that it was unused before your change.

&& (simScreenshot || simGif);
const thumbnails = simScreenshot || simGif;

const hasProjectBeenPersistentShared = parent.hasHeaderBeenPersistentShared();

Expand All @@ -209,7 +207,7 @@ export class ShareEditor extends auth.Component<ShareEditorProps, ShareEditorSta
return visible
? <Modal
title={lf("Share Project")}
className="sharedialog wide"
className={`sharedialog${thumbnails ? " wide" : ""}`}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahah, was my guesstimate of 40rem just the default when it's not .wide? Looks same

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep! I was a bit mind blown by that!

image

parentElement={document.getElementById("root") || undefined}
onClose={this.hide}>
<Share projectName={newProjectName}
Expand Down
Loading