Use iOS global tokens from pipeline (#2242)

* Add tokens-global.ios.ts

* Bump design tokens package to include colors

* Fix tester error (copied Android fix)

* Change files

* Update theme-tokens package.json

* Fixed Badge tint-severe colors

* Attempt to use win32 as platform

* Bump @rnx-kit/jest-preset package

* yarn test -u (snapshots update from windows to win32)

* Remove console.log statements

* Change files

* Split buttonTokens into platform specific files + fix bad merge

* Make badge tests run on win32 instead of ios

* Change files

* Revert "Change files"

This reverts commit 364d33f5ba.

* Revert "Make badge tests run on win32 instead of ios"

This reverts commit fe55c0120f.

* Update snapshots (changes are the differences between ios and windows tokens)

* Change files

Co-authored-by: Valentyna Kozlova <vkozlova@microsoft.com>
This commit is contained in:
lyzhan7 2022-10-25 15:27:12 -07:00 коммит произвёл GitHub
Родитель a50447f551
Коммит 1e46feedf3
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
30 изменённых файлов: 1112 добавлений и 889 удалений

Просмотреть файл

@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Add tokens-global.ios.ts",
"packageName": "@fluentui-react-native/apple-theme",
"email": "78454019+lyzhan7@users.noreply.github.com",
"dependentChangeType": "patch"
}

Просмотреть файл

@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update snapshots (changes are the differences between ios and windows tokens)",
"packageName": "@fluentui-react-native/badge",
"email": "78454019+lyzhan7@users.noreply.github.com",
"dependentChangeType": "patch"
}

Просмотреть файл

@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Add tokens-global.ios.ts",
"packageName": "@fluentui-react-native/button",
"email": "78454019+lyzhan7@users.noreply.github.com",
"dependentChangeType": "patch"
}

Просмотреть файл

@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Switch platform for tests from ios to win32",
"packageName": "@fluentui-react-native/default-theme",
"email": "78454019+lyzhan7@users.noreply.github.com",
"dependentChangeType": "patch"
}

Просмотреть файл

@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update snapshots (changes are the differences between ios and windows tokens)",
"packageName": "@fluentui-react-native/menu-button",
"email": "78454019+lyzhan7@users.noreply.github.com",
"dependentChangeType": "patch"
}

Просмотреть файл

@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update snapshots (changes are the differences between ios and windows tokens)",
"packageName": "@fluentui-react-native/menu",
"email": "78454019+lyzhan7@users.noreply.github.com",
"dependentChangeType": "patch"
}

Просмотреть файл

@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update snapshots (changes are the differences between ios and windows tokens)",
"packageName": "@fluentui-react-native/notification",
"email": "78454019+lyzhan7@users.noreply.github.com",
"dependentChangeType": "patch"
}

Просмотреть файл

@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Add tokens-global.ios.ts",
"packageName": "@fluentui-react-native/theme-tokens",
"email": "78454019+lyzhan7@users.noreply.github.com",
"dependentChangeType": "patch"
}

Просмотреть файл

@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Switch platform for tests from ios to win32",
"packageName": "@fluentui-react-native/win32-theme",
"email": "78454019+lyzhan7@users.noreply.github.com",
"dependentChangeType": "patch"
}

Просмотреть файл

@ -11,13 +11,13 @@ exports[`Badge component tests Badge all props 1`] = `
"backgroundColor": "transparent",
"borderColor": "transparent",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"bottom": 0,
"flexDirection": "row",
"justifyContent": "center",
"minHeight": 24,
"minWidth": 24,
"paddingHorizontal": 4,
"paddingHorizontal": 8,
"position": "relative",
"right": 0,
"width": undefined,
@ -46,10 +46,10 @@ exports[`Badge component tests Badge all props 1`] = `
Object {
"color": "#ffffff",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontWeight": "400",
"margin": 0,
"marginEnd": 2,
"marginEnd": 4,
}
}
>
@ -73,7 +73,7 @@ exports[`Badge component tests Badge tokens 1`] = `
"justifyContent": "center",
"minHeight": 24,
"minWidth": 24,
"paddingHorizontal": 4,
"paddingHorizontal": 8,
"position": "relative",
"right": 0,
"width": undefined,
@ -88,7 +88,7 @@ exports[`Badge component tests Badge tokens 1`] = `
Object {
"color": "#ffffff",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontWeight": "400",
"margin": 0,
}
@ -108,13 +108,13 @@ exports[`Badge component tests Empty Badge 1`] = `
"backgroundColor": "#0078d4",
"borderColor": "transparent",
"borderRadius": 9999,
"borderWidth": 1,
"borderWidth": 1.5,
"bottom": 0,
"flexDirection": "row",
"justifyContent": "center",
"minHeight": 24,
"minWidth": 24,
"paddingHorizontal": 4,
"paddingHorizontal": 8,
"position": "relative",
"right": 0,
"width": undefined,
@ -135,12 +135,12 @@ exports[`CounterBadge component tests CounterBadge all props 1`] = `
"backgroundColor": "transparent",
"borderColor": "transparent",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"bottom": 0,
"flexDirection": "row",
"justifyContent": "center",
"minHeight": 24,
"paddingHorizontal": 4,
"paddingHorizontal": 8,
"right": 0,
"width": undefined,
}
@ -167,7 +167,7 @@ exports[`CounterBadge component tests CounterBadge all props 1`] = `
Object {
"color": "#ffffff",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontStyle": undefined,
"fontWeight": "400",
"letterSpacing": undefined,
@ -192,12 +192,12 @@ exports[`CounterBadge component tests CounterBadge shows 99+ 1`] = `
"backgroundColor": "#0078d4",
"borderColor": "transparent",
"borderRadius": 9999,
"borderWidth": 1,
"borderWidth": 1.5,
"bottom": 0,
"flexDirection": "row",
"justifyContent": "center",
"minHeight": 24,
"paddingHorizontal": 4,
"paddingHorizontal": 8,
"right": 0,
"width": undefined,
}
@ -210,7 +210,7 @@ exports[`CounterBadge component tests CounterBadge shows 99+ 1`] = `
Object {
"color": "#ffffff",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontStyle": undefined,
"fontWeight": "400",
"letterSpacing": undefined,
@ -235,12 +235,12 @@ exports[`CounterBadge component tests CounterBadge shows 1000+ 1`] = `
"backgroundColor": "#0078d4",
"borderColor": "transparent",
"borderRadius": 9999,
"borderWidth": 1,
"borderWidth": 1.5,
"bottom": 0,
"flexDirection": "row",
"justifyContent": "center",
"minHeight": 24,
"paddingHorizontal": 4,
"paddingHorizontal": 8,
"right": 0,
"width": undefined,
}
@ -253,7 +253,7 @@ exports[`CounterBadge component tests CounterBadge shows 1000+ 1`] = `
Object {
"color": "#ffffff",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontStyle": undefined,
"fontWeight": "400",
"letterSpacing": undefined,
@ -279,12 +279,12 @@ exports[`CounterBadge component tests CounterBadge shows zero 1`] = `
"backgroundColor": "#0078d4",
"borderColor": "transparent",
"borderRadius": 9999,
"borderWidth": 1,
"borderWidth": 1.5,
"bottom": 0,
"flexDirection": "row",
"justifyContent": "center",
"minHeight": 24,
"paddingHorizontal": 4,
"paddingHorizontal": 8,
"right": 0,
"width": undefined,
}
@ -297,7 +297,7 @@ exports[`CounterBadge component tests CounterBadge shows zero 1`] = `
Object {
"color": "#ffffff",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontStyle": undefined,
"fontWeight": "400",
"letterSpacing": undefined,
@ -327,7 +327,7 @@ exports[`CounterBadge component tests CounterBadge tokens 1`] = `
"flexDirection": "row",
"justifyContent": "center",
"minHeight": 24,
"paddingHorizontal": 4,
"paddingHorizontal": 8,
"right": 0,
"width": undefined,
}
@ -340,7 +340,7 @@ exports[`CounterBadge component tests CounterBadge tokens 1`] = `
Object {
"color": "#ffffff",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontStyle": undefined,
"fontWeight": "400",
"letterSpacing": undefined,
@ -371,13 +371,13 @@ exports[`PresenceBadge component tests PresenceBadge props 1`] = `
"borderColor": "#ffffff",
"borderRadius": 9999,
"borderWidth": 2,
"bottom": -2,
"bottom": -4,
"flexDirection": "row",
"height": 24,
"justifyContent": "center",
"paddingHorizontal": 4,
"paddingHorizontal": 8,
"position": "relative",
"right": -2,
"right": -4,
"width": 24,
}
}

Просмотреть файл

@ -0,0 +1,86 @@
import { Theme } from '@fluentui-react-native/framework';
import { globalTokens } from '@fluentui-react-native/theme-tokens';
import { TokenSettings } from '@fluentui-react-native/use-styling';
import { ButtonTokens } from './Button.types';
export const defaultButtonTokens: TokenSettings<ButtonTokens, Theme> = () =>
({
block: {
width: '100%',
},
medium: {
padding: globalTokens.spacing.xs,
borderWidth: globalTokens.stroke.width.thin,
iconSize: 16,
focused: {
borderWidth: 0,
padding: globalTokens.spacing.sNudge,
},
hasContent: {
minWidth: 96,
paddingHorizontal: globalTokens.spacing.m - globalTokens.stroke.width.thin,
hasIconAfter: {
spacingIconContentAfter: globalTokens.spacing.sNudge,
},
hasIconBefore: {
spacingIconContentBefore: globalTokens.spacing.sNudge,
},
focused: {
paddingHorizontal: globalTokens.spacing.m,
},
},
},
small: {
padding: globalTokens.spacing.xs - globalTokens.stroke.width.thin,
borderWidth: globalTokens.stroke.width.thin,
iconSize: 16,
focused: {
borderWidth: 0,
padding: globalTokens.spacing.xs,
},
hasContent: {
minWidth: 64,
paddingHorizontal: globalTokens.spacing.s - globalTokens.stroke.width.thin,
hasIconAfter: {
spacingIconContentAfter: globalTokens.spacing.xs,
},
hasIconBefore: {
spacingIconContentBefore: globalTokens.spacing.xs,
},
focused: {
paddingHorizontal: globalTokens.spacing.s,
},
},
},
large: {
padding: globalTokens.spacing.s - globalTokens.stroke.width.thin,
borderWidth: globalTokens.stroke.width.thin,
iconSize: 20,
focused: {
borderWidth: 0,
padding: globalTokens.spacing.s,
},
hasContent: {
minWidth: 96,
paddingHorizontal: globalTokens.spacing.l - globalTokens.stroke.width.thin,
hasIconAfter: {
spacingIconContentAfter: globalTokens.spacing.sNudge,
},
hasIconBefore: {
spacingIconContentBefore: globalTokens.spacing.sNudge,
},
focused: {
paddingHorizontal: globalTokens.spacing.l,
},
},
},
rounded: {
borderRadius: globalTokens.corner.radius.medium,
},
circular: {
borderRadius: globalTokens.corner.radius.circle,
},
square: {
borderRadius: globalTokens.corner.radius.none,
},
} as ButtonTokens);

Просмотреть файл

@ -0,0 +1,86 @@
import { Theme } from '@fluentui-react-native/framework';
import { globalTokens } from '@fluentui-react-native/theme-tokens';
import { TokenSettings } from '@fluentui-react-native/use-styling';
import { ButtonTokens } from './Button.types';
export const defaultButtonTokens: TokenSettings<ButtonTokens, Theme> = () =>
({
block: {
width: '100%',
},
medium: {
padding: globalTokens.spacing.xs,
borderWidth: globalTokens.stroke.width.thin,
iconSize: 16,
focused: {
borderWidth: 0,
padding: globalTokens.spacing.sNudge,
},
hasContent: {
minWidth: 96,
paddingHorizontal: globalTokens.spacing.m - globalTokens.stroke.width.thin,
hasIconAfter: {
spacingIconContentAfter: globalTokens.spacing.sNudge,
},
hasIconBefore: {
spacingIconContentBefore: globalTokens.spacing.sNudge,
},
focused: {
paddingHorizontal: globalTokens.spacing.m,
},
},
},
small: {
padding: globalTokens.spacing.xs - globalTokens.stroke.width.thin,
borderWidth: globalTokens.stroke.width.thin,
iconSize: 16,
focused: {
borderWidth: 0,
padding: globalTokens.spacing.xs,
},
hasContent: {
minWidth: 64,
paddingHorizontal: globalTokens.spacing.s - globalTokens.stroke.width.thin,
hasIconAfter: {
spacingIconContentAfter: globalTokens.spacing.xs,
},
hasIconBefore: {
spacingIconContentBefore: globalTokens.spacing.xs,
},
focused: {
paddingHorizontal: globalTokens.spacing.s,
},
},
},
large: {
padding: globalTokens.spacing.s - globalTokens.stroke.width.thin,
borderWidth: globalTokens.stroke.width.thin,
iconSize: 20,
focused: {
borderWidth: 0,
padding: globalTokens.spacing.s,
},
hasContent: {
minWidth: 96,
paddingHorizontal: globalTokens.spacing.l - globalTokens.stroke.width.thin,
hasIconAfter: {
spacingIconContentAfter: globalTokens.spacing.sNudge,
},
hasIconBefore: {
spacingIconContentBefore: globalTokens.spacing.sNudge,
},
focused: {
paddingHorizontal: globalTokens.spacing.l,
},
},
},
rounded: {
borderRadius: globalTokens.corner.radius.medium,
},
circular: {
borderRadius: globalTokens.corner.radius.circle,
},
square: {
borderRadius: globalTokens.corner.radius.none,
},
} as ButtonTokens);

Просмотреть файл

@ -2,7 +2,6 @@ import { Theme } from '@fluentui-react-native/framework';
import { globalTokens } from '@fluentui-react-native/theme-tokens';
import { TokenSettings } from '@fluentui-react-native/use-styling';
import { ButtonTokens } from './Button.types';
import { Platform } from 'react-native';
export const defaultButtonTokens: TokenSettings<ButtonTokens, Theme> = () =>
({
@ -10,10 +9,7 @@ export const defaultButtonTokens: TokenSettings<ButtonTokens, Theme> = () =>
width: '100%',
},
medium: {
padding: Platform.select({
android: globalTokens.spacing.xs,
default: globalTokens.spacing.sNudge - globalTokens.stroke.width.thin,
}),
padding: globalTokens.spacing.sNudge - globalTokens.stroke.width.thin,
borderWidth: globalTokens.stroke.width.thin,
iconSize: 16,
focused: {

Просмотреть файл

@ -24,13 +24,13 @@ exports[`CompoundButton default 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 11,
"paddingHorizontal": 11,
"padding": 14.5,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -50,7 +50,7 @@ exports[`CompoundButton default 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -68,7 +68,7 @@ exports[`CompoundButton default 1`] = `
style={
Object {
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontWeight": "400",
"margin": 0,
"marginBottom": 0,

Просмотреть файл

@ -27,7 +27,7 @@ exports[`Custom FAB with no shadow(iOS) 1`] = `
"justifyContent": "center",
"minHeight": 56,
"minWidth": 56,
"padding": 16,
"padding": 20,
"width": undefined,
}
}
@ -39,7 +39,7 @@ exports[`Custom FAB with no shadow(iOS) 1`] = `
Object {
"color": "#ffffff",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontWeight": "400",
"margin": 0,
"marginBottom": 0,
@ -126,7 +126,7 @@ exports[`Default FAB (iOS) 1`] = `
"justifyContent": "center",
"minHeight": 56,
"minWidth": 56,
"padding": 16,
"padding": 20,
"paddingBottom": undefined,
"paddingEnd": undefined,
"paddingHorizontal": undefined,
@ -153,7 +153,7 @@ exports[`Default FAB (iOS) 1`] = `
Object {
"color": "#ffffff",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontWeight": "400",
"margin": 0,
"marginBottom": 0,

Просмотреть файл

@ -37,13 +37,13 @@ exports[`ToggleButton default 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -55,7 +55,7 @@ exports[`ToggleButton default 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,

Просмотреть файл

@ -25,13 +25,13 @@ exports[`Button component tests Button circular 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 9999,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -43,7 +43,7 @@ exports[`Button component tests Button circular 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -82,13 +82,13 @@ exports[`Button component tests Button composed 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -98,7 +98,7 @@ exports[`Button component tests Button composed 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"letterSpacing": undefined,
"lineHeight": undefined,
@ -138,13 +138,13 @@ exports[`Button component tests Button customized 1`] = `
"backgroundColor": "pink",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -156,7 +156,7 @@ exports[`Button component tests Button customized 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -195,13 +195,13 @@ exports[`Button component tests Button default 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -213,7 +213,7 @@ exports[`Button component tests Button default 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -257,13 +257,13 @@ exports[`Button component tests Button disabled 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#f3f2f1",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -275,7 +275,7 @@ exports[`Button component tests Button disabled 1`] = `
Object {
"color": "#a19f9d",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -315,13 +315,13 @@ exports[`Button component tests Button large 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 7,
"paddingHorizontal": 15,
"padding": 10.5,
"paddingHorizontal": 18.5,
"width": undefined,
}
}
@ -333,7 +333,7 @@ exports[`Button component tests Button large 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 16,
"fontSize": 17,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -373,13 +373,13 @@ exports[`Button component tests Button primary 1`] = `
"backgroundColor": "#0078d4",
"borderColor": "#005a9e",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -391,7 +391,7 @@ exports[`Button component tests Button primary 1`] = `
Object {
"color": "#ffffff",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -431,13 +431,13 @@ exports[`Button component tests Button small 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 64,
"padding": 3,
"paddingHorizontal": 7,
"padding": 6.5,
"paddingHorizontal": 10.5,
"width": undefined,
}
}
@ -449,7 +449,7 @@ exports[`Button component tests Button small 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontWeight": "400",
"margin": 0,
"marginBottom": 0,
@ -489,13 +489,13 @@ exports[`Button component tests Button square 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 0,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -507,7 +507,7 @@ exports[`Button component tests Button square 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -547,13 +547,13 @@ exports[`Button component tests Button subtle 1`] = `
"backgroundColor": "#ffffff",
"borderColor": "#ffffff",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -565,7 +565,7 @@ exports[`Button component tests Button subtle 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,

Просмотреть файл

@ -55,7 +55,7 @@ exports[`Button default 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 12,
"fontSize": 13,
"fontWeight": "400",
"margin": 0,
"marginEnd": 2,

Просмотреть файл

@ -32,13 +32,13 @@ exports[`Checkbox component tests Menu default 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -50,7 +50,7 @@ exports[`Checkbox component tests Menu default 1`] = `
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -98,13 +98,13 @@ Array [
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -116,7 +116,7 @@ Array [
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -158,7 +158,7 @@ Array [
"display": "flex",
"maxWidth": 300,
"minWidth": 128,
"padding": 4,
"padding": 8,
}
}
>
@ -194,7 +194,6 @@ Array [
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -206,7 +205,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -244,11 +243,10 @@ Array [
"borderRadius": 4,
"display": "flex",
"flexDirection": "row",
"marginTop": 2,
"marginTop": 4,
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -260,7 +258,7 @@ Array [
"color": "#bdbdbd",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -308,13 +306,13 @@ Array [
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -326,7 +324,7 @@ Array [
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -374,7 +372,7 @@ Array [
"display": "flex",
"maxWidth": 300,
"minWidth": 128,
"padding": 4,
"padding": 8,
}
}
>
@ -410,7 +408,6 @@ Array [
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -422,7 +419,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -470,13 +467,13 @@ Array [
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -488,7 +485,7 @@ Array [
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -536,7 +533,7 @@ Array [
"display": "flex",
"maxWidth": 300,
"minWidth": 128,
"padding": 4,
"padding": 8,
}
}
>
@ -580,7 +577,6 @@ Array [
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -601,7 +597,7 @@ Array [
"borderWidth": 0,
},
Object {
"marginEnd": 4,
"marginEnd": 8,
},
Object {
"flex": 0,
@ -644,7 +640,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -658,8 +654,8 @@ Array [
Object {
"backgroundColor": "#d1d1d1",
"display": "flex",
"height": 1,
"margin": 2,
"height": 1.5,
"margin": 4,
"marginVertical": undefined,
"width": undefined,
}
@ -702,11 +698,10 @@ Array [
"borderRadius": 4,
"display": "flex",
"flexDirection": "row",
"marginTop": 2,
"marginTop": 4,
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -727,7 +722,7 @@ Array [
"borderWidth": 0,
},
Object {
"marginEnd": 4,
"marginEnd": 8,
},
Object {
"flex": 0,
@ -770,7 +765,7 @@ Array [
"color": "#bdbdbd",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -818,13 +813,13 @@ Array [
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -836,7 +831,7 @@ Array [
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -884,7 +879,7 @@ Array [
"display": "flex",
"maxWidth": 300,
"minWidth": 128,
"padding": 4,
"padding": 8,
}
}
>
@ -928,7 +923,6 @@ Array [
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -949,7 +943,7 @@ Array [
"borderWidth": 0,
},
Object {
"marginEnd": 4,
"marginEnd": 8,
},
Object {
"flex": 0,
@ -992,7 +986,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -1006,8 +1000,8 @@ Array [
Object {
"backgroundColor": "#d1d1d1",
"display": "flex",
"height": 1,
"margin": 2,
"height": 1.5,
"margin": 4,
"marginVertical": undefined,
"width": undefined,
}
@ -1050,11 +1044,10 @@ Array [
"borderRadius": 4,
"display": "flex",
"flexDirection": "row",
"marginTop": 2,
"marginTop": 4,
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -1075,7 +1068,7 @@ Array [
"borderWidth": 0,
},
Object {
"marginEnd": 4,
"marginEnd": 8,
},
Object {
"flex": 0,
@ -1118,7 +1111,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -1166,13 +1159,13 @@ Array [
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -1184,7 +1177,7 @@ Array [
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -1232,7 +1225,7 @@ Array [
"display": "flex",
"maxWidth": 300,
"minWidth": 128,
"padding": 4,
"padding": 8,
}
}
>
@ -1276,7 +1269,6 @@ Array [
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -1297,7 +1289,7 @@ Array [
"borderWidth": 0,
},
Object {
"marginEnd": 4,
"marginEnd": 8,
},
Object {
"flex": 0,
@ -1340,7 +1332,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -1354,8 +1346,8 @@ Array [
Object {
"backgroundColor": "#d1d1d1",
"display": "flex",
"height": 1,
"margin": 2,
"height": 1.5,
"margin": 4,
"marginVertical": undefined,
"width": undefined,
}
@ -1398,11 +1390,10 @@ Array [
"borderRadius": 4,
"display": "flex",
"flexDirection": "row",
"marginTop": 2,
"marginTop": 4,
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -1423,7 +1414,7 @@ Array [
"borderWidth": 0,
},
Object {
"marginEnd": 4,
"marginEnd": 8,
},
Object {
"flex": 0,
@ -1466,7 +1457,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -1514,13 +1505,13 @@ Array [
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -1532,7 +1523,7 @@ Array [
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -1580,7 +1571,7 @@ Array [
"display": "flex",
"maxWidth": 300,
"minWidth": 128,
"padding": 4,
"padding": 8,
}
}
>
@ -1624,7 +1615,6 @@ Array [
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -1645,7 +1635,7 @@ Array [
"borderWidth": 0,
},
Object {
"marginEnd": 4,
"marginEnd": 8,
},
Object {
"flex": 0,
@ -1688,7 +1678,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -1734,11 +1724,10 @@ Array [
"borderRadius": 4,
"display": "flex",
"flexDirection": "row",
"marginTop": 2,
"marginTop": 4,
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -1759,7 +1748,7 @@ Array [
"borderWidth": 0,
},
Object {
"marginEnd": 4,
"marginEnd": 8,
},
Object {
"flex": 0,
@ -1802,7 +1791,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -1850,13 +1839,13 @@ Array [
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
"width": undefined,
}
}
@ -1868,7 +1857,7 @@ Array [
Object {
"color": "#323130",
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "600",
"margin": 0,
"marginBottom": 0,
@ -1916,7 +1905,7 @@ Array [
"display": "flex",
"maxWidth": 300,
"minWidth": 128,
"padding": 4,
"padding": 8,
}
}
>
@ -1952,7 +1941,6 @@ Array [
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -1964,7 +1952,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}
@ -2008,7 +1996,6 @@ Array [
"maxWidth": 300,
"minHeight": 32,
"minWidth": 160,
"padding": 6,
}
}
>
@ -2020,7 +2007,7 @@ Array [
"color": "#424242",
"flexGrow": 1,
"fontFamily": "System",
"fontSize": 14,
"fontSize": 15,
"fontWeight": "400",
"margin": 0,
}

Просмотреть файл

@ -25,11 +25,11 @@ exports[`ContextualMenu default 1`] = `
"backgroundColor": "#f3f2f1",
"borderColor": "#8a8886",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"padding": 5,
"padding": 8,
"width": undefined,
}
}

Просмотреть файл

@ -191,14 +191,14 @@ exports[`Notification component tests Notification default 1`] = `
"backgroundColor": "transparent",
"borderColor": "#ffffff",
"borderRadius": 4,
"borderWidth": 1,
"borderWidth": 1.5,
"display": "flex",
"flexDirection": "row",
"justifyContent": "center",
"marginStart": 16,
"minWidth": 96,
"padding": 5,
"paddingHorizontal": 11,
"padding": 8,
"paddingHorizontal": 14.5,
}
}
>

Просмотреть файл

@ -32,7 +32,7 @@
},
"dependencies": {
"@fluentui-react-native/default-theme": ">=0.16.6 <1.0.0",
"@fluentui-react-native/design-tokens-ios": "^0.23.0",
"@fluentui-react-native/design-tokens-ios": "^0.26.0",
"@fluentui-react-native/design-tokens-macos": "^0.13.0",
"@fluentui-react-native/memo-cache": "^1.1.7",
"@fluentui-react-native/theme": ">=0.7.6 <1.0.0",

Просмотреть файл

@ -798,8 +798,8 @@ Object {
"brandForegroundLinkSelected": "#2899f5",
"brandStroke1": "#2899f5",
"brandStroke2": "#004c87",
"brandedBackground": "#2899f5",
"brandedBorder": "#6cb8f6",
"brandedBackground": "#2b88d8",
"brandedBorder": "#deecf9",
"brandedCheckedBackground": "#484644",
"brandedCheckedContent": "#faf9f8",
"brandedCheckedHoveredBackground": "#292827",
@ -809,18 +809,18 @@ Object {
"brandedDisabledBorder": "#252423",
"brandedDisabledContent": "#3b3a39",
"brandedDisabledIcon": "#3b3a39",
"brandedFocusedBackground": "#3aa0f3",
"brandedFocusedBackground": "#c7e0f4",
"brandedFocusedBorder": "#82c7ff",
"brandedFocusedContent": "#1b1a19",
"brandedFocusedIcon": "#1b1a19",
"brandedFocusedSecondaryContent": "#201f1e",
"brandedHoveredBackground": "#3aa0f3",
"brandedHoveredBackground": "#c7e0f4",
"brandedHoveredBorder": "#82c7ff",
"brandedHoveredContent": "#1b1a19",
"brandedHoveredIcon": "#1b1a19",
"brandedHoveredSecondaryContent": "#201f1e",
"brandedIcon": "#1b1a19",
"brandedPressedBackground": "#6cb8f6",
"brandedPressedBackground": "#deecf9",
"brandedPressedBorder": "#82c7ff",
"brandedPressedContent": "#1b1a19",
"brandedPressedIcon": "#1b1a19",
@ -841,7 +841,7 @@ Object {
"buttonTextDisabled": "#797775",
"buttonTextHovered": "#f3f2f1",
"buttonTextPressed": "#faf9f8",
"checkboxBackground": "#2899f5",
"checkboxBackground": "#2b88d8",
"checkboxBackgroundDisabled": "#252423",
"checkboxBorderColor": "#979693",
"checkmarkColor": "#1b1a19",
@ -920,18 +920,18 @@ Object {
"ghostPressedSecondaryContent": "#a19f9d",
"ghostSecondaryContent": "#a19f9d",
"inputBackground": "#1b1a19",
"inputBackgroundChecked": "#2899f5",
"inputBackgroundCheckedHovered": "#3aa0f3",
"inputBackgroundChecked": "#2b88d8",
"inputBackgroundCheckedHovered": "#c7e0f4",
"inputBorder": "#797775",
"inputBorderHovered": "#f3f2f1",
"inputFocusBorderAlt": "#2899f5",
"inputFocusBorderAlt": "#2b88d8",
"inputForegroundChecked": "#1b1a19",
"inputPlaceholderText": "#a19f9d",
"inputText": "#f3f2f1",
"inputTextHovered": "#faf9f8",
"link": "#2899f5",
"link": "#2b88d8",
"linkHovered": "#82c7ff",
"linkPressed": "#6cb8f6",
"linkPressed": "#deecf9",
"listBackground": "#1b1a19",
"listHeaderBackgroundHovered": "#252423",
"listHeaderBackgroundPressed": "#292827",
@ -942,7 +942,7 @@ Object {
"menuBackground": "#252423",
"menuDivider": "#484644",
"menuHeader": "#ffffff",
"menuIcon": "#3aa0f3",
"menuIcon": "#c7e0f4",
"menuItemBackgroundHovered": "#323130",
"menuItemBackgroundPressed": "#3b3a39",
"menuItemText": "#f3f2f1",
@ -1012,12 +1012,12 @@ Object {
"neutralStrokeAccessiblePressed": "#b3b3b3",
"neutralStrokeAccessibleSelected": "#3aa0f3",
"neutralStrokeDisabled": "#424242",
"personaActivityGlow": "#2899f5",
"personaActivityGlow": "#2b88d8",
"personaActivityRing": "#1b1a19",
"primaryButtonBackground": "#2899f5",
"primaryButtonBackground": "#2b88d8",
"primaryButtonBackgroundDisabled": "#252423",
"primaryButtonBackgroundHovered": "#3aa0f3",
"primaryButtonBackgroundPressed": "#6cb8f6",
"primaryButtonBackgroundHovered": "#c7e0f4",
"primaryButtonBackgroundPressed": "#deecf9",
"primaryButtonBorder": "transparent",
"primaryButtonBorderFocused": "transparent",
"primaryButtonText": "#1b1a19",
@ -1246,13 +1246,13 @@ Object {
"serif": "System",
},
"sizes": Object {
"body": 14,
"caption": 10,
"body": 15,
"caption": 12,
"header": 20,
"hero": 28,
"heroLarge": 40,
"secondary": 12,
"subheader": 16,
"heroLarge": 60,
"secondary": 13,
"subheader": 17,
},
"variants": Object {
"body1": Object {
@ -1426,8 +1426,8 @@ Object {
"brandForegroundLinkSelected": "#2899f5",
"brandStroke1": "#2899f5",
"brandStroke2": "#004c87",
"brandedBackground": "#2899f5",
"brandedBorder": "#6cb8f6",
"brandedBackground": "#2b88d8",
"brandedBorder": "#deecf9",
"brandedCheckedBackground": "#484644",
"brandedCheckedContent": "#faf9f8",
"brandedCheckedHoveredBackground": "#292827",
@ -1437,18 +1437,18 @@ Object {
"brandedDisabledBorder": "#252423",
"brandedDisabledContent": "#3b3a39",
"brandedDisabledIcon": "#3b3a39",
"brandedFocusedBackground": "#3aa0f3",
"brandedFocusedBackground": "#c7e0f4",
"brandedFocusedBorder": "#82c7ff",
"brandedFocusedContent": "#1b1a19",
"brandedFocusedIcon": "#1b1a19",
"brandedFocusedSecondaryContent": "#201f1e",
"brandedHoveredBackground": "#3aa0f3",
"brandedHoveredBackground": "#c7e0f4",
"brandedHoveredBorder": "#82c7ff",
"brandedHoveredContent": "#1b1a19",
"brandedHoveredIcon": "#1b1a19",
"brandedHoveredSecondaryContent": "#201f1e",
"brandedIcon": "#1b1a19",
"brandedPressedBackground": "#6cb8f6",
"brandedPressedBackground": "#deecf9",
"brandedPressedBorder": "#82c7ff",
"brandedPressedContent": "#1b1a19",
"brandedPressedIcon": "#1b1a19",
@ -1469,7 +1469,7 @@ Object {
"buttonTextDisabled": "#797775",
"buttonTextHovered": "#f3f2f1",
"buttonTextPressed": "#faf9f8",
"checkboxBackground": "#2899f5",
"checkboxBackground": "#2b88d8",
"checkboxBackgroundDisabled": "#252423",
"checkboxBorderColor": "#979693",
"checkmarkColor": "#1b1a19",
@ -1548,18 +1548,18 @@ Object {
"ghostPressedSecondaryContent": "#a19f9d",
"ghostSecondaryContent": "#a19f9d",
"inputBackground": "#1b1a19",
"inputBackgroundChecked": "#2899f5",
"inputBackgroundCheckedHovered": "#3aa0f3",
"inputBackgroundChecked": "#2b88d8",
"inputBackgroundCheckedHovered": "#c7e0f4",
"inputBorder": "#797775",
"inputBorderHovered": "#f3f2f1",
"inputFocusBorderAlt": "#2899f5",
"inputFocusBorderAlt": "#2b88d8",
"inputForegroundChecked": "#1b1a19",
"inputPlaceholderText": "#a19f9d",
"inputText": "#f3f2f1",
"inputTextHovered": "#faf9f8",
"link": "#2899f5",
"link": "#2b88d8",
"linkHovered": "#82c7ff",
"linkPressed": "#6cb8f6",
"linkPressed": "#deecf9",
"listBackground": "#1b1a19",
"listHeaderBackgroundHovered": "#252423",
"listHeaderBackgroundPressed": "#292827",
@ -1570,7 +1570,7 @@ Object {
"menuBackground": "#252423",
"menuDivider": "#484644",
"menuHeader": "#ffffff",
"menuIcon": "#3aa0f3",
"menuIcon": "#c7e0f4",
"menuItemBackgroundHovered": "#323130",
"menuItemBackgroundPressed": "#3b3a39",
"menuItemText": "#f3f2f1",
@ -1640,12 +1640,12 @@ Object {
"neutralStrokeAccessiblePressed": "#b3b3b3",
"neutralStrokeAccessibleSelected": "#3aa0f3",
"neutralStrokeDisabled": "#424242",
"personaActivityGlow": "#2899f5",
"personaActivityGlow": "#2b88d8",
"personaActivityRing": "#1b1a19",
"primaryButtonBackground": "#2899f5",
"primaryButtonBackground": "#2b88d8",
"primaryButtonBackgroundDisabled": "#252423",
"primaryButtonBackgroundHovered": "#3aa0f3",
"primaryButtonBackgroundPressed": "#6cb8f6",
"primaryButtonBackgroundHovered": "#c7e0f4",
"primaryButtonBackgroundPressed": "#deecf9",
"primaryButtonBorder": "transparent",
"primaryButtonBorderFocused": "transparent",
"primaryButtonText": "#1b1a19",
@ -1874,13 +1874,13 @@ Object {
"serif": "System",
},
"sizes": Object {
"body": 14,
"caption": 10,
"body": 15,
"caption": 12,
"header": 20,
"hero": 28,
"heroLarge": 40,
"secondary": 12,
"subheader": 16,
"heroLarge": 60,
"secondary": 13,
"subheader": 17,
},
"variants": Object {
"body1": Object {
@ -2914,13 +2914,13 @@ Object {
"serif": "System",
},
"sizes": Object {
"body": 14,
"caption": 10,
"body": 15,
"caption": 12,
"header": 20,
"hero": 28,
"heroLarge": 40,
"secondary": 12,
"subheader": 16,
"heroLarge": 60,
"secondary": 13,
"subheader": 17,
},
"variants": Object {
"body1": Object {
@ -3106,18 +3106,18 @@ Object {
"brandedDisabledContent": "#d2d0ce",
"brandedDisabledIcon": "#d2d0ce",
"brandedFocusedBackground": "#106ebe",
"brandedFocusedBorder": "#004578",
"brandedFocusedBorder": undefined,
"brandedFocusedContent": "#ffffff",
"brandedFocusedIcon": "#ffffff",
"brandedFocusedSecondaryContent": "#faf9f8",
"brandedHoveredBackground": "#106ebe",
"brandedHoveredBorder": "#004578",
"brandedHoveredBorder": undefined,
"brandedHoveredContent": "#ffffff",
"brandedHoveredIcon": "#ffffff",
"brandedHoveredSecondaryContent": "#faf9f8",
"brandedIcon": "#ffffff",
"brandedPressedBackground": "#005a9e",
"brandedPressedBorder": "#004578",
"brandedPressedBorder": undefined,
"brandedPressedContent": "#ffffff",
"brandedPressedIcon": "#ffffff",
"brandedPressedSecondaryContent": "#faf9f8",
@ -3226,7 +3226,7 @@ Object {
"inputText": "#323130",
"inputTextHovered": "#201f1e",
"link": "#0078d4",
"linkHovered": "#004578",
"linkHovered": undefined,
"linkPressed": "#005a9e",
"listBackground": "#ffffff",
"listHeaderBackgroundHovered": "#f3f2f1",
@ -3542,13 +3542,13 @@ Object {
"serif": "System",
},
"sizes": Object {
"body": 14,
"caption": 10,
"body": 15,
"caption": 12,
"header": 20,
"hero": 28,
"heroLarge": 40,
"secondary": 12,
"subheader": 16,
"heroLarge": 60,
"secondary": 13,
"subheader": 17,
},
"variants": Object {
"body1": Object {
@ -3734,18 +3734,18 @@ Object {
"brandedDisabledContent": "#d2d0ce",
"brandedDisabledIcon": "#d2d0ce",
"brandedFocusedBackground": "#106ebe",
"brandedFocusedBorder": "#004578",
"brandedFocusedBorder": undefined,
"brandedFocusedContent": "#ffffff",
"brandedFocusedIcon": "#ffffff",
"brandedFocusedSecondaryContent": "#faf9f8",
"brandedHoveredBackground": "#106ebe",
"brandedHoveredBorder": "#004578",
"brandedHoveredBorder": undefined,
"brandedHoveredContent": "#ffffff",
"brandedHoveredIcon": "#ffffff",
"brandedHoveredSecondaryContent": "#faf9f8",
"brandedIcon": "#ffffff",
"brandedPressedBackground": "#005a9e",
"brandedPressedBorder": "#004578",
"brandedPressedBorder": undefined,
"brandedPressedContent": "#ffffff",
"brandedPressedIcon": "#ffffff",
"brandedPressedSecondaryContent": "#faf9f8",
@ -3854,7 +3854,7 @@ Object {
"inputText": "#323130",
"inputTextHovered": "#201f1e",
"link": "#0078d4",
"linkHovered": "#004578",
"linkHovered": undefined,
"linkPressed": "#005a9e",
"listBackground": "#ffffff",
"listHeaderBackgroundHovered": "#f3f2f1",
@ -4170,13 +4170,13 @@ Object {
"serif": "System",
},
"sizes": Object {
"body": 14,
"caption": 10,
"body": 15,
"caption": 12,
"header": 20,
"hero": 28,
"heroLarge": 40,
"secondary": 12,
"subheader": 16,
"heroLarge": 60,
"secondary": 13,
"subheader": 17,
},
"variants": Object {
"body1": Object {
@ -4869,8 +4869,8 @@ Object {
"brandForegroundLinkSelected": "#2899f5",
"brandStroke1": "#2899f5",
"brandStroke2": "#004c87",
"brandedBackground": "#2899f5",
"brandedBorder": "#6cb8f6",
"brandedBackground": "#2b88d8",
"brandedBorder": "#deecf9",
"brandedCheckedBackground": "#484644",
"brandedCheckedContent": "#faf9f8",
"brandedCheckedHoveredBackground": "#292827",
@ -4880,18 +4880,18 @@ Object {
"brandedDisabledBorder": "#252423",
"brandedDisabledContent": "#3b3a39",
"brandedDisabledIcon": "#3b3a39",
"brandedFocusedBackground": "#3aa0f3",
"brandedFocusedBackground": "#c7e0f4",
"brandedFocusedBorder": "#82c7ff",
"brandedFocusedContent": "#1b1a19",
"brandedFocusedIcon": "#1b1a19",
"brandedFocusedSecondaryContent": "#201f1e",
"brandedHoveredBackground": "#3aa0f3",
"brandedHoveredBackground": "#c7e0f4",
"brandedHoveredBorder": "#82c7ff",
"brandedHoveredContent": "#1b1a19",
"brandedHoveredIcon": "#1b1a19",
"brandedHoveredSecondaryContent": "#201f1e",
"brandedIcon": "#1b1a19",
"brandedPressedBackground": "#6cb8f6",
"brandedPressedBackground": "#deecf9",
"brandedPressedBorder": "#82c7ff",
"brandedPressedContent": "#1b1a19",
"brandedPressedIcon": "#1b1a19",
@ -4912,7 +4912,7 @@ Object {
"buttonTextDisabled": "#797775",
"buttonTextHovered": "#f3f2f1",
"buttonTextPressed": "#faf9f8",
"checkboxBackground": "#2899f5",
"checkboxBackground": "#2b88d8",
"checkboxBackgroundDisabled": "#252423",
"checkboxBorderColor": "#979693",
"checkmarkColor": "#1b1a19",
@ -4991,18 +4991,18 @@ Object {
"ghostPressedSecondaryContent": "#a19f9d",
"ghostSecondaryContent": "#a19f9d",
"inputBackground": "#1b1a19",
"inputBackgroundChecked": "#2899f5",
"inputBackgroundCheckedHovered": "#3aa0f3",
"inputBackgroundChecked": "#2b88d8",
"inputBackgroundCheckedHovered": "#c7e0f4",
"inputBorder": "#797775",
"inputBorderHovered": "#f3f2f1",
"inputFocusBorderAlt": "#2899f5",
"inputFocusBorderAlt": "#2b88d8",
"inputForegroundChecked": "#1b1a19",
"inputPlaceholderText": "#a19f9d",
"inputText": "#f3f2f1",
"inputTextHovered": "#faf9f8",
"link": "#2899f5",
"link": "#2b88d8",
"linkHovered": "#82c7ff",
"linkPressed": "#6cb8f6",
"linkPressed": "#deecf9",
"listBackground": "#1b1a19",
"listHeaderBackgroundHovered": "#252423",
"listHeaderBackgroundPressed": "#292827",
@ -5013,7 +5013,7 @@ Object {
"menuBackground": "#252423",
"menuDivider": "#484644",
"menuHeader": "#ffffff",
"menuIcon": "#3aa0f3",
"menuIcon": "#c7e0f4",
"menuItemBackgroundHovered": "#323130",
"menuItemBackgroundPressed": "#3b3a39",
"menuItemText": "#f3f2f1",
@ -5083,12 +5083,12 @@ Object {
"neutralStrokeAccessiblePressed": "#b3b3b3",
"neutralStrokeAccessibleSelected": "#3aa0f3",
"neutralStrokeDisabled": "#424242",
"personaActivityGlow": "#2899f5",
"personaActivityGlow": "#2b88d8",
"personaActivityRing": "#1b1a19",
"primaryButtonBackground": "#2899f5",
"primaryButtonBackground": "#2b88d8",
"primaryButtonBackgroundDisabled": "#252423",
"primaryButtonBackgroundHovered": "#3aa0f3",
"primaryButtonBackgroundPressed": "#6cb8f6",
"primaryButtonBackgroundHovered": "#c7e0f4",
"primaryButtonBackgroundPressed": "#deecf9",
"primaryButtonBorder": "transparent",
"primaryButtonBorderFocused": "transparent",
"primaryButtonText": "#1b1a19",
@ -5317,13 +5317,13 @@ Object {
"serif": "System",
},
"sizes": Object {
"body": 14,
"caption": 10,
"body": 15,
"caption": 12,
"header": 20,
"hero": 28,
"heroLarge": 40,
"secondary": 12,
"subheader": 16,
"heroLarge": 60,
"secondary": 13,
"subheader": 17,
},
"variants": Object {
"body1": Object {
@ -5509,18 +5509,18 @@ Object {
"brandedDisabledContent": "#d2d0ce",
"brandedDisabledIcon": "#d2d0ce",
"brandedFocusedBackground": "#106ebe",
"brandedFocusedBorder": "#004578",
"brandedFocusedBorder": undefined,
"brandedFocusedContent": "#ffffff",
"brandedFocusedIcon": "#ffffff",
"brandedFocusedSecondaryContent": "#faf9f8",
"brandedHoveredBackground": "#106ebe",
"brandedHoveredBorder": "#004578",
"brandedHoveredBorder": undefined,
"brandedHoveredContent": "#ffffff",
"brandedHoveredIcon": "#ffffff",
"brandedHoveredSecondaryContent": "#faf9f8",
"brandedIcon": "#ffffff",
"brandedPressedBackground": "#005a9e",
"brandedPressedBorder": "#004578",
"brandedPressedBorder": undefined,
"brandedPressedContent": "#ffffff",
"brandedPressedIcon": "#ffffff",
"brandedPressedSecondaryContent": "#faf9f8",
@ -5629,7 +5629,7 @@ Object {
"inputText": "#323130",
"inputTextHovered": "#201f1e",
"link": "#0078d4",
"linkHovered": "#004578",
"linkHovered": undefined,
"linkPressed": "#005a9e",
"listBackground": "#ffffff",
"listHeaderBackgroundHovered": "#f3f2f1",
@ -5945,13 +5945,13 @@ Object {
"serif": "System",
},
"sizes": Object {
"body": 14,
"caption": 10,
"body": 15,
"caption": 12,
"header": 20,
"hero": 28,
"heroLarge": 40,
"secondary": 12,
"subheader": 16,
"heroLarge": 60,
"secondary": 13,
"subheader": 17,
},
"variants": Object {
"body1": Object {

Просмотреть файл

@ -32,6 +32,7 @@
"license": "MIT",
"dependencies": {
"@fluentui-react-native/design-tokens-android": "^0.25.0",
"@fluentui-react-native/design-tokens-ios": "^0.26.0",
"@fluentui-react-native/design-tokens-win32": "^0.13.0",
"@fluentui-react-native/design-tokens-windows": "^0.13.0",
"@fluentui-react-native/theme-types": ">=0.22.0 <1.0.0",

Просмотреть файл

@ -0,0 +1,3 @@
import globalTokens from '@fluentui-react-native/design-tokens-ios/light/tokens-global.json';
export default globalTokens;

Просмотреть файл

@ -1,2 +1,2 @@
const { configureReactNativeJest } = require('@fluentui-react-native/scripts');
module.exports = configureReactNativeJest('ios');
module.exports = configureReactNativeJest('win32');

Просмотреть файл

@ -43,6 +43,7 @@
"devDependencies": {
"@fluentui-react-native/eslint-config-rules": "^0.1.1",
"@fluentui-react-native/scripts": "^0.1.1",
"@office-iss/react-native-win32": ">=0.68.0 <0.68.6",
"@types/react": "^17.0.2",
"@types/react-native": "^0.68.0",
"react": "17.0.2",

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -23,7 +23,7 @@
},
"devDependencies": {
"@react-native-community/cli": "^7.0.3",
"@rnx-kit/jest-preset": "^0.1.9",
"@rnx-kit/jest-preset": "^0.1.12",
"@types/enzyme": "^3.10.5",
"@types/es6-collections": "^0.5.29",
"@types/es6-promise": "0.0.32",

Просмотреть файл

@ -1458,10 +1458,10 @@
resolved "https://registry.yarnpkg.com/@fluentui-react-native/design-tokens-android/-/design-tokens-android-0.25.0.tgz#5a836592a5934fecffe4a0ed0dd39c214a69ab40"
integrity sha512-pP8ZdbgLpSxDZ+a9YY5wqgwAG9gw/NhXAvOcDSQIJBqWRCN1u7FFOfEVshiZJBDw8GqGl6Qu+vGNoIMyBbckIg==
"@fluentui-react-native/design-tokens-ios@^0.23.0":
version "0.23.0"
resolved "https://registry.yarnpkg.com/@fluentui-react-native/design-tokens-ios/-/design-tokens-ios-0.23.0.tgz#059b66c48fc1e236869187ccee1e39157c1a864a"
integrity sha512-03kPPV0z9hPRvzurUKwXa2as7Cv2PzGbw7xQAagSznoE6dl4r92Z67hlxzBpL5XlSfTvB3LlVhy6Pw5vX45wGw==
"@fluentui-react-native/design-tokens-ios@^0.26.0":
version "0.26.0"
resolved "https://registry.yarnpkg.com/@fluentui-react-native/design-tokens-ios/-/design-tokens-ios-0.26.0.tgz#f477416ac88d42336cce4b5f182c2bdb7600c523"
integrity sha512-CGXuTisSlKzIMIq1JLkKBrhqy5LJpEai8BXiyrD9yw0WWU2jm9sWUoqXfH7EseJ/VrfZVueD9dUQW1jrI63e9Q==
"@fluentui-react-native/design-tokens-macos@^0.13.0":
version "0.13.0"
@ -2620,10 +2620,10 @@
eslint-plugin-react "^7.26.0"
eslint-plugin-react-hooks "^4.3.0"
"@rnx-kit/jest-preset@^0.1.9":
version "0.1.11"
resolved "https://registry.yarnpkg.com/@rnx-kit/jest-preset/-/jest-preset-0.1.11.tgz#fe1944e50ef2995d870887ce6e9691bb83f92b2b"
integrity sha512-x9+XYndZxDE/hXZD8+GCwI7uhWY7qDaDWcT+Ciz+3lnvQweM66UEUnIch6W/hm5TtDCSkEaYN5Wzmrf+82gn/w==
"@rnx-kit/jest-preset@^0.1.12":
version "0.1.12"
resolved "https://registry.yarnpkg.com/@rnx-kit/jest-preset/-/jest-preset-0.1.12.tgz#08e48fa96f489f6bf0644721c03370108c94cd7f"
integrity sha512-K481cJcDhGwo7qa78J1ne1z+b1hgjmiMf8ASD58Hd6iwh33euiZ+zhU8WSqWxOaKmJJBwDYiLthqwDpDtieuUg==
dependencies:
"@babel/preset-env" "^7.0.0"
"@babel/preset-typescript" "^7.0.0"