Skip to content

[Fabric] Enable implementation of custom events on custom components #13635

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.

Sign up for GitHub

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

Merged
acoates-ms merged 5 commits into from
Aug 30, 2024
Merged

[Fabric] Enable implementation of custom events on custom components #13635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
708484d
[Fabric] Enable implementation of custom events on custom components
acoates-ms Aug 29, 2024
4eb7e40
Change files
acoates-ms Aug 29, 2024
53360b8
format
acoates-ms Aug 30, 2024
6723549
lint fix
acoates-ms Aug 30, 2024
bd2cdc5
fix
acoates-ms Aug 30, 2024
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
7 changes: 7 additions & 0 deletions change/react-native-windows-dd026530-5f0b-4ca5-b43e-a7a6960d7696.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "[Fabric] Enable implementation of custom events on custom components",
"packageName": "react-native-windows",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
9 changes: 9 additions & 0 deletions ...rc/js/examples-win/NativeComponents/CustomXamlComponentWithNativeLayoutNativeComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,22 @@

import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';
import type {DirectEventHandler} from 'react-native/Libraries/Types/CodegenTypes';
import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';

type MyEventEvent = $ReadOnly<{|
value: boolean,
target: Int32,
|}>;

type NativeProps = $ReadOnly<{|
...ViewProps,

// Props
label: string,

// Events
onMyEvent?: ?DirectEventHandler<MyEventEvent>,
|}>;

type ComponentType = HostComponent<NativeProps>;
Expand Down
9 changes: 9 additions & 0 deletions .../src/js/examples-win/NativeComponents/CustomXamlComponentWithYogaLayoutNativeComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,22 @@

import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';
import type {DirectEventHandler} from 'react-native/Libraries/Types/CodegenTypes';
import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';

type MyEventEvent = $ReadOnly<{|
value: boolean,
target: Int32,
|}>;

type NativeProps = $ReadOnly<{|
...ViewProps,

// Props
label: string,

// Events
onMyEvent?: ?DirectEventHandler<MyEventEvent>,
|}>;

type ComponentType = HostComponent<NativeProps>;
Expand Down
63 changes: 36 additions & 27 deletions ...act-native-windows/tester/src/js/examples-win/NativeComponents/NativeComponent.windows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,43 @@

'use strict';

import React from 'react';
import React, { useState } from 'react';
import {Text, View} from 'react-native';
import CustomXamlComponentWithNativeLayout from './CustomXamlComponentWithNativeLayoutNativeComponent';

const NativeComponentWithNativeLayout = () => {
let [log, setLog] = useState('');
return (
<View
style={{
borderRadius: 0,
margin: 10,
borderWidth: 2,
flexWrap: 'wrap',
flexDirection: 'row',
gap: 5,
}}>
<View style={{width: 100, height: 100, backgroundColor: 'green'}} />
<View style={{width: 100, height: 100, backgroundColor: 'red'}} />
<View style={{width: 100, height: 100, backgroundColor: 'blue'}} />
<View style={{width: 100, height: 100, backgroundColor: 'pink'}} />
<View style={{width: 100, height: 100, backgroundColor: 'gray'}} />
<Text style={{color: 'gray'}}>This is RN Text</Text>
<Text style={{color: 'red'}}>{log}</Text>
<CustomXamlComponentWithNativeLayout
label="This is a Xaml Button set to ellipisify on truncation"
style={{flexShrink: 1}}
onMyEvent={(arg) => {setLog(log + '\nRecieved MyEvent: ' + JSON.stringify(arg.nativeEvent) + '\n')}}
/>
<View style={{width: 100, height: 100, backgroundColor: 'green'}} />
<View style={{width: 100, height: 100, backgroundColor: 'red'}} />
<View style={{width: 100, height: 100, backgroundColor: 'blue'}} />
<View style={{width: 100, height: 100, backgroundColor: 'pink'}} />
<View style={{width: 100, height: 100, backgroundColor: 'gray'}} />
</View>
);
}

exports.displayName = 'NativeFabricComponent';
exports.framework = 'React';
exports.category = 'UI';
Expand All @@ -27,32 +60,8 @@ exports.examples = [
title: 'Native Component',
render: function (): React.Node {
return (
<View
style={{
borderRadius: 0,
margin: 10,
borderWidth: 2,
flexWrap: 'wrap',
flexDirection: 'row',
gap: 5,
}}>
<View style={{width: 100, height: 100, backgroundColor: 'green'}} />
<View style={{width: 100, height: 100, backgroundColor: 'red'}} />
<View style={{width: 100, height: 100, backgroundColor: 'blue'}} />
<View style={{width: 100, height: 100, backgroundColor: 'pink'}} />
<View style={{width: 100, height: 100, backgroundColor: 'gray'}} />
<Text style={{color: 'gray'}}>This is RN Text</Text>
<CustomXamlComponentWithNativeLayout
label="This is a Xaml Button set to ellipisify on truncation"
style={{flexShrink: 1}}
/>
<View style={{width: 100, height: 100, backgroundColor: 'green'}} />
<View style={{width: 100, height: 100, backgroundColor: 'red'}} />
<View style={{width: 100, height: 100, backgroundColor: 'blue'}} />
<View style={{width: 100, height: 100, backgroundColor: 'pink'}} />
<View style={{width: 100, height: 100, backgroundColor: 'gray'}} />
</View>
<NativeComponentWithNativeLayout />
);
},
},
}
];
61 changes: 35 additions & 26 deletions ...native-windows/tester/src/js/examples-win/NativeComponents/NativeComponentYoga.windows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,43 @@

'use strict';

import React from 'react';
import React, { useState } from 'react';
import {Text, View} from 'react-native';
import CustomXamlComponentWithYogaLayout from './CustomXamlComponentWithYogaLayoutNativeComponent';

const NativeComponentWithYogaExample = () => {
let [log, setLog] = useState('');
return (
<View
style={{
borderRadius: 0,
margin: 10,
borderWidth: 2,
flexWrap: 'wrap',
flexDirection: 'row',
gap: 5,
}}>
<View style={{width: 100, height: 100, backgroundColor: 'green'}} />
<View style={{width: 100, height: 100, backgroundColor: 'red'}} />
<View style={{width: 100, height: 100, backgroundColor: 'blue'}} />
<View style={{width: 100, height: 100, backgroundColor: 'pink'}} />
<View style={{width: 100, height: 100, backgroundColor: 'gray'}} />
<Text style={{color: 'gray'}}>This is RN Text</Text>
<Text style={{color: 'red'}}>{log}</Text>
<CustomXamlComponentWithYogaLayout
label="This is a Xaml Button set to ellipisify on truncation"
style={{flex: 1, minWidth: 100}}
onMyEvent={(arg) => {setLog(log + '\nRecieved MyEvent: ' + JSON.stringify(arg.nativeEvent) + '\n')}}
/>
<View style={{width: 100, height: 100, backgroundColor: 'green'}} />
<View style={{width: 100, height: 100, backgroundColor: 'red'}} />
<View style={{width: 100, height: 100, backgroundColor: 'blue'}} />
<View style={{width: 100, height: 100, backgroundColor: 'pink'}} />
<View style={{width: 100, height: 100, backgroundColor: 'gray'}} />
</View>
);
};

exports.displayName = 'NativeFabricComponentYoga';
exports.framework = 'React';
exports.category = 'UI';
Expand All @@ -27,31 +60,7 @@ exports.examples = [
title: 'Native Component',
render: function (): React.Node {
return (
<View
style={{
borderRadius: 0,
margin: 10,
borderWidth: 2,
flexWrap: 'wrap',
flexDirection: 'row',
gap: 5,
}}>
<View style={{width: 100, height: 100, backgroundColor: 'green'}} />
<View style={{width: 100, height: 100, backgroundColor: 'red'}} />
<View style={{width: 100, height: 100, backgroundColor: 'blue'}} />
<View style={{width: 100, height: 100, backgroundColor: 'pink'}} />
<View style={{width: 100, height: 100, backgroundColor: 'gray'}} />
<Text style={{color: 'gray'}}>This is RN Text</Text>
<CustomXamlComponentWithYogaLayout
label="This is a Xaml Button set to ellipisify on truncation"
style={{flex: 1, minWidth: 100}}
/>
<View style={{width: 100, height: 100, backgroundColor: 'green'}} />
<View style={{width: 100, height: 100, backgroundColor: 'red'}} />
<View style={{width: 100, height: 100, backgroundColor: 'blue'}} />
<View style={{width: 100, height: 100, backgroundColor: 'pink'}} />
<View style={{width: 100, height: 100, backgroundColor: 'gray'}} />
</View>
<NativeComponentWithYogaExample />
);
},
},
Expand Down
16 changes: 16 additions & 0 deletions packages/e2e-test-app-fabric/test/__snapshots__/snapshotPages.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10550,8 +10550,16 @@ exports[`snapshotAllPages Fabric Native Component 1`] = `
>
This is RN Text
</Text>
<Text
style={
{
"color": "red",
}
}
/>
<CustomXamlComponentWithNativeLayout
label="This is a Xaml Button set to ellipisify on truncation"
onMyEvent={[Function]}
style={
{
"flexShrink": 1,
Expand Down Expand Up @@ -10673,8 +10681,16 @@ exports[`snapshotAllPages Fabric Native Component Yoga 1`] = `
>
This is RN Text
</Text>
<Text
style={
{
"color": "red",
}
}
/>
<CustomXamlComponentWithYogaLayout
label="This is a Xaml Button set to ellipisify on truncation"
onMyEvent={[Function]}
style={
{
"flex": 1,
Expand Down
Loading