File tree Expand file tree Collapse file tree 3 files changed +26
-20
lines changed
Sandbox/Editor/Header/CollectionInfo
common/Modals/PreferencesModal/Appearance Expand file tree Collapse file tree 3 files changed +26
-20
lines changed Original file line number Diff line number Diff line change @@ -73,6 +73,9 @@ class CollectionInfo extends React.Component {
7373
7474 render ( ) {
7575 const { sandbox, isLoggedIn, signals } = this . props ;
76+ const { nameValue, updatingName } = this . state ;
77+
78+ const value = nameValue !== 'Untitled' && updatingName ? nameValue : '' ;
7679
7780 const folderName = sandbox . collection
7881 ? basename ( sandbox . collection . path ) ||
@@ -85,7 +88,7 @@ class CollectionInfo extends React.Component {
8588 opacity : 1 ,
8689 } }
8790 to = {
88- this . state . updatingName
91+ updatingName
8992 ? {
9093 opacity : 0 ,
9194 pointerEvents : 'none' ,
@@ -125,7 +128,7 @@ class CollectionInfo extends React.Component {
125128 </ div >
126129 ) }
127130 />
128- { this . state . updatingName ? (
131+ { updatingName ? (
129132 < form
130133 css = { {
131134 position : 'absolute' ,
@@ -147,7 +150,8 @@ class CollectionInfo extends React.Component {
147150 onKeyUp = { this . handleKeyUp }
148151 onBlur = { this . handleBlur }
149152 onChange = { this . handleInputUpdate }
150- value = { this . state . nameValue }
153+ placeholder = { nameValue }
154+ value = { value }
151155 />
152156 </ form >
153157 ) : (
Original file line number Diff line number Diff line change @@ -127,13 +127,12 @@ function EditorSettings({ store, signals }) {
127127 { '"' } as your color theme.
128128 </ SubDescription >
129129
130- < PreferenceText
131- isTextArea
132- style = { { fontFamily : 'Source Code Pro' , fontSize : '.8rem' } }
133- block
134- rows = { 7 }
135- defaultValue = { `You can use your own theme from VSCode directly:
136-
130+ < PreferenceText
131+ isTextArea
132+ style = { { fontFamily : 'Source Code Pro' , fontSize : '.8rem' } }
133+ block
134+ rows = { 7 }
135+ placeholder = { `You can use your own theme from VSCode directly:
1371361. Open VSCode
1381372. Press (CMD or CTRL) + SHIFT + P
1391383. Enter: '> Developer: Generate Color Scheme From Current Settings'
@@ -165,7 +164,7 @@ function EditorSettings({ store, signals }) {
165164 style = { { fontFamily : 'Source Code Pro' , fontSize : '.8rem' } }
166165 block
167166 rows = { 7 }
168- defaultValue = { `You can use your own theme from VSCode directly:
167+ placeholder = { `You can use your own theme from VSCode directly:
1691681. Open VSCode
1701692. Press (CMD or CTRL) + SHIFT + P
1711703. Enter: '> Developer: Generate Color Scheme From Current Settings'
Original file line number Diff line number Diff line change @@ -107,26 +107,29 @@ export default class Explore extends React.PureComponent {
107107 } ;
108108
109109 navigateToNextSandbox = ( ) => {
110- this . setState ( state => ( {
111- featuredSandboxIndex : state . featuredSandboxIndex + 1 ,
112- } ) ) ;
110+ const next = this . state . featuredSandboxIndex + 1 ;
111+ // if last go to first
112+ this . setState ( {
113+ featuredSandboxIndex : next === featuredSandboxes . length ? 0 : next ,
114+ } ) ;
113115 } ;
114116
115117 navigateToPreviousSandbox = ( ) => {
116- this . setState ( state => ( {
117- featuredSandboxIndex : state . featuredSandboxIndex - 1 ,
118- } ) ) ;
118+ const index = this . state . featuredSandboxIndex ;
119+
120+ // if first go to last
121+ this . setState ( {
122+ featuredSandboxIndex :
123+ index === 0 ? featuredSandboxes . length - 1 : index - 1 ,
124+ } ) ;
119125 } ;
120126
121127 handleKeyPress = ( { keyCode } ) => {
122- const { featuredSandboxIndex } = this . state ;
123128 switch ( keyCode ) {
124129 case ARROW_LEFT :
125- if ( featuredSandboxIndex === 0 ) return ;
126130 this . navigateToPreviousSandbox ( ) ;
127131 break ;
128132 case ARROW_RIGHT :
129- if ( featuredSandboxIndex === featuredSandboxes . length - 1 ) return ;
130133 this . navigateToNextSandbox ( ) ;
131134 break ;
132135 default :
You can’t perform that action at this time.
0 commit comments