Skip to content

Bump react-native from 0.73.9 to 0.73.11 #3813

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Fix the tests",
"packageName": "@fluentui-react-native/adapters",
"email": "[email protected]",
"dependentChangeType": "patch"
}
97 changes: 95 additions & 2 deletions packages/utils/adapters/src/adapter.types.macos.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
import type { TextProps, ViewProps, ImageProps, HostComponent, NativeSyntheticEvent } from 'react-native';
import type {
TextProps,
ViewProps,
ImageProps,
HostComponent,
NativeSyntheticEvent,
Animated,
StyleProp,
ImageStyle,
TextStyle,
ViewStyle,
} from 'react-native';

/**
* https://developer.mozilla.org/en-US/docs/Web/API/UIEvent
Expand Down Expand Up @@ -109,6 +120,83 @@ export interface KeyEvent extends NativeSyntheticEvent<NativeKeyEvent> {}
export type DraggedType = 'fileUrl';
export type DraggedTypesType = DraggedType | DraggedType[];

type AnimatableNumericValue = number | Animated.AnimatedNode;
type AnimatableStringValue = string | Animated.AnimatedNode;
interface PerpectiveTransform {
perspective: AnimatableNumericValue;
}

interface RotateTransform {
rotate: AnimatableStringValue;
}

interface RotateXTransform {
rotateX: AnimatableStringValue;
}

interface RotateYTransform {
rotateY: AnimatableStringValue;
}

interface RotateZTransform {
rotateZ: AnimatableStringValue;
}

interface ScaleTransform {
scale: AnimatableNumericValue;
}

interface ScaleXTransform {
scaleX: AnimatableNumericValue;
}

interface ScaleYTransform {
scaleY: AnimatableNumericValue;
}

interface TranslateXTransform {
translateX: AnimatableNumericValue;
}

interface TranslateYTransform {
translateY: AnimatableNumericValue;
}

interface SkewXTransform {
skewX: AnimatableStringValue;
}

interface SkewYTransform {
skewY: AnimatableStringValue;
}

interface MatrixTransform {
matrix: AnimatableNumericValue[];
}

type MaximumOneOf<T, K extends keyof T = keyof T> = K extends keyof T ? { [P in K]: T[K] } & { [P in Exclude<keyof T, K>]?: never } : never;

type MutableTransformStyle<T> = T & {
transform?:
| MaximumOneOf<
PerpectiveTransform &
RotateTransform &
RotateXTransform &
RotateYTransform &
RotateZTransform &
ScaleTransform &
ScaleXTransform &
ScaleYTransform &
TranslateXTransform &
TranslateYTransform &
SkewXTransform &
SkewYTransform &
MatrixTransform
>[]
| string
| undefined;
};

export type IAdapterMacOSViewProps = ViewProps & {
acceptsFirstMouse?: boolean | undefined;
allowsVibrancy?: boolean | undefined;
Expand All @@ -124,8 +212,13 @@ export type IAdapterMacOSViewProps = ViewProps & {
validKeysDown?: string[] | undefined;
validKeysUp?: string[] | undefined;
draggedTypes?: DraggedTypesType | undefined;

style?: StyleProp<MutableTransformStyle<ViewStyle>> | undefined;
};
export type IAdapterMacOSTextProps = Omit<TextProps, 'style'> & {
style?: StyleProp<MutableTransformStyle<TextStyle>> | undefined;
};
export type IAdapterMacOSTextProps = TextProps;
export type IAdapterMacOSImageProps = ImageProps & {
tooltip?: string;
style?: StyleProp<MutableTransformStyle<ImageStyle>> | undefined;
};
95 changes: 93 additions & 2 deletions packages/utils/adapters/src/adapter.types.win32.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
import type { TextProps, ViewProps, ImageProps, NativeSyntheticEvent, HostComponent } from 'react-native';
import type {
TextProps,
ViewProps,
ImageProps,
NativeSyntheticEvent,
HostComponent,
StyleProp,
TextStyle,
Animated,
ImageStyle,
} from 'react-native';

export interface INativeKeyboardEvent {
altKey: boolean;
Expand Down Expand Up @@ -258,7 +268,84 @@ export type TextWin32TextStyle =
| 'ExtraLargeStandard'
| 'HugeStandard';

export type IAdapterWin32TextProps = TextProps & {
type AnimatableNumericValue = number | Animated.AnimatedNode;
type AnimatableStringValue = string | Animated.AnimatedNode;
interface PerpectiveTransform {
perspective: AnimatableNumericValue;
}

interface RotateTransform {
rotate: AnimatableStringValue;
}

interface RotateXTransform {
rotateX: AnimatableStringValue;
}

interface RotateYTransform {
rotateY: AnimatableStringValue;
}

interface RotateZTransform {
rotateZ: AnimatableStringValue;
}

interface ScaleTransform {
scale: AnimatableNumericValue;
}

interface ScaleXTransform {
scaleX: AnimatableNumericValue;
}

interface ScaleYTransform {
scaleY: AnimatableNumericValue;
}

interface TranslateXTransform {
translateX: AnimatableNumericValue;
}

interface TranslateYTransform {
translateY: AnimatableNumericValue;
}

interface SkewXTransform {
skewX: AnimatableStringValue;
}

interface SkewYTransform {
skewY: AnimatableStringValue;
}

interface MatrixTransform {
matrix: AnimatableNumericValue[];
}

type MaximumOneOf<T, K extends keyof T = keyof T> = K extends keyof T ? { [P in K]: T[K] } & { [P in Exclude<keyof T, K>]?: never } : never;

type MutableTransformStyle<T> = Omit<T, 'transform'> & {
transform?:
| MaximumOneOf<
PerpectiveTransform &
RotateTransform &
RotateXTransform &
RotateYTransform &
RotateZTransform &
ScaleTransform &
ScaleXTransform &
ScaleYTransform &
TranslateXTransform &
TranslateYTransform &
SkewXTransform &
SkewYTransform &
MatrixTransform
>[]
| string
| undefined;
};

export type IAdapterWin32TextProps = Omit<TextProps, 'style'> & {
onKeyDown?: (args: IKeyboardEvent) => void;
onKeyDownCapture?: (args: IKeyboardEvent) => void;
onKeyUp?: (args: IKeyboardEvent) => void;
Expand Down Expand Up @@ -297,6 +384,8 @@ export type IAdapterWin32TextProps = TextProps & {
focusable?: boolean;
textStyle?: TextWin32TextStyle;
tooltip?: string;

style?: StyleProp<MutableTransformStyle<TextStyle>> | undefined;
};

export type IAdapterWin32ImageProps = ImageProps & {
Expand All @@ -317,4 +406,6 @@ export type IAdapterWin32ImageProps = ImageProps & {
'aria-level'?: number | undefined;
'aria-controls'?: string | undefined;
'aria-describedby'?: string | undefined;

style?: StyleProp<MutableTransformStyle<ImageStyle>> | undefined;
};
87 changes: 85 additions & 2 deletions packages/utils/adapters/src/adapter.types.windows.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { TextProps, ViewProps, ImageProps, NativeSyntheticEvent } from 'react-native';
import type { TextProps, ViewProps, ImageProps, NativeSyntheticEvent, Animated } from 'react-native';

export interface INativeKeyboardEvent {
altKey: boolean;
Expand Down Expand Up @@ -94,6 +94,83 @@ export type AccessibilityAnnotationInfo = Readonly<{
target?: string;
}>;

type AnimatableNumericValue = number | Animated.AnimatedNode;
type AnimatableStringValue = string | Animated.AnimatedNode;
interface PerpectiveTransform {
perspective: AnimatableNumericValue;
}

interface RotateTransform {
rotate: AnimatableStringValue;
}

interface RotateXTransform {
rotateX: AnimatableStringValue;
}

interface RotateYTransform {
rotateY: AnimatableStringValue;
}

interface RotateZTransform {
rotateZ: AnimatableStringValue;
}

interface ScaleTransform {
scale: AnimatableNumericValue;
}

interface ScaleXTransform {
scaleX: AnimatableNumericValue;
}

interface ScaleYTransform {
scaleY: AnimatableNumericValue;
}

interface TranslateXTransform {
translateX: AnimatableNumericValue;
}

interface TranslateYTransform {
translateY: AnimatableNumericValue;
}

interface SkewXTransform {
skewX: AnimatableStringValue;
}

interface SkewYTransform {
skewY: AnimatableStringValue;
}

interface MatrixTransform {
matrix: AnimatableNumericValue[];
}

type MaximumOneOf<T, K extends keyof T = keyof T> = K extends keyof T ? { [P in K]: T[K] } & { [P in Exclude<keyof T, K>]?: never } : never;

type MutableTransformStyle<T> = T & {
transform?:
| MaximumOneOf<
PerpectiveTransform &
RotateTransform &
RotateXTransform &
RotateYTransform &
RotateZTransform &
ScaleTransform &
ScaleXTransform &
ScaleYTransform &
TranslateXTransform &
TranslateYTransform &
SkewXTransform &
SkewYTransform &
MatrixTransform
>[]
| string
| undefined;
};

export type IAdapterWindowsViewProps = ViewProps & {
onKeyDown?: (args: IKeyboardEvent) => void;
onKeyDownCapture?: (args: IKeyboardEvent) => void;
Expand Down Expand Up @@ -160,6 +237,8 @@ export type IAdapterWindowsViewProps = ViewProps & {
| 'timer'
| 'list'
| 'toolbar';

style?: MutableTransformStyle<ViewProps['style']>;
};

/**
Expand All @@ -179,13 +258,15 @@ export type TextWindowsTextStyle =
| 'ExtraLargeStandard'
| 'HugeStandard';

export type IAdapterWindowsTextProps = TextProps & {
export type IAdapterWindowsTextProps = Omit<TextProps, 'style'> & {
accessibilitySetSize?: number;
accessibilityPosInSet?: number;
accessibilityLevel?: number;
'aria-posinset'?: number | undefined;
'aria-setsize'?: number | undefined;
'aria-level'?: number | undefined;

style?: MutableTransformStyle<TextProps['style']>;
};

export type IAdapterWindowsImageProps = ImageProps & {
Expand All @@ -195,4 +276,6 @@ export type IAdapterWindowsImageProps = ImageProps & {
'aria-posinset'?: number | undefined;
'aria-setsize'?: number | undefined;
'aria-level'?: number | undefined;

style?: MutableTransformStyle<ImageProps['style']>;
};
Loading