Commitaa830ea

authored

Merge pull requestcoderoad#103 from ShMcK/feature/improve-load-solution-ui

Feature/improve load solution ui

2 parents43c1659 +de2d0e0 commitaa830eaCopy full SHA for aa830ea

File tree

+21

-10

lines changed

+21

-10

lines changed

Lines changed: 18 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import{Balloon}from'@alifd/next'`
`2`	`2`	`import*asReactfrom'react'`
`3`	`3`	`import{css,jsx}from'@emotion/core'`
	`4`	`+importIconfrom'../Icon'`
`4`	`5`	`importButtonfrom'../Button'`
`5`	`6`
`6`	`7`	`conststyles={`
`@@ -28,17 +29,32 @@ interface Props {`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`constStepHelp=(props:Props)=>{`
	`32`	`+const[visible,setVisible]=React.useState(false)`
`31`	`33`	`// TODO extract or replace load solution`
`32`	`34`	`const[loadedSolution,setLoadedSolution]=React.useState()`
`33`	`35`	`constonClickHandler=()=>{`
`34`	`36`	`if(!loadedSolution){`
`35`	`37`	`setLoadedSolution(true)`
`36`	`38`	`props.onLoadSolution()`
	`39`	`+setVisible(false)`
`37`	`40`	`}`
`38`	`41`	`}`
`39`		`-constpromptLeft=<Buttoncss={styles.iconButton}>i</Button>`
	`42`	`+constpromptLeft=(`
	`43`	`+<Buttoncss={styles.iconButton}onClick={()=>setVisible(!visible)}>`
	`44`	`+<Icontype="help"/>`
	`45`	`+</Button>`
	`46`	`+)`
`40`	`47`	`return(`
`41`		`-<Balloontrigger={promptLeft}align="l"alignEdgetriggerType="click"css={{width:150}}closable={false}>`
	`48`	`+<Balloon`
	`49`	`+trigger={promptLeft}`
	`50`	`+align="l"`
	`51`	`+alignEdge`
	`52`	`+triggerType="click"`
	`53`	`+css={{width:150}}`
	`54`	`+closable`
	`55`	`+visible={visible}`
	`56`	`+onClose={()=>setVisible(false)}`
	`57`	`+>`
`42`	`58`	`<div>`
`43`	`59`	`<h4css={styles.balloonTitle}>Stuck?</h4>`
`44`	`60`	`<divcss={styles.balloonOptions}>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ const styles = {`
`13`	`13`	`display:'flex'as'flex',`
`14`	`14`	`flexDirection:'column'as'column',`
`15`	`15`	`width:'100%',`
`16`		`-paddingBottom:footerHeight,`
	`16`	`+paddingBottom:'5rem',`
`17`	`17`	`},`
`18`	`18`	`summary:{`
`19`	`19`	`padding:'0rem 1rem 1rem 1rem',`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
@@ -31,13 +31,8 @@ const paragraphText = `Markdown included \`code\`, bold, & _italics_.
`31`	`31`	`storiesOf('Level',module)`
`32`	`32`	`.addDecorator(SideBarDecorator)`
`33`	`33`	`.addDecorator(withKnobs)`
`34`		`-.add('Step',()=>(`
`35`		`-<Step`
`36`		`-order={1}`
`37`		`-content={text('text',stepText)}`
`38`		`-status={select('mode',{ACTIVE:'ACTIVE',COMPLETE:'COMPLETE',INCOMPLETE:'INCOMPLETE'},'COMPLETE','step')}`
`39`		`-onLoadSolution={action('onLoadSolution')}`
`40`		`-/>`
	`34`	`+.add('Active Step',()=>(`
	`35`	`+<Steporder={1}content={text('text',stepText)}status="ACTIVE"onLoadSolution={action('onLoadSolution')}/>`
`41`	`36`	`))`
`42`	`37`	`.add('Step Markdown',()=>(`
`43`	`38`	`<Step`

Comments

(0)