Skip to content

Commit 681040d

Browse files
authored
Merge branch 'develop' into fix/file-new
2 parents 67700ad + f99eda0 commit 681040d

19 files changed

+82
-33
lines changed

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ If you have found a bug in the p5.js Web Editor, you can file it under the ["iss
2929

3030
### How Do I Know My Issue or Pull Request is Getting Reviewed?
3131

32-
To see which pull requests and issues are currently being reviewed, check the [PR Review Board](https://github.com/processing/p5.js-web-editor/projects/9) or the following Milestones: [PATCH Release](https://github.com/processing/p5.js-web-editor/milestone/9), [MINOR Release](https://github.com/processing/p5.js-web-editor/milestone/8).
32+
To see which pull requests and issues are currently being reviewed, check the [PR Review Board](https://github.com/processing/p5.js-web-editor/projects/9) or the following Milestones: [PATCH Release](https://github.com/processing/p5.js-web-editor/milestone/10), [MINOR Release](https://github.com/processing/p5.js-web-editor/milestone/8).
3333

3434
Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones will be prioritized since they are planned to be merged for the next release to Production. Please feel free to [comment on this pinned issue](https://github.com/processing/p5.js-web-editor/issues/2534) if you would like your issue to be considered for the next release!
3535

@@ -38,11 +38,9 @@ Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones
3838

3939
We will aim to deploy on a 1-2 month basis. Here are some dates we’re working towards:
4040

41-
MINOR Release for [p5.js version 1.8.0](https://github.com/processing/p5.js/releases/tag/v1.8.0): By October 27, 2023
41+
2.9.3 PATCH Release: By November 17, 2023
4242

43-
PATCH Release: By November 2, 2023
44-
45-
MINOR Release: By November 30, 2023
43+
2.10.0 MINOR Release: By December 15, 2023
4644

4745
[You can read more about Semantic Versioning and the differences between a MINOR and PATCH release](https://semver.org/).
4846

client/modules/IDE/components/Editor/index.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,8 @@ Editor.propTypes = {
594594
linewrap: PropTypes.bool.isRequired,
595595
lintMessages: PropTypes.arrayOf(
596596
PropTypes.shape({
597-
severity: PropTypes.string.isRequired,
597+
severity: PropTypes.oneOf(['error', 'hint', 'info', 'warning'])
598+
.isRequired,
598599
line: PropTypes.number.isRequired,
599600
message: PropTypes.string.isRequired,
600601
id: PropTypes.number.isRequired

client/modules/IDE/components/EditorAccessibility.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ const EditorAccessibility = ({ lintMessages = [] }) => {
3737
EditorAccessibility.propTypes = {
3838
lintMessages: PropTypes.arrayOf(
3939
PropTypes.shape({
40-
severity: PropTypes.string.isRequired,
40+
severity: PropTypes.oneOf(['error', 'hint', 'info', 'warning'])
41+
.isRequired,
4142
line: PropTypes.number.isRequired,
4243
message: PropTypes.string.isRequired,
4344
id: PropTypes.number.isRequired
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import React from 'react';
2+
3+
import { render, screen } from '../../../test-utils';
4+
5+
import EditorAccessibility from './EditorAccessibility';
6+
7+
describe('<EditorAccessibility />', () => {
8+
it('renders empty message with no lines', () => {
9+
render(<EditorAccessibility lintMessages={[]} />);
10+
11+
expect(
12+
screen.getByRole('listitem', {
13+
description: 'There are no lint messages'
14+
})
15+
).toBeInTheDocument();
16+
});
17+
18+
it('renders lint message', () => {
19+
render(
20+
<EditorAccessibility
21+
lintMessages={[
22+
{
23+
severity: 'info',
24+
line: '1',
25+
message: 'foo',
26+
id: '1a2b3c'
27+
}
28+
]}
29+
/>
30+
);
31+
32+
expect(
33+
screen.queryByText('There are no lint messages')
34+
).not.toBeInTheDocument();
35+
36+
const listItem = screen.getByRole('listitem');
37+
expect(listItem).toBeInTheDocument();
38+
expect(listItem.textContent).toEqual('info in line1 :foo');
39+
});
40+
});

client/styles/components/_modal.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@
1010
.modal-content {
1111
@extend %modal;
1212
min-height: #{150 / $base-font-size}rem;
13-
width: #{500 / $base-font-size}rem;
1413
padding: #{20 / $base-font-size}rem;
14+
15+
@media (min-width: 770px) {
16+
width: #{500 / $base-font-size}rem;
17+
18+
}
19+
1520
.modal--reduced & {
1621
//min-height: #{150 / $base-font-size}rem;
1722
}

client/styles/components/_preferences.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
flex-direction: column;
1111
outline: none;
1212
height: calc(80vh - #{65 / $base-font-size}rem);
13-
max-height: #{460 / $base-font-size}rem;
1413
& .react-tabs {
1514
max-height: 100%;
1615
display: flex;
@@ -19,6 +18,11 @@
1918
& .react-tabs__tab-panel {
2019
overflow-y: auto;
2120
}
21+
22+
@media (min-width: 770px) {
23+
max-height: #{460 / $base-font-size}rem;
24+
25+
}
2226
}
2327

2428
.preference__minus-button,

translations/locales/de/translations.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,8 @@
530530
"KeyUpLineNumber": "Zeile {{lineNumber}}"
531531
},
532532
"EditorAccessibility": {
533-
"NoLintMessages": "Keine Lint-Warnungen vorhanden ",
534-
"CurrentLine": " Aktuelle Zeile"
533+
"NoLintMessages": "Keine Lint-Warnungen vorhanden",
534+
"CurrentLine": "Aktuelle Zeile"
535535
},
536536
"Timer": {
537537
"SavedAgo": "Gesichert: {{timeAgo}}"

translations/locales/en-US/translations.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,8 @@
538538
"KeyUpLineNumber": "line {{lineNumber}}"
539539
},
540540
"EditorAccessibility": {
541-
"NoLintMessages": "There are no lint messages ",
542-
"CurrentLine": " Current line"
541+
"NoLintMessages": "There are no lint messages",
542+
"CurrentLine": "Current line"
543543
},
544544
"Timer": {
545545
"SavedAgo": "Saved: {{timeAgo}}"

translations/locales/es-419/translations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@
530530
},
531531
"EditorAccessibility": {
532532
"NoLintMessages": "No hay mensajes de Lint",
533-
"CurrentLine": " Línea actual"
533+
"CurrentLine": "Línea actual"
534534
},
535535
"Timer": {
536536
"SavedAgo": "Guardado: {{timeAgo}}"

translations/locales/fr-CA/translations.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,8 @@
532532
"KeyUpLineNumber": "ligne {{lineNumber}}"
533533
},
534534
"EditorAccessibility": {
535-
"NoLintMessages": "Il n'y a pas de messages lint ",
536-
"CurrentLine": " Ligne actuelle"
535+
"NoLintMessages": "Il n'y a pas de messages lint",
536+
"CurrentLine": "Ligne actuelle"
537537
},
538538
"Timer": {
539539
"SavedAgo": "Sauvegardé: {{timeAgo}}"

0 commit comments

Comments
 (0)