Merge branch 'develop' into feat/login-required-upload

Author: singhmahipal

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,8 +4,17 @@ Changes:
 
 I have verified that this pull request:
 
+feat/login-required-upload
 - [ ] has no linting errors (`npm run lint`)
 - [ ] has no test errors (`npm run test`)
 - [ ] is from a uniquely-named feature branch and is up to date with the `develop` branch.
 - [ ] is descriptively named and links to an issue number, i.e. `Fixes #123`
 - [ ] meets the standards outlined in the [accessibility guidelines](https://github.com/processing/p5.js-web-editor/blob/develop/contributor_docs/accessibility.md)
+
+* [ ] has no linting errors (`npm run lint`)
+* [ ] has no test errors (`npm run test`)
+* [ ] has no typecheck errors (`npm run typecheck`)
+* [ ] is from a uniquely-named feature branch and is up to date with the  `develop` branch.
+* [ ] is descriptively named and links to an issue number, i.e. `Fixes #123`
+* [ ] meets the standards outlined in the [accessibility guidelines](https://github.com/processing/p5.js-web-editor/blob/develop/contributor_docs/accessibility.md)
+develop

client/modules/IDE/actions/preferences.ts

@@ -6,7 +6,6 @@ import type {
   UpdatePreferencesDispatch,
   SetPreferencesTabValue,
   SetFontSizeValue,
-  GetRootState,
   SetLineNumbersValue,
   SetAutocloseBracketsQuotesValue,
   SetAutocompleteHinterValue,
@@ -20,6 +19,7 @@ import type {
   SetLanguageValue,
   SetThemeValue
 } from './preferences.types';
+import type { GetRootState } from '../../../reducers';
 
 function updatePreferences(
   formParams: UpdatePreferencesRequestBody,

client/modules/IDE/actions/preferences.types.ts

@@ -1,6 +1,6 @@
 import * as ActionTypes from '../../../constants';
 import type { PreferencesState } from '../reducers/preferences';
-import type { RootState } from '../../../reducers';
+import type { GetRootState } from '../../../reducers';
 
 // Value Definitions:
 export type SetPreferencesTabValue = PreferencesState['tabIndex'];
@@ -113,5 +113,3 @@ export type PreferencesThunk = (
   dispatch: UpdatePreferencesDispatch,
   getState: GetRootState
 ) => void;
-
-export type GetRootState = () => RootState;

client/modules/IDE/components/VersionPicker.jsx

@@ -77,9 +77,23 @@ const VersionPicker = React.forwardRef(({ onChangeVersion }, ref) => {
   return (
     <VersionDropdownMenu
       className="versionPicker"
+      aria-label="Select p5.js version"
       anchor={
         <VersionPickerButton ref={ref}>
-          <VersionPickerText>{versionInfo.version}</VersionPickerText>
+          <VersionPickerText>
+            {versionInfo
+              ? (() => {
+                  const current = p5Versions.find((v) =>
+                    typeof v === 'string'
+                      ? v === versionInfo.version
+                      : v.version === versionInfo.version
+                  );
+                  if (!current) return versionInfo.version;
+                  if (typeof current === 'string') return current;
+                  return `${current.version} ${current.label}`;
+                })()
+              : t('Toolbar.CustomLibraryVersion')}
+          </VersionPickerText>
           <VersionPickerArrow>
             <DropdownArrowIcon />
           </VersionPickerArrow>
@@ -88,11 +102,20 @@ const VersionPicker = React.forwardRef(({ onChangeVersion }, ref) => {
       align="left"
       maxHeight="50vh"
     >
-      {p5Versions.map((version) => (
-        <MenuItem key={version} onClick={() => dispatchReplaceVersion(version)}>
-          {version}
-        </MenuItem>
-      ))}
+      {p5Versions.map((item) => {
+        const version = typeof item === 'string' ? item : item.version;
+        const label =
+          typeof item === 'string' ? item : `${item.version} ${item.label}`;
+
+        return (
+          <MenuItem
+            key={version}
+            onClick={() => dispatchReplaceVersion(version)}
+          >
+            {label}
+          </MenuItem>
+        );
+      })}
     </VersionDropdownMenu>
   );
 });

client/modules/IDE/hooks/useP5Version.jsx

@@ -60,7 +60,10 @@ export function P5VersionProvider(props) {
         if (!match) return null;
 
         // See if this is a version we recognize
-        if (p5Versions.includes(match[1])) {
+        const versionExists = p5Versions.some((v) =>
+          typeof v === 'string' ? v === match[1] : v.version === match[1]
+        );
+        if (versionExists) {
           return { version: match[1], minified: !!match[2], scriptNode };
         }
         return null;