File tree Expand file tree Collapse file tree 3 files changed +223
-209
lines changed
components/recipe-generator-modal Expand file tree Collapse file tree 3 files changed +223
-209
lines changed Original file line number Diff line number Diff line change @@ -17,13 +17,22 @@ class RecipeGeneratorModalNotExtended extends React.Component {
17
17
mdParser = new MarkdownIt ( ) ;
18
18
19
19
state = {
20
- formValues : { } ,
21
20
initialCount : + this . props . item . servings ,
22
21
count : + this . props . item . servings ,
23
- ingredients : this . props . item . ingredients ,
24
- formElements : [ ]
22
+ ingredients : this . props . item . ingredients
25
23
} ;
26
24
25
+ componentDidUpdate ( prevProps , prevState ) {
26
+ const { show} = this . props ;
27
+ if ( show && prevProps . show !== show ) {
28
+ this . setState ( {
29
+ initialCount : + this . props . item . servings ,
30
+ count : + this . props . item . servings ,
31
+ ingredients : this . props . item . ingredients
32
+ } ) ;
33
+ }
34
+ }
35
+
27
36
nToBr = ( data ) => {
28
37
if ( undefined === data || '' === data ) {
29
38
return ' ' ;
@@ -61,7 +70,6 @@ class RecipeGeneratorModalNotExtended extends React.Component {
61
70
62
71
onClose = ( ) => {
63
72
const { onClose } = this . props ;
64
- this . setState ( { formValues : { } } ) ;
65
73
onClose && onClose ( ) ;
66
74
67
75
// BUG: Lag
Original file line number Diff line number Diff line change @@ -41,11 +41,11 @@ class Api {
41
41
42
42
getAllTags = ( ) => db . get ( 'recipes' ) . filter ( { isTrash : false } ) . map ( 'tags' ) . value ( ) ;
43
43
44
- getRecipesContainsTag = tag => db . get ( 'recipes' ) . filter ( ( t => t . tags . indexOf ( tag ) > - 1 && false === t . isTrash ) ) . value ( ) ;
44
+ getRecipesContainsTag = tag => db . get ( 'recipes' ) . filter ( ( t => t . tags . indexOf ( tag ) > - 1 && false === t . isTrash ) ) . sortBy ( 'title' ) . value ( ) ;
45
45
46
46
getAllCategories = ( ) => db . get ( 'recipes' ) . filter ( { isTrash : false } ) . map ( 'categories' ) . value ( ) ;
47
47
48
- getRecipesContainsCategory = category => db . get ( 'recipes' ) . filter ( ( t => t . categories . indexOf ( category ) > - 1 && false === t . isTrash ) ) . value ( ) ;
48
+ getRecipesContainsCategory = category => db . get ( 'recipes' ) . filter ( ( t => t . categories . indexOf ( category ) > - 1 && false === t . isTrash ) ) . sortBy ( 'title' ) . value ( ) ;
49
49
50
50
queryRecipe = query => db . get ( 'recipes' ) . filter ( ( t => ( t . title . toLowerCase ( ) . indexOf ( query ) > - 1 ) && false === t . isTrash ) ) . value ( ) ;
51
51
}
You can’t perform that action at this time.
0 commit comments