Skip to content

Commit 3a3fcb3

Browse files
Merge branch 'develop' into fix-back-to-editor-hover
2 parents 8494f9f + fa7d3a3 commit 3a3fcb3

7 files changed

Lines changed: 387 additions & 151 deletions

File tree

client/modules/IDE/components/AssetListRow.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const AssetListRow = ({ asset, username }) => (
4444
{asset.name}
4545
</a>
4646
</th>
47-
<td>{prettyBytes(asset.size)}</td>
47+
<td className="asset-table__size-column">{prettyBytes(asset.size)}</td>
4848
<td>
4949
{asset.sketchId && (
5050
<Link to={`/${username}/sketches/${asset.sketchId}`}>

client/modules/IDE/reducers/files.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,9 @@ const files = (state, action) => {
178178
const isFolderClosed = corrospondingObj.isFolderClosed || false;
179179
return { ...file, isFolderClosed };
180180
}
181+
if (corrospondingObj) {
182+
return { ...file, isSelectedFile: corrospondingObj.isSelectedFile };
183+
}
181184
return file;
182185
});
183186
return setFilePaths(newFiles);

client/styles/components/_asset-list.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
width: #{math.div(60, $base-font-size)}rem;
1717
position: relative;
1818
}
19+
& .asset-table__size-column {
20+
white-space: nowrap;
21+
width: #{math.div(100, $base-font-size)}rem;
22+
padding-right: #{math.div(12, $base-font-size)}rem;
23+
}
1924
}
2025

2126
.asset-table thead th {

common/p5URLs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const p5SoundURLOldTemplate =
22
'https://cdn.jsdelivr.net/npm/p5@$VERSION/lib/addons/p5.sound.min.js';
33
export const p5SoundURL =
4-
'https://cdn.jsdelivr.net/npm/p5.sound@0.2.0/dist/p5.sound.min.js';
4+
'https://cdn.jsdelivr.net/npm/p5.sound@0.3.0/dist/p5.sound.min.js';
55
export const p5PreloadAddonURL =
66
'https://cdn.jsdelivr.net/npm/p5.js-compatibility@0.2.0/src/preload.js';
77
export const p5ShapesAddonURL =

common/p5Versions.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ export const currentP5Version = '1.11.13'; // Don't update to 2.x until 2026
55
// JSON.stringify([...document.querySelectorAll('._132722c7')].map(n => n.innerText), null, 2)
66
// TODO: use their API for this to grab these at build time?
77
export const p5Versions = [
8-
{ version: '2.2.3', label: '(Beta)' },
8+
{ version: '2.3.0', label: '(Beta)' },
9+
'2.2.3',
910
'2.2.2',
1011
'2.2.1',
1112
'2.2.0',

0 commit comments

Comments
 (0)