[Windows] Port to Direct2D to remove win2d dependency #2052

marlenecota · 2023-05-10T01:02:12Z

Summary

Explain the motivation for making this change:
This change removes the win2d (Direct2D wrapper) dependency by using D2D directly. This removes the manual step of adding the win2d to any new react-native-windows projects that want to use react-native-svg. It is also a stepping stone to an easier Fabric implementation for windows.

Test Plan

Ran the example app and verified the functionality is the same to the current windows implementation.

Compatibility

OS	Implemented
iOS	❌
Android	❌
Windows	✅

Checklist

I have tested this on a device and a simulator
I added documentation in README.md
I updated the typed files (typescript)
I added a test for the API in the __tests__ folder

windows/RNSVG/BrushView.cpp

windows/RNSVG/CircleView.cpp

windows/RNSVG/D2DHelpers.h

windows/RNSVG/GroupView.cpp

windows/RNSVG/RenderableView.h

windows/RNSVG/Utils.h

windows/RNSVG/D2DHelpers.h

windows/RNSVG/GroupView.cpp

windows/RNSVG/ImageView.cpp

windows/RNSVG/PatternView.cpp

windows/RNSVG/RadialGradientView.cpp

windows/RNSVG/RenderableView.cpp

windows/RNSVG/RenderableView.h

windows/RNSVG/SvgView.cpp

windows/RNSVG/BrushView.cpp

windows/RNSVG/ImageView.cpp

jonthysell

Looks good to me, as long as you double-check the transform map. Is there windows build CI / tests that we should be running?

windows/RNSVG/RadialGradientView.cpp

windows/RNSVG/TextView.cpp

marlenecota · 2023-11-11T07:48:30Z

Looks good to me, as long as you double-check the transform map. Is there windows build CI / tests that we should be running?

No window's specific CI/tests yet, but it is on my list of things to add.

@WoLewicki - any reservations on this PR?

WoLewicki · 2023-11-13T12:54:02Z

I can merge and release it if you think it is ready 🚀

WoLewicki · 2023-11-13T12:57:52Z

Also, what is the status of windows RN fork? I'll try to bump the Example app to RN 0.73 soon, is it ok for you?

marlenecota · 2023-11-13T16:48:08Z

@WoLewicki please merge! As far as bumping to 73, I don't expect any issues, but I am happy to jump in and fix if anything pops up.

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [react-native-svg](https://togithub.com/react-native-community/react-native-svg) | [`^13.14.0` -> `^15.2.0`](https://renovatebot.com/diffs/npm/react-native-svg/13.14.0/15.2.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/react-native-svg/15.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/react-native-svg/15.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/react-native-svg/13.14.0/15.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/react-native-svg/13.14.0/15.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>react-native-community/react-native-svg (react-native-svg)</summary> ### [`v15.2.0`](https://togithub.com/software-mansion/react-native-svg/releases/tag/v15.2.0) [Compare Source](https://togithub.com/react-native-community/react-native-svg/compare/v15.1.0...v15.2.0) Minor release adding support for RN 0.74 on New Architecture and introducing some bug fixes. Thank you for your contributions! #### What's Changed - feat: add needed changes for RN 0.74 by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2231 - Fix CMakeLists for Android by [@tjzel](https://togithub.com/tjzel) in [software-mansion/react-native-svg#2249 - Adds support to compile react-native-svg against WinAppSDK by [@rozele](https://togithub.com/rozele) in [software-mansion/react-native-svg#2255 - feat: bump RN to 0.74 in FabricExample and remove rea hacks by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2262 - feat: bump RN to 0.74 in Example by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2263 #### New Contributors - [@tjzel](https://togithub.com/tjzel) made their first contribution in [software-mansion/react-native-svg#2249 **Full Changelog**: software-mansion/react-native-svg@v15.1.0...v15.2.0 ### [`v15.1.0`](https://togithub.com/software-mansion/react-native-svg/releases/tag/v15.1.0) [Compare Source](https://togithub.com/react-native-community/react-native-svg/compare/v15.0.0...v15.1.0) Minor release including proper support for `react-native-reanimated` to the library on new architecture by using `dynamic` values for codegen. ##### What's Changed - feat: use dynamics instead of strings for props that can be either string or number by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2238 **Full Changelog**: software-mansion/react-native-svg@v15.0.0...v15.1.0 ### [`v15.0.0`](https://togithub.com/software-mansion/react-native-svg/releases/tag/v15.0.0) [Compare Source](https://togithub.com/react-native-community/react-native-svg/compare/v14.1.0...v15.0.0) Major release introducing support for visionOS 🎉, some bug fixes and a BREAKING CHANGE due to [software-mansion/react-native-svg#2232. If your app already supports `iOS` >= `12.4` then you can safely upgrade the version, otherwise, you have to bump it first. #### What's Changed - feat: add visionOS support by [@okwasniewski](https://togithub.com/okwasniewski) in [software-mansion/react-native-svg#2190 - fix: Correct types for transformsArrayToProps by [@crazyfraggle](https://togithub.com/crazyfraggle) in [software-mansion/react-native-svg#2193 - chore: bump examples to 0.73.1 by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2201 - Fix type exports and enable `isolatedModules` setting to catch it in `tsc` by [@renchap](https://togithub.com/renchap) in [software-mansion/react-native-svg#2197 - Fix crash when SVG is unloaded by XAML by [@rozele](https://togithub.com/rozele) in [software-mansion/react-native-svg#2195 - fix(SvgCssUri): support rendering fallback instead of crashing the app when loading invalid content from remote svg file by [@quangkcao](https://togithub.com/quangkcao) in [software-mansion/react-native-svg#2196 - fix: Ensure RNSVG.dll is built with proper publisher/versioning information via new resource file. by [@taenri](https://togithub.com/taenri) in [software-mansion/react-native-svg#2191 - Update ios-build-test.yml by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2207 - fix: visionOS support by [@tomekzaw](https://togithub.com/tomekzaw) in [software-mansion/react-native-svg#2218 - fixed [@Deprecated](https://togithub.com/Deprecated) warning in React Native 0.73: 'com.facebook.react.common.StandardCharsets' is deprecated and marked for removal by [@coder-xiaomo](https://togithub.com/coder-xiaomo) in [software-mansion/react-native-svg#2208 - fix: typo on require statement (`WithLocalSvg`) by [@voidsatisfaction](https://togithub.com/voidsatisfaction) in [software-mansion/react-native-svg#2223 - fix: Add missing nan value checks for bounds size by [@MatiPl01](https://togithub.com/MatiPl01) in [software-mansion/react-native-svg#2220 - chore(deps): bump ip from 1.1.8 to 1.1.9 in /Example by [@dependabot](https://togithub.com/dependabot) in [software-mansion/react-native-svg#2228 - feat: bump minimal ios version to 12.4 by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2232 #### New Contributors - [@okwasniewski](https://togithub.com/okwasniewski) made their first contribution in [software-mansion/react-native-svg#2190 - [@crazyfraggle](https://togithub.com/crazyfraggle) made their first contribution in [software-mansion/react-native-svg#2193 - [@quangkcao](https://togithub.com/quangkcao) made their first contribution in [software-mansion/react-native-svg#2196 - [@taenri](https://togithub.com/taenri) made their first contribution in [software-mansion/react-native-svg#2191 - [@coder-xiaomo](https://togithub.com/coder-xiaomo) made their first contribution in [software-mansion/react-native-svg#2208 - [@voidsatisfaction](https://togithub.com/voidsatisfaction) made their first contribution in [software-mansion/react-native-svg#2223 - [@MatiPl01](https://togithub.com/MatiPl01) made their first contribution in [software-mansion/react-native-svg#2220 **Full Changelog**: software-mansion/react-native-svg@v14.1.0...v15.0.0 ### [`v14.1.0`](https://togithub.com/software-mansion/react-native-svg/releases/tag/v14.1.0) [Compare Source](https://togithub.com/react-native-community/react-native-svg/compare/v14.0.0...v14.1.0) Minor release adding support for RN 0.73 and fixing some bugs 🎉 Thank you for all your contributions! #### What's Changed - fix: remove unused header causing problems by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2175 - fix `SvgCssUri` fallback by [@myou11](https://togithub.com/myou11) in [software-mansion/react-native-svg#2171 - Minor fix to prevent crash when Loaded fires twice by [@rozele](https://togithub.com/rozele) in [software-mansion/react-native-svg#2180 - feat: add support for RN 73 by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2181 #### New Contributors - [@myou11](https://togithub.com/myou11) made their first contribution in [software-mansion/react-native-svg#2171 - [@rozele](https://togithub.com/rozele) made their first contribution in [software-mansion/react-native-svg#2180 **Full Changelog**: software-mansion/react-native-svg@v14.0.0...v14.1.0 ### [`v14.0.0`](https://togithub.com/software-mansion/react-native-svg/releases/tag/v14.0.0) [Compare Source](https://togithub.com/react-native-community/react-native-svg/compare/v13.14.0...v14.0.0) Major release introducing some minor improvements and a ***BREAKING CHANGE***. From now on, you should import SvgCss, SvgCssUri, SvgWithCss, SvgWithCssUri, inlineStyles, LocalSvg, WithLocalSvg, loadLocalRawResource, from `react-native-svg/css` package instead. See [#2168](https://togithub.com/react-native-community/react-native-svg/issues/2168) for more information. #### What's Changed - enable buildConfig generation to better support AGP8 by [@pvegh](https://togithub.com/pvegh) in [software-mansion/react-native-svg#2143 - perf: avoid unnecessary shared_ptr copies in Fabric components by [@javache](https://togithub.com/javache) in [software-mansion/react-native-svg#2164 - fix: props are no longer unnecesarily copied in new architecture by [@javache](https://togithub.com/javache) in [software-mansion/react-native-svg#2163 - chore(deps): bump [@babel/traverse](https://togithub.com/babel/traverse) from 7.22.8 to 7.23.2 in /Example by [@dependabot](https://togithub.com/dependabot) in [software-mansion/react-native-svg#2158 - Build `renderer/components/rnsvg` with `-std=c++20` by [@NickGerleman](https://togithub.com/NickGerleman) in [software-mansion/react-native-svg#2141 - chore: bump examples to rn 0.72.6 by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2166 - \[Windows] Port to Direct2D to remove win2d dependency by [@marlenecota](https://togithub.com/marlenecota) in [software-mansion/react-native-svg#2052 - feat: move css to different package for size reduction by [@WoLewicki](https://togithub.com/WoLewicki) in [software-mansion/react-native-svg#2168 #### New Contributors - [@pvegh](https://togithub.com/pvegh) made their first contribution in [software-mansion/react-native-svg#2143 - [@javache](https://togithub.com/javache) made their first contribution in [software-mansion/react-native-svg#2164 - [@NickGerleman](https://togithub.com/NickGerleman) made their first contribution in [software-mansion/react-native-svg#2141 **Full Changelog**: software-mansion/react-native-svg@v13.14.0...v14.0.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone America/Los_Angeles. 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/valora-inc/wallet).  --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: valora-bot <valorabot@valoraapp.com>

marlenecota added 13 commits March 28, 2023 13:05

first pass at replacing win2d with d2d

b7d116c

switch brushes but no-op for Pattern

3fe8a3d

Remove win2d::Geometry. Image+Text broken

be0d37f

fix image

e354006

remove last of win2d

06a5e33

add deviceContext and size to Draw params

92b0d06

fix ReactExperimentalFeatureSet warning in example

58d281a

fix image and re-rendering

80caf42

cleanup

ef4daf8

fix gradient stops

8e22a20

various transform changes

56c62db

clean up

0e2a7d9

Merge branch 'main' into windows-d2d

222e6ed

marlenecota marked this pull request as ready for review June 5, 2023 21:33

marlenecota changed the title ~~[DRAFT] [Windows] Port to Direct2D to remove win2d dependency~~ [Windows] Port to Direct2D to remove win2d dependency Jun 5, 2023

chrisglein reviewed Jun 15, 2023

View reviewed changes

marlenecota added 3 commits October 27, 2023 14:41

Add D2D winrt wrappers and no-op Marker impl

9a2531f

revert some files

b66d75a

revert image example page

8b873ef

chrisglein reviewed Oct 31, 2023

View reviewed changes

marlenecota added 3 commits November 3, 2023 14:33

add enum types

944d7d6

refactor brushview transforms

01fe9ec

remove unnecessary {nullptr}

7e44495

TatianaKapos reviewed Nov 9, 2023

View reviewed changes

windows/RNSVG/BrushView.cpp Show resolved Hide resolved

TatianaKapos reviewed Nov 9, 2023

View reviewed changes

windows/RNSVG/ImageView.cpp Show resolved Hide resolved

marlenecota added 4 commits November 10, 2023 11:43

pr feedback

f8a0b6b

rects

63da516

const& all the things

a24e132

more pr feedback

445f27a

TatianaKapos approved these changes Nov 10, 2023

View reviewed changes

jonthysell approved these changes Nov 11, 2023

View reviewed changes

windows/RNSVG/RadialGradientView.cpp Show resolved Hide resolved

windows/RNSVG/TextView.cpp Show resolved Hide resolved

marlenecota added 2 commits November 10, 2023 23:03

RadialGradientView - transform identity check

bfae64a

re-add Geometry {nullptr} initializer

3947ccc

WoLewicki merged commit f88532d into software-mansion:main Nov 14, 2023
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Windows] Port to Direct2D to remove win2d dependency #2052

[Windows] Port to Direct2D to remove win2d dependency #2052

marlenecota commented May 10, 2023 •

edited

Loading

jonthysell left a comment

marlenecota commented Nov 11, 2023

WoLewicki commented Nov 13, 2023

WoLewicki commented Nov 13, 2023

marlenecota commented Nov 13, 2023

[Windows] Port to Direct2D to remove win2d dependency #2052

[Windows] Port to Direct2D to remove win2d dependency #2052

Conversation

marlenecota commented May 10, 2023 • edited Loading

Summary

Test Plan

Compatibility

Checklist

jonthysell left a comment

Choose a reason for hiding this comment

marlenecota commented Nov 11, 2023

WoLewicki commented Nov 13, 2023

WoLewicki commented Nov 13, 2023

marlenecota commented Nov 13, 2023

marlenecota commented May 10, 2023 •

edited

Loading