Skip to content

Commit

Permalink
Merge pull request #354 from EmmaRamirez/release/1.4.1
Browse files Browse the repository at this point in the history
Release/1.4.1
  • Loading branch information
EmmaRamirez authored Oct 28, 2020
2 parents 009fea6 + 445e66a commit 127a15c
Show file tree
Hide file tree
Showing 8 changed files with 437 additions and 310 deletions.
15 changes: 14 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nuzlocke-generator",
"version": "1.4.0",
"version": "1.4.1",
"description": "A tool for generating nuzlocke team pics from data",
"main": "dist/bundle.js",
"scripts": {
Expand Down Expand Up @@ -33,6 +33,7 @@
"license": "MIT",
"dependencies": {
"@emmaramirez/dom-to-image": "^3.0.2",
"@react-hook/debounce": "^3.0.0",
"@types/chalk": "^2.2.0",
"@types/color": "^3.0.0",
"@types/cypress": "^1.1.3",
Expand Down
4 changes: 3 additions & 1 deletion src/components/App/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@ export class UpdaterBase extends React.Component<{
this.props.present != null &&
!isEqual(this.props.present, prev.present)
) {
console.log(this.props.lrt, prev.lrt);
const t0 = performance.now();
this.props.updateEditorHistory(prev.present);
const t1 = performance.now();
console.log(`Updated history in ${t1 - t0}ms`);
}
}

Expand Down
9 changes: 9 additions & 0 deletions src/components/PokemonEditor/CurrentPokemonEdit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,15 @@ CurrentPokemonEditState
</span>
<CurrentPokemonLayoutItem>
<ErrorBoundary>
{/*<CurrentPokemonInput
inputName="species"
labelName="Species"
disabled={currentPokemon.egg}
placeholder="Missing No."
value={currentPokemon.species}
type='autocomplete'
items={(listOfPokemon as unknown) as string[]}
/>*/}
<Autocomplete
items={(listOfPokemon as unknown) as string[]}
name="species"
Expand Down
Loading

0 comments on commit 127a15c

Please sign in to comment.