[0.76] Cherry-pick changes (#14171)

* Fix issue with prop cloning with custom native props (#14061) * Fix issue with prop cloning with custom native props * format * prettier * Change files --------- Co-authored-by: React-Native-Windows Bot <[email protected]> * Export MS.RN.Color ctor in Office dll (#14082) * Export MS.RN.Color ctor in Office dll * Change files * Implement TxScreenToClient and TxClientToScreen * format --------- Co-authored-by: React-Native-Windows Bot <[email protected]> * TextInput caret becomes visible on non-focused TextInputs on resize (#14091) * TextInput caret becomes visible on non-focused TextInputs on resize * Change files --------- Co-authored-by: React-Native-Windows Bot <[email protected]> * [Fabric] Introducing autocapitalize prop in TextInput - Take 2 (#13343) * New implementation of autocapitalize! * Change files * Fixed bug for sentences scenario * Just keep characters mode for now * Revert "Just keep characters mode for now" This reverts commit 60ca1ce. * Re-apply changes minus packages.json.lock * The original js file was deleted, re-applying changes * Fixed snapshot and lint errors * Fix override mismatch, added comments * Remove stale test check * Minor changes * Update obsolete snapshot * Add very basic box-shadow support (#14028) * Add very basic box-shadow support * Change files * Focus should notify island host when tab loop wraps to give host oportunity to take focus (#14026) * Focus should notify island host when tab loop wraps to give host oportunity to take focus * Change files * Default scroll to bring a component into view should have padding around the viewport (#14018) * Default scroll to bring a component into view should have padding around the viewport * Change files * Update focus visuals to use cornerRadius and inner/outer strokes (#14008) * Update focus visuals to use cornerRadius and inner/outer strokes. * Change files * Format * lint fix * Scale focus border for scaleFactor * Fix Text running flattenStyle multiple times (#14041) * integrate rn #45340 and #45345 * Change files * remove dead windows code * Fixing text components not rendering a border with Paper (#14054) ## Description Text components rendered in Paper need to have check if the style they are rendering contains border style props. This bug occurs when the passed in style is an array. From what I can tell, this bug has existed for a long time, possibly forever. [4 Years Ago](946ba7f) This PR fixed borders not rendering for text, but did not address text components with an array of styles. [3 Years Ago](ee4d83d#diff-5beb08e50a61de475cd20c6e68588ac3a5cd687a971883167fe75fc97a0dbdea) This PR changes naming, but not the logic. This PR switches the style that is checked for border props from the one that is passed in to the one that is flattened. This is the type of JSX that is broken. The text does not render a border. ```tsx <Text style={[{ borderColor: "red", borderWidth: 3 }]}>{"hello world"}</Text> ``` ### Type of Change - Bug fix (non-breaking change which fixes an issue) ### Why This reenables borders for Paper text components. ### What Swapped a variable in text.window.js that is used to check for border style props. ## Screenshots Add any relevant screen captures here from before or after your changes. ## Testing Local tests. ## Changelog Fixing text components not rendering a border with Paper --------- Co-authored-by: Sam Walker <[email protected]> Co-authored-by: Jon Thysell <[email protected]> * [Fabric] Get Modal to host RN components in new hwnd (#13500) * save state * add example * build but blank page still :( * clean up comments * visuals show up in new hwnd! * clean up code * better naming and unfork Modal examples * testing save state * Make the RN island a Modal member var * Failed attempt at skipping root view in CEH, leaving it for learning purposes * you can click on UI! * clean up code * Change files * save state * remove hardcoded rootTag * add width/height to example * add test * revert simple.tsx * remove test * update snapshot * feedback part 1: make Modal a RootComponentView * feedback part2: simplify MountChildren * fix deleting modal * feedback round2 * remove comment * remove imports * feedback part 3 * fix overrides * add simple layout - still has issues with padding/flex * feedback part4 * lint * update overrides * Change files * feedback --------- Co-authored-by: Daniel Ayala <[email protected]> * Support accessibilityState 'checked' (#13962) * Implement accessibilityState checked * Change files * Add Testing * Format and Update Snapshots * Adjust Guardrails * Merge * Format * Format * Lint * Change files * Fix Merge Error * Fix focus visuals being obscured by adjacent views (#14093) * Fix focus visuals being obscured by adjacent views * Change files * update snapshots * Fix uimplemented view * review feedback --------- Co-authored-by: React-Native-Windows Bot <[email protected]> * [Fabric] Fix Modal position, disable input to parent hwnd, and add onShow event (#14109) * default to Modal opening in middle of app * add onShow event * Change files * disable input to parent hwnd * fix changefile * Implement cursor property (#14141) * Implement cursor property * Change files * Disable failing UT (#14153) * Disable failing UT * Change files * [Fabric] Implement onDismiss for Modal and remove titlebar (#14126) * add onDismiss event * remove title bar * Change files * fix lint and snapshots * add option for titlebar * upgrade override * Views with keyUpEvents/keyDownEvents set on them should form a stacking context (#14090) * Key and mouse events require a stacking context * Change files * We dont need a stacking context to bubble JS events - but we do to modify the native handling of the events * fix * Fix change files * build fix * fixes * fix * format --------- Co-authored-by: React-Native-Windows Bot <[email protected]> Co-authored-by: Daniel Ayala <[email protected]> Co-authored-by: Tatiana Kapos <[email protected]> Co-authored-by: Sam Walker <[email protected]> Co-authored-by: Sam Walker <[email protected]> Co-authored-by: Jon Thysell <[email protected]> Co-authored-by: Chiara Mooney <[email protected]>
microsoft · Dec 9, 2024 · 41f26e2 · 41f26e2
1 parent 0eb0498
commit 41f26e2
Show file tree

Hide file tree

Showing 94 changed files with 4,875 additions and 3,892 deletions.
diff --git a/.ado/templates/react-native-init-windows.yml b/.ado/templates/react-native-init-windows.yml
@@ -63,7 +63,7 @@ steps:
 
   - ${{ if and(endsWith(parameters.template, '-lib'), not(startsWith(parameters.template, 'old'))) }}:
     - script: |
-        npx --yes create-react-native-library@latest --slug testcli --description testcli --author-name "React-Native-Windows Bot" --author-email [email protected] --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --type module-new --react-native-version $(reactNativeDevDependency) --example vanilla testcli
+        npx --yes create-react-native-library@latest --slug testcli --description testcli --author-name "React-Native-Windows Bot" --author-email [email protected] --author-url http://example.com --repo-url http://example.com --languages kotlin-objc --type turbo-module --react-native-version $(reactNativeDevDependency) --example vanilla testcli
       displayName: Init new lib project with create-react-native-library
       workingDirectory: $(Agent.BuildDirectory)
 

diff --git a/change/@office-iss-react-native-win32-f99cfd3f-e8be-4146-8f14-07aca4f2c5b1.json b/change/@office-iss-react-native-win32-f99cfd3f-e8be-4146-8f14-07aca4f2c5b1.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "adds default Modal",
+  "packageName": "@office-iss/react-native-win32",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@react-native-windows-codegen-132ed636-192e-42e3-808f-a259a253bb75.json b/change/@react-native-windows-codegen-132ed636-192e-42e3-808f-a259a253bb75.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Implement accessibilityState checked",
+  "packageName": "@react-native-windows/codegen",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@react-native-windows-codegen-4ec7c1b2-8541-47d9-a5d0-c245b25fbac1.json b/change/@react-native-windows-codegen-4ec7c1b2-8541-47d9-a5d0-c245b25fbac1.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix issue with prop cloning with custom native props",
+  "packageName": "@react-native-windows/codegen",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-154312b4-b03a-41b3-99e3-905475325a8a.json b/change/react-native-windows-154312b4-b03a-41b3-99e3-905475325a8a.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fixing text components not rendering a border with Paper",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-18d4918c-6f73-4fe4-a6e4-42f5ac6ac39e.json b/change/react-native-windows-18d4918c-6f73-4fe4-a6e4-42f5ac6ac39e.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Implement accessibilityState checked",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-22ea5da8-4ee5-4ec6-bac3-1c62cabf01f7.json b/change/react-native-windows-22ea5da8-4ee5-4ec6-bac3-1c62cabf01f7.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Export MS.RN.Color ctor in Office dll",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-283ad80a-9f48-40a3-b7a3-227795b6f110.json b/change/react-native-windows-283ad80a-9f48-40a3-b7a3-227795b6f110.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "adds default modal that hosts fabric components",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-31db428a-029b-4735-94f6-2c4368b9bda6.json b/change/react-native-windows-31db428a-029b-4735-94f6-2c4368b9bda6.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "implement onDismiss and remove titlebar from Modal",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-42cade43-cd57-4cd5-97d3-2a35b924d78f.json b/change/react-native-windows-42cade43-cd57-4cd5-97d3-2a35b924d78f.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix focus visuals being obscured by adjacent views",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-433ea974-44c7-465f-a6e9-1f34927c7217.json b/change/react-native-windows-433ea974-44c7-465f-a6e9-1f34927c7217.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Focus should notify island host when tab loop wraps to give host oportunity to take focus",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-4fec92b2-f049-43b1-8e13-d9c351c5511b.json b/change/react-native-windows-4fec92b2-f049-43b1-8e13-d9c351c5511b.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Implement cursor property",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-58d5a889-6e77-4cde-a5d8-76a73e9a3cb7.json b/change/react-native-windows-58d5a889-6e77-4cde-a5d8-76a73e9a3cb7.json
@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "Disable failing UT",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "none"
+}
diff --git a/change/react-native-windows-5f728ab0-c614-4bcd-b89d-0bfa4b9956db.json b/change/react-native-windows-5f728ab0-c614-4bcd-b89d-0bfa4b9956db.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Key and mouse events require a stacking context",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-621a9112-d00c-469f-83a8-ae391abefe18.json b/change/react-native-windows-621a9112-d00c-469f-83a8-ae391abefe18.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix issue with prop cloning with custom native props",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-6b83103d-e55d-427a-a482-d2706e24f6a0.json b/change/react-native-windows-6b83103d-e55d-427a-a482-d2706e24f6a0.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Default scroll to bring a component into view should have padding around the viewport",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-76c400e4-4a62-4fcd-95c9-25a19cf51138.json b/change/react-native-windows-76c400e4-4a62-4fcd-95c9-25a19cf51138.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix flatten style running multiple times\"",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-7edd982f-196f-4feb-a824-cbf08e0a2c96.json b/change/react-native-windows-7edd982f-196f-4feb-a824-cbf08e0a2c96.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Add very basic box-shadow support",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-aa22348e-c6b1-4cfc-9a85-c8b2bc2df484.json b/change/react-native-windows-aa22348e-c6b1-4cfc-9a85-c8b2bc2df484.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Introduced autocapitalize prop in TextInput",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-ad145bca-5a3a-45aa-ab7b-35661aa5fe59.json b/change/react-native-windows-ad145bca-5a3a-45aa-ab7b-35661aa5fe59.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "TextInput caret becomes visible on non-focused TextInputs on resize",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-ce27643e-687f-4f35-815b-4e030e9cc358.json b/change/react-native-windows-ce27643e-687f-4f35-815b-4e030e9cc358.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Update focus visuals to use cornerRadius and inner/outer strokes.",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-e6508963-e86e-45b4-86e5-3f82b548e2f7.json b/change/react-native-windows-e6508963-e86e-45b4-86e5-3f82b548e2f7.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix Modal position, disable input to parent hwnd, and add onShow",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js b/packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js
@@ -59,6 +59,11 @@ const Components: Array<RNTesterModuleInfo> = [
     key: 'ImageWin32Test',
     module: require('@office-iss/react-native-win32/Libraries/Image/Tests/ImageWin32Test'),
   },
+  {
+    key: 'ModalExample',
+    category: 'UI',
+    module: require('../examples/Modal/ModalExample'),
+  },
   /*
   {
     key: 'JSResponderHandlerExample',
@@ -68,11 +73,6 @@ const Components: Array<RNTesterModuleInfo> = [
     key: 'KeyboardAvoidingViewExample',
     module: require('../examples/KeyboardAvoidingView/KeyboardAvoidingViewExample'),
   },
-  {
-    key: 'ModalExample',
-    category: 'UI',
-    module: require('../examples/Modal/ModalExample'),
-  },
   {
     key: 'NewAppScreenExample',
     module: require('../examples/NewAppScreen/NewAppScreenExample'),

diff --git a/packages/@react-native-windows/codegen/src/generators/GenerateComponentWindows.ts b/packages/@react-native-windows/codegen/src/generators/GenerateComponentWindows.ts
@@ -42,7 +42,14 @@ const headerTemplate = `/*
 
 const propsTemplate = `REACT_STRUCT(::_PROPS_NAME_::)
 struct ::_PROPS_NAME_:: : winrt::implements<::_PROPS_NAME_::, winrt::Microsoft::ReactNative::IComponentProps> {
-  ::_PROPS_NAME_::(winrt::Microsoft::ReactNative::ViewProps props) : ViewProps(props) {}
+  ::_PROPS_NAME_::(winrt::Microsoft::ReactNative::ViewProps props, const winrt::Microsoft::ReactNative::IComponentProps& cloneFrom)
+    : ViewProps(props)
+  {
+     if (cloneFrom) {
+       auto cloneFromProps = cloneFrom.as<::_PROPS_NAME_::>();
+::_PROP_INITIALIZERS_::  
+     }
+  }
 
   void SetProp(uint32_t hash, winrt::hstring propName, winrt::Microsoft::ReactNative::IJSValueReader value) noexcept {
     winrt::Microsoft::ReactNative::ReadProp(hash, propName, value, *this);
@@ -148,8 +155,10 @@ void Register::_COMPONENT_NAME_::NativeComponent(
       L"::_COMPONENT_NAME_::", [builderCallback](winrt::Microsoft::ReactNative::IReactViewComponentBuilder const &builder) noexcept {
         auto compBuilder = builder.as<winrt::Microsoft::ReactNative::Composition::IReactCompositionViewComponentBuilder>();
 
-        builder.SetCreateProps(
-            [](winrt::Microsoft::ReactNative::ViewProps props) noexcept { return winrt::make<::_COMPONENT_NAME_::Props>(props); });
+        builder.SetCreateProps([](winrt::Microsoft::ReactNative::ViewProps props,
+                              const winrt::Microsoft::ReactNative::IComponentProps& cloneFrom) noexcept {
+            return winrt::make<::_COMPONENT_NAME_::Props>(props, cloneFrom); 
+        });
 
         builder.SetUpdatePropsHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,
                                      const winrt::Microsoft::ReactNative::IComponentProps &newProps,
@@ -304,6 +313,12 @@ export function createComponentGenerator({
           })
           .join('\n');
 
+        const propInitializers = componentShape.props
+          .map(prop => {
+            return `       ${prop.name} = cloneFromProps->${prop.name};`;
+          })
+          .join('\n');
+
         const propObjectTypes = propObjectAliases.jobs
           .map(propObjectTypeName => {
             const propObjectType = propObjectAliases.types[propObjectTypeName]!;
@@ -518,6 +533,7 @@ ${
             .replace(/::_EVENT_EMITTER_NAME_::/g, eventEmitterName)
             .replace(/::_PROPS_NAME_::/g, propsName)
             .replace(/::_COMPONENT_NAME_::/g, componentName)
+            .replace(/::_PROP_INITIALIZERS_::/g, propInitializers)
             .replace(/::_PROPS_FIELDS_::/g, propsFields)
             .replace(/::_NAMESPACE_::/g, namespace)
             .replace(/\n\n\n+/g, '\n\n');

diff --git a/packages/@react-native-windows/tester/overrides.json b/packages/@react-native-windows/tester/overrides.json
@@ -41,6 +41,18 @@
       "baseHash": "dc82e84dbfeb48a0e2d74cff719d92ee0751f975",
       "issue": 12869
     },
+    {
+      "type": "patch",
+      "file": "src/js/examples/Modal/ModalOnShow.windows.js",
+      "baseFile": "packages/rn-tester/js/examples/Modal/ModalOnShow.js",
+      "baseHash": "5098723f16d232ef3c5971a6f153522f42f87f61"
+    },
+    {
+      "type": "patch",
+      "file": "src/js/examples/Modal/ModalPresentation.windows.js",
+      "baseFile": "packages/rn-tester/js/examples/Modal/ModalPresentation.js",
+      "baseHash": "97e0408dad28bd62e6ec22a8454af764d69d8ed5"
+    },
     {
       "type": "patch",
       "file": "src/js/examples/Pressable/PressableExample.windows.js",