feat: use platform prop instead of isScratchDesktop

Author: KManolov3

packages/scratch-gui/src/components/cards/cards.jsx

@@ -423,7 +423,7 @@ Cards.propTypes = {
     onShowAll: PropTypes.func,
     onShrinkExpandCards: PropTypes.func.isRequired,
     onStartDrag: PropTypes.func,
-    platform: PropTypes.string,
+    platform: PropTypes.oneOf(Object.keys(PLATFORM)),
     step: PropTypes.number.isRequired,
     x: PropTypes.number,
     y: PropTypes.number

packages/scratch-gui/src/components/gui/gui.jsx

@@ -43,6 +43,7 @@ import costumesIcon from './icon--costumes.svg';
 import soundsIcon from './icon--sounds.svg';
 import DebugModal from '../debug-modal/debug-modal.jsx';
 import {setPlatform} from '../../reducers/platform.js';
+import {PLATFORM} from '../../lib/platform.js';
 
 const messages = defineMessages({
     addExtension: {
@@ -466,7 +467,7 @@ GUIComponent.propTypes = {
     onTelemetryModalOptIn: PropTypes.func,
     onTelemetryModalOptOut: PropTypes.func,
     onToggleLoginOpen: PropTypes.func,
-    platform: PropTypes.string,
+    platform: PropTypes.oneOf(Object.keys(PLATFORM)),
     renderLogin: PropTypes.func,
     showComingSoon: PropTypes.bool,
     soundsTabVisible: PropTypes.bool,

packages/scratch-gui/src/components/menu-bar/menu-bar.jsx

@@ -966,7 +966,7 @@ MenuBar.propTypes = {
     onShare: PropTypes.func,
     onStartSelectingFileUpload: PropTypes.func,
     onToggleLoginOpen: PropTypes.func,
-    platform: PropTypes.string,
+    platform: PropTypes.oneOf(Object.keys(PLATFORM)),
     projectTitle: PropTypes.string,
     renderLogin: PropTypes.func,
     settingsMenuOpen: PropTypes.bool,

packages/scratch-gui/src/containers/cards.jsx

@@ -19,6 +19,7 @@ import {
 
 import CardsComponent from '../components/cards/cards.jsx';
 import {loadImageData} from '../lib/libraries/decks/translate-image.js';
+import {PLATFORM} from '../lib/platform.js';
 
 class Cards extends React.Component {
     componentDidMount () {
@@ -40,7 +41,7 @@ class Cards extends React.Component {
 
 Cards.propTypes = {
     locale: PropTypes.string.isRequired,
-    platform: PropTypes.string
+    platform: PropTypes.oneOf(Object.keys(PLATFORM))
 };
 
 const mapStateToProps = state => ({

packages/scratch-gui/src/containers/gui.jsx

@@ -39,15 +39,14 @@ import vmListenerHOC from '../lib/vm-listener-hoc.jsx';
 import vmManagerHOC from '../lib/vm-manager-hoc.jsx';
 import cloudManagerHOC from '../lib/cloud-manager-hoc.jsx';
 import systemPreferencesHOC from '../lib/system-preferences-hoc.jsx';
+import {PLATFORM} from '../lib/platform.js';
 
 import GUIComponent from '../components/gui/gui.jsx';
-import {setIsScratchDesktop} from '../lib/isScratchDesktop.js';
 import {GUIStoragePropType} from '../gui-config';
 import {AccountMenuOptionsPropTypes} from '../lib/account-menu-options';
 
 class GUI extends React.Component {
     componentDidMount () {
-        setIsScratchDesktop(this.props.isScratchDesktop);
         this.props.onStorageInit(this.props.storage.scratchStorage);
         this.props.onVmInit(this.props.vm);
         this.props.storage.setProjectMetadata?.(this.props.projectId);
@@ -83,7 +82,6 @@ class GUI extends React.Component {
             cloudHost,
             error,
             isError,
-            isScratchDesktop,
             isShowingProject,
             onProjectLoaded,
             onStorageInit,
@@ -122,8 +120,6 @@ GUI.propTypes = {
     intl: intlShape,
     isError: PropTypes.bool,
     isLoading: PropTypes.bool,
-    // TODO: Use platform prop
-    isScratchDesktop: PropTypes.bool,
     isShowingProject: PropTypes.bool,
     isTotallyNormal: PropTypes.bool,
     loadingStateVisible: PropTypes.bool,
@@ -132,7 +128,7 @@ GUI.propTypes = {
     onStorageInit: PropTypes.func,
     onUpdateProjectId: PropTypes.func,
     onVmInit: PropTypes.func,
-    platform: PropTypes.string,
+    platform: PropTypes.oneOf(Object.keys(PLATFORM)),
     setPlatform: PropTypes.func.isRequired,
     projectHost: PropTypes.string,
     projectId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
@@ -145,7 +141,6 @@ GUI.propTypes = {
 };
 
 GUI.defaultProps = {
-    isScratchDesktop: false,
     isTotallyNormal: false,
     onStorageInit: () => {},
     onProjectLoaded: () => {},

packages/scratch-gui/src/containers/tips-library.jsx

@@ -7,7 +7,7 @@ import decksLibraryContent from '../lib/libraries/decks/index.jsx';
 import tutorialTags from '../lib/libraries/tutorial-tags';
 
 import analytics from '../lib/analytics';
-import {isScratchDesktop} from '../lib/isScratchDesktop';
+import {PLATFORM} from '../lib/platform.js';
 
 import LibraryComponent from '../components/library/library.jsx';
 
@@ -73,11 +73,11 @@ class TipsLibrary extends React.PureComponent {
                 const isProjectTutorial = Object.prototype.hasOwnProperty.call(deck, 'requiredProjectId');
                 const isVideoOnlyTutorial = decksLibraryContent[id].steps.filter(s => s.title).length === 0;
 
-                if (isProjectTutorial && (this.props.hideTutorialProjects || isScratchDesktop())) {
+                if (isProjectTutorial && (this.props.hideTutorialProjects || this.props.platform === PLATFORM.DESKTOP)) {
                     return false;
                 }
 
-                if (isVideoOnlyTutorial && isScratchDesktop()) {
+                if (isVideoOnlyTutorial && this.props.platform === PLATFORM.DESKTOP) {
                     return false;
                 }
 
@@ -117,13 +117,15 @@ TipsLibrary.propTypes = {
     onActivateDeck: PropTypes.func.isRequired,
     onRequestClose: PropTypes.func,
     projectId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    platform: PropTypes.oneOf(Object.keys(PLATFORM)),
     visible: PropTypes.bool,
     hideTutorialProjects: PropTypes.bool
 };
 
 const mapStateToProps = state => ({
     visible: state.scratchGui.modals.tipsLibrary,
-    projectId: state.scratchGui.projectState.projectId
+    projectId: state.scratchGui.projectState.projectId,
+    platform: state.scratchGui.platform.platform
 });
 
 const mapDispatchToProps = dispatch => ({

packages/scratch-gui/src/lib/isScratchDesktop.js

@@ -1,5 +1,6 @@
 import {EditorState, createStandaloneRoot, setAppElement} from '../index-standalone';
 import HashParserHOC from '../lib/hash-parser-hoc.jsx';
+import {PLATFORM} from '../lib/platform.js';
 
 import log from '../lib/log.js';
 
@@ -60,7 +61,7 @@ export default appTarget => {
     if (simulateScratchDesktop) {
         gui.render({
             canEditTitle: true,
-            isScratchDesktop: true,
+            platform: PLATFORM.DESKTOP,
             showTelemetryModal: true,
             canSave: false,
             onTelemetryModalCancel: handleTelemetryModalCancel,

packages/scratch-gui/src/playground/render-gui-standalone.jsx

@@ -6,6 +6,7 @@ import AppStateHOC from '../lib/app-state-hoc.jsx';
 import GUI from '../containers/gui.jsx';
 import HashParserHOC from '../lib/hash-parser-hoc.jsx';
 import log from '../lib/log.js';
+import {PLATFORM} from '../lib/platform.js';
 
 const onClickLogo = () => {
     window.location = 'https://scratch.mit.edu';
@@ -66,7 +67,7 @@ export default appTarget => {
         simulateScratchDesktop ?
             <WrappedGui
                 canEditTitle
-                isScratchDesktop
+                platform={PLATFORM.DESKTOP}
                 showTelemetryModal
                 canSave={false}
                 onTelemetryModalCancel={handleTelemetryModalCancel}