Commit854ced0

authored

Merge pull requestcoderoad#17 from ShMcK/fix/size

Fix/size

2 parents3d8c8fa +7a07a4d commit854ced0Copy full SHA for 854ced0

File tree

+34

-13

lines changed

+34

-13

lines changed

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,17 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": ["tslint:latest","tslint-config-prettier"],`
`3`	`3`	`"rules": {`
	`4`	`+"class-name":true,`
	`5`	`+"curly":true,`
	`6`	`+"interface-name": [true,"never-prefix"],`
`4`	`7`	`"no-string-throw":true,`
`5`		`-"no-unused-expression":true,`
`6`	`8`	`"no-duplicate-variable":true,`
`7`		`-"curly":true,`
`8`		`-"class-name":true,`
	`9`	`+"no-implicit-dependencies":false,`
	`10`	`+"no-unused-expression":true,`
	`11`	`+"object-literal-sort-keys":false,`
	`12`	`+"ordered-imports":false,`
`9`	`13`	`"semicolon": [true,"never"],`
`10`		`-"triple-equals":true,`
`11`		`-"interface-name": [true,"never-prefix"],`
`12`		`-"object-literal-sort-keys":false`
	`14`	`+"triple-equals":true`
`13`	`15`	`},`
`14`	`16`	`"defaultSeverity":"warning",`
`15`	`17`	`"no-submodule-imports":false`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//import '@alifd/next/dist/next.css'`
	`1`	`+import'@alifd/next/dist/next.css'`
`2`	`2`	`import{configure}from'@storybook/react'`
`3`	`3`	`import'../src/styles/index.css'`
`4`	`4`

Lines changed: 21 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,34 @@ interface Props {`
`12`	`12`
`13`	`13`	`conststyles={`
`14`	`14`	`page:{`
`15`		`-width:window.innerWidth,`
`16`		`-height:window.innerHeight,`
	`15`	`+margin:0,`
`17`	`16`	`backgroundColor:'white',`
`18`	`17`	`},`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`constRoutes=({ state}:Props)=>{`
	`21`	`+const[dimensions,setDimensions]=React.useState({`
	`22`	`+width:window.innerWidth-20,`
	`23`	`+height:window.innerHeight-20,`
	`24`	`+})`
	`25`	`+`
	`26`	`+// solution for windows getting off size`
	`27`	`+// without adding multiple listeners`
	`28`	`+React.useEffect(()=>{`
	`29`	`+constdimensionsInterval=setInterval(()=>{`
	`30`	`+setDimensions({`
	`31`	`+width:window.innerWidth-20,`
	`32`	`+height:window.innerHeight-20,`
	`33`	`+})`
	`34`	`+},5000)`
	`35`	`+return()=>{`
	`36`	`+clearInterval(dimensionsInterval)`
	`37`	`+}`
	`38`	`+})`
	`39`	`+`
`22`	`40`	`// TODO: refactor cond to user <Router><Route> and accept first route as if/else if`
`23`	`41`	`return(`
`24`		`-<divstyle={styles.page}>`
	`42`	`+<divstyle={{ ...styles.page, ...dimensions}}>`
`25`	`43`	`<Condstate={state}path="SelectTutorial.Startup">`
`26`	`44`	`<Loading/>`
`27`	`45`	`</Cond>`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,6 @@ const Stage = ({ stage, steps, onNextStage, complete }: Props) => {`
`38`	`38`	`constactiveIndex=stepList.findIndex((stepId:string)=>{`
`39`	`39`	`returnsteps[stepId].status.active`
`40`	`40`	`})`
`41`		`-// only display up until the active step`
`42`		`-constfilteredStepList=stepList.slice(0,activeIndex+1)`
`43`	`41`	`return(`
`44`	`42`	`<divstyle={styles.card}>`
`45`	`43`	`<divstyle={styles.content}>`
`@@ -48,7 +46,7 @@ const Stage = ({ stage, steps, onNextStage, complete }: Props) => {`
`48`	`46`	`</div>`
`49`	`47`	`<divstyle={styles.steps}>`
`50`	`48`	`<Stepcurrent={activeIndex}direction="ver"shape="dot"animationreadOnly>`
`51`		`-{filteredStepList.map((stepId:string,index:number)=>{`
	`49`	`+{stepList.map((stepId:string,index:number)=>{`
`52`	`50`	`conststep=steps[stepId]`
`53`	`51`	`return(`
`54`	`52`	`<Step.Item`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@ import ReactDOM from 'react-dom'`
`3`	`3`	`importAppfrom'./App'`
`4`	`4`
`5`	`5`	`// base styles`
	`6`	`+// TODO: must be a better way to load@alifd styles`
	`7`	`+// currently these are loaded in src/editor/ReactWebView.ts as well`
	`8`	`+import'@alifd/next/dist/next.css'`
`6`	`9`	`import'./styles/index.css'`
`7`	`10`
`8`	`11`	`ReactDOM.render(<App/>,document.getElementById('root')asHTMLElement)`

Comments

(0)