File tree Expand file tree Collapse file tree
src/components/portfolioPage Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -14,12 +14,20 @@ class Corpora extends Component {
1414 } ;
1515
1616 sort = memoize ( ( items , criteria ) => items . sort ( by ( `${ criteria } .0` ) ) ) ;
17+ < << << << HEAD
1718
1819 componentWillReceiveProps ( props ) {
1920 this . setState ( {
2021 listCorpus : [ ...props . ids ]
2122 } )
2223}
24+ === === =
25+ componentWillReceiveProps ( props ) {
26+ this . setState ( {
27+ listCorpus : [ ...props . ids ]
28+ } ) ;
29+ }
30+ >>> >>> > fix problems on props . ids
2331 render ( ) {
2432 let itemsData = this . sort ( this . props . items , this . state . criteria ) ;
2533 let items = itemsData . map ( x =>
@@ -86,7 +94,7 @@ class Corpora extends Component {
8694
8795 isChecked ( corpus ) {
8896 let list = this . state . listCorpus ;
89- if ( ! list . includes ( corpus ) ) {
97+ if ( list . includes ( corpus ) ) {
9098 return true ;
9199 }
92100 return false ;
You can’t perform that action at this time.
0 commit comments