Merge pull request #132 from wdr-data/fix/more-app-regressions

Fix more app regressions

Author: jh0ker

babel.config.js

@@ -20,8 +20,8 @@ module.exports = {
     [
       'formatjs',
       {
+        // No `ast: true`: react-intl 2 renders defaultMessage only as a string.
         idInterpolationPattern: '[sha512:contenthash:base64:6]',
-        ast: true,
       },
     ],
   ],

src/components/menu/menu.jsx

@@ -148,13 +148,7 @@ export const MenuComponent = (props) => {
           </TabPanel>
           <TabPanel className={tabClassNames.tabPanel}>
             <div className={styles.sectionBody}>
-              <Link
-                to={{
-                  pathname: '/projekt/neu',
-                  state: { isNewProject: true },
-                }}
-                className={styles.newButton}
-              >
+              <Link to="/projekt/neu" className={styles.newButton}>
                 <InlineSVG Svg={ButtonNew} className={styles.newButtonIcon} />
                 Neu
               </Link>

src/components/mobile-screen/mobile-screen.jsx

@@ -69,7 +69,7 @@ const MobileScreenComponent = () => (
     </div>
 
     <div className={styles.blockWrapper}>
-      <Link className={styles.link} to="https://github.com/wdr-data/code4maus">
+      <a className={styles.link} href="https://github.com/wdr-data/code4maus">
         <img
           role="Deko-Block"
           alt="Programmieren mit der Maus"
@@ -78,14 +78,14 @@ const MobileScreenComponent = () => (
           draggable={false}
           src={block2}
         />
-      </Link>
+      </a>
 
       <div className={classNames(styles.innerWrapper, styles.secondWrapper)}>
         <p>
           Das Ganze beruht auf der grafischen Programmiersprache{' '}
-          <Link className={styles.link} to="https://scratch.mit.edu/">
+          <a className={styles.link} href="https://scratch.mit.edu/">
             Scratch
-          </Link>
+          </a>
           , die am MIT, in den USA, entwickelt und von Kindern der ganzen Welt
           genutzt wird. Genau wie Scratch, ist auch Programmieren mit der Maus{' '}
           <span className={styles.boldOrange}>Open Source</span> – also frei

src/containers/gui.jsx

@@ -150,8 +150,6 @@ const mapStateToProps = (state) => ({
   layoutmode: state.scratchGui.layoutMode,
   saveProjectVisible: state.scratchGui.modals.saveProject,
   eduLayerActive: state.scratchGui.eduLayer.enabled,
-  isNewProject:
-    state.router.location.state && !!state.router.location.state.isNewProject,
 })
 
 const logPageDisplay = (eduId, isNewProject, tab) => {
@@ -181,7 +179,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
     onActivateTab: (tab) => {
       // react-tabs also fires onSelect for the already active tab
       if (tab !== stateProps.activeTabIndex) {
-        logPageDisplay(eduId, stateProps.isNewProject, tab)
+        logPageDisplay(eduId, ownProps.isNewProject, tab)
       }
       dispatchProps.onActivateTab(tab)
     },

src/containers/sound-tab.jsx

@@ -48,13 +48,14 @@ class SoundTab extends React.Component {
     if (!target || !target.sounds) {
       return
     }
-  
-    if (prevProps.editingTarget !== this.props.editingTarget) {
-      this.setState({ selectedSoundIndex: 0 })
-    } else if (this.state.selectedSoundIndex > target.sounds.length - 1) {
-      this.setState({
-        selectedSoundIndex: Math.max(target.sounds.length - 1, 0),
-      })
+
+    const { selectedSoundIndex } = this.state
+    const nextIndex =
+      prevProps.editingTarget !== editingTarget
+        ? 0
+        : Math.min(selectedSoundIndex, Math.max(target.sounds.length - 1, 0))
+    if (nextIndex !== selectedSoundIndex) {
+      this.setState({ selectedSoundIndex: nextIndex })
     }
   }
 

webpack.config.js

@@ -196,7 +196,7 @@ module.exports = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      'process.env.DEBUG': 'process.env.DEBUG',
+      'process.env.DEBUG': JSON.stringify(Boolean(process.env.DEBUG)),
       'process.env.BRANCH': JSON.stringify(branch),
     }),
     customHtmlPlugin({