@nakamura-123/pages 0.1.21 → 0.1.23

package/dist/page/GradePage.js

@@ -37,11 +37,15 @@ var common_1 = require("@nakamura-123/common");
 var QuizCntGraph_1 = __importDefault(require("../component/Grade/QuizCntGraph"));
 var gradeFnc_1 = require("../functions/gradeFnc");
 var react_i18next_1 = require("react-i18next");
+var react_redux_1 = require("react-redux");
+var JAllTags_1 = __importDefault(require("../component/Grade/JAllTags"));
 var GradePage = function (_a) {
     var navigation = _a.navigation;
     var t = (0, react_i18next_1.useTranslation)().t;
     var realm = (0, react_2.useRealm)();
     var DailyLogDB = (0, react_2.useQuery)(db_1.DailyLogSchema);
+    var appSystem = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.setting.appSystem; }) ||
+        "drill";
     var totalCnt = (0, gradeFnc_1.getTotalQuizCnt)(DailyLogDB);
     // レビューをリクエスト可能か確認
     (0, react_1.useEffect)(function () {
@@ -52,9 +56,8 @@ var GradePage = function (_a) {
       <GradeCard_1.default DailyLogDB={DailyLogDB}/>
       <QuizCntGraph_1.default DailyLogDB={DailyLogDB}/>
       <Square4s_1.default DailyLogDB={DailyLogDB}/>
-      <AllTags_1.default />
+      {appSystem === "JLPT" ? <JAllTags_1.default /> : <AllTags_1.default />}
       <common_1.RoundRectangleIcon title={t("grade.allBadges")} onPress={function () { return navigation.navigate("Badge"); }} icon="shield-alt"/>
-      {/* <StoreReview /> */}
     </react_native_1.ScrollView>);
 };
 var styles = react_native_1.StyleSheet.create({

package/dist/page/GuidePage.d.ts

@@ -0,0 +1,10 @@
+import React from "react";
+interface Props {
+    route: {
+        params: {
+            quizId: string;
+        };
+    };
+}
+declare const GuidePage: React.FC<Props>;
+export default GuidePage;

package/dist/page/GuidePage.js

@@ -0,0 +1,112 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var common_1 = require("@nakamura-123/common");
+var db_1 = require("@nakamura-123/db");
+var react_1 = require("@realm/react");
+var react_2 = __importStar(require("react"));
+var react_native_1 = require("react-native");
+var RubyText_1 = __importDefault(require("../quiz/common/RubyText"));
+var lib_1 = require("@nakamura-123/lib");
+var react_redux_1 = require("react-redux");
+var quizHook_1 = require("../hooks/quizHook");
+var GuidePage = function (_a) {
+    var route = _a.route;
+    var quizId = route.params.quizId;
+    var qImgs = (0, react_redux_1.useSelector)(function (state) { return state.app.imgs.qImgs; });
+    var QuestionDB = (0, react_1.useQuery)(db_1.JQuestionSchema);
+    var question = QuestionDB.filtered("quizId == $0", quizId)[0];
+    if (!question)
+        return null;
+    if (!quizId)
+        return null;
+    var wordVoice = (0, quizHook_1.useGetVoicePath)(quizId, "word");
+    var sentenceVoice = (0, quizHook_1.useGetVoicePath)(quizId, "sentence");
+    (0, react_2.useEffect)(function () {
+        // 音声のプリロード・初回再生
+        if (!wordVoice || !sentenceVoice || !quizId)
+            return;
+        lib_1.voiceFnc.preloadVoiceById(wordVoice, false);
+        lib_1.voiceFnc.preloadVoiceById(sentenceVoice, false);
+        return function () {
+            // voiceFnc.unloadVoiceById(wordVoice);
+            // voiceFnc.unloadVoiceById(sentenceVoice);
+        };
+    }, [quizId, wordVoice]);
+    // 画像のパスを取得
+    var path = lib_1.utilFnc.getImgPathFromWord(qImgs, null, question.quizId);
+    var handleSearch = function (word) {
+        if (!word)
+            return;
+        var words = lib_1.utilFnc.parseRubyText(word);
+        var removeRuby = lib_1.utilFnc.removeRuby(words);
+        lib_1.utilFnc.handleSearchTrans(removeRuby);
+    };
+    return (<react_native_1.View style={styles.container}>
+      <react_native_1.View style={styles.wordBox}>
+        <RubyText_1.default fsize="xxl">{question.jpWord}</RubyText_1.default>
+        <common_1.MyText style={styles.enText}>{question.enWord}</common_1.MyText>
+        <react_native_1.View style={styles.iconBox}>
+          <common_1.IconInCircle name="volume-up" size={20} onPress={function () { return wordVoice && lib_1.voiceFnc.playVoice(wordVoice, 1); }}/>
+          <common_1.IconInCircle name="search" size={20} cStyle={{ marginLeft: 10 }} onPress={function () { return handleSearch(question.jpWord); }}/>
+        </react_native_1.View>
+      </react_native_1.View>
+      <react_native_1.View style={styles.wordBox}>
+        <RubyText_1.default fsize="lg">{question.jpSentence}</RubyText_1.default>
+        <common_1.MyText style={styles.enText}>{question.enSentence}</common_1.MyText>
+        <react_native_1.View style={styles.iconBox}>
+          <common_1.IconInCircle name="volume-up" size={20} onPress={function () {
+            return sentenceVoice && lib_1.voiceFnc.playVoice(sentenceVoice, 1);
+        }}/>
+          <common_1.IconInCircle name="search" size={20} cStyle={{ marginLeft: 10 }} onPress={function () { return handleSearch(question.jpSentence); }}/>
+        </react_native_1.View>
+      </react_native_1.View>
+      <common_1.MyImage path={path}/>
+    </react_native_1.View>);
+};
+var styles = react_native_1.StyleSheet.create({
+    container: {
+        flex: 1,
+        marginTop: 70,
+        marginHorizontal: 20,
+    },
+    wordBox: {
+        justifyContent: "space-between",
+        marginBottom: 20,
+    },
+    iconBox: {
+        flexDirection: "row",
+        // justifyContent: "flex-end",
+        alignItems: "center",
+    },
+    enText: {
+        marginBottom: 5,
+        // marginLeft: 5,
+    },
+});
+exports.default = GuidePage;

package/dist/page/JDatailSettingPage.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+declare const JDetailSettingPage: React.FC;
+export default JDetailSettingPage;

package/dist/page/JDatailSettingPage.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
+var react_native_1 = require("react-native");
+var JDetailSettingPage = function () {
+    return (<react_native_1.View style={styles.container}>
+      <react_native_1.Text style={styles.text}>Detail Setting Page</react_native_1.Text>
+    </react_native_1.View>);
+};
+var styles = react_native_1.StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: "center",
+        alignItems: "center",
+        backgroundColor: "#f5f5f5",
+    },
+    text: {
+        fontSize: 18,
+        color: "#333",
+    },
+});
+exports.default = JDetailSettingPage;

package/dist/page/JDetailSettingPage.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+declare const JDetailSettingPage: React.FC;
+export default JDetailSettingPage;

package/dist/page/JDetailSettingPage.js

@@ -0,0 +1,51 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var common_1 = require("@nakamura-123/common");
+var lib_1 = require("@nakamura-123/lib");
+var stores_1 = require("@nakamura-123/stores");
+var react_1 = __importDefault(require("react"));
+var react_i18next_1 = require("react-i18next");
+var react_native_1 = require("react-native");
+var react_redux_1 = require("react-redux");
+var react_redux_2 = require("react-redux");
+var JDetailSettingPage = function () {
+    var t = (0, react_i18next_1.useTranslation)().t;
+    var quizOption = lib_1.startOption.jQuizStartOptionDetail;
+    var dispatch = (0, react_redux_2.useDispatch)();
+    var selected = (0, react_redux_1.useSelector)(function (state) { return state.quiz.selected; });
+    var system = selected.system || "drill";
+    var storeOption = (0, react_redux_1.useSelector)(function (state) { return state.quizCfg.startCfg.option; });
+    var handleSelect = function (type, value) {
+        dispatch(stores_1.cfgAction.selectOption({ key: type, value: value }));
+    };
+    return (<react_native_1.View style={styles.container}>
+      {quizOption.map(function (O, i) {
+            var type = O.type, options = O.options;
+            var selectedValue = storeOption[type];
+            var selectedIndex = options.findIndex(function (o) { return o.value === selectedValue; });
+            return (<react_native_1.View key={type} style={styles.selectContainer}>
+            <common_1.MyText color="text" fsize="sm" style={styles.title}>
+              {t("setup.detail.".concat(type))}
+            </common_1.MyText>
+            <common_1.OptionSelector key={i} options={options.map(function (o) { return o.label; })} selected={selectedIndex} onSelect={function (childI) { return handleSelect(type, options[childI].value); }}/>
+          </react_native_1.View>);
+        })}
+    </react_native_1.View>);
+};
+var styles = react_native_1.StyleSheet.create({
+    container: {
+        // flex: 1,
+        marginTop: 30,
+        paddingHorizontal: 10,
+    },
+    selectContainer: {
+        marginTop: 20,
+    },
+    title: {
+        marginLeft: 5,
+    },
+});
+exports.default = JDetailSettingPage;

package/dist/page/QuizPage.js

@@ -1,52 +1,19 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importStar(require("react"));
+var react_1 = __importDefault(require("react"));
 var react_native_1 = require("react-native");
-var react_native_gesture_handler_1 = require("react-native-gesture-handler");
 var react_redux_1 = require("react-redux");
-var Title_1 = __importDefault(require("../quiz/Title"));
-var Question_1 = __importDefault(require("../quiz/question/Question"));
-var Answer_1 = __importDefault(require("../quiz/answer/Answer"));
-var CorrectedBar_1 = __importDefault(require("../quiz/explain/CorrectedBar"));
-var Explain_1 = __importDefault(require("../quiz/explain/Explain"));
 var Check_1 = __importDefault(require("../quiz/check/Check"));
-var PageContainerWrap_1 = __importDefault(require("../quiz/common/PageContainerWrap"));
-var Bottom3Btn_1 = __importDefault(require("../quiz/setting/Bottom3Btn"));
 var quizHook_1 = require("../hooks/quizHook");
 var ExitQuizHook_1 = require("../hooks/ExitQuizHook");
-var CollapseExplain_1 = __importDefault(require("../quiz/answer/Input/CollapseExplain"));
 var Guide_1 = __importDefault(require("../component/Guide"));
-var common_1 = require("@nakamura-123/common");
+var QuizContentsDrill_1 = __importDefault(require("../quiz/QuizContentsDrill"));
 var QuizPage = function (_a) {
     var navigation = _a.navigation;
     // スワイプの動作処理
-    var scrollRef = (0, react_1.useRef)(null);
     var mode = (0, quizHook_1.useGetMode)();
     var isCheck = mode === "check";
     var isNotQuiz = mode !== "quiz";
@@ -64,28 +31,20 @@ var QuizPage = function (_a) {
     var guideName = turn === 1 ? "quizPageSwipe1" : "quizPageSwipe2";
     // クイズ終了確認フック
     (0, ExitQuizHook_1.useConfirmExit)(navigation);
-    // ターン変更時にスクロール位置をリセット
-    (0, react_1.useEffect)(function () {
-        var _a;
-        (_a = scrollRef.current) === null || _a === void 0 ? void 0 : _a.scrollTo({ y: 0, animated: true });
-    }, [turn]);
     return (<react_native_1.View style={styles.wrapper}>
-      <react_native_gesture_handler_1.ScrollView contentContainerStyle={styles.container} ref={scrollRef} showsVerticalScrollIndicator={false}>
-        <PageContainerWrap_1.default scrollViewRef={scrollRef} navigation={navigation}>
-          <Title_1.default />
-          <Guide_1.default name={guideName} isVisible={showSwipe1Guide || showSwipe2Guide}>
-            <react_native_1.View></react_native_1.View>
-          </Guide_1.default>
-          <Question_1.default navigation={navigation}/>
-          <Answer_1.default />
-          {isCheck && !isResult && isNotInput && <CorrectedBar_1.default />}
-          {isNotQuiz && <Explain_1.default navigation={navigation}/>}
-          {isInputQuizMode && <CollapseExplain_1.default navigation={navigation}/>}
-          <common_1.HelpMark name="quizSwipe" top={0} right={10}/>
-          <Bottom3Btn_1.default navigation={navigation}/>
-          <react_native_1.View style={{ height: 70 }}/>
-        </PageContainerWrap_1.default>
-      </react_native_gesture_handler_1.ScrollView>
+      {/* <QuizContentsJLPT
+          navigation={navigation}
+          guideName={guideName}
+          showSwipe1Guide={showSwipe1Guide}
+          showSwipe2Guide={showSwipe2Guide}
+          isCheck={isCheck}
+          isResult={isResult}
+          isNotInput={isNotInput}
+          isNotQuiz={isNotQuiz}
+          isInputQuizMode={isInputQuizMode}
+          turn={turn}
+        /> */}
+      <QuizContentsDrill_1.default navigation={navigation} guideName={guideName} showSwipe1Guide={showSwipe1Guide} showSwipe2Guide={showSwipe2Guide} isCheck={isCheck} isResult={isResult} isNotInput={isNotInput} isNotQuiz={isNotQuiz} isInputQuizMode={isInputQuizMode} turn={turn}/>
       {/* 下に固定しておくボタンを設置 */}
       {isNotQuiz && (<react_native_1.View style={styles.fixedBottom}>
           <Guide_1.default name="quizPageTag" isVisible={showTagGuide}>
@@ -97,19 +56,6 @@ var QuizPage = function (_a) {
 var styles = react_native_1.StyleSheet.create({
     wrapper: {
         flex: 1,
-        // paddingHorizontal: 20,
-        // marginTop: 20,
-        // marginBottom: 60,
-    },
-    container: {
-        paddingTop: 20,
-        // paddingBottom: 60,
-    },
-    btnBox: {
-        flexDirection: "row",
-        justifyContent: "space-around",
-        alignItems: "center",
-        paddingVertical: 5,
     },
     fixedBottom: {
         position: "absolute",

package/dist/page/QuizSetupPage.js

@@ -5,21 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importDefault(require("react"));
 var react_native_1 = require("react-native");
-var react_2 = require("@realm/react");
 var react_native_gesture_handler_1 = require("react-native-gesture-handler");
 var react_redux_1 = require("react-redux");
 var common_1 = require("@nakamura-123/common");
-var db_1 = require("@nakamura-123/db");
 var stores_1 = require("@nakamura-123/stores");
 var saveBasicPreSelect = stores_1.setAction.saveBasicPreSelect;
 var toResult = stores_1.quizAction.toResult;
-var tagFnc_1 = require("../functions/tagFnc");
-var createQuizFnc_1 = require("../functions/createQuizFnc");
+var tagFncD_1 = require("../functions/tagFncD");
+var createQuizFncD_1 = require("../functions/createQuizFncD");
 var TagBadge5sPress_1 = __importDefault(require("../component/TagBadge5sPress"));
 var QuizOptionDrill_1 = __importDefault(require("../component/QuizSet/QuizOptionDrill"));
 var quizActionHook_1 = require("../hooks/quizActionHook");
 var Guide_1 = __importDefault(require("../component/Guide"));
 var react_i18next_1 = require("react-i18next");
+var basicHook_1 = require("../hooks/basicHook");
+var tagFncJ_1 = require("../functions/tagFncJ");
+var createQuizFncJ_1 = require("../functions/createQuizFncJ");
 var QuizSetup = function (_a) {
     var navigation = _a.navigation;
     var dispatch = (0, react_redux_1.useDispatch)();
@@ -35,11 +36,19 @@ var QuizSetup = function (_a) {
     var outOfYearRange = startCfg.outOfYearRange;
     var quizTitle = lesson.title;
     // タグの選択
-    var QuestionDB = (0, react_2.useQuery)(db_1.dQuestionSchema);
-    var lessonTags = (0, tagFnc_1.getSubTagLevelCnts)(QuestionDB, selected, outOfYearRange);
+    // const QuestionDB = useQuery(DQuestionSchema);
+    var QuestionDBInfo = (0, basicHook_1.useGetQuestionQuery)();
+    var query = QuestionDBInfo.query, system = QuestionDBInfo.system;
+    // ==========ここの修正から ===============
+    // これよく見ると違うな
+    var lessonTags = system === "JLPT"
+        ? (0, tagFncJ_1.getSubTagLevelCntsJ)(query, selected)
+        : (0, tagFncD_1.getSubTagLevelCnts)(query, selected, outOfYearRange);
     // クイズ開始
     var handleStart = function () {
-        var quizList = (0, createQuizFnc_1.getBasicQuizList)(QuestionDB, startCfg, selected);
+        var quizList = system === "JLPT"
+            ? (0, createQuizFncJ_1.getBasicQuizListJ)(query, startCfg, selected)
+            : (0, createQuizFncD_1.getBasicQuizList)(query, startCfg, selected);
         dispatch(saveBasicPreSelect({ subject: subject, category: category, lessonKey: lesson.key }));
         var isExistQuiz = useStartQuiz(subject, quizList);
         if (!isExistQuiz)
@@ -54,6 +63,9 @@ var QuizSetup = function (_a) {
     var selectedTagCnt = lessonTags.filter(function (tag) {
         return startCfg.tags.includes(tag);
     }).length;
+    var handleDetail = function () {
+        navigation.navigate("JDetailSetting");
+    };
     return (<react_native_1.View style={styles.wrapper}>
       <react_native_gesture_handler_1.ScrollView style={styles.container}>
         <common_1.RoundRectangle title={quizTitle}/>
@@ -63,7 +75,7 @@ var QuizSetup = function (_a) {
         </Guide_1.default>
         <common_1.IconTitle icon="sliders-h" title={t("setup.title.setting")}/>
         <QuizOptionDrill_1.default />
-        {type === "unit" && <common_1.MyText fsize="xs">{t("setup.warn")}</common_1.MyText>}
+        {system === "JLPT" && (<common_1.RoundRectangleIcon icon="cog" title="Detail Setting" onPress={handleDetail}/>)}
       </react_native_gesture_handler_1.ScrollView>
 
       <react_native_1.View style={styles.btnBox}>

package/dist/page/ReportPage.js

@@ -75,7 +75,7 @@ var ReportPage = function (_a) {
     var _d = (0, react_1.useState)(""), inquiry = _d[0], setInquiry = _d[1];
     var storeSetting = (0, react_redux_1.useSelector)(function (state) { return state.setting; });
     var errorLogs = (0, react_redux_1.useSelector)(function (state) { return state.error; });
-    var selectedQuiz = (0, quizHook_1.useQuestionData)();
+    var selectedQuiz = (0, quizHook_1.useQuestionDataD)();
     var appName = (0, react_redux_1.useSelector)(function (state) { var _a; return (_a = state.app.appSetting.quizName) === null || _a === void 0 ? void 0 : _a.appName; });
     var appKey = (0, react_redux_1.useSelector)(function (state) { var _a; return (_a = state.app.appSetting.quizName) === null || _a === void 0 ? void 0 : _a.appKey; });
     var REPORT_TYPES = [

package/dist/page/TestPage.js

@@ -15,18 +15,21 @@ var Square3s_1 = __importDefault(require("../component/TestPage/Square3s"));
 var AverageBar_1 = __importDefault(require("../component/TestPage/AverageBar"));
 var Paw5s_1 = __importDefault(require("../component/Basic/Paw5s"));
 var testFnc_1 = require("../functions/testFnc");
-var createQuizFnc_1 = require("../functions/createQuizFnc");
+var createQuizFncD_1 = require("../functions/createQuizFncD");
 var QuizSaveData_1 = __importDefault(require("../quiz/save/QuizSaveData"));
 var BarChartContainer_1 = __importDefault(require("../component/TestPage/BarChartContainer"));
 var quizActionHook_1 = require("../hooks/quizActionHook");
 var Discription_1 = __importDefault(require("../component/Discription"));
+var basicHook_1 = require("../hooks/basicHook");
+var createQuizFncJ_1 = require("../functions/createQuizFncJ");
 var TestPage = react_1.default.memo(function (_a) {
     var navigation = _a.navigation, subject = _a.subject;
     var dispatch = (0, react_redux_1.useDispatch)();
     var useStartQuiz = (0, quizActionHook_1.useStartQuizAction)();
     var t = (0, react_i18next_1.useTranslation)().t;
     var TestDB = (0, react_2.useQuery)(db_1.TestSchema);
-    var QuestionDB = (0, react_2.useQuery)(db_1.dQuestionSchema);
+    var QuestionInfo = (0, basicHook_1.useGetQuestionQuery)();
+    // const QuestionDB = useQuery(DQuestionSchema);
     var isExistedSaveData = (0, react_redux_1.useSelector)(function (state) { return state.score.isSave[subject.name]; });
     //  Reduxから必要なデータを一括取得
     var quizCnt = subject.cnt;
@@ -54,9 +57,16 @@ var TestPage = react_1.default.memo(function (_a) {
             },
         });
         // クイズ作成
-        var quizList = isUnitType
-            ? (0, createQuizFnc_1.getTestQuestionsByUnit)(QuestionDB, quizCnt, subject.unit)
-            : (0, createQuizFnc_1.getTestQuestions)(QuestionDB, quizCnt);
+        var quizList = [];
+        if (QuestionInfo.system === "JLPT") {
+            var tagName = subject.tagName || "basicTag";
+            quizList = (0, createQuizFncJ_1.getTestQuestionsJ)(QuestionInfo.query, quizCnt, tagName);
+        }
+        else {
+            quizList = isUnitType
+                ? (0, createQuizFncD_1.getTestQuestionsByUnit)(QuestionInfo.query, quizCnt, subject.unit)
+                : (0, createQuizFncD_1.getTestQuestions)(QuestionInfo.query, quizCnt);
+        }
         var isExistQuiz = useStartQuiz(subject.name, quizList);
         if (!isExistQuiz)
             return;

package/dist/quiz/QuizContentDrill.d.ts

@@ -0,0 +1,15 @@
+import React from "react";
+import { Store } from "@nakamura-123/types";
+interface QuizContentDrillProps {
+    navigation: any;
+    guideName: keyof Store.GuideType;
+    showSwipe1Guide: boolean;
+    showSwipe2Guide: boolean;
+    isCheck: boolean;
+    isResult: boolean;
+    isNotInput: boolean;
+    isNotQuiz: boolean;
+    isInputQuizMode: boolean;
+}
+declare const QuizContentDrill: React.FC<QuizContentDrillProps>;
+export default QuizContentDrill;

package/dist/quiz/QuizContentDrill.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
+var react_native_1 = require("react-native");
+var Title_1 = __importDefault(require("./Title"));
+var Question_1 = __importDefault(require("./question/Question"));
+var Answer_1 = __importDefault(require("./answer/Answer"));
+var CorrectedBar_1 = __importDefault(require("./explain/CorrectedBar"));
+var Explain_1 = __importDefault(require("./explain/Explain"));
+var CollapseExplain_1 = __importDefault(require("./answer/Input/CollapseExplain"));
+var Guide_1 = __importDefault(require("../component/Guide"));
+var common_1 = require("@nakamura-123/common");
+var Bottom3Btn_1 = __importDefault(require("./setting/Bottom3Btn"));
+var QuizContentDrill = function (_a) {
+    var navigation = _a.navigation, guideName = _a.guideName, showSwipe1Guide = _a.showSwipe1Guide, showSwipe2Guide = _a.showSwipe2Guide, isCheck = _a.isCheck, isResult = _a.isResult, isNotInput = _a.isNotInput, isNotQuiz = _a.isNotQuiz, isInputQuizMode = _a.isInputQuizMode;
+    return (<>
+      <Title_1.default />
+      <Guide_1.default name={guideName} isVisible={showSwipe1Guide || showSwipe2Guide}>
+        <react_native_1.View></react_native_1.View>
+      </Guide_1.default>
+      <Question_1.default navigation={navigation}/>
+      <Answer_1.default />
+      {isCheck && !isResult && isNotInput && <CorrectedBar_1.default />}
+      {isNotQuiz && <Explain_1.default navigation={navigation}/>}
+      {isInputQuizMode && <CollapseExplain_1.default navigation={navigation}/>}
+      <common_1.HelpMark name="quizSwipe" top={0} right={10}/>
+      <Bottom3Btn_1.default navigation={navigation}/>
+      <react_native_1.View style={{ height: 70 }}/>
+    </>);
+};
+exports.default = QuizContentDrill;

package/dist/quiz/QuizContentsDrill.d.ts

@@ -0,0 +1,16 @@
+import React from "react";
+import { Store } from "@nakamura-123/types";
+interface Props {
+    navigation: any;
+    guideName: keyof Store.GuideType;
+    showSwipe1Guide: boolean;
+    showSwipe2Guide: boolean;
+    isCheck: boolean;
+    isResult: boolean;
+    isNotInput: boolean;
+    isNotQuiz: boolean;
+    isInputQuizMode: boolean;
+    turn: number;
+}
+declare const QuizContentDrill: React.FC<Props>;
+export default QuizContentDrill;

package/dist/quiz/QuizContentsDrill.js

@@ -0,0 +1,70 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importStar(require("react"));
+var react_native_1 = require("react-native");
+var Title_1 = __importDefault(require("./Title"));
+var Question_1 = __importDefault(require("./question/Question"));
+var Answer_1 = __importDefault(require("./answer/Answer"));
+var CorrectedBar_1 = __importDefault(require("./explain/CorrectedBar"));
+var Explain_1 = __importDefault(require("./explain/Explain"));
+var CollapseExplain_1 = __importDefault(require("./answer/Input/CollapseExplain"));
+var Guide_1 = __importDefault(require("../component/Guide"));
+var common_1 = require("@nakamura-123/common");
+var Bottom3Btn_1 = __importDefault(require("./setting/Bottom3Btn"));
+var react_native_gesture_handler_1 = require("react-native-gesture-handler");
+var PageContainerWrap_1 = __importDefault(require("./common/PageContainerWrap"));
+var QuizContentDrill = function (_a) {
+    var navigation = _a.navigation, guideName = _a.guideName, showSwipe1Guide = _a.showSwipe1Guide, showSwipe2Guide = _a.showSwipe2Guide, isCheck = _a.isCheck, isResult = _a.isResult, isNotInput = _a.isNotInput, isNotQuiz = _a.isNotQuiz, isInputQuizMode = _a.isInputQuizMode, turn = _a.turn;
+    var scrollRef = (0, react_1.useRef)(null);
+    // ターン変更時にスクロール位置をリセット
+    (0, react_1.useEffect)(function () {
+        var _a;
+        (_a = scrollRef.current) === null || _a === void 0 ? void 0 : _a.scrollTo({ y: 0, animated: true });
+    }, [turn]);
+    return (<react_native_gesture_handler_1.ScrollView contentContainerStyle={styles.container} ref={scrollRef} showsVerticalScrollIndicator={false}>
+      <PageContainerWrap_1.default scrollViewRef={scrollRef} navigation={navigation}>
+        <Title_1.default />
+        <Guide_1.default name={guideName} isVisible={showSwipe1Guide || showSwipe2Guide}>
+          <react_native_1.View></react_native_1.View>
+        </Guide_1.default>
+        <Question_1.default navigation={navigation}/>
+        <Answer_1.default />
+        {isCheck && !isResult && isNotInput && <CorrectedBar_1.default />}
+        {isNotQuiz && <Explain_1.default navigation={navigation}/>}
+        {isInputQuizMode && <CollapseExplain_1.default navigation={navigation}/>}
+        <common_1.HelpMark name="quizSwipe" top={0} right={10}/>
+        <Bottom3Btn_1.default navigation={navigation}/>
+        <react_native_1.View style={{ height: 70 }}/>
+      </PageContainerWrap_1.default>
+    </react_native_gesture_handler_1.ScrollView>);
+};
+var styles = react_native_1.StyleSheet.create({
+    container: { paddingTop: 20 },
+});
+exports.default = QuizContentDrill;

package/dist/quiz/QuizContentsJLPT.d.ts

@@ -0,0 +1,16 @@
+import React from "react";
+import { Store } from "@nakamura-123/types";
+interface Props {
+    navigation: any;
+    guideName: keyof Store.GuideType;
+    showSwipe1Guide: boolean;
+    showSwipe2Guide: boolean;
+    isCheck: boolean;
+    isResult: boolean;
+    isNotInput: boolean;
+    isNotQuiz: boolean;
+    isInputQuizMode: boolean;
+    turn: number;
+}
+declare const QuizContentDrill: React.FC<Props>;
+export default QuizContentDrill;