update splitToTwoLines again to keeps number with unit in a whole

zetavg · Jan 10, 2024 · 28e912e · 28e912e
1 parent 04b831b
commit 28e912e
Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/App/app/consts/chars.ts b/App/app/consts/chars.ts
@@ -28,4 +28,8 @@ export const UNITS = [
   '公升',
 ];
 
+export const NUMBER_WITH_OPTIONAL_UNIT_REGEX = new RegExp(
+  `^([0-9,.]+) ?(${UNITS.join('|')})?$`,
+);
+
 export const OPERATION_SYMBOLS = ['×', 'x'];
diff --git a/App/app/features/label-printers/print-utils.test.ts b/App/app/features/label-printers/print-utils.test.ts
@@ -74,6 +74,11 @@ describe('splitToTwoLines', () => {
       '10 mm x 20 cm',
     ]);
 
+    expect(splitToTwoLines('Paper 10mm × 20cm', 12)).toStrictEqual([
+      'Paper',
+      '10mm × 20cm',
+    ]);
+
     expect(splitToTwoLines('Paper 10 × 20 cm', 12)).toStrictEqual([
       'Paper',
       '10 × 20 cm',

diff --git a/App/app/features/label-printers/print-utils.ts b/App/app/features/label-printers/print-utils.ts
@@ -2,6 +2,7 @@ import { Platform } from 'react-native';
 
 import {
   LINE_SPLITTING_PUNCTUATION_REGEX,
+  NUMBER_WITH_OPTIONAL_UNIT_REGEX,
   OPERATION_SYMBOLS,
   PUNCTUATION_REGEX,
   T_PUNCTUATION_REGEX,
@@ -55,12 +56,12 @@ function* generateSubstrings(str: string, splitRegex?: RegExp) {
         !UNITS.includes(words[wordsPtr + 1]) &&
         !(
           OPERATION_SYMBOLS.includes(words[wordsPtr + 1]) &&
-          (words[wordsPtr].match(/^[0-9.]+$/) ||
+          (words[wordsPtr].match(NUMBER_WITH_OPTIONAL_UNIT_REGEX) ||
             UNITS.includes(words[wordsPtr]))
         ) &&
         !(
           OPERATION_SYMBOLS.includes(words[wordsPtr]) &&
-          (words[wordsPtr + 1] || '').match(/^[0-9.]+$/)
+          (words[wordsPtr + 1] || '').match(NUMBER_WITH_OPTIONAL_UNIT_REGEX)
         )
       ) {
         yield subStr;