From cdcb08b7eb7a1c39646f0f8f66009c1ec559a8b1 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Thu, 4 May 2017 20:38:43 -0400 Subject: [PATCH 01/13] Update blocks.js --- src/lib/blocks.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/blocks.js b/src/lib/blocks.js index cfd64d98f..c0cf9e3ef 100644 --- a/src/lib/blocks.js +++ b/src/lib/blocks.js @@ -9,7 +9,9 @@ module.exports = function (vm) { { type: 'field_dropdown', name: name, - options: start.concat(menuOptionsFn()) + options: function () { + return start.concat(menuOptionsFn()); + } } ], inputsInline: true, From 3b95020efe04e136b98b4c122fa5f66c4582ca2d Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 1 May 2017 19:04:32 +0000 Subject: [PATCH 02/13] chore(package): update style-loader to version 0.17.0 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7d221cc7c..dcb9bd8a8 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "scratch-render": "^0.1.0-prerelease.0", "scratch-storage": "^0.1.0", "scratch-vm": "^0.1.0-prerelease.0", - "style-loader": "0.16.1", + "style-loader": "^0.17.0", "svg-to-image": "1.1.3", "svg-url-loader": "2.0.2", "travis-after-all": "^1.4.4", From a2b3d4d3d1719745395f9380cfabf5e49d4d747c Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 2 May 2017 07:28:26 +0000 Subject: [PATCH 03/13] chore(package): update css-loader to version 0.28.1 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dcb9bd8a8..86042830f 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "babel-preset-react": "^6.22.0", "classnames": "2.2.5", "copy-webpack-plugin": "4.0.1", - "css-loader": "0.28.0", + "css-loader": "0.28.1", "eslint": "^3.16.1", "eslint-config-scratch": "^3.0.0", "eslint-plugin-react": "^6.10.0", From 96065b2db281fe9983d5c0365407e7cbdd928836 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 8 May 2017 14:57:21 +0000 Subject: [PATCH 04/13] chore(package): update postcss-simple-vars to version 4.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 86042830f..93af10e9e 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "mkdirp": "^0.5.1", "postcss-import": "9.1.0", "postcss-loader": "1.3.3", - "postcss-simple-vars": "3.1.0", + "postcss-simple-vars": "4.0.0", "prop-types": "15.5.8", "react": "15.5.4", "react-dom": "15.5.4", From 330d1465c8f3788d9d7e9c92d4f507138a9e3975 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 9 May 2017 03:15:51 +0000 Subject: [PATCH 05/13] chore(package): update gh-pages to version 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 93af10e9e..66436e53b 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "eslint": "^3.16.1", "eslint-config-scratch": "^3.0.0", "eslint-plugin-react": "^6.10.0", - "gh-pages": "^0.12.0", + "gh-pages": "^1.0.0", "html-webpack-plugin": "2.28.0", "lodash.bindall": "4.4.0", "lodash.defaultsdeep": "4.6.0", From fa3850327a297acf24bea2890dfe3340bff37658 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 9 May 2017 22:40:31 +0000 Subject: [PATCH 06/13] chore(package): update react-tabs to version 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66436e53b..3cfbbef66 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "react-modal": "1.7.7", "react-redux": "5.0.4", "react-style-proptype": "3.0.0", - "react-tabs": "0.8.3", + "react-tabs": "1.0.0", "redux": "3.6.0", "redux-throttle": "0.1.1", "rimraf": "^2.6.1", From 49eebe3041d71f7fe95166028db9f31e6934feb5 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 10 May 2017 12:39:31 +0000 Subject: [PATCH 07/13] chore(package): update postcss-loader to version 2.0.5 Closes #346 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3cfbbef66..9ad18abe2 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,8 @@ "minilog": "3.1.0", "mkdirp": "^0.5.1", "postcss-import": "9.1.0", - "postcss-loader": "1.3.3", - "postcss-simple-vars": "4.0.0", + "postcss-loader": "^2.0.5", + "postcss-simple-vars": "^4.0.0", "prop-types": "15.5.8", "react": "15.5.4", "react-dom": "15.5.4", From 9087e5a6fff5c2abb2219880c9fd7e20e005486d Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 12 May 2017 14:54:25 +0000 Subject: [PATCH 08/13] chore(package): update prop-types to version 15.5.10 Closes #352 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ad18abe2..f21c3ae02 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "postcss-import": "9.1.0", "postcss-loader": "^2.0.5", "postcss-simple-vars": "^4.0.0", - "prop-types": "15.5.8", + "prop-types": "^15.5.10", "react": "15.5.4", "react-dom": "15.5.4", "react-draggable": "2.2.6", From f0c519debe7212e00795af142a22011ef0a787d7 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 12 May 2017 23:27:55 +0000 Subject: [PATCH 09/13] chore(package): update postcss-import to version 10.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f21c3ae02..5cf2e0ce8 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "lodash.pick": "4.4.0", "minilog": "3.1.0", "mkdirp": "^0.5.1", - "postcss-import": "9.1.0", + "postcss-import": "^10.0.0", "postcss-loader": "^2.0.5", "postcss-simple-vars": "^4.0.0", "prop-types": "^15.5.10", From f82c71fb12608a30e9059f2956d2b6c79d3e8035 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sat, 13 May 2017 18:45:56 +0000 Subject: [PATCH 10/13] chore(package): update eslint-plugin-react to version 7.0.1 Closes #344 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5cf2e0ce8..2c2b4c60a 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "css-loader": "0.28.1", "eslint": "^3.16.1", "eslint-config-scratch": "^3.0.0", - "eslint-plugin-react": "^6.10.0", + "eslint-plugin-react": "^7.0.1", "gh-pages": "^1.0.0", "html-webpack-plugin": "2.28.0", "lodash.bindall": "4.4.0", From 424b3440b3082f2e344d451d35245008bc527bcd Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 14 May 2017 23:48:48 +0000 Subject: [PATCH 11/13] chore(package): update autoprefixer to version 7.1.0 Closes #345 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2c2b4c60a..8f9ed2a87 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "react-dom": "^15" }, "devDependencies": { - "autoprefixer": "6.7.7", + "autoprefixer": "7.1.0", "babel-core": "^6.23.1", "babel-eslint": "^7.1.1", "babel-loader": "^7.0.0", From de9c3c0faae05f7130f625a197abdff8c3ce6dcf Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 18 May 2017 04:41:35 +0000 Subject: [PATCH 12/13] chore(package): update react-redux to version 5.0.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8f9ed2a87..54d7f7f2f 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "react-dom": "15.5.4", "react-draggable": "2.2.6", "react-modal": "1.7.7", - "react-redux": "5.0.4", + "react-redux": "5.0.5", "react-style-proptype": "3.0.0", "react-tabs": "1.0.0", "redux": "3.6.0", From cf58d318ed5a6200f768f85836d60c78261d46f0 Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Fri, 19 May 2017 12:54:26 -0700 Subject: [PATCH 13/13] Fix tab style handling, changed in 1.0 --- src/components/gui/gui.css | 10 +++++++--- src/components/gui/gui.jsx | 36 ++++++++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/components/gui/gui.css b/src/components/gui/gui.css index e2fe4db43..ebaf67d84 100644 --- a/src/components/gui/gui.css +++ b/src/components/gui/gui.css @@ -47,7 +47,7 @@ border-bottom: 0 !important; } -.tab-list .tab { +.tab { flex-grow: 1; height: 80%; margin-left: 1px; @@ -63,9 +63,9 @@ align-items: center; } - -.tab-list .tab[aria-selected="true"] { +.tab.is-selected { color: #40B9F5; + background-color: #FFFFFF; } .tabs { @@ -80,6 +80,10 @@ position: relative; flex-grow: 1; flex-shrink: 0; + display: none; +} + +.tab-panel.is-selected { display: flex; } diff --git a/src/components/gui/gui.jsx b/src/components/gui/gui.jsx index 9bf21c40d..47fb1b327 100644 --- a/src/components/gui/gui.jsx +++ b/src/components/gui/gui.jsx @@ -1,6 +1,10 @@ +const classNames = require('classnames'); const PropTypes = require('prop-types'); const React = require('react'); +const {Tab, Tabs, TabList, TabPanel} = require('react-tabs'); +const tabStyles = require('react-tabs/style/react-tabs.css'); const VM = require('scratch-vm'); + const Blocks = require('../../containers/blocks.jsx'); const CostumeTab = require('../../containers/costume-tab.jsx'); const GreenFlag = require('../../containers/green-flag.jsx'); @@ -8,12 +12,13 @@ const TargetPane = require('../../containers/target-pane.jsx'); const SoundTab = require('../../containers/sound-tab.jsx'); const Stage = require('../../containers/stage.jsx'); const StopAll = require('../../containers/stop-all.jsx'); -const MenuBar = require('../menu-bar/menu-bar.jsx'); -const {Tab, Tabs, TabList, TabPanel} = require('react-tabs'); const Box = require('../box/box.jsx'); +const MenuBar = require('../menu-bar/menu-bar.jsx'); + const styles = require('./gui.css'); + const GUIComponent = props => { const { basePath, @@ -31,6 +36,15 @@ const GUIComponent = props => { ); } + const tabClassNames = { + tabs: styles.tabs, + tab: classNames(tabStyles.reactTabsTab, styles.tab), + tabList: classNames(tabStyles.reactTabsTabList, styles.tabList), + tabPanel: classNames(tabStyles.reactTabsTabPanel, styles.tabPanel), + tabPanelSelected: classNames(tabStyles.reactTabsTabPanelSelected, styles.isSelected), + tabSelected: classNames(tabStyles.reactTabsTabSelected, styles.isSelected) + }; + return ( { - - Scripts - Costumes - Sounds + + Scripts + Costumes + Sounds - + { /> - + - +