Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add space-separated string support for fontVariant #34641

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Libraries/Components/View/ReactNativeStyleAttributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import type {AnyAttributeType} from '../../Renderer/shims/ReactNativeTypes';
import processColor from '../../StyleSheet/processColor';
import processFontVariant from '../../StyleSheet/processFontVariant';
import processTransform from '../../StyleSheet/processTransform';
import sizesDiffer from '../../Utilities/differ/sizesDiffer';

Expand Down Expand Up @@ -120,7 +121,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
fontFamily: true,
fontSize: true,
fontStyle: true,
fontVariant: true,
fontVariant: {process: processFontVariant},
fontWeight: true,
includeFontPadding: true,
letterSpacing: true,
Expand Down
56 changes: 29 additions & 27 deletions Libraries/StyleSheet/StyleSheetTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -579,40 +579,42 @@ export type ____FontWeight_Internal =
| '800'
| '900';

export type ____FontVariantArray_Internal = $ReadOnlyArray<
| 'small-caps'
| 'oldstyle-nums'
| 'lining-nums'
| 'tabular-nums'
| 'proportional-nums'
| 'stylistic-one'
| 'stylistic-two'
| 'stylistic-three'
| 'stylistic-four'
| 'stylistic-five'
| 'stylistic-six'
| 'stylistic-seven'
| 'stylistic-eight'
| 'stylistic-nine'
| 'stylistic-ten'
| 'stylistic-eleven'
| 'stylistic-twelve'
| 'stylistic-thirteen'
| 'stylistic-fourteen'
| 'stylistic-fifteen'
| 'stylistic-sixteen'
| 'stylistic-seventeen'
| 'stylistic-eighteen'
| 'stylistic-nineteen'
| 'stylistic-twenty',
>;

export type ____TextStyle_InternalCore = $ReadOnly<{
...$Exact<____ViewStyle_Internal>,
color?: ____ColorValue_Internal,
fontFamily?: string,
fontSize?: number,
fontStyle?: 'normal' | 'italic',
fontWeight?: ____FontWeight_Internal,
fontVariant?: $ReadOnlyArray<
| 'small-caps'
| 'oldstyle-nums'
| 'lining-nums'
| 'tabular-nums'
| 'proportional-nums'
| 'stylistic-one'
| 'stylistic-two'
| 'stylistic-three'
| 'stylistic-four'
| 'stylistic-five'
| 'stylistic-six'
| 'stylistic-seven'
| 'stylistic-eight'
| 'stylistic-nine'
| 'stylistic-ten'
| 'stylistic-eleven'
| 'stylistic-twelve'
| 'stylistic-thirteen'
| 'stylistic-fourteen'
| 'stylistic-fifteen'
| 'stylistic-sixteen'
| 'stylistic-seventeen'
| 'stylistic-eighteen'
| 'stylistic-nineteen'
| 'stylistic-twenty',
>,
fontVariant?: ____FontVariantArray_Internal | string,
textShadowOffset?: $ReadOnly<{
width: number,
height: number,
Expand Down
50 changes: 50 additions & 0 deletions Libraries/StyleSheet/__tests__/processFontVariant-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @format
* @emails oncall+react_native
*/

'use strict';

const processFontVariant = require('../processFontVariant');

describe('processFontVariant', () => {
it('should accept arrays', () => {
expect(processFontVariant([])).toEqual([]);
expect(processFontVariant(['oldstyle-nums'])).toEqual(['oldstyle-nums']);
expect(processFontVariant(['proportional-nums', 'lining-nums'])).toEqual([
'proportional-nums',
'lining-nums',
]);
});

it('should accept string values', () => {
expect(processFontVariant('oldstyle-nums')).toEqual(['oldstyle-nums']);
expect(processFontVariant('lining-nums ')).toEqual(['lining-nums']);
expect(processFontVariant(' tabular-nums')).toEqual(['tabular-nums']);
});

it('should accept string with multiple values', () => {
expect(processFontVariant('oldstyle-nums lining-nums')).toEqual([
'oldstyle-nums',
'lining-nums',
]);
expect(
processFontVariant('proportional-nums oldstyle-nums lining-nums'),
).toEqual(['proportional-nums', 'oldstyle-nums', 'lining-nums']);
expect(
processFontVariant(
' small-caps proportional-nums oldstyle-nums lining-nums',
),
).toEqual([
'small-caps',
'proportional-nums',
'oldstyle-nums',
'lining-nums',
]);
});
});
34 changes: 34 additions & 0 deletions Libraries/StyleSheet/processFontVariant.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @format
* @flow
*/

'use strict';

import type {____FontVariantArray_Internal} from './StyleSheetTypes';

function processFontVariant(
fontVariant: ____FontVariantArray_Internal | string,
): ?____FontVariantArray_Internal {
if (Array.isArray(fontVariant)) {
return fontVariant;
}

// $FlowFixMe[incompatible-type]
const match: ?____FontVariantArray_Internal = fontVariant
.split(' ')
.filter(Boolean);

if (!match) {
return;
}

return match;
}

module.exports = processFontVariant;