@robotical/martyblocksjr 4.2.0 → 4.2.1

package/editions/free/src/css/editor.css

@@ -111,6 +111,97 @@ div.frame {
     height: ${css_vh(37.29)};
 }
 
+.pagelist {
+    position: relative;
+    width: ${css_vh(21.09)};
+}
+
+.pageactions {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: ${css_vh(21.09)};
+    z-index: 7;
+    pointer-events: none;
+}
+
+.pageactionrow {
+    position: relative;
+    width: ${145 * scaleMultiplier}px;
+    height: ${109 * scaleMultiplier}px;
+    margin: ${css_vh(0)} ${css_vh(0)} ${css_vh(0.13)};
+    pointer-events: none;
+}
+
+.duplicatepage {
+    appearance: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: ${28 * scaleMultiplier}px;
+    height: ${28 * scaleMultiplier}px;
+    padding: 0;
+    border: 0;
+    border-radius: 50%;
+    background: url('../assets/ui/numOn.svg') no-repeat center;
+    background-size: 100% 100%;
+    color: #ffffff;
+    cursor: pointer;
+    pointer-events: auto;
+}
+
+.duplicatepage:hover:not(:disabled) {
+    filter: brightness(1.08);
+}
+
+.duplicatepage:active:not(:disabled) {
+    transform: scale(0.94);
+}
+
+.duplicatepage:disabled {
+    opacity: 0.32;
+    cursor: default;
+}
+
+.pageactionrow.delete-mode .duplicatepage {
+    visibility: hidden;
+}
+
+.duplicatepageicon,
+.duplicatepageicon::before,
+.duplicatepageicon::after {
+    box-sizing: border-box;
+    position: absolute;
+}
+
+.duplicatepageicon {
+    top: ${7 * scaleMultiplier}px;
+    left: ${7 * scaleMultiplier}px;
+    width: ${14 * scaleMultiplier}px;
+    height: ${13 * scaleMultiplier}px;
+    z-index: 1;
+}
+
+.duplicatepageicon::before,
+.duplicatepageicon::after {
+    content: '';
+    width: ${11 * scaleMultiplier}px;
+    height: ${10 * scaleMultiplier}px;
+    border: ${1.5 * scaleMultiplier}px solid currentColor;
+    border-radius: ${1.5 * scaleMultiplier}px;
+}
+
+.duplicatepageicon::before {
+    top: 0;
+    left: 0;
+}
+
+.duplicatepageicon::after {
+    top: ${3 * scaleMultiplier}px;
+    left: ${3 * scaleMultiplier}px;
+    background: #F9A737;
+}
+
 .pagethumb {
     background: none;
     position: relative;

package/editions/free/src/css/editorleftpanel.css

@@ -368,7 +368,7 @@
     position: relative;
     display: inline-block;
     word-spacing: -1;
-    width: ${css_vh(29.95)};
+    width: ${css_vh(23.18)};
     height: ${css_vh(10.16)};
     margin: 0px;
     margin-bottom: ${css_vh(-0.39)};
@@ -391,24 +391,22 @@
 
 .spritethumb.off {
     background: url('../assets/ui/viewOff.png') no-repeat left top;
-    background-size: ${css_vh(23.18)};
+    background-size: 100% 100%;
 }
 
 .spritethumb.off.target {
     background: url('../assets/ui/viewOffTarget.png') no-repeat left top;
-    background-size: ${css_vh(23.18)};
+    background-size: 100% 100%;
 }
 
 .spritethumb.on.target {
-    background: url('../assets/ui/viewOnTarget.png') no-repeat left top;
-    background-size: 100%;
-    width: ${css_vh(29.95)};
+    background: url('../assets/ui/viewOnTargetCompact.png') no-repeat left top;
+    background-size: 100% 100%;
 }
 
 .spritethumb.on {
-    background: url('../assets/ui/viewOn.png') no-repeat left top;
-    background-size: 100%;
-    width: ${css_vh(29.95)};
+    background: url('../assets/ui/viewOnCompact.png') no-repeat left top;
+    background-size: 100% 100%;
 }
 
 .spritethumb.noneditable {
@@ -480,8 +478,8 @@
 .spritethumb.on .sname{
     color: #F9A737;
     top: ${css_vh(3.91)};
-    left: ${css_vh(9.24)};
-    width: ${css_vh(11.97)};
+    left: ${css_vh(9.11)};
+    width: ${css_vh(8.33)};
 }
 .spritethumb.noneditable .sname{
     color: #999;
@@ -491,14 +489,14 @@
 }
 
 .spritethumb .brush {
-    display: absolute;
+    display: block;
     position: absolute;
     background:  url('../assets/paint/paintbrush.svg');
-    background-size: ${css_vh(7.03)} ${css_vh(7.03)};
-    width: ${css_vh(7.03)};
-    height: ${css_vh(7.03)};
-    top: ${css_vh(1.30)};
-    left: ${css_vh(21.75)};
+    background-size: 100% 100%;
+    width: ${css_vh(5.73)};
+    height: ${css_vh(5.73)};
+    top: ${css_vh(2.21)};
+    left: ${css_vh(17.45)};
     margin: 0px;
     padding: 0px;
 }
@@ -507,3 +505,4 @@
 .spritethumb.off .brush{ display: none;}
 .spritethumb.noneditable .brush{ display: none;}
 .spritethumb.martynoneditable .brush{ display: none;}
+.spritethumb.paintnoneditable .brush{ display: none;}

package/editions/free/src/css/editorstage.css

@@ -1,5 +1,67 @@
 /* toolbar */
 
+button[data-tooltip]::before,
+button[data-tooltip]::after {
+    position: absolute;
+    left: 50%;
+    z-index: 13000;
+    opacity: 0;
+    visibility: hidden;
+    pointer-events: none;
+    transition: opacity 120ms ease;
+}
+
+button[data-tooltip]::before {
+    content: '';
+    top: calc(100% + 6px);
+    width: 10px;
+    height: 10px;
+    border-top: 1px solid #8E8E8E;
+    border-left: 1px solid #8E8E8E;
+    background: #FFF0B7;
+    transform: translateX(-50%) rotate(45deg);
+}
+
+button[data-tooltip]::after {
+    content: attr(data-tooltip);
+    box-sizing: border-box;
+    top: calc(100% + 11px);
+    width: max-content;
+    max-width: 240px;
+    padding: 7px 10px;
+    border: 1px solid #8E8E8E;
+    border-radius: 4px;
+    background: linear-gradient(#FFF0B7, #FFC842);
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
+    color: #3D2800;
+    font-family: 'Lato Regular', sans-serif;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: 18px;
+    text-align: center;
+    white-space: normal;
+    transform: translateX(-50%);
+}
+
+button[data-tooltip]:hover::before,
+button[data-tooltip]:hover::after,
+button[data-tooltip]:focus::before,
+button[data-tooltip]:focus::after {
+    opacity: 1;
+    visibility: visible;
+}
+
+#full.presentationmode[data-tooltip]::after {
+    left: 0;
+    transform: none;
+}
+
+#go.presentationmode[data-tooltip]::after {
+    right: 0;
+    left: auto;
+    transform: none;
+}
+
 .fullscreen#full {
     position: absolute;
     margin: 0px;

package/editions/free/src/css/paintlook.css

@@ -89,6 +89,29 @@ spriteform.off {visibility: hidden; };
     background-size: 100%;
 }
 
+.paintcancel {
+    float: right;
+    display: block;
+    margin: ${css_vh(0.65)} ${css_vh(0.65)} ${css_vh(0.00)};
+    padding: ${css_vh(0.00)};
+    width: ${css_vh(8.46)};
+    height: ${css_vh(8.46)};
+    background: url('../assets/paint/cancel.svg');
+    background-size: 100%;
+    -webkit-user-select: none;
+    z-index: 1000;
+}
+
+.paintcancel:active {
+    background: url('../assets/paint/cancelPressed.svg');
+    background-size: 100%;
+}
+
+.paintcancel:focus-visible {
+    outline: 3px solid #133C46;
+    outline-offset: 2px;
+}
+
 /* camera */
 
 .phototopbar {

package/editions/free/src/localizations/bg.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/ca.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/cs.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/cy.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/da.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/de.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/el.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/en.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/es.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/fi.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/fr.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/it.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/ja.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/ko.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/nl.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/no.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/pl.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/pt-br.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/pt.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/sv.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/th.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/tr.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/uk.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/zh-cn.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/localizations/zh-tw.json

@@ -1165,6 +1165,7 @@
   "A11Y_ADD_PAGE": "Add page",
   "A11Y_COPY_TO_PAGE": "Copy to page {PAGE}",
   "A11Y_DELETE_PAGE": "Delete page {PAGE}",
+  "A11Y_DUPLICATE_PAGE": "Duplicate page {PAGE}",
   "A11Y_MOVE_PAGE_EARLIER": "Move page {PAGE} earlier",
   "A11Y_MOVE_PAGE_LATER": "Move page {PAGE} later",
   "BLOCK_DESC_MICROBIT_ON_BUTTON": "Starts when a micro:bit button is pressed.",

package/editions/free/src/media.json

@@ -117,6 +117,7 @@
       "height": 321.28673,
       "ext": "svg",
       "name": "Octopus-Pink",
+      "watermarkMode": "source-grayscale",
       "order": "characters,07 weather",
       "tags":["characters", "07 weather"]
     },
@@ -126,6 +127,7 @@
       "height": 321.28673,
       "ext": "svg",
       "name": "Raccoon",
+      "watermarkMode": "source-grayscale",
       "order": "characters,07 weather",
       "tags":["characters", "07 weather"]
     },
@@ -144,6 +146,7 @@
       "height": 321.28673,
       "ext": "svg",
       "name": "Unicorn",
+      "watermarkMode": "source-grayscale",
       "order": "characters,07 weather",
       "tags": ["characters", "07 weather"]
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/martyblocksjr",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "ScratchJr",
   "repository": {
     "type": "git",

package/tests/e2e/accessibility.e2e.test.js

@@ -153,6 +153,14 @@ async function expectNamedControls(page, selectors) {
     expect(missing).toEqual([]);
 }
 
+async function activateSkipLink(page, targetId) {
+    await page.focus('#skip-link');
+    await page.keyboard.press('Enter');
+    await page.waitForFunction((expectedTargetId) => {
+        return document.activeElement && document.activeElement.id === expectedTargetId;
+    }, { timeout: 5_000 }, targetId);
+}
+
 beforeEach(async () => {
     server = spawn('python3', ['-m', 'http.server', `${PORT}`, '--directory', 'editions/free/src'], {
         stdio: 'ignore'
@@ -218,6 +226,8 @@ describe('Accessibility shell audit', () => {
             await tabToSelector(page, '#hometab');
             expectVisibleFocusIndicator(await getFocusStyles(page, '#hometab'));
 
+            await activateSkipLink(page, 'wrapc');
+
             await new Promise((resolve) => setTimeout(resolve, 1200));
             await page.click('#booktab');
             await page.waitForSelector('iframe#htmlcontents', { timeout: 30_000 });
@@ -288,6 +298,8 @@ describe('Accessibility shell audit', () => {
                 await tabToSelector(page, guideCase.focusSelector);
                 expectVisibleFocusIndicator(await getFocusStyles(page, guideCase.focusSelector));
 
+                await activateSkipLink(page, 'content');
+
                 expectNoAxeViolations(await runAxe(page));
                 expect(errors).toEqual([]);
                 await page.close();
@@ -344,6 +356,8 @@ describe('Accessibility shell audit', () => {
             expect(await page.$eval('#scriptscontainer', (element) => element.getAttribute('role'))).toBe('list');
             expect(await page.$eval('#scriptscontainer', (element) => element.getAttribute('aria-label'))).toBe('Programming Script');
 
+            await activateSkipLink(page, 'frame');
+
             await expectNamedControls(page, [
                 '#projectinfo',
                 '#grid',
@@ -551,8 +565,10 @@ describe('Accessibility shell audit', () => {
             });
             expect(await page.evaluate(() => document.activeElement.id)).toBe('projectinfo');
 
-            const editorUrl = page.url();
-            await page.goto(`${editorUrl}&tutorial=cog-jrblocks-1`, { waitUntil: 'domcontentloaded', timeout: 30_000 });
+            const editorUrl = new URL(page.url());
+            editorUrl.searchParams.set('tutorial', 'cog-jrblocks-1');
+            editorUrl.hash = '';
+            await page.goto(editorUrl.toString(), { waitUntil: 'domcontentloaded', timeout: 30_000 });
             await page.waitForSelector('#tutorialMenuBar', { timeout: 40_000 });
             await page.waitForSelector('#nextStep', { timeout: 30_000 });