zoriya/react-native-web
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-web.git synced 2026-05-26 07:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[change] I18nManager getConstants method

Browse Source 
React Native made a breaking change to the (undocumented) I18nManager that
makes the 'isRTL' constant available via the 'getConstants' method. This
removes the getter properties that were previously needed.
This commit is contained in:
Nicolas Gallagher
2021-02-05 16:55:45 -08:00
parent 6a8369dd95
commit a685f2db2e
4 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native-web/src/exports/I18nManager/__tests__/index-test.js
Vendored
+12 -12
View File
@@ -12,7 +12,7 @@ describe('apis/I18nManager', () => {
describe('isRTL', () => {
test('is false', () => {
expect(I18nManager.isRTL).toBe(false);
expect(I18nManager.getConstants().isRTL).toBe(false);
expect(getDocumentDir()).toEqual('ltr');
});
});
@@ -24,12 +24,12 @@ describe('apis/I18nManager', () => {
test('when set to false, "isRTL" is false', () => {
I18nManager.forceRTL(false);
expect(I18nManager.isRTL).toBe(false);
expect(I18nManager.getConstants().isRTL).toBe(false);
expect(getDocumentDir()).toEqual('ltr');
});
test('when set to true, "isRTL" is true', () => {
I18nManager.forceRTL(true);
expect(I18nManager.isRTL).toBe(true);
expect(I18nManager.getConstants().isRTL).toBe(true);
expect(getDocumentDir()).toEqual('rtl');
});
});
@@ -41,11 +41,11 @@ describe('apis/I18nManager', () => {
test('when set to false, "doLeftAndRightSwapInRTL" is false', () => {
I18nManager.swapLeftAndRightInRTL(false);
expect(I18nManager.doLeftAndRightSwapInRTL).toBe(false);
expect(I18nManager.getConstants().doLeftAndRightSwapInRTL).toBe(false);
});
test('when set to true, "doLeftAndRightSwapInRTL" is true', () => {
I18nManager.swapLeftAndRightInRTL(true);
expect(I18nManager.doLeftAndRightSwapInRTL).toBe(true);
expect(I18nManager.getConstants().doLeftAndRightSwapInRTL).toBe(true);
});
});
});
@@ -61,7 +61,7 @@ describe('apis/I18nManager', () => {
describe('isRTL', () => {
test('is true', () => {
expect(I18nManager.isRTL).toBe(true);
expect(I18nManager.getConstants().isRTL).toBe(true);
expect(getDocumentDir()).toEqual('rtl');
});
});
@@ -73,12 +73,12 @@ describe('apis/I18nManager', () => {
test('when set to false, "isRTL" is false', () => {
I18nManager.allowRTL(false);
expect(I18nManager.isRTL).toBe(false);
expect(I18nManager.getConstants().isRTL).toBe(false);
expect(getDocumentDir()).toEqual('ltr');
});
test('when set to true, "isRTL" is true', () => {
I18nManager.allowRTL(true);
expect(I18nManager.isRTL).toBe(true);
expect(I18nManager.getConstants().isRTL).toBe(true);
expect(getDocumentDir()).toEqual('rtl');
});
});
@@ -90,12 +90,12 @@ describe('apis/I18nManager', () => {
test('when set to false, "isRTL" is true', () => {
I18nManager.forceRTL(false);
expect(I18nManager.isRTL).toBe(true);
expect(I18nManager.getConstants().isRTL).toBe(true);
expect(getDocumentDir()).toEqual('rtl');
});
test('when set to true, "isRTL" is true', () => {
I18nManager.forceRTL(true);
expect(I18nManager.isRTL).toBe(true);
expect(I18nManager.getConstants().isRTL).toBe(true);
expect(getDocumentDir()).toEqual('rtl');
});
});
@@ -107,11 +107,11 @@ describe('apis/I18nManager', () => {
test('when set to false, "doLeftAndRightSwapInRTL" is false', () => {
I18nManager.swapLeftAndRightInRTL(false);
expect(I18nManager.doLeftAndRightSwapInRTL).toBe(false);
expect(I18nManager.getConstants().doLeftAndRightSwapInRTL).toBe(false);
});
test('when set to true, "doLeftAndRightSwapInRTL" is true', () => {
I18nManager.swapLeftAndRightInRTL(true);
expect(I18nManager.doLeftAndRightSwapInRTL).toBe(true);
expect(I18nManager.getConstants().doLeftAndRightSwapInRTL).toBe(true);
});
});
});
packages/react-native-web/src/exports/I18nManager/index.js
Vendored
+9 -8
View File
@@ -12,13 +12,17 @@ import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
type I18nManagerStatus = {
allowRTL: (allowRTL: boolean) => void,
doLeftAndRightSwapInRTL: boolean,
forceRTL: (forceRTL: boolean) => void,
isRTL: boolean,
getConstants: () => Constants,
setPreferredLanguageRTL: (setRTL: boolean) => void,
swapLeftAndRightInRTL: (flipStyles: boolean) => void
};
type Constants = {
doLeftAndRightSwapInRTL: boolean,
isRTL: boolean
};
let doLeftAndRightSwapInRTL = true;
let isPreferredLanguageRTL = false;
let isRTLAllowed = true;
@@ -48,18 +52,15 @@ const I18nManager: I18nManagerStatus = {
isRTLForced = bool;
onDirectionChange();
},
getConstants(): Constants {
return { doLeftAndRightSwapInRTL, isRTL: isRTL() };
},
setPreferredLanguageRTL(bool) {
isPreferredLanguageRTL = bool;
onDirectionChange();
},
swapLeftAndRightInRTL(bool) {
doLeftAndRightSwapInRTL = bool;
},
get doLeftAndRightSwapInRTL() {
return doLeftAndRightSwapInRTL;
},
get isRTL() {
return isRTL();
}
};
packages/react-native-web/src/exports/StyleSheet/createStyleResolver.js
Vendored
+2 -2
View File
@@ -54,7 +54,7 @@ export default function createStyleResolver() {
}
function _injectRegisteredStyle(id) {
const { doLeftAndRightSwapInRTL, isRTL } = I18nManager;
const { doLeftAndRightSwapInRTL, isRTL } = I18nManager.getConstants();
const dir = isRTL ? (doLeftAndRightSwapInRTL ? 'rtl' : 'rtlNoSwap') : 'ltr';
if (!inserted[dir][id]) {
const style = createCompileableStyle(i18nStyle(flattenStyle(id)));
@@ -145,7 +145,7 @@ export default function createStyleResolver() {
* Resolves a React Native style object
*/
function _resolveStyle(style, key) {
const { doLeftAndRightSwapInRTL, isRTL } = I18nManager;
const { doLeftAndRightSwapInRTL, isRTL } = I18nManager.getConstants();
const dir = isRTL ? (doLeftAndRightSwapInRTL ? 'rtl' : 'rtlNoSwap') : 'ltr';
// faster: memoized
packages/react-native-web/src/exports/StyleSheet/i18nStyle.js
Vendored
+11 -7
View File
@@ -4,7 +4,7 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @noflow
* @flow
*/
import I18nManager from '../I18nManager';
@@ -78,8 +78,8 @@ const PROPERTIES_VALUE = {
// Invert the sign of a numeric-like value
const additiveInverse = (value: String | Number) => multiplyStyleLengthValue(value, -1);
const i18nStyle = originalStyle => {
const { doLeftAndRightSwapInRTL, isRTL } = I18nManager;
const i18nStyle = (originalStyle: Object) => {
const { doLeftAndRightSwapInRTL, isRTL } = I18nManager.getConstants();
const style = originalStyle || emptyObject;
const frozenProps = {};
const nextStyle = {};
@@ -97,7 +97,7 @@ const i18nStyle = originalStyle => {
// convert start/end
const convertedProp = PROPERTIES_I18N[originalProp];
prop = isRTL ? PROPERTIES_FLIP[convertedProp] : convertedProp;
} else if (isRTL && doLeftAndRightSwapInRTL && PROPERTIES_FLIP[originalProp]) {
} else if (isRTL && doLeftAndRightSwapInRTL && (PROPERTIES_FLIP[originalProp]: any)) {
prop = PROPERTIES_FLIP[originalProp];
}
@@ -123,15 +123,19 @@ const i18nStyle = originalStyle => {
// convert start/end
const convertedValue = PROPERTIES_I18N[originalValue];
value = isRTL ? PROPERTIES_FLIP[convertedValue] : convertedValue;
} else if (isRTL && doLeftAndRightSwapInRTL && PROPERTIES_FLIP[originalValue]) {
value = PROPERTIES_FLIP[originalValue];
} else if (isRTL && doLeftAndRightSwapInRTL) {
const flippedValue = PROPERTIES_FLIP[(originalValue: any)];
if (flippedValue != null) {
value = flippedValue;
}
}
}
// Create finalized style
if (isRTL && prop === 'textShadowOffset') {
const invertedValue = additiveInverse((value: any).width);
(value: any).width = invertedValue;
nextStyle[prop] = value;
nextStyle[prop].width = additiveInverse(value.width);
} else if (!frozenProps[prop]) {
nextStyle[prop] = value;
}