diff --git a/src/components/gui/gui.jsx b/src/components/gui/gui.jsx index 360c725b7..bb8585d1a 100644 --- a/src/components/gui/gui.jsx +++ b/src/components/gui/gui.jsx @@ -33,6 +33,7 @@ import TelemetryModal from '../telemetry-modal/telemetry-modal.jsx'; import layout, {STAGE_SIZE_MODES} from '../../lib/layout-constants'; import {resolveStageSize} from '../../lib/screen-utils'; +import {themeMap} from '../../lib/themes'; import styles from './gui.css'; import addExtensionIcon from './icon--extensions.svg'; @@ -308,7 +309,7 @@ const GUIComponent = props => { isVisible={blocksTabVisible} key={theme} options={{ - media: `${basePath}static/blocks-media/` + media: `${basePath}static/${themeMap[theme].blocksMediaFolder}/` }} stageSize={stageSize} theme={theme} diff --git a/src/components/record-modal/record-modal.css b/src/components/record-modal/record-modal.css index 41fc90a96..42f00649a 100644 --- a/src/components/record-modal/record-modal.css +++ b/src/components/record-modal/record-modal.css @@ -106,7 +106,8 @@ text-align: center; } -.record-button { +/* Increase specificity to make sure this wins out over normalize.css */ +svg.record-button { overflow: visible; } diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx index ae5e175e7..f890f7984 100644 --- a/src/containers/blocks.jsx +++ b/src/containers/blocks.jsx @@ -19,7 +19,7 @@ import DropAreaHOC from '../lib/drop-area-hoc.jsx'; import DragConstants from '../lib/drag-constants'; import defineDynamicBlock from '../lib/define-dynamic-block'; import {DEFAULT_THEME, getColorsForTheme, themeMap} from '../lib/themes'; -import {injectExtensionBlockColors, injectExtensionCategoryColors} from '../lib/themes/blockHelpers'; +import {injectExtensionBlockTheme, injectExtensionCategoryTheme} from '../lib/themes/blockHelpers'; import {connect} from 'react-redux'; import {updateToolbox} from '../reducers/toolbox'; @@ -349,7 +349,7 @@ class Blocks extends React.Component { const stageCostumes = stage.getCostumes(); const targetCostumes = target.getCostumes(); const targetSounds = target.getSounds(); - const dynamicBlocksXML = injectExtensionCategoryColors( + const dynamicBlocksXML = injectExtensionCategoryTheme( this.props.vm.runtime.getBlocksXML(target), this.props.theme ); @@ -436,7 +436,7 @@ class Blocks extends React.Component { if (blockInfo.info && blockInfo.info.isDynamic) { dynamicBlocksInfo.push(blockInfo); } else if (blockInfo.json) { - staticBlocksJson.push(injectExtensionBlockColors(blockInfo.json, this.props.theme)); + staticBlocksJson.push(injectExtensionBlockTheme(blockInfo.json, this.props.theme)); } // otherwise it's a non-block entry such as '---' }); diff --git a/src/lib/themes/__mocks__/dark-mode.js b/src/lib/themes/__mocks__/dark-mode.js index 793270dd6..b3bcd65fd 100644 --- a/src/lib/themes/__mocks__/dark-mode.js +++ b/src/lib/themes/__mocks__/dark-mode.js @@ -10,4 +10,9 @@ const blockColors = { text: '#BBBBBB' }; -export default blockColors; +const extensions = {}; + +export { + blockColors, + extensions +} diff --git a/src/lib/themes/__mocks__/default-colors.js b/src/lib/themes/__mocks__/default-colors.js index f5e7aa48c..d3b3bc94b 100644 --- a/src/lib/themes/__mocks__/default-colors.js +++ b/src/lib/themes/__mocks__/default-colors.js @@ -13,4 +13,6 @@ const blockColors = { workspace: '#555555' }; -export default blockColors; +export { + blockColors +}; diff --git a/src/lib/themes/blockHelpers.js b/src/lib/themes/blockHelpers.js index baf0cb0f9..72ef02237 100644 --- a/src/lib/themes/blockHelpers.js +++ b/src/lib/themes/blockHelpers.js @@ -1,4 +1,4 @@ -import {DEFAULT_THEME, getColorsForTheme} from '.'; +import {DEFAULT_THEME, getColorsForTheme, themeMap} from '.'; // scratch-blocks colours has a pen property that scratch-gui uses for all extensions const getExtensionColors = theme => getColorsForTheme(theme).pen; @@ -12,11 +12,12 @@ const getExtensionColors = theme => getColorsForTheme(theme).pen; * @param {string} theme - Theme name * @returns {Array.} Dynamic block XML updated with colors. */ -const injectExtensionCategoryColors = (dynamicBlockXML, theme) => { +const injectExtensionCategoryTheme = (dynamicBlockXML, theme) => { // Don't do any manipulation for the default theme if (theme === DEFAULT_THEME) return dynamicBlockXML; const extensionColors = getExtensionColors(theme); + const extensionIcons = themeMap[theme].extensions; const parser = new DOMParser(); const serializer = new XMLSerializer(); @@ -27,6 +28,10 @@ const injectExtensionCategoryColors = (dynamicBlockXML, theme) => { // Note: the category's secondaryColour matches up with the blocks' tertiary color, both used for border color. dom.documentElement.setAttribute('secondaryColour', extensionColors.tertiary); + if (extensionIcons[extension.id] && extensionIcons[extension.id].menuIconURI) { + dom.documentElement.setAttribute('iconURI', extensionIcons[extension.id].menuIconURI); + } + return { ...extension, xml: serializer.serializeToString(dom) @@ -34,6 +39,29 @@ const injectExtensionCategoryColors = (dynamicBlockXML, theme) => { }); }; +const isScratchExtension = blockInfoJson => (blockInfoJson.extensions || []).includes('scratch_extension'); + +const injectBlockIcons = (blockInfoJson, theme) => { + if (!blockInfoJson.args0 || blockInfoJson.args0[0].type !== 'field_image') return blockInfoJson; + + const extensionIcons = themeMap[theme].extensions; + const extension = blockInfoJson.type.substring(0, blockInfoJson.type.indexOf('_')); + + if (!extensionIcons[extension] || !extensionIcons[extension].blockIconURI) return blockInfoJson; + + return { + ...blockInfoJson, + args0: blockInfoJson.args0.map((value, index) => { + if (index !== 0) return value; + + return { + ...value, + src: extensionIcons[extension].blockIconURI + }; + }) + }; +}; + /** * Applies extension color theme to static block json. * No changes are applied if called with the default theme, allowing extensions to provide their own colors. @@ -41,14 +69,14 @@ const injectExtensionCategoryColors = (dynamicBlockXML, theme) => { * @param {string} theme - Theme name * @returns {object} Block info json with updated colors. The original blockInfoJson is not modified. */ -const injectExtensionBlockColors = (blockInfoJson, theme) => { +const injectExtensionBlockTheme = (blockInfoJson, theme) => { // Don't do any manipulation for the default theme if (theme === DEFAULT_THEME) return blockInfoJson; const extensionColors = getExtensionColors(theme); return { - ...blockInfoJson, + ...injectBlockIcons(blockInfoJson, theme), colour: extensionColors.primary, colourSecondary: extensionColors.secondary, colourTertiary: extensionColors.tertiary, @@ -57,6 +85,6 @@ const injectExtensionBlockColors = (blockInfoJson, theme) => { }; export { - injectExtensionBlockColors, - injectExtensionCategoryColors + injectExtensionBlockTheme, + injectExtensionCategoryTheme }; diff --git a/src/lib/themes/dark-mode.js b/src/lib/themes/dark-mode.js index 6842c8b39..d1e865163 100644 --- a/src/lib/themes/dark-mode.js +++ b/src/lib/themes/dark-mode.js @@ -76,4 +76,9 @@ const blockColors = { menuHover: 'rgba(255, 255, 255, 0.3)' }; -export default blockColors; +const extensions = {}; + +export { + blockColors, + extensions +}; diff --git a/src/lib/themes/default-colors.js b/src/lib/themes/default-colors.js index 1b53026c5..3a754dca3 100644 --- a/src/lib/themes/default-colors.js +++ b/src/lib/themes/default-colors.js @@ -100,4 +100,6 @@ const blockColors = { menuHover: 'rgba(0, 0, 0, 0.2)' }; -export default blockColors; +export { + blockColors +}; diff --git a/src/lib/themes/high-contrast.js b/src/lib/themes/high-contrast.js index e8f7c0121..16a09283f 100644 --- a/src/lib/themes/high-contrast.js +++ b/src/lib/themes/high-contrast.js @@ -80,4 +80,30 @@ const blockColors = { menuHover: 'rgba(255, 255, 255, 0.3)' }; -export default blockColors; +const extensions = { + music: { + // eslint-disable-next-line max-len + blockIconURI: 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHZpZXdCb3g9IjAgMCA0MCA0MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTI2LjQzMzggMzBDMjkuNTEzIDMwIDMxLjYzNjYgMjguMTU2OSAzMS4xNzkgMjUuODc0QzI4LjI5OTQgMTMuMDQzNiAyNy40MjU2IDkuODUxMzQgMjcuOTQ1NCA5LjYwNTQ3QzI4LjMxMjUgOS40MzE4MyAyOS4zNzQ2IDEwLjcyNzYgMzAuOTE2MiAxMS4xMzU5QzM0LjY0MTYgMTIuMTEyNiA0MC4yNzQyIDYuNDA3NTEgMzQuNTY1NSA3LjI5MTg2QzMyLjMyMjQgNy42MzkgMzAuMTU4NyA2LjIzODM2IDI4LjQ4NzkgNS4xNTY3OUMyNS45MDcyIDMuNDg2MiAyNC41MDI0IDIuNTc2ODQgMjUuNzk3NCAxMC4wNDUxQzI2LjQzNDkgMTMuNzAzNSAyNi45Njk3IDE2LjMyMzEgMjcuMzQ3NSAxOC4xNzM5QzI3Ljk5NTcgMjEuMzQ5NCAyOC4xODE5IDIyLjI2MTYgMjcuNjMyNSAyMi4yNzQxQzI3LjMzMjEgMjIuMTUyIDI3LjAzMjcgMjIuMDU3OCAyNi42OTU3IDIxLjk3MjRDMjYuMDg4IDIxLjgyMjUgMjUuNDUxNiAyMS43MzgyIDI0LjgwNTMgMjEuNzM4MkMyMS43MjcxIDIxLjczODIgMTkuNjAzNiAyMy41ODkyIDIwLjA2MjEgMjUuODc0QzIwLjUxMDcgMjguMTU2OSAyMy4zNjQ2IDMwIDI2LjQzMzggMzBaIiBmaWxsPSJibGFjayIvPgo8cGF0aCBkPSJNOS40Mzg2MSAzNi4wMDAxQzEyLjUwNjUgMzYuMDAwMSAxNC42MzAyIDM0LjE0OCAxNC4xODE3IDMxLjg2NDJDMTEuMzAzMiAxOS4wMzM2IDEwLjQyOTkgMTUuODQxNiAxMC45NDk2IDE1LjU5NThDMTEuMzE2NiAxNS40MjIyIDEyLjM3ODMgMTYuNzE3NyAxMy45MTkgMTcuMTI2QzE3LjY0MjggMTguMTEzNiAyMy4yNzI5IDEyLjM5ODUgMTcuNTY2NyAxMy4yOTE4QzE1LjMyNDggMTMuNjM4NiAxMy4xNjIzIDEyLjIzODIgMTEuNDkyMiAxMS4xNTY5QzguOTEyMzcgOS40ODYzNiA3LjUwNzk3IDguNTc2OTggOC44MDI1MSAxNi4wNDUxQzkuNDQyOTQgMTkuNzI4NiA5Ljk3OTggMjIuMzU5NCAxMC4zNTggMjQuMjEyNUMxMC45OTEyIDI3LjMxNTQgMTEuMTc5NSAyOC4yMzg0IDEwLjY2NDQgMjguMjczMkM5Ljc4NDMyIDI3LjkyNTggOC44MTIzOSAyNy43MjkzIDcuODEwODIgMjcuNzI5M0M0LjczNCAyNy43MjkzIDIuNjExMzQgMjkuNTgwNCAzLjA1OTc4IDMxLjg2NDJDMy41MTgwOSAzNC4xNDggNi4zNzA2OSAzNi4wMDAxIDkuNDM4NjEgMzYuMDAwMVoiIGZpbGw9ImJsYWNrIi8+Cjwvc3ZnPgo=' + }, + pen: { + // eslint-disable-next-line max-len + blockIconURI: 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHZpZXdCb3g9IjAgMCA0MCA0MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik04Ljc1MjkgMzQuNjAyNUw0LjUwMTkgMzYuMzgwNUw2LjI4NTkgMzIuMTQ0NUM3LjUwMzkgMjkuMjUzNSA5LjE5MjkgMjYuNzIyNSAxMS4zMTU5IDI0LjYwNzVMMzEuMDY2OSA0LjkyOTVDMzEuOTExOSA0LjA4NzUgMzMuNzE2OSA0LjUyMDUgMzUuMDk3OSA1Ljg5NjVDMzYuNDc4OSA3LjI3MjUgMzYuOTEzOSA5LjA3MDUgMzYuMDY3OSA5LjkxMjVMMTYuMzE3OSAyOS41OTA1QzE0LjE5NDkgMzEuNzA1NSAxMS42NTM5IDMzLjM4ODUgOC43NTI5IDM0LjYwMjVaIiBmaWxsPSJ3aGl0ZSIvPgo8cGF0aCBkPSJNOC43NTI5IDM0LjYwMjVMNC41MDE5IDM2LjM4MDVMNi4yODU5IDMyLjE0NDVDNy41MDM5IDI5LjI1MzUgOS4xOTI5IDI2LjcyMjUgMTEuMzE1OSAyNC42MDc1TDMxLjA2NjkgNC45Mjk1QzMxLjkxMTkgNC4wODc1IDMzLjcxNjkgNC41MjA1IDM1LjA5NzkgNS44OTY1QzM2LjQ3ODkgNy4yNzI1IDM2LjkxMzkgOS4wNzA1IDM2LjA2NzkgOS45MTI1TDE2LjMxNzkgMjkuNTkwNUMxNC4xOTQ5IDMxLjcwNTUgMTEuNjUzOSAzMy4zODg1IDguNzUyOSAzNC42MDI1IiBzdHJva2U9IiMwQjhFNjkiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8cGF0aCBkPSJNMjkuNDA5MiA2LjExMTNDMjkuNDA5MiA2LjExMTMgMjQuOTYwMiAzLjczMjMgMjEuMjA4MiAxMS44ODIzQzE5LjQ3NDIgMTUuNjQ4MyAxNi44NTgyIDEzLjQyODMgMTYuODU4MiAxMy40MjgzIiBzdHJva2U9IiMwQjhFNjkiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTM2LjQyMDkgOC44MjUxQzM2LjQyMDkgOS4yODgxIDM2LjI3OTkgOS42OTgxIDM1Ljk4NzkgOS45ODkxTDI2LjY1MjkgMTkuMjkwMUMyNi45MzQ5IDE4Ljk5OTEgMjcuMDYzOSAxOC42MjIxIDI3LjA2MzkgMTguMTY5MUMyNy4wNjM5IDE3LjI5NjEgMjYuNTU1OSAxNi4yMDcxIDI1LjY1NjkgMTUuMzAyMUMyNC4yOTQ5IDEzLjk0NDEgMjIuNTA5OSAxMy41MDIxIDIxLjY1NDkgMTQuMzExMUwzMC45ODk5IDUuMDEwMUMzMS44MzM5IDQuMTY5MSAzMy42NDA5IDQuNjAwMSAzNS4wMjQ5IDUuOTY5MUMzNS45MjI5IDYuODc0MSAzNi40MjA5IDcuOTUyMSAzNi40MjA5IDguODI1MVoiIGZpbGw9IiM0Qzk3RkYiLz4KPHBhdGggZD0iTTM2LjQyMDkgOC44MjUxQzM2LjQyMDkgOS4yODgxIDM2LjI3OTkgOS42OTgxIDM1Ljk4NzkgOS45ODkxTDI2LjY1MjkgMTkuMjkwMUMyNi45MzQ5IDE4Ljk5OTEgMjcuMDYzOSAxOC42MjIxIDI3LjA2MzkgMTguMTY5MUMyNy4wNjM5IDE3LjI5NjEgMjYuNTU1OSAxNi4yMDcxIDI1LjY1NjkgMTUuMzAyMUMyNC4yOTQ5IDEzLjk0NDEgMjIuNTA5OSAxMy41MDIxIDIxLjY1NDkgMTQuMzExMUwzMC45ODk5IDUuMDEwMUMzMS44MzM5IDQuMTY5MSAzMy42NDA5IDQuNjAwMSAzNS4wMjQ5IDUuOTY5MUMzNS45MjI5IDYuODc0MSAzNi40MjA5IDcuOTUyMSAzNi40MjA5IDguODI1MSIgc3Ryb2tlPSIjMEI4RTY5IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMC41MTQ2IDMzLjc3MzlDOS45NDE2IDM0LjA3NTkgOS4zNTc2IDM0LjM0NDkgOC43NTA2IDM0LjYwMzlMNC40OTk2IDM2LjM4MTlMNi4yODU2IDMyLjE0NjlDNi41NDM2IDMxLjU0MjkgNi44MTQ2IDMwLjk2MDkgNy4xMTg2IDMwLjM4OTlDNy44MDk2IDMwLjU3MjkgOC41Njc2IDMxLjAxNDkgOS4yMjc2IDMxLjY3MTlDOS44ODY2IDMyLjMyOTkgMTAuMzI5NiAzMy4wODM5IDEwLjUxNDYgMzMuNzczOVoiIGZpbGw9IiM0Qzk3RkYiLz4KPHBhdGggZD0iTTEwLjUxNDYgMzMuNzczOUM5Ljk0MTYgMzQuMDc1OSA5LjM1NzYgMzQuMzQ0OSA4Ljc1MDYgMzQuNjAzOUw0LjQ5OTYgMzYuMzgxOUw2LjI4NTYgMzIuMTQ2OUM2LjU0MzYgMzEuNTQyOSA2LjgxNDYgMzAuOTYwOSA3LjExODYgMzAuMzg5OUM3LjgwOTYgMzAuNTcyOSA4LjU2NzYgMzEuMDE0OSA5LjIyNzYgMzEuNjcxOUM5Ljg4NjYgMzIuMzI5OSAxMC4zMjk2IDMzLjA4MzkgMTAuNTE0NiAzMy43NzM5IiBzdHJva2U9IiMwQjhFNjkiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8ZyBvcGFjaXR5PSIwLjE1Ij4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zNi40OTggOC43NDg1QzM2LjQ5OCA5LjIxMTUgMzYuMzU3IDkuNjIxNSAzNi4wNjUgOS45MTI1TDE2LjMyMyAyOS41OTI1QzE0LjE5MiAzMS43MDQ1IDExLjY1IDMzLjM4NTUgOC43NTEgMzQuNjAzNUw0LjUgMzYuMzgxNUw1LjQ3NCAzNC4wNjQ1TDcuMzk5IDMzLjI1NjVDMTAuMjk4IDMyLjAzODUgMTIuODQgMzAuMzU3NSAxNC45NzEgMjguMjQ1NUwzNC43MTMgOC41NjU1QzM1LjAwNSA4LjI3NDUgMzUuMTQ1IDcuODY0NSAzNS4xNDUgNy40MDE1QzM1LjE0NSA2Ljc1NDUgMzQuODc1IDYuMDAwNSAzNC4zNjYgNS4yNzg1QzM0LjYxNSA1LjQ1MDUgMzQuODY0IDUuNjU1NSAzNS4xMDIgNS44OTI1QzM2IDYuNzk3NSAzNi40OTggNy44NzU1IDM2LjQ5OCA4Ljc0ODVaIiBmaWxsPSIjMEI4RTY5Ii8+CjxwYXRoIGQ9Ik0zNi40OTggOC43NDg1QzM2LjQ5OCA5LjIxMTUgMzYuMzU3IDkuNjIxNSAzNi4wNjUgOS45MTI1TDE2LjMyMyAyOS41OTI1QzE0LjE5MiAzMS43MDQ1IDExLjY1IDMzLjM4NTUgOC43NTEgMzQuNjAzNUw0LjUgMzYuMzgxNUw1LjQ3NCAzNC4wNjQ1TDcuMzk5IDMzLjI1NjVDMTAuMjk4IDMyLjAzODUgMTIuODQgMzAuMzU3NSAxNC45NzEgMjguMjQ1NUwzNC43MTMgOC41NjU1QzM1LjAwNSA4LjI3NDUgMzUuMTQ1IDcuODY0NSAzNS4xNDUgNy40MDE1QzM1LjE0NSA2Ljc1NDUgMzQuODc1IDYuMDAwNSAzNC4zNjYgNS4yNzg1QzM0LjYxNSA1LjQ1MDUgMzQuODY0IDUuNjU1NSAzNS4xMDIgNS44OTI1QzM2IDYuNzk3NSAzNi40OTggNy44NzU1IDM2LjQ5OCA4Ljc0ODUiIHN0cm9rZT0iIzBCOEU2OSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjwvZz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xOC40NTAyIDEyLjgzMUMxOC40NTAyIDEzLjMzIDE4LjA0NjIgMTMuNzM1IDE3LjU0NjIgMTMuNzM1QzE3LjA0NzIgMTMuNzM1IDE2LjY0MTIgMTMuMzMgMTYuNjQxMiAxMi44MzFDMTYuNjQxMiAxMi4zMzEgMTcuMDQ3MiAxMS45MjcgMTcuNTQ2MiAxMS45MjdDMTguMDQ2MiAxMS45MjcgMTguNDUwMiAxMi4zMzEgMTguNDUwMiAxMi44MzFaIiBmaWxsPSIjMEI4RTY5IiBzdHJva2U9IiMwQjhFNjkiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8L3N2Zz4K' + }, + text2speech: { + // eslint-disable-next-line max-len + blockIconURI: 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHZpZXdCb3g9IjAgMCA0MCA0MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE2IDIxLjY2OTNWMzQuMjgzNEMxNiAzNS44MTUxIDE0IDM2LjUzNTkgMTIuOCAzNS41NDQ4TDEwLjIgMzMuMzgyNEM5LjIgMzIuNTcxNSA4IDMyLjIxMTEgNi43IDMyLjIxMTFINi4zQzUgMzIuMjExMSA0IDMxLjMxMDEgNCAzMC4xMzg4VjI1LjkwNDFDNCAyNC43MzI4IDUgMjMuODMxOCA2LjMgMjMuODMxOEg2LjdDOCAyMy44MzE4IDkuMiAyMy4zODEzIDEwLjEgMjIuNjYwNEwxMi44IDIwLjQ5OEMxNCAxOS40MTY4IDE2IDIwLjIyNzcgMTYgMjEuNjY5M1oiIGZpbGw9ImJsYWNrIi8+CjxwYXRoIGQ9Ik0yNCA0QzE5LjU4MTcgNCAxNiA3LjU4MTcyIDE2IDEyQzE2IDE1LjExNDcgMTcuNzc5OSAxNy44MTM2IDIwLjM3ODEgMTkuMTM1MUMyMC4yMDk1IDIwLjkwODcgMTkuNjU2NCAyMS42NjU1IDE5LjMwNDIgMjIuMTQ3M0MxOS4xMjY1IDIyLjM5MDQgMTkgMjIuNTYzNSAxOSAyMi43NjE5QzE5IDIzLjQyODYgMTkuNjY2NyAyMy40Mjg2IDE5LjY2NjcgMjMuNDI4NkMyMC42MTMyIDIzLjQyODYgMjMuNTgxMyAyMi4yNjIzIDI1LjQwOTcgMjBIMjhDMzIuNDE4MyAyMCAzNiAxNi40MTgzIDM2IDEyQzM2IDcuNTgxNzIgMzIuNDE4MyA0IDI4IDRIMjRaIiBmaWxsPSJ3aGl0ZSIgc3Ryb2tlPSIjMEI4RTY5Ii8+Cjwvc3ZnPgo=' + }, + translate: { + // eslint-disable-next-line max-len + blockIconURI: 'data:image/svg+xml;base64,<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8 5C5.79086 5 4 6.79086 4 9V17C4 19.2091 5.79086 21 8 21H8.25277C8.01648 22.1728 7.59283 22.7524 7.30423 23.1473C7.12651 23.3904 7 23.5635 7 23.7619C7 24.4286 7.66667 24.4286 7.66667 24.4286C8.61324 24.4286 11.5813 23.2623 13.4097 21H20C22.2091 21 24 19.2091 24 17V9C24 6.79086 22.2091 5 20 5H8Z" fill="white" stroke="#0B8E69"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4218 7.91302C13.5521 7.80153 13.7239 7.75 13.9067 7.75C14.0928 7.75 14.267 7.80036 14.3994 7.9115C14.5354 8.02561 14.6067 8.18748 14.6067 8.36216V9.52841H18.7036C18.8799 9.52841 19.0272 9.61017 19.1229 9.73957C19.2134 9.86201 19.25 10.0146 19.25 10.1626C19.25 10.3136 19.2147 10.4702 19.1293 10.5971C19.0395 10.7306 18.8927 10.8297 18.7036 10.8297H17.1012C16.6608 12.2802 15.9482 13.6381 14.927 14.7819C15.0606 14.8916 15.189 14.9921 15.3213 15.0826L15.3279 15.0871C16.3219 15.814 17.5472 16.385 18.7351 16.7629C19.0395 16.859 19.2282 17.1036 19.2282 17.4073C19.2282 17.4936 19.2112 17.577 19.1806 17.6561C19.132 17.8055 19.0555 17.9345 18.9428 18.0265C18.8251 18.1226 18.6874 18.1624 18.55 18.1624C18.4481 18.1624 18.3427 18.1477 18.226 18.1047C16.7997 17.6359 15.5777 17.0201 14.433 16.1225L14.4309 16.1208C14.4142 16.1074 14.3975 16.0941 14.3809 16.0807C14.2391 15.9673 14.0975 15.8538 13.9592 15.7335C13.8055 15.8657 13.6522 15.9898 13.4867 16.1141C12.2772 17.0323 11.123 17.6027 9.7455 18.1139L9.73817 18.1166C9.64781 18.147 9.55486 18.1624 9.46112 18.1624C9.31982 18.1624 9.17991 18.1267 9.05858 18.042C8.93808 17.9579 8.85251 17.8372 8.79947 17.6945C8.76726 17.613 8.75 17.5278 8.75 17.4402C8.75 17.1207 8.97641 16.8921 9.23884 16.7903L9.24949 16.7862C10.4679 16.3765 11.614 15.8515 12.8797 14.866C12.9149 14.835 12.9509 14.8055 12.9854 14.7779C11.9845 13.6337 11.2834 12.2689 10.8442 10.8297H9.3075C9.11622 10.8297 8.96687 10.7336 8.87583 10.5946C8.79144 10.4657 8.76088 10.3087 8.76088 10.1626C8.76088 10.0199 8.79235 9.86674 8.8821 9.74212C8.97906 9.60748 9.1291 9.52841 9.3075 9.52841H13.2179V8.36216C13.2179 8.18805 13.2886 8.027 13.4218 7.91302ZM12.2386 10.8297C12.6091 11.9316 13.2056 12.9588 13.9626 13.8377C14.7257 12.9593 15.3051 11.9389 15.6493 10.8297H12.2386Z" fill="#4C97FF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M32 16C34.2091 16 36 17.7909 36 20V28C36 30.2091 34.2091 32 32 32H31.7472C31.9835 33.1728 32.4072 33.7524 32.6958 34.1473C32.8735 34.3904 33 34.5635 33 34.7619C33 35.4286 32.3333 35.4286 32.3333 35.4286C31.3868 35.4286 28.4187 34.2623 26.5903 32H20C17.7909 32 16 30.2091 16 28V20C16 17.7909 17.7909 16 20 16H32Z" fill="white"/>
<path d="M31.7472 32L31.2571 32.0988L31.1364 31.5H31.7472V32ZM32.6958 34.1473L33.0994 33.8522H33.0994L32.6958 34.1473ZM26.5903 32V31.5H26.8291L26.9792 31.6857L26.5903 32ZM35.5 20C35.5 18.067 33.933 16.5 32 16.5V15.5C34.4853 15.5 36.5 17.5147 36.5 20H35.5ZM35.5 28V20H36.5V28H35.5ZM32 31.5C33.933 31.5 35.5 29.933 35.5 28H36.5C36.5 30.4853 34.4853 32.5 32 32.5V31.5ZM31.7472 31.5H32V32.5H31.7472V31.5ZM32.2921 34.4423C31.9838 34.0206 31.5138 33.3727 31.2571 32.0988L32.2374 31.9012C32.4533 32.9729 32.8305 33.4843 33.0994 33.8522L32.2921 34.4423ZM32.5 34.7619C32.5 34.7755 32.5061 34.7666 32.4758 34.7113C32.441 34.6475 32.3869 34.5721 32.2921 34.4423L33.0994 33.8522C33.1823 33.9656 33.2804 34.0983 33.3532 34.2315C33.4307 34.3731 33.5 34.55 33.5 34.7619H32.5ZM32.3333 35.4286C32.3333 34.9286 32.3331 34.9286 32.3329 34.9286C32.3328 34.9286 32.3325 34.9286 32.3324 34.9286C32.3321 34.9286 32.3318 34.9286 32.3315 34.9286C32.3309 34.9286 32.3304 34.9286 32.3298 34.9286C32.3288 34.9286 32.3279 34.9286 32.3272 34.9286C32.3257 34.9286 32.3247 34.9287 32.3242 34.9287C32.3231 34.9287 32.324 34.9287 32.3264 34.9285C32.3313 34.9282 32.3416 34.9272 32.3553 34.925C32.3851 34.92 32.4171 34.911 32.4431 34.898C32.4671 34.886 32.4759 34.8759 32.4798 34.87C32.4816 34.8672 32.5 34.8411 32.5 34.7619H33.5C33.5 35.0161 33.435 35.2399 33.3119 35.4247C33.1908 35.6063 33.0329 35.7211 32.8903 35.7925C32.7496 35.8628 32.6149 35.8955 32.5197 35.9114C32.4709 35.9195 32.4291 35.9237 32.3976 35.926C32.3818 35.9271 32.3683 35.9278 32.3575 35.9281C32.3521 35.9283 32.3473 35.9284 32.3433 35.9285C32.3413 35.9285 32.3394 35.9285 32.3378 35.9286C32.337 35.9286 32.3362 35.9286 32.3354 35.9286C32.3351 35.9286 32.3347 35.9286 32.3343 35.9286C32.3342 35.9286 32.3339 35.9286 32.3338 35.9286C32.3336 35.9286 32.3333 35.9286 32.3333 35.4286ZM26.9792 31.6857C27.8397 32.7504 28.9791 33.5683 30.0258 34.1204C30.5475 34.3956 31.0386 34.6007 31.45 34.736C31.8727 34.875 32.176 34.9286 32.3333 34.9286V35.9286C32.0173 35.9286 31.5947 35.8363 31.1376 35.686C30.669 35.5319 30.1264 35.3041 29.5592 35.0049C28.4281 34.4083 27.1693 33.5119 26.2015 32.3143L26.9792 31.6857ZM20 31.5H26.5903V32.5H20V31.5ZM16.5 28C16.5 29.933 18.067 31.5 20 31.5V32.5C17.5147 32.5 15.5 30.4853 15.5 28H16.5ZM16.5 20V28H15.5V20H16.5ZM20 16.5C18.067 16.5 16.5 18.067 16.5 20H15.5C15.5 17.5147 17.5147 15.5 20 15.5V16.5ZM32 16.5H20V15.5H32V16.5Z" fill="#0B8E69"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M24.9226 25.0201H27.043L26.0115 22.0172H25.9885L24.9226 25.0201ZM25.0946 20H26.9398L30 28.1834H28.1318L27.5129 26.361H24.4527L23.8109 28.1834H22L25.0946 20Z" fill="black"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M33.033 12.8763C32.8335 13.0713 32.5635 13.1813 32.283 13.1813C32.0034 13.1813 31.7334 13.0713 31.5329 12.8763L28.8784 10.2162C28.5734 9.91122 28.4834 9.45621 28.6484 9.0612C28.8134 8.66619 29.1934 8.41119 29.6234 8.41119H30.5784C30.5534 8.18119 30.4884 7.92118 30.3784 7.64618C30.3439 7.56617 30.3084 7.48617 30.2684 7.40617C30.2134 7.31617 30.2189 7.29117 30.1434 7.18117C30.0234 7.00116 29.9134 6.86616 29.7829 6.71116C29.5184 6.42615 29.1984 6.18115 28.8584 6.00115C28.5134 5.82114 28.1534 5.71114 27.8334 5.65114C27.5184 5.59614 27.2284 5.59114 27.0584 5.59114C26.9734 5.58614 26.8634 5.60614 26.8084 5.61114C26.7484 5.61614 26.7134 5.62114 26.7134 5.62114C26.3583 5.65614 26.0383 5.39614 26.0033 5.04113C25.9733 4.74112 26.1483 4.47112 26.4133 4.37112C26.4133 4.37112 26.4483 4.35612 26.5033 4.33612C26.5683 4.31612 26.6284 4.28112 26.7684 4.24112C27.0484 4.15611 27.4034 4.06611 27.8684 4.02111C28.3284 3.98111 28.8834 3.99111 29.4689 4.11111C30.0534 4.23612 30.6684 4.47112 31.2384 4.81113C31.5084 4.98613 31.7984 5.19113 32.0234 5.39114C32.1234 5.46614 32.2935 5.63614 32.3935 5.74114C32.5085 5.86114 32.6135 5.98115 32.719 6.10615C33.1235 6.60616 33.4235 7.14617 33.6185 7.63618C33.7335 7.91618 33.8135 8.18119 33.8735 8.41119H34.9435C35.3735 8.41119 35.7535 8.66619 35.9185 9.0612C36.0835 9.45621 35.9935 9.91122 35.6885 10.2162L33.033 12.8763Z" fill="black"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.96704 27.125C7.16654 26.93 7.43654 26.82 7.71705 26.82C7.99655 26.82 8.26656 26.93 8.46706 27.125L11.1216 29.7851C11.4266 30.0901 11.5166 30.5451 11.3516 30.9401C11.1866 31.3351 10.8066 31.5901 10.3766 31.5901H9.42158C9.44658 31.8201 9.51158 32.0801 9.62158 32.3551C9.65608 32.4351 9.69158 32.5151 9.73158 32.5951C9.78659 32.6851 9.78109 32.7101 9.85659 32.8201C9.97659 33.0001 10.0866 33.1351 10.2171 33.2901C10.4816 33.5751 10.8016 33.8201 11.1416 34.0001C11.4866 34.1801 11.8466 34.2901 12.1666 34.3501C12.4816 34.4051 12.7716 34.4101 12.9416 34.4101C13.0266 34.4151 13.1366 34.3951 13.1916 34.3901C13.2516 34.3851 13.2866 34.3801 13.2866 34.3801C13.6417 34.3451 13.9617 34.6051 13.9967 34.9602C14.0267 35.2602 13.8517 35.5302 13.5867 35.6302C13.5867 35.6302 13.5517 35.6452 13.4967 35.6652C13.4317 35.6852 13.3716 35.7202 13.2316 35.7602C12.9516 35.8452 12.5966 35.9352 12.1316 35.9802C11.6716 36.0202 11.1166 36.0102 10.5311 35.8902C9.94659 35.7652 9.33158 35.5302 8.76157 35.1902C8.49156 35.0152 8.20156 34.8101 7.97655 34.6101C7.87655 34.5351 7.70655 34.3651 7.60655 34.2601C7.49154 34.1401 7.38654 34.0201 7.28104 33.8951C6.87653 33.3951 6.57653 32.8551 6.38153 32.3651C6.26652 32.0851 6.18652 31.8201 6.12652 31.5901H5.0565C4.62649 31.5901 4.24649 31.3351 4.08148 30.9401C3.91648 30.5451 4.00648 30.0901 4.31149 29.7851L6.96704 27.125Z" fill="black"/>
</svg>
' + }, + videoSensing: { + // eslint-disable-next-line max-len + blockIconURI: 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHZpZXdCb3g9IjAgMCA0MCA0MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGNpcmNsZSBvcGFjaXR5PSIwLjI1IiBjeD0iMzIiIGN5PSIyNiIgcj0iNCIgZmlsbD0id2hpdGUiIHN0cm9rZT0iIzBCOEU2OSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxjaXJjbGUgb3BhY2l0eT0iMC41IiBjeD0iMzIiIGN5PSIyMiIgcj0iNCIgZmlsbD0id2hpdGUiIHN0cm9rZT0iIzBCOEU2OSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxjaXJjbGUgb3BhY2l0eT0iMC43NSIgY3g9IjMyIiBjeT0iMTgiIHI9IjQiIGZpbGw9IndoaXRlIiBzdHJva2U9IiMwQjhFNjkiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8Y2lyY2xlIGN4PSIzMiIgY3k9IjE0IiByPSI0IiBmaWxsPSJ3aGl0ZSIgc3Ryb2tlPSIjMEI4RTY5IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPHBhdGggZD0iTTE3IDE3LjVMMjIuNCAxNEMyMi45IDEzLjcgMjMuNSAxMy44IDIzLjggMTQuM0MyMy45IDE0LjUgMjQgMTQuNyAyNCAxNC44VjI1LjFDMjQgMjUuNyAyMy41IDI2LjEgMjMgMjYuMUMyMi44IDI2LjEgMjIuNiAyNiAyMi41IDI1LjlMMTcgMjIuNlYyNEMxNyAyNi4yIDE1LjIgMjguMSAxMyAyOC4xSDQuMUMxLjggMjggMCAyNi4yIDAgMjRWMTYuMUMwIDEzLjggMS44IDEyIDQuMSAxMkgxM0MxNS4yIDEyIDE3IDEzLjggMTcgMTYuMVYxNy41WiIgZmlsbD0iYmxhY2siLz4KPC9zdmc+Cg==' + } +}; + +export { + blockColors, + extensions +}; diff --git a/src/lib/themes/index.js b/src/lib/themes/index.js index 000960e4a..d77a7a6f3 100644 --- a/src/lib/themes/index.js +++ b/src/lib/themes/index.js @@ -1,9 +1,15 @@ import defaultsDeep from 'lodash.defaultsdeep'; import {defineMessages} from 'react-intl'; -import darkMode from './dark-mode'; -import highContrast from './high-contrast'; -import defaultColors from './default-colors'; +import { + blockColors as darkModeBlockColors, + extensions as darkModeExtensions +} from './dark-mode'; +import { + blockColors as highContrastBlockColors, + extensions as highContrastExtensions +} from './high-contrast'; +import {blockColors as defaultColors} from './default-colors'; import defaultIcon from './standard.svg'; import highContrastIcon from './high-contrast.svg'; @@ -34,16 +40,22 @@ const messages = defineMessages({ const themeMap = { [DEFAULT_THEME]: { + blocksMediaFolder: 'blocks-media', colors: defaultColors, + extensions: {}, label: messages[DEFAULT_THEME], icon: defaultIcon }, [DARK_THEME]: { - colors: mergeWithDefaults(darkMode), + blocksMediaFolder: 'blocks-media', + colors: mergeWithDefaults(darkModeBlockColors), + extensions: darkModeExtensions, label: messages[DARK_THEME] }, [HIGH_CONTRAST_THEME]: { - colors: mergeWithDefaults(highContrast), + blocksMediaFolder: 'blocks-media-high-contrast', + colors: mergeWithDefaults(highContrastBlockColors), + extensions: highContrastExtensions, label: messages[HIGH_CONTRAST_THEME], icon: highContrastIcon } diff --git a/static/blocks-media-high-contrast/comment-arrow-down.svg b/static/blocks-media-high-contrast/comment-arrow-down.svg new file mode 100644 index 000000000..9753f40b0 --- /dev/null +++ b/static/blocks-media-high-contrast/comment-arrow-down.svg @@ -0,0 +1,10 @@ + + + + dropdown-caret-up + Created with Sketch. + + + + + diff --git a/static/blocks-media-high-contrast/comment-arrow-up.svg b/static/blocks-media-high-contrast/comment-arrow-up.svg new file mode 100644 index 000000000..a118883f4 --- /dev/null +++ b/static/blocks-media-high-contrast/comment-arrow-up.svg @@ -0,0 +1,10 @@ + + + + dropdown-caret-down + Created with Sketch. + + + + + diff --git a/static/blocks-media-high-contrast/delete-x.svg b/static/blocks-media-high-contrast/delete-x.svg new file mode 100644 index 000000000..46d898a9a --- /dev/null +++ b/static/blocks-media-high-contrast/delete-x.svg @@ -0,0 +1,10 @@ + + + + delete-x + Created with Sketch. + + + + + diff --git a/static/blocks-media-high-contrast/dropdown-arrow.svg b/static/blocks-media-high-contrast/dropdown-arrow.svg new file mode 100644 index 000000000..585e5cc4f --- /dev/null +++ b/static/blocks-media-high-contrast/dropdown-arrow.svg @@ -0,0 +1 @@ +dropdown-arrow \ No newline at end of file diff --git a/static/blocks-media-high-contrast/eyedropper.svg b/static/blocks-media-high-contrast/eyedropper.svg new file mode 100644 index 000000000..c7a7cfc9a --- /dev/null +++ b/static/blocks-media-high-contrast/eyedropper.svg @@ -0,0 +1,22 @@ + + + + Artboard + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/blocks-media-high-contrast/icons/arrow_button.svg b/static/blocks-media-high-contrast/icons/arrow_button.svg new file mode 100644 index 000000000..5fa8ffee2 --- /dev/null +++ b/static/blocks-media-high-contrast/icons/arrow_button.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/blocks-media-high-contrast/repeat.svg b/static/blocks-media-high-contrast/repeat.svg new file mode 100644 index 000000000..70d02b909 --- /dev/null +++ b/static/blocks-media-high-contrast/repeat.svg @@ -0,0 +1,13 @@ + + + + +repeat + + diff --git a/static/blocks-media-high-contrast/rotate-left.svg b/static/blocks-media-high-contrast/rotate-left.svg new file mode 100644 index 000000000..eb120afa4 --- /dev/null +++ b/static/blocks-media-high-contrast/rotate-left.svg @@ -0,0 +1 @@ +rotate-clockwise \ No newline at end of file diff --git a/static/blocks-media-high-contrast/rotate-right.svg b/static/blocks-media-high-contrast/rotate-right.svg new file mode 100644 index 000000000..960c00bbe --- /dev/null +++ b/static/blocks-media-high-contrast/rotate-right.svg @@ -0,0 +1 @@ +rotate-counter-clockwise \ No newline at end of file diff --git a/static/blocks-media-high-contrast/zoom-in.svg b/static/blocks-media-high-contrast/zoom-in.svg new file mode 100644 index 000000000..6395eb2d4 --- /dev/null +++ b/static/blocks-media-high-contrast/zoom-in.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/static/blocks-media-high-contrast/zoom-out.svg b/static/blocks-media-high-contrast/zoom-out.svg new file mode 100644 index 000000000..3dc33cd6e --- /dev/null +++ b/static/blocks-media-high-contrast/zoom-out.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/static/blocks-media-high-contrast/zoom-reset.svg b/static/blocks-media-high-contrast/zoom-reset.svg new file mode 100644 index 000000000..2e358b0d7 --- /dev/null +++ b/static/blocks-media-high-contrast/zoom-reset.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/test/unit/util/themes.test.js b/test/unit/util/themes.test.js index 575f7e886..d12139e20 100644 --- a/test/unit/util/themes.test.js +++ b/test/unit/util/themes.test.js @@ -5,7 +5,7 @@ import { getColorsForTheme, HIGH_CONTRAST_THEME } from '../../../src/lib/themes'; -import {injectExtensionBlockColors, injectExtensionCategoryColors} from '../../../src/lib/themes/blockHelpers'; +import {injectExtensionBlockTheme, injectExtensionCategoryTheme} from '../../../src/lib/themes/blockHelpers'; import {detectTheme, persistTheme} from '../../../src/lib/themes/themePersistance'; jest.mock('../../../src/lib/themes/default-colors'); @@ -49,7 +49,7 @@ describe('themes', () => { colourTertiary: '#0B8E69' }; - const updated = injectExtensionBlockColors(blockInfoJson, DARK_THEME); + const updated = injectExtensionBlockTheme(blockInfoJson, DARK_THEME); expect(updated).toEqual({ type: 'dummy_block', @@ -69,7 +69,7 @@ describe('themes', () => { colourTertiary: '#0B8E69' }; - const updated = injectExtensionBlockColors(blockInfoJson, DEFAULT_THEME); + const updated = injectExtensionBlockTheme(blockInfoJson, DEFAULT_THEME); expect(updated).toEqual({ type: 'dummy_block', @@ -87,7 +87,7 @@ describe('themes', () => { } ]; - injectExtensionCategoryColors(dynamicBlockXML, DARK_THEME); + injectExtensionCategoryTheme(dynamicBlockXML, DARK_THEME); // XMLSerializer is not available outside the browser. // Verify the mocked XMLSerializer.serializeToString is called with updated colors. diff --git a/webpack.config.js b/webpack.config.js index 168faa396..a59eb263d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -171,6 +171,15 @@ module.exports = [ { from: 'node_modules/scratch-blocks/media', to: 'static/blocks-media' + }, + { + from: 'node_modules/scratch-blocks/media', + to: 'static/blocks-media-high-contrast' + }, + { + from: 'static/blocks-media-high-contrast', + to: 'static/blocks-media-high-contrast', + force: true } ] }),