Skip to content

poc: make cat-blocks a configurable theme #374

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

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
+9 −2
Draft

poc: make cat-blocks a configurable theme #374

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
6 changes: 5 additions & 1 deletion packages/scratch-gui/src/containers/blocks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ class Blocks extends React.Component {
);
}
componentDidUpdate (prevProps) {
if (this.props.useCatBlocks !== prevProps.useCatBlocks) {
this.ScratchBlocks = VMScratchBlocks(this.props.vm, this.props.useCatBlocks);
}

// If any modals are open, call hideChaff to close z-indexed field editors
if (this.props.anyModalVisible && !prevProps.anyModalVisible) {
this.ScratchBlocks.hideChaff();
Expand Down Expand Up @@ -699,7 +703,7 @@ const mapStateToProps = state => ({
toolboxXML: state.scratchGui.toolbox.toolboxXML,
customProceduresVisible: state.scratchGui.customProcedures.active,
workspaceMetrics: state.scratchGui.workspaceMetrics,
useCatBlocks: isTimeTravel2020(state)
useCatBlocks: isTimeTravel2020(state) || state.scratchGui.theme.theme === 'high-contrast'
});

const mapDispatchToProps = dispatch => ({
Expand Down
5 changes: 4 additions & 1 deletion packages/scratch-gui/src/lib/blocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
* @returns {ScratchBlocks} ScratchBlocks connected with the vm
*/
export default function (vm, useCatBlocks) {
const ScratchBlocks = useCatBlocks ? require('cat-blocks') : require('scratch-blocks');
const ScratchBlocks = require('scratch-blocks');

ScratchBlocks.useCatBlocks = useCatBlocks;

const jsonForMenuBlock = function (name, menuOptionsFn, colors, start) {
return {
message0: '%1',
Expand Down
Loading