Merge pull request #31 from texttree/develop

Develop

Author: Valyukhov

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@texttree/tt-reference-rcl",
   "author": "TextTree.org",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "This library of components was made as part of the development of the Bible Study App and helps to display books and chapters from the books of the Bible.",
   "keywords": [
     "bible",

src/components/BibleBookList/BibleBookList.js

@@ -111,7 +111,7 @@ function BibleBookList({
       title: titleOBS,
       bookList: currentBookListOBS,
     });
-    if (showCheckbox) {
+    if (!showCheckbox) {
       showCheckbox = allBooksIsSet(currentBookListOBS);
     }
   }
@@ -127,24 +127,24 @@ function BibleBookList({
   ) : (
     ''
   );
-const bookListRender = testamentList.map((el, index) => {
-        return (
-          <BookList
-            bookClasses={bookClasses}
-            bookList={el.bookList}
-            bookListClasses={{
-              title: BibleBookListClasses?.title,
-              book: BibleBookListClasses?.book,
-              bookList: BibleBookListClasses?.bookList,
-            }}
-            key={index}
-            onClickBook={onClickBook}
-            selectedBookId={selectedBookId}
-            showInactive={!checkState}
-            title={el.title}
-          />
-        );
-      })
+  const bookListRender = testamentList.map((el, index) => {
+    return (
+      <BookList
+        bookClasses={bookClasses}
+        bookList={el.bookList}
+        bookListClasses={{
+          title: BibleBookListClasses?.title,
+          book: BibleBookListClasses?.book,
+          bookList: BibleBookListClasses?.bookList,
+        }}
+        key={index}
+        onClickBook={onClickBook}
+        selectedBookId={selectedBookId}
+        showInactive={!checkState}
+        title={el.title}
+      />
+    );
+  });
 
   return (
     <>

src/components/BookList/BookList.js

@@ -12,29 +12,26 @@ function BookList({
   onClickBook,
   showInactive,
 }) {
-
-  bookListRender = bookList.map(
-          (el, index) =>
-            (showInactive || el.isset) && (
-              <Book
-                bookId={el.identifier}
-                className={bookListClasses?.book}
-                classes={bookClasses}
-                isSelected={selectedBookId == el.identifier}
-                isset={el.isset}
-                key={index}
-                onClick={onClickBook}
-                text={el.text}
-              />
-            )
-        )
+  const bookListRender = bookList.map(
+    (el, index) =>
+      (showInactive || el.isset) && (
+        <Book
+          bookId={el.identifier}
+          className={bookListClasses?.book}
+          classes={bookClasses}
+          isSelected={selectedBookId == el.identifier}
+          isset={el.isset}
+          key={index}
+          onClick={onClickBook}
+          text={el.text}
+        />
+      )
+  );
 
   return (
     <>
       <div className={bookListClasses?.title}>{title}</div>
-      <Box className={bookListClasses?.bookList}>
-        {bookListRender}
-      </Box>
+      <Box className={bookListClasses?.bookList}>{bookListRender}</Box>
     </>
   );
 }

src/components/ChapterList/ChapterList.js

@@ -11,23 +11,19 @@ function ChapterList({
   selectedChapter,
   onClickChapter,
 }) {
-  chapterListRender = chapterList.map((el, index) => (
-        <Chapter
-          chapterId={el}
-          chapterPrefix={chapterPrefix}
-          className={chapterListClasses?.chapter}
-          classes={chapterClasses}
-          isSelected={String(selectedChapter) === String(el)}
-          key={index}
-          onClick={onClickChapter}
-        />
-      ))
+  const chapterListRender = chapterList.map((el, index) => (
+    <Chapter
+      chapterId={el}
+      chapterPrefix={chapterPrefix}
+      className={chapterListClasses?.chapter}
+      classes={chapterClasses}
+      isSelected={String(selectedChapter) === String(el)}
+      key={index}
+      onClick={onClickChapter}
+    />
+  ));
 
-  return (
-    <Box className={chapterListClasses?.chapterList}>
-      {chapterListRender}
-    </Box>
-  );
+  return <Box className={chapterListClasses?.chapterList}>{chapterListRender}</Box>;
 }
 
 ChapterList.defaultProps = {