@magmamath/students-features 0.9.4 → 0.9.5-rc.1
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.
- package/dist/commonjs/features/keyboard/components/AlgebraLayout/AlgebraLayout.js +2 -9
- package/dist/commonjs/features/keyboard/components/AlgebraLayout/AlgebraLayout.js.map +1 -1
- package/dist/commonjs/features/keyboard/components/AlgebraLayout/helpers.js +3 -13
- package/dist/commonjs/features/keyboard/components/AlgebraLayout/helpers.js.map +1 -1
- package/dist/commonjs/features/keyboard/components/BasicLayout/keyboardGroups.js +5 -1
- package/dist/commonjs/features/keyboard/components/BasicLayout/keyboardGroups.js.map +1 -1
- package/dist/commonjs/features/keyboard/components/Keyboard.js +4 -4
- package/dist/commonjs/features/keyboard/components/Keyboard.js.map +1 -1
- package/dist/commonjs/features/keyboard/components/UnitsLayout/UnitsLayout.js +2 -6
- package/dist/commonjs/features/keyboard/components/UnitsLayout/UnitsLayout.js.map +1 -1
- package/dist/commonjs/features/keyboard/components/UnitsLayout/helpers.js +3 -10
- package/dist/commonjs/features/keyboard/components/UnitsLayout/helpers.js.map +1 -1
- package/dist/commonjs/features/keyboard/constants/keyboardGroupsByLocale.js +21 -3
- package/dist/commonjs/features/keyboard/constants/keyboardGroupsByLocale.js.map +1 -1
- package/dist/commonjs/features/keyboard/types/MathKeysGroups/basicOperators.js +0 -27
- package/dist/commonjs/features/keyboard/types/MathKeysGroups/basicOperators.js.map +1 -1
- package/dist/commonjs/features/keyboard/types/keyboardGroupIds.js +1 -1
- package/dist/commonjs/features/keyboard/types/types.js +0 -1
- package/dist/commonjs/features/keyboard/types/types.js.map +1 -1
- package/dist/commonjs/lib/helpers/helpers.js +28 -5
- package/dist/commonjs/lib/helpers/helpers.js.map +1 -1
- package/dist/commonjs/shared/translation/constants.js +3 -1
- package/dist/commonjs/shared/translation/constants.js.map +1 -1
- package/dist/commonjs/shared/translation/localization/ca.json +5 -5
- package/dist/commonjs/shared/translation/localization/de.json +42 -0
- package/dist/commonjs/shared/translation/localization/en.json +5 -5
- package/dist/commonjs/shared/translation/localization/gb.json +5 -5
- package/dist/commonjs/shared/translation/localization/sct.json +5 -5
- package/dist/commonjs/shared/translation/localization/sw.json +5 -5
- package/dist/commonjs/shared/translation/types.js +1 -0
- package/dist/commonjs/shared/translation/types.js.map +1 -1
- package/dist/module/features/keyboard/components/AlgebraLayout/AlgebraLayout.js +2 -9
- package/dist/module/features/keyboard/components/AlgebraLayout/AlgebraLayout.js.map +1 -1
- package/dist/module/features/keyboard/components/AlgebraLayout/helpers.js +3 -13
- package/dist/module/features/keyboard/components/AlgebraLayout/helpers.js.map +1 -1
- package/dist/module/features/keyboard/components/BasicLayout/keyboardGroups.js +4 -0
- package/dist/module/features/keyboard/components/BasicLayout/keyboardGroups.js.map +1 -1
- package/dist/module/features/keyboard/components/Keyboard.js +4 -4
- package/dist/module/features/keyboard/components/Keyboard.js.map +1 -1
- package/dist/module/features/keyboard/components/UnitsLayout/UnitsLayout.js +2 -6
- package/dist/module/features/keyboard/components/UnitsLayout/UnitsLayout.js.map +1 -1
- package/dist/module/features/keyboard/components/UnitsLayout/helpers.js +3 -10
- package/dist/module/features/keyboard/components/UnitsLayout/helpers.js.map +1 -1
- package/dist/module/features/keyboard/constants/keyboardGroupsByLocale.js +22 -4
- package/dist/module/features/keyboard/constants/keyboardGroupsByLocale.js.map +1 -1
- package/dist/module/features/keyboard/types/MathKeysGroups/basicOperators.js +0 -27
- package/dist/module/features/keyboard/types/MathKeysGroups/basicOperators.js.map +1 -1
- package/dist/module/features/keyboard/types/keyboardGroupIds.js +1 -1
- package/dist/module/features/keyboard/types/types.js +0 -1
- package/dist/module/features/keyboard/types/types.js.map +1 -1
- package/dist/module/lib/helpers/helpers.js +28 -5
- package/dist/module/lib/helpers/helpers.js.map +1 -1
- package/dist/module/shared/translation/constants.js +3 -1
- package/dist/module/shared/translation/constants.js.map +1 -1
- package/dist/module/shared/translation/localization/ca.json +5 -5
- package/dist/module/shared/translation/localization/de.json +42 -0
- package/dist/module/shared/translation/localization/en.json +5 -5
- package/dist/module/shared/translation/localization/gb.json +5 -5
- package/dist/module/shared/translation/localization/sct.json +5 -5
- package/dist/module/shared/translation/localization/sw.json +5 -5
- package/dist/module/shared/translation/types.js +1 -0
- package/dist/module/shared/translation/types.js.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/components/AlgebraLayout/AlgebraLayout.d.ts +1 -1
- package/dist/typescript/commonjs/features/keyboard/components/AlgebraLayout/AlgebraLayout.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/components/AlgebraLayout/helpers.d.ts +1 -6
- package/dist/typescript/commonjs/features/keyboard/components/AlgebraLayout/helpers.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/components/BasicLayout/keyboardGroups.d.ts +1 -0
- package/dist/typescript/commonjs/features/keyboard/components/BasicLayout/keyboardGroups.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/components/Keyboard.d.ts +0 -1
- package/dist/typescript/commonjs/features/keyboard/components/Keyboard.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/components/UnitsLayout/UnitsLayout.d.ts +1 -1
- package/dist/typescript/commonjs/features/keyboard/components/UnitsLayout/UnitsLayout.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/components/UnitsLayout/helpers.d.ts +1 -2
- package/dist/typescript/commonjs/features/keyboard/components/UnitsLayout/helpers.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/constants/keyboardGroupsByLocale.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/constants/keyboardLayouts.d.ts +2 -2
- package/dist/typescript/commonjs/features/keyboard/types/MathKeysGroups/basicOperators.d.ts +0 -18
- package/dist/typescript/commonjs/features/keyboard/types/MathKeysGroups/basicOperators.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/types/keyboardGroupIds.d.ts +1 -1
- package/dist/typescript/commonjs/features/keyboard/types/keyboardGroupIds.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/types/types.d.ts +1 -3
- package/dist/typescript/commonjs/features/keyboard/types/types.d.ts.map +1 -1
- package/dist/typescript/commonjs/lib/helpers/helpers.d.ts.map +1 -1
- package/dist/typescript/commonjs/shared/translation/constants.d.ts +42 -0
- package/dist/typescript/commonjs/shared/translation/constants.d.ts.map +1 -1
- package/dist/typescript/commonjs/shared/translation/types.d.ts +2 -1
- package/dist/typescript/commonjs/shared/translation/types.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/components/AlgebraLayout/AlgebraLayout.d.ts +1 -1
- package/dist/typescript/module/features/keyboard/components/AlgebraLayout/AlgebraLayout.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/components/AlgebraLayout/helpers.d.ts +1 -6
- package/dist/typescript/module/features/keyboard/components/AlgebraLayout/helpers.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/components/BasicLayout/keyboardGroups.d.ts +1 -0
- package/dist/typescript/module/features/keyboard/components/BasicLayout/keyboardGroups.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/components/Keyboard.d.ts +0 -1
- package/dist/typescript/module/features/keyboard/components/Keyboard.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/components/UnitsLayout/UnitsLayout.d.ts +1 -1
- package/dist/typescript/module/features/keyboard/components/UnitsLayout/UnitsLayout.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/components/UnitsLayout/helpers.d.ts +1 -2
- package/dist/typescript/module/features/keyboard/components/UnitsLayout/helpers.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/constants/keyboardGroupsByLocale.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/constants/keyboardLayouts.d.ts +2 -2
- package/dist/typescript/module/features/keyboard/types/MathKeysGroups/basicOperators.d.ts +0 -18
- package/dist/typescript/module/features/keyboard/types/MathKeysGroups/basicOperators.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/types/keyboardGroupIds.d.ts +1 -1
- package/dist/typescript/module/features/keyboard/types/keyboardGroupIds.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/types/types.d.ts +1 -3
- package/dist/typescript/module/features/keyboard/types/types.d.ts.map +1 -1
- package/dist/typescript/module/lib/helpers/helpers.d.ts.map +1 -1
- package/dist/typescript/module/shared/translation/constants.d.ts +42 -0
- package/dist/typescript/module/shared/translation/constants.d.ts.map +1 -1
- package/dist/typescript/module/shared/translation/types.d.ts +2 -1
- package/dist/typescript/module/shared/translation/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/features/keyboard/components/AlgebraLayout/AlgebraLayout.tsx +2 -2
- package/src/features/keyboard/components/AlgebraLayout/helpers.tsx +6 -19
- package/src/features/keyboard/components/BasicLayout/keyboardGroups.ts +4 -0
- package/src/features/keyboard/components/Keyboard.tsx +4 -4
- package/src/features/keyboard/components/UnitsLayout/UnitsLayout.tsx +1 -2
- package/src/features/keyboard/components/UnitsLayout/helpers.tsx +2 -10
- package/src/features/keyboard/constants/keyboardGroupsByLocale.ts +21 -2
- package/src/features/keyboard/types/MathKeysGroups/basicOperators.tsx +0 -21
- package/src/features/keyboard/types/keyboardGroupIds.ts +1 -1
- package/src/features/keyboard/types/types.ts +0 -2
- package/src/lib/helpers/helpers.ts +23 -8
- package/src/shared/translation/constants.ts +2 -0
- package/src/shared/translation/localization/ca.json +5 -5
- package/src/shared/translation/localization/de.json +42 -0
- package/src/shared/translation/localization/en.json +5 -5
- package/src/shared/translation/localization/gb.json +5 -5
- package/src/shared/translation/localization/sct.json +5 -5
- package/src/shared/translation/localization/sw.json +5 -5
- package/src/shared/translation/types.ts +4 -0
- package/dist/commonjs/features/keyboard/components/MainLayout.js +0 -74
- package/dist/commonjs/features/keyboard/components/MainLayout.js.map +0 -1
- package/dist/commonjs/features/keyboard/components/UnderlinedLayout/UnderlinedLayout.js +0 -24
- package/dist/commonjs/features/keyboard/components/UnderlinedLayout/UnderlinedLayout.js.map +0 -1
- package/dist/commonjs/features/keyboard/components/UnderlinedLayout/keyboardGroups.js +0 -13
- package/dist/commonjs/features/keyboard/components/UnderlinedLayout/keyboardGroups.js.map +0 -1
- package/dist/commonjs/shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon.js +0 -34
- package/dist/commonjs/shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon.js.map +0 -1
- package/dist/commonjs/shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon.js +0 -34
- package/dist/commonjs/shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon.js.map +0 -1
- package/dist/commonjs/shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon.js +0 -34
- package/dist/commonjs/shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon.js.map +0 -1
- package/dist/module/features/keyboard/components/MainLayout.js +0 -67
- package/dist/module/features/keyboard/components/MainLayout.js.map +0 -1
- package/dist/module/features/keyboard/components/UnderlinedLayout/UnderlinedLayout.js +0 -18
- package/dist/module/features/keyboard/components/UnderlinedLayout/UnderlinedLayout.js.map +0 -1
- package/dist/module/features/keyboard/components/UnderlinedLayout/keyboardGroups.js +0 -9
- package/dist/module/features/keyboard/components/UnderlinedLayout/keyboardGroups.js.map +0 -1
- package/dist/module/shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon.js +0 -26
- package/dist/module/shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon.js.map +0 -1
- package/dist/module/shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon.js +0 -26
- package/dist/module/shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon.js.map +0 -1
- package/dist/module/shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon.js +0 -26
- package/dist/module/shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon.js.map +0 -1
- package/dist/typescript/commonjs/features/keyboard/components/MainLayout.d.ts +0 -15
- package/dist/typescript/commonjs/features/keyboard/components/MainLayout.d.ts.map +0 -1
- package/dist/typescript/commonjs/features/keyboard/components/UnderlinedLayout/UnderlinedLayout.d.ts +0 -4
- package/dist/typescript/commonjs/features/keyboard/components/UnderlinedLayout/UnderlinedLayout.d.ts.map +0 -1
- package/dist/typescript/commonjs/features/keyboard/components/UnderlinedLayout/keyboardGroups.d.ts +0 -3
- package/dist/typescript/commonjs/features/keyboard/components/UnderlinedLayout/keyboardGroups.d.ts.map +0 -1
- package/dist/typescript/commonjs/shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon.d.ts +0 -4
- package/dist/typescript/commonjs/shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon.d.ts.map +0 -1
- package/dist/typescript/commonjs/shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon.d.ts +0 -4
- package/dist/typescript/commonjs/shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon.d.ts.map +0 -1
- package/dist/typescript/commonjs/shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon.d.ts +0 -4
- package/dist/typescript/commonjs/shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon.d.ts.map +0 -1
- package/dist/typescript/module/features/keyboard/components/MainLayout.d.ts +0 -15
- package/dist/typescript/module/features/keyboard/components/MainLayout.d.ts.map +0 -1
- package/dist/typescript/module/features/keyboard/components/UnderlinedLayout/UnderlinedLayout.d.ts +0 -4
- package/dist/typescript/module/features/keyboard/components/UnderlinedLayout/UnderlinedLayout.d.ts.map +0 -1
- package/dist/typescript/module/features/keyboard/components/UnderlinedLayout/keyboardGroups.d.ts +0 -3
- package/dist/typescript/module/features/keyboard/components/UnderlinedLayout/keyboardGroups.d.ts.map +0 -1
- package/dist/typescript/module/shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon.d.ts +0 -4
- package/dist/typescript/module/shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon.d.ts.map +0 -1
- package/dist/typescript/module/shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon.d.ts +0 -4
- package/dist/typescript/module/shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon.d.ts.map +0 -1
- package/dist/typescript/module/shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon.d.ts +0 -4
- package/dist/typescript/module/shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon.d.ts.map +0 -1
- package/src/features/keyboard/components/MainLayout.tsx +0 -80
- package/src/features/keyboard/components/UnderlinedLayout/UnderlinedLayout.tsx +0 -12
- package/src/features/keyboard/components/UnderlinedLayout/keyboardGroups.ts +0 -12
- package/src/shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon.tsx +0 -17
- package/src/shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon.tsx +0 -20
- package/src/shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon.tsx +0 -20
package/dist/typescript/module/features/keyboard/components/AlgebraLayout/AlgebraLayout.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { KeyboardLayoutProps } from '../../types/types';
|
|
3
|
-
export declare const AlgebraLayout: (
|
|
3
|
+
export declare const AlgebraLayout: (props: KeyboardLayoutProps) => React.JSX.Element;
|
|
4
4
|
//# sourceMappingURL=AlgebraLayout.d.ts.map
|
package/dist/typescript/module/features/keyboard/components/AlgebraLayout/AlgebraLayout.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AlgebraLayout.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/AlgebraLayout/AlgebraLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAKhD,OAAO,EAAE,mBAAmB,EAAgB,MAAM,mBAAmB,CAAA;AAMrE,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"AlgebraLayout.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/AlgebraLayout/AlgebraLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAKhD,OAAO,EAAE,mBAAmB,EAAgB,MAAM,mBAAmB,CAAA;AAMrE,eAAO,MAAM,aAAa,UAAW,mBAAmB,sBA2CvD,CAAA"}
|
|
@@ -5,11 +5,6 @@ type LayoutOption = {
|
|
|
5
5
|
title: ReactNode;
|
|
6
6
|
onPressIn: () => void;
|
|
7
7
|
};
|
|
8
|
-
|
|
9
|
-
selectedLayout: SelectedLayout;
|
|
10
|
-
setSelectedLayout: (layout: SelectedLayout) => void;
|
|
11
|
-
onLayoutChange?: (isSecondaryLayout: boolean) => void;
|
|
12
|
-
};
|
|
13
|
-
export declare function getSelectOptions({ selectedLayout, setSelectedLayout, onLayoutChange, }: GetSelectOptionsProps): LayoutOption[];
|
|
8
|
+
export declare function getSelectOptions(selectedLayout: SelectedLayout, setSelectedLayout: (layout: SelectedLayout) => void): LayoutOption[];
|
|
14
9
|
export {};
|
|
15
10
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/AlgebraLayout/helpers.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAIxC,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAExC,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,SAAS,CAAA;IAChB,SAAS,EAAE,MAAM,IAAI,CAAA;CACtB,CAAA;AAED,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/AlgebraLayout/helpers.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAIxC,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAExC,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,SAAS,CAAA;IAChB,SAAS,EAAE,MAAM,IAAI,CAAA;CACtB,CAAA;AAED,wBAAgB,gBAAgB,CAC9B,cAAc,EAAE,cAAc,EAC9B,iBAAiB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,GAClD,YAAY,EAAE,CAuBhB"}
|
|
@@ -6,4 +6,5 @@ export declare const MATH_TIME_US_KEYBOARD_GROUP: KeyboardGroup;
|
|
|
6
6
|
export declare const MATH_CURRENCY_SW_KEYBOARD_GROUP: KeyboardGroup;
|
|
7
7
|
export declare const MATH_CURRENCY_UK_KEYBOARD_GROUP: KeyboardGroup;
|
|
8
8
|
export declare const MATH_CURRENCY_US_KEYBOARD_GROUP: KeyboardGroup;
|
|
9
|
+
export declare const MATH_CURRENCY_DE_KEYBOARD_GROUP: KeyboardGroup;
|
|
9
10
|
//# sourceMappingURL=keyboardGroups.d.ts.map
|
package/dist/typescript/module/features/keyboard/components/BasicLayout/keyboardGroups.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboardGroups.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/BasicLayout/keyboardGroups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAKjD,eAAO,MAAM,+BAA+B,EAAE,aAU7C,CAAA;AAED,eAAO,MAAM,kCAAkC,EAAE,aAUhD,CAAA;AAED,eAAO,MAAM,2BAA2B,EAAE,aAIzC,CAAA;AAED,eAAO,MAAM,2BAA2B,EAAE,aAWzC,CAAA;AAED,eAAO,MAAM,+BAA+B,EAAE,aAG7C,CAAA;AACD,eAAO,MAAM,+BAA+B,EAAE,aAG7C,CAAA;AACD,eAAO,MAAM,+BAA+B,EAAE,aAG7C,CAAA"}
|
|
1
|
+
{"version":3,"file":"keyboardGroups.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/BasicLayout/keyboardGroups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAKjD,eAAO,MAAM,+BAA+B,EAAE,aAU7C,CAAA;AAED,eAAO,MAAM,kCAAkC,EAAE,aAUhD,CAAA;AAED,eAAO,MAAM,2BAA2B,EAAE,aAIzC,CAAA;AAED,eAAO,MAAM,2BAA2B,EAAE,aAWzC,CAAA;AAED,eAAO,MAAM,+BAA+B,EAAE,aAG7C,CAAA;AACD,eAAO,MAAM,+BAA+B,EAAE,aAG7C,CAAA;AACD,eAAO,MAAM,+BAA+B,EAAE,aAG7C,CAAA;AACD,eAAO,MAAM,+BAA+B,EAAE,aAG7C,CAAA"}
|
|
@@ -9,7 +9,6 @@ type KeyboardProps = {
|
|
|
9
9
|
color?: SelectOptionColor;
|
|
10
10
|
isVisible?: boolean;
|
|
11
11
|
isDisabled?: boolean;
|
|
12
|
-
showUnderlinedKeys?: boolean;
|
|
13
12
|
disabledKeys?: KeyboardKey[];
|
|
14
13
|
};
|
|
15
14
|
export declare const Keyboard: ({ style, characterType, isVisible, ...props }: KeyboardProps) => React.JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Keyboard.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/components/Keyboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqC,MAAM,OAAO,CAAA;AACzD,OAAO,EAAY,SAAS,EAAmC,SAAS,EAAE,MAAM,cAAc,CAAA;AAC9F,OAAO,EAAqB,iBAAiB,EAAW,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"Keyboard.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/components/Keyboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqC,MAAM,OAAO,CAAA;AACzD,OAAO,EAAY,SAAS,EAAmC,SAAS,EAAE,MAAM,cAAc,CAAA;AAC9F,OAAO,EAAqB,iBAAiB,EAAW,MAAM,4BAA4B,CAAA;AAE1F,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAU9D,KAAK,aAAa,GAAG;IACnB,UAAU,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,CAAA;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;IAC5B,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,QAAQ,kDAA0D,aAAa,sBAuC3F,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { KeyboardLayoutProps } from '../../types/types';
|
|
3
|
-
export declare const UnitsLayout: (
|
|
3
|
+
export declare const UnitsLayout: (props: KeyboardLayoutProps) => React.JSX.Element;
|
|
4
4
|
//# sourceMappingURL=UnitsLayout.d.ts.map
|
package/dist/typescript/module/features/keyboard/components/UnitsLayout/UnitsLayout.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnitsLayout.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/UnitsLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAMvC,OAAO,EAAE,mBAAmB,EAAgB,MAAM,mBAAmB,CAAA;AAQrE,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"UnitsLayout.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/UnitsLayout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAMvC,OAAO,EAAE,mBAAmB,EAAgB,MAAM,mBAAmB,CAAA;AAQrE,eAAO,MAAM,WAAW,UAAW,mBAAmB,sBAwCrD,CAAA"}
|
|
@@ -4,9 +4,8 @@ type UseLayoutSelectOptionsProps = {
|
|
|
4
4
|
activeTabKey: KeyboardUnitsGroupType;
|
|
5
5
|
selectedLayout: SelectedLayout;
|
|
6
6
|
setSelectedLayout: (layout: SelectedLayout) => void;
|
|
7
|
-
onLayoutChange?: (isSecondaryLayout: boolean) => void;
|
|
8
7
|
};
|
|
9
|
-
export declare const getSelectOptions: ({ activeTabKey, selectedLayout, setSelectedLayout,
|
|
8
|
+
export declare const getSelectOptions: ({ activeTabKey, selectedLayout, setSelectedLayout, }: UseLayoutSelectOptionsProps) => {
|
|
10
9
|
key: SelectedLayout;
|
|
11
10
|
title: React.JSX.Element;
|
|
12
11
|
onPressIn: () => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/helpers.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGhE,KAAK,2BAA2B,GAAG;IACjC,YAAY,EAAE,sBAAsB,CAAA;IACpC,cAAc,EAAE,cAAc,CAAA;IAC9B,iBAAiB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/helpers.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGhE,KAAK,2BAA2B,GAAG;IACjC,YAAY,EAAE,sBAAsB,CAAA;IACpC,cAAc,EAAE,cAAc,CAAA;IAC9B,iBAAiB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;CACpD,CAAA;AAED,eAAO,MAAM,gBAAgB,yDAI1B,2BAA2B;;;;GA2B7B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboardGroupsByLocale.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/constants/keyboardGroupsByLocale.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"keyboardGroupsByLocale.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/constants/keyboardGroupsByLocale.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAuC5D,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAA;AAEpD,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAA;AAiC5F,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,CAuCzF,CAAA;AACD,eAAO,MAAM,+BAA+B,EAAE,MAAM,CAClD,MAAM,EACN,MAAM,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,CAwBnD,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MyScriptMathCharacterTypes } from '../../../types/characterTypes';
|
|
2
2
|
export declare const KEYBOARD_LAYOUTS: {
|
|
3
3
|
AlgebraAdvanced: {
|
|
4
|
-
Component: (
|
|
4
|
+
Component: (props: import("../types/types").KeyboardLayoutProps) => import("react").JSX.Element;
|
|
5
5
|
characterTypes: MyScriptMathCharacterTypes[];
|
|
6
6
|
};
|
|
7
7
|
Basic: {
|
|
@@ -21,7 +21,7 @@ export declare const KEYBOARD_LAYOUTS: {
|
|
|
21
21
|
characterTypes: MyScriptMathCharacterTypes[];
|
|
22
22
|
};
|
|
23
23
|
BasicUnits: {
|
|
24
|
-
Component: (
|
|
24
|
+
Component: (props: import("../types/types").KeyboardLayoutProps) => import("react").JSX.Element;
|
|
25
25
|
characterTypes: MyScriptMathCharacterTypes[];
|
|
26
26
|
};
|
|
27
27
|
BasicPlusPlus: {
|
|
@@ -222,23 +222,5 @@ export declare const MATH_BASIC_OPERATORS: {
|
|
|
222
222
|
mathliveValue: string;
|
|
223
223
|
katexValue: string;
|
|
224
224
|
};
|
|
225
|
-
UNDERLINED_TEN: {
|
|
226
|
-
icon: React.JSX.Element;
|
|
227
|
-
mathliveValue: string;
|
|
228
|
-
katexValue: string;
|
|
229
|
-
spreadsheetValue: string;
|
|
230
|
-
};
|
|
231
|
-
UNDERLINED_ONE: {
|
|
232
|
-
icon: React.JSX.Element;
|
|
233
|
-
mathliveValue: string;
|
|
234
|
-
katexValue: string;
|
|
235
|
-
spreadsheetValue: string;
|
|
236
|
-
};
|
|
237
|
-
UNDERLINED_U: {
|
|
238
|
-
icon: React.JSX.Element;
|
|
239
|
-
mathliveValue: string;
|
|
240
|
-
katexValue: string;
|
|
241
|
-
spreadsheetValue: string;
|
|
242
|
-
};
|
|
243
225
|
};
|
|
244
226
|
//# sourceMappingURL=basicOperators.d.ts.map
|
package/dist/typescript/module/features/keyboard/types/MathKeysGroups/basicOperators.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basicOperators.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/types/MathKeysGroups/basicOperators.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"basicOperators.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/types/MathKeysGroups/basicOperators.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AA6CzB,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+N/B,CAAA"}
|
|
@@ -27,6 +27,6 @@ export declare enum MathEntryKeyboardGroupId {
|
|
|
27
27
|
CURRENCY_SW = "math-entry-currency-sw",
|
|
28
28
|
CURRENCY_UK = "math-entry-currency-uk",
|
|
29
29
|
CURRENCY_US = "math-entry-currency-us",
|
|
30
|
-
|
|
30
|
+
CURRENCY_DE = "math-entry-currency-de"
|
|
31
31
|
}
|
|
32
32
|
//# sourceMappingURL=keyboardGroupIds.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboardGroupIds.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/types/keyboardGroupIds.ts"],"names":[],"mappings":"AAAA,oBAAY,wBAAwB;IAClC,eAAe,+BAA+B;IAC9C,sBAAsB,sCAAsC;IAC5D,kBAAkB,kCAAkC;IACpD,yBAAyB,yCAAyC;IAClE,aAAa,6BAA6B;IAC1C,oBAAoB,oCAAoC;IACxD,aAAa,6BAA6B;IAC1C,iBAAiB,iCAAiC;IAClD,OAAO,uBAAuB;IAC9B,UAAU,0BAA0B;IACpC,UAAU,0BAA0B;IACpC,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,aAAa,6BAA6B;IAC1C,aAAa,6BAA6B;IAC1C,aAAa,6BAA6B;IAC1C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,KAAK,qBAAqB;IAC1B,QAAQ,wBAAwB;IAChC,OAAO,uBAAuB;IAC9B,OAAO,uBAAuB;IAC9B,WAAW,2BAA2B;IACtC,WAAW,2BAA2B;IACtC,WAAW,2BAA2B;IACtC,
|
|
1
|
+
{"version":3,"file":"keyboardGroupIds.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/types/keyboardGroupIds.ts"],"names":[],"mappings":"AAAA,oBAAY,wBAAwB;IAClC,eAAe,+BAA+B;IAC9C,sBAAsB,sCAAsC;IAC5D,kBAAkB,kCAAkC;IACpD,yBAAyB,yCAAyC;IAClE,aAAa,6BAA6B;IAC1C,oBAAoB,oCAAoC;IACxD,aAAa,6BAA6B;IAC1C,iBAAiB,iCAAiC;IAClD,OAAO,uBAAuB;IAC9B,UAAU,0BAA0B;IACpC,UAAU,0BAA0B;IACpC,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,aAAa,6BAA6B;IAC1C,aAAa,6BAA6B;IAC1C,aAAa,6BAA6B;IAC1C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,eAAe,+BAA+B;IAC9C,KAAK,qBAAqB;IAC1B,QAAQ,wBAAwB;IAChC,OAAO,uBAAuB;IAC9B,OAAO,uBAAuB;IAC9B,WAAW,2BAA2B;IACtC,WAAW,2BAA2B;IACtC,WAAW,2BAA2B;IACtC,WAAW,2BAA2B;CACvC"}
|
|
@@ -11,8 +11,7 @@ export declare const enum KeyboardType {
|
|
|
11
11
|
BasicUnits = "BasicUnits",
|
|
12
12
|
BasicPlusPlus = "BasicPlusPlus",
|
|
13
13
|
BasicPlusPlusMobile = "BasicPlusPlusMobile",
|
|
14
|
-
Numpad = "Numpad"
|
|
15
|
-
Underlined = "Underlined"
|
|
14
|
+
Numpad = "Numpad"
|
|
16
15
|
}
|
|
17
16
|
export type KeyboardKey = {
|
|
18
17
|
katexValue: string;
|
|
@@ -40,7 +39,6 @@ export type KeyboardGroup = {
|
|
|
40
39
|
};
|
|
41
40
|
export type KeyboardLayoutProps = {
|
|
42
41
|
onKeyPress: (key: KeyboardKeyValue) => void;
|
|
43
|
-
onLayoutChange?: (isSecondaryLayout: boolean) => void;
|
|
44
42
|
color?: SelectOptionColor;
|
|
45
43
|
isDisabled?: boolean;
|
|
46
44
|
disabledKeys?: KeyboardKey[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD,0BAAkB,YAAY;IAC5B,eAAe,oBAAoB;IACnC,KAAK,UAAU;IACf,SAAS,cAAc;IACvB,eAAe,oBAAoB;IACnC,SAAS,cAAc;IACvB,aAAa,kBAAkB;IAC/B,UAAU,eAAe;IACzB,aAAa,kBAAkB;IAC/B,mBAAmB,wBAAwB;IAC3C,MAAM,WAAW;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD,0BAAkB,YAAY;IAC5B,eAAe,oBAAoB;IACnC,KAAK,UAAU;IACf,SAAS,cAAc;IACvB,eAAe,oBAAoB;IACnC,SAAS,cAAc;IACvB,aAAa,kBAAkB;IAC/B,UAAU,eAAe;IACzB,aAAa,kBAAkB;IAC/B,mBAAmB,wBAAwB;IAC3C,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,KAAK,CAAC,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,qBAAqB,CAAA;IAC5B,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAA;IACV,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,WAAW,EAAE,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,EAAE,CAAC,GAAG,EAAE,gBAAgB,KAAK,IAAI,CAAA;IAC3C,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI;KAC3D,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW;CACpC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/lib/helpers/helpers.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI,YAAW,CAAA;AAE5B,eAAO,MAAM,gBAAgB,cACsC,CAAA;AASnE,eAAO,MAAM,mBAAmB,SAAU,IAAI,
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/lib/helpers/helpers.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI,YAAW,CAAA;AAE5B,eAAO,MAAM,gBAAgB,cACsC,CAAA;AASnE,eAAO,MAAM,mBAAmB,SAAU,IAAI,WAsC7C,CAAA"}
|
|
@@ -209,5 +209,47 @@ export declare const LOCALIZATION_CONFIGS: {
|
|
|
209
209
|
weight: string;
|
|
210
210
|
};
|
|
211
211
|
};
|
|
212
|
+
"de-DE": {
|
|
213
|
+
locale: string;
|
|
214
|
+
"teacherFeedback.noComments": string;
|
|
215
|
+
"time.justNow": string;
|
|
216
|
+
"time.minuteAgo": string;
|
|
217
|
+
"time.minutesAgo": string;
|
|
218
|
+
"time.hourAgo": string;
|
|
219
|
+
"time.hoursAgo": string;
|
|
220
|
+
"time.dayAgo": string;
|
|
221
|
+
"time.daysAgo": string;
|
|
222
|
+
"time.monthAgo": string;
|
|
223
|
+
"time.monthsAgo": string;
|
|
224
|
+
"time.yearAgo": string;
|
|
225
|
+
"time.yearsAgo": string;
|
|
226
|
+
chat: {
|
|
227
|
+
anotherHint: string;
|
|
228
|
+
giveHint: string;
|
|
229
|
+
giveHintOpenChat: string;
|
|
230
|
+
answerAgain: string;
|
|
231
|
+
errorMessage: string;
|
|
232
|
+
howCanIHelp: string;
|
|
233
|
+
showError: string;
|
|
234
|
+
inputPlaceholder: string;
|
|
235
|
+
};
|
|
236
|
+
gifCelebrations: {
|
|
237
|
+
greatStart: string;
|
|
238
|
+
onTheWay: string;
|
|
239
|
+
almostThere: string;
|
|
240
|
+
};
|
|
241
|
+
exampleSolution: {
|
|
242
|
+
exampleSolution: string;
|
|
243
|
+
letMeThink: string;
|
|
244
|
+
aha: string;
|
|
245
|
+
errorMessage: string;
|
|
246
|
+
};
|
|
247
|
+
keyboard: {
|
|
248
|
+
length: string;
|
|
249
|
+
area: string;
|
|
250
|
+
volume: string;
|
|
251
|
+
weight: string;
|
|
252
|
+
};
|
|
253
|
+
};
|
|
212
254
|
};
|
|
213
255
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/shared/translation/constants.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/shared/translation/constants.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAOhC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/shared/translation/types.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/shared/translation/types.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,wBAAwB,CAAA;AAOnD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGnD,MAAM,MAAM,YAAY,GAAG,OAAO,cAAc,CAAA;AAChD,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,YAAY,CAAC,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,KAAK,MAAM,CAAA;AAE5F,oBAAY,MAAM;IAChB,EAAE,UAAU;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;IACZ,EAAE,UAAU;IACZ,GAAG,WAAW;IACd,EAAE,UAAU;CACb"}
|
package/package.json
CHANGED
|
@@ -9,11 +9,11 @@ import { SelectedLayout } from './types'
|
|
|
9
9
|
import { getKeyboardGroup } from '../../helpers'
|
|
10
10
|
import { getSelectOptions } from './helpers'
|
|
11
11
|
|
|
12
|
-
export const AlgebraLayout = (
|
|
12
|
+
export const AlgebraLayout = (props: KeyboardLayoutProps) => {
|
|
13
13
|
const [selectedLayout, setSelectedLayout] = useState<SelectedLayout>(SelectedLayout.BASIC)
|
|
14
14
|
const t = useText()
|
|
15
15
|
const { width } = useWindowDimensions()
|
|
16
|
-
const selectOptions = getSelectOptions(
|
|
16
|
+
const selectOptions = getSelectOptions(selectedLayout, setSelectedLayout)
|
|
17
17
|
const isDesktop = width > MOBILE_LAYOUT_WIDTH && !IS_MOBILE
|
|
18
18
|
const locale = t('locale') as Locale
|
|
19
19
|
|
|
@@ -10,17 +10,10 @@ type LayoutOption = {
|
|
|
10
10
|
onPressIn: () => void
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
selectedLayout: SelectedLayout
|
|
15
|
-
setSelectedLayout: (layout: SelectedLayout) => void
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
export function getSelectOptions({
|
|
20
|
-
selectedLayout,
|
|
21
|
-
setSelectedLayout,
|
|
22
|
-
onLayoutChange,
|
|
23
|
-
}: GetSelectOptionsProps): LayoutOption[] {
|
|
13
|
+
export function getSelectOptions(
|
|
14
|
+
selectedLayout: SelectedLayout,
|
|
15
|
+
setSelectedLayout: (layout: SelectedLayout) => void,
|
|
16
|
+
): LayoutOption[] {
|
|
24
17
|
return [
|
|
25
18
|
{
|
|
26
19
|
key: SelectedLayout.BASIC,
|
|
@@ -30,10 +23,7 @@ export function getSelectOptions({
|
|
|
30
23
|
size={22}
|
|
31
24
|
/>
|
|
32
25
|
),
|
|
33
|
-
onPressIn: () =>
|
|
34
|
-
setSelectedLayout(SelectedLayout.BASIC)
|
|
35
|
-
onLayoutChange?.(false)
|
|
36
|
-
},
|
|
26
|
+
onPressIn: () => setSelectedLayout(SelectedLayout.BASIC),
|
|
37
27
|
},
|
|
38
28
|
{
|
|
39
29
|
key: SelectedLayout.ALGEBRA,
|
|
@@ -43,10 +33,7 @@ export function getSelectOptions({
|
|
|
43
33
|
size={25}
|
|
44
34
|
/>
|
|
45
35
|
),
|
|
46
|
-
onPressIn: () =>
|
|
47
|
-
setSelectedLayout(SelectedLayout.ALGEBRA)
|
|
48
|
-
onLayoutChange?.(true)
|
|
49
|
-
},
|
|
36
|
+
onPressIn: () => setSelectedLayout(SelectedLayout.ALGEBRA),
|
|
50
37
|
},
|
|
51
38
|
]
|
|
52
39
|
}
|
|
@@ -58,3 +58,7 @@ export const MATH_CURRENCY_US_KEYBOARD_GROUP: KeyboardGroup = {
|
|
|
58
58
|
id: MathEntryKeyboardGroupId.CURRENCY_US,
|
|
59
59
|
keys: [MATH_CURRENCY_UNITS.DOLLAR, MATH_CURRENCY_UNITS.CENT],
|
|
60
60
|
}
|
|
61
|
+
export const MATH_CURRENCY_DE_KEYBOARD_GROUP: KeyboardGroup = {
|
|
62
|
+
id: MathEntryKeyboardGroupId.CURRENCY_DE,
|
|
63
|
+
keys: [MATH_CURRENCY_UNITS.EURO, MATH_CURRENCY_UNITS.DOLLAR, MATH_CURRENCY_UNITS.POUND],
|
|
64
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React, { useEffect, useMemo, useRef } from 'react'
|
|
2
2
|
import { Animated, StyleProp, StyleSheet, useWindowDimensions, ViewStyle } from 'react-native'
|
|
3
3
|
import { COLORS, IS_MOBILE, SelectOptionColor, SHADOWS } from '@magmamath/react-native-ui'
|
|
4
|
+
import { getLayoutByCharType } from '../constants/keyboardLayouts'
|
|
4
5
|
import { KeyboardKey, KeyboardKeyValue } from '../types/types'
|
|
5
6
|
import { Numpad } from './Numpad/Numpad'
|
|
6
7
|
import { MOBILE_LAYOUT_WIDTH } from '../constants/constants'
|
|
@@ -10,7 +11,6 @@ import {
|
|
|
10
11
|
slideInAnimationSettings,
|
|
11
12
|
slideOutAnimationSettings,
|
|
12
13
|
} from './constants'
|
|
13
|
-
import { MainLayout } from './MainLayout'
|
|
14
14
|
|
|
15
15
|
type KeyboardProps = {
|
|
16
16
|
onKeyPress: (key: KeyboardKeyValue) => void
|
|
@@ -19,15 +19,15 @@ type KeyboardProps = {
|
|
|
19
19
|
color?: SelectOptionColor
|
|
20
20
|
isVisible?: boolean
|
|
21
21
|
isDisabled?: boolean
|
|
22
|
-
showUnderlinedKeys?: boolean
|
|
23
22
|
disabledKeys?: KeyboardKey[]
|
|
24
23
|
}
|
|
25
24
|
|
|
26
25
|
export const Keyboard = ({ style, characterType, isVisible = true, ...props }: KeyboardProps) => {
|
|
27
26
|
const slideAnim = useRef(new Animated.Value(isVisible ? 0 : KEYBOARD_SLIDE_DISTANCE)).current
|
|
28
|
-
|
|
29
27
|
const { width } = useWindowDimensions()
|
|
30
28
|
const isMobile = width <= MOBILE_LAYOUT_WIDTH || IS_MOBILE
|
|
29
|
+
|
|
30
|
+
const Layout = useMemo(() => getLayoutByCharType(characterType), [characterType])
|
|
31
31
|
const mobileStyles = useMemo(
|
|
32
32
|
() => getLayoutConfigStyles(characterType, isMobile),
|
|
33
33
|
[characterType, isMobile],
|
|
@@ -57,7 +57,7 @@ export const Keyboard = ({ style, characterType, isVisible = true, ...props }: K
|
|
|
57
57
|
},
|
|
58
58
|
]}
|
|
59
59
|
>
|
|
60
|
-
<
|
|
60
|
+
<Layout {...props} />
|
|
61
61
|
<Numpad {...props} style={mobileStyles} />
|
|
62
62
|
</Animated.View>
|
|
63
63
|
)
|
|
@@ -12,7 +12,7 @@ import { KeyboardUnitsGroupType, SelectedLayout } from './types'
|
|
|
12
12
|
import { getSelectOptions } from './helpers'
|
|
13
13
|
import { IS_MOBILE } from '@magmamath/react-native-ui'
|
|
14
14
|
|
|
15
|
-
export const UnitsLayout = (
|
|
15
|
+
export const UnitsLayout = (props: KeyboardLayoutProps) => {
|
|
16
16
|
const { width } = useWindowDimensions()
|
|
17
17
|
const t = useText()
|
|
18
18
|
const locale = t('locale') as Locale
|
|
@@ -26,7 +26,6 @@ export const UnitsLayout = ({ onLayoutChange, ...props }: KeyboardLayoutProps) =
|
|
|
26
26
|
activeTabKey: activeTab.key as KeyboardUnitsGroupType,
|
|
27
27
|
selectedLayout,
|
|
28
28
|
setSelectedLayout,
|
|
29
|
-
onLayoutChange,
|
|
30
29
|
})
|
|
31
30
|
|
|
32
31
|
return (
|
|
@@ -8,14 +8,12 @@ type UseLayoutSelectOptionsProps = {
|
|
|
8
8
|
activeTabKey: KeyboardUnitsGroupType
|
|
9
9
|
selectedLayout: SelectedLayout
|
|
10
10
|
setSelectedLayout: (layout: SelectedLayout) => void
|
|
11
|
-
onLayoutChange?: (isSecondaryLayout: boolean) => void
|
|
12
11
|
}
|
|
13
12
|
|
|
14
13
|
export const getSelectOptions = ({
|
|
15
14
|
activeTabKey,
|
|
16
15
|
selectedLayout,
|
|
17
16
|
setSelectedLayout,
|
|
18
|
-
onLayoutChange,
|
|
19
17
|
}: UseLayoutSelectOptionsProps) => {
|
|
20
18
|
{
|
|
21
19
|
const SelectedIcon = UNITS_KEYBOARD_GROUPS.get(activeTabKey)?.icon || RulerIcon
|
|
@@ -29,10 +27,7 @@ export const getSelectOptions = ({
|
|
|
29
27
|
size={22}
|
|
30
28
|
/>
|
|
31
29
|
),
|
|
32
|
-
onPressIn: () =>
|
|
33
|
-
setSelectedLayout(SelectedLayout.ALGEBRA)
|
|
34
|
-
onLayoutChange?.(false)
|
|
35
|
-
},
|
|
30
|
+
onPressIn: () => setSelectedLayout(SelectedLayout.ALGEBRA),
|
|
36
31
|
},
|
|
37
32
|
{
|
|
38
33
|
key: SelectedLayout.UNITS,
|
|
@@ -42,10 +37,7 @@ export const getSelectOptions = ({
|
|
|
42
37
|
size={16}
|
|
43
38
|
/>
|
|
44
39
|
),
|
|
45
|
-
onPressIn: () =>
|
|
46
|
-
setSelectedLayout(SelectedLayout.UNITS)
|
|
47
|
-
onLayoutChange?.(true)
|
|
48
|
-
},
|
|
40
|
+
onPressIn: () => setSelectedLayout(SelectedLayout.UNITS),
|
|
49
41
|
},
|
|
50
42
|
]
|
|
51
43
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { KeyboardGroup, KeyboardType } from '../types/types'
|
|
2
2
|
import {
|
|
3
|
+
MATH_CURRENCY_DE_KEYBOARD_GROUP,
|
|
3
4
|
MATH_CURRENCY_SW_KEYBOARD_GROUP,
|
|
4
5
|
MATH_CURRENCY_UK_KEYBOARD_GROUP,
|
|
5
6
|
MATH_CURRENCY_US_KEYBOARD_GROUP,
|
|
@@ -39,7 +40,6 @@ import {
|
|
|
39
40
|
import { Locale } from '../../../shared/translation'
|
|
40
41
|
import { MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP } from '../components/AlgebraLayout/keyboardGroups'
|
|
41
42
|
import { KeyboardUnitsGroupType, UnitKeyboardGroups } from '../components/UnitsLayout/types'
|
|
42
|
-
import { MATH_ENTRY_UNDERLINED_KEYBOARD_GROUP } from '../components/UnderlinedLayout/keyboardGroups'
|
|
43
43
|
|
|
44
44
|
function createKeyboardLocale(overrides: Partial<Record<KeyboardType, KeyboardGroup>>) {
|
|
45
45
|
const base: Record<KeyboardType, KeyboardGroup> = {
|
|
@@ -56,7 +56,6 @@ function createKeyboardLocale(overrides: Partial<Record<KeyboardType, KeyboardGr
|
|
|
56
56
|
[KeyboardType.BasicTime]: MATH_TIME_US_KEYBOARD_GROUP,
|
|
57
57
|
[KeyboardType.AlgebraAdvanced]: MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP,
|
|
58
58
|
[KeyboardType.Numpad]: MATH_ENTRY_NUMBERS_US_KEYBOARD_GROUP,
|
|
59
|
-
[KeyboardType.Underlined]: MATH_ENTRY_UNDERLINED_KEYBOARD_GROUP,
|
|
60
59
|
}
|
|
61
60
|
return { ...base, ...overrides }
|
|
62
61
|
}
|
|
@@ -98,6 +97,20 @@ export const KEYBOARD_GROUPS_BY_LOCALE: Record<Locale, Record<KeyboardType, Keyb
|
|
|
98
97
|
[KeyboardType.BasicTime]: MATH_TIME_SW_KEYBOARD_GROUP,
|
|
99
98
|
[KeyboardType.Numpad]: MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP,
|
|
100
99
|
}),
|
|
100
|
+
[Locale.DE]: createKeyboardLocale({
|
|
101
|
+
[KeyboardType.Basic]: MATH_ENTRY_BASIC_SW_KEYBOARD_GROUP,
|
|
102
|
+
[KeyboardType.BasicPlus]: MATH_ENTRY_BASIC_SW_PLUS,
|
|
103
|
+
[KeyboardType.BasicPlusMobile]: MATH_ENTRY_BASIC_PLUS_MOBILE_SW,
|
|
104
|
+
[KeyboardType.BasicPlusPlus]: MATH_ENTRY_BASIC_PLUS_PLUS_SW,
|
|
105
|
+
[KeyboardType.BasicPlusPlusMobile]: MATH_ENTRY_BASIC_PLUS_PLUS_MOBILE_SW,
|
|
106
|
+
[KeyboardType.BasicUnits]: {
|
|
107
|
+
...MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS,
|
|
108
|
+
keys: MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS.keys[0],
|
|
109
|
+
},
|
|
110
|
+
[KeyboardType.BasicCurrency]: MATH_CURRENCY_DE_KEYBOARD_GROUP,
|
|
111
|
+
[KeyboardType.BasicTime]: MATH_TIME_SW_KEYBOARD_GROUP,
|
|
112
|
+
[KeyboardType.Numpad]: MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP,
|
|
113
|
+
}),
|
|
101
114
|
}
|
|
102
115
|
export const KEYBOARD_UNITS_GROUPS_BY_LOCALE: Record<
|
|
103
116
|
Locale,
|
|
@@ -119,4 +132,10 @@ export const KEYBOARD_UNITS_GROUPS_BY_LOCALE: Record<
|
|
|
119
132
|
[KeyboardUnitsGroupType.VOLUME]: MATH_ENTRY_VOLUME_UNITS_SW_KEYBOARD_GROUPS,
|
|
120
133
|
[KeyboardUnitsGroupType.WEIGHT]: MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS,
|
|
121
134
|
}),
|
|
135
|
+
[Locale.DE]: createKeyboardUnitsLocale({
|
|
136
|
+
[KeyboardUnitsGroupType.LENGTH]: MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS,
|
|
137
|
+
[KeyboardUnitsGroupType.AREA]: MATH_ENTRY_AREA_UNITS_SW_KEYBOARD_GROUPS,
|
|
138
|
+
[KeyboardUnitsGroupType.VOLUME]: MATH_ENTRY_VOLUME_UNITS_SW_KEYBOARD_GROUPS,
|
|
139
|
+
[KeyboardUnitsGroupType.WEIGHT]: MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS,
|
|
140
|
+
}),
|
|
122
141
|
}
|
|
@@ -42,9 +42,6 @@ import { EqualsIcon } from '../../../../shared/icons/keyboard/EqualsIcon/EqualsI
|
|
|
42
42
|
import { AbsoluteValueIcon } from '../../../../shared/icons/keyboard/AbsoluteValueIcon/AbsoluteValueIcon'
|
|
43
43
|
import { IntervalIcon } from '../../../../shared/icons/keyboard/IntervalIcon/IntervalIcon'
|
|
44
44
|
import { createMathKeysGroup } from './helpers'
|
|
45
|
-
import { UnderlinedTenIcon } from '../../../../shared/icons/keyboard/UnderlinedTenIcon/UnderlinedTenIcon'
|
|
46
|
-
import { UnderlinedOneIcon } from '../../../../shared/icons/keyboard/UnderlinedOneIcon/UnderlinedOneIcon'
|
|
47
|
-
import { UnderlinedUIcon } from '../../../../shared/icons/keyboard/UnderlinedUIcon/UnderlinedUIcon'
|
|
48
45
|
|
|
49
46
|
export const MATH_BASIC_OPERATORS = createMathKeysGroup({
|
|
50
47
|
ADDITION: {
|
|
@@ -269,22 +266,4 @@ export const MATH_BASIC_OPERATORS = createMathKeysGroup({
|
|
|
269
266
|
mathliveValue: '$\\left[, \\right]$',
|
|
270
267
|
katexValue: '[ , ]',
|
|
271
268
|
},
|
|
272
|
-
UNDERLINED_TEN: {
|
|
273
|
-
icon: <UnderlinedTenIcon {...DEFAULT_KEY_ICON_PROPS} />,
|
|
274
|
-
mathliveValue: '\\underline{10}',
|
|
275
|
-
katexValue: '10̲',
|
|
276
|
-
spreadsheetValue: 'TEN',
|
|
277
|
-
},
|
|
278
|
-
UNDERLINED_ONE: {
|
|
279
|
-
icon: <UnderlinedOneIcon {...DEFAULT_KEY_ICON_PROPS} />,
|
|
280
|
-
mathliveValue: '\\underline{1}',
|
|
281
|
-
katexValue: '1̲',
|
|
282
|
-
spreadsheetValue: 'ONE_FOOT_NOTE',
|
|
283
|
-
},
|
|
284
|
-
UNDERLINED_U: {
|
|
285
|
-
icon: <UnderlinedUIcon {...DEFAULT_KEY_ICON_PROPS} />,
|
|
286
|
-
mathliveValue: '\\underline{u}',
|
|
287
|
-
katexValue: 'U̲',
|
|
288
|
-
spreadsheetValue: 'FRACTION',
|
|
289
|
-
},
|
|
290
269
|
})
|
|
@@ -13,7 +13,6 @@ export const enum KeyboardType {
|
|
|
13
13
|
BasicPlusPlus = 'BasicPlusPlus',
|
|
14
14
|
BasicPlusPlusMobile = 'BasicPlusPlusMobile',
|
|
15
15
|
Numpad = 'Numpad',
|
|
16
|
-
Underlined = 'Underlined',
|
|
17
16
|
}
|
|
18
17
|
|
|
19
18
|
export type KeyboardKey = {
|
|
@@ -45,7 +44,6 @@ export type KeyboardGroup = {
|
|
|
45
44
|
|
|
46
45
|
export type KeyboardLayoutProps = {
|
|
47
46
|
onKeyPress: (key: KeyboardKeyValue) => void
|
|
48
|
-
onLayoutChange?: (isSecondaryLayout: boolean) => void
|
|
49
47
|
color?: SelectOptionColor
|
|
50
48
|
isDisabled?: boolean
|
|
51
49
|
disabledKeys?: KeyboardKey[]
|
|
@@ -27,12 +27,27 @@ export const getRelativeTimeText = (date: Date) => {
|
|
|
27
27
|
const years = getYears(days)
|
|
28
28
|
|
|
29
29
|
if (seconds < 60) return getText('time.justNow')
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
return
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
30
|
+
|
|
31
|
+
if (minutes < 60) {
|
|
32
|
+
if (minutes === 1) return `1 ${getText('time.minuteAgo')}`
|
|
33
|
+
return getText('time.minutesAgo', { count: minutes.toString() })
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
if (hours < 24) {
|
|
37
|
+
if (hours === 1) return `1 ${getText('time.hourAgo')}`
|
|
38
|
+
return getText('time.hoursAgo', { count: hours.toString() })
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
if (days < 30) {
|
|
42
|
+
if (days === 1) return `1 ${getText('time.dayAgo')}`
|
|
43
|
+
return getText('time.daysAgo', { count: days.toString() })
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
if (months < 12) {
|
|
47
|
+
if (months === 1) return `1 ${getText('time.monthAgo')}`
|
|
48
|
+
return getText('time.monthsAgo', { count: months.toString() })
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
if (years === 1) return `1 ${getText('time.yearAgo')}`
|
|
52
|
+
return getText('time.yearsAgo', { count: years.toString() })
|
|
38
53
|
}
|
|
@@ -4,6 +4,7 @@ import GB from './localization/gb.json'
|
|
|
4
4
|
import SW from './localization/sw.json'
|
|
5
5
|
import CA from './localization/ca.json'
|
|
6
6
|
import SCT from './localization/sct.json'
|
|
7
|
+
import DE from './localization/de.json'
|
|
7
8
|
|
|
8
9
|
export const LOCALIZATION_CONFIGS = {
|
|
9
10
|
[Locale.EN]: EN,
|
|
@@ -11,4 +12,5 @@ export const LOCALIZATION_CONFIGS = {
|
|
|
11
12
|
[Locale.SW]: SW,
|
|
12
13
|
[Locale.CA]: CA,
|
|
13
14
|
[Locale.SCT]: SCT,
|
|
15
|
+
[Locale.DE]: DE,
|
|
14
16
|
}
|