Xaml support prototype #14811
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| setlocal | ||
| pushd ..\.. | ||
|
|
||
| call yarn || goto :fail | ||
|
|
||
| popd | ||
|
|
||
| call yarn react-native run-windows --msbuildprops RestoreForceEvaluate=true || goto :fail | ||
|
|
||
| echo Success! | ||
| exit /b 0 | ||
|
|
||
| echo FAILED. | ||
| exit /b 1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| lib-commonjs/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <packageSources> | ||
| <clear /> | ||
| <add key="react-native" value="https://pkgs.dev.azure.com/ms/react-native/_packaging/react-native-public/nuget/v3/index.json" /> | ||
| <add key="Nuget.org" value="https://api.nuget.org/v3/index.json" /> | ||
| </packageSources> | ||
| <disabledPackageSources> | ||
| <clear /> | ||
| </disabledPackageSources> | ||
| </configuration> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| module.exports = { | ||
| presets: ['module:@rnw-scripts/babel-react-native-config'], | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| module.exports = { | ||
| preset: 'react-native', | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /** | ||
| * Copyright (c) Microsoft Corporation. | ||
| * Licensed under the MIT License. | ||
| * @format | ||
| * @ts-check | ||
| */ | ||
|
|
||
| const {task, series} = require('just-scripts'); | ||
| const fs = require('fs'); | ||
| const glob = require('glob'); | ||
| const path = require('path'); | ||
|
|
||
| // Use the shared base configuration | ||
| require('@rnw-scripts/just-task'); | ||
|
|
||
| // The TS build process will strip all the types from the NativeComponent spec file. Which means that the codegen babel will not correctly generate the JS view config for the component. | ||
| // So here we manually run babel, overwriting the tsc output, so that we ship the generated code. | ||
| task('codegenNativeComponents', () => { | ||
| const babel = require('@babel/core'); | ||
| const matches = glob.sync('src/**/*NativeComponent.ts'); | ||
|
|
||
| matches.forEach(matchedPath => { | ||
| const relativePath = path.relative( | ||
| path.resolve(process.cwd(), 'src'), | ||
| matchedPath, | ||
| ); | ||
| const code = fs.readFileSync(matchedPath).toString(); | ||
| const filename = path.resolve(process.cwd(), matchedPath); | ||
|
|
||
| const res = babel.transformSync(code, { | ||
| ast: false, | ||
| filename, | ||
| cwd: process.cwd(), | ||
| sourceRoot: process.cwd(), | ||
| root: process.cwd(), | ||
| babelrc: true, | ||
| }); | ||
|
|
||
| const relativeOutputPath = relativePath.replace(/\.ts$/, '.js'); | ||
|
|
||
| fs.writeFileSync( | ||
| path.resolve(process.cwd(), 'lib-commonjs', relativeOutputPath), | ||
| res?.code, | ||
| ); | ||
| }); | ||
| }); | ||
|
|
||
| task( | ||
| 'buildWithCodegetNativeComponents', | ||
| series('build', 'codegenNativeComponents'), | ||
| ); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| { | ||
| "name": "xaml-calendar-view", | ||
| "version": "1.0.0", | ||
| "main": "lib-commonjs/index.js", | ||
| "types": "lib-commonjs/index.d.ts", | ||
| "license": "MIT", | ||
| "private": true, | ||
| "scripts": { | ||
| "build": "rnw-scripts buildWithCodegetNativeComponents", | ||
| "lint": "rnw-scripts lint", | ||
| "lint:fix": "rnw-scripts lint:fix" | ||
| }, | ||
| "codegenConfig": { | ||
| "name": "CalendarView", | ||
| "type": "all", | ||
| "jsSrcsDir": "src", | ||
| "windows": { | ||
| "generators": "componentsWindows", | ||
| "namespace": "winrt::XamlCalendarView::Codegen", | ||
| "outputDirectory": "windows/XamlCalendarView/codegen" | ||
| } | ||
| }, | ||
| "dependencies": { | ||
| "@types/react": "^19.0.0", | ||
| "react": "^19.0.0", | ||
| "react-native": "0.79.0-nightly-20250123-d1028885e", | ||
| "react-native-windows": "^0.0.0-canary.952" | ||
| }, | ||
| "devDependencies": { | ||
| "@babel/core": "^7.25.2", | ||
| "@babel/generator": "^7.25.0", | ||
| "@babel/preset-env": "^7.25.3", | ||
| "@babel/preset-typescript": "^7.8.3", | ||
| "@babel/runtime": "^7.20.0", | ||
| "@react-native-community/cli": "15.0.0-alpha.2", | ||
| "@react-native/metro-config": "0.79.0-nightly-20250123-d1028885e", | ||
| "@rnw-scripts/babel-node-config": "2.3.2", | ||
| "@rnw-scripts/babel-react-native-config": "0.0.0", | ||
| "@rnw-scripts/eslint-config": "1.2.34", | ||
| "@rnw-scripts/just-task": "2.3.51", | ||
| "@rnw-scripts/metro-dev-config": "0.0.0", | ||
| "@rnw-scripts/ts-config": "2.0.5", | ||
| "@rnx-kit/jest-preset": "^0.1.16", | ||
| "@types/react": "^19.0.0", | ||
| "@typescript-eslint/eslint-plugin": "^7.1.1", | ||
| "@typescript-eslint/parser": "^7.1.1", | ||
| "babel-jest": "^29.6.3", | ||
| "eslint": "^8.19.0", | ||
| "glob": "^7.1.6", | ||
| "just-scripts": "^1.3.3", | ||
| "prettier": "2.8.8", | ||
| "typescript": "5.0.4" | ||
| }, | ||
| "engines": { | ||
| "node": ">=18" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
|
|
||
| import * as React from 'react'; | ||
| import RawCalendarView from './CalendarViewNativeComponent'; | ||
|
|
||
| import XamlHost from 'react-native-windows/Libraries/Components/Xaml/XamlHost'; | ||
|
There was a problem hiding this comment. This is an awkward import into a deep path. Should XamlHost be a separate package? |
||
|
|
||
| function CalendarView(props: any) { | ||
| return ( | ||
| <XamlHost label='unused'> | ||
| <RawCalendarView label='unused' {...props} /> | ||
| </XamlHost> | ||
| ); | ||
| } | ||
|
|
||
| export { CalendarView, RawCalendarView }; | ||
|
There was a problem hiding this comment. The idea here is that the CalendarView object is already wrapped in a XamlHost, so is all ready to be put into a JSX tree. RawCalendarView is not. In the future maybe we make it possible to group multiple "Raw" elements under the same XamlHost. There was a problem hiding this comment. If you had a tree of Xaml elements, would you expect something like this? (maybe not supporting layout panels with multiple children, but other controls that have 1 child) There was a problem hiding this comment. I think we could support this without too much work if we want to. I haven't spent a lot of time exploring that though. |
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This version should be more concrete.