@nakamura-123/pages 1.4.2 → 1.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -34,6 +34,7 @@ const common_1 = require("@nakamura-123/common");
34
34
  const articleContentFnc_1 = require("../../functions/articleContentFnc");
35
35
  const Cloze_1 = require("./Cloze");
36
36
  const MyTextqqyy_1 = __importDefault(require("../../quiz/common/MyTextqqyy"));
37
+ const renderTransUdl_1 = require("../../quiz/common/renderTransUdl");
37
38
  const ArticleTable_1 = __importDefault(require("./ArticleTable"));
38
39
  const ArticleImage_1 = __importDefault(require("./ArticleImage"));
39
40
  const FramesFigure_1 = __importDefault(require("./FramesFigure"));
@@ -154,7 +155,7 @@ const ArticleBlockView = ({ block, blockIndex, exampleNumber, exampleImg, groupP
154
155
  {block.translation && (<react_native_1.TouchableOpacity onPress={() => setIsRevealed(!isRevealed)} style={styles.exampleBottom}>
155
156
  {/* 非表示時もopacity:0で全幅描画し、訳文の実際の高さ分の領域を最初から確保する(アイコンの有無で幅が変わって高さがずれないよう、アイコンは重ねて表示する別レイヤーにする) */}
156
157
  <common_1.MyText fsize={(0, articleContentFnc_1.getScaledFsize)("md", userFsize)} weight={(0, articleContentFnc_1.getScaledWeight)(500, userFWeight)} color="text" style={!isRevealed && styles.invisibleText}>
157
- {renderTransUdl(block.translation)}
158
+ {(0, renderTransUdl_1.renderTransUdl)(block.translation, styles.transUdl)}
158
159
  </common_1.MyText>
159
160
  {!isRevealed && (<react_native_1.View style={styles.exampleBottomOverlay}>
160
161
  <common_1.Icon5 name="eye" size={14} color="ltBlack" style={styles.exampleBottomIcon}/>
@@ -217,16 +218,6 @@ const ArticleBlockView = ({ block, blockIndex, exampleNumber, exampleImg, groupP
217
218
  return null;
218
219
  }
219
220
  };
220
- // 例文の訳の中の、空欄に当たる部分(udl[…])に下線を引く。外側の文字の大きさ・太さを受け継ぐので、中は色と線だけ持つ
221
- const renderTransUdl = (text) => text
222
- .split(/(udl\[[^\]]+\])/)
223
- .filter((chunk) => chunk.length > 0)
224
- .map((chunk, i) => {
225
- const m = chunk.match(/^udl\[([^\]]+)\]$/);
226
- return m ? (<react_native_1.Text key={i} style={styles.transUdl}>
227
- {m[1]}
228
- </react_native_1.Text>) : (chunk);
229
- });
230
221
  // 説明の文の【文法名】を太字・緑に、使い分けの決め手(udl[…])に下線を引く(n2bのunit。dk2の記事には【】もudl[]も無い)
231
222
  // 太さはfontFamilyで決まるので、太字は700の書体に替える
232
223
  const renderBodyMarks = (text) => text
@@ -32,6 +32,7 @@ const react_native_gesture_handler_1 = require("react-native-gesture-handler");
32
32
  const react_redux_1 = require("react-redux");
33
33
  const common_1 = require("@nakamura-123/common");
34
34
  const stores_1 = require("@nakamura-123/stores");
35
+ const joinTitleFnc_1 = require("../../functions/joinTitleFnc");
35
36
  const Badge5s_1 = __importDefault(require("../Basic/Badge5s"));
36
37
  const TagBadge5s_1 = __importDefault(require("../TagBadge5s"));
37
38
  const ArticleCategoryList_1 = __importDefault(require("./ArticleCategoryList"));
@@ -42,7 +43,7 @@ const SelectedExamCnt_1 = __importDefault(require("../Basic/SelectedExamCnt"));
42
43
  const BasicProgressBar_1 = __importDefault(require("../Basic/BasicProgressBar"));
43
44
  const ArticleContents = ({ navigation, subject, index }) => {
44
45
  const dispatch = (0, react_redux_1.useDispatch)();
45
- const { t } = (0, common_1.useDrillTranslation)();
46
+ const { t, i18n } = (0, common_1.useDrillTranslation)();
46
47
  // // Reduxから必要なデータを一括取得
47
48
  const categoryList = (0, react_redux_1.useSelector)((state) => state.app[subject.list]);
48
49
  const activeIndex = (0, react_redux_1.useSelector)((state) => state.setting.viewSet[subject.name].activeIndex);
@@ -54,7 +55,7 @@ const ArticleContents = ({ navigation, subject, index }) => {
54
55
  // カテゴリー名を計算
55
56
  const categoryName = `${selectedList.label} ${selectedList.title}`.trim();
56
57
  const selectKey = selectedList.key;
57
- const categoryLabel = selectedList.label + selectedList.title;
58
+ const categoryLabel = (0, joinTitleFnc_1.joinTitle)(i18n === null || i18n === void 0 ? void 0 : i18n.language, selectedList.label, selectedList.title);
58
59
  const initScrollY = (0, react_redux_1.useSelector)((state) => state.setting.viewSet[subject.name].scrollY);
59
60
  const scrollViewRef = (0, react_1.useRef)(null);
60
61
  // 移動を監視
@@ -88,7 +89,7 @@ const ArticleContents = ({ navigation, subject, index }) => {
88
89
  tagName: subject.tag,
89
90
  system: subject.system,
90
91
  lesson: {
91
- title: selectedList.label + selectedList.title,
92
+ title: categoryLabel,
92
93
  key: ALL_NUM,
93
94
  },
94
95
  }));
@@ -112,7 +113,7 @@ const ArticleContents = ({ navigation, subject, index }) => {
112
113
  <Badge5s_1.default badgeType="basic" subject={subject.name} category={selectKey}/>
113
114
  <TagBadge5s_1.default subject={subject} index={index}/>
114
115
  <common_1.HelpMark name="quizOption.allQuiz" top={0}/>
115
- <common_1.RoundRectangleIcon title={categoryLabel + t("basic.allQuiz")} icon={allQuizIcon} onPress={handleAllQuiz}/>
116
+ <common_1.RoundRectangleIcon title={(0, joinTitleFnc_1.joinTitle)(i18n === null || i18n === void 0 ? void 0 : i18n.language, categoryLabel, t("basic.allQuiz"))} icon={allQuizIcon} onPress={handleAllQuiz}/>
116
117
  <BasicSetting_1.default navigation={navigation} subjectType={subject.type}/>
117
118
  </react_native_gesture_handler_1.ScrollView>);
118
119
  };
@@ -32,6 +32,7 @@ const react_native_gesture_handler_1 = require("react-native-gesture-handler");
32
32
  const react_redux_1 = require("react-redux");
33
33
  const common_1 = require("@nakamura-123/common");
34
34
  const stores_1 = require("@nakamura-123/stores");
35
+ const joinTitleFnc_1 = require("../../functions/joinTitleFnc");
35
36
  const Badge5s_1 = __importDefault(require("./Badge5s"));
36
37
  const TagBadge5s_1 = __importDefault(require("../TagBadge5s"));
37
38
  const SubCategoryList_1 = __importDefault(require("./SubCategoryList"));
@@ -42,7 +43,7 @@ const SelectedExamCnt_1 = __importDefault(require("./SelectedExamCnt"));
42
43
  const BasicProgressBar_1 = __importDefault(require("./BasicProgressBar"));
43
44
  const BasicPage = ({ navigation, subject, index }) => {
44
45
  const dispatch = (0, react_redux_1.useDispatch)();
45
- const { t } = (0, common_1.useDrillTranslation)();
46
+ const { t, i18n } = (0, common_1.useDrillTranslation)();
46
47
  // // Reduxから必要なデータを一括取得
47
48
  const categoryList = (0, react_redux_1.useSelector)((state) => state.app[subject.list]);
48
49
  const activeIndex = (0, react_redux_1.useSelector)((state) => state.setting.viewSet[subject.name].activeIndex);
@@ -54,7 +55,7 @@ const BasicPage = ({ navigation, subject, index }) => {
54
55
  // カテゴリー名を計算
55
56
  const categoryName = `${selectedList.label} ${selectedList.title}`.trim();
56
57
  const selectKey = selectedList.key;
57
- const categoryLabel = selectedList.label + selectedList.title;
58
+ const categoryLabel = (0, joinTitleFnc_1.joinTitle)(i18n === null || i18n === void 0 ? void 0 : i18n.language, selectedList.label, selectedList.title);
58
59
  const initScrollY = (0, react_redux_1.useSelector)((state) => state.setting.viewSet[subject.name].scrollY);
59
60
  const scrollViewRef = (0, react_1.useRef)(null);
60
61
  // 移動を監視
@@ -88,7 +89,7 @@ const BasicPage = ({ navigation, subject, index }) => {
88
89
  tagName: subject.tag,
89
90
  system: subject.system,
90
91
  lesson: {
91
- title: selectedList.label + selectedList.title,
92
+ title: categoryLabel,
92
93
  key: ALL_NUM,
93
94
  },
94
95
  }));
@@ -112,7 +113,7 @@ const BasicPage = ({ navigation, subject, index }) => {
112
113
  <Badge5s_1.default badgeType="basic" subject={subject.name} category={selectKey}/>
113
114
  <TagBadge5s_1.default subject={subject} index={index}/>
114
115
  <common_1.HelpMark name="quizOption.allQuiz" top={0}/>
115
- <common_1.RoundRectangleIcon title={categoryLabel + t("basic.allQuiz")} icon={allQuizIcon} onPress={handleAllQuiz}/>
116
+ <common_1.RoundRectangleIcon title={(0, joinTitleFnc_1.joinTitle)(i18n === null || i18n === void 0 ? void 0 : i18n.language, categoryLabel, t("basic.allQuiz"))} icon={allQuizIcon} onPress={handleAllQuiz}/>
116
117
  <BasicSetting_1.default navigation={navigation} subjectType={subject.type}/>
117
118
  </react_native_gesture_handler_1.ScrollView>);
118
119
  };
@@ -34,12 +34,13 @@ const react_redux_1 = require("react-redux");
34
34
  const db_1 = require("@nakamura-123/db");
35
35
  const stores_1 = require("@nakamura-123/stores");
36
36
  const testFnc_1 = require("../../functions/testFnc");
37
+ const joinTitleFnc_1 = require("../../functions/joinTitleFnc");
37
38
  const Paw5s_1 = __importDefault(require("./Paw5s"));
38
39
  const basicHook_1 = require("../../hooks/basicHook");
39
40
  const TestComponent = ({ navigation, subject, index, }) => {
40
41
  var _a;
41
42
  const dispatch = (0, react_redux_1.useDispatch)();
42
- const { t } = (0, common_1.useDrillTranslation)();
43
+ const { t, i18n } = (0, common_1.useDrillTranslation)();
43
44
  // topTabsのラベルを取得
44
45
  const categoryList = (0, react_redux_1.useSelector)((state) => state.app[subject.list]);
45
46
  const selectedCategory = categoryList[index];
@@ -47,7 +48,7 @@ const TestComponent = ({ navigation, subject, index, }) => {
47
48
  const quizCnt = selectedCategory.miniTestCnt;
48
49
  // ミニテストだけ別の形式で出す科目がある(文法:レッスンは意味を取る問題、ミニテストは穴埋め)
49
50
  const miniTestTag = subject.type === "unit" ? (_a = subject.miniTestTag) !== null && _a !== void 0 ? _a : subject.tag : subject.tag;
50
- const testTitle = selectedCategory.title + t("basic.miniTest");
51
+ const testTitle = (0, joinTitleFnc_1.joinTitle)(i18n === null || i18n === void 0 ? void 0 : i18n.language, selectedCategory.title, t("basic.miniTest"));
51
52
  const testDB = (0, react_2.useQuery)(db_1.MiniTestSchema);
52
53
  const outOfYearRange = (0, react_redux_1.useSelector)((state) => state.quizCfg.startCfg.outOfYearRange);
53
54
  // const QuestionDB = useQuery(DQuestionSchema);
@@ -6,17 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const react_1 = __importDefault(require("react"));
7
7
  const react_native_1 = require("react-native");
8
8
  const react_2 = require("@realm/react");
9
- const react_redux_1 = require("react-redux");
10
9
  const db_1 = require("@nakamura-123/db");
11
10
  const common_1 = require("@nakamura-123/common");
12
11
  const tagFncD_1 = require("../../functions/tagFncD");
13
12
  // 文法(G系)の成績画面の全タグ。科目1=意味を取る問題、科目2=穴埋め
14
13
  const GAllTags = () => {
15
14
  const questions = (0, react_2.useQuery)(db_1.GQuestionSchema);
16
- const { basic1, basic2 } = (0, react_redux_1.useSelector)((state) => state.app.appSetting.setting.basic);
15
+ const { t } = (0, common_1.useDrillTranslation)();
17
16
  const rows = [
18
- { title: basic1.name, levels: questions.map((q) => q.meaningTag.level) },
19
- { title: basic2.name, levels: questions.map((q) => q.blankTag.level) },
17
+ { title: t("grade.grammarTag.meaning"), levels: questions.map((q) => q.meaningTag.level) },
18
+ { title: t("grade.grammarTag.blank"), levels: questions.map((q) => q.blankTag.level) },
20
19
  ];
21
20
  return (<react_native_1.View style={styles.container}>
22
21
  {rows.map(({ title, levels }) => (<react_native_1.View key={title}>
@@ -33,6 +33,7 @@ const lib_1 = require("@nakamura-123/lib");
33
33
  const common_1 = require("@nakamura-123/common");
34
34
  const MyTextqqyy_1 = __importDefault(require("../../quiz/common/MyTextqqyy"));
35
35
  const RubyText_1 = __importDefault(require("../../quiz/common/RubyText"));
36
+ const renderTransUdl_1 = require("../../quiz/common/renderTransUdl");
36
37
  const JQuestionBottomText_1 = require("../../quiz/jQuestion/JQuestionBottomText");
37
38
  const quizHook_1 = require("../../hooks/quizHook");
38
39
  const resultHook_1 = require("../../hooks/resultHook");
@@ -70,7 +71,7 @@ const QuizFlatList = ({ navigation }) => {
70
71
  <react_native_1.View style={styles.texts}>
71
72
  <QuestionText item={item}/>
72
73
  {item.sub && (<common_1.MyText fsize="sm" color="gray" numberOfLines={1}>
73
- {item.sub}
74
+ {(0, renderTransUdl_1.renderTransUdl)(item.sub, styles.udl)}
74
75
  </common_1.MyText>)}
75
76
  </react_native_1.View>
76
77
  <common_1.IconInCircle name="tag" size={10} iconColor="white" circleColor={(_b = (_a = lib_1.tagLevels.find((level) => level.level === item.tag)) === null || _a === void 0 ? void 0 : _a.color) !== null && _b !== void 0 ? _b : "light"} cStyle={styles.tag}/>
@@ -0,0 +1 @@
1
+ export declare const joinTitle: (language: string | undefined, ...parts: string[]) => string;
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.joinTitle = void 0;
4
+ // 章の名前と「ミニテスト」などをつなぐ。日本語・中国語は語の間に空白を置かないが、
5
+ // 英語・韓国語・ベトナム語でそのままつなぐと「Unit 1Mini-test」になる。
6
+ // n4tは章の名前の後ろに空白を付けて("Adjective ")この問題を避けていたので、境目にもう空白があれば足さない
7
+ const joinTitle = (language, ...parts) => {
8
+ const sep = !language || /^(ja|zh)/.test(language) ? "" : " ";
9
+ return parts
10
+ .filter((part) => part !== "")
11
+ .reduce((joined, part) => joined === "" || /\s$/.test(joined) || /^\s/.test(part)
12
+ ? joined + part
13
+ : joined + sep + part, "");
14
+ };
15
+ exports.joinTitle = joinTitle;
@@ -31,18 +31,21 @@ const react_native_1 = require("react-native");
31
31
  const react_redux_1 = require("react-redux");
32
32
  const react_native_tab_view_1 = require("react-native-tab-view");
33
33
  const lib_1 = require("@nakamura-123/lib");
34
+ const common_1 = require("@nakamura-123/common");
35
+ const joinTitleFnc_1 = require("../functions/joinTitleFnc");
34
36
  const ArticleContents_1 = __importDefault(require("../component/Article/ArticleContents"));
35
37
  const QuizSaveData_1 = __importDefault(require("../quiz/save/QuizSaveData"));
36
38
  const TabAnimeView_1 = __importDefault(require("../component/TabAnimeView"));
37
39
  const ArticlePage = react_1.default.memo(({ navigation, subject }) => {
38
40
  const dispatch = (0, react_redux_1.useDispatch)();
41
+ const { i18n } = (0, common_1.useDrillTranslation)();
39
42
  (0, react_1.useEffect)(() => {
40
43
  dispatch({ type: "setting/setSelectedSubject", payload: subject.name });
41
44
  }, []);
42
45
  const categoryList = (0, react_redux_1.useSelector)((state) => state.app[subject.list]);
43
46
  const activeIndex = (0, react_redux_1.useSelector)((state) => state.setting.viewSet[subject.name].activeIndex);
44
47
  // ラベルを取得
45
- const labels = categoryList.map((category) => category.label + category.title);
48
+ const labels = categoryList.map((category) => (0, joinTitleFnc_1.joinTitle)(i18n === null || i18n === void 0 ? void 0 : i18n.language, category.label, category.title));
46
49
  const routeLists = labels.map((label, index) => ({
47
50
  key: index.toString(),
48
51
  title: label,
@@ -31,18 +31,21 @@ const react_native_1 = require("react-native");
31
31
  const react_redux_1 = require("react-redux");
32
32
  const react_native_tab_view_1 = require("react-native-tab-view");
33
33
  const lib_1 = require("@nakamura-123/lib");
34
+ const common_1 = require("@nakamura-123/common");
35
+ const joinTitleFnc_1 = require("../functions/joinTitleFnc");
34
36
  const BasicContents_1 = __importDefault(require("../component/Basic/BasicContents"));
35
37
  const QuizSaveData_1 = __importDefault(require("../quiz/save/QuizSaveData"));
36
38
  const TabAnimeView_1 = __importDefault(require("../component/TabAnimeView"));
37
39
  const BasicPage = react_1.default.memo(({ navigation, subject }) => {
38
40
  const dispatch = (0, react_redux_1.useDispatch)();
41
+ const { i18n } = (0, common_1.useDrillTranslation)();
39
42
  (0, react_1.useEffect)(() => {
40
43
  dispatch({ type: "setting/setSelectedSubject", payload: subject.name });
41
44
  }, []);
42
45
  const categoryList = (0, react_redux_1.useSelector)((state) => state.app[subject.list]);
43
46
  const activeIndex = (0, react_redux_1.useSelector)((state) => state.setting.viewSet[subject.name].activeIndex);
44
47
  // ラベルを取得
45
- const labels = categoryList.map((category) => category.label + category.title);
48
+ const labels = categoryList.map((category) => (0, joinTitleFnc_1.joinTitle)(i18n === null || i18n === void 0 ? void 0 : i18n.language, category.label, category.title));
46
49
  const routeLists = labels.map((label, index) => ({
47
50
  key: index.toString(),
48
51
  title: label,
@@ -0,0 +1,3 @@
1
+ import React from "react";
2
+ import { TextStyle } from "react-native";
3
+ export declare const renderTransUdl: (text: string, udlStyle: TextStyle) => React.ReactNode;
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.renderTransUdl = void 0;
7
+ const react_1 = __importDefault(require("react"));
8
+ const react_native_1 = require("react-native");
9
+ // 例文の訳の中の、文法の部分に当たる所(udl[…])に下線を引く。外側の文字の大きさ・太さを受け継ぐので、中は色と線だけ持つ。
10
+ // 当たる語が無い訳には udl[ ] が無く、そのまま返る
11
+ const renderTransUdl = (text, udlStyle) => text
12
+ .split(/(udl\[[^\]]+\])/)
13
+ .filter((chunk) => chunk.length > 0)
14
+ .map((chunk, i) => {
15
+ const m = chunk.match(/^udl\[([^\]]+)\]$/);
16
+ return m ? (<react_native_1.Text key={i} style={udlStyle}>
17
+ {m[1]}
18
+ </react_native_1.Text>) : (chunk);
19
+ });
20
+ exports.renderTransUdl = renderTransUdl;
@@ -32,6 +32,7 @@ const lib_1 = require("@nakamura-123/lib");
32
32
  const common_1 = require("@nakamura-123/common");
33
33
  const QuizCnt_1 = __importDefault(require("../jQuestion/QuizCnt"));
34
34
  const RubyText_1 = __importDefault(require("../common/RubyText"));
35
+ const renderTransUdl_1 = require("../common/renderTransUdl");
35
36
  const Above3BtnJ_1 = __importDefault(require("../setting/Above3BtnJ"));
36
37
  const quizHook_1 = require("../../hooks/quizHook");
37
38
  // 例文と訳。意味を取る問題は文法の部分に下線を引き、答える前でもタップで訳を見られる。
@@ -59,7 +60,7 @@ const GQuestion = ({ navigation }) => {
59
60
  </react_native_1.View>
60
61
  <react_native_1.View style={styles.bottom}>
61
62
  {showTrans && trans && (<common_1.MyText fsize="sm" style={styles.trans}>
62
- {trans}
63
+ {(0, renderTransUdl_1.renderTransUdl)(trans, isBlank ? styles.udlRed : styles.udlBlue)}
63
64
  </common_1.MyText>)}
64
65
  {isQuiz && !isBlank && !isPeek && (<react_native_1.Pressable style={styles.peek} onPress={() => setPeekId(question.quizId)}>
65
66
  <common_1.MyText fsize="xs" color="ltBlack">
@@ -93,6 +94,17 @@ const styles = react_native_1.StyleSheet.create({
93
94
  trans: {
94
95
  textAlign: "center",
95
96
  },
97
+ // 訳の下線は例文の下線と同じ色にする(穴埋めは赤、意味を取る問題は青)。線だけでは細くて見えにくいので文字も色づける
98
+ udlRed: {
99
+ color: lib_1.colors.red,
100
+ textDecorationLine: "underline",
101
+ textDecorationColor: lib_1.colors.red,
102
+ },
103
+ udlBlue: {
104
+ color: lib_1.colors.blue,
105
+ textDecorationLine: "underline",
106
+ textDecorationColor: lib_1.colors.blue,
107
+ },
96
108
  peek: {
97
109
  marginTop: 8,
98
110
  paddingVertical: 5,