Skip to content

chore: sync fork with upstream (dynamic blocks & project_title) #19

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

Closed
NeuronPulse wants to merge 2 commits into from
Closed

chore: sync fork with upstream (dynamic blocks & project_title) #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b37cb1d
Added support for more argument types for dynamic extension blocks (#…
Mythylvia Jun 7, 2026
c9f6ba5
Support `project_title` parameter (#1166)
bddjr Jun 28, 2026
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
16 changes: 16 additions & 0 deletions src/lib/define-dynamic-block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,27 @@ const defineDynamicBlock = (ScratchBlocks, categoryInfo, staticBlockInfo, extend
const arg = blockInfo.arguments[argName];
switch (arg.type) {
case ArgumentType.STRING:
case ArgumentType.NUMBER:
case ArgumentType.ANGLE:
case ArgumentType.MATRIX:
case ArgumentType.NOTE:
case ArgumentType.COLOR:
case ArgumentType.COSTUME:
case ArgumentType.SOUND:
args.push({type: 'input_value', name: argName});
break;
case ArgumentType.BOOLEAN:
args.push({type: 'input_value', name: argName, check: 'Boolean'});
break;
case ArgumentType.IMAGE:
args.push({
type: 'field_image',
src: arg.dataURI || '',
width: 24,
height: 24,
flip_rtl: arg.flipRTL || false
});
break;
}
return `%${++argCount}`;
});
Expand Down
19 changes: 14 additions & 5 deletions src/lib/titled-hoc.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ const TitledHOC = function (WrappedComponent) {
// if project is a new default project, and has loaded,
if (this.props.isShowingWithoutId && prevProps.isAnyCreatingNewState) {
// reset title to default
const defaultProjectTitle = this.handleReceivedProjectTitle();
this.props.onUpdateProjectTitle(defaultProjectTitle, true);
const {title, isDefault} = this.handleReceivedProjectTitle();
this.props.onUpdateProjectTitle(title, isDefault);
}
// if the projectTitle hasn't changed, but the reduxProjectTitle
// HAS changed, we need to report that change to the projectTitle's owner
Expand All @@ -51,11 +51,20 @@ const TitledHOC = function (WrappedComponent) {
let newTitle = requestedTitle;
let isDefault = false;
if (newTitle === null || typeof newTitle === 'undefined') {
newTitle = this.props.intl.formatMessage(messages.defaultProjectTitle);
isDefault = true;
const urlTitle = typeof URLSearchParams !== 'undefined' &&
new URLSearchParams(location.search).get('project_title');
if (urlTitle) {
newTitle = urlTitle;
} else {
newTitle = this.props.intl.formatMessage(messages.defaultProjectTitle);
isDefault = true;
}
}
this.props.onChangedProjectTitle(newTitle, isDefault);
return newTitle;
return {
title: newTitle,
isDefault
};
}
render () {
const {
Expand Down
Loading